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

lin cyl

Browse Source
This commit is contained in:
Ashish Jain
2024-09-27 14:13:54 +02:00
parent ba51f4ab38
commit 0b0c0fc1f1
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/mermaid/src/rendering-util/rendering-elements/shapes/cylinder.ts
View File

@@ -50,7 +50,7 @@ export const createInnerCylinderPathD = (
return [`M${x - width / 2},${-height / 2}`, `a${rx},${ry} 0,0,0 ${width},0`].join(' '); return [`M${x - width / 2},${-height / 2}`, `a${rx},${ry} 0,0,0 ${width},0`].join(' ');
}; };
const MIN_HEIGHT = 50; const MIN_HEIGHT = 25;
const MIN_WIDTH = 25; const MIN_WIDTH = 25;
export const cylinder = async (parent: SVGAElement, node: Node) => { export const cylinder = async (parent: SVGAElement, node: Node) => {
const { themeVariables } = getConfig(); const { themeVariables } = getConfig();
@@ -70,7 +70,7 @@ export const cylinder = async (parent: SVGAElement, node: Node) => {
// based on this width, height is calculated // based on this width, height is calculated
const ry = node.width / 2 / (2.5 + node.width / 50); const ry = node.width / 2 / (2.5 + node.width / 50);
node.height = (node.height ?? 0) - labelPaddingX - ry * 3; node.height = (node.height ?? 0) - labelPaddingX - (ry + ry * 0.05) * 3;
if (node.height < MIN_HEIGHT) { if (node.height < MIN_HEIGHT) {
node.height = MIN_HEIGHT; node.height = MIN_HEIGHT;
} }

25
packages/mermaid/src/rendering-util/rendering-elements/shapes/linedCylinder.ts
View File

@@ -54,17 +54,36 @@ export const createInnerCylinderPathD = (
): string => { ): string => {
return [`M${x - width / 2},${-height / 2}`, `a${rx},${ry} 0,0,0 ${width},0`].join(' '); return [`M${x - width / 2},${-height / 2}`, `a${rx},${ry} 0,0,0 ${width},0`].join(' ');
}; };
const MIN_HEIGHT = 25;
const MIN_WIDTH = 25;
export const linedCylinder = async (parent: SVGAElement, node: Node) => { export const linedCylinder = 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 nodePadding = node.padding ?? 0; const nodePadding = node.padding ?? 0;
const labelPaddingX = node.look === 'neo' ? nodePadding * 2 : nodePadding; const labelPaddingX = node.look === 'neo' ? nodePadding * 2 : nodePadding;
const labelPaddingY = node.look === 'neo' ? nodePadding * 1 : nodePadding; const labelPaddingY = node.look === 'neo' ? nodePadding * 1 : nodePadding;
const w = Math.max(bbox.width + labelPaddingX, node?.width ?? 0);
if (node.width || node.height) {
node.width = (node.width ?? 0) - labelPaddingX;
if (node.width < MIN_WIDTH) {
node.width = MIN_WIDTH;
}
// based on this width, height is calculated
const ry = node.width / 2 / (2.5 + node.width / 50);
node.height = (node.height ?? 0) - labelPaddingY - (ry + ry * 0.05) * 3;
if (node.height < MIN_HEIGHT) {
node.height = MIN_HEIGHT;
}
}
const { shapeSvg, bbox, label } = await labelHelper(parent, node, getNodeClasses(node));
const w = Math.max(bbox.width, node?.width ?? 0) + labelPaddingX;
const rx = w / 2; const rx = w / 2;
const ry = rx / (2.5 + w / 50); const ry = rx / (2.5 + w / 50);
const h = Math.max(bbox.height + ry + labelPaddingY, node?.height ?? 0); const h = Math.max(bbox.height, node?.height ?? 0) + ry + labelPaddingY;
const outerOffset = h * 0.1; // 10% of height const outerOffset = h * 0.1; // 10% of height
let cylinder: d3.Selection<SVGPathElement | SVGGElement, unknown, null, undefined>; let cylinder: d3.Selection<SVGPathElement | SVGGElement, unknown, null, undefined>;