Skip to content

Commit 0b4f852

Browse files
sidharthv96sidharthv96
authored
Merge pull request #6083 from mermaid-js/release/11.4.1
Release/11.4.1
2 parents f507dbb + 0dff4ca commit 0b4f852

File tree

16 files changed

+238
-59
lines changed

16 files changed

+238
-59
lines changed

‎.changeset/eleven-rocks-leave.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'mermaid': patch
3+
---
4+
5+
fix: Kanban diagrams will not render when adding a number as ticket id or assigned for a task

‎.changeset/fresh-bears-doubt.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'mermaid': patch
3+
---
4+
5+
fix: Intersection calculations for tilted cylinder/DAS when using handdrawn look. Some random seeds could cause the calculations to break.

‎.changeset/neat-rabbits-bake.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'mermaid': patch
3+
---
4+
5+
Bump dompurify to `^3.2.1`. This removes the need for `@types/dompurify`.

‎.changeset/nervous-beans-listen.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@mermaid-js/layout-elk': patch
3+
---
4+
5+
fix: Elk rendering of Diamond shape intersections

‎cypress/integration/rendering/flowchart-elk.spec.js

+44-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { imgSnapshotTest, renderGraph } from '../../helpers/util.ts';
22

3-
describe.skip('Flowchart ELK', () => {
3+
describe('Flowchart ELK', () => {
44
it('1-elk: should render a simple flowchart', () => {
55
imgSnapshotTest(
66
`flowchart-elk TD
@@ -857,6 +857,49 @@ flowchart LR
857857
D --> E
858858
A["A"]
859859
860+
`,
861+
{ flowchart: { titleTopMargin: 0 } }
862+
);
863+
});
864+
it('6080: should handle diamond shape intersections', () => {
865+
imgSnapshotTest(
866+
`---
867+
config:
868+
layout: elk
869+
---
870+
flowchart LR
871+
subgraph s1["Untitled subgraph"]
872+
n1["Evaluate"]
873+
n2["Option 1"]
874+
n3["Option 2"]
875+
n4["fa:fa-car Option 3"]
876+
end
877+
subgraph s2["Untitled subgraph"]
878+
n5["Evaluate"]
879+
n6["Option 1"]
880+
n7["Option 2"]
881+
n8["fa:fa-car Option 3"]
882+
end
883+
A["Start"] -- Some text --> B("Continue")
884+
B --> C{"Evaluate"}
885+
C -- One --> D["Option 1"]
886+
C -- Two --> E["Option 2"]
887+
C -- Three --> F["fa:fa-car Option 3"]
888+
n1 -- One --> n2
889+
n1 -- Two --> n3
890+
n1 -- Three --> n4
891+
n5 -- One --> n6
892+
n5 -- Two --> n7
893+
n5 -- Three --> n8
894+
n1@{ shape: diam}
895+
n2@{ shape: rect}
896+
n3@{ shape: rect}
897+
n4@{ shape: rect}
898+
n5@{ shape: diam}
899+
n6@{ shape: rect}
900+
n7@{ shape: rect}
901+
n8@{ shape: rect}
902+
860903
`,
861904
{ flowchart: { titleTopMargin: 0 } }
862905
);

‎cypress/platform/knsv2.html

+141-12
Original file line numberDiff line numberDiff line change
@@ -88,71 +88,200 @@
8888
</head>
8989

9090
<body>
91+
<pre id="diagram4" class="mermaid2">
92+
---
93+
config:
94+
layout: elk
95+
---
96+
flowchart LR
97+
subgraph s1["Untitled subgraph"]
98+
n1["Evaluate"]
99+
n2["Option 1"]
100+
n3["Option 2"]
101+
n4["fa:fa-car Option 3"]
102+
end
103+
n1 -- One --> n2
104+
n1 -- Two --> n3
105+
n1 -- Three --> n4
106+
n5
107+
n1@{ shape: diam}
108+
n2@{ shape: rect}
109+
n3@{ shape: rect}
110+
n4@{ shape: rect}
111+
A["Start"] -- Some text --> B("Continue")
112+
B --> C{"Evaluate"}
113+
C -- One --> D["Option 1"]
114+
C -- Two --> E["Option 2"]
115+
C -- Three --> F["fa:fa-car Option 3"]
116+
117+
118+
</pre>
91119
<pre id="diagram4" class="mermaid">
120+
---
121+
config:
122+
layout: elk
123+
---
124+
flowchart LR
125+
subgraph s1["Untitled subgraph"]
126+
n1["Evaluate"]
127+
n2["Option 1"]
128+
n3["Option 2"]
129+
n4["fa:fa-car Option 3"]
130+
end
131+
subgraph s2["Untitled subgraph"]
132+
n5["Evaluate"]
133+
n6["Option 1"]
134+
n7["Option 2"]
135+
n8["fa:fa-car Option 3"]
136+
end
137+
A["Start"] -- Some text --> B("Continue")
138+
B --> C{"Evaluate"}
139+
C -- One --> D["Option 1"]
140+
C -- Two --> E["Option 2"]
141+
C -- Three --> F["fa:fa-car Option 3"]
142+
n1 -- One --> n2
143+
n1 -- Two --> n3
144+
n1 -- Three --> n4
145+
n5 -- One --> n6
146+
n5 -- Two --> n7
147+
n5 -- Three --> n8
148+
n1@{ shape: diam}
149+
n2@{ shape: rect}
150+
n3@{ shape: rect}
151+
n4@{ shape: rect}
152+
n5@{ shape: diam}
153+
n6@{ shape: rect}
154+
n7@{ shape: rect}
155+
n8@{ shape: rect}
156+
157+
</pre>
158+
<pre id="diagram4" class="mermaid2">
159+
---
160+
config:
161+
layout: elk
162+
---
163+
flowchart LR
164+
subgraph s1["Untitled subgraph"]
165+
n1["Evaluate"]
166+
n2["Option 1"]
167+
end
168+
n1 -- One --> n2
169+
170+
171+
172+
173+
</pre>
174+
<pre id="diagram4" class="mermaid2">
175+
---
176+
config:
177+
layout: elk
178+
---
179+
flowchart LR
180+
A{A} --> B & C
181+
</pre
182+
>
183+
<pre id="diagram4" class="mermaid2">
184+
---
185+
config:
186+
layout: elk
187+
---
188+
flowchart LR
189+
n2@{ shape: rect}
190+
n3@{ shape: rect}
191+
n4@{ shape: rect}
192+
A["Start"] -- Some text --> B("Continue")
193+
B --> C{"Evaluate"}
194+
C -- One --> D["Option 1"]
195+
C -- Two --> E["Option 2"]
196+
C -- Three --> F["fa:fa-car Option 3"]
197+
%% C@{ shape: hexagon}
198+
199+
200+
</pre>
201+
<pre id="diagram4" class="mermaid2">
202+
---
203+
config:
204+
kanban:
205+
ticketBaseUrl: 'https://github.com/your-repo/issues/#TICKET#'
206+
---
207+
kanban
208+
Backlog
209+
task1[📝 Define project requirements]@{ ticket: a101 }
210+
To Do
211+
task2[🔍 Research technologies]@{ ticket: a102 }
212+
Review
213+
task4[🔍 Code review for login feature]@{ ticket: a104 }
214+
Done
215+
task5[✅ Deploy initial version]@{ ticket: a105 }
216+
In Progress
217+
task3[💻 Develop login feature]@{ ticket: 103 }
218+
219+
</pre>
220+
<pre id="diagram4" class="mermaid2">
92221
flowchart LR
93222
nA[Default] --> A@{ icon: 'fa:bell', form: 'rounded' }
94223

95224
</pre>
96-
<pre id="diagram4" class="mermaid">
225+
<pre id="diagram4" class="mermaid2">
97226
flowchart LR
98227
nA[Style] --> A@{ icon: 'fa:bell', form: 'rounded' }
99228
style A fill:#f9f,stroke:#333,stroke-width:4px
100229
</pre>
101-
<pre id="diagram4" class="mermaid">
230+
<pre id="diagram4" class="mermaid2">
102231
flowchart LR
103232
nA[Class] --> A@{ icon: 'fa:bell', form: 'rounded' }
104233
A:::AClass
105234
classDef AClass fill:#f9f,stroke:#333,stroke-width:4px
106235
</pre>
107-
<pre id="diagram4" class="mermaid">
236+
<pre id="diagram4" class="mermaid2">
108237
flowchart LR
109238
nA[Class] --> A@{ icon: 'logos:aws', form: 'rounded' }
110239

111240
</pre>
112-
<pre id="diagram4" class="mermaid">
241+
<pre id="diagram4" class="mermaid2">
113242
flowchart LR
114243
nA[Default] --> A@{ icon: 'fa:bell', form: 'square' }
115244

116245
</pre>
117-
<pre id="diagram4" class="mermaid">
246+
<pre id="diagram4" class="mermaid2">
118247
flowchart LR
119248
nA[Style] --> A@{ icon: 'fa:bell', form: 'square' }
120249
style A fill:#f9f,stroke:#333,stroke-width:4px
121250
</pre>
122-
<pre id="diagram4" class="mermaid">
251+
<pre id="diagram4" class="mermaid2">
123252
flowchart LR
124253
nA[Class] --> A@{ icon: 'fa:bell', form: 'square' }
125254
A:::AClass
126255
classDef AClass fill:#f9f,stroke:#333,stroke-width:4px
127256
</pre>
128-
<pre id="diagram4" class="mermaid">
257+
<pre id="diagram4" class="mermaid2">
129258
flowchart LR
130259
nA[Class] --> A@{ icon: 'logos:aws', form: 'square' }
131260

132261
</pre>
133-
<pre id="diagram4" class="mermaid">
262+
<pre id="diagram4" class="mermaid2">
134263
flowchart LR
135264
nA[Default] --> A@{ icon: 'fa:bell', form: 'circle' }
136265

137266
</pre>
138-
<pre id="diagram4" class="mermaid">
267+
<pre id="diagram4" class="mermaid2">
139268
flowchart LR
140269
nA[Style] --> A@{ icon: 'fa:bell', form: 'circle' }
141270
style A fill:#f9f,stroke:#333,stroke-width:4px
142271
</pre>
143-
<pre id="diagram4" class="mermaid">
272+
<pre id="diagram4" class="mermaid2">
144273
flowchart LR
145274
nA[Class] --> A@{ icon: 'fa:bell', form: 'circle' }
146275
A:::AClass
147276
classDef AClass fill:#f9f,stroke:#333,stroke-width:4px
148277
</pre>
149-
<pre id="diagram4" class="mermaid">
278+
<pre id="diagram4" class="mermaid2">
150279
flowchart LR
151280
nA[Class] --> A@{ icon: 'logos:aws', form: 'circle' }
152281
A:::AClass
153282
classDef AClass fill:#f9f,stroke:#333,stroke-width:4px
154283
</pre>
155-
<pre id="diagram4" class="mermaid">
284+
<pre id="diagram4" class="mermaid2">
156285
flowchart LR
157286
nA[Style] --> A@{ icon: 'logos:aws', form: 'circle' }
158287
style A fill:#f9f,stroke:#333,stroke-width:4px

‎docs/ecosystem/integrations-community.md

-2
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,6 @@ Communication tools and platforms
185185
- [=Diagram block](https://github.com/zag/podlite/tree/main/packages/podlite-diagrams)
186186
- [Standard Notes](https://standardnotes.com/)
187187
- [Mermaid Extension](https://github.com/nienow/sn-mermaid)
188-
- [Sublime Text 3](https://sublimetext.com)
189-
- [Mermaid Package](https://packagecontrol.io/packages/Mermaid)
190188
- [VS Code](https://code.visualstudio.com/)
191189
- [Mermaid Editor](https://marketplace.visualstudio.com/items?itemName=tomoyukim.vscode-mermaid-editor)
192190
- [Mermaid Export](https://marketplace.visualstudio.com/items?itemName=Gruntfuggly.mermaid-export)

0 commit comments

Comments
 (0)