Skip to content

Commit 5ce6084

Browse files
committed
Added support for updating Chart.js defaults.
Chart.js default settings can be accessed by importing `defaults`, i.e. `import { defaults } from 'react-chartjs-2'`.
1 parent 1edf4a1 commit 5ce6084

File tree

5 files changed

+28
-12
lines changed

5 files changed

+28
-12
lines changed

dist/react-chartjs-2.js

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Object.defineProperty(exports, "__esModule", {
66
value: true
77
});
8-
exports.Polar = exports.Radar = exports.HorizontalBar = exports.Bar = exports.Line = exports.Pie = exports.Doughnut = exports.Bubble = undefined;
8+
exports.defaults = exports.Bubble = exports.Polar = exports.Radar = exports.HorizontalBar = exports.Bar = exports.Line = exports.Pie = exports.Doughnut = undefined;
99

1010
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
1111

@@ -358,6 +358,8 @@ var Bubble = exports.Bubble = function (_React$Component8) {
358358
return Bubble;
359359
}(_react2.default.Component);
360360

361+
var defaults = exports.defaults = _chart2.default.defaults;
362+
361363
}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
362364
},{"./utils/deepEqual":2,"chart.js":undefined,"react-dom":undefined}],2:[function(require,module,exports){
363365
'use strict';
@@ -366,7 +368,7 @@ Object.defineProperty(exports, "__esModule", {
366368
value: true
367369
});
368370

369-
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; };
371+
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
370372

371373
var hasOwnProperty = Object.prototype.hasOwnProperty;
372374

@@ -392,10 +394,15 @@ var deepEqual = function deepEqual(objA, objB) {
392394
}
393395

394396
var keysA = Object.keys(objA);
397+
var keysB = Object.keys(objB);
398+
var allKeys = keysA.concat(keysB);
395399

396-
// Test for A's keys different from B.
397-
for (var i = 0; i < keysA.length; i++) {
398-
if (!hasOwnProperty.call(objB, keysA[i])) {
400+
// Verify both objects have all the keys
401+
for (var i = 0; i < allKeys.length; i++) {
402+
if (!hasOwnProperty.call(objB, allKeys[i])) {
403+
return false;
404+
}
405+
if (!hasOwnProperty.call(objA, allKeys[i])) {
399406
return false;
400407
}
401408
}

dist/react-chartjs-2.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/Chart.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Object.defineProperty(exports, "__esModule", {
44
value: true
55
});
6-
exports.Polar = exports.Radar = exports.HorizontalBar = exports.Bar = exports.Line = exports.Pie = exports.Doughnut = exports.Bubble = undefined;
6+
exports.defaults = exports.Bubble = exports.Polar = exports.Radar = exports.HorizontalBar = exports.Bar = exports.Line = exports.Pie = exports.Doughnut = undefined;
77

88
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
99

@@ -354,4 +354,6 @@ var Bubble = exports.Bubble = function (_React$Component8) {
354354
}]);
355355

356356
return Bubble;
357-
}(_react2.default.Component);
357+
}(_react2.default.Component);
358+
359+
var defaults = exports.defaults = _chart2.default.defaults;

0 commit comments

Comments
 (0)