GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-02-04 07:13:25 +08:00
Code Issues Projects Releases Wiki Activity

Include subgraph margin into label positioning

Browse Source
This commit is contained in:
Matheus B 2023-11-11 18:18:51 -03:00
parent 52ed38719f
commit 8b0a5be6d9
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/mermaid/src/dagre-wrapper/clusters.js
View File

@ -5,6 +5,7 @@ import { createText } from '../rendering-util/createText.js';
import { select } from 'd3'; import { select } from 'd3';
import { getConfig } from '../diagram-api/diagramAPI.js'; import { getConfig } from '../diagram-api/diagramAPI.js';
import { evaluate } from '../diagrams/common/common.js'; import { evaluate } from '../diagrams/common/common.js';
import { getSubGraphTitleMargins } from '../utils/getSubGraphTitleMargins.js';
const rect = (parent, node) => { const rect = (parent, node) => {
log.info('Creating subgraph rect for ', node.id, node); log.info('Creating subgraph rect for ', node.id, node);
@ -63,17 +64,22 @@ const rect = (parent, node) => {
.attr('width', width) .attr('width', width)
.attr('height', node.height + padding); .attr('height', node.height + padding);
const { subGraphTitleTopMargin } = getSubGraphTitleMargins();
if (useHtmlLabels) { if (useHtmlLabels) {
label.attr( label.attr(
'transform', 'transform',
// This puts the labal on top of the box instead of inside it // This puts the labal on top of the box instead of inside it
'translate(' + (node.x - bbox.width / 2) + ', ' + (node.y - node.height / 2) + ')' 'translate(' +
(node.x - bbox.width / 2) +
', ' +
(node.y - node.height / 2 + subGraphTitleTopMargin) +
')'
); );
} else { } else {
label.attr( label.attr(
'transform', 'transform',
// This puts the labal on top of the box instead of inside it // This puts the labal on top of the box instead of inside it
'translate(' + node.x + ', ' + (node.y - node.height / 2) + ')' 'translate(' + node.x + ', ' + (node.y - node.height / 2 + subGraphTitleTopMargin) + ')'
); );
} }
// Center the label // Center the label
@ -175,6 +181,7 @@ const roundedWithTitle = (parent, node) => {
.attr('width', width + padding) .attr('width', width + padding)
.attr('height', node.height + padding - bbox.height - 3); .attr('height', node.height + padding - bbox.height - 3);
const { subGraphTitleTopMargin } = getSubGraphTitleMargins();
// Center the label // Center the label
label.attr( label.attr(
'transform', 'transform',
@ -185,6 +192,7 @@ const roundedWithTitle = (parent, node) => {
node.height / 2 - node.height / 2 -
node.padding / 3 + node.padding / 3 +
(evaluate(getConfig().flowchart.htmlLabels) ? 5 : 3)) + (evaluate(getConfig().flowchart.htmlLabels) ? 5 : 3)) +
subGraphTitleTopMargin +
')' ')'
); );