GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-14 06:43:25 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit

Browse Source
This commit is contained in:
RounakJoshi09 2023-10-22 19:34:05 +05:30 committed by GitHub
commit f92ad6307e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cypress/platform/knsv2.html
View File

@ -58,8 +58,10 @@
</head>
<body>
<pre id="diagram" class="mermaid">
classDiagram
`Class<img src=x onerror=alert(1)>` <|-- `Class2<img src=x onerror=alert(2)>`
flowchart-elk LR
subgraph example
node
end
</pre>
<pre id="diagram" class="mermaid2">
flowchart

2
packages/mermaid/package.json
View File

@ -1,6 +1,6 @@
{
"name": "mermaid",
"version": "10.5.0",
"version": "10.5.1",
"description": "Markdown-ish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
"type": "module",
"module": "./dist/mermaid.core.mjs",

6
packages/mermaid/src/diagrams/flowchart/elk/flowRenderer-elk.js
View File

@ -803,8 +803,14 @@ const insertChildren = (nodeArray, parentLookupDb) => {
*/
export const draw = async function (text, id, _version, diagObj) {
// Add temporary render element
diagObj.db.clear();
nodeDb = {};
portPos = {};
diagObj.db.setGen('gen-2');
// Parse the graph definition
diagObj.parser.parse(text);
const renderEl = select('body').append('div').attr('style', 'height:400px').attr('id', 'cy');
let graph = {
id: 'root',

7
packages/mermaid/src/docs/.vitepress/theme/index.ts
View File

@ -6,8 +6,8 @@ import Mermaid from './Mermaid.vue';
import Contributors from '../components/Contributors.vue';
// @ts-ignore
import HomePage from '../components/HomePage.vue';
// @ts-ignore
import TopBar from '../components/TopBar.vue';
// // @ts-ignore
// import TopBar from '../components/TopBar.vue';
import { getRedirect } from './redirect.js';
@ -21,7 +21,8 @@ export default {
...DefaultTheme,
Layout() {
return h(Theme.Layout, null, {
'home-hero-before': () => h(TopBar),
// Keeping this as comment as it took a lot of time to figure out how to add a component to the top bar.
// 'home-hero-before': () => h(TopBar),
'home-features-after': () => h(HomePage),
});
},

6
packages/mermaid/src/docs/index.md
View File

@ -31,7 +31,7 @@ features:
- title: 🏆 Award winning!
details: 2019 JavaScript Open Source Award winner for "The Most Exciting Use of Technology".
link: https://osawards.com/javascript/2019
- title: 🎉 We are on Product Hunt!
details: We would love any and all support from the Mermaid community!
link: https://www.producthunt.com/posts/mermaid-chart
- title: 🥰 Mermaid + Mermaid Chart
details: Mermaid Chart is a major supporter of the Mermaid project.
link: https://www.mermaidchart.com/
---