marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-12-21 19:57:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

#1295 Moving graph operations into mermaid-graplib and adding tests

Browse Source
This commit is contained in:
Knut Sveidqvist
2020-04-10 07:27:04 +02:00
parent 857c860952
commit 8455db6fae
6 changed files with 527 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/dagre-wrapper/index.js
View File

@@ -1,11 +1,12 @@
import dagre from 'dagre';
import insertMarkers from './markers';
import { clear as cleargraphlib, clusterDb, adjustClustersAndEdges } from './mermaid-graphlib';
import { insertNode, positionNode, clear as clearNodes } from './nodes';
import { insertCluster, clear as clearClusters } from './clusters';
import { insertEdgeLabel, positionEdgeLabel, insertEdge, clear as clearEdges } from './edges';
import { logger } from '../logger';
let clusterDb = {};
// let clusterDb = {};
const getAnchorId = id => {
// Only insert an achor once
@@ -50,11 +51,12 @@ const findNonClusterChild = (id, graph) => {
export const render = (elem, graph, markers, diagramtype, id) => {
insertMarkers(elem, markers, diagramtype, id);
clusterDb = {};
clearNodes();
clearEdges();
clearClusters();
adjustClustersAndEdges(graph);
const clusters = elem.insert('g').attr('class', 'clusters'); // eslint-disable-line
const edgePaths = elem.insert('g').attr('class', 'edgePaths');
const edgeLabels = elem.insert('g').attr('class', 'edgeLabels');
@@ -68,13 +70,9 @@ export const render = (elem, graph, markers, diagramtype, id) => {
if (node.type !== 'group') {
insertNode(nodes, graph.node(v));
} else {
// const width = getClusterTitleWidth(clusters, node);
const children = graph.children(v);
logger.info('Cluster identified', node.id, children[0], findNonClusterChild(node.id, graph));
// nodes2expand.push({ id: children[0], width });
clusterDb[node.id] = { id: findNonClusterChild(node.id, graph) };
// clusterDb[node.id] = { id: node.id + '_anchor' };
// const children = graph.children(v);
// logger.info('Cluster identified', node.id, children[0], findNonClusterChild(node.id, graph));
// clusterDb[node.id] = { id: findNonClusterChild(node.id, graph) };
}
});
logger.info('Clusters ', clusterDb);