#4967 Reverting optimimization that breaks subgraphs

2023-10-20 11:12:56 +02:00 · 2023-10-20 11:12:56 +02:00 · 61bc293a95
parent d1b386b5c9
commit 61bc293a95
2 changed files with 10 additions and 2 deletions
--- a/cypress/platform/knsv2.html
+++ b/cypress/platform/knsv2.html
@ -58,8 +58,10 @@
  </head>
  <body>
    <pre id="diagram" class="mermaid">
-      classDiagram
-  `Class<img src=x onerror=alert(1)>` <|-- `Class2<img src=x onerror=alert(2)>`
+flowchart-elk LR
+   subgraph example
+     node
+   end
    </pre>
    <pre id="diagram" class="mermaid2">
 flowchart
--- a/packages/mermaid/src/diagrams/flowchart/elk/flowRenderer-elk.js
+++ b/packages/mermaid/src/diagrams/flowchart/elk/flowRenderer-elk.js
@ -803,8 +803,14 @@ const insertChildren = (nodeArray, parentLookupDb) => {
 */

 export const draw = async function (text, id, _version, diagObj) {
+  // Add temporary render element
+  diagObj.db.clear();
  nodeDb = {};
  portPos = {};
+  diagObj.db.setGen('gen-2');
+  // Parse the graph definition
+  diagObj.parser.parse(text);
+
  const renderEl = select('body').append('div').attr('style', 'height:400px').attr('id', 'cy');
  let graph = {
    id: 'root',