Skip to content

Commit 87e2d81

Browse files
authored
Merge branch 'develop' into refactor/shape-rendering-simplification
2 parents 93aa657 + 7b167cf commit 87e2d81

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+2067
-1066
lines changed

.changeset/brave-baths-behave.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'mermaid': patch
3+
---
4+
5+
fix: Prevent HTML tags from being escaped in sandbox label rendering

.changeset/chatty-insects-dream.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'mermaid': patch
3+
---
4+
5+
fix(treemap): Fixed treemap classDef style application to properly apply user-defined styles

.changeset/lazy-brooms-battle.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'mermaid': patch
3+
---
4+
5+
feat: add alias support for new participant syntax of sequence diagrams

.changeset/ten-plums-bet.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'mermaid': patch
3+
---
4+
5+
fix: Support ComponentQueue_Ext to prevent parsing error

.changeset/tricky-rivers-stand.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'mermaid': patch
3+
---
4+
5+
fix: validate dates and tick interval to prevent UI freeze/crash in gantt diagramtype

.changeset/wide-lines-trade.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'mermaid': patch
3+
---
4+
5+
fix: Mindmap rendering issue when the number of Level 2 nodes exceeds 11

.github/workflows/e2e-timings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
echo "EOF" >> $GITHUB_OUTPUT
5959
6060
- name: Commit and create pull request
61-
uses: peter-evans/create-pull-request@0edc001d28a2959cd7a6b505629f1d82f0a6e67d
61+
uses: peter-evans/create-pull-request@0979079bc20c05bbbb590a56c21c4e2b1d1f1bbe
6262
with:
6363
add-paths: |
6464
cypress/timings.json

.github/workflows/update-browserlist.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
message: 'chore: update browsers list'
2020
push: false
2121
- name: Create Pull Request
22-
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
22+
uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412 # v7.0.9
2323
with:
2424
branch: update-browserslist
2525
title: Update Browserslist

cypress/helpers/util.ts

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,21 @@ export const openURLAndVerifyRendering = (
9898

9999
cy.visit(url);
100100
cy.window().should('have.property', 'rendered', true);
101-
cy.get('svg').should('be.visible');
102-
// cspell:ignore viewbox
103-
cy.get('svg').should('not.have.attr', 'viewbox');
104101

105-
if (validation) {
106-
cy.get('svg').should(validation);
102+
// Handle sandbox mode where SVG is inside an iframe
103+
if (options.securityLevel === 'sandbox') {
104+
cy.get('iframe').should('be.visible');
105+
if (validation) {
106+
cy.get('iframe').should(validation);
107+
}
108+
} else {
109+
cy.get('svg').should('be.visible');
110+
// cspell:ignore viewbox
111+
cy.get('svg').should('not.have.attr', 'viewbox');
112+
113+
if (validation) {
114+
cy.get('svg').should(validation);
115+
}
107116
}
108117

109118
if (screenshot) {

cypress/integration/rendering/c4.spec.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,28 @@ describe('C4 diagram', () => {
114114
{}
115115
);
116116
});
117+
it('C4.6 should render C4Context diagram with ComponentQueue_Ext', () => {
118+
imgSnapshotTest(
119+
`
120+
C4Context
121+
title System Context diagram with ComponentQueue_Ext
122+
123+
Enterprise_Boundary(b0, "BankBoundary0") {
124+
Person(customerA, "Banking Customer A", "A customer of the bank, with personal bank accounts.")
125+
126+
System(SystemAA, "Internet Banking System", "Allows customers to view information about their bank accounts, and make payments.")
127+
128+
Enterprise_Boundary(b1, "BankBoundary") {
129+
ComponentQueue_Ext(msgQueue, "Message Queue", "RabbitMQ", "External message queue system for processing banking transactions")
130+
System_Ext(SystemC, "E-mail system", "The internal Microsoft Exchange e-mail system.")
131+
}
132+
}
133+
134+
BiRel(customerA, SystemAA, "Uses")
135+
Rel(SystemAA, msgQueue, "Sends messages to")
136+
Rel(SystemAA, SystemC, "Sends e-mails", "SMTP")
137+
`,
138+
{}
139+
);
140+
});
117141
});

0 commit comments

Comments
 (0)