marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-21 16:29:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'neo-new-shapes' into sidv/configReturn

Browse Source 
* neo-new-shapes:
  Mermaid version b.10
  Fix for issue with incorrect calculations of which edge a line intersects with
This commit is contained in:
Sidharth Vinod
2024-09-16 14:46:46 +05:30
parent e0c2b832a9 3730f1afbb
commit 2bb1a2c4f2
4 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,6 +137,11 @@ export const addVertex = function (
}
}
const doc = yaml.load(yamlData, { schema: yaml.JSON_SCHEMA }) as NodeMetaData;
if (doc.shape && doc.shape !== doc.shape.toLowerCase()) {
throw new Error(`No such shape: ${node.shape}. Shape names should be lowercase.`);
}
// console.log('yamlData doc', doc);
if (doc?.shape) {
vertex.type = doc?.shape;

27
packages/mermaid/src/rendering-util/layout-algorithms/fixed/index.js
View File

@@ -30,18 +30,31 @@ let nodeDB = new Map();
const calcIntersectionPoint = (node, point) => {
const intersection = node.intersect(point);
const dx = intersection.x - node.x;
const dy = intersection.y - node.y;
let pos = 'l';
const dx = point.x - node.x;
const dy = point.y - node.y;
// Determine the position of the intersection relative to the node
if (Math.abs(dx) > Math.abs(dy)) {
pos = dx > 0 ? 'r' : 'l'; // Right or left
const angleRad = Math.atan2(dy, dx);
const angleDeg = angleRad * (180 / Math.PI);
const halfWidth = node.width / 2;
const halfHeight = node.height / 2;
const criticalAngleRad = Math.atan2(halfHeight, halfWidth);
const criticalAngleDeg = criticalAngleRad * (180 / Math.PI);
let pos;
if (angleDeg >= -criticalAngleDeg && angleDeg <= criticalAngleDeg) {
pos = 'r'; // Right
} else if (angleDeg > criticalAngleDeg && angleDeg <= 180 - criticalAngleDeg) {
pos = 'b'; // Bottom
} else if (angleDeg < -criticalAngleDeg && angleDeg >= -180 + criticalAngleDeg) {
pos = 't'; // Top
} else {
pos = dy > 0 ? 'b' : 't'; // Bottom or top
pos = 'l'; // Left
}
// console.log('angleDeg', angleDeg, 'pos', pos, criticalAngleDeg);
return { x: intersection.x, y: intersection.y, pos };
};