@riverbankcms/sdk 0.135.1 → 0.136.0

package/dist/client/{context-DljQn8L5.mjs → context-BImarOAq.mjs}

@@ -183,6 +183,10 @@ const EVENTS = {
 	registrationStatus: {
 		path: "/public/sites/{siteId}/events/registration-status",
 		method: "GET"
+	},
+	checkoutReturn: {
+		path: "/public/sites/{siteId}/events/checkout-return",
+		method: "POST"
 	}
 };
 const WHOLE_SERIES = {
@@ -779,6 +783,14 @@ function createBlockApi(config) {
 				skipDedup: true
 			});
 		},
+		async resolveEventCheckoutReturn(data) {
+			const sid = requireSiteId();
+			const path = buildPath(EVENTS.checkoutReturn.path, { siteId: sid });
+			return request(EVENTS.checkoutReturn, {
+				path,
+				body: data
+			});
+		},
 		async resolveWaitlistClaim(data) {
 			const sid = requireSiteId();
 			const path = buildPath(WHOLE_SERIES.waitlistClaimResolve.path, { siteId: sid });

package/dist/client/{eventCalendar-DU4iNLpo.mjs → eventCalendar-DS2h-UXD.mjs}

@@ -1,12 +1,12 @@
 "use client";
 import { D as clsx } from "./colorStyles-CrxJrPjJ.mjs";
-import { $ as getLocalMinuteOfDay, E as buildEventCalendarListingRender, H as formatEventTeacherLine, J as resolveEventLinkProps, K as groupEventsByDate, M as buildEventRuntimeFilters, N as getEventRuntimeFiltersKey, Q as getLocalDateKey, U as formatTime, X as getEventAvailability, Z as getEventAvailabilityStatus, st as themeButtonClassName, t as defineIslandPropsDecoder } from "./propsDecoder-mB0aC_Fi.mjs";
-import { o as EventFilters, t as useEventFilters } from "./useEventFilters-Bphkda8m.mjs";
-import { a as CalendarDayCell, c as useCalendarEvents, d as getOrderedDayNames, f as getWeekCalendarDayTuple, h as isToday, i as WeekAgendaView, l as MONTH_NAMES, m as isSameLocalDay, o as EventModalProvider, p as getWeekCalendarDays, r as EventModals, s as useEventModal, t as EventCombinedClient, u as formatDateKey } from "./EventCombined.client-BKB0ZxRR.mjs";
-import { t as BlockApiProvider } from "./context-DljQn8L5.mjs";
+import { $ as getLocalMinuteOfDay, E as buildEventCalendarListingRender, H as formatEventTeacherLine, J as resolveEventLinkProps, K as groupEventsByDate, M as buildEventRuntimeFilters, N as getEventRuntimeFiltersKey, Q as getLocalDateKey, U as formatTime, X as getEventAvailability, Z as getEventAvailabilityStatus, st as themeButtonClassName, t as defineIslandPropsDecoder } from "./propsDecoder-pzBeCh14.mjs";
+import { o as EventFilters, t as useEventFilters } from "./useEventFilters-DeeyGYuk.mjs";
+import { a as CalendarDayCell, c as useCalendarEvents, d as formatDateKey, f as getDayOfWeek, g as isToday, h as isSameCalendarDay, i as WeekAgendaView, l as MONTH_NAMES, m as getWeekCalendarDays, o as EventModalProvider, p as getOrderedDayNames, r as EventModals, s as useEventModal, t as EventCombinedClient, u as addDays } from "./EventCombined.client-BWVNlXTx.mjs";
+import { t as BlockApiProvider } from "./context-BImarOAq.mjs";
 import { t as mountReactIsland } from "./reactMount-SY8AVRof.mjs";
 import { t as buildRouteIslandApiConfig } from "./routeIslandApiConfig-UNsfPcYq.mjs";
-import { n as EventListingController } from "./EventListing.client-Dx8I21ok.mjs";
+import { n as EventListingController } from "./EventListing.client-DVFCDe3i.mjs";
 import { useEffect, useId, useMemo, useState } from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
 //#region ../calendar/src/lane-packing.ts
@@ -80,13 +80,12 @@ function buildTimetableModel$1(input) {
 	const bounds = resolveBounds(input.bounds);
 	const viewportDays = getTimetableDays(input.viewDate, input.view ?? "week", input.startOfWeek);
 	const viewportKeys = new Set(viewportDays.map(formatDateKey));
-	const now = input.now ?? /* @__PURE__ */ new Date();
 	const parsed = parseAllItems(input.items, input);
 	const inViewport = deriveVisibleSegments(parsed.drafts, viewportKeys);
 	const hourRange = resolveHourRange(inViewport, bounds);
 	const laid = layoutCellsByDate(inViewport, hourRange, bounds);
 	return {
-		days: assembleDays(viewportDays, laid.cellsByDate, now),
+		days: assembleDays(viewportDays, laid.cellsByDate, input.today),
 		hourTicks: buildHourTicks(hourRange.startHour, hourRange.endHour),
 		startHour: hourRange.startHour,
 		endHour: hourRange.endHour,
@@ -143,13 +142,13 @@ function layoutCellsByDate(segments, hourRange, bounds) {
 		diagnostics
 	};
 }
-function assembleDays(viewportDays, cellsByDate, now) {
+function assembleDays(viewportDays, cellsByDate, today) {
 	return viewportDays.map((date) => {
 		const dateKey = formatDateKey(date);
 		return {
 			date,
 			dateKey,
-			isToday: isSameLocalDay(date, now),
+			isToday: isSameCalendarDay(date, today),
 			cells: cellsByDate.get(dateKey) ?? []
 		};
 	});
@@ -301,13 +300,12 @@ function getTimetableDays(viewDate, view, startOfWeek) {
 function enumerateDateKeys(startDateKey, endDateKey) {
 	if (startDateKey > endDateKey) throw new Error(`Invalid timetable date range: ${startDateKey} is after ${endDateKey}`);
 	const start = parseDateKey(startDateKey);
-	const end = parseDateKey(endDateKey);
+	parseDateKey(endDateKey);
 	const keys = [];
-	const cursor = new Date(start.year, start.month - 1, start.day);
-	const endDate = new Date(end.year, end.month - 1, end.day);
-	while (cursor.getTime() <= endDate.getTime()) {
+	let cursor = start;
+	while (formatDateKey(cursor) <= endDateKey) {
 		keys.push(formatDateKey(cursor));
-		cursor.setDate(cursor.getDate() + 1);
+		cursor = addDays(cursor, 1);
 	}
 	return keys;
 }
@@ -322,11 +320,36 @@ function parseDateKey(dateKey) {
 	};
 }
 //#endregion
+//#region ../blocks/src/system/runtime/nodes/events/shared/CalendarNavigationChevron.tsx
+function CalendarNavigationChevron({ direction }) {
+	return /* @__PURE__ */ jsx("svg", {
+		width: "20",
+		height: "20",
+		fill: "none",
+		stroke: "currentColor",
+		strokeWidth: 2,
+		viewBox: "0 0 24 24",
+		"aria-hidden": "true",
+		children: /* @__PURE__ */ jsx("path", {
+			strokeLinecap: "round",
+			strokeLinejoin: "round",
+			d: direction === "previous" ? "M15 19l-7-7 7-7" : "M9 5l7 7-7 7"
+		})
+	});
+}
+//#endregion
 //#region ../blocks/src/system/runtime/nodes/events/shared/WeekBoardView.tsx
-function buildWeekBoardViewProps(display, days) {
+function buildWeekBoardNavigationState(viewport, today) {
+	return {
+		rangeLabel: viewport.title,
+		isCurrentWeek: viewport.days.some((day) => isToday(day, today))
+	};
+}
+function buildWeekBoardViewProps(display, days, navigation, events = display.events) {
 	return {
 		days,
-		events: [...display.events],
+		events: [...events],
+		navigation,
 		showCapacity: display.showCapacity,
 		emptyMessage: display.emptyMessage,
 		title: display.boardTitle,
@@ -335,7 +358,9 @@ function buildWeekBoardViewProps(display, days) {
 		ctaHref: display.seeAllUrl,
 		buttonVariant: display.buttonVariant,
 		elevated: display.elevated,
-		banded: display.banded
+		banded: display.banded,
+		calendarTimeZone: display.calendarTimeZone,
+		today: display.today
 	};
 }
 const SHORT_DAY_NAMES = [
@@ -399,6 +424,114 @@ const WeekBoardCard = ({ event, showCapacity }) => {
 		]
 	});
 };
+const WeekBoardNavigationControls = ({ navigation, todayClassName }) => {
+	const handlers = navigation.kind === "interactive" ? navigation : {
+		onPrevious: void 0,
+		onNext: void 0,
+		onToday: void 0
+	};
+	const isLoading = navigation.kind === "interactive" && navigation.loadState.kind === "loading";
+	return /* @__PURE__ */ jsxs("nav", {
+		className: "event-week-board-navigation",
+		"aria-label": "Choose week",
+		children: [
+			/* @__PURE__ */ jsx("button", {
+				type: "button",
+				className: "event-week-board-nav-button",
+				"aria-label": "Previous week",
+				onClick: handlers.onPrevious,
+				children: /* @__PURE__ */ jsx(CalendarNavigationChevron, { direction: "previous" })
+			}),
+			/* @__PURE__ */ jsxs("h3", {
+				className: "event-week-board-range",
+				"aria-live": "polite",
+				children: [navigation.rangeLabel, isLoading ? /* @__PURE__ */ jsx("span", {
+					className: "event-week-board-loading",
+					children: " Loading…"
+				}) : null]
+			}),
+			/* @__PURE__ */ jsx("button", {
+				type: "button",
+				className: "event-week-board-nav-button",
+				"aria-label": "Next week",
+				onClick: handlers.onNext,
+				children: /* @__PURE__ */ jsx(CalendarNavigationChevron, { direction: "next" })
+			}),
+			/* @__PURE__ */ jsx("button", {
+				type: "button",
+				className: todayClassName,
+				disabled: navigation.isCurrentWeek,
+				onClick: handlers.onToday,
+				children: "Today"
+			})
+		]
+	});
+};
+const WeekBoardLegend = () => /* @__PURE__ */ jsx("div", {
+	className: "event-week-board-legend",
+	"aria-hidden": "true",
+	children: LEGEND_ITEMS.map((item) => /* @__PURE__ */ jsxs("span", {
+		className: "event-week-board-legend-item",
+		children: [/* @__PURE__ */ jsx("i", {
+			className: "event-week-board-legend-dot",
+			"data-status": item.status
+		}), item.label]
+	}, item.status))
+});
+const WeekBoardLoadError = ({ navigation, buttonClassName }) => {
+	if (navigation.kind !== "interactive" || navigation.loadState.kind !== "error") return null;
+	return /* @__PURE__ */ jsxs("div", {
+		className: "event-week-board-error",
+		role: "status",
+		children: [/* @__PURE__ */ jsx("p", { children: "Failed to load events" }), /* @__PURE__ */ jsx("button", {
+			type: "button",
+			className: buttonClassName,
+			onClick: navigation.loadState.onRetry,
+			children: "Try again"
+		})]
+	});
+};
+const WeekBoardGrid = ({ days, eventsByDate, showCapacity, today: currentDate }) => /* @__PURE__ */ jsx("div", {
+	className: "event-week-board-grid",
+	children: days.map((date) => {
+		const dateKey = formatDateKey(date);
+		const dayEvents = eventsByDate.get(dateKey) ?? [];
+		const today = isToday(date, currentDate);
+		return /* @__PURE__ */ jsxs("div", {
+			className: clsx("event-week-board-day", dayEvents.length === 0 && "event-week-board-day--empty", today && "event-week-board-day--today"),
+			children: [/* @__PURE__ */ jsxs("div", {
+				className: "event-week-board-day-head",
+				children: [/* @__PURE__ */ jsx("span", {
+					className: "event-week-board-day-abbr",
+					children: SHORT_DAY_NAMES[getDayOfWeek(date)]
+				}), /* @__PURE__ */ jsx("span", {
+					className: "event-week-board-day-num",
+					children: date.day
+				})]
+			}), /* @__PURE__ */ jsx("div", {
+				className: "event-week-board-day-body",
+				children: dayEvents.map((event) => /* @__PURE__ */ jsx(WeekBoardCard, {
+					event,
+					showCapacity
+				}, event.occurrenceId || event.id))
+			})]
+		}, dateKey);
+	})
+});
+const WeekBoardFooter = ({ note, ctaHref, ctaLabel, ctaClassName }) => {
+	if (note === null && ctaHref === null) return null;
+	return /* @__PURE__ */ jsxs("div", {
+		className: "event-week-board-foot",
+		children: [note === null ? null : /* @__PURE__ */ jsx("p", {
+			className: "event-week-board-foot-note",
+			children: note
+		}), ctaHref === null ? null : /* @__PURE__ */ jsx("a", {
+			className: ctaClassName,
+			href: ctaHref,
+			children: ctaLabel
+		})]
+	});
+};
 /**
 * WeekBoardView
 *
@@ -407,18 +540,21 @@ const WeekBoardCard = ({ event, showCapacity }) => {
 * to a stacked list on mobile. Repurposes the week-grouped agenda data as a
 * board rather than an hour-positioned timetable grid.
 */
-const WeekBoardView = ({ days, events, showCapacity, emptyMessage = "No classes scheduled this week", title, footerNote, ctaLabel = "Reserve a place", ctaHref = null, buttonVariant = "outline", elevated = false, banded = false }) => {
-	const eventsByDate = groupEventsByDate(events);
+const WeekBoardView = ({ days, events, navigation, showCapacity, emptyMessage = "No classes scheduled this week", title, footerNote, ctaLabel = "Reserve a place", ctaHref = null, buttonVariant = "outline", elevated = false, banded = false, calendarTimeZone, today }) => {
+	const eventsByDate = groupEventsByDate(events, calendarTimeZone);
 	const hasAnyEvents = days.some((date) => (eventsByDate.get(formatDateKey(date)) ?? []).length > 0);
 	const ctaClassName = themeButtonClassName({
 		variant: buttonVariant,
 		size: "sm"
 	});
+	const todayClassName = themeButtonClassName({
+		variant: buttonVariant,
+		size: "sm"
+	});
 	const hasTitle = typeof title === "string" && title.length > 0;
 	const hasFooterNote = typeof footerNote === "string" && footerNote.length > 0;
-	const hasCta = typeof ctaHref === "string" && ctaHref.length > 0;
 	const footerNoteText = hasAnyEvents ? hasFooterNote ? footerNote : null : emptyMessage;
-	const showFooter = hasCta || footerNoteText !== null;
+	const resolvedCtaHref = typeof ctaHref === "string" && ctaHref.length > 0 ? ctaHref : null;
 	return /* @__PURE__ */ jsx("div", {
 		className: "event-calendar event-calendar--week-board",
 		"data-block": "event-calendar",
@@ -430,59 +566,34 @@ const WeekBoardView = ({ days, events, showCapacity, emptyMessage = "No classes
 			children: [
 				/* @__PURE__ */ jsxs("div", {
 					className: "event-week-board-top",
-					children: [hasTitle ? /* @__PURE__ */ jsx("span", {
-						className: "event-week-board-title",
-						children: title
-					}) : null, /* @__PURE__ */ jsx("div", {
-						className: "event-week-board-legend",
-						"aria-hidden": "true",
-						children: LEGEND_ITEMS.map((item) => /* @__PURE__ */ jsxs("span", {
-							className: "event-week-board-legend-item",
-							children: [/* @__PURE__ */ jsx("i", {
-								className: "event-week-board-legend-dot",
-								"data-status": item.status
-							}), item.label]
-						}, item.status))
-					})]
+					children: [
+						hasTitle ? /* @__PURE__ */ jsx("span", {
+							className: "event-week-board-title",
+							children: title
+						}) : null,
+						/* @__PURE__ */ jsx(WeekBoardNavigationControls, {
+							navigation,
+							todayClassName
+						}),
+						/* @__PURE__ */ jsx(WeekBoardLegend, {})
+					]
 				}),
-				/* @__PURE__ */ jsx("div", {
-					className: "event-week-board-grid",
-					children: days.map((date) => {
-						const dateKey = formatDateKey(date);
-						const dayEvents = eventsByDate.get(dateKey) ?? [];
-						const today = isToday(date);
-						return /* @__PURE__ */ jsxs("div", {
-							className: clsx("event-week-board-day", dayEvents.length === 0 && "event-week-board-day--empty", today && "event-week-board-day--today"),
-							children: [/* @__PURE__ */ jsxs("div", {
-								className: "event-week-board-day-head",
-								children: [/* @__PURE__ */ jsx("span", {
-									className: "event-week-board-day-abbr",
-									children: SHORT_DAY_NAMES[date.getDay()]
-								}), /* @__PURE__ */ jsx("span", {
-									className: "event-week-board-day-num",
-									children: date.getDate()
-								})]
-							}), /* @__PURE__ */ jsx("div", {
-								className: "event-week-board-day-body",
-								children: dayEvents.map((event) => /* @__PURE__ */ jsx(WeekBoardCard, {
-									event,
-									showCapacity
-								}, event.occurrenceId || event.id))
-							})]
-						}, dateKey);
-					})
+				/* @__PURE__ */ jsx(WeekBoardLoadError, {
+					navigation,
+					buttonClassName: todayClassName
+				}),
+				/* @__PURE__ */ jsx(WeekBoardGrid, {
+					days,
+					eventsByDate,
+					showCapacity,
+					today
 				}),
-				showFooter ? /* @__PURE__ */ jsxs("div", {
-					className: "event-week-board-foot",
-					children: [footerNoteText !== null ? /* @__PURE__ */ jsx("p", {
-						className: "event-week-board-foot-note",
-						children: footerNoteText
-					}) : null, hasCta ? /* @__PURE__ */ jsx("a", {
-						className: ctaClassName,
-						href: ctaHref ?? void 0,
-						children: ctaLabel
-					}) : null]
-				}) : null
+				/* @__PURE__ */ jsx(WeekBoardFooter, {
+					note: footerNoteText,
+					ctaHref: resolvedCtaHref,
+					ctaLabel,
+					ctaClassName
+				})
 			]
 		})
 	});
@@ -513,6 +624,7 @@ function buildTimetableModel(input) {
 		items: input.events,
 		viewDate: input.viewDate,
 		startOfWeek: input.startOfWeek,
+		today: input.today,
 		getId: (event) => event.id,
 		getStartsAt: (event) => event.startsAt,
 		getEndsAt: (event) => event.endsAt,
@@ -574,22 +686,24 @@ function formatEventTimeRange(event) {
 	return `${formatTime(event.startsAt, { timeZone })} - ${formatTime(event.endsAt, { timeZone })}`;
 }
 function formatDayLabel(date) {
-	return `${FULL_DAY_NAMES[date.getDay()] ?? ""}, ${MONTH_NAMES[date.getMonth()] ?? ""} ${date.getDate()}`;
+	return `${FULL_DAY_NAMES[getDayOfWeek(date)] ?? ""}, ${MONTH_NAMES[date.month - 1] ?? ""} ${date.day}`;
 }
 function formatShortDayLabel(date) {
-	return `${(FULL_DAY_NAMES[date.getDay()] ?? "").slice(0, 3)} ${date.getDate()}`;
+	return `${(FULL_DAY_NAMES[getDayOfWeek(date)] ?? "").slice(0, 3)} ${date.day}`;
 }
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/events/shared/WeekTimetableView.tsx
-const WeekTimetableView = ({ viewDate, events, startOfWeek, showCapacity, emptyMessage = "No classes scheduled" }) => {
+const WeekTimetableView = ({ viewDate, events, startOfWeek, today, showCapacity, emptyMessage = "No classes scheduled" }) => {
 	const { openEventModal } = useEventModal();
 	const model = useMemo(() => buildTimetableModel({
 		events,
 		viewDate,
-		startOfWeek
+		startOfWeek,
+		today
 	}), [
 		events,
 		startOfWeek,
+		today,
 		viewDate
 	]);
 	const [selectedDayKey, setSelectedDayKey] = useState(() => model.days.find((day) => day.isToday)?.dateKey ?? model.days[0]?.dateKey ?? "");
@@ -748,37 +862,75 @@ const EventCalendarClient = ({ render }) => {
 		buttonVariant: display.buttonVariant,
 		buttonText: display.buttonText,
 		emptyMessage: display.emptyMessage,
-		className: display.className ?? void 0
+		className: display.className ?? void 0,
+		calendarContext: hydration.calendarContext
 	});
 	if (display.displayMode === "list") return /* @__PURE__ */ jsx(EventListingController, { render: buildEventCalendarListingRender(render) });
 	if (display.displayMode === "timetable") return /* @__PURE__ */ jsx(EventCalendarTimetableClient, { render });
-	if (display.displayMode === "week-board") return /* @__PURE__ */ jsx(EventCalendarWeekBoardClient, { display });
+	if (display.displayMode === "week-board") return /* @__PURE__ */ jsx(EventCalendarWeekBoardClient, { render });
 	return /* @__PURE__ */ jsx(EventCalendarGridClient, { render });
 };
-const EventCalendarWeekBoardClient = ({ display }) => {
-	return /* @__PURE__ */ jsx(WeekBoardView, { ...buildWeekBoardViewProps(display, useMemo(() => getWeekCalendarDayTuple(/* @__PURE__ */ new Date(), display.startOfWeek), [display.startOfWeek])) });
+const EventCalendarWeekBoardClient = ({ render }) => {
+	const { display, hydration } = render;
+	const filters = useMemo(() => buildDisplayFilterParams(display), [
+		display.eventSurface,
+		display.filterCategoryIds,
+		display.filterEventPresets,
+		display.filterStaffMemberId,
+		display.filterVenueId,
+		display.scheduleScope
+	]);
+	const initialEvents = usePrefetchedCalendarEvents(display, filters);
+	const { events, viewport, loadState, goToPrevious, goToNext, goToToday, retryCurrentView } = useCalendarEvents({
+		siteId: hydration.siteId,
+		initialEvents,
+		view: "week",
+		startOfWeek: display.startOfWeek,
+		preloadMonths: 1,
+		filters,
+		stage: hydration.stage,
+		calendarContext: hydration.calendarContext
+	});
+	const weekBoardLoadState = loadState.kind === "error" ? {
+		kind: "error",
+		onRetry: retryCurrentView
+	} : loadState;
+	const navigation = {
+		kind: "interactive",
+		...buildWeekBoardNavigationState(viewport, hydration.calendarContext.initialToday),
+		loadState: weekBoardLoadState,
+		onPrevious: goToPrevious,
+		onNext: goToNext,
+		onToday: goToToday
+	};
+	return /* @__PURE__ */ jsx(WeekBoardView, { ...buildWeekBoardViewProps({
+		...display,
+		calendarTimeZone: hydration.calendarContext.timeZone,
+		today: hydration.calendarContext.initialToday
+	}, viewport.days, navigation, events) });
 };
 const EventCalendarTimetableClient = ({ render }) => {
 	const { display, hydration } = render;
 	const { filtersNode, listFilters } = useEventCalendarFilterState(display);
 	const calendarInitialEvents = usePrefetchedCalendarEvents(display, listFilters);
-	const { events, viewDate, viewport, loading, error, goToPrevious, goToNext, goToToday } = useCalendarEvents({
+	const { events, viewDate, viewport, loadState, retryCurrentView, goToPrevious, goToNext, goToToday } = useCalendarEvents({
 		siteId: hydration.siteId,
 		initialEvents: calendarInitialEvents,
 		view: "week",
 		startOfWeek: display.startOfWeek,
 		preloadMonths: 1,
 		filters: listFilters,
-		stage: hydration.stage
+		stage: hydration.stage,
+		calendarContext: hydration.calendarContext
 	});
 	return /* @__PURE__ */ jsxs(EventModalProvider, { children: [/* @__PURE__ */ jsx(EventCalendarChrome, {
 		display,
 		calendarView: "week",
 		className: "event-calendar--timetable",
-		error,
+		loadState,
 		filters: filtersNode,
 		headerTitle: viewport.title,
-		loading,
+		onRetry: retryCurrentView,
 		onNext: goToNext,
 		onPrevious: goToPrevious,
 		onToday: goToToday,
@@ -787,7 +939,8 @@ const EventCalendarTimetableClient = ({ render }) => {
 			events,
 			startOfWeek: display.startOfWeek,
 			emptyMessage: display.emptyMessage,
-			showCapacity: display.showCapacity
+			showCapacity: display.showCapacity,
+			today: hydration.calendarContext.initialToday
 		})
 	}), /* @__PURE__ */ jsx(EventModals, {
 		cardRole: display.cardRole,
@@ -801,24 +954,25 @@ const EventCalendarGridClient = ({ render }) => {
 	const calendarView = display.defaultCalendarView;
 	const { filtersNode, listFilters } = useEventCalendarFilterState(display);
 	const calendarInitialEvents = usePrefetchedCalendarEvents(display, listFilters);
-	const { events, viewDate, viewport, loading, error, goToPrevious, goToNext, goToToday } = useCalendarEvents({
+	const { events, viewDate, viewport, loadState, retryCurrentView, goToPrevious, goToNext, goToToday } = useCalendarEvents({
 		siteId: hydration.siteId,
 		initialEvents: calendarInitialEvents,
 		view: calendarView,
 		startOfWeek: display.startOfWeek,
 		preloadMonths: 1,
 		filters: listFilters,
-		stage: hydration.stage
+		stage: hydration.stage,
+		calendarContext: hydration.calendarContext
 	});
-	const eventsByDate = useMemo(() => groupEventsByDate(events), [events]);
+	const eventsByDate = useMemo(() => groupEventsByDate(events, hydration.calendarContext.timeZone), [events, hydration.calendarContext.timeZone]);
 	const dayNames = useMemo(() => getOrderedDayNames(display.startOfWeek), [display.startOfWeek]);
 	return /* @__PURE__ */ jsxs(EventModalProvider, { children: [/* @__PURE__ */ jsxs(EventCalendarChrome, {
 		display,
 		calendarView,
-		error,
+		loadState,
 		filters: filtersNode,
 		headerTitle: viewport.title,
-		loading,
+		onRetry: retryCurrentView,
 		onNext: goToNext,
 		onPrevious: goToPrevious,
 		onToday: goToToday,
@@ -826,7 +980,9 @@ const EventCalendarGridClient = ({ render }) => {
 			days: viewport.days,
 			events,
 			emptyMessage: display.emptyMessage,
-			showCapacity: display.showCapacity
+			showCapacity: display.showCapacity,
+			calendarTimeZone: hydration.calendarContext.timeZone,
+			today: hydration.calendarContext.initialToday
 		}) : /* @__PURE__ */ jsxs("div", {
 			className: "event-calendar-container",
 			children: [/* @__PURE__ */ jsx("div", {
@@ -842,11 +998,12 @@ const EventCalendarGridClient = ({ render }) => {
 					return /* @__PURE__ */ jsx(CalendarDayCell, {
 						date,
 						events: eventsByDate.get(dateKey) || [],
-						isCurrentMonth: date.getMonth() === viewDate.getMonth()
+						isCurrentMonth: date.month === viewDate.month,
+						today: hydration.calendarContext.initialToday
 					}, dateKey);
 				})
 			})]
-		}), viewport.kind === "month" && events.length === 0 && !loading && !error ? /* @__PURE__ */ jsx("p", {
+		}), viewport.kind === "month" && events.length === 0 && loadState.kind === "idle" ? /* @__PURE__ */ jsx("p", {
 			className: "event-calendar-empty",
 			children: display.emptyMessage
 		}) : null]
@@ -918,7 +1075,7 @@ function buildDisplayFilterParams(display) {
 		filterVenueId: display.filterVenueId
 	});
 }
-const EventCalendarChrome = ({ children, display, calendarView, className, error, filters, headerTitle, loading, onNext, onPrevious, onToday }) => /* @__PURE__ */ jsxs("div", {
+const EventCalendarChrome = ({ children, display, calendarView, className, loadState, filters, headerTitle, onRetry, onNext, onPrevious, onToday }) => /* @__PURE__ */ jsxs("div", {
 	className: [
 		"event-calendar",
 		className,
@@ -937,11 +1094,11 @@ const EventCalendarChrome = ({ children, display, calendarView, className, error
 						onClick: onPrevious,
 						className: "event-calendar-nav-btn",
 						"aria-label": calendarView === "week" ? "Previous week" : "Previous month",
-						children: /* @__PURE__ */ jsx(CalendarChevron, { direction: "previous" })
+						children: /* @__PURE__ */ jsx(CalendarNavigationChevron, { direction: "previous" })
 					}),
 					/* @__PURE__ */ jsxs("h3", {
 						className: "event-calendar-title",
-						children: [headerTitle, loading ? /* @__PURE__ */ jsx("span", {
+						children: [headerTitle, loadState.kind === "loading" ? /* @__PURE__ */ jsx("span", {
 							className: "rb-ml-2 rb-caption status-muted",
 							children: "(loading...)"
 						}) : null]
@@ -951,7 +1108,7 @@ const EventCalendarChrome = ({ children, display, calendarView, className, error
 						onClick: onNext,
 						className: "event-calendar-nav-btn",
 						"aria-label": calendarView === "week" ? "Next week" : "Next month",
-						children: /* @__PURE__ */ jsx(CalendarChevron, { direction: "next" })
+						children: /* @__PURE__ */ jsx(CalendarNavigationChevron, { direction: "next" })
 					})
 				]
 			}), /* @__PURE__ */ jsx("button", {
@@ -965,14 +1122,14 @@ const EventCalendarChrome = ({ children, display, calendarView, className, error
 			})]
 		}),
 		children,
-		error ? /* @__PURE__ */ jsxs("div", {
+		loadState.kind === "error" ? /* @__PURE__ */ jsxs("div", {
 			className: "rb-mt-4 rb-text-center",
 			children: [/* @__PURE__ */ jsx("p", {
 				className: "status-error rb-caption rb-mb-2",
 				children: "Failed to load events"
 			}), /* @__PURE__ */ jsx("button", {
 				type: "button",
-				onClick: onToday,
+				onClick: onRetry,
 				className: themeButtonClassName({
 					variant: display.buttonVariant,
 					size: "sm"
@@ -982,21 +1139,6 @@ const EventCalendarChrome = ({ children, display, calendarView, className, error
 		}) : null
 	]
 });
-function CalendarChevron({ direction }) {
-	return /* @__PURE__ */ jsx("svg", {
-		width: "20",
-		height: "20",
-		fill: "none",
-		stroke: "currentColor",
-		strokeWidth: 2,
-		viewBox: "0 0 24 24",
-		children: /* @__PURE__ */ jsx("path", {
-			strokeLinecap: "round",
-			strokeLinejoin: "round",
-			d: direction === "previous" ? "M15 19l-7-7 7-7" : "M9 5l7 7-7 7"
-		})
-	});
-}
 //#endregion
 //#region src/rendering/islands/enhancers/eventCalendar.tsx
 const decode = defineIslandPropsDecoder("event-calendar");

package/dist/client/{eventCombined-CZuupW8m.mjs → eventCombined-Drt4Oq9p.mjs}

@@ -1,6 +1,6 @@
-import { t as defineIslandPropsDecoder } from "./propsDecoder-mB0aC_Fi.mjs";
-import { n as EventCombinedIslandClient } from "./EventCombined.client-BKB0ZxRR.mjs";
-import { t as BlockApiProvider } from "./context-DljQn8L5.mjs";
+import { t as defineIslandPropsDecoder } from "./propsDecoder-pzBeCh14.mjs";
+import { n as EventCombinedIslandClient } from "./EventCombined.client-BWVNlXTx.mjs";
+import { t as BlockApiProvider } from "./context-BImarOAq.mjs";
 import { t as mountReactIsland } from "./reactMount-SY8AVRof.mjs";
 import { t as buildRouteIslandApiConfig } from "./routeIslandApiConfig-UNsfPcYq.mjs";
 import "react";

package/dist/client/{eventDetails-DPQWwCIi.mjs → eventDetails-Bl2vWgTX.mjs}

@@ -1,6 +1,6 @@
-import { $t as formatCurrencyAmount, B as formatEventPrice, J as resolveEventLinkProps, Jt as publicEventPricingCurrency, Kt as toBookingTimeZone, O as resolveEventRegistrationScopedEvents, Ut as getBookingLocalDateKey, Xt as publicEventPricingType, Y as resolveRuntimeEventPricing, et as formatWholeSeriesPriceAmount, nt as resolveWholeSeriesPricingState, qt as toScheduledBookingDateTime, t as defineIslandPropsDecoder, tt as formatWholeSeriesPriceDisplay, z as formatEventDateParts } from "./propsDecoder-mB0aC_Fi.mjs";
+import { B as formatEventPrice, J as resolveEventLinkProps, Jt as toBookingTimeZone, O as resolveEventRegistrationScopedEvents, Qt as publicEventPricingType, Wt as getBookingLocalDateKey, Xt as publicEventPricingCurrency, Y as resolveRuntimeEventPricing, Yt as toScheduledBookingDateTime, et as formatWholeSeriesPriceAmount, nt as resolveWholeSeriesPricingState, t as defineIslandPropsDecoder, tn as formatCurrencyAmount, tt as formatWholeSeriesPriceDisplay, z as formatEventDateParts } from "./propsDecoder-pzBeCh14.mjs";
 import { t as mountReactIsland } from "./reactMount-SY8AVRof.mjs";
-import { t as LeafletStaticMap } from "./LeafletStaticMap-CEWx-Bhe.mjs";
+import { t as LeafletStaticMap } from "./LeafletStaticMap-BY5mIHw9.mjs";
 import "react";
 import { jsx, jsxs } from "react/jsx-runtime";
 //#region ../blocks/src/system/runtime/nodes/events/shared/eventProductEligibility.ts
@@ -130,7 +130,8 @@ function isOrdinaryEvent(event) {
 function deriveWholeSeriesPhase(sessions, nowIso) {
 	const now = Date.parse(nowIso);
 	if (now < Date.parse(sessions[0].startsAt)) return "upcoming";
-	return now <= Date.parse(sessions.at(-1)?.endsAt ?? sessions[0].endsAt) ? "inProgress" : "completed";
+	const finalSession = sessions[sessions.length - 1] ?? sessions[0];
+	return now <= Date.parse(finalSession.endsAt) ? "inProgress" : "completed";
 }
 function selectRelatedDates(input) {
 	if (!input.seriesId) return [];