adjustment for vertical labels on the x axis and update baselines

plotly · Nov 26, 2020 · 6f575a3 · 6f575a3
1 parent a1d021b
commit 6f575a3
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 2 deletions.
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js
@@ -2637,6 +2637,7 @@ axes.makeLabelFns = function(ax, shift, angle) {
     };
 
     var x0, y0, ff, flipIt;
+    var xQ = 0;
 
     var side = ax.side;
     var axLetter = ax._id.charAt(0);
@@ -2666,9 +2667,11 @@ axes.makeLabelFns = function(ax, shift, angle) {
                     ff = 0.5;
                 }
             }
+
+            xQ = (MID_SHIFT / 2) * (tickangle / 90);
         }
 
-        out.xFn = function(d) { return d.dx + x0; };
+        out.xFn = function(d) { return d.dx + x0 + xQ * d.fontSize; };
         out.yFn = function(d) { return d.dy + y0 + d.fontSize * ff; };
         out.anchorFn = function(d, a) {
             if(isAligned) {
@@ -2709,7 +2712,6 @@ axes.makeLabelFns = function(ax, shift, angle) {
             }
         }
 
-        var xQ = 0;
         if(insideTickLabels) {
             var ang = isNumeric(tickangle) ? +tickangle : 0;
             if(ang !== 0) {

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