marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-25 02:09:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

implemented neo-fication and shape resize for waveRectangle, taggedWaveEdgedRectangle, multiWaveEdgedRectangle shapes

Browse Source
This commit is contained in:
omkarht
2024-09-03 18:01:15 +05:30
parent b84617c915
commit ea987171b2
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/mermaid/src/rendering-util/rendering-elements/shapes/multiWaveEdgedRectangle.ts
View File

@@ -14,8 +14,12 @@ export const multiWaveEdgedRectangle = async (parent: SVGAElement, node: Node) =
const { labelStyles, nodeStyles } = styles2String(node); const { labelStyles, nodeStyles } = styles2String(node);
node.labelStyle = labelStyles; node.labelStyle = labelStyles;
const { shapeSvg, bbox, label } = await labelHelper(parent, node, getNodeClasses(node)); const { shapeSvg, bbox, label } = await labelHelper(parent, node, getNodeClasses(node));
const w = Math.max(bbox.width + (node.padding ?? 0) * 2, node?.width ?? 0);
const h = Math.max(bbox.height + (node.padding ?? 0) * 2, node?.height ?? 0); const nodePadding = node.padding ?? 0;
const labelPaddingX = node.look === 'neo' ? nodePadding * 2 : nodePadding;
const labelPaddingY = node.look === 'neo' ? nodePadding * 1 : nodePadding;
const w = Math.max(bbox.width + labelPaddingX * 2, node?.width ?? 0);
const h = Math.max(bbox.height + labelPaddingY * 2, node?.height ?? 0);
const waveAmplitude = h / 4; const waveAmplitude = h / 4;
const finalH = h + waveAmplitude; const finalH = h + waveAmplitude;
const x = -w / 2; const x = -w / 2;

9
packages/mermaid/src/rendering-util/rendering-elements/shapes/taggedWaveEdgedRectangle.ts
View File

@@ -14,8 +14,11 @@ export const taggedWaveEdgedRectangle = async (parent: SVGAElement, node: Node)
const { labelStyles, nodeStyles } = styles2String(node); const { labelStyles, nodeStyles } = styles2String(node);
node.labelStyle = labelStyles; node.labelStyle = labelStyles;
const { shapeSvg, bbox, label } = await labelHelper(parent, node, getNodeClasses(node)); const { shapeSvg, bbox, label } = await labelHelper(parent, node, getNodeClasses(node));
const w = Math.max(bbox.width + (node.padding ?? 0) * 2, node?.width ?? 0); const nodePadding = node.padding ?? 0;
const h = Math.max(bbox.height + (node.padding ?? 0) * 2, node?.height ?? 0); const labelPaddingX = node.look === 'neo' ? nodePadding * 2 : nodePadding;
const labelPaddingY = node.look === 'neo' ? nodePadding * 1 : nodePadding;
const w = Math.max(bbox.width + labelPaddingX * 2, node?.width ?? 0);
const h = Math.max(bbox.height + labelPaddingY * 2, node?.height ?? 0);
const waveAmplitude = h / 4; const waveAmplitude = h / 4;
const tagWidth = 0.2 * w; const tagWidth = 0.2 * w;
const tagHeight = 0.2 * h; const tagHeight = 0.2 * h;
@@ -88,7 +91,7 @@ export const taggedWaveEdgedRectangle = async (parent: SVGAElement, node: Node)
waveEdgeRect.attr('transform', `translate(0,${-waveAmplitude / 2})`); waveEdgeRect.attr('transform', `translate(0,${-waveAmplitude / 2})`);
label.attr( label.attr(
'transform', 'transform',
`translate(${-w / 2 + (node.padding ?? 0) - (bbox.x - (bbox.left ?? 0))},${-h / 2 + (node.padding ?? 0) - waveAmplitude / 2 - (bbox.y - (bbox.top ?? 0))})` `translate(${-w / 2 + (labelPaddingX ?? 0) - (bbox.x - (bbox.left ?? 0))},${-h / 2 + (labelPaddingY ?? 0) - waveAmplitude / 2 - (bbox.y - (bbox.top ?? 0))})`
); );
updateNodeBounds(node, waveEdgeRect); updateNodeBounds(node, waveEdgeRect);

7
packages/mermaid/src/rendering-util/rendering-elements/shapes/waveRectangle.ts
View File

@@ -21,8 +21,11 @@ export const waveRectangle = async (parent: SVGAElement, node: Node) => {
const minWidth = 100; // Minimum width const minWidth = 100; // Minimum width
const minHeight = 50; // Minimum height const minHeight = 50; // Minimum height
const baseWidth = Math.max(bbox.width + (node.padding ?? 0) * 2, node?.width ?? 0); const nodePadding = node.padding ?? 0;
const baseHeight = Math.max(bbox.height + (node.padding ?? 0) * 2, node?.height ?? 0); const labelPaddingX = node.look === 'neo' ? nodePadding * 2 : nodePadding;
const labelPaddingY = node.look === 'neo' ? nodePadding * 1 : nodePadding;
const baseWidth = Math.max(bbox.width + labelPaddingX * 2, node?.width ?? 0);
const baseHeight = Math.max(bbox.height + labelPaddingY * 2, node?.height ?? 0);
const aspectRatio = baseWidth / baseHeight; const aspectRatio = baseWidth / baseHeight;