#5237 Recusive structuture refactoring for subgraphs

mermaid-js · May 3, 2024 · b2c286f · b2c286f
1 parent 024bffd
commit b2c286f
Show file tree

Hide file tree

Showing 5 changed files with 243 additions and 168 deletions.
diff --git a/cypress/platform/knsv2.html b/cypress/platform/knsv2.html
@@ -74,19 +74,24 @@
   <body>
     <pre id="diagram" class="mermaid">
 stateDiagram-v2
-    [*] --> First
+    Chimp --> A
+
+  </pre
+    >
+    <pre id="diagram" class="mermaid2">
+stateDiagram-v2
     state First {
-        [*] --> second
-        second --> [*]
+second --> third
     }
-
-
-
   </pre
     >
     <pre id="diagram" class="mermaid2">
 stateDiagram-v2
-       Second
+    [*] --> First
+    state First {
+        [*] --> second
+        second --> [*]
+    }
   </pre
     >
     <pre id="diagram" class="mermaid2">

diff --git a/packages/mermaid/src/diagrams/state/stateDb.js b/packages/mermaid/src/diagrams/state/stateDb.js
@@ -574,16 +574,6 @@ const setDirection = (dir) => {
 const trimColon = (str) => (str && str[0] === ':' ? str.substr(1).trim() : str.trim());
 
 const dataFetcher = (parent, parsedItem, diagramStates, nodes, edges, altFlag, useRough) => {
-  console.log(
-    'abc88 parent, parsedItemm, diagramStates, nodes, edges, altFlag, useRough:',
-    parent,
-    parsedItem,
-    diagramStates,
-    nodes,
-    edges,
-    altFlag,
-    useRough
-  );
   const itemId = parsedItem.id;
   const classStr = getClassesFromDbInfo(diagramStates[itemId]);
 
@@ -758,6 +748,11 @@ const dataFetcher = (parent, parsedItem, diagramStates, nodes, edges, altFlag, u
   }
 };
 
+/**
+ *
+ * @param nodes
+ * @param nodeData
+ */
 function insertOrUpdateNode(nodes, nodeData) {
   const existingNodeData = nodes.find((node) => node.id === nodeData.id);
   if (existingNodeData) {

diff --git a/packages/mermaid/src/diagrams/state/stateRenderer-v3-unified.ts b/packages/mermaid/src/diagrams/state/stateRenderer-v3-unified.ts
@@ -87,8 +87,8 @@ export const draw = async function (text: string, id: string, _version: string,
   // performRender(data4Rendering);
 
   data4Layout.type = diag.type;
-  data4Layout.layoutAlgorithm = 'dagre-wrapper';
-  //data4Layout.layoutAlgorithm = 'elk';
+  // data4Layout.layoutAlgorithm = 'dagre-wrapper';
+  data4Layout.layoutAlgorithm = 'elk';
   data4Layout.direction = DIR;
   data4Layout.nodeSpacing = conf.nodeSpacing || 50;
   data4Layout.rankSpacing = conf.rankSpacing || 50;