fix data-referenced shapes on multicategory axes

- lock down annotations in same mock.

Author: etpinard

src/components/shapes/calc_autorange.js

@@ -6,7 +6,6 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
 var Lib = require('../../lib');
@@ -84,7 +83,7 @@ function calcPaddingOptions(lineWidth, sizeMode, v0, v1, path, isYAxis) {
 }
 
 function shapeBounds(ax, v0, v1, path, paramsToUse) {
-    var convertVal = (ax.type === 'category') ? ax.r2c : ax.d2c;
+    var convertVal = (ax.type === 'category' || ax.type === 'multicategory') ? ax.r2c : ax.d2c;
 
     if(v0 !== undefined) return [convertVal(v0), convertVal(v1)];
     if(!path) return;

test/image/baselines/multicategory-y.png

@@ -0,0 +1,77 @@
+{
+  "data": [
+    {
+      "type": "bar",
+      "orientation": "h",
+      "y": [
+        ["2017", "2017", "2017", "2017", "2018", "2018", "2018"],
+        ["q1", "q2", "q3", "q4", "q1", "q2", "q3" ]
+      ],
+      "x": [1, 2, 3, 1, 3, 2, 3, 1]
+    },
+    {
+      "type": "scatter",
+      "y": [
+        ["2017", "2017", "2017", "2017", "2018", "2018", "2018"],
+        ["q1", "q2", "q3", "q4", "q1", "q2", "q3"]
+      ],
+      "x": [1.12, 2.15, 3.07, 1.48, 2.78, 1.95, 2.54, 0.64]
+    },
+
+    {
+      "mode": "markers",
+      "marker": {
+        "symbol": "square"
+      },
+      "y": [
+        ["2017", "2017", "2017", "2017", "2018", "2018", "2018"],
+        ["q1", "looooooooooooooooong", "q3", "q4", "q1", "q2", "q3"]
+      ],
+      "x": [1, 2, 3, 1, 3, 2, 3, 1],
+      "xaxis": "x2",
+      "yaxis": "y2"
+    }
+  ],
+  "layout": {
+    "grid": {
+      "rows": 2,
+      "columns": 1,
+      "pattern": "independent",
+      "ygap": 0.2
+    },
+    "yaxis": {
+      "title": "MULTI-CATEGORY",
+      "tickfont": {"size": 16},
+      "ticks": "outside",
+      "tickson": "boundaries"
+    },
+    "yaxis2": {
+      "title": "MULTI-CATEGORY",
+      "tickfont": {"size": 12},
+      "ticks": "outside",
+      "tickson": "boundaries"
+    },
+    "xaxis": {
+      "domain": [0.05, 1]
+    },
+    "xaxis2": {
+      "domain": [0.3, 1]
+    },
+    "showlegend": false,
+    "hovermode": "y",
+    "width": 600,
+    "height": 700,
+    "annotations": [{
+      "text": "LOOK",
+      "xref": "x", "x": 3,
+      "yref": "y", "y": 6,
+      "ax": 50, "ay": -50
+    }],
+    "shapes": [{
+      "type": "line",
+      "xref": "paper", "x0": 0.05, "x1": 1,
+      "yref": "y", "y0": 7, "y1": 7,
+      "line": {"color": "red"}
+    }]
+  }
+}