force-graph 1.42.5 → 1.42.8

package/README.md

@@ -3,7 +3,7 @@ force-graph
 
 [![NPM package][npm-img]][npm-url]
 [![Build Size][build-size-img]][build-size-url]
-[![Dependencies][dependencies-img]][dependencies-url]
+[![NPM Downloads][npm-downloads-img]][npm-downloads-url]
 
 Force-directed graph rendered on HTML5 canvas.
 
@@ -15,7 +15,12 @@ A web component to represent a graph data structure in a 2-dimensional canvas us
 Uses HTML5 canvas for rendering and [d3-force](https://github.com/d3/d3-force) for the underlying physics engine.
 Supports canvas zooming/panning, node dragging and node/link hover/click interactions.
 
-Check out the examples:
+See also the [3D version](https://github.com/vasturiano/3d-force-graph).
+
+And check out the [React bindings](https://github.com/vasturiano/react-force-graph).
+
+## Examples
+
 * [Basic](https://vasturiano.github.io/force-graph/example/basic/) ([source](https://github.com/vasturiano/force-graph/blob/master/example/basic/index.html))
 * [Load JSON](https://vasturiano.github.io/force-graph/example/load-json/) ([source](https://github.com/vasturiano/force-graph/blob/master/example/load-json/index.html))
 * [Medium size graph (~4k elements)](https://vasturiano.github.io/force-graph/example/medium-graph/) ([source](https://github.com/vasturiano/force-graph/blob/master/example/medium-graph/index.html))
@@ -46,28 +51,24 @@ Check out the examples:
 * [yarn.lock dependency graph (DAG mode)](https://vasturiano.github.io/force-graph/example/dag-yarn/) ([source](https://github.com/vasturiano/force-graph/blob/master/example/dag-yarn/index.html))
 * [Usage as UI to construct graphs](https://vasturiano.github.io/force-graph/example/build-a-graph/) ([source](https://github.com/vasturiano/force-graph/blob/master/example/build-a-graph/index.html))
 
-See also the [3D version](https://github.com/vasturiano/3d-force-graph).
-
-And check out the [React bindings](https://github.com/vasturiano/react-force-graph).
-
 ## Quick start
 
-```
+```js
 import ForceGraph from 'force-graph';
 ```
 or
-```
-var ForceGraph = require('force-graph');
+```js
+const ForceGraph = require('force-graph');
 ```
 or even
-```
+```html
 <script src="//unpkg.com/force-graph"></script>
 ```
 then
-```
-var myGraph = ForceGraph();
+```js
+const myGraph = ForceGraph();
 myGraph(<myDOMElement>)
-    .graphData(<myData>);
+  .graphData(<myData>);
 ```
 
 ## API reference
@@ -191,7 +192,7 @@ myGraph(<myDOMElement>)
 | <b>graph2ScreenCoords</b>(<i>x</i>, <i>y</i>) | Utility method to translate node coordinates to the viewport domain. Given a pair of `x`,`y` graph coordinates, returns the current equivalent `{x, y}` in viewport coordinates. |
 
 ### Input JSON syntax
-```
+```json
 {
     "nodes": [
         {
@@ -204,14 +205,14 @@ myGraph(<myDOMElement>)
           "name": "name2",
           "val": 10
         },
-        (...)
+        ...
     ],
     "links": [
         {
             "source": "id1",
             "target": "id2"
         },
-        (...)
+        ...
     ]
 }
 ```
@@ -220,9 +221,9 @@ myGraph(<myDOMElement>)
 
 [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=L398E7PKP47E8&currency_code=USD&source=url) If this project has helped you and you'd like to contribute back, you can always [buy me a ☕](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=L398E7PKP47E8&currency_code=USD&source=url)!
 
-[npm-img]: https://img.shields.io/npm/v/force-graph.svg
+[npm-img]: https://img.shields.io/npm/v/force-graph
 [npm-url]: https://npmjs.org/package/force-graph
-[build-size-img]: https://img.shields.io/bundlephobia/minzip/force-graph.svg
+[build-size-img]: https://img.shields.io/bundlephobia/minzip/force-graph
 [build-size-url]: https://bundlephobia.com/result?p=force-graph
-[dependencies-img]: https://img.shields.io/david/vasturiano/force-graph.svg
-[dependencies-url]: https://david-dm.org/vasturiano/force-graph
+[npm-downloads-img]: https://img.shields.io/npm/dt/force-graph
+[npm-downloads-url]: https://www.npmtrends.com/force-graph

package/dist/force-graph.d.ts

@@ -72,8 +72,8 @@ interface ForceGraphGenericInstance<ChainableInstance> {
   nodeAutoColorBy(colorByAccessor: NodeAccessor<string | null>): ChainableInstance;
   nodeCanvasObject(): CanvasCustomRenderFn<NodeObject>;
   nodeCanvasObject(renderFn: CanvasCustomRenderFn<NodeObject>): ChainableInstance;
-  nodeCanvasObjectMode(): string | ((obj: NodeObject) => CanvasCustomRenderMode);
-  nodeCanvasObjectMode(modeAccessor: string | ((obj: NodeObject) => CanvasCustomRenderMode)): ChainableInstance;
+  nodeCanvasObjectMode(): string | ((obj: NodeObject) => CanvasCustomRenderMode | any);
+  nodeCanvasObjectMode(modeAccessor: string | ((obj: NodeObject) => CanvasCustomRenderMode | any)): ChainableInstance;
   nodePointerAreaPaint(): CanvasPointerAreaPaintFn<NodeObject>;
   nodePointerAreaPaint(renderFn: CanvasPointerAreaPaintFn<NodeObject>): ChainableInstance;
 

package/dist/force-graph.js

@@ -1,4 +1,4 @@
-// Version 1.42.5 force-graph - https://github.com/vasturiano/force-graph
+// Version 1.42.8 force-graph - https://github.com/vasturiano/force-graph
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
@@ -9166,12 +9166,16 @@
         return [];
       }
 
-      const trm = v2 * v2 - 4 * v1 * v3,
-        sq = Math.sqrt(trm),
-        d2 = 2 * v1;
+      const d2 = 2 * v1;
 
       if (utils.approximately(d2, 0)) return [];
 
+      const trm = v2 * v2 - 4 * v1 * v3;
+
+      if (trm < 0) return [];
+
+      const sq = Math.sqrt(trm);
+
       return [(sq - v2) / d2, -(v2 + sq) / d2].filter(function (r) {
         return 0 <= r && r <= 1;
       });
@@ -9760,7 +9764,7 @@
     __normal2(t) {
       const d = this.derivative(t);
       const q = sqrt(d.x * d.x + d.y * d.y);
-      return { x: -d.y / q, y: d.x / q };
+      return { t, x: -d.y / q, y: d.x / q };
     }
 
     __normal3(t) {
@@ -9799,6 +9803,7 @@
       ];
       // normal vector:
       const n = {
+        t,
         x: R[0] * r1.x + R[1] * r1.y + R[2] * r1.z,
         y: R[3] * r1.x + R[4] * r1.y + R[5] * r1.z,
         z: R[6] * r1.x + R[7] * r1.y + R[8] * r1.z,