plots: add linkSubplot method

etpinard · etpinard · commit 40fc7f90d0c8 · 2016-09-15T17:22:34.000-04:00
- which handles fullLayout._plots creation and reference updates
- rm block in Plots.transition that used to handle that
diff --git a/src/plots/plots.js b/src/plots/plots.js
@@ -414,6 +414,9 @@ plots.supplyDefaults = function(gd) {
         ax.setScale();
     }
 
+    // relink / initialize subplot axis objects
+    plots.linkSubplots(newFullData, newFullLayout, oldFullData, oldFullLayout);
+
     // update object references in calcdata
     if((gd.calcdata || []).length === newFullData.length) {
         for(i = 0; i < newFullData.length; i++) {
@@ -559,6 +562,41 @@ function relinkPrivateKeys(toContainer, fromContainer) {
     }
 }
 
+plots.linkSubplots = function(newFullData, newFullLayout, oldFullData, oldFullLayout) {
+    var oldSubplots = oldFullLayout._plots || {},
+        newSubplots = newFullLayout._plots = {};
+
+    var mockGd = {
+        data: newFullData,
+        _fullLayout: newFullLayout
+    };
+
+    var ids = Plotly.Axes.getSubplots(mockGd);
+
+    function getAxisFunc(subplot, axLetter) {
+        return function() { return Plotly.Axes.getFromId(mockGd, subplot, axLetter); };
+    }
+
+    for(var i = 0; i < ids.length; i++) {
+        var id = ids[i],
+            oldSubplot = oldSubplots[id],
+            plotinfo;
+
+        if(oldSubplot) {
+            plotinfo = newSubplots[id] = oldSubplot;
+        }
+        else {
+            plotinfo = newSubplots[id] = {};
+            plotinfo.id = id;
+        }
+
+        plotinfo.x = getAxisFunc(id, 'x');
+        plotinfo.y = getAxisFunc(id, 'y');
+        plotinfo.xaxis = plotinfo.x();
+        plotinfo.yaxis = plotinfo.y();
+    }
+};
+
 plots.supplyDataDefaults = function(dataIn, dataOut, layout) {
     var modules = layout._modules = [],
         basePlotModules = layout._basePlotModules = [],
@@ -1363,7 +1401,8 @@ plots.transition = function(gd, data, layout, traces, frameOpts, transitionOpts)
     var transitionedTraces = [];
 
     function prepareTransitions() {
-        var plotinfo, i;
+        var i;
+
         for(i = 0; i < traceIndices.length; i++) {
             var traceIdx = traceIndices[i];
             var trace = gd._fullData[traceIdx];
@@ -1410,19 +1449,6 @@ plots.transition = function(gd, data, layout, traces, frameOpts, transitionOpts)
         // transitions:
         plots.supplyDefaults(gd);
 
-        // This step fies the .xaxis and .yaxis references that otherwise
-        // aren't updated by the supplyDefaults step:
-        var subplots = Plotly.Axes.getSubplots(gd);
-
-        // Polar does not have _plots:
-        if(gd._fullLayout._plots) {
-            for(i = 0; i < subplots.length; i++) {
-                plotinfo = gd._fullLayout._plots[subplots[i]];
-                plotinfo.xaxis = plotinfo.x();
-                plotinfo.yaxis = plotinfo.y();
-            }
-        }
-
         plots.doCalcdata(gd);
 
         ErrorBars.calc(gd);
