@nomideusz/svelte-calendar 0.21.0 → 1.0.1

package/dist/views/planner/PlannerScroll.svelte

@@ -20,13 +20,14 @@ import { prefersReducedMotion } from "svelte/motion";
 import { useCalendarContext } from "../shared/context.svelte.js";
 import EventContent from "../shared/EventContent.svelte";
 import { createClock } from "../../core/clock.svelte.js";
-import { DAY_MS, HOUR_MS, sod, addDaysMs } from "../../core/time.js";
-import { startOfWeek as sowFn, isAllDay, isMultiDay, segmentForDay } from "../../core/time.js";
-import { weekdayShort, monthLong, fmtTime as _fmtTime, getLabels } from "../../core/locale.js";
+import { HOUR_MS, sod, addDaysMs, diffDays } from "../../core/time.js";
+import { startOfWeek as sowFn, isAllDay, segmentForDay } from "../../core/time.js";
+import { weekdayShort, monthLong, fmtTime as _fmtTime } from "../../core/locale.js";
 import { createChipFit } from "../shared/chip-fit.svelte.js";
-const L = $derived(getLabels());
 let { mondayStart = true, locale, height = 520, events = [], style = "", focusDate, oneventclick, oneventcreate, onexternaldrop, selectedEventId = null, readOnly = false, visibleHours } = $props();
 const ctx = useCalendarContext();
+/** Per-instance labels (Calendar's `labels` prop over the globals). */
+const L = $derived(ctx.labels);
 const clock = createClock(ctx.timezone);
 // Drag ghost flies between day cells instead of teleporting.
 // No fallback: without a counterpart (drag start/end) it appears/disappears instantly.
@@ -72,6 +73,32 @@ function rowPitch() {
 	const rows = el?.querySelectorAll("[data-week]");
 	return rows && rows.length > 1 ? rows[1].offsetTop - rows[0].offsetTop : TIME_H + ROW_MARGIN;
 }
+// ─── Wall-clock helpers ─────────────────────────
+// The axis is wall-clock hours. A DST day is 23 or 25 hours long, so
+// `dayMs + h * HOUR_MS` is an hour off after the change: convert through
+// the local calendar instead.
+/** Fractional wall-clock hour `hour` on the day starting at `dayMs` → epoch ms. */
+function atHour(dayMs, hour) {
+	// MakeTime sums the fields in local time, so this may pass 24h.
+	return new Date(dayMs).setHours(0, 0, 0, Math.round(hour * HOUR_MS));
+}
+/** Epoch ms → fractional wall-clock hour counted from the day at `dayMs`. */
+function hourOf(ms, dayMs) {
+	const d = new Date(ms);
+	return diffDays(ms, dayMs) * 24 + d.getHours() + d.getMinutes() / 60 + d.getSeconds() / 3600 + d.getMilliseconds() / HOUR_MS;
+}
+/** All-day events and timed ones a (wall-clock) day or longer are bars;
+*  a shorter overnight event is a chip on the day it starts. */
+function inAllDayStrip(ev) {
+	return isAllDay(ev) || ev.end.getTime() >= addDaysMs(ev.start.getTime(), 1);
+}
+function statusText(ev) {
+	if (ev.status === "cancelled") return ` (${L.cancelled})`;
+	if (ev.status === "tentative") return ` (${L.tentative})`;
+	if (ev.status === "full") return ` (${L.full})`;
+	if (ev.status === "limited") return ` (${L.limited})`;
+	return "";
+}
 // ─── Time axis ──────────────────────────────────
 // Without visibleHours the axis spans the hours the loaded events start in:
 // a timetable of 7:00–21:00 classes spread over 24 hours bunches them up.
