feat: support getBinStepSignal for prebinned data (#7063)

vega · Nov 20, 2020 · 6ae3648 · 6ae3648
1 parent 2059beb
commit 6ae3648
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/src/compile/scale/range.ts b/src/compile/scale/range.ts
@@ -72,17 +72,27 @@ export function parseUnitScaleRange(model: UnitModel) {
 function getBinStepSignal(model: UnitModel, channel: 'x' | 'y'): SignalRefWrapper {
   const fieldDef = model.fieldDef(channel);
 
-  if (fieldDef && fieldDef.bin && isBinning(fieldDef.bin)) {
-    const binSignal = getBinSignalName(model, fieldDef.field, fieldDef.bin);
-
-    // TODO: extract this to be range step signal
+  if (fieldDef?.bin) {
+    const {bin, field} = fieldDef;
     const sizeType = getSizeChannel(channel);
     const sizeSignal = model.getName(sizeType);
-    return new SignalRefWrapper(() => {
-      const updatedName = model.getSignalName(binSignal);
-      const binCount = `(${updatedName}.stop - ${updatedName}.start) / ${updatedName}.step`;
-      return `${model.getSignalName(sizeSignal)} / (${binCount})`;
-    });
+
+    if (isObject(bin) && bin.binned && bin.step !== undefined) {
+      return new SignalRefWrapper(() => {
+        const scaleName = model.scaleName(channel);
+        const binCount = `(domain("${scaleName}")[1] - domain("${scaleName}")[0]) / ${bin.step}`;
+        return `${model.getSignalName(sizeSignal)} / (${binCount})`;
+      });
+    } else if (isBinning(bin)) {
+      const binSignal = getBinSignalName(model, field, bin);
+
+      // TODO: extract this to be range step signal
+      return new SignalRefWrapper(() => {
+        const updatedName = model.getSignalName(binSignal);
+        const binCount = `(${updatedName}.stop - ${updatedName}.start) / ${updatedName}.step`;
+        return `${model.getSignalName(sizeSignal)} / (${binCount})`;
+      });
+    }
   }
   return undefined;
 }