Merge pull request #62 from sgratzl/release/v4.1.2

sgratzl · web-flow · commit c3f05624f5e5 · 2023-02-15T20:54:09.000-05:00
Release v4.1.2
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "chartjs-chart-graph",
   "description": "Chart.js module for charting error bars",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "author": {
     "name": "Samuel Gratzl",
     "email": "sam@sgratzl.com",
@@ -55,7 +55,7 @@
   ],
   "dependencies": {
     "@types/d3-force": "^3.0.4",
-    "@types/d3-hierarchy": "^3.1.1",
+    "@types/d3-hierarchy": "^3.1.2",
     "d3-dispatch": "^3.0.1",
     "d3-force": "^3.0.0",
     "d3-hierarchy": "^3.1.2",
@@ -64,41 +64,41 @@
   },
   "devDependencies": {
     "@chiogen/rollup-plugin-terser": "^7.1.3",
-    "@rollup/plugin-commonjs": "^24.0.0",
+    "@rollup/plugin-commonjs": "^24.0.1",
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@rollup/plugin-replace": "^5.0.2",
     "@rollup/plugin-typescript": "^11.0.0",
-    "@types/jest": "^29.2.5",
+    "@types/jest": "^29.4.0",
     "@types/jest-image-snapshot": "^6.1.0",
     "@types/node": "^18.11.18",
     "@types/seedrandom": "^3.0.4",
-    "@typescript-eslint/eslint-plugin": "^5.48.1",
-    "@typescript-eslint/parser": "^5.48.1",
+    "@typescript-eslint/eslint-plugin": "^5.49.0",
+    "@typescript-eslint/parser": "^5.49.0",
     "@yarnpkg/sdks": "^2.6.3",
     "canvas": "^2.11.0",
     "canvas-5-polyfill": "^0.1.5",
-    "chart.js": "^4.1.2",
-    "eslint": "^8.31.0",
+    "chart.js": "^4.2.0",
+    "eslint": "^8.32.0",
     "eslint-config-airbnb-typescript": "^17.0.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-flowtype": "^8.0.3",
-    "eslint-plugin-import": "^2.27.4",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-react": "^7.32.0",
+    "eslint-plugin-react": "^7.32.1",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "jest": "^29.3.1",
-    "jest-environment-jsdom": "^29.3.1",
+    "jest": "^29.4.1",
+    "jest-environment-jsdom": "^29.4.1",
     "jest-image-snapshot": "^6.1.0",
     "prettier": "^2.8.3",
-    "rimraf": "^4.0.5",
-    "rollup": "~3.10.0",
+    "rimraf": "^3",
+    "rollup": "~3.12.0",
     "rollup-plugin-cleanup": "^3.2.1",
     "rollup-plugin-dts": "^5.1.1",
     "seedrandom": "^3.0.5",
     "ts-jest": "^29.0.5",
-    "tslib": "^2.4.1",
+    "tslib": "^2.5.0",
     "typedoc": "^0.23.24",
     "typescript": "^4.9.4"
   },
