fix waterfall connectors - not to draw lines between null amounts - using BADNUM

Author: archmoj

src/traces/waterfall/calc.js

@@ -11,6 +11,7 @@
 var Axes = require('../../plots/cartesian/axes');
 var mergeArray = require('../../lib').mergeArray;
 var calcSelection = require('../scatter/calc_selection');
+var BADNUM = require('../../constants/numerical').BADNUM;
 
 function isAbsolute(a) {
     return (a === 'a' || a === 'absolute');
@@ -44,13 +45,22 @@ module.exports = function calc(gd, trace) {
     var hasTotals = false;
 
     for(var i = 0; i < serieslen; i++) {
+
         var amount = size[i] || 0;
 
+        var connectToNext = false;
+        if(size[i] !== BADNUM || isTotal(trace.measure[i]) || isAbsolute(trace.measure[i])) {
+            if(i + 1 < serieslen && (size[i + 1] !== BADNUM || isTotal(trace.measure[i + 1]) || isAbsolute(trace.measure[i + 1]))) {
+                connectToNext = true;
+            }
+        }
+
         var cdi = cd[i] = {
             i: i,
             p: pos[i],
             s: amount,
-            rawS: amount
+            rawS: amount,
+            cNext: connectToNext
         };
 
         if(isAbsolute(trace.measure[i])) {

src/traces/waterfall/plot.js

@@ -46,9 +46,12 @@ function plotConnectors(gd, plotinfo, cdModule, traceLayer) {
 
         connectors.exit().remove();
 
-        var len = connectors[0].length;
+        var len = connectors.size();
 
         connectors.each(function(di, i) {
+            // don't draw lines between nulls
+            if(i !== len - 1 && !di.cNext) return;
+
             var connector = d3.select(this);
             var shape = '';
 

test/image/baselines/waterfall_nonnumeric_sizes.png

@@ -5,13 +5,17 @@
         "a",
         "b",
         "c",
-        "d"
+        "d",
+        "e",
+        "f"
       ],
       "y": [
         1,
         null,
         "nonsense",
-        15
+        14,
+        0,
+        1
       ],
       "type": "waterfall"
     }

test/image/mocks/waterfall_nonnumeric_sizes.json

@@ -231,6 +231,7 @@ describe('waterfall calc / crossTraceCalc', function() {
         assertPointField(cd, 'isSum', [[false, false, false], [true, false, true, false, true]]);
         assertPointField(cd, 'rawS', [[2, 1, 2], [3, 1, 0, 2, 0]]);
         assertPointField(cd, 'dir', [['increasing', 'increasing', 'increasing'], ['totals', 'increasing', 'totals', 'increasing', 'totals']]);
+        assertPointField(cd, 'cNext', [[true, true, false], [true, true, true, true, false]]);
         assertPointField(cd, 'hasTotals', [[false, undefined, undefined], [true, undefined, undefined, undefined, undefined]]);
         assertTraceField(cd, 't.barwidth', [0.8, 0.8]);
         assertTraceField(cd, 't.poffset', [-0.4, -0.4]);
@@ -263,6 +264,7 @@ describe('waterfall calc / crossTraceCalc', function() {
         assertPointField(cd, 'isSum', [[false, false, false], [true, false, true, false, true]]);
         assertPointField(cd, 'rawS', [[2, 1, 2], [3, 1, 0, 2, 0]]);
         assertPointField(cd, 'dir', [['increasing', 'increasing', 'increasing'], ['totals', 'increasing', 'totals', 'increasing', 'totals']]);
+        assertPointField(cd, 'cNext', [[true, true, false], [true, true, true, true, false]]);
         assertPointField(cd, 'hasTotals', [[false, undefined, undefined], [true, undefined, undefined, undefined, undefined]]);
         assertTraceField(cd, 't.barwidth', [0.36, 0.36]);
         assertTraceField(cd, 't.poffset', [-0.38, 0.02]);