feat: upgrade to beta.9

sgratzl · Jan 17, 2021 · a23c129 · a23c129
1 parent bf6d5e6
commit a23c129
Show file tree

Hide file tree

Showing 13 changed files with 311 additions and 212 deletions.
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": "3.0.0-beta.6",
+  "version": "3.0.0-beta.8",
   "author": {
     "name": "Samuel Gratzl",
     "email": "sam@sgratzl.com",
@@ -49,41 +49,42 @@
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^17.0.0",
-    "@rollup/plugin-node-resolve": "^11.0.0",
+    "@rollup/plugin-node-resolve": "^11.1.0",
     "@rollup/plugin-replace": "^2.3.4",
-    "@rollup/plugin-typescript": "^8.0.0",
-    "@types/jest": "^26.0.18",
+    "@rollup/plugin-typescript": "^8.1.0",
+    "@types/jest": "^26.0.20",
     "@types/jest-image-snapshot": "^4.1.3",
-    "@types/node": "^14.14.11",
+    "@types/node": "^14.14.21",
     "@types/seedrandom": "^2.4.28",
-    "@typescript-eslint/eslint-plugin": "^4.9.1",
-    "@typescript-eslint/parser": "^4.9.1",
+    "@typescript-eslint/eslint-plugin": "^4.13.0",
+    "@typescript-eslint/parser": "^4.13.0",
     "@yarnpkg/pnpify": "^2.4.0",
     "canvas": "^2.6.1",
-    "chart.js": "^3.0.0-beta.7",
-    "eslint": "^7.15.0",
-    "eslint-config-prettier": "^7.0.0",
+    "canvas-5-polyfill": "^0.1.5",
+    "chart.js": "^3.0.0-beta.9",
+    "eslint": "^7.18.0",
+    "eslint-config-prettier": "^7.1.0",
     "eslint-config-react-app": "^6.0.0",
     "eslint-plugin-flowtype": "^5.2.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-prettier": "^3.2.0",
-    "eslint-plugin-react": "^7.21.5",
+    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-react": "^7.22.0",
     "eslint-plugin-react-hooks": "^4.2.0",
     "jest": "^26.6.3",
-    "jest-image-snapshot": "^4.2.0",
+    "jest-image-snapshot": "^4.3.0",
     "prettier": "^2.2.1",
     "release-it": "^14.2.2",
     "rimraf": "^3.0.2",
-    "rollup": "^2.34.2",
+    "rollup": "^2.36.2",
     "rollup-plugin-cleanup": "^3.2.1",
-    "rollup-plugin-dts": "^2.0.0",
+    "rollup-plugin-dts": "^2.0.1",
     "rollup-plugin-terser": "^7.0.2",
     "seedrandom": "^3.0.5",
     "ts-jest": "^26.4.4",
-    "tslib": "^2.0.3",
-    "typedoc": "^0.19.2",
-    "typescript": "^4.1.2"
+    "tslib": "^2.1.0",
+    "typedoc": "^0.20.16",
+    "typescript": "^4.1.3"
   },
   "scripts": {
     "clean": "rimraf build node_modules \"*.tgz\"",

diff --git a/samples/default_esm.html b/samples/default_esm.html
@@ -11,8 +11,8 @@
     <script type="importmap-shim">
       {
         "imports": {
-          "chart.js": "https://unpkg.com/chart.js@3.0.0-beta.7?module",
-          "chart.js/helpers": "https://unpkg.com/chart.js@3.0.0-beta.7/helpers/helpers.esm.js?module",
+          "chart.js": "https://unpkg.com/chart.js@3.0.0-beta.9?module",
+          "chart.js/helpers": "https://unpkg.com/chart.js@3.0.0-beta.9/helpers/helpers.esm.js?module",
           "chartjs-chart-graph": "../build/index.esm.js",
           "d3-force": "https://unpkg.com/d3-force?module",
           "d3-hierarchy": "https://unpkg.com/d3-hierarchy?module"

diff --git a/samples/directed.html b/samples/directed.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/chart.js@3.0.0-beta.7/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.0.0-beta.9/dist/chart.js"></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://unpkg.com/chart.js@3.0.0-beta.7/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.0.0-beta.9/dist/chart.js"></script>
     <script src="../build/index.umd.js"></script>
   </head>
 

diff --git a/samples/graphChange.html b/samples/graphChange.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/chart.js@3.0.0-beta.7/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.0.0-beta.9/dist/chart.js"></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://unpkg.com/chart.js@3.0.0-beta.7/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.0.0-beta.9/dist/chart.js"></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://unpkg.com/chart.js@3.0.0-beta.7/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.0.0-beta.9/dist/chart.js"></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://unpkg.com/chart.js@3.0.0-beta.7/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.0.0-beta.9/dist/chart.js"></script>
     <!-- <script src="https://unpkg.com/chartjs-plugin-datalabels"></script> -->
     <script src="../build/index.umd.js"></script>
   </head>

diff --git a/samples/tree.html b/samples/tree.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/chart.js@3.0.0-beta.7/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.0.0-beta.9/dist/chart.js"></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://unpkg.com/chart.js@3.0.0-beta.7/dist/chart.js"></script>
+    <script src="https://unpkg.com/chart.js@3.0.0-beta.9/dist/chart.js"></script>
     <!-- <script src="https://unpkg.com/chartjs-plugin-datalabels"></script>
     <script src="https://unpkg.com/chartjs-plugin-dragdata"></script> -->
     <script src="../build/index.umd.js"></script>

diff --git a/src/__tests__/createChart.ts b/src/__tests__/createChart.ts
@@ -3,6 +3,7 @@
 
 import { Chart, ChartConfiguration, defaults, ChartType, DefaultDataPoint } from 'chart.js';
 import { toMatchImageSnapshot, MatchImageSnapshotOptions } from 'jest-image-snapshot';
+import 'canvas-5-polyfill';
 
 expect.extend({ toMatchImageSnapshot });
 
@@ -30,11 +31,13 @@ export default function createChart<
   canvas.width = width;
   canvas.height = height;
   defaults.font.family = 'Courier New';
-  defaults.font.color = 'transparent';
+  defaults.color = 'transparent';
   config.options = Object.assign(
     {
       responsive: false,
-      animation: false,
+      animation: {
+        duration: 1,
+      },
       plugins: {
         legend: {
           display: false,
@@ -55,7 +58,7 @@ export default function createChart<
     canvas,
     ctx,
     async toMatchImageSnapshot(options?: MatchImageSnapshotOptions) {
-      await new Promise((resolve) => setTimeout(resolve, 100));
+      await new Promise((resolve) => setTimeout(resolve, 500));
 
       const image = await toBuffer(canvas);
       expect(image).toMatchImageSnapshot(options);

diff --git a/src/controllers/graph.ts b/src/controllers/graph.ts
@@ -18,6 +18,7 @@ import {
   PointPrefixedHoverOptions,
   CartesianScaleTypeRegistry,
   CoreChartOptions,
+  ScriptableContext,
 } from 'chart.js';
 import { merge } from 'chart.js/helpers';
 import { clipArea, unclipArea } from 'chart.js/helpers';
@@ -116,8 +117,8 @@ export class GraphController extends ScatterController {
       meta._parsed.splice(data.length, meta._parsed.length - data.length);
     }
     this._cachedMeta._sorted = false;
-    iScale.invalidateCaches();
-    vScale.invalidateCaches();
+    (iScale as any)._dataLimitsCached = false;
+    (vScale as any)._dataLimitsCached = false;
 
     this._parseEdges();
   }
@@ -522,10 +523,10 @@ export interface IGraphEdgeDataPoint {
 
 export interface IGraphChartControllerDatasetOptions
   extends ControllerDatasetOptions,
-    ScriptableAndArrayOptions<PointPrefixedOptions>,
-    ScriptableAndArrayOptions<PointPrefixedHoverOptions>,
-    ScriptableAndArrayOptions<IEdgeLineOptions>,
-    ScriptableAndArrayOptions<LineHoverOptions> {
+    ScriptableAndArrayOptions<PointPrefixedOptions, ScriptableContext>,
+    ScriptableAndArrayOptions<PointPrefixedHoverOptions, ScriptableContext>,
+    ScriptableAndArrayOptions<IEdgeLineOptions, ScriptableContext>,
+    ScriptableAndArrayOptions<LineHoverOptions, ScriptableContext> {
   edges: IGraphEdgeDataPoint[];
 }