add bar stack visible -> autorange test & move 'b' init to setPositions

etpinard · etpinard · commit f1cda60e8681 · 2018-07-27T17:18:27.000-04:00
- Bar.setPositions mutate 'b' in bar trace calcdate, we need
  to reinit 'b' during setPositions so that we can skip
  calc on visible edits
diff --git a/src/traces/bar/calc.js b/src/traces/bar/calc.js
@@ -6,12 +6,8 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
-var isNumeric = require('fast-isnumeric');
-var isArrayOrTypedArray = require('../../lib').isArrayOrTypedArray;
-
 var Axes = require('../../plots/cartesian/axes');
 var hasColorscale = require('../../components/colorscale/has_colorscale');
 var colorscaleCalc = require('../../components/colorscale/calc');
@@ -27,24 +23,14 @@ module.exports = function calc(gd, trace) {
     var xa = Axes.getFromId(gd, trace.xaxis || 'x'),
         ya = Axes.getFromId(gd, trace.yaxis || 'y'),
         orientation = trace.orientation || ((trace.x && !trace.y) ? 'h' : 'v'),
-        sa, pos, size, i, scalendar;
+        pos, size, i;
 
     if(orientation === 'h') {
-        sa = xa;
         size = xa.makeCalcdata(trace, 'x');
         pos = ya.makeCalcdata(trace, 'y');
-
-        // not sure if it really makes sense to have dates for bar size data...
-        // ideally if we want to make gantt charts or something we'd treat
-        // the actual size (trace.x or y) as time delta but base as absolute
-        // time. But included here for completeness.
-        scalendar = trace.xcalendar;
-    }
-    else {
-        sa = ya;
+    } else {
         size = ya.makeCalcdata(trace, 'y');
         pos = xa.makeCalcdata(trace, 'x');
-        scalendar = trace.ycalendar;
     }
 
     // create the "calculated data" to plot
@@ -60,33 +46,6 @@ module.exports = function calc(gd, trace) {
         }
     }
 
