make waterfall NOT a 'bar' category

etpinard · etpinard · commit ce0a56aa96c4 · 2019-03-27T14:33:17.000-04:00
- this was causing more issues than it solved.
diff --git a/src/components/legend/style.js b/src/components/legend/style.js
@@ -283,8 +283,6 @@ module.exports = function style(s, gd) {
 
     function styleBars(d) {
         var trace = d[0].trace;
-        if(trace.type === 'waterfall') return d;
-
         var marker = trace.marker || {};
         var markerLine = marker.line || {};
 
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js
@@ -2823,14 +2823,16 @@ function hasBarsOrFill(gd, ax) {
     for(var i = 0; i < fullData.length; i++) {
         var trace = fullData[i];
 
-        if(trace.visible === true &&
-            (trace.xaxis + trace.yaxis) === subplot &&
-            (
-                Registry.traceIs(trace, 'bar') && trace.orientation === {x: 'h', y: 'v'}[axLetter] ||
-                trace.fill && trace.fill.charAt(trace.fill.length - 1) === axLetter
-            )
-        ) {
-            return true;
+        if(trace.visible === true && (trace.xaxis + trace.yaxis) === subplot) {
+            if(
+                (Registry.traceIs(trace, 'bar') || trace.type === 'waterfall') &&
+                trace.orientation === {x: 'h', y: 'v'}[axLetter]
+            ) return true;
+
+            if(
+                trace.fill &&
+                trace.fill.charAt(trace.fill.length - 1) === axLetter
+            ) return true;
         }
     }
     return false;
diff --git a/src/traces/bar/cross_trace_calc.js b/src/traces/bar/cross_trace_calc.js
@@ -37,7 +37,7 @@ function crossTraceCalc(gd, plotinfo) {
         var fullTrace = fullTraces[i];
         if(
             fullTrace.visible === true &&
-            (Registry.traceIs(fullTrace, 'bar') && fullTrace.type !== 'waterfall') &&
+            Registry.traceIs(fullTrace, 'bar') &&
             fullTrace.xaxis === xa._id &&
             fullTrace.yaxis === ya._id
         ) {
diff --git a/src/traces/waterfall/index.js b/src/traces/waterfall/index.js
@@ -27,7 +27,7 @@ Waterfall.selectPoints = require('../bar/select');
 Waterfall.moduleType = 'trace';
 Waterfall.name = 'waterfall';
 Waterfall.basePlotModule = require('../../plots/cartesian');
-Waterfall.categories = ['cartesian', 'svg', 'bar', 'oriented', 'showLegend', 'zoomScale'];
+Waterfall.categories = ['cartesian', 'svg', 'oriented', 'showLegend', 'zoomScale'];
 Waterfall.meta = {
     description: [
         'Draws waterfall trace which is useful graph to displays the',
