Merge remote-tracking branch 'refs/remotes/origin/master'

dagrejs · Jul 17, 2024 · b0c45c8 · b0c45c8
2 parents 6d323ed + bc0f99a
commit b0c45c8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/dist/dagre.js b/dist/dagre.js
@@ -456,12 +456,12 @@ function layout(g, opts) {
   time("layout", () => {
     let layoutGraph =
       time("  buildLayoutGraph", () => buildLayoutGraph(g));
-    time("  runLayout",        () => runLayout(layoutGraph, time));
+    time("  runLayout",        () => runLayout(layoutGraph, time, opts));
     time("  updateInputGraph", () => updateInputGraph(g, layoutGraph));
   });
 }
 
-function runLayout(g, time) {
+function runLayout(g, time, opts) {
   time("    makeSpaceForEdgeLabels", () => makeSpaceForEdgeLabels(g));
   time("    removeSelfEdges",        () => removeSelfEdges(g));
   time("    acyclic",                () => acyclic.run(g));
@@ -476,7 +476,7 @@ function runLayout(g, time) {
   time("    normalize.run",          () => normalize.run(g));
   time("    parentDummyChains",      () => parentDummyChains(g));
   time("    addBorderSegments",      () => addBorderSegments(g));
-  time("    order",                  () => order(g));
+  time("    order",                  () => order(g, opts));
   time("    insertSelfEdges",        () => insertSelfEdges(g));
   time("    adjustCoordinateSystem", () => coordinateSystem.adjust(g));
   time("    position",               () => position(g));
@@ -2959,7 +2959,7 @@ function zipObject(props, values) {
 }
 
 },{"@dagrejs/graphlib":29}],28:[function(require,module,exports){
-module.exports = "1.1.2";
+module.exports = "1.1.3";
 
 },{}],29:[function(require,module,exports){
 /**

diff --git a/dist/dagre.min.js b/dist/dagre.min.js
diff --git a/lib/version.js b/lib/version.js
@@ -1 +1 @@
-module.exports = "1.1.3";
+module.exports = "1.1.4-pre";
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dagrejs/dagre",
-  "version": "1.1.3",
+  "version": "1.1.4-pre",
   "description": "Graph layout for JavaScript",
   "author": "Chris Pettitt <cpettitt@gmail.com>",
   "contributors": [
@@ -49,4 +49,4 @@
     "type": "git",
     "url": "https://github.com/dagrejs/dagre.git"
   }
-}
+}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		module.exports = "1.1.3";
		module.exports = "1.1.4-pre";