use _subplots in Axes.list/listIds

Author: alexcjohnson

src/plots/cartesian/axes.js

@@ -57,10 +57,10 @@ axes.getFromTrace = axisIds.getFromTrace;
  *     Only required if it's different from `dflt`
  */
 axes.coerceRef = function(containerIn, containerOut, gd, attr, dflt, extraOption) {
-    var axLetter = attr.charAt(attr.length - 1),
-        axlist = axes.listIds(gd, axLetter),
-        refAttr = attr + 'ref',
-        attrDef = {};
+    var axLetter = attr.charAt(attr.length - 1);
+    var axlist = gd._fullLayout._subplots[axLetter + 'axis'];
+    var refAttr = attr + 'ref';
+    var attrDef = {};
 
     if(!dflt) dflt = axlist[0] || extraOption;
     if(!extraOption) extraOption = dflt;

src/plots/cartesian/axis_ids.js

@@ -9,7 +9,6 @@
 'use strict';
 
 var Registry = require('../../registry');
-var Lib = require('../../lib');
 
 var constants = require('./constants');
 
@@ -40,53 +39,43 @@ exports.cleanId = function cleanId(id, axLetter) {
     return id.charAt(0) + axNum;
 };
 
-// get all axis object names
-// optionally restricted to only x or y or z by string axLetter
-// and optionally 2D axes only, not those inside 3D scenes
-function listNames(gd, axLetter, only2d) {
+// get all axis objects, as restricted in listNames
+exports.list = function(gd, axLetter, only2d) {
     var fullLayout = gd._fullLayout;
     if(!fullLayout) return [];
 
-    function filterAxis(obj, extra) {
-        var keys = Object.keys(obj),
-            axMatch = /^[xyz]axis[0-9]*/,
-            out = [];
-
-        for(var i = 0; i < keys.length; i++) {
-            var k = keys[i];
-            if(axLetter && k.charAt(0) !== axLetter) continue;
-            if(axMatch.test(k)) out.push(extra + k);
-        }
+    var idList = exports.listIds(gd, axLetter);
+    var out = new Array(idList.length);
+    var i;
 
-        return out.sort();
+    for(i = 0; i < idList.length; i++) {
+        var idi = idList[i];
+        out[i] = fullLayout[idi.charAt(0) + 'axis' + idi.substr(1)];
     }
 
-    var names = filterAxis(fullLayout, '');
-    if(only2d) return names;
+    if(!only2d) {
+        var sceneIds3D = fullLayout._subplots.gl3d || [];
 
-    var sceneIds3D = fullLayout._subplots.gl3d || [];
-    for(var i = 0; i < sceneIds3D.length; i++) {
-        var sceneId = sceneIds3D[i];
-        names = names.concat(
-            filterAxis(fullLayout[sceneId], sceneId + '.')
-        );
-    }
+        for(i = 0; i < sceneIds3D.length; i++) {
+            var scene = fullLayout[sceneIds3D[i]];
 
-    return names;
-}
+            if(axLetter) out.push(scene[axLetter + 'axis']);
+            else out.push(scene.xaxis, scene.yaxis, scene.zaxis);
+        }
+    }
 
-// get all axis objects, as restricted in listNames
-exports.list = function(gd, axletter, only2d) {
-    return listNames(gd, axletter, only2d)
-        .map(function(axName) {
-            return Lib.nestedProperty(gd._fullLayout, axName).get();
-        });
+    return out;
 };
 
 // get all axis ids, optionally restricted by letter
 // this only makes sense for 2d axes
-exports.listIds = function(gd, axletter) {
-    return listNames(gd, axletter, true).map(exports.name2id);
+exports.listIds = function(gd, axLetter) {
+    var fullLayout = gd._fullLayout;
+    if(!fullLayout) return [];
+
+    var subplotLists = fullLayout._subplots;
+    if(axLetter) return subplotLists[axLetter + 'axis'];
+    return subplotLists.xaxis.concat(subplotLists.yaxis);
 };
 
 // get an axis object from its id 'x','x2' etc

test/jasmine/tests/annotations_test.js

@@ -25,6 +25,11 @@ describe('Test annotations', function() {
         function _supply(layoutIn, layoutOut) {
             layoutOut = layoutOut || {};
             layoutOut._has = Plots._hasPlotType.bind(layoutOut);
+            layoutOut._subplots = {xaxis: ['x', 'x2'], yaxis: ['y', 'y2']};
+            ['xaxis', 'yaxis', 'xaxis2', 'yaxis2'].forEach(function(axName) {
+                if(!layoutOut[axName]) layoutOut[axName] = {type: 'linear', range: [0, 1]};
+                Axes.setConvert(layoutOut[axName]);
+            });
 
             Annotations.supplyLayoutDefaults(layoutIn, layoutOut);
 
@@ -89,7 +94,6 @@ describe('Test annotations', function() {
             var layoutOut = {
                 xaxis: { type: 'date', range: ['2000-01-01', '2016-01-01'] }
             };
-            Axes.setConvert(layoutOut.xaxis);
 
             _supply(layoutIn, layoutOut);
 
@@ -132,10 +136,6 @@ describe('Test annotations', function() {
                 yaxis2: {type: 'category', range: [0, 1]}
             };
 
-            ['xaxis', 'xaxis2', 'yaxis', 'yaxis2'].forEach(function(k) {
-                Axes.setConvert(layoutOut[k]);
-            });
-
             _supply(layoutIn, layoutOut);
 
             expect(layoutOut.annotations[0]._xclick).toBe(10, 'paper x');

test/jasmine/tests/axes_test.js

@@ -1242,7 +1242,8 @@ describe('Test axes', function() {
                     xaxis: { range: [0, 0.5] },
                     yaxis: { range: [0, 0.5] },
                     xaxis2: { range: [0.5, 1] },
-                    yaxis2: { range: [0.5, 1] }
+                    yaxis2: { range: [0.5, 1] },
+                    _subplots: {xaxis: ['x', 'x2'], yaxis: ['y', 'y2'], cartesian: ['xy', 'x2y2']}
                 }
             };
         });
@@ -1318,7 +1319,7 @@ describe('Test axes', function() {
         it('returns array of axes, including the ones in scenes', function() {
             gd = {
                 _fullLayout: {
-                    _subplots: {gl3d: ['scene', 'scene2']},
+                    _subplots: {xaxis: [], yaxis: [], gl3d: ['scene', 'scene2']},
                     scene: {
                         xaxis: { _id: 'x' },
                         yaxis: { _id: 'y' },

test/jasmine/tests/layout_images_test.js

@@ -21,7 +21,10 @@ describe('Layout images', function() {
 
         beforeEach(function() {
             layoutIn = { images: [] };
-            layoutOut = { _has: Plots._hasPlotType };
+            layoutOut = {
+                _has: Plots._hasPlotType,
+                _subplots: {xaxis: [], yaxis: []}
+            };
         });
 
         it('should reject when there is no `source`', function() {

test/jasmine/tests/modebar_test.js

@@ -25,12 +25,13 @@ describe('ModeBar', function() {
         return parent;
     }
 
-    function getMockGraphInfo() {
+    function getMockGraphInfo(xaxes, yaxes) {
         return {
             _fullLayout: {
                 dragmode: 'zoom',
                 _paperdiv: d3.select(getMockContainerTree()),
-                _has: Plots._hasPlotType
+                _has: Plots._hasPlotType,
+                _subplots: {xaxis: xaxes || [], yaxis: yaxes || []}
             },
             _fullData: [],
             _context: {
@@ -188,7 +189,7 @@ describe('ModeBar', function() {
                 ['toggleSpikelines', 'hoverClosestCartesian', 'hoverCompareCartesian']
             ]);
 
-            var gd = getMockGraphInfo();
+            var gd = getMockGraphInfo(['x'], ['y']);
             gd._fullLayout._basePlotModules = [{ name: 'cartesian' }];
             gd._fullLayout.xaxis = {fixedrange: false};
 
@@ -206,7 +207,7 @@ describe('ModeBar', function() {
                 ['toggleSpikelines', 'hoverClosestCartesian', 'hoverCompareCartesian']
             ]);
 
-            var gd = getMockGraphInfo();
+            var gd = getMockGraphInfo(['x'], ['y']);
             gd._fullLayout._basePlotModules = [{ name: 'cartesian' }];
             gd._fullLayout.xaxis = {fixedrange: false};
             gd._fullData = [{
@@ -230,7 +231,7 @@ describe('ModeBar', function() {
                 ['toggleSpikelines', 'hoverClosestCartesian', 'hoverCompareCartesian']
             ]);
 
-            var gd = getMockGraphInfo();
+            var gd = getMockGraphInfo(['x'], ['y']);
             gd._fullLayout._basePlotModules = [{ name: 'cartesian' }];
             gd._fullLayout.xaxis = {fixedrange: false};
             gd._fullData = [{
@@ -364,7 +365,7 @@ describe('ModeBar', function() {
                 ['hoverClosestGl2d']
             ]);
 
-            var gd = getMockGraphInfo();
+            var gd = getMockGraphInfo(['x'], ['y']);
             gd._fullLayout._basePlotModules = [{ name: 'gl2d' }];
             gd._fullLayout.xaxis = {fixedrange: false};
 
@@ -427,7 +428,7 @@ describe('ModeBar', function() {
                 ['toggleHover']
             ]);
 
-            var gd = getMockGraphInfo();
+            var gd = getMockGraphInfo(['x'], ['y']);
             gd._fullData = [{
                 type: 'scatter',
                 visible: true,
@@ -569,7 +570,7 @@ describe('ModeBar', function() {
 
         // gives 11 buttons in 5 groups by default
         function setupGraphInfo() {
-            var gd = getMockGraphInfo();
+            var gd = getMockGraphInfo(['x'], ['y']);
             gd._fullLayout._basePlotModules = [{ name: 'cartesian' }];
             gd._fullLayout.xaxis = {fixedrange: false};
             return gd;

test/jasmine/tests/shapes_test.js

@@ -60,7 +60,8 @@ describe('Test shapes defaults:', function() {
             xaxis: {type: 'linear', range: [0, 20]},
             yaxis: {type: 'log', range: [1, 5]},
             xaxis2: {type: 'date', range: ['2006-06-05', '2006-06-09']},
-            yaxis2: {type: 'category', range: [-0.5, 7.5]}
+            yaxis2: {type: 'category', range: [-0.5, 7.5]},
+            _subplots: {xaxis: ['x', 'x2'], yaxis: ['y', 'y2']}
         };
 
         Axes.setConvert(fullLayout.xaxis);