adjust vertical ticklabels on x axes

plotly · Nov 26, 2020 · 8efa7bd · 8efa7bd
1 parent a7518ec
commit 8efa7bd
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 2 deletions.
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js
@@ -2641,7 +2641,7 @@ axes.makeLabelFns = function(ax, shift, angle) {
 
     var side = ax.side;
     var axLetter = ax._id.charAt(0);
-
+    var tickangle = ax.tickangle;
     var endSide;
     if(axLetter === 'x') {
         endSide =
@@ -2654,6 +2654,16 @@ axes.makeLabelFns = function(ax, shift, angle) {
         x0 = labelShift * flipIt;
         y0 = shift + labelStandoff * flipIt;
         ff = endSide ? 1 : -0.2;
+        if(Math.abs(tickangle) === 90) {
+            if(
+                (tickangle === -90 && side === 'bottom') ||
+                (tickangle === 90 && side === 'top')
+            ) {
+                ff = CAP_SHIFT;
+            } else {
+                ff = 0.5;
+            }
+        }
 
         out.xFn = function(d) { return d.dx + x0; };
         out.yFn = function(d) { return d.dy + y0 + d.fontSize * ff; };
@@ -2684,7 +2694,6 @@ axes.makeLabelFns = function(ax, shift, angle) {
 
         x0 = labelStandoff;
         y0 = labelShift * flipIt;
-        var tickangle = ax.tickangle;
         ff = 0;
         if(Math.abs(tickangle) === 90) {
             if(

diff --git a/test/image/baselines/1.png b/test/image/baselines/1.png
diff --git a/test/image/baselines/bar_multiline_labels.png b/test/image/baselines/bar_multiline_labels.png
diff --git a/test/image/baselines/box_grouped-multicategory.png b/test/image/baselines/box_grouped-multicategory.png
diff --git a/test/image/baselines/ticklabelposition-d.png b/test/image/baselines/ticklabelposition-d.png
diff --git a/test/image/baselines/vertical-tickangles.png b/test/image/baselines/vertical-tickangles.png