fix: support x/yOffset without x/y (vega#9135)

* fix: remove 'replaceOffsetWithMainChannel' * chore: update examples [CI] * fix: support x/yOffset without x/y * chore: update examples [CI] --------- Co-authored-by: Fan Du <[email protected]> Co-authored-by: GitHub Actions Bot <[email protected]>
BradyJ27 · Oct 19, 2023 · 3e0462b · 3e0462b
1 parent 7011887
commit 3e0462b
Show file tree

Hide file tree

Showing 16 changed files with 178 additions and 96 deletions.
diff --git a/examples/compiled/bar_x_offset_without_x.png b/examples/compiled/bar_x_offset_without_x.png
diff --git a/examples/compiled/bar_x_offset_without_x.svg b/examples/compiled/bar_x_offset_without_x.svg
diff --git a/...led/bar_x_offset_without_x_broken.vg.json → ...s/compiled/bar_x_offset_without_x.vg.json b/...led/bar_x_offset_without_x_broken.vg.json → ...s/compiled/bar_x_offset_without_x.vg.json
@@ -1,8 +1,9 @@
 {
   "$schema": "https://vega.github.io/schema/vega/v5.json",
-  "description": "xOffset without x will be replaced as x",
+  "description": "xOffset without x",
   "background": "white",
   "padding": 5,
+  "width": 20,
   "height": 200,
   "style": "cell",
   "data": [
@@ -39,13 +40,6 @@
       ]
     }
   ],
-  "signals": [
-    {"name": "x_step", "value": 20},
-    {
-      "name": "width",
-      "update": "bandspace(domain('x').length, 0.1, 0.05) * x_step"
-    }
-  ],
   "marks": [
     {
       "name": "marks",
@@ -59,23 +53,19 @@
           "description": {
             "signal": "\"value: \" + (format(datum[\"value\"], \"\")) + \"; group: \" + (isValid(datum[\"group\"]) ? datum[\"group\"] : \"\"+datum[\"group\"])"
           },
-          "x": {"scale": "x", "field": "group"},
-          "width": {"signal": "max(0.25, bandwidth('x'))"},
+          "x": {
+            "signal": "width",
+            "mult": 0.5,
+            "offset": {"scale": "xOffset", "field": "group"}
+          },
+          "width": {"signal": "max(0.25, bandwidth('xOffset'))"},
           "y": {"scale": "y", "field": "value_end"},
           "y2": {"scale": "y", "field": "value_start"}
         }
       }
     }
   ],
   "scales": [
-    {
-      "name": "x",
-      "type": "band",
-      "domain": {"data": "data_0", "field": "group", "sort": true},
-      "range": {"step": {"signal": "x_step"}},
-      "paddingInner": 0.1,
-      "paddingOuter": 0.05
-    },
     {
       "name": "y",
       "type": "linear",
@@ -84,6 +74,12 @@
       "nice": true,
       "zero": true
     },
+    {
+      "name": "xOffset",
+      "type": "band",
+      "domain": {"data": "data_0", "field": "group", "sort": true},
+      "range": [{"signal": "-width/2"}, {"signal": "width/2"}]
+    },
     {
       "name": "color",
       "type": "ordinal",
@@ -95,7 +91,6 @@
     {
       "scale": "y",
       "orient": "left",
-      "gridScale": "x",
       "grid": true,
       "tickCount": {"signal": "ceil(height/40)"},
       "domain": false,
@@ -106,16 +101,6 @@
       "ticks": false,
       "zindex": 0
     },
-    {
-      "scale": "x",
-      "orient": "bottom",
-      "grid": false,
-      "title": "group",
-      "labelAlign": "right",
-      "labelAngle": 270,
-      "labelBaseline": "middle",
-      "zindex": 0
-    },
     {
       "scale": "y",
       "orient": "left",

diff --git a/examples/compiled/bar_x_offset_without_x_broken.png b/examples/compiled/bar_x_offset_without_x_broken.png
diff --git a/examples/compiled/bar_x_offset_without_x_broken.svg b/examples/compiled/bar_x_offset_without_x_broken.svg
diff --git a/...ecs/bar_x_offset_without_x_broken.vl.json → ...ples/specs/bar_x_offset_without_x.vl.json b/...ecs/bar_x_offset_without_x_broken.vl.json → ...ples/specs/bar_x_offset_without_x.vl.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://vega.github.io/schema/vega-lite/v5.json",
-  "description": "xOffset without x will be replaced as x",
+  "description": "xOffset without x",
   "data": {
     "values": [
       {"category":"A", "group": "x", "value":0.1},