fix box/violin x0/y0 multi-category edge case

etpinard · etpinard · commit c802d321327b · 2018-12-06T14:43:28.000-05:00
diff --git a/src/traces/box/calc.js b/src/traces/box/calc.js
@@ -178,8 +178,10 @@ function getPos(trace, posLetter, posAxis, val, num) {
         pos0 = num;
     }
 
-    // TODO what to do on multicategory posAxis?
-    var pos0c = posAxis.d2c(pos0, 0, trace[posLetter + 'calendar']);
+    var pos0c = posAxis.type === 'multicategory' ?
+        posAxis.r2c(pos0) :
+        posAxis.d2c(pos0, 0, trace[posLetter + 'calendar']);
+
     return val.map(function() { return pos0c; });
 }
 
diff --git a/test/image/baselines/box-violin-x0-category-position.png b/test/image/baselines/box-violin-x0-category-position.png
diff --git a/test/image/mocks/box-violin-x0-category-position.json b/test/image/mocks/box-violin-x0-category-position.json
@@ -0,0 +1,65 @@
+{
+  "data": [
+    {
+      "y": [ 0.2, 0.2, 0.6, 1, 0.5, 0.4, 0.2, 0.7, 0.9, 0.1, 0.5, 0.3, 0.6, 0.7, 0.3, 0.6, 0, 0.5, 0.7, 0.9, 0.5, 0.8, 0.7, 0.2 ],
+      "x": [
+        [ "2016", "2016", "2016", "2016", "2016", "2016", "2016", "2016", "2016", "2016", "2016", "2016",
+          "2017", "2017", "2017", "2017", "2017", "2017", "2017", "2017", "2017", "2017", "2017", "2017"
+        ],
+        [ "day 1", "day 1", "day 1", "day 1", "day 1", "day 1",
+            "day 2", "day 2", "day 2", "day 2", "day 2", "day 2",
+            "day 1", "day 1", "day 1", "day 1", "day 1", "day 1",
+          "day 2", "day 2", "day 2", "day 2", "day 2", "day 2"
+        ]
+      ],
+      "type": "box"
+    },
+    {
+      "y": [ 0.6, 0.7, 0.3, 0.6, 0, 0.5, 0.7, 0.9, 0.5, 0.8, 0.7, 0.2, 0.1, 0.3, 0.1, 0.9, 0.6, 0.6, 0.9, 1, 0.3, 0.6, 0.8, 0.5, 0.6, 0.7, 0.3, 0.6, 0, 0.5, 0.7, 0.9, 0.5, 0.8, 0.7, 0.2 ],
+      "x0": 0.5,
+      "type": "violin"
+    },
+    {
+      "y": [ 0.2, 0.2, 0.6, 1, 0.5, 0.4, 0.2, 0.7, 0.9, 0.1, 0.5, 0.3, 0.6, 0.7, 0.3, 0.6, 0, 0.5, 0.7, 0.9, 0.5, 0.8, 0.7, 0.2 ],
+      "x": [ "day 1", "day 1", "day 1", "day 1", "day 1", "day 1", "day 2",
+        "day 2", "day 2", "day 2", "day 2", "day 2",
+        "day 1", "day 1", "day 1", "day 1", "day 1", "day 1",
+        "day 2", "day 2", "day 2", "day 2", "day 2", "day 2"
+      ],
+      "type": "box",
+      "xaxis": "x2",
+      "yaxis": "y2"
+    },
+    {
+      "y": [ 0.6, 0.7, 0.3, 0.6, 0, 0.5, 0.7, 0.9, 0.5, 0.8, 0.7, 0.2, 0.1, 0.3, 0.1, 0.9, 0.6, 0.6, 0.9, 1, 0.3, 0.6, 0.8, 0.5, 0.6, 0.7, 0.3, 0.6, 0, 0.5, 0.7, 0.9, 0.5, 0.8, 0.7, 0.2 ],
+      "x0": "day 2",
+      "type": "violin",
+      "xaxis": "x2",
+      "yaxis": "y2"
+    }
+  ],
+  "layout": {
+    "grid": {
+      "rows": 2,
+      "columns": 1,
+      "pattern": "independent"
+    },
+    "annotations": [
+      {
+        "xref": "x",
+        "yref": "y",
+        "x": 0.5,
+        "text": "violin at x0:0.5",
+        "y": 1.5
+      },
+      {
+        "xref": "x2",
+        "yref": "y2",
+        "x": "day 2",
+        "text": "box at x0:\"day 2\"",
+        "y": 1.5
+      }
+    ],
+    "showlegend": false
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -178,8 +178,10 @@ function getPos(trace, posLetter, posAxis, val, num) {`
`178`	`178`	`pos0 = num;`
`179`	`179`	`}`
`180`	`180`
`181`		`- // TODO what to do on multicategory posAxis?`
`182`		`- var pos0c = posAxis.d2c(pos0, 0, trace[posLetter + 'calendar']);`
	`181`	`+ var pos0c = posAxis.type === 'multicategory' ?`
	`182`	`+ posAxis.r2c(pos0) :`
	`183`	`+ posAxis.d2c(pos0, 0, trace[posLetter + 'calendar']);`
	`184`	`+`
`183`	`185`	`return val.map(function() { return pos0c; });`
`184`	`186`	`}`
`185`	`187`