diff --git a/samples/default_esm.html b/samples/default_esm.html
@@ -11,8 +11,8 @@
     <script type="importmap-shim">
       {
         "imports": {
-          "chart.js": " https://cdn.jsdelivr.net/npm/chart.js@~4.1.1?module",
-          "chart.js/helpers": " https://cdn.jsdelivr.net/npm/chart.js@~4.1.1/helpers/helpers.esm.js?module",
+          "chart.js": " https://cdn.jsdelivr.net/npm/chart.js@~4.2.0?module",
+          "chart.js/helpers": " https://cdn.jsdelivr.net/npm/chart.js@~4.2.0/helpers/helpers.esm.js?module",
           "chartjs-chart-graph": "../build/index.js",
           "d3-force": " https://cdn.jsdelivr.net/npm/d3-force?module",
           "d3-hierarchy": " https://cdn.jsdelivr.net/npm/d3-hierarchy?module"
diff --git a/samples/directed.html b/samples/directed.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.1.1"></script>
+    <script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.2.0"></script>
     <script src="../build/index.umd.js"></script>
   </head>
 
diff --git a/samples/forceDirectedGraph.html b/samples/forceDirectedGraph.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.1.1"></script>
+    <script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.2.0"></script>
     <script src="https://cdn.jsdelivr.net/npm/hammerjs@2.0.8"></script>
     <script src=" https://cdn.jsdelivr.net/npm/chartjs-plugin-zoom/dist/chartjs-plugin-zoom"></script>
     <script src="../build/index.umd.js"></script>
diff --git a/samples/graphChange.html b/samples/graphChange.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.1.1"></script>
+    <script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.2.0"></script>
     <script src="../build/index.umd.js"></script>
   </head>
 
diff --git a/samples/multi.html b/samples/multi.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.1.1"></script>
+    <script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.2.0"></script>
     <script src="../build/index.umd.js"></script>
     <style>
       body {
diff --git a/samples/radial.html b/samples/radial.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.1.1"></script>
+    <script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.2.0"></script>
     <script src="../build/index.umd.js"></script>
   </head>
 
diff --git a/samples/radiallabel.html b/samples/radiallabel.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.1.1"></script>
+    <script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.2.0"></script>
     <script src=" https://cdn.jsdelivr.net/npm/chartjs-plugin-datalabels@next"></script>
     <!-- <script src=" https://cdn.jsdelivr.net/npm/chartjs-plugin-datalabels"></script> -->
     <script src="../build/index.umd.js"></script>
diff --git a/samples/tree.html b/samples/tree.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.1.1"></script>
+    <script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.2.0"></script>
     <script src="../build/index.umd.js"></script>
   </head>
 
diff --git a/samples/treelabel.html b/samples/treelabel.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.1.1"></script>
+    <script src=" https://cdn.jsdelivr.net/npm/chart.js@~4.2.0"></script>
     <script src=" https://cdn.jsdelivr.net/npm/chartjs-plugin-datalabels@next"></script>
     <script src="https://cdn.jsdelivr.net/npm/hammerjs@2.0.8"></script>
     <script src=" https://cdn.jsdelivr.net/npm/chartjs-plugin-zoom/dist/chartjs-plugin-zoom"></script>
diff --git a/src/controllers/DendrogramController.ts b/src/controllers/DendrogramController.ts
@@ -80,7 +80,10 @@ export class DendrogramController extends GraphController {
   doLayout(root: HierarchyNode<{ x: number; y: number; angle?: number }>): void {
     const options = this.options.tree;
 
-    const layout = options.mode === 'tree' ? tree() : cluster();
+    const layout =
+      options.mode === 'tree'
+        ? tree<{ x: number; y: number; angle?: number }>()
+        : cluster<{ x: number; y: number; angle?: number }>();
 
     if (options.orientation === 'radial') {
       layout.size([Math.PI * 2, 1]);
diff --git a/src/controllers/ForceDirectedGraphController.ts b/src/controllers/ForceDirectedGraphController.ts
@@ -167,7 +167,7 @@ export class ForceDirectedGraphController extends GraphController {
         this._copyPosition();
         this.chart.render();
         // trigger a full update
-        this.chart.update('normal');
+        this.chart.update('default');
       });
     const sim = this.options.simulation;
 
diff --git a/src/controllers/GraphController.ts b/src/controllers/GraphController.ts
@@ -175,7 +175,8 @@ export class GraphController extends ScatterController {
     const reset = mode === 'reset';
 
     const firstOpts = this.resolveDataElementOptions(start, mode);
-    const sharedOptions = this.getSharedOptions(firstOpts) ?? {};
+    const dummyShared = {};
+    const sharedOptions = this.getSharedOptions(firstOpts) ?? dummyShared;
     const includeOptions = this.includeOptions(mode, sharedOptions);
 
     const { xScale, yScale } = meta;
@@ -207,7 +208,11 @@ export class GraphController extends ScatterController {
       };
       properties.points._source = nodes[parsed.source];
       if (includeOptions) {
-        properties.options = sharedOptions || this.resolveDataElementOptions(index, mode);
+        if (sharedOptions !== dummyShared) {
+          properties.options = sharedOptions;
+        } else {
+          properties.options = this.resolveDataElementOptions(index, mode);
+        }
       }
       this.updateEdgeElement(edge, index, properties, mode);
     }
diff --git a/yarn.lock b/yarn.lock
