Options need to include dataset level defaults from main chart type (#8534)

diff --git a/src/core/core.config.js b/src/core/core.config.js
index f93a8ba9ef89b2107d2740be6477efa81e21b747..32b70dded58b84e6a034128361561bf35beef6ea 100644 (file)
--- a/src/core/core.config.js
+++ b/src/core/core.config.js
@@ -276,9 +276,11 @@ export default class Config {
    * @return {object[]}
    */
   chartOptionScopes() {
+    const controllerDefaults = defaults.controllers[this.type] || {};
     return [
       this.options,
-      defaults.controllers[this.type] || {},
+      controllerDefaults,
+      controllerDefaults.datasets || {},
       {type: this.type},
       defaults,
       defaults.descriptors

diff --git a/test/specs/core.controller.tests.js b/test/specs/core.controller.tests.js
index e618e9c1f52f86195c922559c16ff1abbb8565a4..2fb13eb4bae2040339d7d5416a6b5ca2a7943d48 100644 (file)
--- a/test/specs/core.controller.tests.js
+++ b/test/specs/core.controller.tests.js
@@ -171,6 +171,17 @@ describe('Chart', function() {
       defaults.controllers.line.spanGaps = false;
     });
 
+    it('should initialize config with default dataset options', function() {
+      var defaults = Chart.defaults.controllers.pie.datasets;
+
+      var chart = acquireChart({
+        type: 'pie'
+      });
+
+      var options = chart.options;
+      expect(options.circumference).toBe(defaults.circumference);
+    });
+
     it('should override axis positions that are incorrect', function() {
       var chart = acquireChart({
         type: 'line',