Fix: Initialize data object when replaced (#8918)

diff --git a/src/core/core.config.js b/src/core/core.config.js
index d54b42aa0f144d41bfb62a1f7c0e9a3e3e32965a..e57fa28864f495f480a04cedf5f7d82e68e3f790 100644 (file)
--- a/src/core/core.config.js
+++ b/src/core/core.config.js
@@ -85,12 +85,16 @@ function initOptions(config) {
   options.scales = mergeScaleConfig(config, options);
 }
 
-function initConfig(config) {
-  config = config || {};
-
-  const data = config.data = config.data || {datasets: [], labels: []};
+function initData(data) {
+  data = data || {};
   data.datasets = data.datasets || [];
   data.labels = data.labels || [];
+  return data;
+}
+
+function initConfig(config) {
+  config = config || {};
+  config.data = initData(config.data);
 
   initOptions(config);
 
@@ -137,7 +141,7 @@ export default class Config {
   }
 
   set data(data) {
-    this._config.data = data;
+    this._config.data = initData(data);
   }
 
   get options() {

diff --git a/test/specs/core.controller.tests.js b/test/specs/core.controller.tests.js
index 9d4e7aa96e3772ca9495137db0f0e28edf68d56e..aa492ba837d310f5e6c82a8ad939644705e34d8e 100644 (file)
--- a/test/specs/core.controller.tests.js
+++ b/test/specs/core.controller.tests.js
@@ -230,6 +230,17 @@ describe('Chart', function() {
       expect(createChart).toThrow(new Error('"area" is not a registered controller.'));
     });
 
+    it('should initialize the data object', function() {
+      const chart = acquireChart({type: 'bar'});
+      expect(chart.data).toEqual(jasmine.objectContaining({labels: [], datasets: []}));
+      chart.data = {};
+      expect(chart.data).toEqual(jasmine.objectContaining({labels: [], datasets: []}));
+      chart.data = null;
+      expect(chart.data).toEqual(jasmine.objectContaining({labels: [], datasets: []}));
+      chart.data = undefined;
+      expect(chart.data).toEqual(jasmine.objectContaining({labels: [], datasets: []}));
+    });
+
     describe('should disable hover', function() {
       it('when options.hover=false', function() {
         var chart = acquireChart({