From 309ff6be3818cc3a5f49f7dec6782f5ae6ffb738 Mon Sep 17 00:00:00 2001 From: kairi003 Date: Sun, 10 Nov 2024 02:02:55 +0900 Subject: [PATCH] fix: Reimplement notes in namespaces for classRenderer-v3 (#5880) --- packages/mermaid/src/diagrams/class/classDb.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/mermaid/src/diagrams/class/classDb.ts b/packages/mermaid/src/diagrams/class/classDb.ts index e15103469a..38281f94e7 100644 --- a/packages/mermaid/src/diagrams/class/classDb.ts +++ b/packages/mermaid/src/diagrams/class/classDb.ts @@ -126,7 +126,7 @@ export const lookUpDomId = function (_id: string): string { export const clear = function () { relations = []; classes = new Map(); - notes = []; + notes = new Map(); interfaces = []; functions = []; functions.push(setupToolTips); @@ -629,9 +629,7 @@ export const getData = () => { } } - let cnt = 0; - for (const note of notes) { - cnt++; + for (const note of notes.values()) { const noteNode: Node = { id: note.id, label: note.text, @@ -645,14 +643,15 @@ export const getData = () => { `stroke: ${config.themeVariables.noteBorderColor}`, ], look: config.look, + parentId: note.parent, }; nodes.push(noteNode); - const noteClassId = classes.get(note.class)?.id ?? ''; + const noteClassId = classes.get(note.class)?.id; if (noteClassId) { const edge: Edge = { - id: `edgeNote${cnt}`, + id: `edgeNote${note.index}`, start: note.id, end: noteClassId, type: 'normal', @@ -682,7 +681,7 @@ export const getData = () => { nodes.push(interfaceNode); } - cnt = 0; + let cnt = 0; for (const classRelation of relations) { cnt++; const edge: Edge = {