marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-08-26 19:56:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

#5237 Fix fir subgraphs with elk

Browse Source
This commit is contained in:
Knut Sveidqvist
2024-07-03 15:47:33 +02:00
parent 8db678a039
commit 6b7d78ebcf
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/mermaid-layout-elk/src/render.ts
View File

@@ -594,18 +594,11 @@ export const render = async (data4Layout, svg, element, algorithm) => {
return { x: segment.x + offset.x, y: segment.y + offset.y }; return { x: segment.x + offset.x, y: segment.y + offset.y };
}); });
edge.points = [ edge.points = [
{
x: startNode.x + startNode.width / 2 + offset.x,
y: startNode.y + startNode.height / 2 + offset.y,
},
{ x: src.x + offset.x, y: src.y + offset.y }, { x: src.x + offset.x, y: src.y + offset.y },
...segPoints, ...segPoints,
{ x: dest.x + offset.x, y: dest.y + offset.y }, { x: dest.x + offset.x, y: dest.y + offset.y },
{
x: endNode.x + endNode.width / 2 + offset.x,
y: endNode.y + endNode.height / 2 + offset.y,
},
]; ];
let sw = startNode.width; let sw = startNode.width;
let ew = endNode.width; let ew = endNode.width;
if (startNode.isGroup) { if (startNode.isGroup) {
@@ -644,7 +637,18 @@ export const render = async (data4Layout, svg, element, algorithm) => {
startNode.innerHTML startNode.innerHTML
); );
} }
if (startNode.shape === 'diamond') {
edge.points.unshift({
x: startNode.x + startNode.width / 2 + offset.x,
y: startNode.y + startNode.height / 2 + offset.y,
});
}
if (startNode.shape === 'diamond') {
edge.points.push({
x: endNode.x + endNode.width / 2 + offset.x,
y: endNode.y + endNode.height / 2 + offset.y,
});
}
edge.points = cutPathAtIntersect( edge.points = cutPathAtIntersect(
edge.points.reverse(), edge.points.reverse(),
{ {