add supplyDefaults bypass 'axrange' optimization to Plotly.update

Author: etpinard

src/plot_api/plot_api.js

@@ -1716,22 +1716,7 @@ exports.relayout = function relayout(gd, astr, val) {
         seq.push(subroutines.layoutReplot);
     }
     else if(Object.keys(aobj).length) {
-        var flagList = Object.keys(flags).filter(function(k) { return flags[k]; });
-
-        // Optimization mostly for large splom traces where
-        // Plots.supplyDefaults can take > 100ms
-        if(flagList[0] === 'axrange' && flagList.length === 1) {
-            for(var k in specs.rangesAltered) {
-                var axName = Axes.id2name(k);
-                var axIn = gd.layout[axName];
-                var axOut = gd._fullLayout[axName];
-                axOut.autorange = axIn.autorange;
-                axOut.range = axIn.range.slice();
-                axOut.cleanRange();
-            }
-        } else {
-            Plots.supplyDefaults(gd);
-        }
+        axRangeSupplyDefaultsByPass(gd, flags, specs) || Plots.supplyDefaults(gd);
 
         if(flags.legend) seq.push(subroutines.doLegend);
         if(flags.layoutstyle) seq.push(subroutines.layoutStyles);
@@ -1759,6 +1744,28 @@ exports.relayout = function relayout(gd, astr, val) {
     });
 };
 
+// Optimization mostly for large splom traces where
+// Plots.supplyDefaults can take > 100ms
+function axRangeSupplyDefaultsByPass(gd, flags, specs) {
+    var k;
+
+    if(!flags.axrange) return false;
+
+    for(k in flags) {
+        if(k !== 'axrange' && flags[k]) return false;
+    }
+
+    for(k in specs.rangesAltered) {
+        var axName = Axes.id2name(k);
+        var axIn = gd.layout[axName];
+        var axOut = gd._fullLayout[axName];
+        axOut.autorange = axIn.autorange;
+        axOut.range = axIn.range.slice();
+        axOut.cleanRange();
+    }
+    return true;
+}
+
 function addAxRangeSequence(seq, rangesAltered) {
     // N.B. leave as sequence of subroutines (for now) instead of
     // subroutine of its own so that finalDraw always gets
@@ -2182,15 +2189,13 @@ exports.update = function update(gd, traceUpdate, layoutUpdate, _traces) {
     }
     else {
         seq.push(Plots.previousPromises);
-        Plots.supplyDefaults(gd);
+        axRangeSupplyDefaultsByPass(gd, relayoutFlags, relayoutSpecs) || Plots.supplyDefaults(gd);
 
         if(restyleFlags.style) seq.push(subroutines.doTraceStyle);
         if(restyleFlags.colorbars) seq.push(subroutines.doColorBars);
         if(relayoutFlags.legend) seq.push(subroutines.doLegend);
         if(relayoutFlags.layoutstyle) seq.push(subroutines.layoutStyles);
-        if(relayoutFlags.axrange) {
-            addAxRangeSequence(seq, relayoutSpecs.rangesAltered);
-        }
+        if(relayoutFlags.axrange) addAxRangeSequence(seq, relayoutSpecs.rangesAltered);
         if(relayoutFlags.ticks) seq.push(subroutines.doTicksRelayout);
         if(relayoutFlags.modebar) seq.push(subroutines.doModeBar);
         if(relayoutFlags.camera) seq.push(subroutines.doCamera);

test/jasmine/tests/plot_api_test.js

@@ -533,6 +533,7 @@ describe('Test plot api', function() {
                 spyOn(subroutines, m);
             });
             spyOn(Axes, 'doTicks');
+            spyOn(Plots, 'supplyDefaults').and.callThrough();
         });
 
         function mock(gd) {
@@ -542,6 +543,7 @@ describe('Test plot api', function() {
             Axes.doTicks.calls.reset();
 
             supplyAllDefaults(gd);
+            Plots.supplyDefaults.calls.reset();
             Plots.doCalcdata(gd);
             gd.emit = function() {};
             return gd;
@@ -650,6 +652,7 @@ describe('Test plot api', function() {
                 expect(Axes.doTicks).toHaveBeenCalledTimes(1);
                 expect(Axes.doTicks.calls.allArgs()[0][1]).toEqual(['x']);
                 expect(Axes.doTicks.calls.allArgs()[0][2]).toBe(true, 'skip-axis-title argument');
+                expect(Plots.supplyDefaults).not.toHaveBeenCalled();
             }
 
             var specs = [