dagre - npm Package Compare versions

Comparing version 0.5.2 to 0.5.3

CHANGELOG.md

@@ -0,1 +1,6 @@
+v0.5.3
+======
+
+* Fixes for edge label placement in rankdir=LR and rankdir=RL
+
 v0.5.2
@@ -2,0 +7,0 @@ ======

lib/coordinate-system.js

@@ -46,3 +46,5 @@ "use strict";
     _.each(edge.points, reverseYOne);
-    reverseYOne(edge);
+    if (_.has(edge, "y")) {
+      reverseYOne(edge);
+    }
   });
@@ -61,3 +63,5 @@ }
     _.each(edge.points, swapXYOne);
-    swapXYOne(edge);
+    if (_.has(edge, "x")) {
+      swapXYOne(edge);
+    }
   });
@@ -64,0 +68,0 @@ }

lib/layout.js

@@ -150,4 +150,4 @@ "use strict";
 function makeSpaceForEdgeLabels(g) {
-  var graphLabel = g.graph();
-  graphLabel.ranksep /= 2;
+  var graph = g.graph();
+  graph.ranksep /= 2;
   _.each(g.edges(), function(e) {
@@ -157,3 +157,7 @@ var edge = g.edge(e);
     if (edge.labelpos.toLowerCase() !== "c") {
-      edge.width += edge.labeloffset;
+      if (graph.rankdir === "TB" || graph.rankdir === "BT") {
+        edge.width += edge.labeloffset;
+      } else {
+        edge.height += edge.labeloffset;
+      }
     }
@@ -225,2 +229,17 @@ });
 
+  _.each(g.edges(), function(e) {
+    var edge = g.edge(e);
+
+    if (_.has(edge, "x")) {
+      var x = edge.x,
+          y = edge.y,
+          w = edge.width,
+          h = edge.height;
+      minX = Math.min(minX, x - w / 2);
+      maxX = Math.max(maxX, x + w / 2);
+      minY = Math.min(minY, y - h / 2);
+      maxY = Math.max(maxY, y + h / 2);
+    }
+  });
+
   minX -= marginX;
@@ -272,5 +291,8 @@ minY -= marginY;
     if (_.has(edge, "x")) {
+      if (edge.labelpos === "l" || edge.labelpos === "r") {
+        edge.width -= edge.labeloffset;
+      }
       switch (edge.labelpos) {
-        case "l": edge.x -= edge.width / 2; break;
-        case "r": edge.x += edge.width / 2; break;
+        case "l": edge.x -= edge.width / 2 + edge.labeloffset; break;
+        case "r": edge.x += edge.width / 2 + edge.labeloffset; break;
       }
@@ -277,0 +299,0 @@ }

lib/normalize.js

@@ -83,2 +83,4 @@ "use strict";
         origLabel.y = node.y;
+        origLabel.width = node.width;
+        origLabel.height = node.height;
       }
@@ -85,0 +87,0 @@ v = w;

lib/version.js

@@ -1,1 +0,1 @@
-module.exports = "0.5.2";
+module.exports = "0.5.3";

package.json

 {
   "name": "dagre",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "Graph layout for JavaScript",
@@ -12,3 +12,3 @@ "author": "Chris Pettitt <[e-mail]>",
   "dependencies": {
-    "graphlib": "^0.8.0",
+    "graphlib": "^0.8.3",
     "lodash": "^2.4.1"
@@ -15,0 +15,0 @@ },

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

379007

increased by0.23%

Lines of code

2474

increased by1.06%

Dependency changes

• Updatedgraphlib@^0.8.3