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

5237 Subgraph handling

Browse Source
This commit is contained in:
Knut Sveidqvist
2024-06-12 11:34:13 +02:00
parent d895a62565
commit 913dbee2e7
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/mermaid/src/rendering-util/layout-algorithms/dagre/index.js
View File

@@ -183,11 +183,12 @@ const recursiveRender = async (_elem, graph, diagramType, id, parentCluster, sit
const halfPadding = node?.padding / 2 || 0; const halfPadding = node?.padding / 2 || 0;
const labelHeight = node?.labelBBox?.height || 0; const labelHeight = node?.labelBBox?.height || 0;
const offsetY = labelHeight - halfPadding || 0; const offsetY = labelHeight - halfPadding || 0;
node.y += offsetY / 2 + 2; node.y += offsetY + (parent?.offsetY / 2 || 4);
node.offsetY = offsetY;
insertCluster(clusters, node); insertCluster(clusters, node);
// A cluster in the non-recursive way // A cluster in the non-recursive way
log.info( console.log(
'A tainted cluster node with children XBX', 'A tainted cluster node with children XBX',
v, v,
node.id, node.id,
@@ -204,7 +205,6 @@ const recursiveRender = async (_elem, graph, diagramType, id, parentCluster, sit
node.y += (parent?.offsetY || 0) / 2; node.y += (parent?.offsetY || 0) / 2;
log.info( log.info(
'A regular node XBX - using the padding', 'A regular node XBX - using the padding',
v,
node.id, node.id,
'parent', 'parent',
node.parentId, node.parentId,
@@ -216,6 +216,7 @@ const recursiveRender = async (_elem, graph, diagramType, id, parentCluster, sit
node.offsetY, node.offsetY,
'parent', 'parent',
parent, parent,
parent?.offsetY,
node node
); );

6
packages/mermaid/src/rendering-util/rendering-elements/clusters.js
View File

@@ -209,6 +209,12 @@ const roundedWithTitle = (parent, node) => {
node.diff = -node.padding / 2; node.diff = -node.padding / 2;
} }
// if (node.id === 'Apa0') {
// console.log('XBX here', node);
// node.y += 10;
// } else {
// console.log('XBX there', node);
// }
const x = node.x - width / 2 - halfPadding; const x = node.x - width / 2 - halfPadding;
const y = node.y - node.height / 2 - halfPadding; const y = node.y - node.height / 2 - halfPadding;
const innerY = node.y - node.height / 2 - halfPadding + bbox.height - 1; const innerY = node.y - node.height / 2 - halfPadding + bbox.height - 1;