From d3d0df59cba6c3b553e82514db6f5318bc6eeb0f Mon Sep 17 00:00:00 2001 From: Knut Sveidqvist Date: Sun, 9 May 2021 15:34:02 +0200 Subject: [PATCH] --- .../rendering/stateDiagram-v2.spec.js | 20 +++++++++++++++++++ src/diagrams/state/stateRenderer-v2.js | 8 -------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/cypress/integration/rendering/stateDiagram-v2.spec.js b/cypress/integration/rendering/stateDiagram-v2.spec.js index 7574de9bc..af1f1e808 100644 --- a/cypress/integration/rendering/stateDiagram-v2.spec.js +++ b/cypress/integration/rendering/stateDiagram-v2.spec.js @@ -398,6 +398,26 @@ stateDiagram-v2 } ); }); + it('v2 should handle different rendering directions in composite states', () => { + imgSnapshotTest( + ` +stateDiagram + direction LR + state A { + direction BT + a --> b + } + state C { + direction RL + c --> d + } + A --> C + `, + { + logLevel: 0, fontFamily: 'courier', + } + ); + }); it('v2 handle transition from one state in a composite state to a composite state', () => { imgSnapshotTest( ` diff --git a/src/diagrams/state/stateRenderer-v2.js b/src/diagrams/state/stateRenderer-v2.js index 486355ed1..ea5756330 100644 --- a/src/diagrams/state/stateRenderer-v2.js +++ b/src/diagrams/state/stateRenderer-v2.js @@ -85,7 +85,6 @@ const setupNode = (g, parent, node, altFlag) => { // group if (!nodeDb[node.id].type && node.doc) { log.info('Setting cluster for ', node.id, getDir(node)); - console.info('Setting cluster for ', node.id, getDir(node)); nodeDb[node.id].type = 'group'; nodeDb[node.id].dir = getDir(node); nodeDb[node.id].shape = node.type === 'divider' ? 'divider' : 'roundedWithTitle'; @@ -220,9 +219,6 @@ const getDir = (nodes, defaultDir) => { } } } - if(nodes.id==='A') { - console.log('nodes.id',nodes.id, dir) - } return dir; }; /** @@ -232,7 +228,6 @@ const getDir = (nodes, defaultDir) => { */ export const draw = function(text, id) { log.info('Drawing state diagram (v2)', id); - console.info('Drawing state diagram (v2)', id); stateDb.clear(); nodeDb = {}; const parser = state.parser; @@ -254,7 +249,6 @@ export const draw = function(text, id) { log.info(stateDb.getRootDocV2()); stateDb.extract(stateDb.getRootDocV2()); log.info(stateDb.getRootDocV2()); - console.info(stateDb.getRootDocV2()); // Create the input mermaid.graph const g = new graphlib.Graph({ @@ -272,9 +266,7 @@ export const draw = function(text, id) { return {}; }); - console.info('Setup node') setupNode(g, undefined, stateDb.getRootDocV2(), true); - console.info('Setup node done') // Set up an SVG group so that we can translate the final graph. const svg = select(`[id="${id}"]`);