Merge branch 'master' into data-argument-as-func

Author: jerairrest

dist/react-chartjs-2.js

@@ -2006,7 +2006,7 @@ var ChartComponent = function (_React$Component) {
 
       this.shadowDataProp = _extends({}, data, {
         datasets: data.datasets && data.datasets.map(function (set) {
-          return Object.assign({}, set);
+          return _extends({}, set);
         })
       });
 

dist/react-chartjs-2.min.js

@@ -47,7 +47,10 @@ const Graph = React.createClass({
 				newData.push(Math.floor(Math.random() * 100));
 			}
 
-			var newDataSet = Object.assign({}, oldDataSet);
+			var newDataSet = {
+				...oldDataSet
+			};
+
 			newDataSet.data = newData;
 
 			_this.setState({datasets: [newDataSet]});

example/src/components/randomizedLine.js

@@ -152,7 +152,7 @@ var ChartComponent = function (_React$Component) {
 
       this.shadowDataProp = _extends({}, data, {
         datasets: data.datasets && data.datasets.map(function (set) {
-          return Object.assign({}, set);
+          return _extends({}, set);
         })
       });
 

lib/index.js

@@ -112,7 +112,11 @@ class ChartComponent extends React.Component {
 
     this.shadowDataProp = {
       ...data,
-      datasets: data.datasets && data.datasets.map(set => Object.assign({}, set))
+      datasets: data.datasets && data.datasets.map(set => {
+        return {
+            ...set
+        }
+      })
     };
 
     return data;