Merge branch 'develop' into layout-v3

Pausing POC
Renderer for flowcharts using cytoscape, WIP
2025-08-16 23:09:28 +02:00 · 2022-09-14 10:32:25 +02:00 · 2022-09-14 10:27:30 +02:00 · 2022-09-13 17:41:43 +02:00
35 changed files with 897 additions and 64 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -63,13 +63,6 @@
      "rules": {
        "no-console": "off"
      }
-    },
-    {
-      "files": ["./**/*.spec.{ts,js}", "./cypress/**", "./demos/**", "./**/docs/**"],
-      "rules": {
-        "jsdoc/require-jsdoc": "off",
-        "@typescript-eslint/no-unused-vars": "off"
-      }
    }
  ]
 }
--- a/cypress/platform/cyto.html
+++ b/cypress/platform/cyto.html
@@ -0,0 +1,92 @@
+<html>
+  <head>
+    <link href="https://fonts.googleapis.com/css?family=Montserrat&display=swap" rel="stylesheet" />
+    <link href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css" rel="stylesheet" />
+    <link
+      rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"
+    />
+    <link
+      href="https://fonts.googleapis.com/css?family=Noto+Sans+SC&display=swap"
+      rel="stylesheet"
+    />
+    <style>
+      body {
+        /* background: rgb(221, 208, 208); */
+        /* background:#333; */
+        font-family: 'Arial';
+        /* font-size: 18px !important; */
+        width: 100%;
+        /* display: flex; */
+        /* flex-direction: column; */
+        margin-left: 20px;
+      }
+      h1 {
+        color: grey;
+      }
+      .mermaid2,
+      .mermaid3 {
+        display: none;
+      }
+      .mermaid {
+      }
+      .mermaid svg {
+        border: 1px solid purple;
+        /* font-size: 18px !important; */
+        /* fontfamily: 'courier'; */
+      }
+      #cy {
+        width: 300px;
+        height: 300px;
+        display: block;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="cy"></div>
+    <pre class="mermaid" style="width: 50%">
+flowchart TD
+id1 --> id2--> id3[I am number 3 and I<br/>am a gigantic node<br/>am a gigantic node<br/>am a gigantic node<br/>am a gigantic node<br/>am a gigantic node]--> id4--> id5 --> id1
+id5 --> id4
+id5 --> id4
+    </pre>
+    <pre class="mermaid2" style="width: 50%">
+flowchart TD
+id1 --> id2--> id3
+id2 --> id1
+    </pre>
+    <script src="./mermaid.js"></script>
+    <script>
+      mermaid.parseError = function (err, hash) {
+        // console.error('Mermaid error: ', err);
+      };
+      mermaid.initialize({
+        maxTextSize: 900000,
+        startOnLoad: true,
+        securityLevel: 'loose',
+        logLevel: 0,
+        fontFamily: 'courier',
+        flowchart: {
+          // curve: 'curveLinear',
+          useMaxWidth: true,
+          htmlLabels: false,
+          fontFamily: 'courier',
+          defaultRenderer: 'cytoscape',
+          // defaultRenderer: 'dagre-wrapper',
+        },
+      });
+      function callback() {
+        alert('It worked');
+      }
+
+      function clickByFlow(elemName) {
+        const div = document.createElement('div');
+        div.className = 'created-by-click';
+        div.style = 'padding: 20px; background: green; color: white;';
+        div.innerText = 'Clicked By Flow';
+
+        document.getElementsByTagName('body')[0].appendChild(div);
+      }
+    </script>
+  </body>
+</html>
--- a/cypress/platform/knsv.html
+++ b/cypress/platform/knsv.html
@@ -38,7 +38,7 @@
    </style>
  </head>
  <body>
-    <pre class="mermaid" style="width: 50%">
+    <pre class="mermaid2" style="width: 50%">
 flowchart LR
  classDef aPID stroke:#4e4403,fill:#fdde29,color:#4e4403,rx:5px,ry:5px;
  classDef crm stroke:#333333,fill:#DCDCDC,color:#333333,rx:5px,ry:5px;
@@ -71,10 +71,12 @@ flowchart TD
    end
    end
    </pre>
+    --> id2 --> id3(I have a long text) --> id4 --> id5 --> id1
    <pre class="mermaid" style="width: 50%">
 flowchart TD
-id
+id1
    </pre>
+    <pre id="cy" style="width: 50%"></pre>
    <pre class="mermaid2" style="width: 50%">
 flowchart LR
        a["<strong>Haiya</strong>"]===>b
@@ -99,7 +101,7 @@ flowchart TD
      class A someclass;
      class C someclass;
    </pre>
-    <pre class="mermaid" style="width: 50%">
+    <pre class="mermaid2" style="width: 50%">
   sequenceDiagram
      title: My Sequence Diagram Title
      accTitle: My Acc Sequence Diagram
@@ -109,14 +111,14 @@ flowchart TD
      John-->>Alice: Great!
      Alice-)John: See you later!
    </pre>
-    <pre class="mermaid" style="width: 50%">
+    <pre class="mermaid2" style="width: 50%">
 graph TD
    A -->|000| B
    B -->|111| C

    linkStyle 1 stroke:#ff3,stroke-width:4px,color:red;
    </pre>
-    <pre class="mermaid" style="width: 100%">
+    <pre class="mermaid2" style="width: 100%">
  journey
      accTitle: My User Journey Diagram
      accDescr: My User Journey Diagram Description
@@ -130,10 +132,10 @@ graph TD
        Go downstairs: 5: Me
        Sit down: 5: Me
    </pre>
-    <pre class="mermaid" style="width: 100%">
+    <pre class="mermaid2" style="width: 100%">
        info
    </pre>
-    <pre class="mermaid" style="width: 100%">
+    <pre class="mermaid2" style="width: 100%">
 requirementDiagram
      accTitle: My req Diagram
      accDescr: My req Diagram Description
@@ -174,7 +176,7 @@ requirementDiagram
    test_req - contains -> test_req3
    test_req <- copies - test_entity2
    </pre>
-    <pre class="mermaid" style="width: 100%">
+    <pre class="mermaid2" style="width: 100%">
 gantt
    dateFormat  YYYY-MM-DD
    title       Adding GANTT diagram functionality to mermaid
@@ -206,7 +208,7 @@ gantt
    Add gantt diagram to demo page      :20h
    Add another diagram to demo page    :48h
    </pre>