-    // set base
-    var base = trace.base,
-        b;
-
-    if(isArrayOrTypedArray(base)) {
-        for(i = 0; i < Math.min(base.length, cd.length); i++) {
-            b = sa.d2c(base[i], 0, scalendar);
-            if(isNumeric(b)) {
-                cd[i].b = +b;
-                cd[i].hasB = 1;
-            }
-            else cd[i].b = 0;
-        }
-        for(; i < cd.length; i++) {
-            cd[i].b = 0;
-        }
-    }
-    else {
-        b = sa.d2c(base, 0, scalendar);
-        var hasBase = isNumeric(b);
-        b = hasBase ? b : 0;
-        for(i = 0; i < cd.length; i++) {
-            cd[i].b = b;
-            if(hasBase) cd[i].hasB = 1;
-        }
-    }
-
     // auto-z and autocolorscale if applicable
     if(hasColorscale(trace, 'marker')) {
         colorscaleCalc(trace, trace.marker.color, 'marker', 'c');
diff --git a/src/traces/bar/set_positions.js b/src/traces/bar/set_positions.js
@@ -65,6 +65,8 @@ function setGroupPositions(gd, pa, sa, calcTraces) {
         included,
         i, calcTrace, fullTrace;
 
+    initBase(gd, pa, sa, calcTraces);
+
     if(overlay) {
         setGroupPositionsInOverlayMode(gd, pa, sa, calcTraces);
     }
@@ -110,6 +112,45 @@ function setGroupPositions(gd, pa, sa, calcTraces) {
     collectExtents(calcTraces, pa);
 }
 
+function initBase(gd, pa, sa, calcTraces) {
+    var i, j;
+
+    for(i = 0; i < calcTraces.length; i++) {
+        var cd = calcTraces[i];
+        var trace = cd[0].trace;
+        var base = trace.base;
+        var b;
+
+        // not sure if it really makes sense to have dates for bar size data...
+        // ideally if we want to make gantt charts or something we'd treat
+        // the actual size (trace.x or y) as time delta but base as absolute
+        // time. But included here for completeness.
+        var scalendar = trace.orientation === 'h' ? trace.xcalendar : trace.ycalendar;
+
+        if(isArrayOrTypedArray(base)) {
+            for(j = 0; j < Math.min(base.length, cd.length); j++) {
+                b = sa.d2c(base[j], 0, scalendar);
+                if(isNumeric(b)) {
+                    cd[j].b = +b;
+                    cd[j].hasB = 1;
+                }
+                else cd[j].b = 0;
+            }
+            for(; j < cd.length; j++) {
+                cd[j].b = 0;
+            }
+        } else {
+            b = sa.d2c(base, 0, scalendar);
+            var hasBase = isNumeric(b);
+            b = hasBase ? b : 0;
+            for(j = 0; j < cd.length; j++) {
+                cd[j].b = b;
+                if(hasBase) cd[j].hasB = 1;
+            }
+        }
+    }
+}
+
 
 function setGroupPositionsInOverlayMode(gd, pa, sa, calcTraces) {
     var barnorm = gd._fullLayout.barnorm,
diff --git a/test/jasmine/tests/bar_test.js b/test/jasmine/tests/bar_test.js
@@ -1331,22 +1331,34 @@ describe('A bar plot', function() {
         .catch(failTest)
         .then(done);
     });
+});
+
+describe('bar visibility toggling:', function() {
+    var gd;
+
+    beforeEach(function() {
+        gd = createGraphDiv();
+    });
+
+    afterEach(destroyGraphDiv);
+
+    function _assert(msg, xrng, yrng, calls) {
+        var fullLayout = gd._fullLayout;
+        expect(fullLayout.xaxis.range).toBeCloseToArray(xrng, 2, msg + ' xrng');
+        expect(fullLayout.yaxis.range).toBeCloseToArray(yrng, 2, msg + ' yrng');
 
-    it('should update axis range according to visible edits', function(done) {
+        var setPositions = gd._fullData[0]._module.setPositions;
+        expect(setPositions).toHaveBeenCalledTimes(calls);
+        setPositions.calls.reset();
+    }
+
+    it('should have the correct edit type', function() {
         var schema = Plotly.PlotSchema.get();
         expect(schema.traces.bar.attributes.visible.editType)
             .toBe('plot', 'visible editType');
+    });
 
-        function _assert(msg, xrng, yrng, calls) {
-            var fullLayout = gd._fullLayout;
-            expect(fullLayout.xaxis.range).toBeCloseToArray(xrng, 2, msg + ' xrng');
-            expect(fullLayout.yaxis.range).toBeCloseToArray(yrng, 2, msg + ' yrng');
-
-            var setPositions = gd._fullData[0]._module.setPositions;
-            expect(setPositions).toHaveBeenCalledTimes(calls);
-            setPositions.calls.reset();
-        }
-
+    it('should update axis range according to visible edits (group case)', function(done) {
         Plotly.plot(gd, [
             {type: 'bar', x: [1, 2, 3], y: [1, 2, 1]},
             {type: 'bar', x: [1, 2, 3], y: [-1, -2, -1]}
@@ -1375,6 +1387,36 @@ describe('A bar plot', function() {
         .catch(failTest)
         .then(done);
     });
+
+    it('should update axis range according to visible edits (stack case)', function(done) {
+        Plotly.plot(gd, [
+            {type: 'bar', x: [1, 2, 3], y: [1, 2, 1]},
+            {type: 'bar', x: [1, 2, 3], y: [2, 3, 2]}
+        ], {barmode: 'stack'})
+        .then(function() {
+            spyOn(gd._fullData[0]._module, 'setPositions').and.callThrough();
+
+            _assert('base', [0.5, 3.5], [0, 5.263], 0);
+            return Plotly.restyle(gd, 'visible', false, [1]);
+        })
+        .then(function() {
+            _assert('visible [true,false]', [0.5, 3.5], [0, 2.105], 1);
+            return Plotly.restyle(gd, 'visible', false, [0]);
+        })
+        .then(function() {
+            _assert('both invisible', [0.5, 3.5], [0, 2.105], 0);
+            return Plotly.restyle(gd, 'visible', true, [1]);
+        })
+        .then(function() {
+            _assert('visible [false,true]', [0.5, 3.5], [0, 3.157], 1);
+            return Plotly.restyle(gd, 'visible', true);
+        })
+        .then(function() {
+            _assert('back to both visible', [0.5, 3.5], [0, 5.263], 1);
+        })
+        .catch(failTest)
+        .then(done);
+    });
 });
 
 describe('bar hover', function() {
