Merge pull request #12 from tyba/master

Allow custom chart types.
reactjs · Mar 26, 2015 · afac2df · afac2df
2 parents c7449c1 + eb2c1f0
commit afac2df
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/index.js b/index.js
@@ -4,5 +4,6 @@ module.exports = {
   Line: require('./lib/line'),
   Pie: require('./lib/pie'),
   PolarArea: require('./lib/polar-area'),
-  Radar: require('./lib/radar')
+  Radar: require('./lib/radar'),
+  createClass: require('./lib/core').createClass
 };
diff --git a/lib/core.js b/lib/core.js
@@ -1,5 +1,5 @@
 module.exports = {
-  createClass: function(chartType, methodNames) {
+  createClass: function(chartType, methodNames, dataKey) {
     var classData = {
       displayName: chartType + 'Chart',
       getInitialState: function() { return {}; },
@@ -40,7 +40,8 @@ module.exports = {
         chart.destroy();
         this.initializeChart(nextProps);
       } else {
-        updatePoints(nextProps, chart);
+        dataKey = dataKey || dataKeys[chart.name];
+        updatePoints(nextProps, chart, dataKey);
         chart.update();
       }
     };
@@ -82,15 +83,14 @@ var dataKeys = {
   'Bar': 'bars'
 };
 
-var updatePoints = function(nextProps, chart) {
+var updatePoints = function(nextProps, chart, dataKey) {
   var name = chart.name;
 
   if (name === 'PolarArea' || name === 'Pie' || name === 'Doughnut') {
     nextProps.data.forEach(function(segment, segmentIndex) {
       chart.segments[segmentIndex].value = segment.value;
     });
   } else {
-    var dataKey = dataKeys[name];
     nextProps.data.datasets.forEach(function(set, setIndex) {
       set.data.forEach(function(val, pointIndex) {
         chart.datasets[setIndex][dataKey][pointIndex].value = val;