🔪 [un]selected style container for waterfall (for now)

- use a ohlc/candlestick approach to styling onSelect

bypass [un]selected now that it is not supported in waterfall

Author: etpinard

src/traces/bar/defaults.js

@@ -37,7 +37,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
     coerce('hovertext');
     coerce('hovertemplate');
 
-    handleText(traceIn, traceOut, layout, coerce);
+    handleText(traceIn, traceOut, layout, coerce, true);
 
     handleStyleDefaults(traceIn, traceOut, coerce, defaultColor, layout);
 
@@ -109,10 +109,9 @@ function crossTraceDefaults(fullData, fullLayout) {
     }
 }
 
-function handleText(traceIn, traceOut, layout, coerce) {
+function handleText(traceIn, traceOut, layout, coerce, moduleHasSelUnselected) {
 
     var textPosition = coerce('textposition');
-
     var hasBoth = Array.isArray(textPosition) || textPosition === 'auto';
     var hasInside = hasBoth || textPosition === 'inside';
     var hasOutside = hasBoth || textPosition === 'outside';
@@ -137,8 +136,12 @@ function handleText(traceIn, traceOut, layout, coerce) {
         if(hasOutside) coerceFont(coerce, 'outsidetextfont', textFont);
 
         coerce('constraintext');
-        coerce('selected.textfont.color');
-        coerce('unselected.textfont.color');
+
+        if(moduleHasSelUnselected) {
+            coerce('selected.textfont.color');
+            coerce('unselected.textfont.color');
+        }
+
         coerce('cliponaxis');
     }
 }

src/traces/waterfall/attributes.js

@@ -122,8 +122,5 @@ module.exports = {
     },
 
     offsetgroup: barAttrs.offsetgroup,
-    alignmentgroup: barAttrs.offsetgroup,
-
-    selected: barAttrs.selected,
-    unselected: barAttrs.unselected
+    alignmentgroup: barAttrs.offsetgroup
 };

src/traces/waterfall/defaults.js

@@ -48,7 +48,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
     coerce('hovertext');
     coerce('hovertemplate');
 
-    handleText(traceIn, traceOut, layout, coerce);
+    handleText(traceIn, traceOut, layout, coerce, false);
 
     handleDirection(coerce, 'increasing', INCREASING_COLOR);
     handleDirection(coerce, 'decreasing', DECREASING_COLOR);

src/traces/waterfall/index.js

@@ -19,7 +19,6 @@ Waterfall.calc = require('./calc');
 Waterfall.crossTraceCalc = require('./cross_trace_calc');
 Waterfall.plot = require('./plot');
 Waterfall.style = require('./style').style;
-Waterfall.styleOnSelect = require('./style').styleOnSelect;
 Waterfall.hoverPoints = require('./hover');
 Waterfall.selectPoints = require('../bar/select');
 

src/traces/waterfall/style.js

@@ -31,6 +31,7 @@ function style(gd, cd) {
                 .call(Color.fill, cont.color)
                 .call(Color.stroke, cont.line.color)
                 .call(Drawing.dashLine, cont.line.dash, cont.line.width)
+                .style('opacity', trace.selectedpoints && !di.selected ? 0.3 : 1);
         });
 
         styleTextPoints(gTrace, trace, gd);
@@ -49,6 +50,5 @@ function style(gd, cd) {
 }
 
 module.exports = {
-    style: style,
-    styleOnSelect: styleOnSelect
+    style: style
 };