fixup restyle connector visible remove nodes

archmoj · archmoj · commit c53bcce408bc · 2019-03-27T13:39:38.000-04:00
diff --git a/src/traces/waterfall/defaults.js b/src/traces/waterfall/defaults.js
@@ -67,9 +67,11 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
     var connectorVisible = coerce('connector.visible');
     if(connectorVisible) {
         coerce('connector.mode');
-        coerce('connector.line.color');
-        coerce('connector.line.width');
-        coerce('connector.line.dash');
+        var connectorLineWidth = coerce('connector.line.width');
+        if(connectorLineWidth) {
+            coerce('connector.line.color');
+            coerce('connector.line.dash');
+        }
     }
 }
 
diff --git a/src/traces/waterfall/plot.js b/src/traces/waterfall/plot.js
@@ -27,15 +27,18 @@ function plotConnectors(gd, plotinfo, cdModule, traceLayer) {
         var cd0 = cd[0];
         var trace = cd0.trace;
 
-        if(!trace.connector || !trace.connector.visible || !trace.connector.line.width) return;
+        var group = Lib.ensureSingle(plotGroup, 'g', 'lines');
+
+        if(!trace.connector || !trace.connector.visible) {
+            group.remove();
+            return;
+        }
 
         var isHorizontal = (trace.orientation === 'h');
         var mode = trace.connector.mode;
 
         if(!plotinfo.isRangePlot) cd0.node3 = plotGroup;
 
-        var group = Lib.ensureSingle(plotGroup, 'g', 'lines');
-
         var connectors = group.selectAll('g.line').data(Lib.identity);
 
         connectors.enter().append('g')
diff --git a/src/traces/waterfall/style.js b/src/traces/waterfall/style.js
@@ -20,7 +20,7 @@ function style(gd, cd) {
 
     s.selectAll('g.lines').each(function(d) {
         var sel = d3.select(this);
-        var connectorLine = (d[0].trace.connector.line || {});
+        var connectorLine = d[0].trace.connector.line;
 
         lineGroupStyle(sel.selectAll('path'),
             connectorLine.width,

Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,11 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {`
`67`	`67`	`var connectorVisible = coerce('connector.visible');`
`68`	`68`	`if(connectorVisible) {`
`69`	`69`	`coerce('connector.mode');`
`70`		`- coerce('connector.line.color');`
`71`		`- coerce('connector.line.width');`
`72`		`- coerce('connector.line.dash');`
	`70`	`+ var connectorLineWidth = coerce('connector.line.width');`
	`71`	`+ if(connectorLineWidth) {`
	`72`	`+ coerce('connector.line.color');`
	`73`	`+ coerce('connector.line.dash');`
	`74`	`+ }`
`73`	`75`	`}`
`74`	`76`	`}`
`75`	`77`