More complete bar_multiline_labels test with the change disabled.

darabos · darabos · commit e96f7e161f7f · 2018-03-05T13:27:59.000+01:00
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js
@@ -2037,6 +2037,26 @@ axes.doTicks = function(gd, axid, skipTitle) {
             });
         }
 
+        // How much to shift a multi-line label to center it vertically.
+        function getAnchorHeight(lineCount, lineHeight, angle) {
+            var h = (lineCount - 1) * lineHeight;
+            if (axLetter === 'x') {
+                if (angle < -20 || 20 < angle) {
+                    return -0.5 * h;
+                } else if (axside === 'top') {
+                    return -h;
+                }
+            } else {
+                angle *= axside === 'left' ? 1 : -1;
+                if (angle < -20) {
+                    return -h;
+                } else if (angle < 20) {
+                  return -0.5 * h;
+                }
+            }
+            return 0;
+        }
+
         function positionLabels(s, angle) {
             s.each(function(d) {
                 var anchor = labelanchor(angle, d);
@@ -2047,22 +2067,12 @@ axes.doTicks = function(gd, axid, skipTitle) {
                         (' rotate(' + angle + ',' + labelx(d) + ',' +
                             (labely(d) - d.fontSize / 2) + ')') :
                         '');
-                var extraHeight = d.text ?
-                  (d.text.split('<br>').length - 1) * LINE_SPACING * d.fontSize : 0;
-                if (axLetter === 'x') {
-                  if (angle < -20 || 20 < angle) {
-                    transform += ' translate(0, ' + (-0.5 * extraHeight) + ')';
-                  } else if (axside === 'top') {
-                    transform += ' translate(0, ' + (-extraHeight) + ')';
-                  }
-                } else {
-                  var textAngle = isNumeric(angle) ? +angle : 0;
-                  textAngle *= axside === 'left' ? 1 : -1;
-                  if (textAngle < -20) {
-                    transform += ' translate(0, ' + (-extraHeight) + ')';
-                  } else if (textAngle < 20) {
-                    transform += ' translate(0, ' + (-0.5 * extraHeight) + ')';
-                  }
+                var anchorHeight = getAnchorHeight(
+                    svgTextUtils.lineCount(thisLabel),
+                    LINE_SPACING * d.fontSize,
+                    isNumeric(angle) ? +angle : 0);
+                if (anchorHeight) {
+                  //transform += ' translate(0, ' + anchorHeight + ')';
                 }
                 if(mathjaxGroup.empty()) {
                     thisLabel.select('text').attr({
diff --git a/test/image/baselines/bar_multiline_labels.png b/test/image/baselines/bar_multiline_labels.png
diff --git a/test/image/mocks/bar_multiline_labels.json b/test/image/mocks/bar_multiline_labels.json
@@ -1,46 +1,56 @@
 {
     "data":[
         {
-            "x":["x 1","multiple<br>lines","one<br>two<br>three"],
-            "y":["x 2","multiple<br>lines","one<br>two<br>three"]
+            "type": "bar",
+            "x":["x 1","multiple<br>lines","one<br >two<BR>three"],
+            "y":["x 2","multiple<br>lines","one<br >two<BR>three"]
         },
         {
+            "type": "bar",
             "x":["x 2","multiple<br>lines","one<br>two<br>three"],
             "y":["y 2","multiple<br>lines","one<br>two<br>three"],
             "xaxis": "x2",
             "yaxis": "y2"
         },
         {
+            "type": "bar",
             "x":["x 3","multiple<br>lines","one<br>two<br>three"],
             "y":["y 3","multiple<br>lines","one<br>two<br>three"],
             "xaxis": "x3",
             "yaxis": "y3"
         },
         {
+            "type": "bar",
             "x":["x 4","multiple<br>lines","one<br>two<br>three"],
             "y":["y 4","multiple<br>lines","one<br>two<br>three"],
             "xaxis": "x4",
             "yaxis": "y4"
         },
         {
+            "type": "bar",
+            "orientation": "h",
             "x":["x 5","multiple<br>lines","one<br>two<br>three"],
             "y":["y 5","multiple<br>lines","one<br>two<br>three"],
             "xaxis": "x5",
             "yaxis": "y5"
         },
         {
+            "type": "bar",
+            "orientation": "h",
             "x":["x 6","multiple<br>lines","one<br>two<br>three"],
             "y":["y 6","multiple<br>lines","one<br>two<br>three"],
             "xaxis": "x6",
             "yaxis": "y6"
         },
         {
+            "type": "scatter",
             "x":["x 7","multiple<br>lines","one<br>two<br>three"],
             "y":["y 7","multiple<br>lines","one<br>two<br>three"],
             "xaxis": "x7",
             "yaxis": "y7"
         },
         {
+            "type": "scatter",
             "x":["x 8","multiple<br>lines","one<br>two<br>three"],
             "y":["y 8","multiple<br>lines","one<br>two<br>three"],
             "xaxis": "x8",
