Merge pull request #129 from strawbrary/master

Fix: unknown prop 'redraw' warning in React v15.2
reactjs · Jul 14, 2016 · 602f861 · 602f861
2 parents 7b5f7d8 + 23c3d45
commit 602f861
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/dist/react-chartjs.js b/dist/react-chartjs.js
@@ -83,6 +83,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	module.exports = {
 	  createClass: function(chartType, methodNames, dataKey) {
+	    var excludedProps = ['data', 'options', 'redraw'];
 	    var classData = {
 	      displayName: chartType + 'Chart',
 	      getInitialState: function() { return {}; },
@@ -92,7 +93,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        };
 	        for (var name in this.props) {
 	          if (this.props.hasOwnProperty(name)) {
-	            if (name !== 'data' && name !== 'options') {
+	            if (excludedProps.indexOf(name) === -1) {
 	              _props[name] = this.props[name];
 	            }
 	          }
@@ -127,7 +128,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	        updatePoints(nextProps, chart, dataKey);
 	        if (chart.scale) {
 	          chart.scale.xLabels = nextProps.data.labels;
+
+	            if (chart.scale.calculateXLabelRotation){
 	          chart.scale.calculateXLabelRotation();
+	            }
 	        }
 	        chart.update();
 	      }
@@ -188,6 +192,17 @@ return /******/ (function(modules) { // webpackBootstrap
 	    while(nextProps.data.length < chart.segments.length) {
 	      chart.removeData();
 	    }
+	  } else if (name === "Radar") {
+	      chart.removeData();
+	      nextProps.data.datasets.forEach(function(set, setIndex) {
+	      set.data.forEach(function(val, pointIndex) {
+	        if (typeof(chart.datasets[setIndex][dataKey][pointIndex]) == "undefined") {
+	          addData(nextProps, chart, setIndex, pointIndex);
+	        } else {
+	          chart.datasets[setIndex][dataKey][pointIndex].value = val;
+	        }
+	      });
+	    });
 	  } else {
 	    while (chart.scale.xLabels.length > nextProps.data.labels.length) {
 	      chart.removeData();

diff --git a/dist/react-chartjs.min.js b/dist/react-chartjs.min.js
diff --git a/lib/core.js b/lib/core.js
@@ -3,6 +3,7 @@ var ReactDOM = require('react-dom');
 
 module.exports = {
   createClass: function(chartType, methodNames, dataKey) {
+    var excludedProps = ['data', 'options', 'redraw'];
     var classData = {
       displayName: chartType + 'Chart',
       getInitialState: function() { return {}; },
@@ -12,7 +13,7 @@ module.exports = {
         };
         for (var name in this.props) {
           if (this.props.hasOwnProperty(name)) {
-            if (name !== 'data' && name !== 'options') {
+            if (excludedProps.indexOf(name) === -1) {
               _props[name] = this.props[name];
             }
           }