diff --git a/cypress/platform/knsv2.html b/cypress/platform/knsv2.html
index ba7f41601..83472039d 100644
--- a/cypress/platform/knsv2.html
+++ b/cypress/platform/knsv2.html
@@ -56,29 +56,30 @@
Security check
-graph LR
- subgraph external
- inside
+flowchart LR
+ %% Actors
+ A
+ subgraph Sub
+ B --> C
end
- outside --> external
+
+ %% Accusations
+ A --L --> Sub
+
+ %% Offense
+ B --> A
+
-mindmap
- root
- child1((Circle))
- grandchild 1
- grandchild 2
- child2(Round rectangle)
- grandchild 3
- grandchild 4
- child3[Square]
- grandchild 5
- ::icon(mdi mdi-fire)
- gc6((grand
child 6))
- ::icon(mdi mdi-fire)
- gc7((grand
grand
child 8))
-
-
+ stateDiagram-v2
+
+ [*] --> S1
+ S1 --> S2: long line using
should work
+ S1 --> S3: long line using
should work
+ S1 --> S4: long line using \\nshould work
+
+
+
gantt
title Style today marker (vertical line should be 5px wide and half-transparent blue)
dateFormat YYYY-MM-DD
@@ -103,7 +104,7 @@ mindmap
// console.error('Mermaid error: ', err);
};
mermaid.initialize({
- theme: 'base',
+ theme: 'default',
startOnLoad: true,
logLevel: 0,
flowchart: {
@@ -114,10 +115,6 @@ mindmap
useMaxWidth: false,
},
useMaxWidth: false,
- lazyLoadedDiagrams: [
- './mermaid-mindmap-detector.esm.mjs',
- './mermaid-example-diagram-detector.esm.mjs',
- ],
});
function callback() {
alert('It worked');
diff --git a/packages/mermaid/src/dagre-wrapper/clusters.js b/packages/mermaid/src/dagre-wrapper/clusters.js
index 40729dead..57c3ff513 100644
--- a/packages/mermaid/src/dagre-wrapper/clusters.js
+++ b/packages/mermaid/src/dagre-wrapper/clusters.js
@@ -59,11 +59,9 @@ const rect = (parent, node) => {
// Center the label
label.attr(
'transform',
- 'translate(' +
- (node.x - bbox.width / 2) +
- ', ' +
- (node.y - node.height / 2 + node.padding / 3) +
- ')'
+ // This puts the labal on top of the box instead of inside it
+ // 'translate(' + (node.x - bbox.width / 2) + ', ' + (node.y - node.height / 2 - bbox.height) + ')'
+ 'translate(' + (node.x - bbox.width / 2) + ', ' + (node.y - node.height / 2) + ')'
);
const rectBox = rect.node().getBBox();
diff --git a/packages/mermaid/src/dagre-wrapper/edges.js b/packages/mermaid/src/dagre-wrapper/edges.js
index 5213d0684..bb22cee83 100644
--- a/packages/mermaid/src/dagre-wrapper/edges.js
+++ b/packages/mermaid/src/dagre-wrapper/edges.js
@@ -130,9 +130,21 @@ export const positionEdgeLabel = (edge, paths) => {
if (path) {
// // debugger;
const pos = utils.calcLabelPosition(path);
- log.info('Moving label from (', x, ',', y, ') to (', pos.x, ',', pos.y, ') abc78');
- // x = pos.x;
- // y = pos.y;
+ log.info(
+ 'Moving label ' + edge.label + ' from (',
+ x,
+ ',',
+ y,
+ ') to (',
+ pos.x,
+ ',',
+ pos.y,
+ ') abc78'
+ );
+ if (paths.updatedPath) {
+ x = pos.x;
+ y = pos.y;
+ }
}
el.attr('transform', 'translate(' + x + ', ' + y + ')');
}
@@ -463,7 +475,7 @@ export const insertEdge = function (elem, e, edge, clusterDb, diagramType, graph
.attr('style', edge.style);
// DEBUG code, adds a red circle at each edge coordinate
- // edge.points.forEach(point => {
+ // edge.points.forEach((point) => {
// elem
// .append('circle')
// .style('stroke', 'red')