From 7dd174642cf1a161dda14e95706a9318bcc62ae7 Mon Sep 17 00:00:00 2001 From: Tyler Long Date: Tue, 6 Mar 2018 16:04:40 +0800 Subject: [PATCH] Use graphlibrary --- package.json | 1 + src/diagrams/classDiagram/classRenderer.js | 3 ++- src/diagrams/flowchart/flowRenderer.js | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0be6eef9e..462d42e87 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "d3": "3.5.17", "dagre-d3-renderer": "0.4.25", "dagre-layout": "^0.8.6", + "graphlibrary": "^2.2.0", "he": "^1.1.1", "lodash": "^4.17.5", "moment": "^2.21.0" diff --git a/src/diagrams/classDiagram/classRenderer.js b/src/diagrams/classDiagram/classRenderer.js index e570d4cb1..d30ad37d4 100644 --- a/src/diagrams/classDiagram/classRenderer.js +++ b/src/diagrams/classDiagram/classRenderer.js @@ -1,5 +1,6 @@ import dagre from 'dagre-layout' +import graphlib from 'graphlibrary' import classDb from './classDb' import d3 from '../../d3' @@ -311,7 +312,7 @@ export const draw = function (text, id) { insertMarkers(diagram) // Layout graph, Create a new directed graph - const g = new dagre.graphlib.Graph({ + const g = new graphlib.Graph({ multigraph: true }) diff --git a/src/diagrams/flowchart/flowRenderer.js b/src/diagrams/flowchart/flowRenderer.js index 94dbc8aaa..381ec4516 100644 --- a/src/diagrams/flowchart/flowRenderer.js +++ b/src/diagrams/flowchart/flowRenderer.js @@ -1,3 +1,5 @@ +import graphlib from 'graphlibrary' + import graphDb from './graphDb' import flow from './parser/flow' import dot from './parser/dot' @@ -265,7 +267,7 @@ export const draw = function (text, id, isDot) { } // Create the input mermaid.graph - const g = new dagreD3.graphlib.Graph({ + const g = new graphlib.Graph({ multigraph: true, compound: true })