make makeSubplotLayer agnostic to fullLayout

etpinard · etpinard · commit a708381b4b21 · 2016-10-05T15:30:46.000-04:00
- to allow calling outside the drawFramework step
diff --git a/src/plots/cartesian/index.js b/src/plots/cartesian/index.js
@@ -167,27 +167,34 @@ exports.drawFramework = function(gd) {
         .data(subplotData, Lib.identity);
 
     subplotLayers.enter().append('g')
-        .classed('subplot', true);
+        .attr('class', function(name) { return 'subplot ' + name; });
 
     subplotLayers.order();
 
     subplotLayers.exit()
         .call(purgeSubplotLayers, fullLayout);
 
-    subplotLayers.each(function(subplot) {
-        var plotgroup = d3.select(this),
-            plotinfo = fullLayout._plots[subplot];
+    subplotLayers.each(function(name) {
+        var plotinfo = fullLayout._plots[name];
+
+        // keep ref to plot group
+        plotinfo.plotgroup = d3.select(this);
 
-        // references to any subplots overlaid on this one,
-        // filled in makeSubplotLayer
+        // initialize list of overlay subplots
         plotinfo.overlays = [];
 
-        plotgroup.call(makeSubplotLayer, gd, subplot);
+        makeSubplotLayer(plotinfo);
+
+        // fill in list of overlay subplots
+        if(plotinfo.mainplot) {
+            var mainplot = fullLayout._plots[plotinfo.mainplot];
+            mainplot.overlays.push(plotinfo);
+        }
 
         // make separate drag layers for each subplot,
         // but append them to paper rather than the plot groups,
         // so they end up on top of the rest
-        plotinfo.draglayer = joinLayer(fullLayout._draggers, 'g', subplot);
+        plotinfo.draglayer = joinLayer(fullLayout._draggers, 'g', name);
     });
 };
 
@@ -225,6 +232,7 @@ function makeSubplotData(gd) {
         var mainplot = xa2._id + ya2._id;
         if(mainplot !== subplot && subplots.indexOf(mainplot) !== -1) {
             plotinfo.mainplot = mainplot;
+            plotinfo.mainplotinfo = fullLayout._plots[mainplot];
             overlays.push(subplot);
 
             // for now force overlays to overlay completely... so they
@@ -247,15 +255,9 @@ function makeSubplotData(gd) {
     return subplotData;
 }
 
-function makeSubplotLayer(plotgroup, gd, subplot) {
-    var fullLayout = gd._fullLayout,
-        plotinfo = fullLayout._plots[subplot];
-
-    // keep reference to plotgroup in _plots object
-    plotinfo.plotgroup = plotgroup;
-
-    // add class corresponding to the subplot id
-    plotgroup.classed(subplot, true);
+function makeSubplotLayer(plotinfo) {
+    var plotgroup = plotinfo.plotgroup,
+        id = plotinfo.id;
 
     // Layers to keep plot types in the right order.
     // from back to front:
@@ -264,7 +266,7 @@ function makeSubplotLayer(plotgroup, gd, subplot) {
     // 3. errorbars for bars and scatter
     // 4. scatter
     // 5. box plots
-    function plotLayers(parent) {
+    function joinPlotLayers(parent) {
         joinLayer(parent, 'g', 'imagelayer');
         joinLayer(parent, 'g', 'maplayer');
         joinLayer(parent, 'g', 'barlayer');
@@ -298,27 +300,25 @@ function makeSubplotLayer(plotgroup, gd, subplot) {
         plotinfo.overaxes = joinLayer(plotgroup, 'g', 'overaxes');
     }
     else {
+        var mainplotinfo = plotinfo.mainplotinfo;
 
         // now make the components of overlaid subplots
         // overlays don't have backgrounds, and append all
         // their other components to the corresponding
         // extra groups of their main plots.
 
-        var mainplot = fullLayout._plots[plotinfo.mainplot];
-        mainplot.overlays.push(plotinfo);
+        plotinfo.gridlayer = joinLayer(mainplotinfo.overgrid, 'g', id);
+        plotinfo.zerolinelayer = joinLayer(mainplotinfo.overzero, 'g', id);
 
-        plotinfo.gridlayer = joinLayer(mainplot.overgrid, 'g', subplot);
-        plotinfo.zerolinelayer = joinLayer(mainplot.overzero, 'g', subplot);
-
-        plotinfo.plot = joinLayer(mainplot.overplot, 'g', subplot);
-        plotinfo.xlines = joinLayer(mainplot.overlines, 'path', subplot);
-        plotinfo.ylines = joinLayer(mainplot.overlines, 'path', subplot);
-        plotinfo.xaxislayer = joinLayer(mainplot.overaxes, 'g', subplot);
-        plotinfo.yaxislayer = joinLayer(mainplot.overaxes, 'g', subplot);
+        plotinfo.plot = joinLayer(mainplotinfo.overplot, 'g', id);
+        plotinfo.xlines = joinLayer(mainplotinfo.overlines, 'path', id);
+        plotinfo.ylines = joinLayer(mainplotinfo.overlines, 'path', id);
+        plotinfo.xaxislayer = joinLayer(mainplotinfo.overaxes, 'g', id);
+        plotinfo.yaxislayer = joinLayer(mainplotinfo.overaxes, 'g', id);
     }
 
     // common attributes for all subplots, overlays or not
-    plotinfo.plot.call(plotLayers);
+    plotinfo.plot.call(joinPlotLayers);
 
     plotinfo.xlines
         .style('fill', 'none')
@@ -345,7 +345,6 @@ function purgeSubplotLayers(layers, fullLayout) {
     });
 }
 
-
 function joinLayer(parent, nodeType, className) {
     var layer = parent.selectAll('.' + className)
         .data([0]);
