From 4e685b74a7c0500f192696a7fab53b8ae4cac04e Mon Sep 17 00:00:00 2001 From: omkarht Date: Thu, 16 Jan 2025 17:04:54 +0530 Subject: [PATCH] Draft of third set of shapes [Divided Process, Manual Input,Subprocess, Horizontal Cylinder, Loop Limit] --- .../rendering-util/rendering-elements/shapes/dividedRect.ts | 4 ++-- .../rendering-util/rendering-elements/shapes/slopedRect.ts | 4 ++-- .../rendering-util/rendering-elements/shapes/subroutine.ts | 4 ++-- .../rendering-elements/shapes/tiltedCylinder.ts | 2 +- .../rendering-elements/shapes/trapezoidalPentagon.ts | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/mermaid/src/rendering-util/rendering-elements/shapes/dividedRect.ts b/packages/mermaid/src/rendering-util/rendering-elements/shapes/dividedRect.ts index 571466fab..61b105952 100644 --- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/dividedRect.ts +++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/dividedRect.ts @@ -12,8 +12,8 @@ export async function dividedRectangle( const { labelStyles, nodeStyles } = styles2String(node); node.labelStyle = labelStyles; - const paddingX = node.look === 'neo' ? (node.padding ?? 0) * 2 : (node.padding ?? 0); - const paddingY = node.look === 'neo' ? (node.padding ?? 0) * 1 : (node.padding ?? 0); + const paddingX = node.look === 'neo' ? 16 : (node.padding ?? 0); + const paddingY = node.look === 'neo' ? 16 : (node.padding ?? 0); // If incoming height & width are present, subtract the padding from them // as labelHelper does not take padding into account diff --git a/packages/mermaid/src/rendering-util/rendering-elements/shapes/slopedRect.ts b/packages/mermaid/src/rendering-util/rendering-elements/shapes/slopedRect.ts index eb0dd1ce5..e90fb298f 100644 --- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/slopedRect.ts +++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/slopedRect.ts @@ -9,8 +9,8 @@ export async function slopedRect(parent: D3Selecti const { labelStyles, nodeStyles } = styles2String(node); node.labelStyle = labelStyles; const nodePadding = node.padding ?? 0; - const labelPaddingX = node.look === 'neo' ? nodePadding * 2 : nodePadding; - const labelPaddingY = node.look === 'neo' ? nodePadding * 1 : nodePadding; + const labelPaddingX = node.look === 'neo' ? 16 : nodePadding; + const labelPaddingY = node.look === 'neo' ? 12 : nodePadding; // If incoming height & width are present, subtract the padding from them // as labelHelper does not take padding into account 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 1c123c5c4..02292fe1b 100644 --- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/subroutine.ts +++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/subroutine.ts @@ -44,8 +44,8 @@ export async function subroutine(parent: D3Selecti node.labelStyle = labelStyles; const nodePadding = node?.padding || 8; - const labelPaddingX = node.look === 'neo' ? nodePadding * 3 : nodePadding; - const labelPaddingY = node.look === 'neo' ? nodePadding * 1.5 : nodePadding; + const labelPaddingX = node.look === 'neo' ? 28 : nodePadding; + const labelPaddingY = node.look === 'neo' ? 12 : nodePadding; // If incoming height & width are present, subtract the padding from them // as labelHelper does not take padding into account diff --git a/packages/mermaid/src/rendering-util/rendering-elements/shapes/tiltedCylinder.ts b/packages/mermaid/src/rendering-util/rendering-elements/shapes/tiltedCylinder.ts index c072f9337..63af2ef03 100644 --- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/tiltedCylinder.ts +++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/tiltedCylinder.ts @@ -61,7 +61,7 @@ export async function tiltedCylinder( const { labelStyles, nodeStyles } = styles2String(node); node.labelStyle = labelStyles; const nodePadding = node.padding ?? 0; - const labelPadding = node.look === 'neo' ? nodePadding : nodePadding / 2; + const labelPadding = node.look === 'neo' ? 12 : nodePadding / 2; if (node.width || node.height) { const originalHeight = node.height ?? 0; node.height = (node.height ?? 0) - labelPadding; diff --git a/packages/mermaid/src/rendering-util/rendering-elements/shapes/trapezoidalPentagon.ts b/packages/mermaid/src/rendering-util/rendering-elements/shapes/trapezoidalPentagon.ts index 14d8d55c8..616746eb1 100644 --- a/packages/mermaid/src/rendering-util/rendering-elements/shapes/trapezoidalPentagon.ts +++ b/packages/mermaid/src/rendering-util/rendering-elements/shapes/trapezoidalPentagon.ts @@ -12,8 +12,8 @@ export async function trapezoidalPentagon( const { labelStyles, nodeStyles } = styles2String(node); node.labelStyle = labelStyles; const nodePadding = node.padding ?? 0; - const labelPaddingX = node.look === 'neo' ? nodePadding * 2 : nodePadding; - const labelPaddingY = node.look === 'neo' ? nodePadding * 1 : nodePadding; + const labelPaddingX = node.look === 'neo' ? 16 : nodePadding; + const labelPaddingY = node.look === 'neo' ? 12 : nodePadding; const minWidth = 15, minHeight = 5; if (node.width || node.height) {