rm _gd ref in fullLayout axis containers

- make setConvert take fullLayout,
  use fullLayout._size in setScale instead of gd._fullLayout._size
- add _input ref to fullLayout axis,
  use that in doAutorange to copy back computed range to input layout

Author: etpinard

src/components/colorbar/draw.js

@@ -185,11 +185,10 @@ module.exports = function draw(gd, id) {
         }
 
         // Prepare the Plotly axis object
-        handleAxisDefaults(cbAxisIn, cbAxisOut, coerce, axisOptions);
+        handleAxisDefaults(cbAxisIn, cbAxisOut, coerce, axisOptions, fullLayout);
         handleAxisPositionDefaults(cbAxisIn, cbAxisOut, coerce, axisOptions);
 
         cbAxisOut._id = 'y' + id;
-        cbAxisOut._gd = gd;
 
         // position can't go in through supplyDefaults
         // because that restricts it to [0,1]

src/plots/cartesian/axes.js

@@ -328,14 +328,10 @@ axes.doAutoRange = function(ax) {
 
         // doAutoRange will get called on fullLayout,
         // but we want to report its results back to layout
-        var axIn = ax._gd.layout[ax._name];
 
-        if(!axIn) ax._gd.layout[ax._name] = axIn = {};
-
-        if(axIn !== ax) {
-            axIn.range = ax.range.slice();
-            axIn.autorange = ax.autorange;
-        }
+        var axIn = ax._input;
+        axIn.range = ax.range.slice();
+        axIn.autorange = ax.autorange;
     }
 };
 
