allow datasets with null values

Author: cmiotto

lib/Axes.js

@@ -437,7 +437,7 @@ var Axes = React.createClass({
       this.xAxisMode = this.props.categoryAxisMode;
       this.yAxisMode = 'point';
       this.xAxisLabels = this.props.categoryLabels;
-      this.yAxisLabels = this.props.valueLabels || fixedValues.reverse();
+      this.yAxisLabels = this.props.valueLabels.reverse() || fixedValues.reverse();
       this.xAxisUnits = this._getCategoryUnits(props);
       this.yAxisUnits = this._getValueUnits(props).reverse();
     } else {

lib/LineChart.js

@@ -284,6 +284,9 @@ var LineChart = React.createClass({
   },
 
   _renderLine: function(value, index, values, dataset) {
+    if ( value == null ) {
+      return null;
+    }
     var fromValue = value;
     var toValue = values[index + 1];
     if (typeof toValue == 'undefined') {
@@ -309,6 +312,9 @@ var LineChart = React.createClass({
   },
 
   _renderArea: function(value, index, values, dataset) {
+    if ( value == null ) {
+      return null;
+    }
     var fromValue = value;
     var toValue = values[index + 1];
     if (typeof toValue == 'undefined') {
@@ -364,12 +370,14 @@ var LineChart = React.createClass({
 
   componentWillMount: function() {
     var p = this.props;
-    ensureScaleCoverRange(p.valueScale, p.datasets, false);
+    // don't ensureScaleCoverRange if datasets has no values
+    p.datasets.some(d => d.values.some(v => v != null)) && ensureScaleCoverRange(p.valueScale, p.datasets, false);
   },
 
   componentWillReceiveProps: function(nextProps) {
     var p = nextProps;
-    ensureScaleCoverRange(p.valueScale, p.datasets, false);
+    // don't ensureScaleCoverRange if datasets has no values
+    p.datasets.some(d => d.values.some(v => v != null)) && ensureScaleCoverRange(p.valueScale, p.datasets, false);
   },
 
   render: function() {

lib/makeRange.js

@@ -34,19 +34,25 @@ function makeRange(datasets : Array<Dataset>, totalize: boolean): Range {
     dataArray.forEach(function(data, index) {
       // min
       data.forEach(function(datum, index) {
-        min = Math.min(min, datum.value);
+        if ( datum.value != null ) {
+          min = Math.min(min, datum.value);
+        }
       });
       // max
       var total = 0;
       data.forEach(function(datum, index) {
-        total += datum.value;
+        if ( datum.value != null ) {
+          total += datum.value;
+        }
       });
       max = Math.max(max, total);
     });
   } else {
     datasets.forEach(function(dataset, index) {
-      min = Math.min(min, ...dataset.values);
-      max = Math.max(max, ...dataset.values);
+      if ( dataset.values.some(v => v != null) ) {
+        min = Math.min(min, ...dataset.values);
+        max = Math.max(max, ...dataset.values);
+      }
     });
   }
   return { min, max };