marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-27 11:19:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for fixed layout, mermaid v11.0.0-b.61

Browse Source
This commit is contained in:
Knut Sveidqvist
2024-08-08 09:49:16 +02:00
parent 534cf32231
commit 8e3cb5fb1b
6 changed files with 12 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -280,7 +280,7 @@ export const addEdges = async function (dataForLayout, graph, svg) {
await Promise.all(
edges.map(async function (edge) {
let linkId = edge.id;
const linkId = edge.id;
if (!edge.id) {
// Identify Link
const linkIdBase = edge.id; // 'L-' + edge.start + '-' + edge.end;

2
packages/mermaid/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@mermaid-chart/mermaid",
"version": "11.0.0-b.60",
"version": "11.0.0-b.61",
"description": "Markdown-ish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
"type": "module",
"module": "./dist/mermaid.core.mjs",

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

@@ -63,13 +63,11 @@ const doRender = async (_elem, data4Layout, siteConfig, positions) => {
})
);
await Promise.all(
data4Layout.edges.forEach(async function (edge) {
edge.x = edge?.x || 0;
edge.y = edge?.y || 0;
await insertEdgeLabel(edgeLabels, edge);
})
);
for (const edge of data4Layout.edges) {
edge.x = edge?.x || 0;
edge.y = edge?.y || 0;
await insertEdgeLabel(edgeLabels, edge);
}
// log.info('############################################# XXX');
// log.info('### Layout ### XXX');
@@ -86,8 +84,7 @@ const doRender = async (_elem, data4Layout, siteConfig, positions) => {
});
// Insert the edges and position the edge labels
data4Layout.edges.forEach(function (edge) {
// console.log('Edge: ', edge, nodes[edge.start]);
for (const edge of data4Layout.edges) {
// log.info('Edge ' + e.v + ' -> ' + e.w + ': ' + JSON.stringify(edge), edge);
edge.points = fixInterSections(
@@ -105,114 +102,8 @@ const doRender = async (_elem, data4Layout, siteConfig, positions) => {
);
paths.updatedPath = paths.originalPath;
positionEdgeLabel(edge, paths);
});
}
// log.info('Graph after layout:', graphlibJson.write(graph));
// // Move the nodes to the correct place
// let diff = 0;
// log.info('Need the size here XAX', graph.node('T1')?.height);
// let { subGraphTitleTotalMargin } = getSubGraphTitleMargins(siteConfig);
// subGraphTitleTotalMargin = 0;
// sortNodesByHierarchy(graph).forEach(function (v) {
// const node = graph.node(v);
// const p = graph.node(node?.parentId);
// subGraphTitleTotalMargin = p?.offsetY || subGraphTitleTotalMargin;
// log.info(
// 'Position XAX' + v + ': (' + node.x,
// ',' + node.y,
// ') width: ',
// node.width,
// ' height: ',
// node.height
// );
// if (node && node.clusterNode) {
// const parentId = graph.parent(v);
// // Adjust for padding when on root level
// node.y = parentId ? node.y + 2 : node.y - 8;
// node.x -= 8;
// log.info(
// 'A tainted cluster node XBX',
// v,
// node.id,
// node.width,
// node.height,
// node.x,
// node.y,
// graph.parent(v)
// );
// clusterDb[node.id].node = node;
// // node.y += subGraphTitleTotalMargin - 10;
// node.y -= (node.offsetY || 0) / 2;
// positionNode(node);
// } else {
// // Non cluster node
// if (graph.children(v).length > 0) {
// node.height += 0;
// const parent = graph.node(node.parentId);
// const halfPadding = node?.padding / 2 || 0;
// const labelHeight = node?.labelBBox?.height || 0;
// const offsetY = labelHeight - halfPadding || 0;
// node.y += offsetY / 2 + 2;
// insertCluster(clusters, node);
// // A cluster in the non-recursive way
// log.info(
// 'A pure cluster node with children XBX',
// v,
// node.id,
// node.width,
// node.height,
// node.x,
// node.y,
// 'offset',
// parent?.offsetY
// );
// clusterDb[node.id].node = node;
// } else {
// const parent = graph.node(node.parentId);
// node.y += (parent?.offsetY || 0) / 2;
// log.info(
// 'A regular node XBX - using the padding',
// v,
// node.id,
// 'parent',
// node.parentId,
// node.width,
// node.height,
// node.x,
// node.y,
// 'offsetY',
// node.offsetY,
// 'parent',
// parent,
// node
// );
// positionNode(node);
// }
// }
// });
// // Move the edge labels to the correct place after layout
// graph.edges().forEach(function (e) {
// const edge = graph.edge(e);
// log.info('Edge ' + e.v + ' -> ' + e.w + ': ' + JSON.stringify(edge), edge);
// edge.points.forEach((point) => (point.y += subGraphTitleTotalMargin / 2));
// const paths = insertEdge(edgePaths, edge, clusterDb, diagramType, graph, id);
// positionEdgeLabel(edge, paths);
// });
// graph.nodes().forEach(function (v) {
// const n = graph.node(v);
// log.info(v, n.type, n.diff);
// if (n.isGroup) {
// diff = n.diff;
// }
// });
// log.trace('Returning from recursive render XAX', elem, diff);
return { elem, diff: 0 };
};
/**

1
packages/mermaid/src/rendering-util/rendering-elements/edges.js
View File

@@ -54,6 +54,7 @@ export const insertEdgeLabel = async (elem, edge) => {
label.attr('transform', 'translate(' + -bbox.width / 2 + ', ' + -bbox.height / 2 + ')');
// Make element accessible by id for positioning
log.debug('Inserting edge label abc88', edge.id, edge.label, edgeLabels.get(edge.id));
edgeLabels.set(edge.id, edgeLabel);
// Update the abstract data of the edge with the new information about its width and height

2
packages/mermaid/src/rendering-util/rendering-elements/shapes/subroutine.ts
View File

@@ -82,7 +82,7 @@ export const subroutine = async (parent: SVGAElement, node: Node) => {
const l2El = shapeSvg.insert(() => l2, ':first-child');
l1El.attr('class', 'neo-line');
l2El.attr('class', 'neo-line');
let rect = shapeSvg.insert(() => roughNode, ':first-child');
const rect = shapeSvg.insert(() => roughNode, ':first-child');
const { cssStyles } = node;
rect.attr('class', 'basic label-container').attr('style', cssStyles);
updateNodeBounds(node, rect);