mirror of
https://github.com/mermaid-js/mermaid.git
synced 2025-08-26 19:56:45 +02:00
add curlyBrace shape
This commit is contained in:
@@ -40,6 +40,7 @@ const newShapesSet5 = [
|
|||||||
'card',
|
'card',
|
||||||
'shadedProcess',
|
'shadedProcess',
|
||||||
] as const;
|
] as const;
|
||||||
|
const newShapesSet6 = ['curlyBraces'];
|
||||||
|
|
||||||
// Aggregate all shape sets into a single array
|
// Aggregate all shape sets into a single array
|
||||||
const newShapesSets = [
|
const newShapesSets = [
|
||||||
@@ -48,6 +49,7 @@ const newShapesSets = [
|
|||||||
newShapesSet3,
|
newShapesSet3,
|
||||||
newShapesSet4,
|
newShapesSet4,
|
||||||
newShapesSet5,
|
newShapesSet5,
|
||||||
|
newShapesSet6,
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
looks.forEach((look) => {
|
looks.forEach((look) => {
|
||||||
|
@@ -48,6 +48,7 @@ import { multiWaveEdgedRectangle } from './shapes/multiWaveEdgedRectangle.js';
|
|||||||
import { windowPane } from './shapes/windowPane.js';
|
import { windowPane } from './shapes/windowPane.js';
|
||||||
import { linedWaveEdgedRect } from './shapes/linedWaveEdgedRect.js';
|
import { linedWaveEdgedRect } from './shapes/linedWaveEdgedRect.js';
|
||||||
import { taggedWaveEdgedRectangle } from './shapes/taggedWaveEdgedRectangle.js';
|
import { taggedWaveEdgedRectangle } from './shapes/taggedWaveEdgedRectangle.js';
|
||||||
|
import { curlyBraces } from './shapes/curlyBraces.js';
|
||||||
|
|
||||||
//Use these names as the left side to render shapes.
|
//Use these names as the left side to render shapes.
|
||||||
const shapes = {
|
const shapes = {
|
||||||
@@ -212,6 +213,9 @@ const shapes = {
|
|||||||
lightningBolt,
|
lightningBolt,
|
||||||
bolt: lightningBolt,
|
bolt: lightningBolt,
|
||||||
'com-link': lightningBolt,
|
'com-link': lightningBolt,
|
||||||
|
curlyBraces,
|
||||||
|
brace: curlyBraces,
|
||||||
|
comment: curlyBraces,
|
||||||
hourglass,
|
hourglass,
|
||||||
odd: rect_left_inv_arrow,
|
odd: rect_left_inv_arrow,
|
||||||
labelRect,
|
labelRect,
|
||||||
|
@@ -0,0 +1,114 @@
|
|||||||
|
import { labelHelper, updateNodeBounds, getNodeClasses, createPathFromPoints } from './util.js';
|
||||||
|
import intersect from '../intersect/index.js';
|
||||||
|
import type { Node } from '$root/rendering-util/types.d.ts';
|
||||||
|
import {
|
||||||
|
styles2String,
|
||||||
|
userNodeOverrides,
|
||||||
|
} from '$root/rendering-util/rendering-elements/shapes/handDrawnShapeStyles.js';
|
||||||
|
import rough from 'roughjs';
|
||||||
|
|
||||||
|
function generateCirclePoints(
|
||||||
|
centerX: number,
|
||||||
|
centerY: number,
|
||||||
|
radius: number,
|
||||||
|
numPoints = 100,
|
||||||
|
startAngle = 0,
|
||||||
|
endAngle = 180
|
||||||
|
) {
|
||||||
|
const points = [];
|
||||||
|
|
||||||
|
// Convert angles to radians
|
||||||
|
const startAngleRad = (startAngle * Math.PI) / 180;
|
||||||
|
const endAngleRad = (endAngle * Math.PI) / 180;
|
||||||
|
|
||||||
|
// Calculate the angle range in radians
|
||||||
|
const angleRange = endAngleRad - startAngleRad;
|
||||||
|
|
||||||
|
// Calculate the angle step
|
||||||
|
const angleStep = angleRange / (numPoints - 1);
|
||||||
|
|
||||||
|
for (let i = 0; i < numPoints; i++) {
|
||||||
|
const angle = startAngleRad + i * angleStep;
|
||||||
|
const x = centerX + radius * Math.cos(angle);
|
||||||
|
const y = centerY + radius * Math.sin(angle);
|
||||||
|
points.push({ x, y });
|
||||||
|
}
|
||||||
|
|
||||||
|
return points;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const curlyBraces = async (parent: SVGAElement, node: Node) => {
|
||||||
|
const { labelStyles, nodeStyles } = styles2String(node);
|
||||||
|
node.labelStyle = labelStyles;
|
||||||
|
const { shapeSvg, bbox, label } = await labelHelper(parent, node, getNodeClasses(node));
|
||||||
|
const w = bbox.width + (node.padding ?? 0);
|
||||||
|
const h = bbox.height + (node.padding ?? 0);
|
||||||
|
const radius = w * 0.05;
|
||||||
|
|
||||||
|
const { cssStyles } = node;
|
||||||
|
|
||||||
|
const points = [
|
||||||
|
...generateCirclePoints(w / 2, -h / 2, radius, 20, -90, 0),
|
||||||
|
{ x: w / 2 + radius, y: -radius },
|
||||||
|
...generateCirclePoints(w / 2 + w * 0.1, -radius, radius, 20, -180, -270),
|
||||||
|
...generateCirclePoints(w / 2 + w * 0.1, radius, radius, 20, -90, -180),
|
||||||
|
{ x: w / 2 + radius, y: h / 2 },
|
||||||
|
...generateCirclePoints(w / 2, h / 2, radius, 20, 0, 90),
|
||||||
|
];
|
||||||
|
|
||||||
|
const rectPoints = [
|
||||||
|
{ x: -w / 2, y: -h / 2 - radius },
|
||||||
|
{ x: w / 2, y: -h / 2 - radius },
|
||||||
|
...generateCirclePoints(w / 2, -h / 2, radius, 20, -90, 0),
|
||||||
|
{ x: w / 2 + radius, y: -radius },
|
||||||
|
...generateCirclePoints(w / 2 + w * 0.1, -radius, radius, 20, -180, -270),
|
||||||
|
...generateCirclePoints(w / 2 + w * 0.1, radius, radius, 20, -90, -180),
|
||||||
|
{ x: w / 2 + radius, y: h / 2 },
|
||||||
|
...generateCirclePoints(w / 2, h / 2, radius, 20, 0, 90),
|
||||||
|
{ x: w / 2, y: h / 2 + radius },
|
||||||
|
{ x: -w / 2, y: h / 2 + radius },
|
||||||
|
];
|
||||||
|
|
||||||
|
// @ts-ignore - rough is not typed
|
||||||
|
const rc = rough.svg(shapeSvg);
|
||||||
|
const options = userNodeOverrides(node, { fill: 'none' });
|
||||||
|
|
||||||
|
if (node.look !== 'handDrawn') {
|
||||||
|
options.roughness = 0;
|
||||||
|
options.fillStyle = 'solid';
|
||||||
|
}
|
||||||
|
const bowTieRectPath = createPathFromPoints(points);
|
||||||
|
const newCurlyBracePath = bowTieRectPath.replace('Z', '');
|
||||||
|
const curlyBracePath = rc.path(newCurlyBracePath, options);
|
||||||
|
const rectPath = createPathFromPoints(rectPoints);
|
||||||
|
const rectShape = rc.path(rectPath, { ...options });
|
||||||
|
const bowTieRectShape = shapeSvg.insert('g', ':first-child');
|
||||||
|
bowTieRectShape.insert(() => rectShape, ':first-child').attr('stroke-opacity', 0);
|
||||||
|
bowTieRectShape.insert(() => curlyBracePath, ':first-child');
|
||||||
|
bowTieRectShape.attr('class', 'text');
|
||||||
|
|
||||||
|
if (cssStyles && node.look !== 'handDrawn') {
|
||||||
|
bowTieRectShape.selectAll('path').attr('style', cssStyles);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (nodeStyles && node.look !== 'handDrawn') {
|
||||||
|
bowTieRectShape.selectAll('path').attr('style', nodeStyles);
|
||||||
|
}
|
||||||
|
|
||||||
|
bowTieRectShape.attr('transform', `translate(${-radius}, 0)`);
|
||||||
|
|
||||||
|
label.attr(
|
||||||
|
'transform',
|
||||||
|
`translate(${-w / 2 - (bbox.x - (bbox.left ?? 0))},${-h / 2 + (node.padding ?? 0) / 2 - (bbox.y - (bbox.top ?? 0))})`
|
||||||
|
);
|
||||||
|
|
||||||
|
updateNodeBounds(node, bowTieRectShape);
|
||||||
|
|
||||||
|
node.intersect = function (point) {
|
||||||
|
const pos = intersect.polygon(node, rectPoints, point);
|
||||||
|
|
||||||
|
return pos;
|
||||||
|
};
|
||||||
|
|
||||||
|
return shapeSvg;
|
||||||
|
};
|
Reference in New Issue
Block a user