@@ -1137,7 +1133,7 @@ axes.tickText = function(ax, x, hover) {
 };
 
 function tickTextObj(ax, x, text) {
-    var tf = ax.tickfont || ax._gd._fullLayout.font;
+    var tf = ax.tickfont || {};
 
     return {
         x: x,
@@ -1347,7 +1343,7 @@ function numFormat(v, ax, fmtoverride, hover) {
             if(dp) v = v.substr(0, dp + tickRound).replace(/\.?0+$/, '');
         }
         // insert appropriate decimal point and thousands separator
-        v = Lib.numSeparate(v, ax._gd._fullLayout.separators, separatethousands);
+        v = Lib.numSeparate(v, ax.separators, separatethousands);
     }
 
     // add exponent

src/plots/cartesian/axis_defaults.js

@@ -39,7 +39,7 @@ var autoType = require('./axis_autotype');
  *  data: the plot data to use in choosing auto type
  *  bgColor: the plot background color, to calculate default gridline colors
  */
-module.exports = function handleAxisDefaults(containerIn, containerOut, coerce, options) {
+module.exports = function handleAxisDefaults(containerIn, containerOut, coerce, options, layoutOut) {
     var letter = options.letter,
         font = options.font || {},
         defaultTitle = 'Click to enter ' +
@@ -78,7 +78,7 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
         handleCalendarDefaults(containerIn, containerOut, 'calendar', options.calendar);
     }
 
-    setConvert(containerOut);
+    setConvert(containerOut, layoutOut);
 
     var dfltColor = coerce('color');
     // if axis.color was provided, use it for fonts too; otherwise,

src/plots/cartesian/layout_defaults.js

@@ -138,8 +138,13 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
 
     for(i = 0; i < axesList.length; i++) {
         axName = axesList[i];
-        axLayoutIn = layoutIn[axName] || {};
-        axLayoutOut = {};
+
+        if(!Lib.isPlainObject(layoutIn[axName])) {
+            layoutIn[axName] = {};
+        }
+
+        axLayoutIn = layoutIn[axName];
+        axLayoutOut = layoutOut[axName] = {};
 
         var axLetter = axName.charAt(0);
 
@@ -164,13 +169,7 @@ module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
 
         handlePositionDefaults(axLayoutIn, axLayoutOut, coerce, positioningOptions);
 
-        layoutOut[axName] = axLayoutOut;
-
-        // so we don't have to repeat autotype unnecessarily,
-        // copy an autotype back to layoutIn
-        if(!layoutIn[axName] && axLayoutIn.type !== '-') {
-            layoutIn[axName] = {type: axLayoutIn.type};
-        }
+        axLayoutOut._input = axLayoutIn;
     }
 
     // quick second pass for range slider and selector defaults

src/plots/cartesian/set_convert.js

@@ -61,7 +61,8 @@ function num(v) {
  * also clears the autorange bounds ._min and ._max
  * and the autotick constraints ._minDtick, ._forceTick0
  */
-module.exports = function setConvert(ax) {
+module.exports = function setConvert(ax, fullLayout) {
+    fullLayout = fullLayout || {};
 
     // clipMult: how many axis lengths past the edge do we render?
     // for panning, 1-2 would suffice, but for zooming more is nice.
@@ -319,7 +320,7 @@ module.exports = function setConvert(ax) {
 
     // set scaling to pixels
     ax.setScale = function(usePrivateRange) {
-        var gs = ax._gd._fullLayout._size,
+        var gs = fullLayout._size,
             axLetter = ax._id.charAt(0);
 
         // TODO cleaner way to handle this case
@@ -328,7 +329,7 @@ module.exports = function setConvert(ax) {
         // make sure we have a domain (pull it in from the axis
         // this one is overlaying if necessary)
         if(ax.overlaying) {
-            var ax2 = axisIds.getFromId(ax._gd, ax.overlaying);
+            var ax2 = axisIds.getFromId({ _fullLayout: fullLayout }, ax.overlaying);
             ax.domain = ax2.domain;
         }
 
@@ -360,7 +361,6 @@ module.exports = function setConvert(ax) {
             Lib.notifier(
                 'Something went wrong with axis scaling',
                 'long');
-            ax._gd._replotting = false;
             throw new Error('axis scaling');
         }
     };
@@ -417,6 +417,10 @@ module.exports = function setConvert(ax) {
     ax._min = [];
     ax._max = [];
 
+    // copy ref to fullLayout.separators so that
+    // methods in Axes can use it w/o having to pass fullLayout
+    ax.separators = fullLayout.separators;
+
     // and for bar charts and box plots: reset forced minimum tick spacing
     delete ax._minDtick;
     delete ax._forceTick0;

src/plots/geo/geo.js

@@ -465,10 +465,9 @@ function createMockAxis(fullLayout) {
     var mockAxis = {
         type: 'linear',
         showexponent: 'all',
-        exponentformat: Axes.layoutAttributes.exponentformat.dflt,
-        _gd: { _fullLayout: fullLayout }
+        exponentformat: Axes.layoutAttributes.exponentformat.dflt
     };
 
-    Axes.setConvert(mockAxis);
+    Axes.setConvert(mockAxis, fullLayout);
     return mockAxis;
 }

src/plots/plots.js

@@ -491,12 +491,10 @@ plots.supplyDefaults = function(gd) {
     // TODO may return a promise
     plots.doAutoMargin(gd);
 
-    // can't quite figure out how to get rid of this... each axis needs
-    // a reference back to the DOM object for just a few purposes
+    // set scale after auto margin routine
     var axList = Plotly.Axes.list(gd);
     for(i = 0; i < axList.length; i++) {
         var ax = axList[i];
-        ax._gd = gd;
         ax.setScale();
     }
 

src/plots/ternary/ternary.js

@@ -176,10 +176,9 @@ proto.adjustLayout = function(ternaryLayout, graphSize) {
             xDomainCenter - xDomainFinal / 2,
             xDomainCenter + xDomainFinal / 2
         ],
-        _id: 'x',
-        _gd: _this.graphDiv
+        _id: 'x'
     };
-    setConvert(_this.xaxis);
+    setConvert(_this.xaxis, _this.graphDiv._fullLayout);
     _this.xaxis.setScale();
 
     _this.yaxis = {
@@ -189,10 +188,9 @@ proto.adjustLayout = function(ternaryLayout, graphSize) {
             yDomainCenter - yDomainFinal / 2,
             yDomainCenter + yDomainFinal / 2
         ],
-        _id: 'y',
-        _gd: _this.graphDiv
+        _id: 'y'
     };
-    setConvert(_this.yaxis);
+    setConvert(_this.yaxis, _this.graphDiv._fullLayout);
     _this.yaxis.setScale();
 
     // set up the modified axes for tick drawing
@@ -212,12 +210,12 @@ proto.adjustLayout = function(ternaryLayout, graphSize) {
         _axislayer: _this.layers.aaxis,
         _gridlayer: _this.layers.agrid,
         _pos: 0, // _this.xaxis.domain[0] * graphSize.w,
-        _gd: _this.graphDiv,
         _id: 'y',
         _length: w,
         _gridpath: 'M0,0l' + h + ',-' + (w / 2)
     });
-    setConvert(aaxis);
+    setConvert(aaxis, _this.graphDiv._fullLayout);
+    aaxis.setScale();
 
     // baxis goes across the bottom (backward). We can set it up as an x axis
     // without any enclosing transformation.
@@ -230,12 +228,12 @@ proto.adjustLayout = function(ternaryLayout, graphSize) {
         _gridlayer: _this.layers.bgrid,
         _counteraxis: _this.aaxis,
         _pos: 0, // (1 - yDomain0) * graphSize.h,
-        _gd: _this.graphDiv,
         _id: 'x',
         _length: w,
         _gridpath: 'M0,0l-' + (w / 2) + ',-' + h
     });
-    setConvert(baxis);
+    setConvert(baxis, _this.graphDiv._fullLayout);
+    baxis.setScale();
     aaxis._counteraxis = baxis;
 
     // caxis goes down the right side. Set it up as a y axis, with
@@ -250,12 +248,12 @@ proto.adjustLayout = function(ternaryLayout, graphSize) {
         _gridlayer: _this.layers.cgrid,
         _counteraxis: _this.baxis,
         _pos: 0, // _this.xaxis.domain[1] * graphSize.w,
-        _gd: _this.graphDiv,
         _id: 'y',
         _length: w,
         _gridpath: 'M0,0l-' + h + ',' + (w / 2)
     });
-    setConvert(caxis);
+    setConvert(caxis, _this.graphDiv._fullLayout);
+    caxis.setScale();
 
     var triangleClip = 'M' + x0 + ',' + (y0 + h) + 'h' + w + 'l-' + (w / 2) + ',-' + h + 'Z';
     _this.clipDef.select('path').attr('d', triangleClip);

test/jasmine/tests/axes_test.js

@@ -1485,9 +1485,8 @@ describe('Test axes', function() {
 
     describe('calcTicks and tickText', function() {
         function mockCalc(ax) {
-            Axes.setConvert(ax);
             ax.tickfont = {};
-            ax._gd = {_fullLayout: {separators: '.,'}};
+            Axes.setConvert(ax, {separators: '.,'});
             return Axes.calcTicks(ax).map(function(v) { return v.text; });
         }