diff --git a/cypress/integration/rendering/flowchart-v2.spec.js b/cypress/integration/rendering/flowchart-v2.spec.js index 27e728405..0f4b079c9 100644 --- a/cypress/integration/rendering/flowchart-v2.spec.js +++ b/cypress/integration/rendering/flowchart-v2.spec.js @@ -671,7 +671,7 @@ title: Simple flowchart flowchart TD A --> B `, - { flowchart: { titleTopMargin: 0 } } + { flowchart: { titleTopMargin: 10 } } ); }); it('3192: It should be possieble to render flowcharts with invisible edges', () => { @@ -682,7 +682,7 @@ title: Simple flowchart with invisible edges flowchart TD A ~~~ B `, - { flowchart: { titleTopMargin: 0 } } + { flowchart: { titleTopMargin: 10 } } ); }); it('4023: Should render html labels with images and-or text correctly', () => { diff --git a/cypress/platform/knsv2.html b/cypress/platform/knsv2.html index 1b1ccd685..13de19ba0 100644 --- a/cypress/platform/knsv2.html +++ b/cypress/platform/knsv2.html @@ -58,6 +58,14 @@
+--- +title: Simple flowchart with invisible edges +--- +flowchart TD +A ~~~ B ++
stateDiagram-v2 [*] --> Still Still --> [*] @@ -73,7 +81,7 @@ flowchart RL a1 -- l2 --> a2 end-
+flowchart RL subgraph "`one`" a1 -- l1 --> a2 @@ -98,11 +106,11 @@ flowchart LR way`"]-+classDiagram-v2 note "I love this diagram!\nDo you love it?"-+stateDiagram-v2 State1: The state with a note with minus - and plus + in it note left of State1 @@ -147,7 +155,7 @@ mindmap शान्तिः سلام 和平 `"]-+%%{init: {"flowchart": {"defaultRenderer": "elk"}} }%% flowchart TB %% I could not figure out how to use double quotes in labels in Mermaid @@ -399,21 +407,31 @@ mindmap mermaid.parseError = function (err, hash) { // console.error('Mermaid error: ', err); }; + // mermaid.initialize({ + // // theme: 'forest', + // startOnLoad: true, + // logLevel: 0, + // flowchart: { + // // defaultRenderer: 'elk', + // useMaxWidth: false, + // // htmlLabels: false, + // htmlLabels: true, + // }, + // // htmlLabels: false, + // gantt: { + // useMaxWidth: false, + // }, + // useMaxWidth: false, + // }); mermaid.initialize({ - // theme: 'forest', - startOnLoad: true, - logLevel: 0, - flowchart: { - // defaultRenderer: 'elk', - useMaxWidth: false, - // htmlLabels: false, - htmlLabels: true, + flowchart: { titleTopMargin: 10 }, + fontFamily: 'courier', + sequence: { + actorFontFamily: 'courier', + noteFontFamily: 'courier', + messageFontFamily: 'courier', }, - // htmlLabels: false, - gantt: { - useMaxWidth: false, - }, - useMaxWidth: false, + fontSize: 16, }); function callback() { alert('It worked'); diff --git a/packages/mermaid-zenuml/package.json b/packages/mermaid-zenuml/package.json index cb8da96b6..8167174e6 100644 --- a/packages/mermaid-zenuml/package.json +++ b/packages/mermaid-zenuml/package.json @@ -33,7 +33,7 @@ ], "license": "MIT", "dependencies": { - "@zenuml/core": "^3.0.0" + "@zenuml/core": "^3.0.3" }, "devDependencies": { "mermaid": "workspace:^" diff --git a/packages/mermaid/package.json b/packages/mermaid/package.json index 9a1f34676..b1b98f5f7 100644 --- a/packages/mermaid/package.json +++ b/packages/mermaid/package.json @@ -1,6 +1,6 @@ { "name": "mermaid", - "version": "10.2.4", + "version": "10.4.0", "description": "Markdown-ish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.", "type": "module", "module": "./dist/mermaid.core.mjs", diff --git a/packages/mermaid/src/diagrams/mindmap/parser/mindmap.jison b/packages/mermaid/src/diagrams/mindmap/parser/mindmap.jison index 9dd046a3d..afd5e2300 100644 --- a/packages/mermaid/src/diagrams/mindmap/parser/mindmap.jison +++ b/packages/mermaid/src/diagrams/mindmap/parser/mindmap.jison @@ -40,7 +40,7 @@ "[" { this.begin('NODE');return 'NODE_DSTART'; } [\s]+ return 'SPACELIST' /* skip all whitespace */ ; // !(-\() return 'NODE_ID'; -[^\(\[\n\-\)\{\}]+ return 'NODE_ID'; +[^\(\[\n\)\{\}]+ return 'NODE_ID'; <> return 'EOF'; ["][`] { this.begin("NSTR2");} [^`"]+ { return "NODE_DESCR";}