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

Adjusted fixed height settings tag-doc

Browse Source
This commit is contained in:
Knut Sveidqvist
2024-10-02 13:22:38 +02:00
parent 36f1dc8541
commit ed1427ed31
1 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,19 +21,31 @@ export const taggedWaveEdgedRectangle = async (parent: SVGAElement, node: Node)
let adjustFinalHeight = true; let adjustFinalHeight = true;
if (node.width || node.height) { if (node.width || node.height) {
adjustFinalHeight = false; adjustFinalHeight = false;
node.width = (node?.width ?? 10) - labelPaddingX * 2; node.width = (node?.width ?? 0) - labelPaddingX * 2;
node.height = (node?.height ?? 10) - labelPaddingY * 2; if (node.width < 10) {
node.width = 10;
}
node.height = (node?.height ?? 0) - labelPaddingY * 2;
if (node.height < 10) {
node.height = 10;
}
} }
const { shapeSvg, bbox, label } = await labelHelper(parent, node, getNodeClasses(node)); const { shapeSvg, bbox, label } = await labelHelper(parent, node, getNodeClasses(node));
const w = (node?.width ? node?.width : bbox.width) + (labelPaddingX ?? 0) * 2; const w = (node?.width ? node?.width : bbox.width) + (labelPaddingX ?? 0) * 2;
const h = (node?.height ? node?.height : bbox.width) + (labelPaddingY ?? 0) * 3; const h = (node?.height ? node?.height : bbox.height) + (labelPaddingY ?? 0) * 2;
const waveAmplitude = h / 4; const waveAmplitude = h / 8;
const tagWidth = 0.2 * w; const tagWidth = 0.2 * w;
const tagHeight = 0.2 * h; const tagHeight = 0.2 * h;
const finalH = h + (adjustFinalHeight ? waveAmplitude : -waveAmplitude); const finalH = h + (adjustFinalHeight ? waveAmplitude : -waveAmplitude);
const { cssStyles } = node; const { cssStyles } = node;
// To maintain minimum width
const minWidth = 14;
const widthDif = minWidth - w;
const extraW = widthDif > 0 ? widthDif / 2 : 0;
// @ts-ignore - rough is not typed // @ts-ignore - rough is not typed
const rc = rough.svg(shapeSvg); const rc = rough.svg(shapeSvg);
const options = userNodeOverrides(node, {}); const options = userNodeOverrides(node, {});
@@ -44,29 +56,26 @@ export const taggedWaveEdgedRectangle = async (parent: SVGAElement, node: Node)
} }
const points = [ const points = [
{ x: -w / 2 - (w / 2) * 0.1, y: finalH / 2 }, { x: -w / 2 - extraW, y: finalH / 2 },
...generateFullSineWavePoints( ...generateFullSineWavePoints(
-w / 2 - (w / 2) * 0.1, -w / 2 - extraW,
finalH / 2, finalH / 2,
w / 2 + (w / 2) * 0.1, w / 2 + extraW,
finalH / 2, finalH / 2,
waveAmplitude, waveAmplitude,
0.8 0.8
), ),
{ x: w / 2 + extraW, y: -finalH / 2 },
{ x: w / 2 + (w / 2) * 0.1, y: -finalH / 2 }, { x: -w / 2 - extraW, y: -finalH / 2 },
{ x: -w / 2 - (w / 2) * 0.1, y: -finalH / 2 },
]; ];
const x = -w / 2 + (w / 2) * 0.1; const x = -w / 2;
const y = !adjustFinalHeight const y = !adjustFinalHeight ? -finalH / 2 - 1.6 * tagHeight : -finalH / 2 - 0.4 * tagHeight;
? -finalH / 2 - 1.25 * waveAmplitude - 1 * tagHeight
: -finalH / 2 - 0.4 * tagHeight;
const tagPoints = [ const tagPoints = [
{ x: x + w - tagWidth, y: (y + h) * 1.4 }, { x: x + w - extraW - tagWidth, y: (y + h) * 1.4 },
{ x: x + w, y: y + h - tagHeight }, { x: x + w - extraW, y: y + h - tagHeight },
{ x: x + w, y: (y + h) * 0.9 }, { x: x + w - extraW, y: (y + h) * 0.9 },
...generateFullSineWavePoints( ...generateFullSineWavePoints(
x + w, x + w,
(y + h) * 1.3, (y + h) * 1.3,