@neo4j-nvl/layout-workers 0.3.5-f46f9cc3 → 0.3.6-ade05d13

package/lib/hierarchical-layout/dagre-layout-impl.js

@@ -70,14 +70,6 @@ const createGraph = (pixelRatio) => {
     g.graph().ranksep = 75 * pixelRatio;
     return g;
 };
-const findParent = (id, layoutGraph) => {
-    // predecessors uses inEdges, successors uses outEdges
-    let pId = findParentForEdges(id, layoutGraph.predecessors(id), layoutGraph);
-    if (pId === null) {
-        pId = findParentForEdges(id, layoutGraph.successors(id), layoutGraph);
-    }
-    return pId;
-};
 const findParentForEdges = (id, connectedNodes, layoutGraph) => {
     const { rank: currentRank } = layoutGraph.node(id);
     let pRank = null;
@@ -99,6 +91,14 @@ const findParentForEdges = (id, connectedNodes, layoutGraph) => {
     }
     return pId;
 };
+const findParent = (id, layoutGraph) => {
+    // predecessors uses inEdges, successors uses outEdges
+    let pId = findParentForEdges(id, layoutGraph.predecessors(id), layoutGraph);
+    if (pId === null) {
+        pId = findParentForEdges(id, layoutGraph.successors(id), layoutGraph);
+    }
+    return pId;
+};
 const getConnectedSubGraphs = (g, pixelRatio) => {
     const subGraphs = [];
     const components = graphlib.alg.components(g);
@@ -126,9 +126,9 @@ const getConnectedSubGraphs = (g, pixelRatio) => {
 const layoutGraph = (g, direction, parents) => {
     g.graph().ranker = Ranker;
     g.graph().rankdir = Directions[direction];
-    const layoutGraph = dagre.layout(g);
-    for (const id of layoutGraph.nodes()) {
-        const pId = findParent(id, layoutGraph);
+    const dagreLayoutGraph = dagre.layout(g);
+    for (const id of dagreLayoutGraph.nodes()) {
+        const pId = findParent(id, dagreLayoutGraph);
         if (pId !== null) {
             parents[id] = pId;
         }
@@ -189,8 +189,8 @@ export const layout = (nodes, nodeIds, idToPosition, rels, direction, packing, p
         subGraphs.forEach((subGraph) => layoutGraph(subGraph, direction, parents));
         const isVertical = isDirectionVertical(direction);
         const isNatural = isDirectionNatural(direction);
-        const singleNodeGraphs = subGraphs.filter((g) => g.nodeCount() === 1);
-        const multiNodeGraphs = subGraphs.filter((g) => g.nodeCount() !== 1);
+        const singleNodeGraphs = subGraphs.filter((sg) => sg.nodeCount() === 1);
+        const multiNodeGraphs = subGraphs.filter((sg) => sg.nodeCount() !== 1);
         if (packing === PackingBin) {
             multiNodeGraphs.sort((a, b) => b.nodeCount() - a.nodeCount());
             const adjustDimensionPaddingNormal = ({ width, height, ...rest }) => ({
@@ -214,10 +214,12 @@ export const layout = (nodes, nodeIds, idToPosition, rels, direction, packing, p
             if (!isNatural) {
                 const positionProp = isVertical ? 'y' : 'x';
                 const extentProp = isVertical ? 'height' : 'width';
-                const min = bins.reduce((min, d) => (min === null ? d[positionProp] : Math.min(d[positionProp], min[extentProp] || 0)), null);
-                const max = bins.reduce((max, d) => max === null
-                    ? d[positionProp] + d[extentProp]
-                    : Math.max(d[positionProp] + d[extentProp], max[extentProp] || 0), null);
+                const min = bins.reduce((minBin, d) => (minBin === null ? d[positionProp] : Math.min(d[positionProp], minBin[extentProp] || 0)), null);
+                const max = bins.reduce((maxBin, d) => {
+                    return maxBin === null
+                        ? d[positionProp] + d[extentProp]
+                        : Math.max(d[positionProp] + d[extentProp], maxBin[extentProp] || 0);
+                }, null);
                 bins.forEach((d) => {
                     d[positionProp] = min + (max - (d[positionProp] + d[extentProp]));
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neo4j-nvl/layout-workers",
-  "version": "0.3.5-f46f9cc3",
+  "version": "0.3.6-ade05d13",
   "license": "SEE LICENSE IN 'LICENSE.txt'",
   "description": "Layout workers for the Neo4j Visualization Library",
   "keywords": [
@@ -22,7 +22,7 @@
     "watch": "yarn global:tsc -w",
     "prepack": "cp ../../LICENSE.txt ./",
     "postpack": "rm LICENSE.txt",
-    "eslint": "yarn global:eslint ./src/ --ext .js,.mjs --plugin only-warn"
+    "eslint": "yarn global:eslint ./src/ --ext .js,.mjs"
   },
   "typedoc": {
     "entryPoint": "./src/index.js",
@@ -40,5 +40,5 @@
   "devDependencies": {
     "@types/node": "^18.11.11"
   },
-  "stableVersion": "0.3.5"
+  "stableVersion": "0.3.6"
 }