sort categories by values: improve splom logic

Author: antoinerg

src/plots/cartesian/type_defaults.js

@@ -80,14 +80,8 @@ function setAutoType(ax, data) {
         ax.type = autoType(boxPositions, calendar, opts);
     } else if(d0.type === 'splom') {
         var dimensions = d0.dimensions;
-        var diag = d0._diag;
-        for(i = 0; i < dimensions.length; i++) {
-            var dim = dimensions[i];
-            if(dim.visible && (diag[i][0] === id || diag[i][1] === id)) {
-                ax.type = autoType(dim.values, calendar, opts);
-                break;
-            }
-        }
+        var dim = dimensions[d0._axesDim[id]];
+        if(dim.visible) ax.type = autoType(dim.values, calendar, opts);
     } else {
         ax.type = autoType(d0[axLetter] || [d0[axLetter + '0']], calendar, opts);
     }

src/plots/plots.js

@@ -2919,22 +2919,20 @@ function sortAxisCategoriesByValue(axList, gd) {
                     // If `splom`, collect values across dimensions
                     if(type === 'splom') {
                         // Find which dimension the current axis is representing
-                        var currentDimensionIndex = cdi.trace[axLetter + 'axes'].indexOf(ax._id);
+                        var currentDimensionIndex = fullTrace._axesDim[ax._id];
 
                         // Apply logic to associated x axis
                         if(axLetter === 'y') {
-                            var associatedXAxis = ax._id.split('');
-                            associatedXAxis[0] = 'x';
-                            associatedXAxis = associatedXAxis.join('');
-                            ax = gd._fullLayout[axisIDs.id2name(associatedXAxis)];
+                            var associatedXAxisID = fullTrace._diag[currentDimensionIndex][0];
+                            ax = gd._fullLayout[axisIDs.id2name(associatedXAxisID)];
                         }
 
                         var categories = cdi.trace.dimensions[currentDimensionIndex].values;
                         for(l = 0; l < categories.length; l++) {
                             cat = categories[l];
                             catIndex = ax._categoriesMap[cat];
 
-                            // Collect values over all other dimensions
+                            // Collect associated values at index `l` over all other dimensions
                             for(o = 0; o < cdi.trace.dimensions.length; o++) {
                                 if(o === currentDimensionIndex) continue;
                                 var dimension = cdi.trace.dimensions[o];

src/traces/splom/defaults.js

@@ -127,6 +127,7 @@ function handleAxisDefaults(traceIn, traceOut, layout, coerce) {
     var mustShiftX = !showDiag && !showLower;
     var mustShiftY = !showDiag && !showUpper;
 
+    traceOut._axesDim = {};
     for(i = 0; i < dimLength; i++) {
         var dim = dimensions[i];
         var i0 = i === 0;
@@ -143,6 +144,8 @@ function handleAxisDefaults(traceIn, traceOut, layout, coerce) {
         fillAxisStashes(xaId, yaId, dim, xList);
         fillAxisStashes(yaId, xaId, dim, yList);
         diag[i] = [xaId, yaId];
+        traceOut._axesDim[xaId] = i;
+        traceOut._axesDim[yaId] = i;
     }
 
     // fill in splom subplot keys