Skip to content

Commit 07e3189

Browse files
authored
Merge pull request #13 from gor181/labels-not-updated-#11
Labels not updated fixes #11
2 parents 4b05ad2 + 8f57eb7 commit 07e3189

File tree

4 files changed

+10
-17
lines changed

4 files changed

+10
-17
lines changed

Diff for: dist/react-chartjs-2.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -100,21 +100,17 @@ var ChartComponent = _react2['default'].createClass({
100100
},
101101

102102
updateChart: function updateChart() {
103-
var _this = this;
104-
105103
var _props = this.props;
106104
var data = _props.data;
107105
var options = _props.options;
108106

109107
if (!this.chart_instance) return;
110108

111109
if (options) {
112-
_chartJs2['default'].helpers.configMerge(this.chart_instance.options, options);
110+
this.chart_instance.options = _chartJs2['default'].helpers.configMerge(this.chart_instance.options, options);
113111
}
114112

115-
data.datasets.forEach(function (dataset, index) {
116-
_this.chart_instance.data.datasets[index] = dataset;
117-
});
113+
this.chart_instance.config.data = _extends({}, this.chart_instance.config.data, data);
118114

119115
this.chart_instance.update();
120116
},

Diff for: dist/react-chartjs-2.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: lib/Chart.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -98,21 +98,17 @@ var ChartComponent = _react2['default'].createClass({
9898
},
9999

100100
updateChart: function updateChart() {
101-
var _this = this;
102-
103101
var _props = this.props;
104102
var data = _props.data;
105103
var options = _props.options;
106104

107105
if (!this.chart_instance) return;
108106

109107
if (options) {
110-
_chartJs2['default'].helpers.configMerge(this.chart_instance.options, options);
108+
this.chart_instance.options = _chartJs2['default'].helpers.configMerge(this.chart_instance.options, options);
111109
}
112110

113-
data.datasets.forEach(function (dataset, index) {
114-
_this.chart_instance.data.datasets[index] = dataset;
115-
});
111+
this.chart_instance.config.data = _extends({}, this.chart_instance.config.data, data);
116112

117113
this.chart_instance.update();
118114
},

Diff for: src/Chart.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,13 @@ const ChartComponent = React.createClass({
7474
if (!this.chart_instance) return;
7575

7676
if (options) {
77-
Chart.helpers.configMerge(this.chart_instance.options, options);
77+
this.chart_instance.options = Chart.helpers.configMerge(this.chart_instance.options, options);
7878
}
7979

80-
data.datasets.forEach((dataset, index) => {
81-
this.chart_instance.data.datasets[index] = dataset;
82-
});
80+
this.chart_instance.config.data = {
81+
...this.chart_instance.config.data,
82+
...data
83+
};
8384

8485
this.chart_instance.update();
8586
},

0 commit comments

Comments
 (0)