adapt waterfall legend to new *marker* styles ...

- add logic to not show 'totals' part in legend item
  when waterfall trace does not show totals bars

fixup bar / waterfall styles

Author: etpinard

src/components/legend/style.js

@@ -244,39 +244,32 @@ module.exports = function style(s, gd) {
 
     function styleWaterfalls(d) {
         var trace = d[0].trace;
-        if(trace.type !== 'waterfall') return d;
 
-        var barpath = d3.select(this).select('g.legendpoints')
-            .selectAll('path.legendbar')
-            .data(Registry.traceIs(trace, 'bar') ? [d, d, d] : []);
-        barpath.enter().append('path').classed('legendbar', true)
-            .attr('d', function(_, i) {
-                return (
-                    (i === 0) ? 'M-6,-6V6H0Z' :
-                    (i === 1) ? 'M6,6V-6H0Z' : 'M6,6H0L-6,-6H-0Z'
-                );
-            })
-            .attr('transform', 'translate(20,0)');
-        barpath.exit().remove();
-
-        barpath.each(function(d, i) {
-
-            var container = trace.marker || trace[
-                (i % 3 === 0) ? 'increasing' :
-                (i % 3 === 1) ? 'decreasing' : 'totals'
-            ];
+        var ptsData = [];
+        if(trace.type === 'waterfall' && trace.visible) {
+            ptsData = d[0].hasTotals ?
+                [['increasing', 'M-6,-6V6H0Z'], ['totals', 'M6,6H0L-6,-6H-0Z'], ['decreasing', 'M6,6V-6H0Z']] :
+                [['increasing', 'M-6,-6V6H6Z'], ['decreasing', 'M6,6V-6H-6Z']];
+        }
 
-            var line = container.line || {};
+        var pts = d3.select(this).select('g.legendpoints')
+            .selectAll('path.legendwaterfall')
+            .data(ptsData);
+        pts.enter().append('path').classed('legendwaterfall', true)
+            .attr('transform', 'translate(20,0)')
+            .style('stroke-miterlimit', 1);
+        pts.exit().remove();
 
-            var p = d3.select(this);
-            var d0 = d[0];
-            var w = (d0.mlw + 1 || line.width + 1) - 1;
+        pts.each(function(dd) {
+            var pt = d3.select(this);
+            var cont = trace[dd[0]].marker;
 
-            p.style('stroke-width', w + 'px')
-                .call(Color.fill, container.color);
+            pt.attr('d', dd[1])
+                .style('stroke-width', cont.line.width + 'px')
+                .call(Color.fill, cont.color);
 
-            if(w) {
-                p.call(Color.stroke, container.color);
+            if(cont.line.width) {
+                pt.call(Color.stroke, cont.line.color);
             }
         });
     }

src/traces/bar/style.js

@@ -21,7 +21,7 @@ var attributeOutsideTextFont = attributes.outsidetextfont;
 var helpers = require('./helpers');
 
 function style(gd, cd) {
-    var s = cd ? cd[0].node3 : d3.select(gd).selectAll('g.trace.bars');
+    var s = cd ? cd[0].node3 : d3.select(gd).selectAll('g.barlayer').selectAll('g.trace');
     var barcount = s.size();
     var fullLayout = gd._fullLayout;
 

src/traces/waterfall/calc.js

@@ -40,6 +40,8 @@ module.exports = function calc(gd, trace) {
     // set position and size (as well as for waterfall total size)
     var previousSum = 0;
     var newSize;
+    // trace-wide flags
+    var hasTotals = false;
 
     for(var i = 0; i < serieslen; i++) {
         var amount = size[i] || 0;
@@ -70,11 +72,16 @@ module.exports = function calc(gd, trace) {
             previousSum += newSize;
         }
 
+        if(cdi.dir === 'totals') {
+            hasTotals = true;
+        }
+
         if(trace.ids) {
             cdi.id = String(trace.ids[i]);
         }
     }
 
+    cd[0].hasTotals = hasTotals;
 
     mergeArray(trace.text, cd, 'tx');
     mergeArray(trace.hovertext, cd, 'htx');