search for links in constraint and match groups

Author: archmoj

src/plots/cartesian/autorange.js

@@ -14,7 +14,9 @@ var Lib = require('../../lib');
 var FP_SAFE = require('../../constants/numerical').FP_SAFE;
 var Registry = require('../../registry');
 
-var getFromId = require('./axis_ids').getFromId;
+var axIds = require('./axis_ids');
+var getFromId = axIds.getFromId;
+var isLinked = axIds.isLinked;
 
 module.exports = {
     getAutoRange: getAutoRange,
@@ -56,8 +58,9 @@ function getAutoRange(gd, ax) {
     var i, j;
     var newRange = [];
 
-    var getPadMin = makePadFn(ax, 0);
-    var getPadMax = makePadFn(ax, 1);
+    var fullLayout = gd._fullLayout;
+    var getPadMin = makePadFn(fullLayout, ax, 0);
+    var getPadMax = makePadFn(fullLayout, ax, 1);
     var extremes = concatExtremes(gd, ax);
     var minArray = extremes.min;
     var maxArray = extremes.max;
@@ -202,7 +205,7 @@ function calcBreaksLength(ax, v0, v1) {
  * calculate the pixel padding for ax._min and ax._max entries with
  * optional extrapad as 5% of the total axis length
  */
-function makePadFn(ax, max) {
+function makePadFn(fullLayout, ax, max) {
     // 5% padding for points that specify extrapad: true
     var extrappad = 0.05 * ax._length;
 
@@ -222,11 +225,7 @@ function makePadFn(ax, max) {
 
     var A = 0;
     var B = 0;
-
-    if(
-        !anchorAxis.matches && !ax.matches &&
-        !anchorAxis.scaleanchor && !ax.scaleanchor
-    ) {
+    if(!isLinked(fullLayout, ax._id)) {
         A = padInsideLabelsOnAnchorAxis(ax, max);
         B = padInsideLabelsOnThisAxis(ax, max);
     }

src/plots/cartesian/axes.js

@@ -63,6 +63,7 @@ axes.list = axisIds.list;
 axes.listIds = axisIds.listIds;
 axes.getFromId = axisIds.getFromId;
 axes.getFromTrace = axisIds.getFromTrace;
+axes.isLinked = axisIds.isLinked;
 
 var autorange = require('./autorange');
 axes.getAutoRange = autorange.getAutoRange;
@@ -3202,26 +3203,26 @@ axes.drawLabels = function(gd, ax, opts) {
         });
     }
 
-    var anchorAx = ax._anchorAxis;
-    if(
-        anchorAx && anchorAx.autorange &&
-        !anchorAx.matches && !ax.matches &&
-        !anchorAx.scaleanchor && !ax.scaleanchor &&
-        (ax.ticklabelposition || '').indexOf('inside') !== -1
-    ) {
-        if(!fullLayout._insideTickLabelsAutorange) {
-            fullLayout._insideTickLabelsAutorange = {};
-        }
-        fullLayout._insideTickLabelsAutorange[anchorAx._name + '.autorange'] = anchorAx.autorange;
-
-        seq.push(
-            function computeFinalTickLabelBoundingBoxes() {
-                tickLabels.each(function(d, i) {
-                    var thisLabel = selectTickLabel(this);
-                    ax._vals[i].bb = Drawing.bBox(thisLabel.node());
-                });
+    if(!axisIds.isLinked(fullLayout, ax._id)) {
+        var anchorAx = ax._anchorAxis;
+        if(
+            anchorAx && anchorAx.autorange &&
+            (ax.ticklabelposition || '').indexOf('inside') !== -1
+        ) {
+            if(!fullLayout._insideTickLabelsAutorange) {
+                fullLayout._insideTickLabelsAutorange = {};
             }
-        );
+            fullLayout._insideTickLabelsAutorange[anchorAx._name + '.autorange'] = anchorAx.autorange;
+
+            seq.push(
+                function computeFinalTickLabelBoundingBoxes() {
+                    tickLabels.each(function(d, i) {
+                        var thisLabel = selectTickLabel(this);
+                        ax._vals[i].bb = Drawing.bBox(thisLabel.node());
+                    });
+                }
+            );
+        }
     }
 
     var done = Lib.syncOrAsync(seq);

src/plots/cartesian/axis_ids.js

@@ -136,3 +136,26 @@ exports.ref2id = function(ar) {
     // return the axis ID. Otherwise it returns false.
     return (/^[xyz]/.test(ar)) ? ar.split(' ')[0] : false;
 };
+
+
+exports.isLinked = function(fullLayout, axId) {
+    var linked = false;
+
+    (fullLayout._axisConstraintGroups || []).forEach(function(e) {
+        if(e[axId]) {
+            linked = true;
+            return;
+        }
+    });
+
+    if(!linked) {
+        (fullLayout._axisMatchGroups || []).forEach(function(e) {
+            if(e[axId]) {
+                linked = true;
+                return;
+            }
+        });
+    }
+
+    return linked;
+};

src/plots/cartesian/constraints.js

@@ -565,8 +565,8 @@ exports.enforce = function enforce(gd) {
                         // *are* expanding to the full domain
                         var outerMin = rangeCenter - halfRange * factor * 1.0001;
                         var outerMax = rangeCenter + halfRange * factor * 1.0001;
-                        var getPadMin = autorange.makePadFn(ax, 0);
-                        var getPadMax = autorange.makePadFn(ax, 1);
+                        var getPadMin = autorange.makePadFn(fullLayout, ax, 0);
+                        var getPadMax = autorange.makePadFn(fullLayout, ax, 1);
 
                         updateDomain(ax, factor);
                         var m = Math.abs(ax._m);