Merge pull request #13 from gor181/labels-not-updated-#11

Labels not updated fixes #11
reactchartjs · Aug 6, 2016 · 07e3189 · 07e3189
2 parents 4b05ad2 + 8f57eb7
commit 07e3189
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/dist/react-chartjs-2.js b/dist/react-chartjs-2.js
@@ -100,21 +100,17 @@ var ChartComponent = _react2['default'].createClass({
 	},
 
 	updateChart: function updateChart() {
-		var _this = this;
-
 		var _props = this.props;
 		var data = _props.data;
 		var options = _props.options;
 
 		if (!this.chart_instance) return;
 
 		if (options) {
-			_chartJs2['default'].helpers.configMerge(this.chart_instance.options, options);
+			this.chart_instance.options = _chartJs2['default'].helpers.configMerge(this.chart_instance.options, options);
 		}
 
-		data.datasets.forEach(function (dataset, index) {
-			_this.chart_instance.data.datasets[index] = dataset;
-		});
+		this.chart_instance.config.data = _extends({}, this.chart_instance.config.data, data);
 
 		this.chart_instance.update();
 	},

diff --git a/dist/react-chartjs-2.min.js b/dist/react-chartjs-2.min.js
diff --git a/lib/Chart.js b/lib/Chart.js
@@ -98,21 +98,17 @@ var ChartComponent = _react2['default'].createClass({
 	},
 
 	updateChart: function updateChart() {
-		var _this = this;
-
 		var _props = this.props;
 		var data = _props.data;
 		var options = _props.options;
 
 		if (!this.chart_instance) return;
 
 		if (options) {
-			_chartJs2['default'].helpers.configMerge(this.chart_instance.options, options);
+			this.chart_instance.options = _chartJs2['default'].helpers.configMerge(this.chart_instance.options, options);
 		}
 
-		data.datasets.forEach(function (dataset, index) {
-			_this.chart_instance.data.datasets[index] = dataset;
-		});
+		this.chart_instance.config.data = _extends({}, this.chart_instance.config.data, data);
 
 		this.chart_instance.update();
 	},

diff --git a/src/Chart.js b/src/Chart.js
@@ -74,12 +74,13 @@ const ChartComponent = React.createClass({
 		if (!this.chart_instance) return;
 
 		if (options) {
-			Chart.helpers.configMerge(this.chart_instance.options, options);
+			this.chart_instance.options = Chart.helpers.configMerge(this.chart_instance.options, options);
 		}
 
-		data.datasets.forEach((dataset, index) => {
-			this.chart_instance.data.datasets[index] = dataset;
-		});
+		this.chart_instance.config.data = {
+			...this.chart_instance.config.data,
+			...data
+		};
 
 		this.chart_instance.update();
 	},