graphein 0.20.0 → 0.22.0

package/dist/charts/bar.d.ts

@@ -1,4 +1,57 @@
 import type { Surface } from '../render/surface.js';
 import type { CartesianModel } from '../runtime/cartesian.js';
+type CornerSide = 'top' | 'bottom' | 'left' | 'right' | 'none';
+interface BarRect {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+    color: string;
+    cornerSide: CornerSide;
+}
+/**
+ * One bar (or stacked segment) in category/value-axis pixel space. Marks stay
+ * in axis space rather than screen space so the same paint pass serves both
+ * orientations and update morphs can interpolate them directly.
+ */
+export interface BarMark {
+    /** Stable identity: series key + category key (+ a duplicate ordinal). */
+    key: string;
+    seriesKey: string;
+    category: string;
+    /** Category-axis start pixel and thickness. */
+    catStart: number;
+    catThick: number;
+    /** Value-axis pixels of the base edge and the value end. */
+    base: number;
+    end: number;
+    color: string;
+    alpha: number;
+    /** Whether the value end is rounded (false for inner stacked segments). */
+    rounded: boolean;
+    /** Stacked layouts: stack identity (sign + category) and level from the baseline. */
+    stack?: string;
+    level?: number;
+}
+export interface BarGeometry {
+    kind: 'bar';
+    marks: BarMark[];
+    radius: number;
+    horizontal: boolean;
+    /** Value-axis pixel of the zero baseline. */
+    baseline: number;
+    /** Rows the layout represents (including zero-length bars). */
+    represented: number;
+}
+/** Screen rect for a mark, or null when it has no drawable extent. */
+export declare function barMarkRect(geometry: Pick<BarGeometry, 'horizontal'>, mark: BarMark): BarRect | null;
+/**
+ * Resolve every bar for the current model without drawing. Returns null when
+ * the model has no band axis to lay bars out on.
+ */
+export declare function layoutBars(model: CartesianModel): BarGeometry | null;
+/** Paint resolved bar marks onto the surface's marks layer, clipped to the plot. */
+export declare function paintBars(surface: Surface, model: CartesianModel, geometry: BarGeometry): void;
 export declare function drawBar(surface: Surface, model: CartesianModel): void;
+export {};
 //# sourceMappingURL=bar.d.ts.map

