GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-28 07:03:17 +08:00
Code Issues Projects Releases Wiki Activity

#5237 fix for duplicate nodes for join fork

Browse Source
This commit is contained in:
Ashish Jain 2024-05-08 09:43:01 +02:00
parent 7529db8254
commit fbe13f4e9e
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -754,6 +754,9 @@ const dataFetcher = (parent, parsedItem, diagramStates, nodes, edges, altFlag, u
* @param nodeData * @param nodeData
*/ */
function insertOrUpdateNode(nodes, nodeData) { function insertOrUpdateNode(nodes, nodeData) {
if (!nodeData.id || nodeData.id === '</join></fork>') {
return;
}
const existingNodeData = nodes.find((node) => node.id === nodeData.id); const existingNodeData = nodes.find((node) => node.id === nodeData.id);
if (existingNodeData) { if (existingNodeData) {
//update the existing nodeData //update the existing nodeData

17
packages/mermaid/src/rendering-util/types.d.ts vendored
View File

@ -13,13 +13,15 @@ interface Node {
label?: string; label?: string;
parentId?: string; parentId?: string;
position?: string; position?: string;
styles?: string; styles?: string; // Pick one, don't need both `styles` & `style`, or have (nodeStyle + labelStyle)
classes?: string; style?: string;
classes?: string; // Pick one `classes` vs `class`
class?: string;
// Flowchart specific properties // Flowchart specific properties
labelType?: string; labelType?: string; // Always use markdown string?
domId: string; domId: string;
// Rendering specific properties for both Flowchart and State Diagram nodes // Rendering specific properties for both Flowchart and State Diagram nodes
dir?: string; dir?: string; // Only relevant for isGroup true, i.e. a sub-graph or composite state.
haveCallback?: boolean; haveCallback?: boolean;
labelStyle?: string; labelStyle?: string;
labelText?: string; labelText?: string;
@ -31,15 +33,14 @@ interface Node {
ry?: number; ry?: number;
shape?: string; shape?: string;
tooltip?: string; tooltip?: string;
type: string; type: string; // replace with isGroup: boolean, default false
width?: number; width?: number;
height?: number; height?: number;
// Specific properties for State Diagram nodes TODO remove and use generic properties // Specific properties for State Diagram nodes TODO remove and use generic properties
intersect?: (point: any) => any; intersect?: (point: any) => any;
style?: string;
class?: string; borders?: string; //Maybe have it similar to nodeStyle, labelStyle, have it as borderStyle (check the usage)
borders?: string;
useRough?: boolean; useRough?: boolean;
} }