marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-11-18 19:54:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: temp fix for shape with comma

Browse Source
This commit is contained in:
Ashish Jain
2024-07-26 10:02:12 +02:00
parent 4d8e519298
commit f176b71c7c
3 changed files with 3178 additions and 9177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
cypress/platform/knsv2.html
View File

@@ -1,33 +1,19 @@
<html> <html>
<head> <head>
<link href="https://fonts.googleapis.com/css?family=Montserrat&display=swap" rel="stylesheet" /> <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 href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css" rel="stylesheet" />
<link <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
rel="stylesheet" <link href="https://cdn.jsdelivr.net/npm/@mdi/font@6.9.96/css/materialdesignicons.min.css" rel="stylesheet" />
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" <link href="https://fonts.googleapis.com/css?family=Noto+Sans+SC&display=swap" rel="stylesheet" />
/>
<link
href="https://cdn.jsdelivr.net/npm/@mdi/font@6.9.96/css/materialdesignicons.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.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin /> <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link <link href="https://fonts.googleapis.com/css2?family=Kalam:wght@300;400;700&display=swap" rel="stylesheet" />
href="https://fonts.googleapis.com/css2?family=Kalam:wght@300;400;700&display=swap"
rel="stylesheet"
/>
<link <link
href="https://fonts.googleapis.com/css2?family=Caveat:wght@400..700&family=Kalam:wght@300;400;700&family=Rubik+Mono+One&display=swap" 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" rel="stylesheet" />
/> <link href="https://fonts.googleapis.com/css2?family=Kalam:wght@300;400;700&family=Rubik+Mono+One&display=swap"
<link rel="stylesheet" />
href="https://fonts.googleapis.com/css2?family=Kalam:wght@300;400;700&family=Rubik+Mono+One&display=swap"
rel="stylesheet"
/>
<style> <style>
body { body {
@@ -36,12 +22,15 @@
font-family: 'Arial'; font-family: 'Arial';
/* font-size: 18px !important; */ /* font-size: 18px !important; */
} }
h1 { h1 {
color: grey; color: grey;
} }
.mermaid2 { .mermaid2 {
display: none; display: none;
} }
.mermaid svg { .mermaid svg {
/* font-size: 18px !important; */ /* font-size: 18px !important; */
@@ -56,6 +45,7 @@
} }
</style> </style>
</head> </head>
<body> <body>
<pre id="diagram4" class="mermaid"> <pre id="diagram4" class="mermaid">
flowchart flowchart
@@ -69,9 +59,8 @@ flowchart
shape: hexagon, shape: hexagon,
icon: car icon: car
}@ --> B }@ --> B
</pre </pre>
> <pre id="diagram4" class="mermaid2">
<pre id="diagram4" class="mermaid">
flowchart flowchart
A{"This is a label"}@{ A{"This is a label"}@{
@@ -90,8 +79,7 @@ flowchart
icon: car icon: car
}@ --> B }@ --> B
A(This is a label) A(This is a label)
</pre </pre>
>
<script type="module"> <script type="module">
import mermaid from './mermaid.esm.mjs'; import mermaid from './mermaid.esm.mjs';
@@ -137,4 +125,5 @@ flowchart
}; };
</script> </script>
</body> </body>
</html> </html>

4
packages/mermaid/src/diagrams/flowchart/flowDb.ts
View File

@@ -140,6 +140,10 @@ export const addVertex = function (
const doc = yaml.load(yamlData, { schema: yaml.JSON_SCHEMA }); const doc = yaml.load(yamlData, { schema: yaml.JSON_SCHEMA });
console.log('yamlData doc', doc); console.log('yamlData doc', doc);
if (doc?.shape) { if (doc?.shape) {
//check if shape has a trailing `,` and remove it
if (doc.shape.endsWith(',')) {
doc.shape = doc.shape.slice(0, -1);
}
vertex.type = doc?.shape; vertex.type = doc?.shape;
} }
if (doc?.label) { if (doc?.label) {

12162
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff