Skip to content

Commit 1f98db8

Browse files
committed
fix(class): avoid duplicate labels on self-referential edges
Clear label props on split sub-edges to prevent multiplicity labels from rendering 3x after structuredClone during layout. - keep labels only on correct sub-edges - defensively clear all label positions - remove unintended arrow on edge2 - add visual regression test - add changeset
1 parent 167178e commit 1f98db8

4 files changed

Lines changed: 36 additions & 0 deletions

File tree

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'mermaid': patch
3+
---
4+
5+
fix: self-referential class multiplicity labels no longer rendered multiple times
6+
7+
Fixes #7560. Resolves an issue where cardinality labels on self-referential class relationships were rendered three times due to edge splitting in the dagre layout. The fix ensures that each sub-edge only carries its relevant label positions.

‎cypress/integration/rendering/classDiagram-v3.spec.js‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,4 +1042,19 @@ class C13["With Città foreign language"]
10421042
{ logLevel: 1, htmlLabels: true }
10431043
);
10441044
});
1045+
1046+
it('should render a self-referential class diagram with multiplicity labels (fixes #7560)', () => {
1047+
imgSnapshotTest(
1048+
`
1049+
classDiagram
1050+
class SelfReferential{
1051+
+int id
1052+
+int self_referential_id
1053+
+SelfReferential referenced
1054+
}
1055+
SelfReferential "1" --> "0..1" SelfReferential : referenced
1056+
`,
1057+
{ logLevel: 1, htmlLabels: true }
1058+
);
1059+
});
10451060
});

‎packages/mermaid/src/dagre-wrapper/mermaid-graphlib.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,16 @@ export const adjustClustersAndEdges = (graph, depth) => {
306306
const edge2 = structuredClone(edge);
307307
edge1.label = '';
308308
edge1.arrowTypeEnd = 'none';
309+
// Clear multiplicity labels on edge1 (start->mid segment) - keep startLabelRight if needed, clear others
310+
edge1.startLabelLeft = '';
311+
edge1.endLabelRight = '';
312+
edge1.endLabelLeft = '';
309313
edge2.label = '';
314+
edge2.arrowTypeStart = 'none';
315+
// Clear multiplicity labels on edge2 (mid->end segment) - keep endLabelLeft if needed, clear others
316+
edge2.startLabelRight = '';
317+
edge2.startLabelLeft = '';
318+
edge2.endLabelRight = '';
310319
edge1.fromCluster = e.v;
311320
edge2.toCluster = e.v;
312321

‎packages/mermaid/src/rendering-util/layout-algorithms/dagre/index.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,14 +346,19 @@ export const render = async (data4Layout, svg) => {
346346
edge1.label = '';
347347
edge1.arrowTypeEnd = 'none';
348348
edge1.endLabelLeft = '';
349+
edge1.endLabelRight = ''; // defensive
350+
edge1.startLabelLeft = ''; // defensive
349351
edge1.id = nodeId + '-cyclic-special-1';
350352
edgeMid.startLabelRight = '';
353+
edgeMid.startLabelLeft = ''; // defensive
351354
edgeMid.endLabelLeft = '';
355+
edgeMid.endLabelRight = ''; // defensive
352356
edgeMid.arrowTypeStart = 'none';
353357
edgeMid.arrowTypeEnd = 'none';
354358
edgeMid.id = nodeId + '-cyclic-special-mid';
355359
edge2.label = '';
356360
edge2.startLabelRight = '';
361+
edge2.startLabelLeft = ''; // defensive
357362
edge2.arrowTypeStart = 'none';
358363
if (node.isGroup) {
359364
edge1.fromCluster = nodeId;

0 commit comments

Comments
 (0)