marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-23 17:29:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Knut Sveidqvist
2019-12-01 07:54:02 +01:00
parent cce86c8e96 eec45dfff9
commit de8f8b02dc
18 changed files with 249 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/diagrams/flowchart/flowChartShapes.js
View File

@@ -1,4 +1,4 @@
import dagreD3 from 'dagre-d3';
import dagreD3 from 'dagre-d3-unofficial';
function question(parent, bbox, node) {
const w = bbox.width;

5
src/diagrams/flowchart/flowRenderer.js
View File

@@ -6,11 +6,10 @@ import flow from './parser/flow';
import { getConfig } from '../../config';
const newDagreD3 = true;
import dagreD3 from 'dagre-d3';
import dagreD3 from 'dagre-d3-unofficial';
// const newDagreD3 = false;
// import dagreD3 from '../../../../dagre-d3-renderer/dist/dagre-d3.core.js';
import addHtmlLabel from 'dagre-d3/lib/label/add-html-label.js';
import addHtmlLabel from 'dagre-d3-unofficial/lib/label/add-html-label.js';
import { logger } from '../../logger';
import { interpolateToCurve } from '../../utils';
import flowChartShapes from './flowChartShapes';