Aggressive splom perf

src/components/fx/hover.js

@@ -396,6 +396,10 @@ function _hover(gd, evt, subplot, noHoverEvent) {
         if(fullLayout[subplotId]) {
             pointData.subplot = fullLayout[subplotId]._subplot;
         }
+        // add ref to splom scene
+        if(fullLayout._splomScenes && fullLayout._splomScenes[trace.uid]) {
+            pointData.scene = fullLayout._splomScenes[trace.uid];
+        }
 
         closedataPreviousLength = hoverData.length;
 

src/plot_api/plot_api.js

@@ -1738,8 +1738,8 @@ function addAxRangeSequence(seq, rangesAltered) {
     // subroutine of its own so that finalDraw always gets
     // executed after drawData
     var doTicks = rangesAltered ?
-        function(gd) { return subroutines.doTicksRelayout(gd, rangesAltered); } :
-        subroutines.doTicksRelayout;
+        function(gd) { return Axes.doTicks(gd, Object.keys(rangesAltered), true); } :
+        function(gd) { return Axes.doTicks(gd, 'redraw'); };
 
     seq.push(
         subroutines.doAutoRangeAndConstraints,

src/plot_api/subroutines.js

@@ -498,12 +498,8 @@ exports.doLegend = function(gd) {
     return Plots.previousPromises(gd);
 };
 
-exports.doTicksRelayout = function(gd, rangesAltered) {
-    if(rangesAltered) {
-        Axes.doTicks(gd, Object.keys(rangesAltered), true);
-    } else {
-        Axes.doTicks(gd, 'redraw');
-    }
+exports.doTicksRelayout = function(gd) {
+    Axes.doTicks(gd, 'redraw');
 
     if(gd._fullLayout._hasOnlyLargeSploms) {
         clearGlCanvases(gd);

src/plots/cartesian/select.js

@@ -514,7 +514,9 @@ function determineSearchTraces(gd, xAxes, yAxes, subplot) {
           // FIXME: make sure we don't have more than single axis for splom
           trace._xaxes[xAxisIds[0]] && trace._yaxes[yAxisIds[0]]
         ) {
-            searchTraces.push(createSearchInfo(trace._module, cd, xAxes[0], yAxes[0]));
+            var info = createSearchInfo(trace._module, cd, xAxes[0], yAxes[0]);
+            info.scene = gd._fullLayout._splomScenes[trace.uid];
+            searchTraces.push(info);
         } else {
             if(xAxisIds.indexOf(trace.xaxis) === -1) continue;
             if(yAxisIds.indexOf(trace.yaxis) === -1) continue;

src/traces/scattergl/attributes.js

@@ -28,15 +28,7 @@ var attrs = module.exports = overrideAll({
     y0: scatterAttrs.y0,
     dy: scatterAttrs.dy,
 
-    text: extendFlat({}, scatterAttrs.text, {
-        description: [
-            'Sets text elements associated with each (x,y) pair to appear on hover.',
-            'If a single string, the same string appears over',
-            'all the data points.',
-            'If an array of string, the items are mapped in order to the',
-            'this trace\'s (x,y) coordinates.'
-        ].join(' ')
-    }),
+    text: scatterAttrs.text,
     hovertext: scatterAttrs.hovertext,
 
     textposition: scatterAttrs.textposition,

src/traces/scattergl/index.js

@@ -893,9 +893,7 @@ function selectPoints(searchInfo, selectionTester) {
     return selection;
 }
 
-function style(gd, cds) {
-    if(!cds) return;
-
+function styleOnSelect(gd, cds) {
     var stash = cds[0][0].t;
     var scene = stash._scene;
 
@@ -957,7 +955,7 @@ module.exports = {
     calc: calc,
     plot: plot,
     hoverPoints: hoverPoints,
-    style: style,
+    styleOnSelect: styleOnSelect,
     selectPoints: selectPoints,
 
     sceneOptions: sceneOptions,

src/traces/scatterpolargl/index.js

@@ -183,7 +183,7 @@ module.exports = {
     calc: calc,
     plot: plot,
     hoverPoints: hoverPoints,
-    style: ScatterGl.style,
+    styleOnSelect: ScatterGl.styleOnSelect,
     selectPoints: ScatterGl.selectPoints,
 
     meta: {

src/traces/splom/attributes.js

@@ -11,6 +11,7 @@
 var scatterGlAttrs = require('../scattergl/attributes');
 var cartesianIdRegex = require('../../plots/cartesian/constants').idRegex;
 var templatedArray = require('../../plot_api/plot_template').templatedArray;
+var extendFlat = require('../../lib/extend').extendFlat;
 
 function makeAxesValObject(axLetter) {
     return {
@@ -86,7 +87,15 @@ module.exports = {
 
     // mode: {}, (only 'markers' for now)
 
-    text: scatterGlAttrs.text,
+    text: extendFlat({}, scatterGlAttrs.text, {
+        description: [
+            'Sets text elements associated with each (x,y) pair to appear on hover.',
+            'If a single string, the same string appears over',
+            'all the data points.',
+            'If an array of string, the items are mapped in order to the',
+            'this trace\'s (x,y) coordinates.'
+        ].join(' ')
+    }),
     marker: scatterGlAttrs.marker,
 
     xaxes: makeAxesValObject('x'),

src/traces/splom/base_plot.js

@@ -45,19 +45,18 @@ function drag(gd) {
     for(var i = 0; i < cd.length; i++) {
         var cd0 = cd[i][0];
         var trace = cd0.trace;
-        var stash = cd0.t;
-        var scene = stash._scene;
+        var scene = fullLayout._splomScenes[trace.uid];
 
         if(trace.type === 'splom' && scene && scene.matrix) {
-            dragOne(gd, trace, stash, scene);
+            dragOne(gd, trace, scene);
         }
     }
 }
 
-function dragOne(gd, trace, stash, scene) {
+function dragOne(gd, trace, scene) {
     var visibleLength = scene.matrixOptions.data.length;
-    var visibleDims = stash.visibleDims;
-    var ranges = new Array(visibleLength);
+    var visibleDims = trace._visibleDims;
+    var ranges = scene.viewOpts.ranges = new Array(visibleLength);
 
     for(var k = 0; k < visibleDims.length; k++) {
         var i = visibleDims[k];
@@ -168,46 +167,40 @@ function makeGridData(gd) {
     return gridBatches;
 }
 
-function clean(newFullData, newFullLayout, oldFullData, oldFullLayout, oldCalcdata) {
-    var oldModules = oldFullLayout._modules || [];
-    var newModules = newFullLayout._modules || [];
+function clean(newFullData, newFullLayout, oldFullData, oldFullLayout) {
+    oldLoop:
+    for(var i = 0; i < oldFullData.length; i++) {
+        var oldTrace = oldFullData[i];
 
-    var hadSplom, hasSplom;
-    var i;
+        if(oldTrace.type === 'splom') {
+            for(var j = 0; j < newFullData.length; j++) {
+                var newTrace = newFullData[j];
 
-    for(i = 0; i < oldModules.length; i++) {
-        if(oldModules[i].name === 'splom') {
-            hadSplom = true;
-            break;
-        }
-    }
-    for(i = 0; i < newModules.length; i++) {
-        if(newModules[i].name === 'splom') {
-            hasSplom = true;
-            break;
-        }
-    }
+                if(oldTrace.uid === newTrace.uid && newTrace.type === 'splom') {
+                    continue oldLoop;
+                }
+            }
 
-    if(hadSplom && !hasSplom) {
-        for(i = 0; i < oldCalcdata.length; i++) {
-            var cd0 = oldCalcdata[i][0];
-            var trace = cd0.trace;
-            var scene = cd0.t._scene;
-
-            if(
-                trace.type === 'splom' &&
-                scene && scene.matrix && scene.matrix.destroy
-            ) {
-                scene.matrix.destroy();
-                cd0.t._scene = null;
+            if(oldFullLayout._splomScenes) {
+                var scene = oldFullLayout._splomScenes[oldTrace.uid];
+                if(scene && scene.destroy) scene.destroy();
+                // must first set scene to null in order to get garbage collected
+                oldFullLayout._splomScenes[oldTrace.uid] = null;
+                delete oldFullLayout._splomScenes[oldTrace.uid];
             }
         }
     }
 
+    if(Object.keys(oldFullLayout._splomScenes || {}).length === 0) {
+        delete oldFullLayout._splomScenes;
+    }
+
     if(oldFullLayout._splomGrid &&
         (!newFullLayout._hasOnlyLargeSploms && oldFullLayout._hasOnlyLargeSploms)) {
+        // must first set scene to null in order to get garbage collected
         oldFullLayout._splomGrid.destroy();
         oldFullLayout._splomGrid = null;
+        delete oldFullLayout._splomGrid;
     }
 
     Cartesian.clean(newFullData, newFullLayout, oldFullData, oldFullLayout);
@@ -228,7 +221,7 @@ function updateFx(gd) {
             var trace = cd0.trace;
 
             if(trace.type === 'splom') {
-                var scene = cd0.t._scene;
+                var scene = fullLayout._splomScenes[trace.uid];
                 if(scene.selectBatch === null) {
                     scene.matrix.update(scene.matrixOptions, null);
                 }