@@ -79,7 +106,7 @@ const eventHours = $derived.by(() => {
 	let lo = 24;
 	let hi = -1;
 	for (const ev of events) {
-		if (isAllDay(ev) || isMultiDay(ev)) continue;
+		if (inAllDayStrip(ev)) continue;
 		const h = ev.start.getHours() + ev.start.getMinutes() / 60;
 		lo = Math.min(lo, h);
 		hi = Math.max(hi, h);
@@ -88,10 +115,10 @@ const eventHours = $derived.by(() => {
 });
 const startHour = $derived(visibleHours?.[0] ?? eventHours[0]);
 const endHour = $derived(visibleHours?.[1] ?? eventHours[1]);
-/** Where a chip starting this far into the day sits, px from the axis top.
-*  A chip at the last hour still ends inside the floor height. */
-function timeTop(msIntoDay) {
-	const f = (msIntoDay / HOUR_MS - startHour) / Math.max(1, endHour - startHour);
+/** Where a chip starting this many wall-clock hours into the day sits, px
+*  from the axis top. A chip at the last hour still ends inside the floor height. */
+function timeTop(hoursIntoDay) {
+	const f = (hoursIntoDay - startHour) / Math.max(1, endHour - startHour);
 	return Math.min(Math.max(f, 0), 1) * (TIME_H - CHIP_H);
 }
 /** Each chip at its start time, or just under the chip before it when that
@@ -100,7 +127,7 @@ function chipTops(list, dayMs) {
 	const tops = [];
 	let min = 0;
 	for (const ev of list) {
-		const top = Math.max(timeTop(ev.start.getTime() - dayMs), min);
+		const top = Math.max(timeTop(hourOf(ev.start.getTime(), dayMs)), min);
 		tops.push(top);
 		min = top + CHIP_H + CHIP_GAP;
 	}
@@ -110,7 +137,7 @@ function chipTops(list, dayMs) {
 *  it), but never above a chip that has already started — pushed-down
 *  chips would read as still to come. */
 function nowTop(list, tops, dayMs) {
-	let y = timeTop(clock.tick - dayMs);
+	let y = timeTop(hourOf(clock.tick, dayMs));
 	list.forEach((ev, i) => {
 		if (ev.start.getTime() <= clock.tick) y = Math.max(y, tops[i] + CHIP_H + CHIP_GAP / 2);
 	});
@@ -177,15 +204,17 @@ const weeks = $derived.by(() => {
 			const isToday = ms === todayMs;
 			const isPast = equalDays ? false : ms < todayMs;
 			const dayEnd = addDaysMs(ms, 1);
-			const dayEventsAll = events.filter((ev) => ev.start.getTime() < dayEnd && ev.end.getTime() > ms).sort((a, b) => a.start.getTime() - b.start.getTime());
-			// Separate all-day / multi-day from timed events
+			// A zero-length event counts where it sits (even at midnight)
+			const dayEventsAll = events.filter((ev) => ev.start.getTime() < dayEnd && (ev.end.getTime() > ms || ev.start.getTime() >= ms)).sort((a, b) => a.start.getTime() - b.start.getTime());
+			// Separate all-day / day-long from timed events. A timed event that
+			// runs past midnight (22:00–01:00) is a chip on its start day only.
 			const timedEvents = [];
 			const allDaySegments = [];
 			for (const ev of dayEventsAll) {
-				if (isAllDay(ev) || isMultiDay(ev)) {
+				if (inAllDayStrip(ev)) {
 					const seg = segmentForDay(ev, ms);
 					if (seg) allDaySegments.push(seg);
-				} else {
+				} else if (ev.start.getTime() >= ms && ev.end.getTime() >= ev.start.getTime()) {
 					timedEvents.push(ev);
 				}
 			}
@@ -246,7 +275,15 @@ function fmtAmPm(d) {
 // ─── Scroll to current week on mount ────────────────
 onMount(() => {
 	tick().then(() => scrollWeekIntoContainer());
-	return () => cancelAnimationFrame(syncRaf);
+	return () => {
+		cancelAnimationFrame(syncRaf);
+		// Unmounted mid-gesture (a view switch between pointerdown and
+		// pointerup): drop the window listeners and the auto-scroll frame,
+		// and the half-made drag with them.
+		const live = evDragStarted;
+		cleanupEvDrag();
+		if (live && drag?.active) drag.cancel();
+	};
 });
 // Rows grow when their events arrive, which moves every row below them —
 // including the one we centred on an empty grid. Centre once more when the
@@ -347,31 +384,47 @@ function handleUserScroll() {
 		}
 	}
 }
-/** Where a new thing lands on this day, or null when the day refuses it.
-*  A cell is a whole day here — there is no time axis to drop onto — so
-*  everything starts at the first visible hour. One rule, so an empty-cell
-*  click and a drop from outside can never disagree about a day. */
-function dayDropStart(ms) {
+/** The time at a pointer's height on a day's axis — timeTop read backwards,
+*  the pointer at the chip's middle. Half hours: the whole day is ~100px.
+*  Wall-clock ms into the local day; dayDropStart makes it an instant. */
+function pointerTime(cell, clientY) {
+	const area = cell.querySelector(".wg-cell-events");
+	if (!area) return startHour * HOUR_MS;
+	// The result is wall-clock time into the day (ms), rounded to half hours
+	// of the local day — dayDropStart turns it into an instant.
+	const y = clientY - area.getBoundingClientRect().top - CHIP_H / 2;
+	const f = Math.min(Math.max(y / (TIME_H - CHIP_H), 0), 1);
+	const hours = startHour + f * Math.max(1, endHour - startHour);
+	return Math.round(hours * 2) * (HOUR_MS / 2);
+}
+/** Where a new thing lands on this day, or null when the day (or that hour
+*  of it) refuses it. `at` is the pointer's time into the day; without one
+*  (the keyboard) it is the first hour of the axis. One rule, so an
+*  empty-cell click and a drop from outside can never disagree. */
+function dayDropStart(ms, at = startHour * HOUR_MS) {
 	if (disabledSet.has(ms)) return null;
-	const startHour = visibleHours?.[0] ?? 9;
+	const hour = at / HOUR_MS;
 	if (blockedSlots?.length) {
 		const jsDay = new Date(ms).getDay();
 		const isoDay = jsDay === 0 ? 7 : jsDay;
 		const blocked = blockedSlots.some((slot) => {
 			if (slot.day && slot.day !== isoDay) return false;
-			return startHour >= slot.start && startHour < slot.end;
+			return hour >= slot.start && hour < slot.end;
 		});
 		if (blocked) return null;
 	}
-	return new Date(ms + startHour * HOUR_MS);
+	return new Date(atHour(ms, hour));
 }
 function handleDayCellClick(ms, e) {
 	const target = e.target;
 	if (target.closest(".wg-ev, .wg-ad, .wg-ev-more")) return;
 	if (readOnly || !oneventcreate) return;
-	const start = dayDropStart(ms);
+	const at = e instanceof MouseEvent ? pointerTime(e.currentTarget, e.clientY) : undefined;
+	const start = dayDropStart(ms, at);
 	if (!start) return;
-	const durMin = minDuration ? Math.max(60, minDuration) : 60;
+	// An hour, or the minimum duration when that is longer. Blocked-slot and
+	// max-duration validation is Calendar's (ctx.oneventcreate), not ours.
+	const durMin = Math.max(60, minDuration ?? 0);
 	oneventcreate({
 		start,
 		end: new Date(start.getTime() + durMin * 6e4)
@@ -379,21 +432,31 @@ function handleDayCellClick(ms, e) {
 }
 // ─── External drop (HTML5 DnD) ──────────────────────
 // A class chip dragged in from outside the calendar; the cell it is over
-// lights up so the day it would land on is never in doubt.
-let dropDayMs = $state(null);
+// lights up and a line on its axis says the time it would land at.
+let drop = $state(null);
 function onCellDragOver(e, ms) {
-	if (!onexternaldrop || readOnly || !dayDropStart(ms)) return;
+	if (!onexternaldrop || readOnly) return;
+	const at = pointerTime(e.currentTarget, e.clientY);
+	if (!dayDropStart(ms, at)) {
+		drop = null;
+		return;
+	}
 	e.preventDefault();
 	if (e.dataTransfer) e.dataTransfer.dropEffect = "copy";
-	dropDayMs = ms;
+	if (drop?.day !== ms || drop.at !== at) drop = {
+		day: ms,
+		at
+	};
 }
-function onCellDragLeave(ms) {
-	if (dropDayMs === ms) dropDayMs = null;
+function onCellDragLeave(e, ms) {
+	// Leaving for a chip inside the same cell is not leaving the cell.
+	if (e.currentTarget.contains(e.relatedTarget)) return;
+	if (drop?.day === ms) drop = null;
 }
 function onCellDrop(e, ms) {
-	dropDayMs = null;
+	drop = null;
 	if (!onexternaldrop || readOnly || !e.dataTransfer) return;
-	const start = dayDropStart(ms);
+	const start = dayDropStart(ms, pointerTime(e.currentTarget, e.clientY));
 	if (!start) return;
 	e.preventDefault();
 	onexternaldrop({
@@ -421,6 +484,11 @@ let evCellW = 100;
 *  step is the row under the pointer, found by hit-test, not by division.
 *  Held as a timestamp: an extension can renumber rows mid-drag. */
 let evStartWeekMs = 0;
+/** The day cell the press landed in; the drag moves the event by the days
+*  between it and the cell now under the pointer. */
+let evPressDayMs = 0;
+/** The grid runs right-to-left (`dir="rtl"`): a rightward drag goes back. */
+let evRtl = false;
 const dragPreviewEvent = $derived.by(() => {
 	const payload = drag?.active && drag.mode === "move" ? drag.payload : null;
 	if (!payload?.eventId) return null;
@@ -446,15 +514,16 @@ function timedEventsForDay(day) {
 const previewKeySnapshot = new Map();
 function dragPreviewTimedForDay(dayMs) {
 	const ev = dragPreviewEvent;
-	if (!ev || isAllDay(ev) || isMultiDay(ev)) return null;
+	if (!ev || inAllDayStrip(ev)) return null;
+	// Where the chip would sit: its start day (as in the week rows)
 	const dayEnd = addDaysMs(dayMs, 1);
-	const hit = ev.start.getTime() < dayEnd && ev.end.getTime() > dayMs;
+	const hit = ev.start.getTime() >= dayMs && ev.start.getTime() < dayEnd;
 	if (hit) previewKeySnapshot.set("timed", ev.id);
 	return hit ? ev : null;
 }
 function dragPreviewSegmentForDay(dayMs) {
 	const ev = dragPreviewEvent;
-	if (!ev || !isAllDay(ev) && !isMultiDay(ev)) return null;
+	if (!ev || !inAllDayStrip(ev)) return null;
 	const seg = segmentForDay(ev, dayMs);
 	if (seg) previewKeySnapshot.set(dayMs, `${ev.id}:${seg.dayIndex}`);
 	return seg;
@@ -532,19 +601,45 @@ function onEventPointerDown(e, ev) {
 	evDragStarted = false;
 	evDragId = ev.id;
 	evDragEvent = ev;
+	const cellMs = Number(e.currentTarget.closest("[data-day]")?.dataset.day);
+	evPressDayMs = Number.isFinite(cellMs) ? cellMs : sod(ev.start.getTime());
 	window.addEventListener("pointermove", onEvWindowPointerMove);
 	window.addEventListener("pointerup", onEvWindowPointerUp, { once: true });
 	window.addEventListener("pointercancel", onEvWindowPointerCancel, { once: true });
 }
+/** The day `cols` rendered columns away from the press cell, in the row
+*  whose start is `rowMs`. Columns are counted over the days actually shown
+*  (hideDays leaves gaps in the dates, not in the columns); running off a
+*  row's end carries into the neighbouring row. */
+function dayAtColumn(rowMs, cols) {
+	const startRow = weeks.findIndex((w) => w.weekStart === evStartWeekMs);
+	let r = weeks.findIndex((w) => w.weekStart === rowMs);
+	if (startRow < 0 || r < 0) return null;
+	const pressCol = weeks[startRow].days.findIndex((d) => d.ms === evPressDayMs);
+	if (pressCol < 0) return null;
+	let col = pressCol + cols;
+	while (col < 0 && r > 0) {
+		r--;
+		col += weeks[r].days.length;
+	}
+	while (col >= weeks[r].days.length && r < weeks.length - 1) {
+		col -= weeks[r].days.length;
+		r++;
+	}
+	const days = weeks[r].days;
+	if (!days.length) return null;
+	return days[Math.max(0, Math.min(days.length - 1, col))].ms;
+}
 /** Where the dragged event sits for the pointer's current offset. */
 function updateDragFromPointer() {
 	const ev = evDragEvent;
 	if (!drag || !ev) return;
-	const dayOffset = Math.round((evLastX - evDragStartX) / evCellW);
+	const dx = (evLastX - evDragStartX) * (evRtl ? -1 : 1);
+	const colOffset = Math.round(dx / evCellW);
 	const nowWeekMs = weekMsAtY(evLastY);
-	// A vertical row step spans one period (customDays), not always 7 days
-	const weekOffset = evStartWeekMs && nowWeekMs ? Math.round((nowWeekMs - evStartWeekMs) / (customDays * DAY_MS)) : 0;
-	const deltaDays = dayOffset + weekOffset * customDays;
+	const target = evStartWeekMs && nowWeekMs ? dayAtColumn(nowWeekMs, colOffset) : null;
+	// Without a mapped cell (the rows are mid-rebuild) keep the press day
+	const deltaDays = target === null ? 0 : diffDays(target, evPressDayMs);
 	drag.updatePointer(new Date(addDaysMs(ev.start.getTime(), deltaDays)), new Date(addDaysMs(ev.end.getTime(), deltaDays)));
 }
 // ─── Auto-scroll under a drag ───────────────────────
@@ -590,6 +685,7 @@ function onEvWindowPointerMove(e) {
 		evDragging = true;
 		evCellW = getCellWidth();
 		evStartWeekMs = weekMsAtY(evDragStartY);
+		evRtl = !!el && getComputedStyle(el).direction === "rtl";
 		drag.beginMove(ev.id, ev.start, ev.end);
 	}
 	setAutoScroll(e.clientY);
@@ -607,6 +703,8 @@ function cleanupEvDrag() {
 	evAnchor = undefined;
 	evDragMovable = false;
 	evStartWeekMs = 0;
+	evPressDayMs = 0;
+	evRtl = false;
 }
 function onEvWindowPointerUp() {
 	if (!evDragStarted) {
@@ -631,9 +729,28 @@ function onWindowKeydown(e) {
 // ─── "+N more" per-cell expansion ───────────────────
 let expandedCells = $state({});
 // ─── Roving tabindex for grid cells ─────────────────
-// One tabbable cell (last focused, else today); arrows move focus.
+// One tabbable cell (last focused, else today, else the first shown day of
+// the anchor week — today may be a hidden day or outside the buffer, and
+// the grid must never drop out of the tab order); arrows move focus.
 let focusedCellMs = $state(null);
-const tabbableCellMs = $derived(focusedCellMs ?? todayMs);
+const tabbableCellMs = $derived.by(() => {
+	let fallback = null;
+	let anchorFirst = null;
+	let focusedShown = false;
+	let todayShown = false;
+	for (const w of weeks) {
+		if (!w.days.length) continue;
+		fallback ??= w.days[0].ms;
+		if (w.weekStart === anchorPeriodStart) anchorFirst = w.days[0].ms;
+		for (const d of w.days) {
+			if (d.ms === focusedCellMs) focusedShown = true;
+			if (d.ms === todayMs) todayShown = true;
+		}
+	}
+	if (focusedShown) return focusedCellMs;
+	if (todayShown) return todayMs;
+	return anchorFirst ?? fallback;
+});
 function onCellKeydown(e, ms) {
 	if (e.key === "Enter" || e.key === " ") {
 		e.preventDefault();
@@ -730,14 +847,14 @@ function onCellKeydown(e, ms) {
 								class:wg-cell--weekend={day.isWeekend}
 								class:wg-cell--disabled={disabledSet.has(day.ms)}
 								class:wg-cell--expanded={isExpanded}
-								class:wg-cell--drop={dropDayMs === day.ms}
+								class:wg-cell--drop={drop?.day === day.ms}
 								role="gridcell"
 								data-day={day.ms}
 								tabindex={day.ms === tabbableCellMs ? 0 : -1}
 								aria-label="{new Date(day.ms).toLocaleDateString(locale ?? 'en-US', { weekday: 'long', month: 'short', day: 'numeric' })}{day.isToday ? ` (${L.today.toLowerCase()})` : ''}, {L.nEvents(day.events.length + day.allDaySegments.length)}"
 								onclick={(e) => handleDayCellClick(day.ms, e)}
 								ondragover={(e) => onCellDragOver(e, day.ms)}
-								ondragleave={() => onCellDragLeave(day.ms)}
+								ondragleave={(e) => onCellDragLeave(e, day.ms)}
 								ondrop={(e) => onCellDrop(e, day.ms)}
 								onfocus={() => { focusedCellMs = day.ms; }}
 								onkeydown={(e) => onCellKeydown(e, day.ms)}
@@ -767,9 +884,9 @@ function onCellKeydown(e, ms) {
 										{@const isoDay = jsDay === 0 ? 7 : jsDay}
 										{#each blockedSlots as slot, i (i)}
 											{#if (!slot.day || slot.day === isoDay) && slot.end > startHour && slot.start < endHour}
-												{@const slotRange = `${_fmtTime(new Date(day.ms + slot.start * HOUR_MS), locale)} – ${_fmtTime(new Date(day.ms + slot.end * HOUR_MS), locale)}`}
-												{@const bandTop = timeTop(slot.start * HOUR_MS)}
-												{@const bandH = Math.max(14, timeTop(slot.end * HOUR_MS) - bandTop)}
+												{@const slotRange = `${_fmtTime(new Date(atHour(day.ms, slot.start)), locale)} – ${_fmtTime(new Date(atHour(day.ms, slot.end)), locale)}`}
+												{@const bandTop = timeTop(slot.start)}
+												{@const bandH = Math.max(14, timeTop(slot.end) - bandTop)}
 												<!-- A chip over the band would cut its label in half: the title keeps it -->
 												{@const covered = tops.some((t) => t < bandTop + bandH && t + CHIP_H > bandTop)}
 												<div
@@ -777,7 +894,7 @@ function onCellKeydown(e, ms) {
 													style:top="{bandTop}px"
 													style:height="{bandH}px"
 													title="{slot.label ? `${slot.label}, ` : ''}{slotRange}"
-													aria-label="{slot.label || 'Unavailable'}, {slotRange}"
+													aria-label="{slot.label || L.unavailable}, {slotRange}"
 												>
 													{#if slot.label && !covered}
 														<span class="wg-blocked-label">{slot.label}</span>
@@ -806,7 +923,7 @@ function onCellKeydown(e, ms) {
 											style:margin-top="{tops[i] - (i ? tops[i - 1] + CHIP_H : 0)}px"
 											role="button"
 											tabindex="0"
-											aria-label="{ev.title}, {fmtAmPm(ev.start)} – {fmtAmPm(ev.end)}{ev.status === 'cancelled' ? ` (cancelled)` : ''}{ev.status === 'tentative' ? ` (tentative)` : ''}{ev.status === 'full' ? ` (full)` : ''}{ev.status === 'limited' ? ` (limited)` : ''}{ev.start.getTime() <= clock.tick && ev.end.getTime() > clock.tick ? ` (${L.inProgress})` : ''}"
+											aria-label="{ev.title}, {fmtAmPm(ev.start)} – {fmtAmPm(ev.end)}{statusText(ev)}{ev.start.getTime() <= clock.tick && ev.end.getTime() > clock.tick ? ` (${L.inProgress})` : ''}"
 											onpointerdown={(e) => onEventPointerDown(e, ev)}
 											onpointerenter={() => oneventhover?.(ev)}
 											onkeydown={(e) => { if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); e.stopPropagation(); oneventclick?.(ev, e.currentTarget.getBoundingClientRect()); } }}
@@ -827,7 +944,7 @@ function onCellKeydown(e, ms) {
 										<div
 											class="wg-ev wg-ev--drag-preview"
 											style:--ev-color={previewTimedEvent.color ?? 'var(--dt-accent)'}
-											style:top="{timeTop(previewTimedEvent.start.getTime() - day.ms)}px"
+											style:top="{timeTop(hourOf(previewTimedEvent.start.getTime(), day.ms))}px"
 											aria-hidden="true"
 											in:previewReceive={{ key: previewKeySnapshot.get('timed') ?? '' }}
 											out:previewSend={{ key: previewKeySnapshot.get('timed') ?? '' }}
@@ -835,6 +952,11 @@ function onCellKeydown(e, ms) {
 											{@render timedEventContent(previewTimedEvent, inset)}
 										</div>
 									{/if}
+									{#if drop?.day === day.ms}
+										<div class="wg-now wg-drop" style:top="{timeTop(drop.at / HOUR_MS) + CHIP_H / 2}px" aria-hidden="true">
+											<span class="wg-now-time">{fmtAmPm(new Date(atHour(day.ms, drop.at / HOUR_MS)))}</span>
+										</div>
+									{/if}
 									{#if nowY !== null}
 										<div class="wg-now" style:top="{nowY}px" aria-hidden="true">
 											<span class="wg-now-time">{fmtAmPm(new Date(clock.tick))}</span>
@@ -1090,7 +1212,7 @@ function onCellKeydown(e, ms) {
 	}
 
 	.wg-day-wd {
-		font: 400 10px / 1 var(--dt-sans, system-ui, sans-serif);
+		font: 400 11px / 1 var(--dt-sans, system-ui, sans-serif);
 		letter-spacing: 0.04em;
 		text-transform: uppercase;
 		color: var(--dt-text-3, rgba(0, 0, 0, 0.38));
@@ -1176,7 +1298,7 @@ function onCellKeydown(e, ms) {
 	}
 
 	.wg-ad-title {
-		font: 500 10px / 1.1 var(--dt-sans, system-ui, sans-serif);
+		font: 500 11px / 1.1 var(--dt-sans, system-ui, sans-serif);
 		color: var(--dt-text, rgba(0, 0, 0, 0.87));
 		white-space: nowrap;
 		overflow: hidden;
@@ -1184,16 +1306,19 @@ function onCellKeydown(e, ms) {
 		flex: 1;
 	}
 
+	/* The event colour as ink can be a pale fill (a host's "no colour" tint);
+	   pulled toward the text colour it stays the event's hue and stays legible
+	   on the chip in either theme. */
 	.wg-ad-cont {
-		font-size: 10px;
-		color: var(--ev-color);
+		font-size: 11px;
+		color: color-mix(in srgb, var(--ev-color) 45%, var(--dt-text, #000));
 		flex-shrink: 0;
 		line-height: 1;
 	}
 
 	.wg-ad-arrow {
-		font-size: 10px;
-		color: var(--ev-color);
+		font-size: 11px;
+		color: color-mix(in srgb, var(--ev-color) 45%, var(--dt-text, #000));
 		flex-shrink: 0;
 		margin-left: auto;
 		line-height: 1;
@@ -1227,9 +1352,19 @@ function onCellKeydown(e, ms) {
 		border-top: 1px dashed var(--dt-accent, #2563eb);
 	}
 	.wg-now-time {
-		font: 500 9px / 1 var(--dt-sans, system-ui, sans-serif);
+		font: 500 10px / 1 var(--dt-sans, system-ui, sans-serif);
 		color: var(--dt-accent, #2563eb);
 	}
+	/* Where a dragged-in class would land: the now-line's shape, solid */
+	.wg-drop {
+		z-index: 3;
+	}
+	.wg-drop::after {
+		border-top-style: solid;
+	}
+	.wg-drop .wg-now-time {
+		font-weight: 600;
+	}
 
 	.wg-ev {
 		position: relative; /* above the blocked bands */
@@ -1294,9 +1429,11 @@ function onCellKeydown(e, ms) {
 		cursor: default;
 	}
 
+	/* On the tinted chip the tertiary ink fell under 4.5:1; the time is the
+	   chip's first answer, so it reads in the secondary ink. */
 	.wg-ev-time {
-		font: 400 10px / 1 var(--dt-sans, system-ui, sans-serif);
-		color: var(--dt-text-3, rgba(0, 0, 0, 0.38));
+		font: 400 11px / 1 var(--dt-sans, system-ui, sans-serif);
+		color: var(--dt-text-2, rgba(0, 0, 0, 0.6));
 		flex-shrink: 0;
 		white-space: nowrap;
 	}
@@ -1312,7 +1449,7 @@ function onCellKeydown(e, ms) {
 	}
 
 	.wg-ev-loc {
-		font: 400 10px / 1 var(--dt-sans, system-ui, sans-serif);
+		font: 400 11px / 1 var(--dt-sans, system-ui, sans-serif);
 		color: var(--dt-text-3, rgba(0, 0, 0, 0.38));
 		white-space: nowrap;
 		flex-shrink: 0; /* shown only when measured to fit — never squeezed */