From be9123ee2b9ecd1e6fc76825b8cff0b975bb1e88 Mon Sep 17 00:00:00 2001 From: saurabhg772244 Date: Wed, 18 Sep 2024 13:10:07 +0530 Subject: [PATCH] Updated renderOptions to add direction property --- packages/mermaid-layout-elk/src/render.ts | 2 +- packages/mermaid/src/dagre-wrapper/index.js | 2 +- .../src/rendering-util/layout-algorithms/dagre/index.js | 2 +- .../src/rendering-util/rendering-elements/shapes/forkJoin.ts | 4 ++-- packages/mermaid/src/rendering-util/types.ts | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/mermaid-layout-elk/src/render.ts b/packages/mermaid-layout-elk/src/render.ts index 58be637ab..4e9f66a81 100644 --- a/packages/mermaid-layout-elk/src/render.ts +++ b/packages/mermaid-layout-elk/src/render.ts @@ -37,7 +37,7 @@ export const render = async ( // Add the element to the DOM if (!node.isGroup) { - const childNodeEl = await insertNode(nodeEl, node, { config }); + const childNodeEl = await insertNode(nodeEl, node, { config, dir: node.dir }); boundingBox = childNodeEl.node().getBBox(); child.domId = childNodeEl; child.width = boundingBox.width; diff --git a/packages/mermaid/src/dagre-wrapper/index.js b/packages/mermaid/src/dagre-wrapper/index.js index 76f3113df..86ae7e284 100644 --- a/packages/mermaid/src/dagre-wrapper/index.js +++ b/packages/mermaid/src/dagre-wrapper/index.js @@ -87,7 +87,7 @@ const recursiveRender = async (_elem, graph, diagramType, id, parentCluster, sit // insertCluster(clusters, graph.node(v)); } else { log.info('Node - the non recursive path', v, node.id, node); - await insertNode(nodes, graph.node(v), { config: siteConfig }); + await insertNode(nodes, graph.node(v), { config: siteConfig, dir }); } } }) diff --git a/packages/mermaid/src/rendering-util/layout-algorithms/dagre/index.js b/packages/mermaid/src/rendering-util/layout-algorithms/dagre/index.js index 6dbd62590..6f1fa7d3b 100644 --- a/packages/mermaid/src/rendering-util/layout-algorithms/dagre/index.js +++ b/packages/mermaid/src/rendering-util/layout-algorithms/dagre/index.js @@ -125,7 +125,7 @@ const recursiveRender = async (_elem, graph, diagramType, id, parentCluster, sit // insertCluster(clusters, graph.node(v)); } else { log.trace('Node - the non recursive path XAX', v, nodes, graph.node(v), dir); - await insertNode(nodes, graph.node(v), { config: siteConfig }); + await insertNode(nodes, graph.node(v), { config: siteConfig, dir }); } } }) diff --git a/packages/mermaid/src/rendering-util/rendering-elements/shapes/forkJoin.ts b/packages/mermaid/src/rendering-util/rendering-elements/shapes/forkJoin.ts index 2492412dc..fa735994f 100644 --- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/forkJoin.ts +++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/forkJoin.ts @@ -1,11 +1,11 @@ import { getNodeClasses, updateNodeBounds } from './util.js'; import intersect from '../intersect/index.js'; -import type { Node } from '../../types.js'; +import type { Node, RenderOptions } from '../../types.js'; import type { SVG } from '../../../diagram-api/types.js'; import rough from 'roughjs'; import { styles2String, userNodeOverrides } from './handDrawnShapeStyles.js'; -export const forkJoin = (parent: SVG, node: Node, dir: string) => { +export const forkJoin = (parent: SVG, node: Node, { dir }: RenderOptions) => { const { nodeStyles } = styles2String(node); node.label = ''; const shapeSvg = parent diff --git a/packages/mermaid/src/rendering-util/types.ts b/packages/mermaid/src/rendering-util/types.ts index 0d24f6fdf..510e94b94 100644 --- a/packages/mermaid/src/rendering-util/types.ts +++ b/packages/mermaid/src/rendering-util/types.ts @@ -143,4 +143,5 @@ export type LayoutMethod = export interface RenderOptions { config: MermaidConfig; + dir: string; }