From 41484b2272a3dafad20e982cefbab62c6f8632b2 Mon Sep 17 00:00:00 2001 From: Knut Sveidqvist Date: Tue, 6 Aug 2024 15:03:19 +0200 Subject: [PATCH] MC-1730 Fix for subroutine shape --- packages/mermaid/package.json | 2 +- .../rendering-util/rendering-elements/shapes/subroutine.ts | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/mermaid/package.json b/packages/mermaid/package.json index 474523168..d0dd7a45f 100644 --- a/packages/mermaid/package.json +++ b/packages/mermaid/package.json @@ -1,6 +1,6 @@ { "name": "@mermaid-chart/mermaid", - "version": "11.0.0-b.58", + "version": "11.0.0-b.59", "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/rendering-util/rendering-elements/shapes/subroutine.ts b/packages/mermaid/src/rendering-util/rendering-elements/shapes/subroutine.ts index 6f9363073..f804efcfc 100644 --- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/subroutine.ts +++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/subroutine.ts @@ -65,6 +65,7 @@ export const subroutine = async (parent: SVGAElement, node: Node) => { ]; if (node.look === 'handdrawn' || (node.look === 'neo' && !useGradient)) { + console.log('OXE points 1', points); // @ts-ignore - rough is not typed const rc = rough.svg(shapeSvg); const options = userNodeOverrides(node, {}); @@ -72,8 +73,6 @@ export const subroutine = async (parent: SVGAElement, node: Node) => { if (node.look === 'neo') { options.roughness = 0; options.fillStyle = 'solid'; - // options.stroke = 'none'; - // options.strokeWidth = 0 } const roughNode = rc.rectangle(x - 8, y, w + 16, h, options); @@ -87,7 +86,9 @@ export const subroutine = async (parent: SVGAElement, node: Node) => { let rect = shapeSvg.insert(() => roughNode, ':first-child'); const { cssStyles } = node; rect.attr('class', 'basic label-container').attr('style', cssStyles); + updateNodeBounds(node, rect); } else { + console.log('OXE points 2', points); const el = insertPolygonShape(shapeSvg, w, h, points); if (nodeStyles) { el.attr('style', nodeStyles);