mirror of
https://github.com/mermaid-js/mermaid.git
synced 2025-09-20 15:59:51 +02:00
Draft of second set of shapes [Card, Cylinder, Reversed Trapezoid, Odd, Tagged Rect]
This commit is contained in:
omkarht
248
cypress/platform/omkarht-new-padding.html
Normal file
248
cypress/platform/omkarht-new-padding.html
Normal file
@@ -0,0 +1,248 @@
|
|||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<link href="https://fonts.googleapis.com/css?family=Montserrat&display=swap" rel="stylesheet" />
|
||||||
|
<link href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css" rel="stylesheet" />
|
||||||
|
<link
|
||||||
|
rel="stylesheet"
|
||||||
|
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"
|
||||||
|
/>
|
||||||
|
<link
|
||||||
|
href="https://cdn.jsdelivr.net/npm/@mdi/font@6.9.96/css/materialdesignicons.min.css"
|
||||||
|
rel="stylesheet"
|
||||||
|
/>
|
||||||
|
<link
|
||||||
|
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css"
|
||||||
|
rel="stylesheet"
|
||||||
|
/>
|
||||||
|
<link
|
||||||
|
href="https://fonts.googleapis.com/css?family=Noto+Sans+SC&display=swap"
|
||||||
|
rel="stylesheet"
|
||||||
|
/>
|
||||||
|
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
||||||
|
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
|
||||||
|
<link
|
||||||
|
href="https://fonts.googleapis.com/css2?family=Kalam:wght@300;400;700&display=swap"
|
||||||
|
rel="stylesheet"
|
||||||
|
/>
|
||||||
|
<link
|
||||||
|
href="https://fonts.googleapis.com/css2?family=Caveat:wght@400..700&family=Kalam:wght@300;400;700&family=Rubik+Mono+One&display=swap"
|
||||||
|
rel="stylesheet"
|
||||||
|
/>
|
||||||
|
<link
|
||||||
|
href="https://fonts.googleapis.com/css2?family=Kalam:wght@300;400;700&family=Rubik+Mono+One&display=swap"
|
||||||
|
rel="stylesheet"
|
||||||
|
/>
|
||||||
|
<link
|
||||||
|
href="https://fonts.googleapis.com/css2?family=Recursive:wght@300..1000&display=swap"
|
||||||
|
rel="stylesheet"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.recursive-500 {
|
||||||
|
font-family: 'Recursive', serif;
|
||||||
|
font-optical-sizing: auto;
|
||||||
|
font-weight: 500;
|
||||||
|
font-style: normal;
|
||||||
|
font-variation-settings:
|
||||||
|
'slnt' 0,
|
||||||
|
'CASL' 0,
|
||||||
|
'CRSV' 0.5,
|
||||||
|
'MONO' 0;
|
||||||
|
}
|
||||||
|
body {
|
||||||
|
/* background: rgb(221, 208, 208); */
|
||||||
|
/* background: #333; */
|
||||||
|
/* font-family: 'Arial'; */
|
||||||
|
font-family: 'Recursive', serif;
|
||||||
|
font-optical-sizing: auto;
|
||||||
|
font-weight: 500;
|
||||||
|
font-style: normal;
|
||||||
|
font-variation-settings:
|
||||||
|
'slnt' 0,
|
||||||
|
'CASL' 0,
|
||||||
|
'CRSV' 0.5,
|
||||||
|
'MONO' 0;
|
||||||
|
/* color: white; */
|
||||||
|
/* font-size: 18px !important; */
|
||||||
|
}
|
||||||
|
.gridify.tiny {
|
||||||
|
background-image: linear-gradient(
|
||||||
|
transparent 11px,
|
||||||
|
rgba(220, 220, 200, 0.8) 12px,
|
||||||
|
transparent 12px
|
||||||
|
),
|
||||||
|
linear-gradient(90deg, transparent 11px, rgba(220, 220, 200, 0.8) 12px, transparent 12px);
|
||||||
|
background-size:
|
||||||
|
100% 12px,
|
||||||
|
12px 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.gridify.dots {
|
||||||
|
background-image: radial-gradient(
|
||||||
|
circle at center,
|
||||||
|
rgba(220, 220, 200, 0.8) 1px,
|
||||||
|
transparent 1px
|
||||||
|
);
|
||||||
|
background-size: 24px 24px;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
color: grey;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mermaid2 {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mermaid svg {
|
||||||
|
font-size: 16px !important;
|
||||||
|
font-family: 'Recursive', serif;
|
||||||
|
font-optical-sizing: auto;
|
||||||
|
font-weight: 500;
|
||||||
|
font-style: normal;
|
||||||
|
font-variation-settings:
|
||||||
|
'slnt' 0,
|
||||||
|
'CASL' 0,
|
||||||
|
'CRSV' 0.5,
|
||||||
|
'MONO' 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
pre {
|
||||||
|
width: 100%;
|
||||||
|
/*box-shadow: 4px 4px 0px 0px #0000000F;*/
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body class="gridify dots">
|
||||||
|
<p class="mb-20">Test Diagram</p>
|
||||||
|
<div class="w-full h-64">
|
||||||
|
<pre style="display: none">
|
||||||
|
---
|
||||||
|
config:
|
||||||
|
theme: neo
|
||||||
|
layout: dagre
|
||||||
|
---
|
||||||
|
flowchart TD
|
||||||
|
A{"Cylinder"} --- n1["Rectangle"] & n2["Rounded"] & n3(["Stadium"])
|
||||||
|
n1 --x n4["Rounded"]
|
||||||
|
n2 --o n5["Hexagon"]
|
||||||
|
n3 --> n6["Parallelogram"]
|
||||||
|
n5 o--o n7["Trapezoid"]
|
||||||
|
n4 x--x n8["Lean Right"]
|
||||||
|
n6 <--> n9(("Circle"))
|
||||||
|
n8 --> n10["Rose"]
|
||||||
|
n7 --> n11["Pine"]
|
||||||
|
n9 --> n12["Peach"]
|
||||||
|
n2@{ shape: rounded}
|
||||||
|
n4@{ shape: rounded}
|
||||||
|
n5@{ shape: hex}
|
||||||
|
n6@{ shape: lean-l}
|
||||||
|
n7@{ shape: trap-b}
|
||||||
|
n8@{ shape: lean-r}
|
||||||
|
|
||||||
|
n10:::Rose
|
||||||
|
n11:::Pine
|
||||||
|
n12:::Peach
|
||||||
|
classDef Rose stroke-width:1px, stroke-dasharray:none, stroke:#FF5978, fill:#FFDFE5, color:#8E2236
|
||||||
|
classDef Pine stroke-width:1px, stroke-dasharray:none, stroke:#254336, fill:#27654A, color:#FFFFFF
|
||||||
|
classDef Peach stroke-width:1px, stroke-dasharray:none, stroke:#FBB35A, fill:#FFEFDB, color:#8F632D
|
||||||
|
n10 --x End
|
||||||
|
n11 --x End
|
||||||
|
n12 --x End
|
||||||
|
|
||||||
|
</pre
|
||||||
|
>
|
||||||
|
|
||||||
|
<pre id="diagram4" class="mermaid">
|
||||||
|
---
|
||||||
|
config:
|
||||||
|
theme: neo
|
||||||
|
layout: dagre
|
||||||
|
---
|
||||||
|
flowchart TD
|
||||||
|
n1["Cylinder"]
|
||||||
|
n1@{ shape: database}
|
||||||
|
|
||||||
|
</pre
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<script type="module">
|
||||||
|
import mermaid from './mermaid.esm.mjs';
|
||||||
|
import layouts from './mermaid-layout-elk.esm.mjs';
|
||||||
|
|
||||||
|
const staticBellIconPack = {
|
||||||
|
prefix: 'fa6-regular',
|
||||||
|
icons: {
|
||||||
|
bell: {
|
||||||
|
body: '<path fill="currentColor" d="M224 0c-17.7 0-32 14.3-32 32v19.2C119 66 64 130.6 64 208v25.4c0 45.4-15.5 89.5-43.8 124.9L5.3 377c-5.8 7.2-6.9 17.1-2.9 25.4S14.8 416 24 416h400c9.2 0 17.6-5.3 21.6-13.6s2.9-18.2-2.9-25.4l-14.9-18.6c-28.3-35.5-43.8-79.6-43.8-125V208c0-77.4-55-142-128-156.8V32c0-17.7-14.3-32-32-32m0 96c61.9 0 112 50.1 112 112v25.4c0 47.9 13.9 94.6 39.7 134.6H72.3c25.8-40 39.7-86.7 39.7-134.6V208c0-61.9 50.1-112 112-112m64 352H160c0 17 6.7 33.3 18.7 45.3S207 512 224 512s33.3-6.7 45.3-18.7S288 465 288 448"/>',
|
||||||
|
width: 448,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
width: 512,
|
||||||
|
height: 512,
|
||||||
|
};
|
||||||
|
|
||||||
|
mermaid.registerIconPacks([
|
||||||
|
{
|
||||||
|
name: 'logos',
|
||||||
|
loader: () =>
|
||||||
|
fetch('https://unpkg.com/@iconify-json/logos@1/icons.json').then((res) => res.json()),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'fa',
|
||||||
|
loader: () => staticBellIconPack,
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
mermaid.registerLayoutLoaders(layouts);
|
||||||
|
mermaid.parseError = function (err, hash) {
|
||||||
|
console.error('Mermaid error: ', err);
|
||||||
|
};
|
||||||
|
window.callback = function () {
|
||||||
|
alert('A callback was triggered');
|
||||||
|
};
|
||||||
|
function callback() {
|
||||||
|
alert('It worked');
|
||||||
|
}
|
||||||
|
await mermaid.initialize({
|
||||||
|
startOnLoad: false,
|
||||||
|
theme: 'redux',
|
||||||
|
// theme: 'default',
|
||||||
|
// theme: 'forest',
|
||||||
|
// handDrawnSeed: 12,
|
||||||
|
look: 'neo',
|
||||||
|
// 'elk.nodePlacement.strategy': 'NETWORK_SIMPLEX',
|
||||||
|
// layout: 'dagre',
|
||||||
|
// layout: 'elk',
|
||||||
|
// layout: 'fixed',
|
||||||
|
// htmlLabels: false,
|
||||||
|
flowchart: { titleTopMargin: 10 },
|
||||||
|
|
||||||
|
// fontFamily: 'Caveat',
|
||||||
|
// fontFamily: 'Kalam',
|
||||||
|
// fontFamily: 'courier',
|
||||||
|
fontFamily: 'Recursive',
|
||||||
|
sequence: {
|
||||||
|
actorFontFamily: 'courier',
|
||||||
|
noteFontFamily: 'courier',
|
||||||
|
messageFontFamily: 'courier',
|
||||||
|
},
|
||||||
|
kanban: {
|
||||||
|
htmlLabels: false,
|
||||||
|
},
|
||||||
|
fontSize: 16,
|
||||||
|
logLevel: 0,
|
||||||
|
securityLevel: 'loose',
|
||||||
|
callback,
|
||||||
|
});
|
||||||
|
// setTimeout(() => {
|
||||||
|
mermaid.init(undefined, document.querySelectorAll('.mermaid'));
|
||||||
|
// }, 1000);
|
||||||
|
mermaid.parseError = function (err, hash) {
|
||||||
|
console.error('In parse error:');
|
||||||
|
console.error(err);
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -25,15 +25,18 @@ export async function card<T extends SVGGraphicsElement>(parent: D3Selection<T>,
|
|||||||
// as labelHelper does not take padding into account
|
// as labelHelper does not take padding into account
|
||||||
// also check if the width or height is less than minimum default values (50),
|
// also check if the width or height is less than minimum default values (50),
|
||||||
// if so set it to min value
|
// if so set it to min value
|
||||||
|
const nodePadding = node.padding ?? 0;
|
||||||
|
const labelPaddingX = node.look === 'neo' ? 25 : 0;
|
||||||
|
const labelPaddingY = node.look === 'neo' ? 24 : nodePadding;
|
||||||
if (node.width || node.height) {
|
if (node.width || node.height) {
|
||||||
node.width = Math.max((node?.width ?? 0) - (node.padding ?? 0), 10);
|
node.width = Math.max((node?.width ?? 0) - (labelPaddingX ?? 0), 10);
|
||||||
node.height = Math.max((node?.height ?? 0) - (node.padding ?? 0), 10);
|
node.height = Math.max((node?.height ?? 0) - (labelPaddingY ?? 0), 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
const { shapeSvg, bbox } = await labelHelper(parent, node, getNodeClasses(node));
|
const { shapeSvg, bbox } = await labelHelper(parent, node, getNodeClasses(node));
|
||||||
|
|
||||||
const totalWidth = (node?.width ? node?.width : bbox.width) + (node.padding ?? 0);
|
const totalWidth = (node?.width ? node?.width : bbox.width) + (labelPaddingX ?? 0);
|
||||||
const totalHeight = (node?.height ? node?.height : bbox.height) + (node.padding ?? 0);
|
const totalHeight = (node?.height ? node?.height : bbox.height) + (labelPaddingY ?? 0);
|
||||||
|
|
||||||
const h = totalHeight;
|
const h = totalHeight;
|
||||||
const w = totalWidth;
|
const w = totalWidth;
|
||||||
|
|||||||
@@ -61,8 +61,8 @@ export async function cylinder<T extends SVGGraphicsElement>(parent: D3Selection
|
|||||||
node.labelStyle = labelStyles;
|
node.labelStyle = labelStyles;
|
||||||
|
|
||||||
const nodePadding = node.padding ?? 0;
|
const nodePadding = node.padding ?? 0;
|
||||||
const labelPaddingX = node.look === 'neo' ? nodePadding * 2 : nodePadding;
|
const labelPaddingX = node.look === 'neo' ? 24 : nodePadding;
|
||||||
const labelPaddingY = node.look === 'neo' ? nodePadding * 1 : nodePadding;
|
const labelPaddingY = node.look === 'neo' ? 16 : nodePadding;
|
||||||
|
|
||||||
if (node.width || node.height) {
|
if (node.width || node.height) {
|
||||||
const originalWidth = node.width ?? 0;
|
const originalWidth = node.width ?? 0;
|
||||||
|
|||||||
@@ -29,7 +29,8 @@ export async function inv_trapezoid<T extends SVGGraphicsElement>(
|
|||||||
node.labelStyle = labelStyles;
|
node.labelStyle = labelStyles;
|
||||||
|
|
||||||
const nodePadding = node.padding ?? 0;
|
const nodePadding = node.padding ?? 0;
|
||||||
const labelPaddingY = node.look === 'neo' ? nodePadding * 1.5 : nodePadding * 2;
|
const labelPaddingY = node.look === 'neo' ? 24 : nodePadding;
|
||||||
|
const labelPaddingX = node.look === 'neo' ? 19 : 0;
|
||||||
if (node.width || node.height) {
|
if (node.width || node.height) {
|
||||||
node.width = node?.width ?? 0;
|
node.width = node?.width ?? 0;
|
||||||
if (node.width < 10) {
|
if (node.width < 10) {
|
||||||
@@ -46,7 +47,7 @@ export async function inv_trapezoid<T extends SVGGraphicsElement>(
|
|||||||
}
|
}
|
||||||
const { shapeSvg, bbox } = await labelHelper(parent, node, getNodeClasses(node));
|
const { shapeSvg, bbox } = await labelHelper(parent, node, getNodeClasses(node));
|
||||||
const h = (node?.height ? node?.height : bbox.height) + labelPaddingY;
|
const h = (node?.height ? node?.height : bbox.height) + labelPaddingY;
|
||||||
const w = node?.width ? node?.width : bbox.width;
|
const w = node?.width ? node?.width : bbox.width + labelPaddingX * 2;
|
||||||
|
|
||||||
const points = [
|
const points = [
|
||||||
{ x: 0, y: 0 },
|
{ x: 0, y: 0 },
|
||||||
|
|||||||
@@ -12,9 +12,8 @@ export async function rect_left_inv_arrow<T extends SVGGraphicsElement>(
|
|||||||
const { labelStyles, nodeStyles } = styles2String(node);
|
const { labelStyles, nodeStyles } = styles2String(node);
|
||||||
node.labelStyle = labelStyles;
|
node.labelStyle = labelStyles;
|
||||||
const nodePadding = node.padding ?? 0;
|
const nodePadding = node.padding ?? 0;
|
||||||
const labelPaddingX = node.look === 'neo' ? nodePadding * 3 : (node.padding ?? 0);
|
const labelPaddingX = node.look === 'neo' ? 21 : (nodePadding ?? 0);
|
||||||
const labelPaddingY = node.look === 'neo' ? nodePadding * 1.5 : (node.padding ?? 0);
|
const labelPaddingY = node.look === 'neo' ? 12 : (nodePadding ?? 0);
|
||||||
|
|
||||||
if (node.width || node.height) {
|
if (node.width || node.height) {
|
||||||
node.width = (node?.width ?? 10) - labelPaddingX * 2;
|
node.width = (node?.width ?? 10) - labelPaddingX * 2;
|
||||||
node.height = (node?.height ?? 10) - labelPaddingY * 2;
|
node.height = (node?.height ?? 10) - labelPaddingY * 2;
|
||||||
|
|||||||
@@ -13,8 +13,8 @@ export async function taggedRect<T extends SVGGraphicsElement>(parent: D3Selecti
|
|||||||
node.labelStyle = labelStyles;
|
node.labelStyle = labelStyles;
|
||||||
|
|
||||||
const nodePadding = node.padding ?? 0;
|
const nodePadding = node.padding ?? 0;
|
||||||
const labelPaddingX = node.look === 'neo' ? nodePadding * 2 : nodePadding;
|
const labelPaddingX = node.look === 'neo' ? 16 : nodePadding;
|
||||||
const labelPaddingY = node.look === 'neo' ? nodePadding * 1 : nodePadding;
|
const labelPaddingY = node.look === 'neo' ? 12 : nodePadding;
|
||||||
|
|
||||||
// If incoming height & width are present, subtract the padding from them
|
// If incoming height & width are present, subtract the padding from them
|
||||||
// as labelHelper does not take padding into account
|
// as labelHelper does not take padding into account
|
||||||
|
|||||||
Reference in New Issue
Block a user