Merge pull request #1348 from plotly/finance-no-data

Don't try adding rangeslider to visible: false finance traces

Author: etpinard

src/traces/candlestick/transform.js

@@ -42,7 +42,7 @@ exports.transform = function transform(dataIn, state) {
         );
     }
 
-    helpers.addRangeSlider(state.layout);
+    helpers.addRangeSlider(dataOut, state.layout);
 
     return dataOut;
 };

src/traces/ohlc/helpers.js

@@ -104,7 +104,18 @@ exports.getFilterFn = function(direction) {
     }
 };
 
-exports.addRangeSlider = function(layout) {
-    if(!layout.xaxis) layout.xaxis = {};
-    if(!layout.xaxis.rangeslider) layout.xaxis.rangeslider = {};
+exports.addRangeSlider = function(data, layout) {
+    var hasOneVisibleTrace = false;
+
+    for(var i = 0; i < data.length; i++) {
+        if(data[i].visible === true) {
+            hasOneVisibleTrace = true;
+            break;
+        }
+    }
+
+    if(hasOneVisibleTrace) {
+        if(!layout.xaxis) layout.xaxis = {};
+        if(!layout.xaxis.rangeslider) layout.xaxis.rangeslider = {};
+    }
 };

src/traces/ohlc/transform.js

@@ -44,7 +44,7 @@ exports.transform = function transform(dataIn, state) {
         );
     }
 
-    helpers.addRangeSlider(state.layout);
+    helpers.addRangeSlider(dataOut, state.layout);
 
     return dataOut;
 };

test/jasmine/tests/finance_test.js

@@ -962,4 +962,44 @@ describe('finance charts updates:', function() {
             done();
         });
     });
+
+    it('Plotly.plot with data-less trace and adding with Plotly.restyle', function(done) {
+        var data = [
+            { type: 'candlestick' },
+            { type: 'ohlc' },
+            { type: 'bar', y: [2, 1, 2] }
+        ];
+
+        Plotly.plot(gd, data).then(function() {
+            expect(countScatterTraces()).toEqual(0);
+            expect(countBoxTraces()).toEqual(0);
+            expect(countRangeSliders()).toEqual(0);
+
+            return Plotly.restyle(gd, {
+                open: [mock0.open],
+                high: [mock0.high],
+                low: [mock0.low],
+                close: [mock0.close]
+            }, [0]);
+        })
+        .then(function() {
+            expect(countScatterTraces()).toEqual(0);
+            expect(countBoxTraces()).toEqual(2);
+            expect(countRangeSliders()).toEqual(1);
+
+            return Plotly.restyle(gd, {
+                open: [mock0.open],
+                high: [mock0.high],
+                low: [mock0.low],
+                close: [mock0.close]
+            }, [1]);
+        })
+        .then(function() {
+            expect(countScatterTraces()).toEqual(2);
+            expect(countBoxTraces()).toEqual(2);
+            expect(countRangeSliders()).toEqual(1);
+        })
+        .then(done);
+    });
+
 });