update logic from inside label to past edge of label

plotly · Mar 30, 2021 · 1f146f5 · 1f146f5
1 parent f05cd39
commit 1f146f5
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 2 deletions.
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js
@@ -3062,6 +3062,7 @@ axes.drawLabels = function(gd, ax, opts) {
             var min = Math.min(p0, p1) + ax._offset;
             var max = Math.max(p0, p1) + ax._offset;
 
+            var side = ax.side;
             var isX = ax._id.charAt(0) === 'x';
 
             var visibleLabelMin = Infinity;
@@ -3086,8 +3087,17 @@ axes.drawLabels = function(gd, ax, opts) {
                     if(hide) {
                         t.style('display', 'none'); // hidden
                     } else {
-                        visibleLabelMin = Math.min(visibleLabelMin, isX ? bb.top : bb.left);
-                        visibleLabelMax = Math.max(visibleLabelMax, isX ? bb.bottom : bb.right);
+                        if(side === 'bottom' || side === 'right') {
+                            visibleLabelMin = Math.min(visibleLabelMin, isX ? bb.top : bb.left);
+                        } else {
+                            visibleLabelMin = -Infinity;
+                        }
+
+                        if(side === 'top' || side === 'left') {
+                            visibleLabelMax = Math.max(visibleLabelMax, isX ? bb.bottom : bb.right);
+                        } else {
+                            visibleLabelMax = Infinity;
+                        }
                     }
                 } // TODO: hide mathjax?
             });

diff --git a/test/image/baselines/axes_chain_scaleanchor_matches2_inside-ticklabels.png b/test/image/baselines/axes_chain_scaleanchor_matches2_inside-ticklabels.png
diff --git a/test/image/baselines/ticklabelposition-1.png b/test/image/baselines/ticklabelposition-1.png
diff --git a/test/image/baselines/ticklabelposition-5.png b/test/image/baselines/ticklabelposition-5.png
diff --git a/test/image/baselines/ticklabelposition-6.png b/test/image/baselines/ticklabelposition-6.png
diff --git a/test/image/baselines/ticklabelposition-a.png b/test/image/baselines/ticklabelposition-a.png