Migrate to Chart.js v3.0.0-beta.13 (#203, #214, #220, #222)

chartjs · Apr 12, 2021 · 4ded4d0 · 4ded4d0
1 parent 31aa84b
commit 4ded4d0
Show file tree

Hide file tree

Showing 67 changed files with 369 additions and 460 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
+.idea
 .vscode/
 bower.json
 cc-test-reporter

diff --git a/docs/guide/getting-started.md b/docs/guide/getting-started.md
@@ -55,7 +55,7 @@ Once loaded, the plugin, available under the global `ChartDataLabels` property,
 ### Module
 
 ```javascript
-import Chart from 'chart.js';
+import {Chart} from 'chart.js';
 import ChartDataLabels from 'chartjs-plugin-datalabels';
 ```
 
@@ -91,13 +91,13 @@ The [plugin options](options.md) can be changed at 3 different levels and are ev
 
 - per dataset: `dataset.datalabels.*`
 - per chart: `options.plugins.datalabels.*`
-- or globally: `Chart.defaults.global.plugins.datalabels.*`
+- or globally: `Chart.defaults.plugins.datalabels.*`
 
 For example:
 
 ```javascript
 // Change default options for ALL charts
-Chart.helpers.merge(Chart.defaults.global.plugins.datalabels, {
+Chart.defaults.set('plugins.datalabels', {
   color: '#FE777B'
 });
 

diff --git a/docs/guide/options.md b/docs/guide/options.md
@@ -12,12 +12,12 @@ The following table lists all available options:
 | `borderWidth` | `number` | Yes | Yes | `0`
 | [`clamp`](positioning.md#clamping) | `boolean` | Yes | Yes | `false`
 | [`clip`](positioning.md#clipping) | `boolean` | Yes | Yes | `false`
-| `color` | [`Style`](#style-options) | Yes | Yes | [`defaultFontColor`](http://www.chartjs.org/docs/latest/general/fonts.html)
+| `color` | [`Style`](#style-options) | Yes | Yes | [`color`](http://www.chartjs.org/docs/latest/general/fonts.html)
 | [`display`](positioning.md#visibility) | `boolean` \| `string` | Yes | Yes | `true`
 | `font` | `object` | Yes | Yes | -
-| `font.family` | `string` | - | - | [`defaultFontFamily`](http://www.chartjs.org/docs/latest/general/fonts.html)
-| `font.size` | `string` | - | - | [`defaultFontSize`](http://www.chartjs.org/docs/latest/general/fonts.html)
-| `font.style` | `string` | - | - | [`defaultFontStyle`](http://www.chartjs.org/docs/latest/general/fonts.html)
+| `font.family` | `string` | - | - | [`font.family`](http://www.chartjs.org/docs/latest/general/fonts.html)
+| `font.size` | `string` | - | - | [`font.size`](http://www.chartjs.org/docs/latest/general/fonts.html)
+| `font.style` | `string` | - | - | [`font.style`](http://www.chartjs.org/docs/latest/general/fonts.html)
 | `font.weight` | `string` | - | - | `'normal'`
 | [`font.lineHeight`](formatting.md#multiline-labels) | `number` \| `string` | - | - | `1.2`
 | [`formatter`](formatting.md#data-transformation) | `function` \| `null` | - | - | -

diff --git a/docs/samples/advanced/custom-labels.md b/docs/samples/advanced/custom-labels.md
@@ -63,19 +63,18 @@ var config = /* <block:config:0> */ {
     },
     elements: {
       line: {
-        fill: false
+        fill: false,
+        tension: 0.4
       }
     },
     scales: {
-      xAxes: [{
+      x: {
         display: false,
         offset: true
-      }],
-      yAxes: [{
-        ticks: {
-          beginAtZero: true
-        }
-      }]
+      },
+      y: {
+        beginAtZero: true
+      }
     }
   }
 } /* </block:config> */;

diff --git a/docs/samples/advanced/multiple-labels.md b/docs/samples/advanced/multiple-labels.md
@@ -109,7 +109,8 @@ var config = /* <block:config:0> */ {
     },
     elements: {
       line: {
-        fill: false
+        fill: false,
+        tension: 0.4
       },
       point: {
         hoverRadius: 7,

diff --git a/docs/samples/charts/bar.md b/docs/samples/charts/bar.md
@@ -85,12 +85,12 @@ var config = /* <block:config:0> */ {
       }
     },
     scales: {
-      xAxes: [{
+      x: {
         stacked: true
-      }],
-      yAxes: [{
+      },
+      y: {
         stacked: true
-      }]
+      }
     }
   }
 } /* </block:config> */;

diff --git a/docs/samples/charts/line.md b/docs/samples/charts/line.md
@@ -78,13 +78,14 @@ var config = /* <block:config:0> */ {
     },
     elements: {
       line: {
-        fill: false
+        fill: false,
+        tension: 0.4
       }
     },
     scales: {
-      yAxes: [{
+      y: {
         stacked: true
-      }]
+      }
     }
   }
 } /* </block:config> */;

diff --git a/docs/samples/defaults.js b/docs/samples/defaults.js
@@ -1,15 +1,15 @@
-import {defaults, helpers} from 'chart.js';
+import {defaults} from 'chart.js';
 
-const {merge} = helpers;
-
-merge(defaults.global, {
-  legend: {
-    display: false
-  },
-  title: {
-    display: false
-  },
-  tooltips: {
-    enabled: false
+defaults.set({
+  plugins: {
+    legend: {
+      display: false
+    },
+    title: {
+      display: false
+    },
+    tooltip: {
+      enabled: false
+    }
   }
 });
diff --git a/docs/samples/events/highlight.md b/docs/samples/events/highlight.md
@@ -95,13 +95,14 @@ var config = /* <block:config:0> */ {
     },
     elements: {
       line: {
-        fill: false
+        fill: false,
+        tension: 0.4
       }
     },
     scales: {
-      yAxes: [{
+      y: {
         stacked: true
-      }]
+      }
     }
   }
 } /* </block:config> */;

diff --git a/docs/samples/events/listeners.md b/docs/samples/events/listeners.md
@@ -97,13 +97,14 @@ var config = /* <block:config:0> */ {
     },
     elements: {
       line: {
-        fill: false
+        fill: false,
+        tension: 0.4
       }
     },
     scales: {
-      yAxes: [{
+      y: {
         stacked: true
-      }]
+      }
     }
   }
 } /* </block:config> */;

diff --git a/docs/samples/events/selection.md b/docs/samples/events/selection.md
@@ -149,13 +149,14 @@ var config = /* <block:config:0> */ {
     },
     elements: {
       line: {
-        fill: false
+        fill: false,
+        tension: 0.4
       }
     },
     scales: {
-      yAxes: [{
+      y: {
         stacked: true
-      }]
+      }
     }
   }
 } /* </block:config> */;

diff --git a/docs/samples/register.js b/docs/samples/register.js
@@ -1,4 +1,4 @@
-import {plugins} from 'chart.js';
+import {Chart} from 'chart.js';
 import plugin from '../../dist/chartjs-plugin-datalabels.js';
 
-plugins.register(plugin);
+Chart.register(plugin);
diff --git a/docs/samples/scriptable/data.md b/docs/samples/scriptable/data.md
@@ -82,7 +82,8 @@ var config = /* <block:config:0> */ {
     },
     elements: {
       line: {
-        fill: false
+        fill: false,
+        tension: 0.4
       }
     },
   }

diff --git a/docs/samples/scriptable/dataset.md b/docs/samples/scriptable/dataset.md
@@ -79,7 +79,8 @@ var config = /* <block:config:0> */ {
     elements: {
       line: {
         borderWidth: 2,
-        fill: false
+        fill: false,
+        tension: 0.4
       }
     },
   }

diff --git a/docs/samples/scriptable/indices.md b/docs/samples/scriptable/indices.md
@@ -72,7 +72,8 @@ var config = /* <block:config:0> */ {
     },
     elements: {
       line: {
-        fill: false
+        fill: false,
+        tension: 0.4
       }
     },
   }

diff --git a/docs/samples/scriptable/interactions.md b/docs/samples/scriptable/interactions.md
@@ -105,13 +105,14 @@ var config = /* <block:config:0> */ {
     },
     elements: {
       line: {
-        fill: false
+        fill: false,
+        tension: 0.4
       }
     },
     scales: {
-      yAxes: [{
+      y: {
         stacked: true
-      }]
+      }
     }
   }
 } // </block:config>

diff --git a/docs/samples/scriptable/mirror.md b/docs/samples/scriptable/mirror.md
@@ -66,7 +66,8 @@ var config = /* <block:config:0> */ {
     },
     elements: {
       line: {
-        fill: false
+        fill: false,
+        tension: 0.4
       },
       point: {
         hoverRadius: 7,

diff --git a/docs/samples/utils.js b/docs/samples/utils.js
@@ -11,7 +11,9 @@ function fallback(/* values ... */) {
   }
 }
 
-var Color = typeof window !== 'undefined' ? window.Color : {};
+var Color = typeof window !== 'undefined' && window.Chart !== undefined ?
+  window.Chart.helpers.color :
+  function() {};
 
 export var COLORS = [
   '#FF3784',
@@ -75,7 +77,7 @@ export function colors(config) {
   var cfg = config || {};
   var c = cfg.color || color(0);
   var count = cfg.count !== undefined ? cfg.count : 8;
-  var method = cfg.mode ? Color.prototype[cfg.mode] : null;
+  var method = cfg.mode ? Color(color)[cfg.mode] : null;
   var values = [];
   var i, f, v;
 

diff --git a/karma.conf.js b/karma.conf.js
@@ -25,7 +25,7 @@ module.exports = function(karma) {
     files: [
       {pattern: './test/fixtures/**/*.js', included: false},
       {pattern: './test/fixtures/**/*.png', included: false},
-      'node_modules/chart.js/dist/Chart.js',
+      'node_modules/chart.js/dist/chart.js',
       'test/index.js',
       'src/plugin.js',
       specs

diff --git a/package-lock.json b/package-lock.json