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/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/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);
                 }

src/traces/splom/index.js

@@ -30,14 +30,13 @@ var TOO_MANY_POINTS = require('../scattergl/constants').TOO_MANY_POINTS;
 function calc(gd, trace) {
     var dimensions = trace.dimensions;
     var commonLength = trace._length;
-    var stash = {};
     var opts = {};
     // 'c' for calculated, 'l' for linear,
     // only differ here for log axes, pass ldata to createMatrix as 'data'
     var cdata = opts.cdata = [];
     var ldata = opts.data = [];
     // keep track of visible dimensions
-    var visibleDims = stash.visibleDims = [];
+    var visibleDims = trace._visibleDims = [];
     var i, k, dim, xa, ya;
 
     function makeCalcdata(ax, dim) {
@@ -107,22 +106,27 @@ function calc(gd, trace) {
         calcAxisExpansion(gd, trace, xa, ya, cdata[k], cdata[k], ppad);
     }
 
-    var scene = stash._scene = sceneUpdate(gd, stash);
+    var scene = sceneUpdate(gd, trace);
     if(!scene.matrix) scene.matrix = true;
     scene.matrixOptions = opts;
 
     scene.selectedOptions = convertMarkerSelection(trace, trace.selected);
     scene.unselectedOptions = convertMarkerSelection(trace, trace.unselected);
 
-    return [{x: false, y: false, t: stash, trace: trace}];
+    return [{x: false, y: false, t: {}, trace: trace}];
 }
 
-function sceneUpdate(gd, stash) {
-    var scene = stash._scene;
+function sceneUpdate(gd, trace) {
+    var fullLayout = gd._fullLayout;
+    var uid = trace.uid;
 
-    var reset = {
-        dirty: true
-    };
+    // must place ref to 'scene' in fullLayout, so that:
+    // - it can be relinked properly on updates
+    // - it can be destroyed properly when needed
+    var splomScenes = fullLayout._splomScenes;
+    if(!splomScenes) splomScenes = fullLayout._splomScenes = {};
+
+    var reset = {dirty: true};
 
     var first = {
         selectBatch: null,
@@ -131,8 +135,10 @@ function sceneUpdate(gd, stash) {
         select: null
     };
 
+    var scene = splomScenes[trace.uid];
+
     if(!scene) {
-        scene = stash._scene = Lib.extendFlat({}, reset, first);
+        scene = splomScenes[uid] = Lib.extendFlat({}, reset, first);
 
         scene.draw = function draw() {
             // draw traces in selection mode
@@ -147,13 +153,13 @@ function sceneUpdate(gd, stash) {
 
         // remove scene resources
         scene.destroy = function destroy() {
-            if(scene.matrix) scene.matrix.destroy();
-
+            if(scene.matrix && scene.matrix.destroy) {
+                scene.matrix.destroy();
+            }
             scene.matrixOptions = null;
             scene.selectBatch = null;
             scene.unselectBatch = null;
-
-            stash._scene = null;
+            scene = null;
         };
     }
 
@@ -178,7 +184,7 @@ function plotOne(gd, cd0) {
     var gs = fullLayout._size;
     var trace = cd0.trace;
     var stash = cd0.t;
-    var scene = stash._scene;
+    var scene = fullLayout._splomScenes[trace.uid];
     var matrixOpts = scene.matrixOptions;
     var cdata = matrixOpts.cdata;
     var regl = fullLayout._glcanvas.data()[0].regl;
@@ -194,7 +200,7 @@ function plotOne(gd, cd0) {
     matrixOpts.upper = trace.showlowerhalf;
     matrixOpts.diagonal = trace.diagonal.visible;
 
-    var visibleDims = stash.visibleDims;
+    var visibleDims = trace._visibleDims;
     var visibleLength = cdata.length;
     var viewOpts = {};
     viewOpts.ranges = new Array(visibleLength);
@@ -305,17 +311,16 @@ function plotOne(gd, cd0) {
 function hoverPoints(pointData, xval, yval) {
     var cd = pointData.cd;
     var trace = cd[0].trace;
-    var stash = cd[0].t;
-    var scene = stash._scene;
+    var scene = pointData.scene;
     var cdata = scene.matrixOptions.cdata;
     var xa = pointData.xa;
     var ya = pointData.ya;
     var xpx = xa.c2p(xval);
     var ypx = ya.c2p(yval);
     var maxDistance = pointData.distance;
 
-    var xi = getDimIndex(trace, stash, xa);
-    var yi = getDimIndex(trace, stash, ya);
+    var xi = getDimIndex(trace, xa);
+    var yi = getDimIndex(trace, ya);
     if(xi === false || yi === false) return [pointData];
 
     var x = cdata[xi];
@@ -352,7 +357,7 @@ function selectPoints(searchInfo, selectionTester) {
     var cd = searchInfo.cd;
     var trace = cd[0].trace;
     var stash = cd[0].t;
-    var scene = stash._scene;
+    var scene = searchInfo.scene;
     var cdata = scene.matrixOptions.cdata;
     var xa = searchInfo.xaxis;
     var ya = searchInfo.yaxis;
@@ -364,8 +369,8 @@ function selectPoints(searchInfo, selectionTester) {
     var hasOnlyLines = (!subTypes.hasMarkers(trace) && !subTypes.hasText(trace));
     if(trace.visible !== true || hasOnlyLines) return selection;
 
-    var xi = getDimIndex(trace, stash, xa);
-    var yi = getDimIndex(trace, stash, ya);
+    var xi = getDimIndex(trace, xa);
+    var yi = getDimIndex(trace, ya);
     if(xi === false || yi === false) return selection;
 
     var xpx = stash.xpx[xi];
@@ -424,15 +429,15 @@ function style(gd, cds) {
 
     var fullLayout = gd._fullLayout;
     var cd0 = cds[0];
-    var scene0 = cd0[0].t._scene;
+    var scene0 = fullLayout._splomScenes[cd0[0].trace.uid];
     scene0.matrix.regl.clear({color: true, depth: true});
 
     if(fullLayout._splomGrid) {
         fullLayout._splomGrid.draw();
     }
 
     for(var i = 0; i < cds.length; i++) {
-        var scene = cds[i][0].t._scene;
+        var scene = fullLayout._splomScenes[cds[i][0].trace.uid];
         scene.draw();
     }
 
@@ -446,11 +451,11 @@ function style(gd, cds) {
     }
 }
 
-function getDimIndex(trace, stash, ax) {
+function getDimIndex(trace, ax) {
     var axId = ax._id;
     var axLetter = axId.charAt(0);
     var ind = {x: 0, y: 1}[axLetter];
-    var visibleDims = stash.visibleDims;
+    var visibleDims = trace._visibleDims;
 
     for(var k = 0; k < visibleDims.length; k++) {
         var i = visibleDims[k];