package/dist/charts/bar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bar.d.ts","sourceRoot":"","sources":["../../src/charts/bar.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AA6P3D,wBAAgB,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,GAAG,IAAI,CAsBrE"}
+{"version":3,"file":"bar.d.ts","sourceRoot":"","sources":["../../src/charts/bar.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAQ3D,KAAK,UAAU,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;AAE/D,UAAU,OAAO;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,UAAU,CAAC;CACxB;AAED;;;;GAIG;AACH,MAAM,WAAW,OAAO;IACtB,0EAA0E;IAC1E,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,+CAA+C;IAC/C,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,4DAA4D;IAC5D,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,2EAA2E;IAC3E,OAAO,EAAE,OAAO,CAAC;IACjB,qFAAqF;IACrF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,KAAK,CAAC;IACZ,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,OAAO,CAAC;IACpB,6CAA6C;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,+DAA+D;IAC/D,WAAW,EAAE,MAAM,CAAC;CACrB;AAoFD,sEAAsE;AACtE,wBAAgB,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,GAAG,IAAI,CAIpG;AA8ID;;;GAGG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,cAAc,GAAG,WAAW,GAAG,IAAI,CAYpE;AAED,oFAAoF;AACpF,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,GAAG,IAAI,CA2B9F;AAED,wBAAgB,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,GAAG,IAAI,CAQrE"}

package/dist/charts/bar.js

@@ -1,6 +1,7 @@
 import { roundedRect } from "../shape/index.js";
 import { RoughPen } from "../rough/index.js";
 import { accessor, toKey, toNumber } from "../util/data.js";
+import { staggerProgress } from "../animation/stagger.js";
 import { rowAlpha } from "./emphasis.js";
 function finite(value) {
   return Number.isFinite(value);
@@ -56,8 +57,26 @@ function orientedRect(horizontal, catStart, catThick, base, value, color) {
     cornerSide: value < base ? "top" : value > base ? "bottom" : "none"
   };
 }
-function drawGroupedBars(surface, model, radius, pen) {
-  const ctx = surface.marks.ctx;
+function barMarkRect(geometry, mark) {
+  const rect = orientedRect(geometry.horizontal, mark.catStart, mark.catThick, mark.base, mark.end, mark.color);
+  if (rect && !mark.rounded) rect.cornerSide = "none";
+  return rect;
+}
+function entranceGrowth(model) {
+  const t = model.entranceProgress ?? 1;
+  const stagger = model.entranceStagger ?? 0;
+  if (!(stagger > 0) || t >= 1) return () => t;
+  const categories = model.x.categories ?? [];
+  const order = new Map(categories.map((category, index) => [category, index]));
+  return (categoryKey) => staggerProgress(t, order.get(categoryKey) ?? 0, categories.length, stagger, model.entranceEase);
+}
+function markKey(seen, seriesKey, categoryKey) {
+  const base = `${seriesKey}
${categoryKey}`;
+  const n = seen.get(base) ?? 0;
+  seen.set(base, n + 1);
+  return n === 0 ? base : `${base}
${n}`;
+}
+function layoutGroupedBars(model, out) {
   let represented = 0;
   const readX = accessor(model.x.field);
   const readY = accessor(model.y.field ?? "");
@@ -67,62 +86,55 @@ function drawGroupedBars(surface, model, radius, pen) {
   const subWidth = seriesCount > 1 ? bandWidth / seriesCount : bandWidth;
   const gap = seriesCount > 1 && subWidth > 3 ? Math.min(1, subWidth * 0.15) : 0;
   const barThick = Math.max(0, subWidth - gap);
-  const t = model.entranceProgress ?? 1;
-  const grow = (pixel) => model.y.baseline + (pixel - model.y.baseline) * t;
+  const growthOf = entranceGrowth(model);
+  const grow = (pixel, t) => model.y.baseline + (pixel - model.y.baseline) * t;
+  const seen = /* @__PURE__ */ new Map();
   model.series.forEach((series, seriesIndex) => {
-    ctx.fillStyle = series.color;
     for (const row of series.rows) {
       const raw = readY(row);
       const value = toNumber(raw);
       if (raw == null || raw === "" || !finite(value)) continue;
-      const center = model.x.pixel(readX(row));
+      const xValue = readX(row);
+      const center = model.x.pixel(xValue);
       if (center == null || !Number.isFinite(center)) continue;
       const valuePixel = model.y.pixel(value);
       if (!Number.isFinite(valuePixel)) continue;
       represented++;
+      const categoryKey = toKey(xValue);
+      const t = growthOf(categoryKey);
       const catStart = center - bandWidth / 2 + seriesIndex * subWidth + gap / 2;
-      const rect = orientedRect(
-        horizontal,
+      const base = grow(model.y.baseline, t);
+      const end = grow(valuePixel, t);
+      if (!orientedRect(horizontal, catStart, barThick, base, end, series.color)) continue;
+      out.push({
+        key: markKey(seen, series.key, categoryKey),
+        seriesKey: series.key,
+        category: categoryKey,
         catStart,
-        barThick,
-        grow(model.y.baseline),
-        grow(valuePixel),
-        series.color
-      );
-      if (rect) {
-        const alpha = rowAlpha(model.emphasis, row);
-        drawRect(ctx, rect, radius, pen, alpha);
-        surface.evidence?.mark(
-          "bar",
-          rect.x,
-          rect.y,
-          rect.width,
-          rect.height,
-          rect.color,
-          alpha,
-          model.plot,
-          1,
-          void 0,
-          alpha < 1
-        );
-      }
+        catThick: barThick,
+        base,
+        end,
+        color: series.color,
+        alpha: rowAlpha(model.emphasis, row),
+        rounded: true
+      });
     }
   });
-  surface.evidence?.data(represented);
+  return represented;
 }
-function drawStackedBars(surface, model, radius, pen) {
-  const ctx = surface.marks.ctx;
+function layoutStackedBars(model, out) {
   let represented = 0;
   const readX = accessor(model.x.field);
   const readY = accessor(model.y.field ?? "");
   const horizontal = model.orientation === "horizontal";
   const positiveTotals = /* @__PURE__ */ new Map();
   const negativeTotals = /* @__PURE__ */ new Map();
-  const segments = [];
-  const roundedEnds = /* @__PURE__ */ new Map();
+  const levels = /* @__PURE__ */ new Map();
+  const outerSegments = /* @__PURE__ */ new Map();
   const bandWidth = model.x.bandwidth;
-  const t = model.entranceProgress ?? 1;
-  const grow = (pixel) => model.y.baseline + (pixel - model.y.baseline) * t;
+  const growthOf = entranceGrowth(model);
+  const grow = (pixel, t) => model.y.baseline + (pixel - model.y.baseline) * t;
+  const seen = /* @__PURE__ */ new Map();
   for (const series of model.series) {
     for (const row of series.rows) {
       const xValue = readX(row);
@@ -141,66 +153,88 @@ function drawStackedBars(surface, model, radius, pen) {
       const base = totals.get(categoryKey) ?? 0;
       const top = base + value;
       totals.set(categoryKey, top);
-      const rect = orientedRect(
-        horizontal,
-        center - bandWidth / 2,
-        bandWidth,
-        grow(model.y.pixel(base)),
-        grow(model.y.pixel(top)),
-        series.color
-      );
-      if (!rect) continue;
+      const t = growthOf(categoryKey);
+      const basePx = grow(model.y.pixel(base), t);
+      const endPx = grow(model.y.pixel(top), t);
+      const catStart = center - bandWidth / 2;
+      if (!orientedRect(horizontal, catStart, bandWidth, basePx, endPx, series.color)) continue;
       represented++;
-      segments.push({ ...rect, stackEndKey, alpha: rowAlpha(model.emphasis, row) });
-      roundedEnds.set(stackEndKey, segments.length - 1);
+      const level = levels.get(stackEndKey) ?? 0;
+      levels.set(stackEndKey, level + 1);
+      out.push({
+        key: markKey(seen, series.key, categoryKey),
+        seriesKey: series.key,
+        category: categoryKey,
+        catStart,
+        catThick: bandWidth,
+        base: basePx,
+        end: endPx,
+        color: series.color,
+        alpha: rowAlpha(model.emphasis, row),
+        rounded: false,
+        stack: stackEndKey,
+        level
+      });
+      outerSegments.set(stackEndKey, out.length - 1);
     }
   }
-  segments.forEach((segment, index) => {
-    const isOuterSegment = roundedEnds.get(segment.stackEndKey) === index;
-    drawRect(
-      ctx,
-      { ...segment, cornerSide: isOuterSegment ? segment.cornerSide : "none" },
-      radius,
-      pen,
-      segment.alpha
-    );
-    surface.evidence?.mark(
-      "bar",
-      segment.x,
-      segment.y,
-      segment.width,
-      segment.height,
-      segment.color,
-      segment.alpha,
-      model.plot,
-      1,
-      void 0,
-      segment.alpha < 1
-    );
-  });
-  surface.evidence?.data(represented);
+  for (const index of outerSegments.values()) out[index].rounded = true;
+  return represented;
 }
-function drawBar(surface, model) {
-  surface.evidence?.begin("rows");
-  surface.evidence?.data(0);
+function layoutBars(model) {
+  if (model.x.kind !== "band" || model.x.bandwidth <= 0 || model.series.length === 0) return null;
+  const marks = [];
+  const represented = model.stacked ? layoutStackedBars(model, marks) : layoutGroupedBars(model, marks);
+  return {
+    kind: "bar",
+    marks,
+    radius: defaultRadius(model, model.spec),
+    horizontal: model.orientation === "horizontal",
+    baseline: model.y.baseline,
+    represented
+  };
+}
+function paintBars(surface, model, geometry) {
   const ctx = surface.marks.ctx;
-  const spec = model.spec;
   const { plot } = model;
-  const radius = defaultRadius(model, spec);
   const pen = model.sketch ? new RoughPen(ctx, model.sketch) : null;
-  if (model.x.kind !== "band" || model.x.bandwidth <= 0 || model.series.length === 0) return;
   ctx.save();
   ctx.beginPath();
   ctx.rect(plot.x, plot.y, plot.width, plot.height);
   ctx.clip();
-  if (model.stacked) {
-    drawStackedBars(surface, model, radius, pen);
-  } else {
-    drawGroupedBars(surface, model, radius, pen);
+  for (const mark of geometry.marks) {
+    const rect = barMarkRect(geometry, mark);
+    if (!rect) continue;
+    drawRect(ctx, rect, geometry.radius, pen, mark.alpha);
+    surface.evidence?.mark(
+      "bar",
+      rect.x,
+      rect.y,
+      rect.width,
+      rect.height,
+      rect.color,
+      mark.alpha,
+      plot,
+      1,
+      void 0,
+      mark.alpha < 1
+    );
   }
   ctx.restore();
 }
+function drawBar(surface, model) {
+  surface.evidence?.begin("rows");
+  surface.evidence?.data(0);
+  const geometry = layoutBars(model);
+  model.geometry = geometry ?? void 0;
+  if (!geometry) return;
+  paintBars(surface, model, geometry);
+  surface.evidence?.data(geometry.represented);
+}
 export {
-  drawBar
+  barMarkRect,
+  drawBar,
+  layoutBars,
+  paintBars
 };
 //# sourceMappingURL=bar.js.map

package/dist/charts/bar.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/charts/bar.ts"],
-  "sourcesContent": ["import type { Surface } from '../render/surface';\nimport type { CartesianModel } from '../runtime/cartesian';\nimport type { BarSpec } from '../spec/types';\nimport { roundedRect } from '../shape';\nimport { RoughPen } from '../rough';\nimport { accessor, toKey, toNumber } from '../util/data';\nimport { rowAlpha } from './emphasis';\n\ntype CornerSide = 'top' | 'bottom' | 'left' | 'right' | 'none';\n\ninterface BarRect {\n  x: number;\n  y: number;\n  width: number;\n  height: number;\n  color: string;\n  cornerSide: CornerSide;\n}\n\ninterface StackSegment extends BarRect {\n  stackEndKey: string;\n  alpha: number;\n}\n\nfunction finite(value: number): boolean {\n  return Number.isFinite(value);\n}\n\nfunction defaultRadius(model: CartesianModel, spec: BarSpec): number {\n  return Math.max(0, spec.cornerRadius ?? Math.min(4, model.tokens.radius.sm));\n}\n\nfunction makeRadii(side: CornerSide, radius: number): number | [number, number, number, number] {\n  if (side === 'top') return [radius, radius, 0, 0];\n  if (side === 'bottom') return [0, 0, radius, radius];\n  if (side === 'right') return [0, radius, radius, 0];\n  if (side === 'left') return [radius, 0, 0, radius];\n  return 0;\n}\n\nfunction drawRect(\n  ctx: CanvasRenderingContext2D,\n  rect: BarRect,\n  radius: number,\n  pen?: RoughPen | null,\n  alpha = 1,\n): void {\n  if (!finite(rect.x) || !finite(rect.y) || !finite(rect.width) || !finite(rect.height)) return;\n  if (rect.width <= 0 || rect.height <= 0) return;\n\n  const prevAlpha = ctx.globalAlpha;\n  if (alpha !== 1) ctx.globalAlpha = prevAlpha * alpha;\n\n  if (pen) {\n    pen.rect(rect.x, rect.y, rect.width, rect.height, { stroke: rect.color, fill: rect.color });\n    if (alpha !== 1) ctx.globalAlpha = prevAlpha;\n    return;\n  }\n\n  const r = Math.min(radius, rect.width / 2, rect.height / 2);\n  ctx.beginPath();\n  roundedRect(ctx, rect.x, rect.y, rect.width, rect.height, makeRadii(rect.cornerSide, r));\n  ctx.fillStyle = rect.color;\n  ctx.fill();\n  if (alpha !== 1) ctx.globalAlpha = prevAlpha;\n}\n\n/**\n * Build a screen-space rect from category-axis and value-axis pixels. `catStart`\n * and `catThick` are the bar's position and thickness along the category (band)\n * axis; `base` and `value` are pixels along the value axis. For vertical bars the\n * category axis is horizontal (screen x) and the value axis vertical; for\n * horizontal bars they swap. Corners round on the growing value end.\n */\nfunction orientedRect(\n  horizontal: boolean,\n  catStart: number,\n  catThick: number,\n  base: number,\n  value: number,\n  color: string,\n): BarRect | null {\n  if (!finite(catStart) || !finite(catThick) || !finite(base) || !finite(value)) return null;\n  const lo = Math.min(base, value);\n  const len = Math.abs(value - base);\n  if (catThick <= 0 || len <= 0) return null;\n  if (horizontal) {\n    return {\n      x: lo,\n      y: catStart,\n      width: len,\n      height: catThick,\n      color,\n      cornerSide: value > base ? 'right' : value < base ? 'left' : 'none',\n    };\n  }\n  return {\n    x: catStart,\n    y: lo,\n    width: catThick,\n    height: len,\n    color,\n    cornerSide: value < base ? 'top' : value > base ? 'bottom' : 'none',\n  };\n}\n\nfunction drawGroupedBars(\n  surface: Surface,\n  model: CartesianModel,\n  radius: number,\n  pen?: RoughPen | null,\n): void {\n  const ctx = surface.marks.ctx;\n  let represented = 0;\n  const readX = accessor(model.x.field);\n  const readY = accessor(model.y.field ?? '');\n  const horizontal = model.orientation === 'horizontal';\n  const seriesCount = model.series.length;\n  const bandWidth = model.x.bandwidth;\n  const subWidth = seriesCount > 1 ? bandWidth / seriesCount : bandWidth;\n  const gap = seriesCount > 1 && subWidth > 3 ? Math.min(1, subWidth * 0.15) : 0;\n  const barThick = Math.max(0, subWidth - gap);\n  // Entrance: interpolate every value-axis pixel toward the baseline so bars\n  // grow out of the axis. Identity (`grow(p) === p`) once progress reaches 1.\n  const t = model.entranceProgress ?? 1;\n  const grow = (pixel: number): number => model.y.baseline + (pixel - model.y.baseline) * t;\n\n  model.series.forEach((series, seriesIndex) => {\n    ctx.fillStyle = series.color;\n    for (const row of series.rows) {\n      const raw = readY(row);\n      const value = toNumber(raw);\n      if (raw == null || raw === '' || !finite(value)) continue;\n\n      const center = model.x.pixel(readX(row));\n      if (center == null || !Number.isFinite(center)) continue;\n      const valuePixel = model.y.pixel(value);\n      if (!Number.isFinite(valuePixel)) continue;\n      represented++;\n\n      const catStart = center - bandWidth / 2 + seriesIndex * subWidth + gap / 2;\n      const rect = orientedRect(\n        horizontal,\n        catStart,\n        barThick,\n        grow(model.y.baseline),\n        grow(valuePixel),\n        series.color,\n      );\n      if (rect) {\n        const alpha = rowAlpha(model.emphasis, row);\n        drawRect(ctx, rect, radius, pen, alpha);\n        surface.evidence?.mark(\n          'bar',\n          rect.x,\n          rect.y,\n          rect.width,\n          rect.height,\n          rect.color,\n          alpha,\n          model.plot,\n          1,\n          undefined,\n          alpha < 1,\n        );\n      }\n    }\n  });\n  surface.evidence?.data(represented);\n}\n\nfunction drawStackedBars(\n  surface: Surface,\n  model: CartesianModel,\n  radius: number,\n  pen?: RoughPen | null,\n): void {\n  const ctx = surface.marks.ctx;\n  let represented = 0;\n  const readX = accessor(model.x.field);\n  const readY = accessor(model.y.field ?? '');\n  const horizontal = model.orientation === 'horizontal';\n  const positiveTotals = new Map<string, number>();\n  const negativeTotals = new Map<string, number>();\n  const segments: StackSegment[] = [];\n  const roundedEnds = new Map<string, number>();\n  const bandWidth = model.x.bandwidth;\n  // Entrance: scale the whole stack out of the value baseline (see grouped bars).\n  const t = model.entranceProgress ?? 1;\n  const grow = (pixel: number): number => model.y.baseline + (pixel - model.y.baseline) * t;\n\n  for (const series of model.series) {\n    for (const row of series.rows) {\n      const xValue = readX(row);\n      const center = model.x.pixel(xValue);\n      if (center == null || !Number.isFinite(center)) continue;\n\n      const raw = readY(row);\n      const value = toNumber(raw);\n      if (raw == null || raw === '' || !finite(value)) continue;\n      if (value === 0) {\n        if (Number.isFinite(model.y.pixel(value))) represented++;\n        continue;\n      }\n\n      const categoryKey = toKey(xValue);\n      const totals = value >= 0 ? positiveTotals : negativeTotals;\n      const stackEndKey = `${value >= 0 ? 'pos' : 'neg'}:${categoryKey}`;\n      const base = totals.get(categoryKey) ?? 0;\n      const top = base + value;\n      totals.set(categoryKey, top);\n\n      const rect = orientedRect(\n        horizontal,\n        center - bandWidth / 2,\n        bandWidth,\n        grow(model.y.pixel(base)),\n        grow(model.y.pixel(top)),\n        series.color,\n      );\n      if (!rect) continue;\n      represented++;\n\n      segments.push({ ...rect, stackEndKey, alpha: rowAlpha(model.emphasis, row) });\n      roundedEnds.set(stackEndKey, segments.length - 1);\n    }\n  }\n\n  segments.forEach((segment, index) => {\n    const isOuterSegment = roundedEnds.get(segment.stackEndKey) === index;\n    drawRect(\n      ctx,\n      { ...segment, cornerSide: isOuterSegment ? segment.cornerSide : 'none' },\n      radius,\n      pen,\n      segment.alpha,\n    );\n    surface.evidence?.mark(\n      'bar',\n      segment.x,\n      segment.y,\n      segment.width,\n      segment.height,\n      segment.color,\n      segment.alpha,\n      model.plot,\n      1,\n      undefined,\n      segment.alpha < 1,\n    );\n  });\n  surface.evidence?.data(represented);\n}\n\nexport function drawBar(surface: Surface, model: CartesianModel): void {\n  surface.evidence?.begin('rows');\n  surface.evidence?.data(0);\n  const ctx = surface.marks.ctx;\n  const spec = model.spec as BarSpec;\n  const { plot } = model;\n  const radius = defaultRadius(model, spec);\n  const pen = model.sketch ? new RoughPen(ctx, model.sketch) : null;\n\n  if (model.x.kind !== 'band' || model.x.bandwidth <= 0 || model.series.length === 0) return;\n  ctx.save();\n  ctx.beginPath();\n  ctx.rect(plot.x, plot.y, plot.width, plot.height);\n  ctx.clip();\n\n  if (model.stacked) {\n    drawStackedBars(surface, model, radius, pen);\n  } else {\n    drawGroupedBars(surface, model, radius, pen);\n  }\n\n  ctx.restore();\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { Surface } from '../render/surface';\nimport type { CartesianModel } from '../runtime/cartesian';\nimport type { BarSpec } from '../spec/types';\nimport { roundedRect } from '../shape';\nimport { RoughPen } from '../rough';\nimport { accessor, toKey, toNumber } from '../util/data';\nimport { staggerProgress } from '../animation/stagger';\nimport { rowAlpha } from './emphasis';\n\ntype CornerSide = 'top' | 'bottom' | 'left' | 'right' | 'none';\n\ninterface BarRect {\n  x: number;\n  y: number;\n  width: number;\n  height: number;\n  color: string;\n  cornerSide: CornerSide;\n}\n\n/**\n * One bar (or stacked segment) in category/value-axis pixel space. Marks stay\n * in axis space rather than screen space so the same paint pass serves both\n * orientations and update morphs can interpolate them directly.\n */\nexport interface BarMark {\n  /** Stable identity: series key + category key (+ a duplicate ordinal). */\n  key: string;\n  seriesKey: string;\n  category: string;\n  /** Category-axis start pixel and thickness. */\n  catStart: number;\n  catThick: number;\n  /** Value-axis pixels of the base edge and the value end. */\n  base: number;\n  end: number;\n  color: string;\n  alpha: number;\n  /** Whether the value end is rounded (false for inner stacked segments). */\n  rounded: boolean;\n  /** Stacked layouts: stack identity (sign + category) and level from the baseline. */\n  stack?: string;\n  level?: number;\n}\n\nexport interface BarGeometry {\n  kind: 'bar';\n  marks: BarMark[];\n  radius: number;\n  horizontal: boolean;\n  /** Value-axis pixel of the zero baseline. */\n  baseline: number;\n  /** Rows the layout represents (including zero-length bars). */\n  represented: number;\n}\n\nfunction finite(value: number): boolean {\n  return Number.isFinite(value);\n}\n\nfunction defaultRadius(model: CartesianModel, spec: BarSpec): number {\n  return Math.max(0, spec.cornerRadius ?? Math.min(4, model.tokens.radius.sm));\n}\n\nfunction makeRadii(side: CornerSide, radius: number): number | [number, number, number, number] {\n  if (side === 'top') return [radius, radius, 0, 0];\n  if (side === 'bottom') return [0, 0, radius, radius];\n  if (side === 'right') return [0, radius, radius, 0];\n  if (side === 'left') return [radius, 0, 0, radius];\n  return 0;\n}\n\nfunction drawRect(\n  ctx: CanvasRenderingContext2D,\n  rect: BarRect,\n  radius: number,\n  pen?: RoughPen | null,\n  alpha = 1,\n): void {\n  if (!finite(rect.x) || !finite(rect.y) || !finite(rect.width) || !finite(rect.height)) return;\n  if (rect.width <= 0 || rect.height <= 0) return;\n\n  const prevAlpha = ctx.globalAlpha;\n  if (alpha !== 1) ctx.globalAlpha = prevAlpha * alpha;\n\n  if (pen) {\n    pen.rect(rect.x, rect.y, rect.width, rect.height, { stroke: rect.color, fill: rect.color });\n    if (alpha !== 1) ctx.globalAlpha = prevAlpha;\n    return;\n  }\n\n  const r = Math.min(radius, rect.width / 2, rect.height / 2);\n  ctx.beginPath();\n  roundedRect(ctx, rect.x, rect.y, rect.width, rect.height, makeRadii(rect.cornerSide, r));\n  ctx.fillStyle = rect.color;\n  ctx.fill();\n  if (alpha !== 1) ctx.globalAlpha = prevAlpha;\n}\n\n/**\n * Build a screen-space rect from category-axis and value-axis pixels. `catStart`\n * and `catThick` are the bar's position and thickness along the category (band)\n * axis; `base` and `value` are pixels along the value axis. For vertical bars the\n * category axis is horizontal (screen x) and the value axis vertical; for\n * horizontal bars they swap. Corners round on the growing value end.\n */\nfunction orientedRect(\n  horizontal: boolean,\n  catStart: number,\n  catThick: number,\n  base: number,\n  value: number,\n  color: string,\n): BarRect | null {\n  if (!finite(catStart) || !finite(catThick) || !finite(base) || !finite(value)) return null;\n  const lo = Math.min(base, value);\n  const len = Math.abs(value - base);\n  if (catThick <= 0 || len <= 0) return null;\n  if (horizontal) {\n    return {\n      x: lo,\n      y: catStart,\n      width: len,\n      height: catThick,\n      color,\n      cornerSide: value > base ? 'right' : value < base ? 'left' : 'none',\n    };\n  }\n  return {\n    x: catStart,\n    y: lo,\n    width: catThick,\n    height: len,\n    color,\n    cornerSide: value < base ? 'top' : value > base ? 'bottom' : 'none',\n  };\n}\n\n/** Screen rect for a mark, or null when it has no drawable extent. */\nexport function barMarkRect(geometry: Pick<BarGeometry, 'horizontal'>, mark: BarMark): BarRect | null {\n  const rect = orientedRect(geometry.horizontal, mark.catStart, mark.catThick, mark.base, mark.end, mark.color);\n  if (rect && !mark.rounded) rect.cornerSide = 'none';\n  return rect;\n}\n\n/**\n * Entrance growth along the value axis. Without a stagger every bar shares the\n * runtime's eased progress; with one, `entranceProgress` is the raw clock and\n * each category starts a little later than the previous one.\n */\nfunction entranceGrowth(model: CartesianModel): (categoryKey: string) => number {\n  const t = model.entranceProgress ?? 1;\n  const stagger = model.entranceStagger ?? 0;\n  if (!(stagger > 0) || t >= 1) return () => t;\n  const categories = model.x.categories ?? [];\n  const order = new Map(categories.map((category, index) => [category, index]));\n  return (categoryKey) =>\n    staggerProgress(t, order.get(categoryKey) ?? 0, categories.length, stagger, model.entranceEase);\n}\n\nfunction markKey(seen: Map<string, number>, seriesKey: string, categoryKey: string): string {\n  const base = `${seriesKey}\\u0001${categoryKey}`;\n  const n = seen.get(base) ?? 0;\n  seen.set(base, n + 1);\n  return n === 0 ? base : `${base}\\u0001${n}`;\n}\n\nfunction layoutGroupedBars(model: CartesianModel, out: BarMark[]): number {\n  let represented = 0;\n  const readX = accessor(model.x.field);\n  const readY = accessor(model.y.field ?? '');\n  const horizontal = model.orientation === 'horizontal';\n  const seriesCount = model.series.length;\n  const bandWidth = model.x.bandwidth;\n  const subWidth = seriesCount > 1 ? bandWidth / seriesCount : bandWidth;\n  const gap = seriesCount > 1 && subWidth > 3 ? Math.min(1, subWidth * 0.15) : 0;\n  const barThick = Math.max(0, subWidth - gap);\n  // Entrance: interpolate every value-axis pixel toward the baseline so bars\n  // grow out of the axis. Identity (`grow(p) === p`) once progress reaches 1.\n  const growthOf = entranceGrowth(model);\n  const grow = (pixel: number, t: number): number => model.y.baseline + (pixel - model.y.baseline) * t;\n  const seen = new Map<string, number>();\n\n  model.series.forEach((series, seriesIndex) => {\n    for (const row of series.rows) {\n      const raw = readY(row);\n      const value = toNumber(raw);\n      if (raw == null || raw === '' || !finite(value)) continue;\n\n      const xValue = readX(row);\n      const center = model.x.pixel(xValue);\n      if (center == null || !Number.isFinite(center)) continue;\n      const valuePixel = model.y.pixel(value);\n      if (!Number.isFinite(valuePixel)) continue;\n      represented++;\n\n      const categoryKey = toKey(xValue);\n      const t = growthOf(categoryKey);\n      const catStart = center - bandWidth / 2 + seriesIndex * subWidth + gap / 2;\n      const base = grow(model.y.baseline, t);\n      const end = grow(valuePixel, t);\n      if (!orientedRect(horizontal, catStart, barThick, base, end, series.color)) continue;\n      out.push({\n        key: markKey(seen, series.key, categoryKey),\n        seriesKey: series.key,\n        category: categoryKey,\n        catStart,\n        catThick: barThick,\n        base,\n        end,\n        color: series.color,\n        alpha: rowAlpha(model.emphasis, row),\n        rounded: true,\n      });\n    }\n  });\n  return represented;\n}\n\nfunction layoutStackedBars(model: CartesianModel, out: BarMark[]): number {\n  let represented = 0;\n  const readX = accessor(model.x.field);\n  const readY = accessor(model.y.field ?? '');\n  const horizontal = model.orientation === 'horizontal';\n  const positiveTotals = new Map<string, number>();\n  const negativeTotals = new Map<string, number>();\n  const levels = new Map<string, number>();\n  const outerSegments = new Map<string, number>();\n  const bandWidth = model.x.bandwidth;\n  // Entrance: scale the whole stack out of the value baseline (see grouped bars).\n  const growthOf = entranceGrowth(model);\n  const grow = (pixel: number, t: number): number => model.y.baseline + (pixel - model.y.baseline) * t;\n  const seen = new Map<string, number>();\n\n  for (const series of model.series) {\n    for (const row of series.rows) {\n      const xValue = readX(row);\n      const center = model.x.pixel(xValue);\n      if (center == null || !Number.isFinite(center)) continue;\n\n      const raw = readY(row);\n      const value = toNumber(raw);\n      if (raw == null || raw === '' || !finite(value)) continue;\n      if (value === 0) {\n        if (Number.isFinite(model.y.pixel(value))) represented++;\n        continue;\n      }\n\n      const categoryKey = toKey(xValue);\n      const totals = value >= 0 ? positiveTotals : negativeTotals;\n      const stackEndKey = `${value >= 0 ? 'pos' : 'neg'}:${categoryKey}`;\n      const base = totals.get(categoryKey) ?? 0;\n      const top = base + value;\n      totals.set(categoryKey, top);\n\n      const t = growthOf(categoryKey);\n      const basePx = grow(model.y.pixel(base), t);\n      const endPx = grow(model.y.pixel(top), t);\n      const catStart = center - bandWidth / 2;\n      if (!orientedRect(horizontal, catStart, bandWidth, basePx, endPx, series.color)) continue;\n      represented++;\n\n      const level = levels.get(stackEndKey) ?? 0;\n      levels.set(stackEndKey, level + 1);\n      out.push({\n        key: markKey(seen, series.key, categoryKey),\n        seriesKey: series.key,\n        category: categoryKey,\n        catStart,\n        catThick: bandWidth,\n        base: basePx,\n        end: endPx,\n        color: series.color,\n        alpha: rowAlpha(model.emphasis, row),\n        rounded: false,\n        stack: stackEndKey,\n        level,\n      });\n      outerSegments.set(stackEndKey, out.length - 1);\n    }\n  }\n  for (const index of outerSegments.values()) out[index].rounded = true;\n  return represented;\n}\n\n/**\n * Resolve every bar for the current model without drawing. Returns null when\n * the model has no band axis to lay bars out on.\n */\nexport function layoutBars(model: CartesianModel): BarGeometry | null {\n  if (model.x.kind !== 'band' || model.x.bandwidth <= 0 || model.series.length === 0) return null;\n  const marks: BarMark[] = [];\n  const represented = model.stacked ? layoutStackedBars(model, marks) : layoutGroupedBars(model, marks);\n  return {\n    kind: 'bar',\n    marks,\n    radius: defaultRadius(model, model.spec as BarSpec),\n    horizontal: model.orientation === 'horizontal',\n    baseline: model.y.baseline,\n    represented,\n  };\n}\n\n/** Paint resolved bar marks onto the surface's marks layer, clipped to the plot. */\nexport function paintBars(surface: Surface, model: CartesianModel, geometry: BarGeometry): void {\n  const ctx = surface.marks.ctx;\n  const { plot } = model;\n  const pen = model.sketch ? new RoughPen(ctx, model.sketch) : null;\n  ctx.save();\n  ctx.beginPath();\n  ctx.rect(plot.x, plot.y, plot.width, plot.height);\n  ctx.clip();\n  for (const mark of geometry.marks) {\n    const rect = barMarkRect(geometry, mark);\n    if (!rect) continue;\n    drawRect(ctx, rect, geometry.radius, pen, mark.alpha);\n    surface.evidence?.mark(\n      'bar',\n      rect.x,\n      rect.y,\n      rect.width,\n      rect.height,\n      rect.color,\n      mark.alpha,\n      plot,\n      1,\n      undefined,\n      mark.alpha < 1,\n    );\n  }\n  ctx.restore();\n}\n\nexport function drawBar(surface: Surface, model: CartesianModel): void {\n  surface.evidence?.begin('rows');\n  surface.evidence?.data(0);\n  const geometry = layoutBars(model);\n  model.geometry = geometry ?? undefined;\n  if (!geometry) return;\n  paintBars(surface, model, geometry);\n  surface.evidence?.data(geometry.represented);\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/charts/box.d.ts

@@ -31,10 +31,41 @@ export interface BoxLayout {
     geoms: BoxGeom[];
     showOutliers: boolean;
 }
+/** One box as drawn: pixel-space whiskers, quartiles and outliers. */
+export interface BoxMark {
+    key: string;
+    /** Category key (x) and series key, for hover focus subsets. */
+    category: string;
+    seriesKey?: string;
+    color: string;
+    cx: number;
+    boxW: number;
+    yQ1: number;
+    yQ3: number;
+    yMed: number;
+    yLo: number;
+    yHi: number;
+    /** Outlier centers (px). */
+    outliers: number[];
+    /** Opacity: the highlight's dim, times any morph fade. */
+    alpha: number;
+    /** Observations summarized (render evidence). */
+    count: number;
+}
+/** A box plot's resolved marks — what {@link paintBoxes} draws and update morphs tween. */
+export interface BoxGeometry {
+    kind: 'box';
+    marks: BoxMark[];
+    showOutliers: boolean;
+}
 /** Type-7 (linear interpolation) quantile of a pre-sorted ascending array. */
 export declare function computeStats(values: number[], whisker: 'tukey' | 'minMax'): BoxStats | null;
 /** Resolve per-category (and per-series) box geometry without drawing. */
 export declare function computeBoxes(model: CartesianModel): BoxLayout | null;
+/** Resolve the boxes' pixel geometry (including highlight dimming) without drawing. */
+export declare function layoutBoxes(model: CartesianModel): BoxGeometry | null;
+/** Paint box geometry (clipped to the plot), recording evidence for each box and outlier. */
+export declare function paintBoxes(surface: Surface, model: CartesianModel, geometry: BoxGeometry): void;
 export declare function drawBox(surface: Surface, model: CartesianModel): void;
 /** Box-plot interaction (the runtime uses this instead of the generic cartesian one). */
 export declare function buildBoxInteraction(model: CartesianModel): InteractionModel | void;

package/dist/charts/box.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"box.d.ts","sourceRoot":"","sources":["../../src/charts/box.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAS3D,OAAO,KAAK,EAAE,gBAAgB,EAAc,MAAM,sBAAsB,CAAC;AAEzE,MAAM,WAAW,QAAQ;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,OAAO;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,sEAAsE;IACtE,MAAM,EAAE,OAAO,CAAC;IAChB,kEAAkE;IAClE,WAAW,EAAE,OAAO,CAAC;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,iEAAiE;IACjE,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,QAAQ,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,8EAA8E;AAC9E,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,GAAG,IAAI,CA+B3F;AAED,0EAA0E;AAC1E,wBAAgB,YAAY,CAAC,KAAK,EAAE,cAAc,GAAG,SAAS,GAAG,IAAI,CAwDpE;AAgID,wBAAgB,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,GAAG,IAAI,CAuDrE;AAED,yFAAyF;AACzF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,cAAc,GAAG,gBAAgB,GAAG,IAAI,CA4DlF"}
+{"version":3,"file":"box.d.ts","sourceRoot":"","sources":["../../src/charts/box.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAS3D,OAAO,KAAK,EAAE,gBAAgB,EAAc,MAAM,sBAAsB,CAAC;AAEzE,MAAM,WAAW,QAAQ;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,OAAO;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,sEAAsE;IACtE,MAAM,EAAE,OAAO,CAAC;IAChB,kEAAkE;IAClE,WAAW,EAAE,OAAO,CAAC;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,iEAAiE;IACjE,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,QAAQ,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,sEAAsE;AACtE,MAAM,WAAW,OAAO;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,gEAAgE;IAChE,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,4BAA4B;IAC5B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,0DAA0D;IAC1D,KAAK,EAAE,MAAM,CAAC;IACd,iDAAiD;IACjD,KAAK,EAAE,MAAM,CAAC;CACf;AAED,2FAA2F;AAC3F,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,KAAK,CAAC;IACZ,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,8EAA8E;AAC9E,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,GAAG,IAAI,CA+B3F;AAED,0EAA0E;AAC1E,wBAAgB,YAAY,CAAC,KAAK,EAAE,cAAc,GAAG,SAAS,GAAG,IAAI,CAwDpE;AA6GD,uFAAuF;AACvF,wBAAgB,WAAW,CAAC,KAAK,EAAE,cAAc,GAAG,WAAW,GAAG,IAAI,CAsBrE;AAED,6FAA6F;AAC7F,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,GAAG,IAAI,CA8C/F;AAED,wBAAgB,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,GAAG,IAAI,CAWrE;AAED,yFAAyF;AACzF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,cAAc,GAAG,gBAAgB,GAAG,IAAI,CA4DlF"}