mirrors
/
mermaid
mirror of https://github.com/mermaid-js/mermaid.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

#5237 Bugfix for fork/join

This commit is contained in:
Knut Sveidqvist 2024-05-07 15:47:39 +02:00
parent d497a5c4ac
commit b9a73c88b5
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cypress/platform/knsv2.html
View File

@ -73,15 +73,20 @@
</head>
<body>
<pre id="diagram" class="mermaid">
stateDiagram-v2
state ProActive {
state Active {
APA
}
}
stateDiagram
state fork_state <<fork>>
[*] --> fork_state
fork_state --> State2
fork_state --> State3
state join_state <<join>>
State2 --> join_state
State3 --> join_state
join_state --> State4
State4 --> [*]
</pre
>
<pre id="diagram" class="mermaid">
<pre id="diagram" class="mermaid2">
stateDiagram-v2
[*] --> Active
@ -100,13 +105,13 @@ stateDiagram-v2
}
</pre
>
<pre id="diagram" class="mermaid">
<pre id="diagram" class="mermaid2">
stateDiagram-v2
state ProActive {
state Active {
Chimp --> A
Chimp --> B
Chimp --> C
Chimp --> A
Chimp --> B
Chimp --> C
}
}
</pre
@ -520,7 +525,8 @@ mindmap
handdrawn: true,
layout: 'elk',
flowchart: { titleTopMargin: 10 },
fontFamily: 'Caveat',
// fontFamily: 'Caveat',
fontFamily: 'Kalam',
sequence: {
actorFontFamily: 'courier',
noteFontFamily: 'courier',

3
packages/mermaid/src/rendering-util/rendering-elements/nodes.js
View File

@ -17,7 +17,8 @@ const shapes = {
rect,
stateStart,
stateEnd,
forkJoin,
fork: forkJoin,
join: forkJoin,
choice,
};