force-graph 1.42.2 → 1.42.6

package/dist/force-graph.module.js

@@ -50,14 +50,9 @@ function ownKeys(object, enumerableOnly) {
 
   if (Object.getOwnPropertySymbols) {
     var symbols = Object.getOwnPropertySymbols(object);
-
-    if (enumerableOnly) {
-      symbols = symbols.filter(function (sym) {
-        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-      });
-    }
-
-    keys.push.apply(keys, symbols);
+    enumerableOnly && (symbols = symbols.filter(function (sym) {
+      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+    })), keys.push.apply(keys, symbols);
   }
 
   return keys;
@@ -65,19 +60,12 @@ function ownKeys(object, enumerableOnly) {
 
 function _objectSpread2(target) {
   for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {};
-
-    if (i % 2) {
-      ownKeys(Object(source), true).forEach(function (key) {
-        _defineProperty(target, key, source[key]);
-      });
-    } else if (Object.getOwnPropertyDescriptors) {
-      Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-      ownKeys(Object(source)).forEach(function (key) {
-        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-      });
-    }
+    var source = null != arguments[i] ? arguments[i] : {};
+    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
+      _defineProperty(target, key, source[key]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
   }
 
   return target;
@@ -86,17 +74,11 @@ function _objectSpread2(target) {
 function _typeof(obj) {
   "@babel/helpers - typeof";
 
-  if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
-    _typeof = function (obj) {
-      return typeof obj;
-    };
-  } else {
-    _typeof = function (obj) {
-      return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-    };
-  }
-
-  return _typeof(obj);
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
+    return typeof obj;
+  } : function (obj) {
+    return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+  }, _typeof(obj);
 }
 
 function _defineProperty(obj, key, value) {
@@ -1252,11 +1234,9 @@ var forceGraph = Kapsule({
       triggerUpdate: false
     },
     onZoom: {
-      "default": function _default() {},
       triggerUpdate: false
     },
     onZoomEnd: {
-      "default": function _default() {},
       triggerUpdate: false
     },
     onRenderFramePre: {
@@ -1444,6 +1424,8 @@ var forceGraph = Kapsule({
     };
   },
   init: function init(domNode, state) {
+    var _this = this;
+
     // Wipe DOM
     domNode.innerHTML = ''; // Container anchor for canvas and tooltip
 
@@ -1537,9 +1519,12 @@ var forceGraph = Kapsule({
       }
 
       delete obj.__initialDragPos;
-      state.forceGraph.d3AlphaTarget(0) // release engine low intensity
-      .resetCountdown(); // let the engine readjust after releasing fixed nodes
-      // drag cursor
+
+      if (state.forceGraph.d3AlphaTarget()) {
+        state.forceGraph.d3AlphaTarget(0) // release engine low intensity
+        .resetCountdown(); // let the engine readjust after releasing fixed nodes
+      } // drag cursor
+
 
       state.canvas.classList.remove('grabbable');
       state.isPointerDragging = false;
@@ -1566,10 +1551,11 @@ var forceGraph = Kapsule({
         c.translate(t.x, t.y);
         c.scale(t.k, t.k);
       });
-      state.onZoom(_objectSpread2({}, t));
+      state.onZoom && state.onZoom(_objectSpread2(_objectSpread2({}, t), _this.centerAt())); // report x,y coordinates relative to canvas center
+
       state.needsRedraw = true;
     }).on('end', function (ev) {
-      return state.onZoomEnd(_objectSpread2({}, ev.transform));
+      return state.onZoomEnd && state.onZoomEnd(_objectSpread2(_objectSpread2({}, ev.transform), _this.centerAt()));
     });
     adjustCanvasSize(state);
     state.forceGraph.onNeedsRedraw(function () {

package/example/dag-yarn/index.html

@@ -1,7 +1,7 @@
 <head>
   <style> body { margin: 0; } </style>
 
-  <script src="//bundle.run/@yarnpkg/lockfile"></script>
+  <script src="//bundle.run/@yarnpkg/lockfile@1.1.0"></script>
   <script src="//unpkg.com/dat.gui"></script>
   <script src="//unpkg.com/d3-quadtree"></script>
   <script src="//unpkg.com/d3-force"></script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "force-graph",
-  "version": "1.42.2",
+  "version": "1.42.6",
   "description": "2D force-directed graph rendered on HTML5 canvas",
   "unpkg": "dist/force-graph.min.js",
   "main": "dist/force-graph.common.js",
@@ -40,7 +40,7 @@
   "dependencies": {
     "@tweenjs/tween.js": "18",
     "accessor-fn": "1",
-    "bezier-js": "3 - 4",
+    "bezier-js": "3 - 5",
     "canvas-color-tracker": "1",
     "d3-array": "1 - 3",
     "d3-drag": "2 - 3",
@@ -54,19 +54,19 @@
     "lodash.throttle": "4"
   },
   "devDependencies": {
-    "@babel/core": "^7.15.0",
-    "@babel/plugin-proposal-class-properties": "^7.14.5",
-    "@babel/plugin-proposal-object-rest-spread": "^7.14.7",
-    "@babel/preset-env": "^7.15.0",
+    "@babel/core": "^7.16.12",
+    "@babel/plugin-proposal-class-properties": "^7.16.7",
+    "@babel/plugin-proposal-object-rest-spread": "^7.16.7",
+    "@babel/preset-env": "^7.16.11",
     "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^20.0.0",
-    "@rollup/plugin-node-resolve": "^13.0.4",
-    "postcss": "^8.3.6",
+    "@rollup/plugin-commonjs": "^21.0.1",
+    "@rollup/plugin-node-resolve": "^13.1.3",
+    "postcss": "^8.4.5",
     "rimraf": "^3.0.2",
-    "rollup": "^2.55.1",
-    "rollup-plugin-dts": "^3.0.2",
-    "rollup-plugin-postcss": "^4.0.0",
+    "rollup": "^2.66.1",
+    "rollup-plugin-dts": "^4.1.0",
+    "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-terser": "^7.0.2",
-    "typescript": "^4.3.5"
+    "typescript": "^4.5.5"
   }
 }

package/src/force-graph.js

@@ -178,8 +178,8 @@ export default Kapsule({
     onLinkHover: { triggerUpdate: false },
     onBackgroundClick: { triggerUpdate: false },
     onBackgroundRightClick: { triggerUpdate: false },
-    onZoom: { default: () => {}, triggerUpdate: false },
-    onZoomEnd: { default: () => {}, triggerUpdate: false },
+    onZoom: { triggerUpdate: false },
+    onZoomEnd: { triggerUpdate: false },
     onRenderFramePre: { triggerUpdate: false },
     onRenderFramePost: { triggerUpdate: false },
     ...linkedProps
@@ -432,9 +432,11 @@ export default Kapsule({
           if (initPos.fy === undefined) { obj.fy = undefined; }
           delete(obj.__initialDragPos);
 
-          state.forceGraph
-            .d3AlphaTarget(0)   // release engine low intensity
-            .resetCountdown();  // let the engine readjust after releasing fixed nodes
+          if (state.forceGraph.d3AlphaTarget()) {
+            state.forceGraph
+              .d3AlphaTarget(0)   // release engine low intensity
+              .resetCountdown();  // let the engine readjust after releasing fixed nodes
+          }
 
           // drag cursor
           state.canvas.classList.remove('grabbable');
@@ -468,10 +470,10 @@ export default Kapsule({
           c.translate(t.x, t.y);
           c.scale(t.k, t.k);
         });
-        state.onZoom({ ...t });
+        state.onZoom && state.onZoom({ ...t, ...this.centerAt() }); // report x,y coordinates relative to canvas center
         state.needsRedraw = true;
       })
-      .on('end', ev => state.onZoomEnd({ ...ev.transform }));
+      .on('end', ev => state.onZoomEnd && state.onZoomEnd({ ...ev.transform, ...this.centerAt() }));
 
     adjustCanvasSize(state);
 

package/src/index.d.ts

@@ -30,7 +30,7 @@ type DagMode = 'td' | 'bu' | 'lr' | 'rl' | 'radialout' | 'radialin';
 
 interface ForceFn {
   (alpha: number): void;
-  initialize?: (nodes: NodeObject[]) => void;
+  initialize?: (nodes: NodeObject[], ...args: any[]) => void;
   [key: string]: any;
 }