marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-18 06:49:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

#5237 fix for node duplication

Browse Source
This commit is contained in:
Ashish Jain
2024-05-03 12:50:02 +02:00
parent 913b29dbcb
commit 5e53d6cfee
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cypress/platform/knsv2.html
View File

@@ -74,8 +74,13 @@
<body>
<pre id="diagram" class="mermaid">
stateDiagram-v2
Chimp --> Gorilla
Chimp --> Bonobo
[*] --> First
state First {
[*] --> second
second --> [*]
}
</pre
>

19
packages/mermaid/src/diagrams/state/stateDb.js
View File

@@ -716,7 +716,12 @@ const dataFetcher = (parent, parsedItem, diagramStates, nodes, edges, altFlag, u
//add parent id to noteData
noteData.parentId = parentId;
nodes.push(groupData, noteData, nodeData);
//insert groupData
insertOrUpdateNode(nodes, groupData);
//insert noteData
insertOrUpdateNode(nodes, noteData);
//insert nodeData
insertOrUpdateNode(nodes, nodeData);
let from = itemId;
let to = noteData.id;
@@ -742,7 +747,7 @@ const dataFetcher = (parent, parsedItem, diagramStates, nodes, edges, altFlag, u
useRough,
});
} else {
nodes.push(nodeData);
insertOrUpdateNode(nodes, nodeData);
}
console.log('Nodes:', nodes);
@@ -753,6 +758,16 @@ const dataFetcher = (parent, parsedItem, diagramStates, nodes, edges, altFlag, u
}
};
function insertOrUpdateNode(nodes, nodeData) {
const existingNodeData = nodes.find((node) => node.id === nodeData.id);
if (existingNodeData) {
//update the existing nodeData
Object.assign(existingNodeData, nodeData);
} else {
nodes.push(nodeData);
}
}
/**
* Create a standard string for the dom ID of an item.
* If a type is given, insert that before the counter, preceded by the type spacer

2
packages/mermaid/src/diagrams/state/stateRenderer-v3-unified.ts
View File

@@ -88,7 +88,7 @@ export const draw = async function (text: string, id: string, _version: string,
data4Layout.type = diag.type;
data4Layout.layoutAlgorithm = 'dagre-wrapper';
// data4Layout.layoutAlgorithm = 'elk';
//data4Layout.layoutAlgorithm = 'elk';
data4Layout.direction = DIR;
data4Layout.nodeSpacing = conf.nodeSpacing || 50;
data4Layout.rankSpacing = conf.rankSpacing || 50;