fix: apply bandPosition to offset channel for grouped bar (so band si…

…ze works with grouped bars) fix #9177
vega · Nov 16, 2023 · 0d7ec05 · 0d7ec05
1 parent efacdd0
commit 0d7ec05
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/compile/mark/encode/offset.ts b/src/compile/mark/encode/offset.ts
@@ -26,7 +26,7 @@ export function positionOffset({
   markDef: MarkDef<Mark, SignalRef>;
   encoding?: Encoding<string>;
   model?: UnitModel;
-  bandPosition?: number;
+  bandPosition?: number | SignalRef;
 }): Offset {
   const channel = `${baseChannel}Offset` as
     | 'xOffset'

diff --git a/src/compile/mark/encode/position-rect.ts b/src/compile/mark/encode/position-rect.ts
@@ -203,7 +203,16 @@ function positionAndSize(
 
   const vgChannel = vgAlignedPositionChannel(channel, markDef, config, defaultBandAlign);
   const center = vgChannel === 'xc' || vgChannel === 'yc';
-  const {offset, offsetType} = positionOffset({channel, markDef, encoding, model, bandPosition: center ? 0.5 : 0});
+
+  const bandPosition = center
+    ? 0.5
+    : isSignalRef(bandSize)
+    ? {signal: `(1-${bandSize})/2`}
+    : isRelativeBandSize(bandSize)
+    ? (1 - bandSize.band) / 2
+    : 0;
+
+  const {offset, offsetType} = positionOffset({channel, markDef, encoding, model, bandPosition});
 
   const posRef = ref.midPointRefWithPositionInvalidTest({
     channel,
@@ -215,15 +224,7 @@ function positionAndSize(
     stack,
     offset,
     defaultRef: pointPositionDefaultRef({model, defaultPos: 'mid', channel, scaleName, scale}),
-    bandPosition: center
-      ? offsetType === 'encoding'
-        ? 0
-        : 0.5
-      : isSignalRef(bandSize)
-      ? {signal: `(1-${bandSize})/2`}
-      : isRelativeBandSize(bandSize)
-      ? (1 - bandSize.band) / 2
-      : 0
+    bandPosition: offsetType === 'encoding' ? 0 : bandPosition
   });
 
   if (vgSizeChannel) {