@nowline/layout 0.8.5 → 0.9.0

package/dist/themes/shared.js

@@ -18,14 +18,6 @@ export const PADDING_PX = {
     lg: 20,
     xl: 32,
 };
-export const HEADER_HEIGHT_PX = {
-    none: 0,
-    xs: 24,
-    sm: 36,
-    md: 56,
-    lg: 80,
-    xl: 112,
-};
 export const TEXT_SIZE_PX = {
     none: 0,
     xs: 10,
@@ -54,8 +46,10 @@ export const LOGO_SIZE_PX = {
 // `ITEM_ROW_HEIGHT - 8 = 56`) are owned by `BandScale` as of m2.5b.
 // `defaultRowBand()` keeps the legacy 64/56 split byte-stable; new
 // callers should consume `bandScale.step()` and `bandScale.bandwidth()`.
-// Minimum item bar width so zero-duration items remain visible.
-export const MIN_ITEM_WIDTH = 8;
+// Minimum painted bar width: a bar spans exactly its dates, so this floor
+// only keeps a sub-pixel or zero-duration item visible
+// (specs/true-width-layout.md §3.1).
+export const MIN_ITEM_WIDTH = 1;
 // Height (px) of the bottom progress strip drawn along the item bar's
 // bottom edge. Single source of truth used by:
 //   - the renderer (strip rect height + bottom-edge offset)
@@ -69,26 +63,37 @@ export const MIN_ITEM_WIDTH = 8;
 // grows, chips lift, and the slack arrow stays centered on the strip.
 export const PROGRESS_STRIP_HEIGHT_PX = 4;
 // Timeline tick header band — a single row that holds the date labels
-// (e.g. "Jan 05", "Feb 14"). Layout sizes the panel; the renderer
-// paints the labels at a fixed baseline offset from the panel's top.
-//
-// Bumping the panel height without re-centering the baseline mis-centers
-// the dates — keep both knobs together so a change to either one is
-// visible at a glance.
-export const TIMELINE_TICK_PANEL_HEIGHT_PX = 24;
+// (e.g. "Jan 05", "Feb 14"). The roadmap's `header-height` style key
+// picks the panel height from this table; `none` drops the panel (top
+// and mirrored bottom) entirely. Layout sizes the panel; the renderer
+// paints the labels at `timelineTickLabelBaselineOffsetPx(height)` from
+// the panel's top, so the dates stay centered at every bucket.
+export const HEADER_HEIGHT_PX = {
+    none: 0,
+    xs: 16,
+    sm: 20,
+    md: 24,
+    lg: 32,
+    xl: 40,
+};
+/** Tick panel height at the default `header-height:md`. */
+export const TIMELINE_TICK_PANEL_HEIGHT_PX = HEADER_HEIGHT_PX.md;
 /**
- * Baseline Y of the tick-label text relative to the tick panel's top.
- * Approximately vertically centers a 10 pt label in the panel.
+ * Baseline Y of the tick-label text relative to the tick panel's top,
+ * for a panel `panelHeightPx` tall. Approximately vertically centers a
+ * 10 pt label: half the panel plus ~3 px of descender allowance.
  */
-export const TIMELINE_TICK_LABEL_BASELINE_OFFSET_PX = 15;
+export function timelineTickLabelBaselineOffsetPx(panelHeightPx) {
+    return Math.round(panelHeightPx / 2 + 3);
+}
+/** Tick-label baseline offset at the default panel height. */
+export const TIMELINE_TICK_LABEL_BASELINE_OFFSET_PX = timelineTickLabelBaselineOffsetPx(TIMELINE_TICK_PANEL_HEIGHT_PX);
 /**
- * Horizontal breathing room (px) added to a track-block's right edge
- * after sequencing. Applied to `group { ... }` and `parallel { ... }`
- * blocks so successive blocks don't crowd each other. Items butt up
- * against their neighbors (no gutter) — only block boundaries get this
- * gutter.
+ * Font size of the tick labels. Layout reads it to decide whether a
+ * partial edge column is wide enough to hold its label; the renderer
+ * paints at the same size.
  */
-export const TRACK_BLOCK_TAIL_GUTTER_PX = 8;
+export const TIMELINE_TICK_LABEL_FONT_SIZE_PX = 10;
 // Frame-tab chiclet — the rounded label tab that overhangs a swimlane
 // frame and the dashed include-region border. Both surfaces share the
 // same height + label baseline so the chiclets read as siblings.
@@ -100,51 +105,6 @@ export const TRACK_BLOCK_TAIL_GUTTER_PX = 8;
 export const FRAME_TAB_HEIGHT_PX = 22;
 /** Baseline Y of the chiclet label relative to the tab's top edge. */
 export const FRAME_TAB_LABEL_BASELINE_OFFSET_PX = 15;
-// Group title chiclet — the small label tab anchored flush in the upper-left
-// corner of a styled group's bounding box. Smaller than the frame-tab so it
-// reads as a "container label" rather than a sibling of the swimlane tab.
-//
-// The chiclet's top edge aligns with the group box's top edge and its left
-// edge aligns with the box's left edge (no overhang). The group reserves
-// `GROUP_TITLE_TAB_HEIGHT_PX + GROUP_TITLE_TAB_GUTTER_PX` of vertical top
-// padding inside the box before the first child row begins, so the chiclet
-// never overlaps content. Bumping the height without re-tuning
-// `GROUP_TITLE_TAB_LABEL_BASELINE_OFFSET_PX` mis-centers the label.
-/** Height (px) of the group-title chiclet anchored at the box's upper-left. */
-export const GROUP_TITLE_TAB_HEIGHT_PX = 16;
-/** Horizontal padding (px) on each side of the title text inside the chiclet. */
-export const GROUP_TITLE_TAB_PAD_X_PX = 6;
-/** Vertical gap (px) between the chiclet's bottom edge and the first inner row. */
-export const GROUP_TITLE_TAB_GUTTER_PX = 4;
-/** Baseline Y of the chiclet label relative to the chiclet's top edge.
- *  Tuned for a 9 pt bold glyph roughly vertically centered in a 16 px tab. */
-export const GROUP_TITLE_TAB_LABEL_BASELINE_OFFSET_PX = 11;
-/** Font size (px) of the group-title chiclet label. */
-export const GROUP_TITLE_TAB_LABEL_FONT_SIZE_PX = 9;
-/** Approximate per-character width factor used to size the chiclet to its
- *  title text. Mirrors the constant used in the renderer's pre-port code
- *  so the chiclet hugs short titles without clipping long ones. */
-export const GROUP_TITLE_TAB_CHAR_WIDTH_PX = 5.5;
-/** Padding (px) reserved on the inside-bottom of a styled group box before
- *  its lower stroke. Symmetric with the chiclet gutter so children breathe
- *  on both ends. */
-export const GROUP_BOTTOM_PAD_PX = 4;
-/**
- * Vertical space (px) reserved ABOVE a bracket-style (no-fill) group's
- * box to host its overhanging title label. Bracket groups paint their
- * label at `box.y - 2` (baseline) in the renderer — the glyph extent
- * lives entirely ABOVE box.y. Without an explicit reservation, that
- * overhang collides with the previous sibling's bracket-foot when two
- * bracket-titled groups stack in a parallel (the foot ends right where
- * the next label's top would render). The group shifts its own box.y
- * down by this amount so the label has clear space above it; the
- * caller advances by `bracketLabelOverhang + box.height + interRowGap`.
- *
- * Filled-style ("chiclet") groups use `GROUP_TITLE_TAB_HEIGHT_PX +
- * GROUP_TITLE_TAB_GUTTER_PX` instead — the chiclet sits INSIDE the box,
- * so they need no above-box reservation.
- */
-export const GROUP_BRACKET_LABEL_OVERHANG_PX = 12;
 /**
  * Dashed-accent pattern (px on / px off) used for two nowline accents
  * that read as "structural emphasis": the milestone vertical cut line
@@ -191,14 +151,14 @@ export const NOW_PILL_LABEL_INSET_X_PX = 6;
  * stroke peeks past the pill's squared edge by half-stroke).
  */
 export const NOWLINE_STROKE_WIDTH_PX = 2.25;
-// Visual inset applied on each side of an item bar. Two adjacent (logically
-// chained) items therefore have a 2× ITEM_INSET_PX visible gutter between
-// them, leaving room for vertical drop-lines (dependency arrows, anchor /
-// milestone cuts, the now-line) to pass between bars without crossing them.
-export const ITEM_INSET_PX = 6;
+// The seam a bar gives up on each side, from inside its dates, so two bars
+// that abut in time show a 2 px gap between their strokes
+// (specs/true-width-layout.md §3.1). A bar too short for both seams and the
+// `MIN_ITEM_WIDTH` floor shrinks its seams instead, staying centred in its
+// dates.
+export const ITEM_SEAM_PX = 1;
 // Canonical content gutter — the rest-state spacing between adjacent
 // pieces of chart content. Used for:
-//   - the gap between two adjacent items in a track (= 2 × ITEM_INSET_PX),
 //   - the gap between the header card and the chart's left edge (originX
 //     offset from chartLeftX),
 //   - the bottom margin around the attribution wordmark.
@@ -208,10 +168,13 @@ export const ITEM_INSET_PX = 6;
 // That's a runtime concern — the layout engine emits a static positioned
 // model and the interactive shell animates spacing on top. Keep this
 // constant as the rest-state baseline.
-export const GUTTER_PX = 2 * ITEM_INSET_PX;
-// Default pixel-per-day when no explicit scale is set. Calibrated so a
-// 26-week (180 day) roadmap fits a 1200 px content area.
-export const DEFAULT_PIXELS_PER_DAY = 5;
+export const GUTTER_PX = 12;
+// Pixels per day at the days scale (`scale:1d`). A day literal labels
+// every column, so a day must hold its widest `M/D` label (`12/31`, about
+// 29 px at the 10 px tick font), as a 40 px week holds `Sep 28`. That
+// also keeps a day here wider than a day inside a default week column
+// (8 px under business, about 5.7 px under full).
+export const DEFAULT_PIXELS_PER_DAY = 32;
 // Header box defaults per position. The beside-mode card width is dynamic
 // (sized to the title + author text, clamped to MIN..MAX with text wrap),
 // so the layout uses these bounds instead of a single fixed width.
@@ -227,13 +190,15 @@ export const HEADER_ABOVE_HEIGHT_PX = 72;
 //   │  Footnotes              ↑     │   header band (HEADER_HEIGHT)
 //   │                         │     │
 //   ├─────────────────────────┘     │   gap = PANEL_PADDING
-//   │  N  Title — description       │   row N (ROW_HEIGHT each)
+//   │  N  Title — description       │   row (ROW_HEIGHT each)
+//   │     that wraps at the title   │   wrapped row
 //   │  N  …                         │
 //   │                               │
 //   └───────────────────────────────┘   bottom pad = PANEL_PADDING
 //
 // Total panel height (when entries.length > 0):
-//   HEADER_HEIGHT + entries × ROW_HEIGHT + PANEL_PADDING
+//   HEADER_HEIGHT + rows × ROW_HEIGHT + PANEL_PADDING, where rows counts
+//   every entry's rows (wrapped ones included) and each region heading.
 /** Height (px) of the header band above the entry rows. */
 export const FOOTNOTE_HEADER_HEIGHT_PX = 28;
 /**
@@ -307,4 +272,35 @@ export const LABEL_THINNING = {
     quarters: 4,
     years: 5,
 };
+// Opacity of a non-working band (`timeline.nonWorkingFill`) under the
+// `show` display (specs/working-calendar.md §7.3).
+export const NON_WORKING_FILL_OPACITY = 0.1;
+// Waves (specs/waves.md section 9.10; hatch geometry section 9.3).
+export const WAVE_STRIP_HEIGHT_PX = 20;
+export const WAVE_BOUNDARY_WIDTH_PX = 2;
+export const WAVE_CROSS_DASH = '2 2';
+export const WAVE_HATCH_OPACITY = 0.13;
+export const WAVE_HATCH_TILE_PX = 6;
+export const WAVE_HATCH_STROKE_PX = 2;
+export const WAVE_STYLED_TINT_OPACITY = 0.12;
+export const WAVE_STYLED_STRIP_MIX_OPACITY = 0.25;
+export const WAVE_STRIP_LABEL_FONT_SIZE_PX = 10;
+export const WAVE_LEGEND_LINE_PX = 14;
+export const WAVE_LEGEND_GAP_PX = 8;
+// Wave strip and legend geometry (specs/waves.md §9.1, §9.5).
+/** Horizontal padding on each side of a strip label in the fit test. */
+export const WAVE_STRIP_LABEL_PAD_PX = 6;
+/** Horizontal padding of a strip label's halo on each side. */
+export const WAVE_LABEL_HALO_PAD_PX = 2;
+/** Vertical inset of a strip label's halo from the strip's top and bottom. */
+export const WAVE_LABEL_HALO_INSET_Y_PX = 3;
+/** How far a strip cell sits inside the backing panel: half its 1 px stroke. */
+export const WAVE_CELL_INSET_PX = 0.5;
+/** Legend swatch (a hatched bar) size. */
+export const WAVE_LEGEND_SWATCH_WIDTH_PX = 18;
+export const WAVE_LEGEND_SWATCH_HEIGHT_PX = 10;
+/** Gap between a legend swatch and its text. */
+export const WAVE_LEGEND_SWATCH_GAP_PX = 6;
+/** Legend text baseline below its line's top (10 px text in a 14 px line). */
+export const WAVE_LEGEND_BASELINE_OFFSET_PX = 11;
 //# sourceMappingURL=shared.js.map

package/dist/themes/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/themes/shared.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/themes/shared.ts"],"names":[],"mappings":"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"}

package/dist/time-scale.d.ts

@@ -1,19 +1,33 @@
+import type { NonWorkingDisplay } from './non-working-display.js';
 import type { WorkingCalendar } from './working-calendar.js';
 export interface TimeScaleOptions {
     /** [start, end] in calendar dates (UTC midnight assumed). */
     domain: [Date, Date];
     /** [originX, originX + chartWidth]. */
     range: [number, number];
-    /** Optional non-continuous calendar for future weekend-skip support. */
+    /** The working calendar; without one every day is a working day. */
     calendar?: WorkingCalendar;
+    /** How non-working days are drawn; `hide` when omitted. */
+    nonWorking?: NonWorkingDisplay;
 }
 export declare class TimeScale {
     readonly domain: [Date, Date];
     readonly range: [number, number];
     readonly pixelsPerDay: number;
     readonly calendar?: WorkingCalendar;
-    private readonly d3;
+    /** The requested display; `showsNonWorking` says whether it takes effect. */
+    readonly nonWorking: NonWorkingDisplay;
     constructor(opts: TimeScaleOptions);
+    /**
+     * True when non-working days are drawn at full width: the `show`
+     * display over a calendar that has non-working days. The one predicate
+     * every show-only branch in the layout is gated on.
+     */
+    get showsNonWorking(): boolean;
+    /** Working days from the domain start to `date` (calendar days without a calendar). */
+    private indexOf;
+    /** Calendar days from the domain start to `x`, and the whole day `x` lies in. */
+    private dayAt;
     /**
      * Project a date onto the x-axis. Always returns a number, even
      * for dates outside the domain (callers that need clamping use
@@ -22,15 +36,37 @@ export declare class TimeScale {
     forward(date: Date): number;
     /**
      * Project a date onto the x-axis, returning `null` when the date
-     * is outside [domain[0], domain[1]]. Replaces the legacy
-     * `xForDate(date, timeline)` helper.
+     * is outside [domain[0], domain[1]]. The guard compares raw dates,
+     * so a hidden day inside the window still projects. Replaces the
+     * legacy `xForDate(date, timeline)` helper.
      */
     forwardWithinDomain(date: Date): number | null;
     /**
-     * Inverse projection. Returns a Date for any x in the chart;
-     * callers that want day-resolution can floor the result.
+     * Inverse projection: the working day whose start is nearest x
+     * (UTC midnight). Never a non-working day, except under `show`, where
+     * every day has width and this is the calendar day nearest x.
      */
     invert(x: number): Date;
+    /**
+     * The working-day index at `x`, with the fraction of a working day it
+     * is into. Under `show` an x inside a non-working day reads as the start
+     * of the next working day; otherwise x is linear in the index.
+     */
+    indexAtX(x: number): number;
+    /**
+     * Where an item placed at `x` starts. Under `show` an x inside a
+     * non-working day moves forward to the start of the next working day;
+     * an x inside a working day keeps its fraction, so a start mid-Friday
+     * stays mid-Friday. The identity otherwise.
+     */
+    startX(x: number): number;
+    /**
+     * The x where `n` working days from `startX(x)` end. Under `show` that is
+     * the end of the last working day the span reaches, with a partial day
+     * interpolated, so a Mon-Fri item ends on Friday evening and the weekend
+     * after it stays open. `x + n * pixelsPerDay` otherwise.
+     */
+    advanceX(x: number, n: number): number;
     /** First pixel of the chart (start of range). */
     get originX(): number;
     /** Width of the chart band in pixels. */

package/dist/time-scale.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"time-scale.d.ts","sourceRoot":"","sources":["../src/time-scale.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,MAAM,WAAW,gBAAgB;IAC7B,6DAA6D;IAC7D,MAAM,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACrB,uCAAuC;IACvC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxB,wEAAwE;IACxE,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC9B;AAED,qBAAa,SAAS;IAClB,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC;IACpC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAA4B;gBAEnC,IAAI,EAAE,gBAAgB;IASlC;;;;OAIG;IACH,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM;IAK3B;;;;OAIG;IACH,mBAAmB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI;IAK9C;;;OAGG;IACH,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI;IAIvB,iDAAiD;IACjD,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,yCAAyC;IACzC,IAAI,OAAO,IAAI,MAAM,CAEpB;CACJ"}
+{"version":3,"file":"time-scale.d.ts","sourceRoot":"","sources":["../src/time-scale.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAQ7D,MAAM,WAAW,gBAAgB;IAC7B,6DAA6D;IAC7D,MAAM,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACrB,uCAAuC;IACvC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxB,oEAAoE;IACpE,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,2DAA2D;IAC3D,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAClC;AAED,qBAAa,SAAS;IAClB,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC;IACpC,6EAA6E;IAC7E,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC;IAEvC,YAAY,IAAI,EAAE,gBAAgB,EAYjC;IAED;;;;OAIG;IACH,IAAI,eAAe,IAAI,OAAO,CAE7B;IAED,uFAAuF;IACvF,OAAO,CAAC,OAAO;IAMf,iFAAiF;IACjF,OAAO,CAAC,KAAK;IAKb;;;;OAIG;IACH,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAK1B;IAED;;;;;OAKG;IACH,mBAAmB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAG7C;IAED;;;;OAIG;IACH,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAMtB;IAED;;;;OAIG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAO1B;IAED;;;;;OAKG;IACH,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAMxB;IAED;;;;;OAKG;IACH,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAUrC;IAED,iDAAiD;IACjD,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,yCAAyC;IACzC,IAAI,OAAO,IAAI,MAAM,CAEpB;CACJ"}

package/dist/time-scale.js

@@ -3,26 +3,60 @@
 // also exposes `invert(x) -> Date` for the m4 editor work and that
 // composes with a `WorkingCalendar` for non-continuous time models.
 //
-// Forward direction matches the legacy arithmetic byte-for-byte
-// (`originX + daysBetween(domain[0], date) * pixelsPerDay`) so the
-// m2.5a refactor leaves the rendered output unchanged. Invert uses
-// `d3-scale.scaleTime` so callers get a precise Date back from a
-// pixel coordinate.
-import { scaleTime } from 'd3-scale';
-import { daysBetween } from './calendar.js';
+// x is linear in the working-day index from the domain start
+// (specs/working-calendar.md §7.1): `originX + index * pixelsPerDay`.
+// With no calendar, or one with no non-working day, the index is
+// `daysBetween`, so the forward direction matches the legacy
+// arithmetic byte-for-byte. Under a calendar with non-working days a
+// hidden date maps to the start of the next working day, and `invert`
+// returns the working day whose start is nearest x.
+//
+// Under the `show` display (§7.3) a calendar's non-working days keep their
+// full width instead: x is linear in calendar days, and `startX` /
+// `advanceX` step an item over the non-working days it crosses. Every
+// branch for it is gated on `showsNonWorking`, so `hide`, a calendar with no
+// non-working day and a scale with no calendar keep the code above verbatim.
+import { addDays, daysBetween } from './calendar.js';
+/**
+ * Tolerance, in days, for reading a day off an x. Pixel sums carry float
+ * noise, so an x a hair before a day's start counts as that day.
+ */
+const DAY_EPSILON = 1e-6;
 export class TimeScale {
     domain;
     range;
     pixelsPerDay;
     calendar;
-    d3;
+    /** The requested display; `showsNonWorking` says whether it takes effect. */
+    nonWorking;
     constructor(opts) {
         this.domain = opts.domain;
         this.range = opts.range;
         this.calendar = opts.calendar;
-        const spanDays = Math.max(1, daysBetween(opts.domain[0], opts.domain[1]));
+        this.nonWorking = opts.nonWorking ?? 'hide';
+        const spanDays = Math.max(1, this.showsNonWorking
+            ? daysBetween(opts.domain[0], opts.domain[1])
+            : this.indexOf(opts.domain[1]));
         this.pixelsPerDay = (opts.range[1] - opts.range[0]) / spanDays;
-        this.d3 = scaleTime().domain(opts.domain).range(opts.range);
+    }
+    /**
+     * True when non-working days are drawn at full width: the `show`
+     * display over a calendar that has non-working days. The one predicate
+     * every show-only branch in the layout is gated on.
+     */
+    get showsNonWorking() {
+        return this.nonWorking === 'show' && this.calendar?.hasNonWorkingDays === true;
+    }
+    /** Working days from the domain start to `date` (calendar days without a calendar). */
+    indexOf(date) {
+        return this.calendar
+            ? this.calendar.workingIndexOf(this.domain[0], date)
+            : daysBetween(this.domain[0], date);
+    }
+    /** Calendar days from the domain start to `x`, and the whole day `x` lies in. */
+    dayAt(x) {
+        const days = (x - this.range[0]) / this.pixelsPerDay;
+        return { days, day: Math.floor(days + DAY_EPSILON) };
     }
     /**
      * Project a date onto the x-axis. Always returns a number, even
@@ -30,13 +64,16 @@ export class TimeScale {
      * `forwardWithinDomain`).
      */
     forward(date) {
-        const days = daysBetween(this.domain[0], date);
-        return this.range[0] + days * this.pixelsPerDay;
+        if (this.showsNonWorking) {
+            return this.range[0] + daysBetween(this.domain[0], date) * this.pixelsPerDay;
+        }
+        return this.range[0] + this.indexOf(date) * this.pixelsPerDay;
     }
     /**
      * Project a date onto the x-axis, returning `null` when the date
-     * is outside [domain[0], domain[1]]. Replaces the legacy
-     * `xForDate(date, timeline)` helper.
+     * is outside [domain[0], domain[1]]. The guard compares raw dates,
+     * so a hidden day inside the window still projects. Replaces the
+     * legacy `xForDate(date, timeline)` helper.
      */
     forwardWithinDomain(date) {
         if (date < this.domain[0] || date > this.domain[1])
@@ -44,11 +81,66 @@ export class TimeScale {
         return this.forward(date);
     }
     /**
-     * Inverse projection. Returns a Date for any x in the chart;
-     * callers that want day-resolution can floor the result.
+     * Inverse projection: the working day whose start is nearest x
+     * (UTC midnight). Never a non-working day, except under `show`, where
+     * every day has width and this is the calendar day nearest x.
      */
     invert(x) {
-        return this.d3.invert(x);
+        const index = Math.round((x - this.range[0]) / this.pixelsPerDay);
+        if (this.showsNonWorking)
+            return addDays(this.domain[0], index);
+        return this.calendar
+            ? this.calendar.dateAtWorkingIndex(this.domain[0], index)
+            : addDays(this.domain[0], index);
+    }
+    /**
+     * The working-day index at `x`, with the fraction of a working day it
+     * is into. Under `show` an x inside a non-working day reads as the start
+     * of the next working day; otherwise x is linear in the index.
+     */
+    indexAtX(x) {
+        const { days, day } = this.dayAt(x);
+        if (!this.showsNonWorking || !this.calendar)
+            return days;
+        const date = addDays(this.domain[0], day);
+        const index = this.calendar.workingIndexOf(this.domain[0], date);
+        if (!this.calendar.isWorkingDay(date))
+            return index;
+        return index + Math.max(0, days - day);
+    }
+    /**
+     * Where an item placed at `x` starts. Under `show` an x inside a
+     * non-working day moves forward to the start of the next working day;
+     * an x inside a working day keeps its fraction, so a start mid-Friday
+     * stays mid-Friday. The identity otherwise.
+     */
+    startX(x) {
+        if (!this.showsNonWorking || !this.calendar)
+            return x;
+        const date = addDays(this.domain[0], this.dayAt(x).day);
+        if (this.calendar.isWorkingDay(date))
+            return x;
+        const index = this.calendar.workingIndexOf(this.domain[0], date);
+        return this.forward(this.calendar.dateAtWorkingIndex(this.domain[0], index));
+    }
+    /**
+     * The x where `n` working days from `startX(x)` end. Under `show` that is
+     * the end of the last working day the span reaches, with a partial day
+     * interpolated, so a Mon-Fri item ends on Friday evening and the weekend
+     * after it stays open. `x + n * pixelsPerDay` otherwise.
+     */
+    advanceX(x, n) {
+        if (!this.showsNonWorking || !this.calendar)
+            return x + n * this.pixelsPerDay;
+        const start = this.startX(x);
+        if (n <= 0)
+            return start;
+        const target = this.indexAtX(start) + n;
+        // The working day the span ends in, and how much of it it covers (0, 1].
+        const lastDay = Math.ceil(target - DAY_EPSILON) - 1;
+        const covered = target - lastDay;
+        const lastDate = this.calendar.dateAtWorkingIndex(this.domain[0], lastDay);
+        return this.forward(lastDate) + covered * this.pixelsPerDay;
     }
     /** First pixel of the chart (start of range). */
     get originX() {

package/dist/time-scale.js.map

@@ -1 +1 @@
-{"version":3,"file":"time-scale.js","sourceRoot":"","sources":["../src/time-scale.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,mEAAmE;AACnE,mEAAmE;AACnE,oEAAoE;AACpE,EAAE;AACF,gEAAgE;AAChE,mEAAmE;AACnE,mEAAmE;AACnE,iEAAiE;AACjE,oBAAoB;AAEpB,OAAO,EAAkB,SAAS,EAAE,MAAM,UAAU,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAY5C,MAAM,OAAO,SAAS;IACT,MAAM,CAAe;IACrB,KAAK,CAAmB;IACxB,YAAY,CAAS;IACrB,QAAQ,CAAmB;IACnB,EAAE,CAA4B;IAE/C,YAAY,IAAsB;QAC9B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1E,IAAI,CAAC,YAAY,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC;QAC/D,IAAI,CAAC,EAAE,GAAG,SAAS,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChE,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,IAAU;QACd,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QAC/C,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC;IACpD,CAAC;IAED;;;;OAIG;IACH,mBAAmB,CAAC,IAAU;QAC1B,IAAI,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAChE,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,CAAS;QACZ,OAAO,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC;IAED,iDAAiD;IACjD,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IAED,yCAAyC;IACzC,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACzC,CAAC;CACJ"}
+{"version":3,"file":"time-scale.js","sourceRoot":"","sources":["../src/time-scale.ts"],"names":[],"mappings":"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"}