-    <pre class="mermaid" style="width: 100%">
+    <pre class="mermaid2" style="width: 100%">
 stateDiagram
  state Active {
    Idle
@@ -234,7 +236,7 @@ stateDiagram
          end
          B ->> A: Return
    </pre>
-    <pre class="mermaid" style="width: 100%">
+    <pre class="mermaid2" style="width: 100%">
 classDiagram
 accTitle: My class diagram
 accDescr: My class diagram Description
@@ -259,7 +261,7 @@ class Class10 {
        A->>Bob: Hola
        Bob-->A: Pasten !
    </pre>
-    <pre class="mermaid" style="width: 100%">
+    <pre class="mermaid2" style="width: 100%">
      gitGraph
       commit id: "ZERO"
       branch develop
@@ -288,7 +290,7 @@ flowchart TD
      C -->|Two| E[iPhone]
      C -->|Three| F[fa:fa-car Car]
    </pre>
-    <pre class="mermaid" style="width: 100%">
+    <pre class="mermaid2" style="width: 100%">
        classDiagram
          Animal "1" <|-- Duck
          Animal <|-- Fish
@@ -311,7 +313,7 @@ flowchart TD
            +run()
          }
    </pre>
-    <pre class="mermaid" style="width: 100%">
+    <pre class="mermaid2" style="width: 100%">
        erDiagram
    CAR ||--o{ NAMED-DRIVER : allows
    CAR {
@@ -343,6 +345,8 @@ flowchart TD
          useMaxWidth: true,
          htmlLabels: false,
          fontFamily: 'courier',
+          defaultRenderer: 'cytoscape',
+          // defaultRenderer: 'dagre-wrapper',
        },
      });
      function callback() {
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
  },
  "dependencies": {
    "@braintree/sanitize-url": "^6.0.0",
+    "cytoscape": "^3.23.0",
    "d3": "^7.0.0",
    "dagre": "^0.8.5",
    "dagre-d3": "^0.6.4",
--- a/src/dagre-wrapper/createLabel.js
+++ b/src/dagre-wrapper/createLabel.js
@@ -1,9 +1,11 @@
 import { select } from 'd3';
 import { log } from '../logger';
 import { getConfig } from '../config';
-import { evaluate } from '../diagrams/common/common';
+import { sanitizeText, evaluate } from '../diagrams/common/common';
 import { decodeEntities } from '../mermaidAPI';

+const sanitizeTxt = (txt) => sanitizeText(txt, getConfig());
+
 /**
 * @param dom
 * @param styleFn
--- a/src/dagre-wrapper/nodes.js
+++ b/src/dagre-wrapper/nodes.js
@@ -6,7 +6,7 @@ import intersect from './intersect/index.js';
 import createLabel from './createLabel';
 import note from './shapes/note';
 import { parseMember } from '../diagrams/class/svgDraw';
-import { evaluate } from '../diagrams/common/common';
+import { evaluate, sanitizeText as sanitize } from '../diagrams/common/common';

 const question = (parent, node) => {
  const { shapeSvg, bbox } = labelHelper(parent, node, undefined, true);
@@ -346,7 +346,7 @@ const rect = (parent, node) => {
 };

 const labelRect = (parent, node) => {
-  const { shapeSvg } = labelHelper(parent, node, 'label', true);
+  const { shapeSvg, bbox, halfPadding } = labelHelper(parent, node, 'label', true);

  log.trace('Classes = ', node.classes);
  // add the rect
@@ -1062,6 +1062,7 @@ export const insertNode = (elem, node, dir) => {
  if (node.haveCallback) {
    nodeElems[node.id].attr('class', nodeElems[node.id].attr('class') + ' clickable');
  }
+  return newEl;
 };
 export const setNodeElem = (elem, node) => {
  nodeElems[node.id] = elem;
--- a/src/diagram-api/diagram-orchestration.ts
+++ b/src/diagram-api/diagram-orchestration.ts
@@ -41,9 +41,11 @@ import erStyles from '../diagrams/er/styles';
 import flowParser from '../diagrams/flowchart/parser/flow';
 import { flowDetector } from '../diagrams/flowchart/flowDetector';
 import { flowDetectorV2 } from '../diagrams/flowchart/flowDetector-v2';
+import { flowDetectorV3 } from '../diagrams/flowchart/flowDetector-v3';
 import flowDb from '../diagrams/flowchart/flowDb';
 import flowRenderer from '../diagrams/flowchart/flowRenderer';
 import flowRendererV2 from '../diagrams/flowchart/flowRenderer-v2';
+import flowRendererV3 from '../diagrams/flowchart/flowRenderer-v3';
 import flowStyles from '../diagrams/flowchart/styles';

 // @ts-ignore: TODO Fix ts errors
@@ -305,6 +307,20 @@ export const addDiagrams = () => {
    },
    flowDetectorV2
  );
+  registerDiagram(
+    'flowchart-v3',
+    {
+      parser: flowParser,
+      db: flowDb,
+      renderer: flowRendererV3,
+      styles: flowStyles,
+      init: () => {
+        flowDb.clear();
+        flowDb.setGen('gen-3');
+      },
+    },
+    flowDetectorV3
+  );
  registerDiagram(
    'gitGraph',
    { parser: gitGraphParser, db: gitGraphDb, renderer: gitGraphRenderer, styles: gitGraphStyles },
--- a/src/diagrams/c4/c4Db.js
+++ b/src/diagrams/c4/c4Db.js
@@ -1,5 +1,6 @@
 import mermaidAPI from '../../mermaidAPI';
 import * as configApi from '../../config';
+import { log } from '../../logger';
 import { sanitizeText } from '../common/common';
 import { setAccTitle, getAccTitle, getAccDescription, setAccDescription } from '../../commonDb';

@@ -20,6 +21,7 @@ let boundarys = [
 let rels = [];
 let title = '';
 let wrapEnabled = false;
+let description = '';
 let c4ShapeInRow = 4;
 let c4BoundaryInRow = 2;
 var c4Type;
@@ -634,13 +636,13 @@ export const updateLayoutConfig = function (typeC4Shape, c4ShapeInRowParam, c4Bo
  let c4BoundaryInRowValue = c4BoundaryInRow;

  if (typeof c4ShapeInRowParam === 'object') {
-    const value = Object.values(c4ShapeInRowParam)[0];
+    let [key, value] = Object.entries(c4ShapeInRowParam)[0];
    c4ShapeInRowValue = parseInt(value);
  } else {
    c4ShapeInRowValue = parseInt(c4ShapeInRowParam);
  }
  if (typeof c4BoundaryInRowParam === 'object') {
-    const value = Object.values(c4BoundaryInRowParam)[0];
+    let [key, value] = Object.entries(c4BoundaryInRowParam)[0];
    c4BoundaryInRowValue = parseInt(value);
  } else {
    c4BoundaryInRowValue = parseInt(c4BoundaryInRowParam);
@@ -719,6 +721,7 @@ export const clear = function () {
  boundaryParseStack = [''];
  title = '';
  wrapEnabled = false;
+  description = '';
  c4ShapeInRow = 4;
  c4BoundaryInRow = 2;
 };
--- a/src/diagrams/c4/c4Renderer.js
+++ b/src/diagrams/c4/c4Renderer.js
@@ -1,5 +1,5 @@
 import { select } from 'd3';
-import svgDraw from './svgDraw';
+import svgDraw, { drawText, fixLifeLineHeights } from './svgDraw';
 import { log } from '../../logger';
 import { parser } from './parser/c4Diagram';
 import common from '../common/common';
@@ -298,7 +298,7 @@ export const drawC4ShapeArray = function (currentBounds, diagram, c4ShapeArray,

    currentBounds.insert(c4Shape);

-    svgDraw.drawC4Shape(diagram, c4Shape, conf);
+    const height = svgDraw.drawC4Shape(diagram, c4Shape, conf);
  }

  currentBounds.bumpLastMargin(conf.c4ShapeMargin);
@@ -616,6 +616,7 @@ export const draw = function (_text, id, _version, diagObj) {
  globalBoundaryMaxY = conf.diagramMarginY;

  const title = diagObj.db.getTitle();
+  const c4type = diagObj.db.getC4Type();
  let currentBoundarys = diagObj.db.getBoundarys('');
  // switch (c4type) {
  //   case 'C4Context':
--- a/src/diagrams/c4/svgDraw.js
+++ b/src/diagrams/c4/svgDraw.js
@@ -1,4 +1,5 @@
 import common from '../common/common';
+import { addFunction } from '../../interactionDb';
 import { sanitizeUrl } from '@braintree/sanitize-url';

 export const drawRect = function (elem, rectData) {
--- a/src/diagrams/class/classRenderer-v2.js
+++ b/src/diagrams/class/classRenderer-v2.js
@@ -3,6 +3,7 @@ import graphlib from 'graphlib';
 import { log } from '../../logger';
 import { getConfig } from '../../config';
 import { render } from '../../dagre-wrapper/index.js';
+// import addHtmlLabel from 'dagre-d3/lib/label/add-html-label.js';
 import { curveLinear } from 'd3';
 import { interpolateToCurve, getStylesFromArray } from '../../utils';
 import { setupGraphViewbox } from '../../setupGraphViewbox';
@@ -10,6 +11,7 @@ import common from '../common/common';
 import addSVGAccessibilityFields from '../../accessibility';

 let idCache = {};
+const padding = 20;

 const sanitizeText = (txt) => common.sanitizeText(txt, getConfig());

@@ -233,6 +235,20 @@ export const addRelations = function (relations, g) {
  });
 };

+/**
+ * Gets the ID with the same label as in the cache
+ *
+ * @param {string} label The label to look for
+ * @returns {string} The resulting ID
+ */
+const getGraphId = function (label) {
+  const foundEntry = Object.entries(idCache).find((entry) => entry[1].label === label);
+
+  if (foundEntry) {
+    return foundEntry[0];
+  }
+};
+
 /**
 * Merges the value of `conf` with the passed `cnf`
 *
--- a/src/diagrams/class/classRenderer.js
+++ b/src/diagrams/class/classRenderer.js
@@ -10,6 +10,12 @@ import addSVGAccessibilityFields from '../../accessibility';
 let idCache = {};
 const padding = 20;

+const confa = {
+  dividerMargin: 10,
+  padding: 5,
+  textHeight: 10,
+};
+
 /**
 * Gets the ID with the same label as in the cache
 *
@@ -157,6 +163,7 @@ export const draw = function (text, id, _version, diagObj) {
    securityLevel === 'sandbox'
      ? select(sandboxElement.nodes()[0].contentDocument.body)
      : select('body');
+  const doc = securityLevel === 'sandbox' ? sandboxElement.nodes()[0].contentDocument : document;

  // Fetch the default direction, use TD if none was found
  const diagram = root.select(`[id='${id}']`);
--- a/src/diagrams/er/erDb.js
+++ b/src/diagrams/er/erDb.js
@@ -1,7 +1,7 @@
 import { log } from '../../logger';
 import mermaidAPI from '../../mermaidAPI';
 import * as configApi from '../../config';
-
+import common from '../common/common';
 import {
  setAccTitle,
  getAccTitle,
@@ -12,6 +12,8 @@ import {

 let entities = {};
 let relationships = [];
+let title = '';
+let description = '';

 const Cardinality = {
  ZERO_OR_ONE: 'ZERO_OR_ONE',
@@ -76,6 +78,7 @@ const getRelationships = () => relationships;
 const clear = function () {
  entities = {};
  relationships = [];
+  title = '';
  commonClear();
 };

--- a/src/diagrams/flowchart/flowDetector-v2.ts
+++ b/src/diagrams/flowchart/flowDetector-v2.ts
@@ -1,8 +1,23 @@
 import type { DiagramDetector } from '../../diagram-api/detectType';
-
+import { log } from '../../diagram-api/diagramAPI';
 export const flowDetectorV2: DiagramDetector = (txt, config) => {
+  log.info('Config in flowDetector-v2 defaultRenderer: ', config?.flowchart?.defaultRenderer);
+
+  // If we have confgured to use cytoscape then we should always return false here
+  if (config?.flowchart?.defaultRenderer === 'cytoscape') {
+    log.info('flowDetector-v2 returning false');
+    return false;
+  } else {
+    log.info('flowDetector-v2 not cytoscape');
+  }
+
  // If we have confgured to use dagre-wrapper then we should return true in this function for graph code thus making it use the new flowchart diagram
  if (config?.flowchart?.defaultRenderer === 'dagre-wrapper' && txt.match(/^\s*graph/) !== null)
    return true;
+  log.info('Config in flowDetector-v2 returning', txt.match(/^\s*flowchart/) !== null);
  return txt.match(/^\s*flowchart/) !== null;
 };
+
+/*
+if (((_a = config === null || config === void 0 ? void 0 : config.flowchart) === null || _a === void 0 ? void 0 : _a.defaultRenderer) === 'dagre-wrapper1' && txt.match(/^\s*graph/) !== null)
+*/
--- a/src/diagrams/flowchart/flowDetector-v3.ts
+++ b/src/diagrams/flowchart/flowDetector-v3.ts
@@ -0,0 +1,8 @@
+import type { DiagramDetector } from '../../diagram-api/detectType';
+
+export const flowDetectorV3: DiagramDetector = (txt, config) => {
+  // If we have confgured to use dagre-wrapper then we should return true in this function for graph code thus making it use the new flowchart diagram
+  if (config?.flowchart?.defaultRenderer === 'cytoscape' && txt.match(/^\s*graph/) !== null)
+    return true;
+  return txt.match(/^\s*flowchart/) !== null;
+};
--- a/src/diagrams/flowchart/flowRenderer-v2.js
+++ b/src/diagrams/flowchart/flowRenderer-v2.js
@@ -12,7 +12,7 @@ import { interpolateToCurve, getStylesFromArray } from '../../utils';
 import { setupGraphViewbox } from '../../setupGraphViewbox';
 import addSVGAccessibilityFields from '../../accessibility';

-const conf = {};
+let conf = {};
 export const setConf = function (cnf) {
  const keys = Object.keys(cnf);
  for (let i = 0; i < keys.length; i++) {
@@ -351,6 +351,7 @@ export const getClasses = function (text, diagObj) {
 */

 export const draw = function (text, id, _version, diagObj) {
+  // const conf = config.getConfig(_version);
  log.info('Drawing flowchart');
  diagObj.db.clear();
  flowDb.setGen('gen-2');
--- a/src/diagrams/flowchart/flowRenderer-v3.js
+++ b/src/diagrams/flowchart/flowRenderer-v3.js
@@ -0,0 +1,549 @@
+import graphlib from 'graphlib';
+import { select, curveLinear, selectAll } from 'd3';
+
+import flowDb from './flowDb';
+import { getConfig } from '../../config';
+import { insertNode } from '../../dagre-wrapper/nodes.js';
+import { render } from '../../dagre-wrapper/index.js';
+import addHtmlLabel from 'dagre-d3/lib/label/add-html-label.js';
+import { log } from '../../logger';
+import common, { evaluate } from '../common/common';
+import { interpolateToCurve, getStylesFromArray } from '../../utils';
+import { setupGraphViewbox } from '../../setupGraphViewbox';
+import addSVGAccessibilityFields from '../../accessibility';
+
+import cytoscape from 'cytoscape';
+
+const conf = {};
+export const setConf = function (cnf) {
+  const keys = Object.keys(cnf);
+  for (let i = 0; i < keys.length; i++) {
+    conf[keys[i]] = cnf[keys[i]];
+  }
+};
+
+// /**
+//  * Function that adds the vertices found during parsing to the graph to be rendered.
+//  *
+//  * @param vert Object containing the vertices.
+//  * @param g The graph that is to be drawn.
+//  * @param svgId
+//  * @param root
+//  * @param doc
+//  * @param diagObj
+//  */
+export const addVertices = function (vert, cy, svgId, root, doc, diagObj) {
+  const svg = root.select(`[id="${svgId}"]`);
+  const nodes = svg.insert('g').attr('class', 'nodes');
+  const keys = Object.keys(vert);
+
+  // Iterate through each item in the vertex object (containing all the vertices found) in the graph definition
+  keys.forEach(function (id) {
+    const vertex = vert[id];
+
+    /**
+     * Variable for storing the classes for the vertex
+     *
+     * @type {string}
+     */
+    let classStr = 'default';
+    if (vertex.classes.length > 0) {
+      classStr = vertex.classes.join(' ');
+    }
+
+    const styles = getStylesFromArray(vertex.styles);
+
+    // Use vertex id as text in the box if no text is provided by the graph definition
+    let vertexText = vertex.text !== undefined ? vertex.text : vertex.id;
+
+    // We create a SVG label, either by delegating to addHtmlLabel or manually
+    let vertexNode;
+    if (evaluate(getConfig().flowchart.htmlLabels)) {
+      // TODO: addHtmlLabel accepts a labelStyle. Do we possibly have that?
+      const node = {
+        label: vertexText.replace(
+          /fa[lrsb]?:fa-[\w-]+/g,
+          (s) => `<i class='${s.replace(':', ' ')}'></i>`
+        ),
+      };
+      vertexNode = addHtmlLabel(svg, node).node();
+      vertexNode.parentNode.removeChild(vertexNode);
+    } else {
+      const svgLabel = doc.createElementNS('http://www.w3.org/2000/svg', 'text');
+      svgLabel.setAttribute('style', styles.labelStyle.replace('color:', 'fill:'));
+
+      const rows = vertexText.split(common.lineBreakRegex);
+
+      for (let j = 0; j < rows.length; j++) {
+        const tspan = doc.createElementNS('http://www.w3.org/2000/svg', 'tspan');
+        tspan.setAttributeNS('http://www.w3.org/XML/1998/namespace', 'xml:space', 'preserve');
+        tspan.setAttribute('dy', '1em');
+        tspan.setAttribute('x', '1');
+        tspan.textContent = rows[j];
+        svgLabel.appendChild(tspan);
+      }
+      vertexNode = svgLabel;
+    }
+
+    let radious = 0;
+    let _shape = '';
+    // Set the shape based parameters
+    switch (vertex.type) {
+      case 'round':
+        radious = 5;
+        _shape = 'rect';
+        break;
+      case 'square':
+        _shape = 'rect';
+        break;
+      case 'diamond':
+        _shape = 'question';
+        break;
+      case 'hexagon':
+        _shape = 'hexagon';
+        break;
+      case 'odd':
+        _shape = 'rect_left_inv_arrow';
+        break;
+      case 'lean_right':
+        _shape = 'lean_right';
+        break;
+      case 'lean_left':
+        _shape = 'lean_left';
+        break;
+      case 'trapezoid':
+        _shape = 'trapezoid';
+        break;
+      case 'inv_trapezoid':
+        _shape = 'inv_trapezoid';
+        break;
+      case 'odd_right':
+        _shape = 'rect_left_inv_arrow';
+        break;
+      case 'circle':
+        _shape = 'circle';
+        break;
+      case 'ellipse':
+        _shape = 'ellipse';
+        break;
+      case 'stadium':
+        _shape = 'stadium';
+        break;
+      case 'subroutine':
+        _shape = 'subroutine';
+        break;
+      case 'cylinder':
+        _shape = 'cylinder';
+        break;
+      case 'group':
+        _shape = 'rect';
+        break;
+      case 'doublecircle':
+        _shape = 'doublecircle';
+        break;
+      default:
+        _shape = 'rect';
+    }
+    // // Add the node
+    const node = {
+      labelStyle: styles.labelStyle,
+      shape: _shape,
+      labelText: vertexText,
+      rx: radious,
+      ry: radious,
+      class: classStr,
+      style: styles.style,
+      id: vertex.id,
+      link: vertex.link,
+      linkTarget: vertex.linkTarget,
+      tooltip: diagObj.db.getTooltip(vertex.id) || '',
+      domId: diagObj.db.lookUpDomId(vertex.id),
+      haveCallback: vertex.haveCallback,
+      width: vertex.type === 'group' ? 500 : undefined,
+      dir: vertex.dir,
+      type: vertex.type,
+      props: vertex.props,
+      padding: getConfig().flowchart.padding,
+    };
+    const nodeEl = insertNode(nodes, node, vertex.dir);
+    const boundingBox = nodeEl.node().getBBox();
+    cy.add({
+      group: 'nodes',
+      data: {
+        id: vertex.id,
+        labelStyle: styles.labelStyle,
+        shape: _shape,
+        labelText: vertexText,
+        rx: radious,
+        ry: radious,
+        class: classStr,
+        style: styles.style,
+        link: vertex.link,
+        linkTarget: vertex.linkTarget,
+        tooltip: diagObj.db.getTooltip(vertex.id) || '',
+        domId: diagObj.db.lookUpDomId(vertex.id),
+        haveCallback: vertex.haveCallback,
+        width: vertex.type === 'group' ? 500 : undefined,
+        dir: vertex.dir,
+        type: vertex.type,
+        props: vertex.props,
+        padding: getConfig().flowchart.padding,
+        boundingBox,
+        el: nodeEl,
+      },
+    });
+
+    log.trace('setNode', {
+      labelStyle: styles.labelStyle,
+      shape: _shape,
+      labelText: vertexText,
+      rx: radious,
+      ry: radious,
+      class: classStr,
+      style: styles.style,
+      id: vertex.id,
+      domId: diagObj.db.lookUpDomId(vertex.id),
+      width: vertex.type === 'group' ? 500 : undefined,
+      type: vertex.type,
+      dir: vertex.dir,
+      props: vertex.props,
+      padding: getConfig().flowchart.padding,
+    });
+  });
+};
+
+/**
+ * Add edges to graph based on parsed graph definition
+ *
+ * @param {object} edges The edges to add to the graph
+ * @param {object} g The graph object
+ * @param cy
+ * @param diagObj
+ */
+export const addEdges = function (edges, cy, diagObj) {
+  // log.info('abc78 edges = ', edges);
+  let cnt = 0;
+  let linkIdCnt = {};
+
+  let defaultStyle;
+  let defaultLabelStyle;
+
+  if (typeof edges.defaultStyle !== 'undefined') {
+    const defaultStyles = getStylesFromArray(edges.defaultStyle);
+    defaultStyle = defaultStyles.style;
+    defaultLabelStyle = defaultStyles.labelStyle;
+  }
+
+  edges.forEach(function (edge) {
+    cnt++;
+
+    // Identify Link
+    var linkIdBase = 'L-' + edge.start + '-' + edge.end;
+    // count the links from+to the same node to give unique id
+    if (typeof linkIdCnt[linkIdBase] === 'undefined') {
+      linkIdCnt[linkIdBase] = 0;
+      log.info('abc78 new entry', linkIdBase, linkIdCnt[linkIdBase]);
+    } else {
+      linkIdCnt[linkIdBase]++;
+      log.info('abc78 new entry', linkIdBase, linkIdCnt[linkIdBase]);
+    }
+    let linkId = linkIdBase + '-' + linkIdCnt[linkIdBase];
+    log.info('abc78 new link id to be used is', linkIdBase, linkId, linkIdCnt[linkIdBase]);
+    var linkNameStart = 'LS-' + edge.start;
+    var linkNameEnd = 'LE-' + edge.end;
+
+    const edgeData = { style: '', labelStyle: '' };
+    edgeData.minlen = edge.length || 1;
+    //edgeData.id = 'id' + cnt;
+
+    // Set link type for rendering
+    if (edge.type === 'arrow_open') {
+      edgeData.arrowhead = 'none';
+    } else {
+      edgeData.arrowhead = 'normal';
+    }
+
+    // Check of arrow types, placed here in order not to break old rendering
+    edgeData.arrowTypeStart = 'arrow_open';
+    edgeData.arrowTypeEnd = 'arrow_open';
+
+    /* eslint-disable no-fallthrough */
+    switch (edge.type) {
+      case 'double_arrow_cross':
+        edgeData.arrowTypeStart = 'arrow_cross';
+      case 'arrow_cross':
+        edgeData.arrowTypeEnd = 'arrow_cross';
+        break;
+      case 'double_arrow_point':
+        edgeData.arrowTypeStart = 'arrow_point';
+      case 'arrow_point':
+        edgeData.arrowTypeEnd = 'arrow_point';
+        break;
+      case 'double_arrow_circle':
+        edgeData.arrowTypeStart = 'arrow_circle';
+      case 'arrow_circle':
+        edgeData.arrowTypeEnd = 'arrow_circle';
+        break;
+    }
+
+    let style = '';
+    let labelStyle = '';
+
+    switch (edge.stroke) {
+      case 'normal':
+        style = 'fill:none;';
+        if (typeof defaultStyle !== 'undefined') {
+          style = defaultStyle;
+        }
+        if (typeof defaultLabelStyle !== 'undefined') {
+          labelStyle = defaultLabelStyle;
+        }
+        edgeData.thickness = 'normal';
+        edgeData.pattern = 'solid';
+        break;
+      case 'dotted':
+        edgeData.thickness = 'normal';
+        edgeData.pattern = 'dotted';
+        edgeData.style = 'fill:none;stroke-width:2px;stroke-dasharray:3;';
+        break;
+      case 'thick':
+        edgeData.thickness = 'thick';
+        edgeData.pattern = 'solid';
+        edgeData.style = 'stroke-width: 3.5px;fill:none;';
+        break;
+    }
+    if (typeof edge.style !== 'undefined') {
+      const styles = getStylesFromArray(edge.style);
+      style = styles.style;
+      labelStyle = styles.labelStyle;
+    }
+
+    edgeData.style = edgeData.style += style;
+    edgeData.labelStyle = edgeData.labelStyle += labelStyle;
+
+    if (typeof edge.interpolate !== 'undefined') {
+      edgeData.curve = interpolateToCurve(edge.interpolate, curveLinear);
+    } else if (typeof edges.defaultInterpolate !== 'undefined') {
+      edgeData.curve = interpolateToCurve(edges.defaultInterpolate, curveLinear);
+    } else {
+      edgeData.curve = interpolateToCurve(conf.curve, curveLinear);
+    }
+
+    if (typeof edge.text === 'undefined') {
+      if (typeof edge.style !== 'undefined') {
+        edgeData.arrowheadStyle = 'fill: #333';
+      }
+    } else {
+      edgeData.arrowheadStyle = 'fill: #333';
+      edgeData.labelpos = 'c';
+    }
+
+    edgeData.labelType = 'text';
+    edgeData.label = edge.text.replace(common.lineBreakRegex, '\n');
+
+    if (typeof edge.style === 'undefined') {
+      edgeData.style = edgeData.style || 'stroke: #333; stroke-width: 1.5px;fill:none;';
+    }
+
+    edgeData.labelStyle = edgeData.labelStyle.replace('color:', 'fill:');
+
+    edgeData.id = linkId;
+    edgeData.classes = 'flowchart-link ' + linkNameStart + ' ' + linkNameEnd;
+
+    // Add the edge to the graph
+    cy.add({ group: 'edges', data: { source: edge.start, target: edge.end, edgeData, id: cnt } });
+  });
+};
+
+/**
+ * Returns the all the styles from classDef statements in the graph definition.
+ *
+ * @param text
+ * @param diagObj
+ * @returns {object} ClassDef styles
+ */
+export const getClasses = function (text, diagObj) {
+  log.info('Extracting classes');
+  diagObj.db.clear();
+  try {
+    // Parse the graph definition
+    diagObj.parse(text);
+    return diagObj.db.getClasses();
+  } catch (e) {
+    return;
+  }
+};
+
+/**
+ * Draws a flowchart in the tag with id: id based on the graph definition in text.
+ *
+ * @param text
+ * @param id
+ */
+
+export const draw = function (text, id, _version, diagObj) {
+  return new Promise(function (resolve, reject) {
+    const cy = cytoscape({
+      // styleEnabled: false,
+      // animate: false,
+      // ready: function () {
+      //   log.info('Ready', this);
+      // },
+      container: document.getElementById('cy'), // container to render in
+
+      elements: [
+        // list of graph elements to start with
+        // { // node a
+        //   data: { id: 'a' }
+        // },
+        // { // node b
+        //   data: { id: 'b' }
+        // },
+        // { // edge ab
+        //   data: { id: 'ab', source: 'a', target: 'b' }
+        // }
+      ],
+
+      style: [
+        // the stylesheet for the graph
+        {
+          selector: 'node',
+          style: {
+            'background-color': '#666',
+            label: 'data(labelText)',
+          },
+        },
+
+        {
+          selector: 'edge',
+          style: {
+            width: 3,
+            'line-color': '#ccc',
+            'target-arrow-color': '#ccc',
+            'target-arrow-shape': 'triangle',
+            'curve-style': 'bezier',
+            label: 'data(id)',
+          },
+        },
+      ],
+
+      layout: {
+        name: 'breadthfirst',
+        rows: 1,
+      },
+    });
+    log.info('Drawing flowchart using v3 renderer');
+    // Fetch the default direction, use TD if none was found
+    let dir = diagObj.db.getDirection();
+    if (typeof dir === 'undefined') {
+      dir = 'TD';
+    }
+
+    const { securityLevel, flowchart: conf } = getConfig();
+    // const nodeSpacing = conf.nodeSpacing || 50;
+    // const rankSpacing = conf.rankSpacing || 50;
+
+    // Handle root and document for when rendering in sandbox mode
+    let sandboxElement;
+    if (securityLevel === 'sandbox') {
+      sandboxElement = select('#i' + id);
+    }
+    const root =
+      securityLevel === 'sandbox'
+        ? select(sandboxElement.nodes()[0].contentDocument.body)
+        : select('body');
+    const doc = securityLevel === 'sandbox' ? sandboxElement.nodes()[0].contentDocument : document;
+
+    const svg = root.select(`[id="${id}"]`);
+    const edgesEl = svg.insert('g').attr('class', 'edges edgePath');
+
+    // Fetch the vertices/nodes and edges/links from the parsed graph definition
+    const vert = diagObj.db.getVertices();
+    addVertices(vert, cy, id, root, doc, diagObj);
+    // c.style();
+    // Make cytoscape care about the dimensisions of the nodes
+    cy.nodes().forEach(function (n) {
+      n.layoutDimensions = () => {
+        const boundingBox = n.data().boundingBox;
+        return { w: boundingBox.width, h: boundingBox.height };
+      };
+    });
+
+    const edges = diagObj.db.getEdges();
+    addEdges(edges, cy, diagObj);
+
+    cy.layout({
+      // name: 'grid',
+      // name: 'circle',
+      name: 'cose',
+      // name: 'breadthfirst',
+      headless: true,
+      styleEnabled: false,
+      animate: false,
+    }).run();
+    log.info('Positions', cy.nodes().positions());
+    window.cy = cy;
+    cy.ready((e) => {
+      log.info('Ready', e);
+      setTimeout(() => {
+        cy.nodes().map((node, id) => {
+          const data = node.data();
+          log.info('Position: (', node.position().x, ', ', node.position().y, ')', data);
+          data.el.attr('transform', `translate(${node.position().x}, ${node.position().y})`);
+          // document
+          //   .querySelector(`[id="${data.domId}"]`)
+          //   .setAttribute('transform', `translate(${node.position().x}, ${node.position().y})`);
+          log.info('Id = ', data.domId, svg.select(`[id="${data.domId}"]`), data.el.node());
+        });
+
+        cy.edges().map((edge, id) => {
+          const data = edge.data();
+          if (edge[0]._private.bodyBounds) {
+            const bounds = edge[0]._private.rscratch;
+            log.info(
+              id,
+              // 'x:',
+              // edge.controlPoints(),
+              // 'y:',
+              edge[0]._private.rscratch
+              // 'w:',
+              // edge.boundingbox().w,
+              // 'h:',
+              // edge.boundingbox().h,
+              // edge.midPoint()
+            );
+            // data.el.attr('transform', `translate(${node.position().x}, ${node.position().y})`);
+            // edgesEl
+            //   .insert('line')
+            //   .attr('x1', bounds.startX)
+            //   .attr('y1', bounds.startY)
+            //   .attr('x2', bounds.endX)
+            //   .attr('y2', bounds.endY)
+            //   .attr('class', 'path');
+            edgesEl
+              .insert('path')
+              // Todo use regular line function
+              .attr(
+                'd',
+                `M ${bounds.startX},${bounds.startY} L ${bounds.midX},${bounds.midY} L${bounds.endX},${bounds.endY} `
+              )
+              .attr('class', 'path')
+              .attr('fill', 'none');
+          }
+        });
+
+        log.info(cy.json());
+        setupGraphViewbox({}, svg, conf.diagramPadding, conf.useMaxWidth);
+        resolve();
+      }, 500);
+    });
+  });
+};
+
+export default {
+  // setConf,
+  // addVertices,
+  // addEdges,
+  getClasses,
+  draw,
+};
--- a/src/diagrams/flowchart/flowRenderer.js
+++ b/src/diagrams/flowchart/flowRenderer.js
@@ -29,6 +29,8 @@ export const setConf = function (cnf) {
 * @param diagObj
 */
 export const addVertices = function (vert, g, svgId, root, _doc, diagObj) {
+  const securityLevel = getConfig().securityLevel;
+
  const svg = !root ? select(`[id="${svgId}"]`) : root.select(`[id="${svgId}"]`);
  const doc = !_doc ? document : _doc;
  const keys = Object.keys(vert);
--- a/src/diagrams/gantt/ganttDb.js
+++ b/src/diagrams/gantt/ganttDb.js
@@ -4,7 +4,7 @@ import { log } from '../../logger';
 import * as configApi from '../../config';
 import utils from '../../utils';
 import mermaidAPI from '../../mermaidAPI';
-
+import common from '../common/common';
 import {
  setAccTitle,
  getAccTitle,
@@ -21,6 +21,8 @@ let todayMarker = '';
 let includes = [];
 let excludes = [];
 let links = {};
+let title = '';
+let accDescription = '';
 let sections = [];
 let tasks = [];
 let currentSection = '';
@@ -32,6 +34,10 @@ let topAxis = false;
 // The serial order of the task in the script
 let lastOrder = 0;

+const sanitizeText = function (txt) {
+  return common.sanitizeText(txt, configApi.getConfig());
+};
+
 export const parseDirective = function (statement, context, type) {
  mermaidAPI.parseDirective(this, statement, context, type);
 };
@@ -41,6 +47,7 @@ export const clear = function () {
  tasks = [];
  currentSection = '';
  funs = [];
+  title = '';
  taskCnt = 0;
  lastTask = undefined;
  lastTaskID = undefined;
@@ -240,8 +247,7 @@ const getStartDate = function (prevTime, dateFormat, str) {
 * - `ms` for milliseconds
 *
 * @param {string} str - A string representing the duration.
- * @returns {moment.Duration} A moment duration, including an invalid moment for invalid input
- *   string.
+ * @returns {moment.Duration} A moment duration, including an invalid moment for invalid input string.
 */
 const parseDuration = function (str) {
  const statement = /^(\d+(?:\.\d+)?)([yMwdhms]|ms)$/.exec(str.trim());
--- a/src/diagrams/gantt/ganttRenderer.js
+++ b/src/diagrams/gantt/ganttRenderer.js
@@ -391,6 +391,7 @@ export const draw = function (text, id, version, diagObj) {
    if (securityLevel === 'sandbox') {
      let sandboxElement;
      sandboxElement = select('#i' + id);
+      const root = select(sandboxElement.nodes()[0].contentDocument.body);
      const doc = sandboxElement.nodes()[0].contentDocument;

      rectangles
--- a/src/diagrams/git/gitGraphRenderer.js
+++ b/src/diagrams/git/gitGraphRenderer.js
@@ -5,6 +5,7 @@ import { getConfig } from '../../config';
 import addSVGAccessibilityFields from '../../accessibility';

 let allCommitsDict = {};
+let branchNum;

 const commitType = {
  NORMAL: 0,
@@ -82,7 +83,7 @@ const drawCommits = (svg, commits, modifyGraph) => {
  const sortedKeys = keys.sort((a, b) => {
    return commits[a].seq - commits[b].seq;
  });
-  sortedKeys.forEach((key) => {
+  sortedKeys.forEach((key, index) => {
    const commit = commits[key];

    const y = branchPos[commit.branch].pos;
@@ -289,15 +290,18 @@ const drawCommits = (svg, commits, modifyGraph) => {
 };

 /**
- * Detect if there are other commits between commit1's x-position and commit2's x-position on the
- * same branch as commit2.
+ * Detect if there are other commits between commit1's x-position and commit2's x-position on the same
+ * branch as commit2.
 *
 * @param {any} commit1
 * @param {any} commit2
 * @param allCommits
- * @returns {boolean} If there are commits between commit1's x-position and commit2's x-position
+ * @returns {boolean} if there are commits between commit1's x-position and commit2's x-position
 */
 const hasOverlappingCommits = (commit1, commit2, allCommits) => {
+  const commit1Pos = commitPos[commit2.id];
+  const commit2Pos = commitPos[commit1.id];
+
  // Find commits on the same branch as commit2
  const keys = Object.keys(allCommits);
  const overlappingComits = keys.filter((key) => {
@@ -318,7 +322,7 @@ const hasOverlappingCommits = (commit1, commit2, allCommits) => {
 * @param {any} y1
 * @param {any} y2
 * @param {any} _depth
- * @returns {number} Y value between y1 and y2
+ * @returns {number} y value between y1 and y2
 */
 const findLane = (y1, y2, _depth) => {
  const depth = _depth || 0;
@@ -351,11 +355,25 @@ const findLane = (y1, y2, _depth) => {
 * @param {any} allCommits
 */
 const drawArrow = (svg, commit1, commit2, allCommits) => {
+  const conf = getConfig();
+
  const p1 = commitPos[commit1.id];
  const p2 = commitPos[commit2.id];
  const overlappingCommits = hasOverlappingCommits(commit1, commit2, allCommits);
  // log.debug('drawArrow', p1, p2, overlappingCommits, commit1.id, commit2.id);

+  let url = '';
+  if (conf.arrowMarkerAbsolute) {
+    url =
+      window.location.protocol +
+      '//' +
+      window.location.host +
+      window.location.pathname +
+      window.location.search;
+    url = url.replace(/\(/g, '\\(');
+    url = url.replace(/\)/g, '\\)');
+  }
+
  let arc = '';
  let arc2 = '';
  let radius = 0;
@@ -413,7 +431,7 @@ const drawArrow = (svg, commit1, commit2, allCommits) => {
      } ${p2.y}`;
    }
  }
-  svg
+  const arrow = svg
    .append('path')
    .attr('d', lineDef)
    .attr('class', 'arrow arrow' + (colorClassNum % THEME_COLOR_LIMIT));
@@ -421,7 +439,10 @@ const drawArrow = (svg, commit1, commit2, allCommits) => {

 const drawArrows = (svg, commits) => {
  const gArrows = svg.append('g').attr('class', 'commit-arrows');
-  Object.keys(commits).forEach((key) => {
+  let pos = 0;
+
+  const k = Object.keys(commits);
+  k.forEach((key, index) => {
    const commit = commits[key];
    if (commit.parents && commit.parents.length > 0) {
      commit.parents.forEach((parent) => {
--- a/src/diagrams/info/infoRenderer.js
+++ b/src/diagrams/info/infoRenderer.js
@@ -27,6 +27,7 @@ export const draw = (text, id, version, diagObj) => {
      securityLevel === 'sandbox'
        ? select(sandboxElement.nodes()[0].contentDocument.body)
        : select('body');
+    const doc = securityLevel === 'sandbox' ? sandboxElement.nodes()[0].contentDocument : document;

    // Parse the graph definition
    // parser.parse(text);
--- a/src/diagrams/mindmap/mindmapRenderer.js
+++ b/src/diagrams/mindmap/mindmapRenderer.js
@@ -2,7 +2,7 @@
 import { select } from 'd3';
 import { log, getConfig, setupGraphViewbox } from '../../diagram-api/diagramAPI';
 import svgDraw from './svgDraw';
-import { BoundingBox, Layout } from 'non-layered-tidy-tree-layout';
+import { BoundingBox, Layout, Tree } from 'non-layered-tidy-tree-layout';
 import clone from 'fast-clone';
 import * as db from './mindmapDb';

@@ -85,8 +85,9 @@ function rightToLeft(mindmap) {
 /**
 * @param mindmap
 * @param dir
+ * @param conf
 */
-function layout(mindmap, dir) {
+function layout(mindmap, dir, conf) {
  const bb = new BoundingBox(30, 60);

  const layout = new Layout(bb);
@@ -191,7 +192,8 @@ function layoutMindmap(node, conf) {
  });

  // Merge the trees into a single tree
-  mergeTrees(node, trees);
+  const result = mergeTrees(node, trees);
+  eachNode;
  return node;
 }
 /**
@@ -230,11 +232,13 @@ export const draw = (text, id, version, diagObj) => {
      securityLevel === 'sandbox'
        ? select(sandboxElement.nodes()[0].contentDocument.body)
        : select('body');
+    const doc = securityLevel === 'sandbox' ? sandboxElement.nodes()[0].contentDocument : document;
+
    // Parse the graph definition

    const svg = root.select('#' + id);

-    svg.append('g');
+    const g = svg.append('g');
    const mm = diagObj.db.getMindmap();

    // Draw the graph and start with drawing the nodes without proper position
--- a/src/diagrams/mindmap/styles.js
+++ b/src/diagrams/mindmap/styles.js
@@ -1,4 +1,4 @@
-import { darken, lighten, isDark } from 'khroma';
+import { darken, lighten, adjust, invert, isDark } from 'khroma';

 const genSections = (options) => {
  let sections = '';
--- a/src/diagrams/mindmap/svgDraw.js
+++ b/src/diagrams/mindmap/svgDraw.js
@@ -47,9 +47,9 @@ function wrap(text, width) {
  });
 }

-const defaultBkg = function (elem, node, section) {
+const defaultBkg = function (elem, node, section, conf) {
  const rd = 5;
-  elem
+  const r = elem
    .append('path')
    .attr('id', 'node-' + node.id)
    .attr('class', 'node-bkg node-' + db.type2Str(node.type))
@@ -68,22 +68,25 @@ const defaultBkg = function (elem, node, section) {
    .attr('x2', node.width)
    .attr('y2', node.height);
 };
-const rectBkg = function (elem, node) {
-  elem
+const rectBkg = function (elem, node, section, conf) {
+  const r = elem
    .append('rect')
    .attr('id', 'node-' + node.id)
    .attr('class', 'node-bkg node-' + db.type2Str(node.type))
    .attr('height', node.height)
    .attr('width', node.width);
 };
-const cloudBkg = function (elem, node) {
+const cloudBkg = function (elem, node, section, conf) {
+  const rd = 5;
+  const r = elem;
  const w = node.width;
  const h = node.height;
+  const r0 = 0.1 * w;
  const r1 = 0.15 * w;
  const r2 = 0.25 * w;
  const r3 = 0.35 * w;
  const r4 = 0.2 * w;
-  elem
+  const p = elem
    .append('path')
    .attr('id', 'node-' + node.id)
    .attr('class', 'node-bkg node-' + db.type2Str(node.type))
@@ -106,11 +109,12 @@ const cloudBkg = function (elem, node) {
    H0 V0 Z`
    );
 };
-const bangBkg = function (elem, node) {
+const bangBkg = function (elem, node, section, conf) {
+  const rd = 5;
  const w = node.width;
  const h = node.height;
  const r = 0.15 * w;
-  elem
+  const p = elem
    .append('path')
    .attr('id', 'node-' + node.id)
    .attr('class', 'node-bkg node-' + db.type2Str(node.type))
@@ -137,15 +141,16 @@ const bangBkg = function (elem, node) {
    H0 V0 Z`
    );
 };
-const circleBkg = function (elem, node) {
-  elem
+const circleBkg = function (elem, node, section, conf) {
+  const r = elem
    .append('circle')
    .attr('id', 'node-' + node.id)
    .attr('class', 'node-bkg node-' + db.type2Str(node.type))
    .attr('r', node.width / 2);
+  // .attr('width', node.width);
 };
-const roundedRectBkg = function (elem, node) {
-  elem
+const roundedRectBkg = function (elem, node, section, conf) {
+  const r = elem
    .append('rect')
    .attr('id', 'node-' + node.id)
    .attr('class', 'node-bkg node-' + db.type2Str(node.type))
@@ -178,6 +183,7 @@ export const drawNode = function (elem, node, section, conf) {
    .append('text')
    .text(node.descr)
    .attr('dy', '1em')
+    // .attr('dy', '0')
    .attr('alignment-baseline', 'middle')
    .attr('dominant-baseline', 'middle')
    .attr('text-anchor', 'middle')
@@ -189,12 +195,18 @@ export const drawNode = function (elem, node, section, conf) {
  if (node.icon) {
    if (node.type === db.nodeType.CIRCLE) {
      node.height += 50;
+      const orgWidth = node.width;
      node.width += 50;
+      // node.width = Math.max(orgWidth, 100);
+      const widthDiff = Math.abs(node.width - orgWidth);
      const icon = nodeElem
        .append('foreignObject')
        .attr('height', '50px')
        .attr('width', node.width)
        .attr('style', 'text-align: center;');
+      // .attr('x', 0)
+      // .attr('y', 0)
+      // .attr('class', 'node-icon ' + node.icon);
      icon
        .append('div')
        .attr('class', 'icon-container')
@@ -214,7 +226,9 @@ export const drawNode = function (elem, node, section, conf) {
        .attr('width', '60px')
        .attr('height', node.height)
        .attr('style', 'text-align: center;margin-top:' + heightDiff / 2 + 'px;');
-
+      // .attr('x', 0)
+      // .attr('y', 0)
+      // .attr('class', 'node-icon ' + node.icon);
      icon
        .append('div')
        .attr('class', 'icon-container')
@@ -244,11 +258,15 @@ export const drawNode = function (elem, node, section, conf) {
      circleBkg(bkgElem, node, section, conf);
      break;
    case db.nodeType.CLOUD:
+      // bkgElem.attr('transform', 'translate(' + node.width / 2 + ', ' + +node.height / 2 + ')');
      cloudBkg(bkgElem, node, section, conf);
      break;
    case db.nodeType.BANG:
+      // bkgElem.attr('transform', 'translate(' + node.width / 2 + ', ' + +node.height / 2 + ')');
      bangBkg(bkgElem, node, section, conf);
      break;
+    default:
+    // defaultBkg(bkgElem, node, section, conf);
  }

  // Position the node to its coordinate
@@ -259,7 +277,17 @@ export const drawNode = function (elem, node, section, conf) {
  return node.height;
 };

-export const drawEdge = function drawEdge(edgesElem, mindmap, parent, depth, section) {
+export const drawEdge = function drawEdge(edgesElem, mindmap, parent, depth, section, conf) {
+  // edgesElem
+  //   .append('line')
+  //   .attr('x1', parent.x + parent.width / 2)
+  //   .attr('y1', parent.y + parent.height / 2)
+  //   .attr('x2', mindmap.x + mindmap.width / 2)
+  //   .attr('y2', mindmap.y + mindmap.height / 2)
+  //   .attr('class', 'edge section-edge-' + section + ' edge-depth-' + depth);
+
+  //<path d="M100,250 Q250,100 400,250 T700,250" />
+
  const sx = parent.x + parent.width / 2;
  const sy = parent.y + parent.height / 2;
  const ex = mindmap.x + mindmap.width / 2;
@@ -280,7 +308,7 @@ export const drawEdge = function drawEdge(edgesElem, mindmap, parent, depth, sec
    .attr('class', 'edge section-edge-' + section + ' edge-depth-' + depth);
 };

-export const positionNode = function (node) {
+export const positionNode = function (node, conf) {
  const nodeElem = db.getElementById(node.id);

  const x = node.x || 0;
--- a/src/diagrams/pie/pieDb.js
+++ b/src/diagrams/pie/pieDb.js
@@ -13,6 +13,8 @@ import {
 } from '../../commonDb';

 let sections = {};
+let title = '';
+let description = '';
 let showData = false;

 export const parseDirective = function (statement, context, type) {
@@ -47,6 +49,7 @@ const cleanupValue = function (value) {

 const clear = function () {
  sections = {};
+  title = '';
  showData = false;
  commonClear();
 };
--- a/src/diagrams/requirement/requirementDb.js
+++ b/src/diagrams/requirement/requirementDb.js
@@ -1,7 +1,7 @@
 import * as configApi from '../../config';
 import { log } from '../../logger';
 import mermaidAPI from '../../mermaidAPI';
-
+import common from '../common/common';
 import {
  setAccTitle,
  getAccTitle,
@@ -15,6 +15,10 @@ let latestRequirement = {};
 let requirements = {};
 let latestElement = {};
 let elements = {};
+let title = '';
+let accDescription = '';
+
+const sanitizeText = (txt) => common.sanitizeText(txt, configApi.getConfig());

 const RequirementType = {
  REQUIREMENT: 'Requirement',
--- a/src/diagrams/requirement/requirementRenderer.js
+++ b/src/diagrams/requirement/requirementRenderer.js
@@ -320,6 +320,7 @@ export const draw = (text, id, _version, diagObj) => {
    securityLevel === 'sandbox'
      ? select(sandboxElement.nodes()[0].contentDocument.body)
      : select('body');
+  const doc = securityLevel === 'sandbox' ? sandboxElement.nodes()[0].contentDocument : document;

  const svg = root.select(`[id='${id}']`);
  markers.insertLineEndings(svg, conf);
--- a/src/diagrams/sequence/sequenceDb.js
+++ b/src/diagrams/sequence/sequenceDb.js
@@ -16,6 +16,8 @@ let prevActor = undefined;
 let actors = {};
 let messages = [];
 const notes = [];
+let diagramTitle = '';
+let description = '';
 let sequenceNumbersEnabled = false;
 let wrapEnabled;

@@ -151,6 +153,7 @@ export const clear = function () {
  actors = {};
  messages = [];
  sequenceNumbersEnabled = false;
+  diagramTitle = '';
  commonClear();
 };

--- a/src/diagrams/state/stateDb.js
+++ b/src/diagrams/state/stateDb.js
@@ -11,6 +11,8 @@ import {
  clear as commonClear,
 } from '../../commonDb';

+const sanitizeText = (txt) => common.sanitizeText(txt, configApi.getConfig());
+
 const clone = (o) => JSON.parse(JSON.stringify(o));
 let rootDoc = [];

@@ -119,6 +121,10 @@ let documents = {
 let currentDocument = documents.root;

 let startCnt = 0;
+let endCnt = 0; // let stateCnt = 0;
+
+let title = 'State diagram';
+let description = '';

 /**
 * Function called by parser when a node definition has been found.
@@ -173,6 +179,7 @@ export const clear = function (saveCommon) {
  currentDocument = documents.root;

  startCnt = 0;
+  endCnt = 0;
  classes = [];
  if (!saveCommon) {
    commonClear();
@@ -204,6 +211,7 @@ export const addRelation = function (_id1, _id2, title) {
    type1 = 'start';
  }
  if (_id2 === '[*]') {
+    endCnt++;
    id2 = 'end' + startCnt;
    type2 = 'end';
  }
--- a/src/diagrams/state/stateRenderer-v2.js
+++ b/src/diagrams/state/stateRenderer-v2.js
@@ -283,6 +283,7 @@ export const draw = function (text, id, _version, diag) {
    securityLevel === 'sandbox'
      ? select(sandboxElement.nodes()[0].contentDocument.body)
      : select('body');
+  const doc = securityLevel === 'sandbox' ? sandboxElement.nodes()[0].contentDocument : document;
  const svg = root.select(`[id="${id}"]`);

  // Run the renderer. This is what draws the final graph.
--- a/src/diagrams/user-journey/journeyDb.js
+++ b/src/diagrams/user-journey/journeyDb.js
@@ -1,5 +1,6 @@
 import mermaidAPI from '../../mermaidAPI';
 import * as configApi from '../../config';
+import common from '../common/common';
 import {
  setAccTitle,
  getAccTitle,
@@ -10,6 +11,10 @@ import {
  clear as commonClear,
 } from '../../commonDb';

+const sanitizeText = (txt) => common.sanitizeText(txt, configApi.getConfig());
+
+let title = '';
+let description = '';
 let currentSection = '';

 const sections = [];
@@ -24,6 +29,8 @@ export const clear = function () {
  sections.length = 0;
  tasks.length = 0;
  currentSection = '';
+  title = '';
+  description = '';
  rawTasks.length = 0;
  commonClear();
 };
--- a/src/mermaidAPI.ts
+++ b/src/mermaidAPI.ts
@@ -118,12 +118,12 @@ export const decodeEntities = function (text: string): string {
 *   element will be removed when rendering is completed.
 * @returns {void}
 */
-const render = function (
+const render = async function (
  id: string,
  text: string,
  cb: (svgCode: string, bindFunctions?: (element: Element) => void) => void,
  container?: Element
-): void {
+): Promise<void> {
  configApi.reset();
  text = text.replace(/\r\n?/g, '\n'); // parser problems on CRLF ignore all CR and leave LF;;
  const graphInit = utils.detectInit(text);
@@ -299,7 +299,7 @@ const render = function (
  svg.insertBefore(style1, firstChild);

  try {
-    diag.renderer.draw(text, id, pkg.version, diag);
+    await diag.renderer.draw(text, id, pkg.version, diag);
  } catch (e) {
    errorRenderer.draw(id, pkg.version);
    throw e;
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -39,10 +39,12 @@ const directive =
  /[%]{2}[{]\s*(?:(?:(\w+)\s*:|(\w+))\s*(?:(?:(\w+))|((?:(?![}][%]{2}).|\r?\n)*))?\s*)(?:[}][%]{2})?/gi;
 const directiveWithoutOpen =
  /\s*(?:(?:(\w+)(?=:):|(\w+))\s*(?:(?:(\w+))|((?:(?![}][%]{2}).|\r?\n)*))?\s*)(?:[}][%]{2})?/gi;
+const anyComment = /\s*%%.*\n/gm;

 /**
 * @function detectInit Detects the init config object from the text
 * @param config
+ * @param config
 *
 *   ```mermaid
 *
@@ -327,6 +329,7 @@ const calcLabelPosition = (points) => {

 const calcCardinalityPosition = (isRelationTypePresent, points, initialPosition) => {
  let prevPoint;
+  let totalDistance = 0;
  log.info('our points', points);
  if (points[0] !== initialPosition) {
    points = points.reverse();
@@ -386,6 +389,7 @@ const calcTerminalLabelPosition = (terminalMarkerSize, position, _points) => {
  // Todo looking to faster cloning method
  let points = JSON.parse(JSON.stringify(_points));
  let prevPoint;
+  let totalDistance = 0;
  log.info('our points', points);
  if (position !== 'start_left' && position !== 'start_right') {
    points = points.reverse();
@@ -724,6 +728,19 @@ export const calculateTextDimensions = memoize(
  (text, config) => `${text}-${config.fontSize}-${config.fontWeight}-${config.fontFamily}`
 );

+/**
+ * Applys d3 attributes
+ *
+ * @param {any} d3Elem D3 Element to apply the attributes onto
+ * @param {[string, string][]} attrs Object.keys equivalent format of key to value mapping of
+ *   attributes
+ */
+const d3Attrs = function (d3Elem, attrs) {
+  for (const attr of attrs) {
+    d3Elem.attr(attr[0], attr[1]);
+  }
+};
+
 export const initIdGenerator = class iterator {
  constructor(deterministic, seed) {
    this.deterministic = deterministic;
--- a/yarn.lock
+++ b/yarn.lock
@@ -4710,6 +4710,14 @@ cypress@9.7.0:
    untildify "^4.0.0"
    yauzl "^2.10.0"

+cytoscape@^3.23.0:
+  version "3.23.0"
+  resolved "https://registry.yarnpkg.com/cytoscape/-/cytoscape-3.23.0.tgz#054ee05a6d0aa3b4f139382bbf2f4e5226df3c6d"
+  integrity sha512-gRZqJj/1kiAVPkrVFvz/GccxsXhF3Qwpptl32gKKypO4IlqnKBjTOu+HbXtEggSGzC5KCaHp3/F7GgENrtsFkA==
+  dependencies:
+    heap "^0.2.6"
+    lodash "^4.17.21"
+
 "d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", d3-array@3:
  version "3.1.1"
  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-3.1.1.tgz#7797eb53ead6b9083c75a45a681e93fc41bc468c"
@@ -6775,6 +6783,11 @@ he@^1.1.0:
  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==

+heap@^0.2.6:
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/heap/-/heap-0.2.7.tgz#1e6adf711d3f27ce35a81fe3b7bd576c2260a8fc"
+  integrity sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg==
+
 highlight.js@^10.5.0:
  version "10.7.3"
  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531"
Author	SHA1	Message	Date
Knut Sveidqvist	25c9e499b3	Merge branch 'develop' into layout-v3	2022-09-14 10:32:25 +02:00
Knut Sveidqvist	be5d9bd623	Pausing POC	2022-09-14 10:27:30 +02:00
Knut Sveidqvist	d851cc63bf	Renderer for flowcharts using cytoscape, WIP	2022-09-13 17:41:43 +02:00