feat: upgrade to beta.9

sgratzl · Jan 17, 2021 · f48c342 · f48c342
1 parent a5e55c7
commit f48c342
Show file tree

Hide file tree

Showing 10 changed files with 307 additions and 206 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "chartjs-chart-pcp",
   "description": "Chart.js module for charting parallel coordinate plots",
-  "version": "3.0.0-beta.7",
+  "version": "3.0.0-beta.8",
   "author": {
     "name": "Samuel Gratzl",
     "email": "sam@sgratzl.com",
@@ -41,39 +41,40 @@
   ],
   "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",
-    "@typescript-eslint/eslint-plugin": "^4.9.1",
-    "@typescript-eslint/parser": "^4.9.1",
+    "@types/node": "^14.14.21",
+    "@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",
     "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/basic.html b/samples/basic.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://unpkg.com/chart.js@3.0.0-beta.7"></script>
+    <script src="https://unpkg.com/chart.js@3.0.0-beta.9"></script>
     <script src="../build/index.umd.js"></script>
   </head>
 

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

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-pcp": "../build/index.esm.js"
         }
       }

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

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,

diff --git a/src/controllers/LogarithmicParallelCoordinatesController.ts b/src/controllers/LogarithmicParallelCoordinatesController.ts
@@ -6,6 +6,7 @@ import {
   ChartItem,
   ChartConfiguration,
   CartesianScaleTypeRegistry,
+  ScriptableContext,
 } from 'chart.js';
 import { LineSegment, LogarithmicAxis, ILineSegmentOptions, ILogarithmicAxisOptions } from '../elements';
 import { ParallelCoordinatesController } from './ParallelCoordinatesController';
@@ -22,8 +23,8 @@ export class LogarithmicParallelCoordinatesController extends ParallelCoordinate
 export interface ILogarithmicParallelCoordinatesControllerDatasetOptions
   extends ControllerDatasetOptions,
     ILogarithmicAxisOptions,
-    ScriptableAndArrayOptions<ILineSegmentOptions>,
-    ScriptableAndArrayOptions<CommonHoverOptions> {}
+    ScriptableAndArrayOptions<ILineSegmentOptions, ScriptableContext>,
+    ScriptableAndArrayOptions<CommonHoverOptions, ScriptableContext> {}
 
 export type ILogarithmicParallelCoordinatesChartOptions = ILogarithmicAxisOptions;
 

diff --git a/src/controllers/ParallelCoordinatesController.ts b/src/controllers/ParallelCoordinatesController.ts
@@ -12,6 +12,7 @@ import {
   ChartComponent,
   ChartMeta,
   ChartConfiguration,
+  ScriptableContext,
 } from 'chart.js';
 import { merge } from 'chart.js/helpers';
 import { splineCurve } from 'chart.js/helpers';
@@ -37,7 +38,7 @@ export class ParallelCoordinatesController extends DatasetController<LineSegment
     const ds = this.getDataset() as any;
     ds.yAxisID = ds.label;
     super.linkScales();
-    this._cachedMeta.vScale = this._cachedMeta.dataset;
+    this._cachedMeta.vScale = this._cachedMeta.dataset as any;
   }
 
   addElements() {
@@ -258,8 +259,8 @@ export class ParallelCoordinatesController extends DatasetController<LineSegment
 export interface IParallelCoordinatesControllerDatasetOptions
   extends ControllerDatasetOptions,
     ILinearAxisOptions,
-    ScriptableAndArrayOptions<ILineSegmentOptions>,
-    ScriptableAndArrayOptions<CommonHoverOptions> {}
+    ScriptableAndArrayOptions<ILineSegmentOptions, ScriptableContext>,
+    ScriptableAndArrayOptions<CommonHoverOptions, ScriptableContext> {}
 
 export type IParallelCoordinatesChartOptions = ILinearAxisOptions;
 

diff --git a/src/elements/axis.ts b/src/elements/axis.ts
@@ -46,11 +46,12 @@ function BaseMixin<O extends IAxisOptions>(superClass: { new (...args: any[]): S
       this.top = props.top;
       this.bottom = props.bottom;
 
-      super.update(w, h, null);
+      const r = super.update(w, h);
 
       this.top = props.top;
       this.bottom = props.bottom;
       this.configure();
+      return r;
     }
 
     draw(c: any) {