Skip to content
TypeScript

feat: build the calendar with week, day and month views

Vipul Kumar385fffa8fb85
diff --git a/.gitignore b/.gitignore
index 5ef6a52..f76474e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,6 @@ yarn-error.log*
# typescript
*.tsbuildinfo
next-env.d.ts
+
+# local tooling
+.claude/
diff --git a/src/app/globals.css b/src/app/globals.css
index 3aa289a..5dfb41c 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -323,3 +323,12 @@
--tw-exit-scale: 1;
}
}
+
+@keyframes event-pulse {
+ 0% {
+ box-shadow: 0 0 0 0 rgba(137, 101, 222, 0.55);
+ }
+ 100% {
+ box-shadow: 0 0 0 10px rgba(137, 101, 222, 0);
+ }
+}
diff --git a/src/components/calendar/all-day-row.tsx b/src/components/calendar/all-day-row.tsx
new file mode 100644
index 0000000..791951a
--- /dev/null
+++ b/src/components/calendar/all-day-row.tsx
@@ -0,0 +1,71 @@
+"use client";
+
+import { useMemo } from "react";
+import { cn } from "@/lib/utils";
+import { useAppStore } from "@/stores/app-store";
+import { useCalendarStore } from "@/stores/calendar-store";
+import { openOverlay } from "@/stores/overlay-store";
+import { eventStyle } from "./event-colors";
+
+type Chip = { kind: "event" | "holiday"; id: string; title: string; style: React.CSSProperties };
+
+const CHIP_HEIGHT = 28;
+const CHIP_GAP = 4;
+const ROW_PADDING = 5.5;
+
+/** The all-day lane above the time grid: holidays first, then all-day events. */
+export function AllDayRow({ days, axisWidth }: { days: string[]; axisWidth: number }) {
+ const events = useAppStore((s) => s.events);
+ const holidays = useAppStore((s) => s.holidays);
+ const openPopover = useCalendarStore((s) => s.openPopover);
+
+ const chipsByDay = useMemo(
+ () =>
+ days.map((day): Chip[] => [
+ ...holidays
+ .filter((h) => h.date === day)
+ .map((h) => ({ kind: "holiday" as const, id: h.id, title: "National holiday", style: eventStyle("purple") })),
+ ...events
+ .filter((e) => e.allDay && e.date === day)
+ .map((e) => ({ kind: "event" as const, id: e.id, title: e.title, style: eventStyle(e.color) })),
+ ]),
+ [days, events, holidays],
+ );
+
+ const most = Math.max(1, ...chipsByDay.map((c) => c.length));
+ const height = ROW_PADDING * 2 + most * CHIP_HEIGHT + (most - 1) * CHIP_GAP + 1;
+
+ return (
+ <div className="flex w-full shrink-0 items-stretch overflow-hidden border-b border-hairline" style={{ height }}>
+ <div className="flex shrink-0 items-center justify-end pr-3" style={{ width: axisWidth }}>
+ {most > 1 && <span className="t-12 text-placeholder">All day</span>}
+ </div>
+ {days.map((day, i) => (
+ <div
+ key={day}
+ role="group"
+ aria-label="All-day events"
+ onClick={(e) => {
+ if (e.target === e.currentTarget) openOverlay({ kind: "event", date: day, allDay: true });
+ }}
+ className="flex min-w-0 flex-1 cursor-default flex-col justify-center gap-1 overflow-hidden border-l border-hairline px-1"
+ >
+ {chipsByDay[i].map((chip) => (
+ <button
+ key={chip.id}
+ type="button"
+ onClick={(e) => openPopover(chip.kind, chip.id, e.currentTarget)}
+ className={cn(
+ "press flex h-7 w-full shrink-0 items-center overflow-hidden rounded-lg px-2 text-left outline-none",
+ "hover-fine:brightness-[0.97] focus-visible:ring-2 focus-visible:ring-brand/60 dark:hover-fine:brightness-110",
+ )}
+ style={chip.style}
+ >
+ <span className="t-14 salt min-w-0 flex-1 truncate">{chip.title}</span>
+ </button>
+ ))}
+ </div>
+ ))}
+ </div>
+ );
+}
diff --git a/src/components/calendar/calendar-header.tsx b/src/components/calendar/calendar-header.tsx
new file mode 100644
index 0000000..7885354
--- /dev/null
+++ b/src/components/calendar/calendar-header.tsx
@@ -0,0 +1,126 @@
+"use client";
+
+import { Icon } from "@/components/icon";
+import { Button } from "@/components/ui/button";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
+import {
+ addDays,
+ formatRange,
+ formatShort,
+ formatWeekday,
+ fromKey,
+ isoWeek,
+ monthName,
+ startOfMonth,
+ daysInMonth,
+ weekDays,
+} from "@/lib/dates";
+import { cn } from "@/lib/utils";
+import { useToday } from "@/hooks/use-today";
+import { useAppStore } from "@/stores/app-store";
+import { useCalendarStore, type CalendarView } from "@/stores/calendar-store";
+
+// Fixed segment geometry from the Figma so the active pill can slide.
+const VIEWS: { id: CalendarView; label: string; left: number; width: number; key: string }[] = [
+ { id: "day", label: "Day", left: 1, width: 45, key: "D" },
+ { id: "week", label: "Week", left: 48, width: 51, key: "W" },
+ { id: "month", label: "Month", left: 101, width: 61, key: "M" },
+];
+
+function useRangeLabel() {
+ const { view, date } = useCalendarStore();
+ const weekStartsOn = useAppStore((s) => s.settings.weekStartsOn);
+ const year = fromKey(date).getFullYear();
+ const title = `${monthName(date)}, ${year}`;
+
+ if (view === "month") {
+ const first = startOfMonth(date);
+ return { title, subtitle: formatRange(first, addDays(first, daysInMonth(date) - 1)) };
+ }
+ const days = weekDays(date, weekStartsOn);
+ // ISO weeks start on Monday; for Sunday-first weeks use that Monday.
+ const week = isoWeek(weekStartsOn === 0 ? days[1] : days[0]);
+ if (view === "day") return { title, subtitle: `Week ${isoWeek(date)} · ${formatWeekday(date)}, ${formatShort(date)}` };
+ return { title, subtitle: `Week ${week} · ${formatRange(days[0], days[6])}` };
+}
+
+export function CalendarHeader() {
+ const view = useCalendarStore((s) => s.view);
+ const setView = useCalendarStore((s) => s.setView);
+ const setDate = useCalendarStore((s) => s.setDate);
+ const step = useCalendarStore((s) => s.step);
+ const today = useToday();
+ const { title, subtitle } = useRangeLabel();
+ const active = VIEWS.find((v) => v.id === view)!;
+ const unit = view === "day" ? "day" : view === "week" ? "week" : "month";
+
+ return (
+ <div className="flex h-[68px] w-full shrink-0 items-center gap-2 overflow-hidden border-b border-hairline px-4">
+ <div className="flex min-w-0 flex-1 flex-col items-start gap-1.5 overflow-hidden whitespace-nowrap">
+ <h2 className="t-16 text-fg">{title}</h2>
+ <p className="t-14 salt text-fg-2">{subtitle}</p>
+ </div>
+
+ <div className="flex items-center gap-2">
+ <Button size="sm" onClick={() => setDate(today)} aria-keyshortcuts="T">
+ Today
+ </Button>
+
+ <div className="flex h-[30px] items-center overflow-hidden rounded-lg border border-control bg-surface">
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <button
+ type="button"
+ onClick={() => step(-1)}
+ aria-label={`Previous ${unit}`}
+ className="press flex h-full w-[29px] items-center justify-center outline-none hover-fine:bg-hover focus-visible:bg-hover"
+ >
+ <Icon name="arrow-left" />
+ </button>
+ </TooltipTrigger>
+ <TooltipContent>Previous {unit}</TooltipContent>
+ </Tooltip>
+ <span className="h-full w-px bg-control" aria-hidden />
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <button
+ type="button"
+ onClick={() => step(1)}
+ aria-label={`Next ${unit}`}
+ className="press flex h-full w-[29px] items-center justify-center outline-none hover-fine:bg-hover focus-visible:bg-hover"
+ >
+ <Icon name="arrow-right" className="-scale-x-100" />
+ </button>
+ </TooltipTrigger>
+ <TooltipContent>Next {unit}</TooltipContent>
+ </Tooltip>
+ </div>
+
+ <div role="tablist" aria-label="Calendar view" className="relative flex h-[30px] w-[163px] items-center gap-0.5 overflow-hidden rounded-lg bg-app p-px">
+ <span
+ aria-hidden
+ className="absolute top-px left-0 h-7 rounded-lg border border-segment bg-surface transition-[transform,width] duration-200 ease-(--ease-out)"
+ style={{ width: active.width, transform: `translateX(${active.left}px)` }}
+ />
+ {VIEWS.map((v) => (
+ <button
+ key={v.id}
+ type="button"
+ role="tab"
+ aria-selected={view === v.id}
+ aria-keyshortcuts={v.key}
+ onClick={() => setView(v.id)}
+ style={{ width: v.width }}
+ className={cn(
+ "t-14 salt relative z-10 flex h-7 shrink-0 items-center justify-center rounded-md outline-none transition-colors duration-150 focus-visible:ring-2 focus-visible:ring-brand/40",
+ view === v.id ? "text-fg" : "text-fg-2 hover-fine:text-fg",
+ )}
+ >
+ {v.label}
+ </button>
+ ))}
+ </div>
+ </div>
+ </div>
+ );
+}
diff --git a/src/components/calendar/calendar.tsx b/src/components/calendar/calendar.tsx
new file mode 100644
index 0000000..22a816d
--- /dev/null
+++ b/src/components/calendar/calendar.tsx
@@ -0,0 +1,31 @@
+"use client";
+
+import { useMemo } from "react";
+import { isWeekend, weekDays } from "@/lib/dates";
+import { useAppStore } from "@/stores/app-store";
+import { useCalendarStore } from "@/stores/calendar-store";
+import { CalendarHeader } from "./calendar-header";
+import { EventPopover } from "./event-popover";
+import { MonthView } from "./month-view";
+import { TimeGrid } from "./time-grid";
+
+export function Calendar() {
+ const view = useCalendarStore((s) => s.view);
+ const date = useCalendarStore((s) => s.date);
+ const weekStartsOn = useAppStore((s) => s.settings.weekStartsOn);
+ const showWeekends = useAppStore((s) => s.settings.showWeekends);
+
+ const days = useMemo(() => {
+ if (view === "day") return [date];
+ const week = weekDays(date, weekStartsOn);
+ return showWeekends ? week : week.filter((d) => !isWeekend(d));
+ }, [view, date, weekStartsOn, showWeekends]);
+
+ return (
+ <section aria-label="Calendar" className="flex h-full min-w-0 flex-1 flex-col overflow-hidden bg-surface">
+ <CalendarHeader />
+ {view === "month" ? <MonthView /> : <TimeGrid key={view} days={days} />}
+ <EventPopover />
+ </section>
+ );
+}
diff --git a/src/components/calendar/event-popover.tsx b/src/components/calendar/event-popover.tsx
new file mode 100644
index 0000000..59c8edb
--- /dev/null
+++ b/src/components/calendar/event-popover.tsx
@@ -0,0 +1,166 @@
+"use client";
+
+import { useMemo } from "react";
+import { CalendarHeartIcon, CopyIcon, MapPinIcon, PencilIcon, PlaneIcon, Trash2Icon } from "lucide-react";
+import { Button } from "@/components/ui/button";
+import { Popover, PopoverAnchor, PopoverContent } from "@/components/ui/popover";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
+import { StatusBadge } from "@/components/time-off/status-badge";
+import { formatLong, formatTimeRange, formatWeekday } from "@/lib/dates";
+import { formatDuration } from "@/lib/dates";
+import { useAppStore } from "@/stores/app-store";
+import { useCalendarStore } from "@/stores/calendar-store";
+import { openOverlay } from "@/stores/overlay-store";
+
+/** Details card for an event or holiday, anchored to whatever was clicked. */
+export function EventPopover() {
+ const target = useCalendarStore((s) => s.popover);
+ const close = useCalendarStore((s) => s.closePopover);
+ const event = useAppStore((s) => (target?.kind === "event" ? s.events.find((e) => e.id === target.id) : undefined));
+ const holiday = useAppStore((s) => (target?.kind === "holiday" ? s.holidays.find((h) => h.id === target.id) : undefined));
+ const request = useAppStore((s) => (event?.requestId ? s.requests.find((r) => r.id === event.requestId) : undefined));
+ const timeFormat = useAppStore((s) => s.settings.timeFormat);
+ const deleteEvent = useAppStore((s) => s.deleteEvent);
+ const duplicateEvent = useAppStore((s) => s.duplicateEvent);
+
+ const rect = target?.rect;
+ const virtualRef = useMemo(
+ () => ({
+ current: {
+ getBoundingClientRect: () =>
+ rect ? DOMRect.fromRect(rect) : DOMRect.fromRect({ x: 0, y: 0, width: 0, height: 0 }),
+ },
+ }),
+ [rect],
+ );
+
+ const open = Boolean(target && (event || holiday));
+
+ return (
+ <Popover open={open} onOpenChange={(v) => !v && close()}>
+ <PopoverAnchor virtualRef={virtualRef} />
+ <PopoverContent
+ side="right"
+ align="start"
+ sideOffset={8}
+ collisionPadding={12}
+ className="w-[300px] gap-0 p-0"
+ onOpenAutoFocus={(e) => e.preventDefault()}
+ >
+ {event && (
+ <>
+ <div className="flex gap-3 p-4">
+ <span className="mt-0.5 size-3 shrink-0 rounded-[4px]" style={{ background: `var(--event-${event.color}-fg)` }} />
+ <div className="grid min-w-0 flex-1 gap-2">
+ <h3 className="t-16 leading-[1.25] break-words text-fg">{event.title}</h3>
+ <p className="t-14 salt text-fg-2">
+ {formatWeekday(event.date)}, {formatLong(event.date)}
+ </p>
+ <p className="t-14 salt text-fg-2">
+ {event.allDay
+ ? "All day"
+ : `${formatTimeRange(event.start, event.end, timeFormat)} · ${formatDuration(event.end - event.start)}`}
+ </p>
+ {event.location && (
+ <p className="t-14 flex items-center gap-1.5 text-fg-2">
+ <MapPinIcon className="size-3.5 text-icon" /> <span className="truncate">{event.location}</span>
+ </p>
+ )}
+ {event.note && !request && <p className="t-14 leading-[1.4] text-fg">{event.note}</p>}
+ {request && (
+ <div className="flex items-center gap-2 pt-1">
+ <StatusBadge status={request.status} />
+ <span className="t-12 truncate text-fg-2">{request.duration}</span>
+ </div>
+ )}
+ </div>
+ </div>
+ <div className="flex items-center gap-1 border-t border-hairline bg-app px-2 py-2">
+ {request ? (
+ <Button
+ size="sm"
+ onClick={() => {
+ close();
+ openOverlay({ kind: "request-details", requestId: request.id });
+ }}
+ >
+ <PlaneIcon /> View request
+ </Button>
+ ) : (
+ <Button
+ size="sm"
+ onClick={() => {
+ close();
+ openOverlay({ kind: "event", eventId: event.id });
+ }}
+ >
+ <PencilIcon /> Edit
+ </Button>
+ )}
+ <span className="flex-1" />
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Button
+ variant="ghost"
+ size="icon-sm"
+ aria-label="Duplicate"
+ onClick={() => {
+ duplicateEvent(event.id);
+ close();
+ }}
+ >
+ <CopyIcon />
+ </Button>
+ </TooltipTrigger>
+ <TooltipContent>Duplicate</TooltipContent>
+ </Tooltip>
+ {!request && (
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Button
+ variant="ghost"
+ size="icon-sm"
+ aria-label="Delete"
+ onClick={() => {
+ deleteEvent(event.id);
+ close();
+ }}
+ >
+ <Trash2Icon className="text-danger" />
+ </Button>
+ </TooltipTrigger>
+ <TooltipContent>Delete</TooltipContent>
+ </Tooltip>
+ )}
+ </div>
+ </>
+ )}
+ {holiday && (
+ <>
+ <div className="flex gap-3 p-4">
+ <span className="mt-0.5 size-3 shrink-0 rounded-[4px] bg-[var(--event-purple-fg)]" />
+ <div className="grid min-w-0 flex-1 gap-2">
+ <h3 className="t-16 text-fg">{holiday.name}</h3>
+ <p className="t-14 salt text-fg-2">
+ {formatWeekday(holiday.date)}, {formatLong(holiday.date)}
+ </p>
+ <p className="t-14 salt text-fg-2">National holiday · not counted against your allowance</p>
+ </div>
+ </div>
+ <div className="flex items-center border-t border-hairline bg-app px-2 py-2">
+ <Button
+ size="sm"
+ onClick={() => {
+ close();
+ openOverlay({ kind: "holidays" });
+ }}
+ >
+ <CalendarHeartIcon /> See holiday list
+ </Button>
+ </div>
+ </>
+ )}
+ </PopoverContent>
+ </Popover>
+ );
+}
diff --git a/src/components/calendar/layout.ts b/src/components/calendar/layout.ts
new file mode 100644
index 0000000..f85d562
--- /dev/null
+++ b/src/components/calendar/layout.ts
@@ -0,0 +1,48 @@
+import type { CalEvent } from "@/lib/types";
+
+/** One hour of the time grid, in px (matches the Figma: lines every 64px). */
+export const HOUR_HEIGHT = 64;
+export const SNAP_MINUTES = 15;
+export const MIN_EVENT_MINUTES = 15;
+
+export const minutesToPx = (m: number) => (m / 60) * HOUR_HEIGHT;
+export const pxToMinutes = (px: number) => (px / HOUR_HEIGHT) * 60;
+export const snap = (m: number, step = SNAP_MINUTES) => Math.round(m / step) * step;
+export const clamp = (n: number, min: number, max: number) => Math.min(max, Math.max(min, n));
+
+export type PositionedEvent = { event: CalEvent; column: number; columns: number };
+
+/**
+ * Lays out overlapping timed events side by side. Events are grouped into
+ * clusters of transitive overlap; each cluster is split into the fewest
+ * columns that keep events from colliding.
+ */
+export function layoutDay(events: CalEvent[]): PositionedEvent[] {
+ const sorted = [...events].sort((a, b) => a.start - b.start || b.end - a.end);
+ const out: PositionedEvent[] = [];
+ let cluster: { event: CalEvent; column: number }[] = [];
+ let clusterEnd = -1;
+ let columnEnds: number[] = [];
+
+ const flush = () => {
+ const columns = columnEnds.length;
+ for (const c of cluster) out.push({ ...c, columns });
+ cluster = [];
+ columnEnds = [];
+ };
+
+ for (const event of sorted) {
+ if (event.start >= clusterEnd && cluster.length) flush();
+ let column = columnEnds.findIndex((end) => end <= event.start);
+ if (column === -1) {
+ column = columnEnds.length;
+ columnEnds.push(event.end);
+ } else {
+ columnEnds[column] = event.end;
+ }
+ cluster.push({ event, column });
+ clusterEnd = Math.max(clusterEnd, event.end);
+ }
+ if (cluster.length) flush();
+ return out;
+}
diff --git a/src/components/calendar/month-view.tsx b/src/components/calendar/month-view.tsx
new file mode 100644
index 0000000..5e29ad8
--- /dev/null
+++ b/src/components/calendar/month-view.tsx
@@ -0,0 +1,130 @@
+"use client";
+
+import { useMemo } from "react";
+import { WEEKDAYS_SHORT, dayOfWeek, formatTime, fromKey, isWeekend, monthGrid } from "@/lib/dates";
+import { cn } from "@/lib/utils";
+import { useToday } from "@/hooks/use-today";
+import { useAppStore } from "@/stores/app-store";
+import { useCalendarStore } from "@/stores/calendar-store";
+import { openOverlay } from "@/stores/overlay-store";
+import { eventStyle } from "./event-colors";
+
+const MAX_CHIPS = 3;
+
+export function MonthView() {
+ const date = useCalendarStore((s) => s.date);
+ const setDate = useCalendarStore((s) => s.setDate);
+ const setView = useCalendarStore((s) => s.setView);
+ const openPopover = useCalendarStore((s) => s.openPopover);
+ const events = useAppStore((s) => s.events);
+ const holidays = useAppStore((s) => s.holidays);
+ const { weekStartsOn, showWeekends, timeFormat } = useAppStore((s) => s.settings);
+ const today = useToday();
+
+ const grid = useMemo(() => {
+ const all = monthGrid(date, weekStartsOn);
+ return showWeekends ? all : all.filter((d) => !isWeekend(d));
+ }, [date, weekStartsOn, showWeekends]);
+ const cols = showWeekends ? 7 : 5;
+ const month = date.slice(0, 7);
+
+ const byDay = useMemo(() => {
+ const map = new Map<string, { kind: "event" | "holiday"; id: string; label: string; color: Parameters<typeof eventStyle>[0]; sort: number }[]>();
+ for (const h of holidays) {
+ map.set(h.date, [...(map.get(h.date) ?? []), { kind: "holiday", id: h.id, label: "National holiday", color: "purple", sort: -2 }]);
+ }
+ for (const e of events) {
+ const label = e.allDay ? e.title : `${formatTime(e.start, timeFormat)} ${e.title}`;
+ map.set(e.date, [...(map.get(e.date) ?? []), { kind: "event", id: e.id, label, color: e.color, sort: e.allDay ? -1 : e.start }]);
+ }
+ for (const list of map.values()) list.sort((a, b) => a.sort - b.sort);
+ return map;
+ }, [events, holidays, timeFormat]);
+
+ const headers = grid.slice(0, cols).map((d) => WEEKDAYS_SHORT[dayOfWeek(d)]);
+
+ return (
+ <div className="flex min-h-0 flex-1 flex-col">
+ <div className="grid h-10 shrink-0 border-b border-hairline" style={{ gridTemplateColumns: `repeat(${cols}, minmax(0, 1fr))` }}>
+ {headers.map((h, i) => (
+ <div key={h} className={cn("t-14 flex items-center px-3 text-dayname", i > 0 && "border-l border-hairline")}>
+ {h}
+ </div>
+ ))}
+ </div>
+ <div
+ className="grid min-h-0 flex-1"
+ style={{ gridTemplateColumns: `repeat(${cols}, minmax(0, 1fr))`, gridTemplateRows: `repeat(6, minmax(0, 1fr))` }}
+ >
+ {grid.map((d, i) => {
+ const items = byDay.get(d) ?? [];
+ const inMonth = d.startsWith(month);
+ const selected = d === date;
+ const isToday = d === today;
+ const hidden = items.length - MAX_CHIPS;
+ return (
+ <div
+ key={d}
+ onClick={(e) => {
+ if (e.target === e.currentTarget) setDate(d);
+ }}
+ onDoubleClick={(e) => {
+ if (e.target === e.currentTarget) openOverlay({ kind: "event", date: d, start: 540, end: 600 });
+ }}
+ className={cn(
+ "flex min-h-0 flex-col gap-1 overflow-hidden border-b border-hairline p-1.5",
+ i % cols > 0 && "border-l",
+ !inMonth && "bg-app/60",
+ )}
+ >
+ <button
+ type="button"
+ onClick={() => (selected ? setView("day") : setDate(d))}
+ className={cn(
+ "t-14 flex h-6 min-w-6 shrink-0 items-center justify-center self-start rounded-lg px-1 transition-[background-color,color] duration-150 outline-none focus-visible:ring-2 focus-visible:ring-brand/50",
+ selected
+ ? "accent-badge font-semibold"
+ : isToday
+ ? "text-brand hover-fine:bg-brand-tint"
+ : inMonth
+ ? "text-fg hover-fine:bg-hover"
+ : "text-placeholder hover-fine:bg-hover",
+ )}
+ aria-label={fromKey(d).toDateString()}
+ >
+ {fromKey(d).getDate()}
+ </button>
+ {items.slice(0, MAX_CHIPS).map((it) => (
+ <button
+ key={it.id}
+ type="button"
+ onClick={(e) => openPopover(it.kind, it.id, e.currentTarget)}
+ className={cn(
+ "t-12 salt flex h-[22px] w-full shrink-0 items-center truncate rounded-md px-1.5 text-left outline-none",
+ "hover-fine:brightness-[0.97] focus-visible:ring-2 focus-visible:ring-brand/50 dark:hover-fine:brightness-110",
+ !inMonth && "opacity-60",
+ )}
+ style={eventStyle(it.color)}
+ >
+ <span className="truncate">{it.label}</span>
+ </button>
+ ))}
+ {hidden > 0 && (
+ <button
+ type="button"
+ onClick={() => {
+ setDate(d);
+ setView("day");
+ }}
+ className="t-12 self-start rounded-md px-1.5 py-1 text-fg-2 hover-fine:bg-hover hover-fine:text-fg"
+ >
+ +{hidden} more
+ </button>
+ )}
+ </div>
+ );
+ })}
+ </div>
+ </div>
+ );
+}
diff --git a/src/components/calendar/time-grid.tsx b/src/components/calendar/time-grid.tsx
new file mode 100644
index 0000000..c647ec8
--- /dev/null
+++ b/src/components/calendar/time-grid.tsx
@@ -0,0 +1,406 @@
+"use client";
+
+import { useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
+import { WEEKDAYS_SHORT, dayOfWeek, formatTime, formatTimeRange, fromKey } from "@/lib/dates";
+import { cn } from "@/lib/utils";
+import type { CalEvent } from "@/lib/types";
+import { useNow, useToday } from "@/hooks/use-today";
+import { useAppStore } from "@/stores/app-store";
+import { useCalendarStore } from "@/stores/calendar-store";
+import { openOverlay } from "@/stores/overlay-store";
+import { AllDayRow } from "./all-day-row";
+import { eventStyle } from "./event-colors";
+import {
+ clamp,
+ HOUR_HEIGHT,
+ layoutDay,
+ MIN_EVENT_MINUTES,
+ minutesToPx,
+ pxToMinutes,
+ snap,
+ SNAP_MINUTES,
+} from "./layout";
+
+const AXIS_WIDTH = 70;
+const HOURS = Array.from({ length: 23 }, (_, i) => i + 1);
+const DRAG_THRESHOLD = 4;
+
+type Drag =
+ | { type: "create"; dayIndex: number; anchor: number; current: number; moved: boolean }
+ | {
+ type: "move" | "resize";
+ eventId: string;
+ dayIndex: number;
+ start: number;
+ end: number;
+ grabOffset: number;
+ moved: boolean;
+ locked: boolean;
+ };
+
+export function DayHeaders({ days }: { days: string[] }) {
+ const selected = useCalendarStore((s) => s.date);
+ const setDate = useCalendarStore((s) => s.setDate);
+ const setView = useCalendarStore((s) => s.setView);
+ const today = useToday();
+
+ return (
+ <div className="flex h-14 w-full shrink-0 items-start overflow-hidden border-b border-hairline">
+ <div className="h-full shrink-0" style={{ width: AXIS_WIDTH }} />
+ {days.map((d) => {
+ const isSelected = d === selected;
+ const isToday = d === today;
+ return (
+ <button
+ key={d}
+ type="button"
+ onClick={() => (isSelected ? setView("day") : setDate(d))}
+ aria-label={`${fromKey(d).toDateString()}${isSelected ? ", selected — open day view" : ""}`}
+ aria-pressed={isSelected}
+ className="group flex h-full min-w-0 flex-1 items-center gap-2 overflow-hidden border-l border-hairline px-3 text-left outline-none focus-visible:bg-hover"
+ >
+ <span className="t-14 shrink-0 text-center whitespace-nowrap text-dayname">{WEEKDAYS_SHORT[dayOfWeek(d)]}</span>
+ <span
+ className={cn(
+ "t-16 flex h-6 min-w-6 shrink-0 items-center justify-center overflow-hidden rounded-lg px-1 whitespace-nowrap transition-[background-color,color] duration-150",
+ isSelected
+ ? "accent-badge font-semibold"
+ : isToday
+ ? "text-brand group-hover:bg-brand-tint"
+ : "text-fg group-hover:bg-hover",
+ )}
+ >
+ {fromKey(d).getDate()}
+ </span>
+ </button>
+ );
+ })}
+ </div>
+ );
+}
+
+export function TimeGrid({ days }: { days: string[] }) {
+ const events = useAppStore((s) => s.events);
+ const timeFormat = useAppStore((s) => s.settings.timeFormat);
+ const dayStartHour = useAppStore((s) => s.settings.dayStartHour);
+ const moveEvent = useAppStore((s) => s.moveEvent);
+ const focusEventId = useCalendarStore((s) => s.focusEventId);
+ const clearFocus = useCalendarStore((s) => s.clearFocus);
+ const openPopover = useCalendarStore((s) => s.openPopover);
+ const today = useToday();
+ const now = useNow();
+
+ const scrollRef = useRef<HTMLDivElement>(null);
+ const bodyRef = useRef<HTMLDivElement>(null);
+ const pointerStart = useRef<{ x: number; y: number; target: Element | null } | null>(null);
+ const [drag, setDrag] = useState<Drag | null>(null);
+ const [highlightId, setHighlightId] = useState<string | null>(null);
+
+ // Open on the working day, like the design (06:00 at the top edge).
+ useLayoutEffect(() => {
+ if (scrollRef.current) scrollRef.current.scrollTop = dayStartHour * HOUR_HEIGHT;
+ }, [dayStartHour]);
+
+ // Scroll a searched-for event into view and pulse it once.
+ useEffect(() => {
+ if (!focusEventId) return;
+ const ev = events.find((e) => e.id === focusEventId);
+ if (ev && !ev.allDay && scrollRef.current) {
+ scrollRef.current.scrollTo({ top: Math.max(0, minutesToPx(ev.start) - HOUR_HEIGHT), behavior: "smooth" });
+ }
+ const raf = requestAnimationFrame(() => {
+ setHighlightId(focusEventId);
+ clearFocus();
+ });
+ const t = setTimeout(() => setHighlightId(null), 1400);
+ return () => {
+ cancelAnimationFrame(raf);
+ clearTimeout(t);
+ };
+ }, [focusEventId, events, clearFocus]);
+
+ // Apply the in-flight drag as a preview so the layout reflows live.
+ const columns = useMemo(() => {
+ const preview =
+ drag && drag.type !== "create" && drag.moved && !drag.locked
+ ? { id: drag.eventId, date: days[drag.dayIndex], start: drag.start, end: drag.end }
+ : null;
+ return days.map((day) => {
+ const dayEvents = events
+ .map((e) => (preview && e.id === preview.id ? { ...e, ...preview } : e))
+ .filter((e) => !e.allDay && e.date === day);
+ return layoutDay(dayEvents);
+ });
+ }, [days, events, drag]);
+
+ function pointToSlot(clientX: number, clientY: number) {
+ const rect = bodyRef.current!.getBoundingClientRect();
+ const colWidth = rect.width / days.length;
+ return {
+ dayIndex: clamp(Math.floor((clientX - rect.left) / colWidth), 0, days.length - 1),
+ minutes: clamp(pxToMinutes(clientY - rect.top), 0, 1440),
+ };
+ }
+
+ function onPointerDown(e: React.PointerEvent<HTMLDivElement>) {
+ if (e.button !== 0) return;
+ const target = e.target as Element;
+ const eventEl = target.closest<HTMLElement>("[data-event-id]");
+ const { dayIndex, minutes } = pointToSlot(e.clientX, e.clientY);
+ pointerStart.current = { x: e.clientX, y: e.clientY, target: eventEl };
+ e.currentTarget.setPointerCapture(e.pointerId);
+
+ if (eventEl) {
+ const ev = events.find((x) => x.id === eventEl.dataset.eventId);
+ if (!ev) return;
+ const resizing = Boolean(target.closest("[data-resize]"));
+ setDrag({
+ type: resizing ? "resize" : "move",
+ eventId: ev.id,
+ dayIndex: days.indexOf(ev.date),
+ start: ev.start,
+ end: ev.end,
+ grabOffset: minutes - ev.start,
+ moved: false,
+ locked: Boolean(ev.requestId),
+ });
+ } else {
+ const m = snap(minutes - SNAP_MINUTES / 2);
+ setDrag({ type: "create", dayIndex, anchor: m, current: m, moved: false });
+ }
+ }
+
+ function onPointerMove(e: React.PointerEvent<HTMLDivElement>) {
+ if (!drag || !pointerStart.current) return;
+ const dist = Math.hypot(e.clientX - pointerStart.current.x, e.clientY - pointerStart.current.y);
+ const moved = drag.moved || dist > DRAG_THRESHOLD;
+ if (!moved) return;
+ const { dayIndex, minutes } = pointToSlot(e.clientX, e.clientY);
+
+ if (drag.type === "create") {
+ setDrag({ ...drag, moved, current: snap(minutes) });
+ } else if (drag.locked) {
+ setDrag({ ...drag, moved });
+ } else if (drag.type === "move") {
+ const length = drag.end - drag.start;
+ const start = clamp(snap(minutes - drag.grabOffset), 0, 1440 - length);
+ setDrag({ ...drag, moved, dayIndex, start, end: start + length });
+ } else {
+ const end = clamp(snap(minutes), drag.start + MIN_EVENT_MINUTES, 1440);
+ setDrag({ ...drag, moved, end });
+ }
+ }
+
+ function onPointerUp() {
+ const d = drag;
+ const start = pointerStart.current;
+ setDrag(null);
+ pointerStart.current = null;
+ if (!d) return;
+
+ if (d.type === "create") {
+ const day = days[d.dayIndex];
+ if (!d.moved) {
+ const s = clamp(Math.floor(d.anchor / 30) * 30, 0, 1380);
+ openOverlay({ kind: "event", date: day, start: s, end: s + 60 });
+ } else {
+ const s = Math.min(d.anchor, d.current);
+ const en = Math.max(d.anchor, d.current, s + MIN_EVENT_MINUTES);
+ openOverlay({ kind: "event", date: day, start: s, end: en });
+ }
+ return;
+ }
+ if (!d.moved || d.locked) {
+ if (start?.target) openPopover("event", d.eventId, start.target);
+ return;
+ }
+ const ev = events.find((x) => x.id === d.eventId);
+ const date = days[d.dayIndex];
+ if (ev && (ev.date !== date || ev.start !== d.start || ev.end !== d.end)) {
+ moveEvent(d.eventId, { date, start: d.start, end: d.end });
+ }
+ }
+
+ const nowMinutes = now ? (now - fromKey(today).getTime()) / 60000 : -1;
+ const todayIndex = days.indexOf(today);
+ const createGhost =
+ drag?.type === "create"
+ ? {
+ dayIndex: drag.dayIndex,
+ start: drag.moved ? Math.min(drag.anchor, drag.current) : clamp(Math.floor(drag.anchor / 30) * 30, 0, 1380),
+ end: drag.moved
+ ? Math.max(drag.anchor, drag.current, Math.min(drag.anchor, drag.current) + MIN_EVENT_MINUTES)
+ : clamp(Math.floor(drag.anchor / 30) * 30, 0, 1380) + 60,
+ }
+ : null;
+
+ return (
+ <>
+ <DayHeaders days={days} />
+ <AllDayRow days={days} axisWidth={AXIS_WIDTH} />
+ <div ref={scrollRef} className="relative min-h-0 w-full flex-1 overflow-y-auto [scrollbar-width:none] [&::-webkit-scrollbar]:hidden">
+ {/* Masks the line/label that sits exactly on the top edge when scrolled to an hour. */}
+ <div className="pointer-events-none sticky top-0 z-20 h-0 w-full" aria-hidden>
+ <div className="absolute top-0 left-0 h-2 bg-surface" style={{ width: AXIS_WIDTH }} />
+ <div className="absolute top-0 right-0 h-px bg-surface" style={{ left: AXIS_WIDTH }} />
+ </div>
+ <div className="relative flex w-full" style={{ height: 24 * HOUR_HEIGHT }}>
+
+ {/* Hour lines */}
+ <div className="pointer-events-none absolute inset-y-0 right-0" style={{ left: AXIS_WIDTH }} aria-hidden>
+ {HOURS.map((h) => (
+ <div key={h} className="absolute inset-x-0 h-px bg-hairline" style={{ top: h * HOUR_HEIGHT }} />
+ ))}
+ </div>
+
+ {/* Time axis */}
+ <div className="relative h-full shrink-0 select-none" style={{ width: AXIS_WIDTH }} aria-hidden>
+ {HOURS.map((h) => (
+ <span
+ key={h}
+ className="t-14 absolute right-3 whitespace-nowrap text-fg-2"
+ style={{ top: h * HOUR_HEIGHT - 7 }}
+ >
+ {formatTime(h * 60, timeFormat).replace(":00 ", " ")}
+ </span>
+ ))}
+ </div>
+
+ {/* Day columns */}
+ <div
+ ref={bodyRef}
+ className={cn("relative flex h-full min-w-0 flex-1 touch-none select-none", drag?.moved && drag.type === "move" && !drag.locked && "cursor-grabbing")}
+ onPointerDown={onPointerDown}
+ onPointerMove={onPointerMove}
+ onPointerUp={onPointerUp}
+ onPointerCancel={() => setDrag(null)}
+ >
+ {days.map((day, i) => (
+ <div
+ key={day}
+ className="relative h-full min-w-0 flex-1 border-l border-hairline"
+ aria-label={`${fromKey(day).toDateString()} schedule`}
+ role="group"
+ >
+ {columns[i].map(({ event, column, columns: count }) => (
+ <EventBlock
+ key={event.id}
+ event={event}
+ column={column}
+ count={count}
+ timeFormat={timeFormat}
+ dragging={Boolean(drag && drag.type !== "create" && drag.eventId === event.id && drag.moved && !drag.locked)}
+ highlighted={highlightId === event.id}
+ onOpen={(el) => openPopover("event", event.id, el)}
+ />
+ ))}
+
+ {createGhost?.dayIndex === i && (
+ <div
+ className="pointer-events-none absolute z-20 flex flex-col gap-0.5 overflow-hidden rounded-lg border border-dashed border-brand/60 bg-brand-tint p-2 text-brand"
+ style={{
+ top: minutesToPx(createGhost.start) + 1,
+ height: Math.max(minutesToPx(createGhost.end - createGhost.start) - 2, 14),
+ left: 2,
+ right: 3,
+ }}
+ >
+ <span className="t-12 salt">{formatTimeRange(createGhost.start, createGhost.end, timeFormat)}</span>
+ </div>
+ )}
+
+ {i === todayIndex && nowMinutes >= 0 && nowMinutes <= 1440 && (
+ <div
+ className="pointer-events-none absolute right-0 left-0 z-10 flex items-center"
+ style={{ top: minutesToPx(nowMinutes) - 4 }}
+ aria-label={`Now, ${formatTime(Math.floor(nowMinutes), timeFormat)}`}
+ >
+ <span className="-ml-1 size-2 rounded-full bg-brand" />
+ <span className="h-[1.5px] flex-1 bg-brand" />
+ </div>
+ )}
+ </div>
+ ))}
+ </div>
+ </div>
+ </div>
+ </>
+ );
+}
+
+function EventBlock({
+ event,
+ column,
+ count,
+ timeFormat,
+ dragging,
+ highlighted,
+ onOpen,
+}: {
+ event: CalEvent;
+ column: number;
+ count: number;
+ timeFormat: "24h" | "12h";
+ dragging: boolean;
+ highlighted: boolean;
+ onOpen: (el: HTMLElement) => void;
+}) {
+ const height = minutesToPx(event.end - event.start) - 2;
+ const compact = height < 44;
+ const locked = Boolean(event.requestId);
+ const time = formatTimeRange(event.start, event.end, timeFormat);
+
+ return (
+ <div
+ data-event-id={event.id}
+ role="button"
+ tabIndex={0}
+ aria-label={`${event.title}, ${time}${event.note ? `, ${event.note}` : ""}`}
+ onKeyDown={(e) => {
+ if (e.key === "Enter" || e.key === " ") {
+ e.preventDefault();
+ onOpen(e.currentTarget);
+ }
+ }}
+ className={cn(
+ "group/event absolute flex overflow-hidden rounded-lg font-medium outline-none",
+ "transition-[box-shadow,filter,opacity] duration-150 focus-visible:ring-2 focus-visible:ring-brand/60",
+ "hover-fine:brightness-[0.97] dark:hover-fine:brightness-110",
+ compact ? "items-center px-2" : "flex-col gap-0.5 p-2",
+ locked ? "cursor-pointer" : "cursor-grab",
+ dragging && "z-30 opacity-95 shadow-[0_8px_24px_-6px_rgba(15,15,15,0.28)]",
+ highlighted && "animate-[event-pulse_1.4s_var(--ease-out)]",
+ )}
+ style={{
+ ...eventStyle(event.color),
+ top: minutesToPx(event.start) + 1,
+ height: Math.max(height, 14),
+ left: `calc((100% - 5px) * ${column / count} + 2px)`,
+ width: `calc((100% - 5px) / ${count} - ${count > 1 ? 2 : 0}px)`,
+ zIndex: dragging ? 30 : 10 + column,
+ }}
+ >
+ {compact ? (
+ <p className="t-14 salt min-w-0 flex-1 truncate">
+ {event.title}
+ {height >= 28 ? null : <span className="t-12 ml-1 opacity-80">{formatTime(event.start, timeFormat)}</span>}
+ </p>
+ ) : (
+ <>
+ <p className={cn("t-14 salt w-full shrink-0 overflow-hidden break-words", height >= 60 ? "line-clamp-2" : "line-clamp-1")}>
+ {event.title}
+ </p>
+ <p className="t-12 salt w-full shrink-0 truncate">{time}</p>
+ {event.note && <p className="t-12 salt w-full shrink-0 truncate">{event.note}</p>}
+ </>
+ )}
+ {!locked && (
+ <span
+ data-resize
+ aria-hidden
+ className="absolute inset-x-0 bottom-0 h-1.5 cursor-ns-resize"
+ />
+ )}
+ </div>
+ );
+}
diff --git a/src/stores/calendar-store.ts b/src/stores/calendar-store.ts
index 8f6fdab..1872228 100644
--- a/src/stores/calendar-store.ts
+++ b/src/stores/calendar-store.ts
@@ -6,31 +6,46 @@ import { DESIGN_DATE } from "@/lib/seed";
export type CalendarView = "day" | "week" | "month";
+/** What the details popover is showing and where it's anchored. */
+export type PopoverTarget = {
+ kind: "event" | "holiday";
+ id: string;
+ rect: { x: number; y: number; width: number; height: number };
+};
+
type CalendarStore = {
view: CalendarView;
/** Focused day: drives the visible range and the accent date badge. */
date: string;
/** Asks the grid to scroll a specific event into view. */
focusEventId: string | null;
+ popover: PopoverTarget | null;
setView: (view: CalendarView) => void;
setDate: (date: string) => void;
step: (dir: 1 | -1) => void;
focusEvent: (id: string, date: string) => void;
clearFocus: () => void;
+ openPopover: (kind: PopoverTarget["kind"], id: string, el: Element) => void;
+ closePopover: () => void;
};
export const useCalendarStore = create<CalendarStore>()((set, get) => ({
view: "week",
date: DESIGN_DATE,
focusEventId: null,
- setView: (view) => set({ view }),
- setDate: (date) => set({ date }),
+ popover: null,
+ setView: (view) => set({ view, popover: null }),
+ setDate: (date) => set({ date, popover: null }),
step: (dir) => {
const { view, date } = get();
- if (view === "day") set({ date: addDays(date, dir) });
- else if (view === "week") set({ date: addDays(date, 7 * dir) });
- else set({ date: addMonths(date, dir) });
+ const next = view === "day" ? addDays(date, dir) : view === "week" ? addDays(date, 7 * dir) : addMonths(date, dir);
+ set({ date: next, popover: null });
},
focusEvent: (id, date) => set({ focusEventId: id, date }),
clearFocus: () => set({ focusEventId: null }),
+ openPopover: (kind, id, el) => {
+ const r = el.getBoundingClientRect();
+ set({ popover: { kind, id, rect: { x: r.x, y: r.y, width: r.width, height: r.height } } });
+ },
+ closePopover: () => set({ popover: null }),
}));