@riverbankcms/sdk 0.135.1 → 0.136.0

package/dist/client/rendering/client.mjs

@@ -211,6 +211,10 @@ var init_endpoints = __esmMin((() => {
 		registrationStatus: {
 			path: "/public/sites/{siteId}/events/registration-status",
 			method: "GET"
+		},
+		checkoutReturn: {
+			path: "/public/sites/{siteId}/events/checkout-return",
+			method: "POST"
 		}
 	};
 	WHOLE_SERIES = {
@@ -792,6 +796,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 });
@@ -3732,7 +3744,7 @@ var init_boxBackgroundSchema = __esmMin((() => {
 			showVideoOnMobile: z.boolean().nullable().optional()
 		})
 	]);
-})), axesSchema, typographyStyleSchema, bodyTypographyStyleSchema, headingSizeSchema, headingTypographyOverridesSchema, headingTypographyStyleSchema, proseLinkUnderlineStyleSchema, proseLinkUnderlineThicknessSchema, proseLinkUnderlineOffsetSchema, proseLinkStyleSchema, semanticSpacingSchema, boxRoundedSchema, noHeadingDecorationSchema, visibleHeadingDecorationSchema, headingDecorationSchema, headingDecorationOverrideSchema, accordionIconTreatmentSchema, sectionStylesOverrideSchema, containerStylesOverrideSchema, cardBorderOverrideSchema, cardStylesOverrideSchema, blockStyleOverridesSchema, blockThemeOverrideSchema, typographyScaleSchema, eyebrowTypographyStyleSchema, typographySchema, spaceSchema, corners, shadow, border, motion, inputStyle$1, headerPositioning, headerNavStyle, navFontWeight, headerMaxWidth, headerBarFrame, headerBorderSchema, logoStyleSchema, headerLogoTextSchema, navEffectsSchema, dropdownStyleSchema, headerCtaGapSchema, headerCtaTreatmentSchema, navContainerSchema, headerBackgroundSchema, headerSchema, footerVariant, footerMaxWidth, footerMode, footerNavLayoutMode, footerNavLayoutAlign, footerSpacing, footerLogoPlacement, footerLogoSize, footerLogoMaxHeight, footerBottomTextLinkStyleSchema, footerBottomBarSchema, footerNavLayoutSchema, footerLogoSchema, footerSchema, containerPaddingPresetSchema, layoutSchema, heroTypographySizeSchema, heroTypographyLineHeightSchema, heroResponsiveTypographySchema, heroTypographySchema, heroSchema, bodyTextIntroTypographySizeSchema, bodyTextSchema, gradientsSchema, testimonialQuoteTreatmentSchema, themeSchema;
+})), axesSchema, typographyStyleSchema, bodyTypographyStyleSchema, headingSizeSchema, headingTypographyOverridesSchema, headingTypographyStyleSchema, proseLinkUnderlineStyleSchema, proseLinkUnderlineThicknessSchema, proseLinkUnderlineOffsetSchema, proseLinkStyleSchema, semanticSpacingSchema, boxRoundedSchema, noHeadingDecorationSchema, visibleHeadingDecorationSchema, headingDecorationSchema, headingDecorationOverrideSchema, accordionIconTreatmentSchema, sectionStylesOverrideSchema, containerStylesOverrideSchema, cardBorderOverrideSchema, cardStylesOverrideSchema, blockStyleOverridesSchema, blockThemeOverrideSchema, typographyScaleSchema, eyebrowTypographyStyleSchema, typographySchema, spaceSchema, corners, shadow, border, motion, inputStyle$1, headerPositioning, headerNavStyle, navFontWeight, headerMaxWidth, headerBorderSchema, logoStyleSchema, headerLogoTextSchema, dropdownStyleSchema, headerCtaGapSchema, headerCtaTreatmentSchema, navContainerSchema, headerBackgroundSchema, headerSchema, footerVariant, footerMaxWidth, footerMode, footerNavLayoutMode, footerNavLayoutAlign, footerSpacing, footerLogoPlacement, footerLogoSize, footerLogoMaxHeight, footerBottomTextLinkStyleSchema, footerBottomBarSchema, footerNavLayoutSchema, footerLogoSchema, footerSchema, containerPaddingPresetSchema, layoutSchema, heroTypographySizeSchema, heroTypographyLineHeightSchema, heroResponsiveTypographySchema, heroTypographySchema, heroSchema, bodyTextIntroTypographySizeSchema, bodyTextSchema, gradientsSchema, testimonialQuoteTreatmentSchema, themeSchema;
 var init_schema$2 = __esmMin((() => {
 	init_media$2();
 	init_schema$3();
@@ -4086,7 +4098,6 @@ var init_schema$2 = __esmMin((() => {
 		"bold"
 	]);
 	headerMaxWidth = z.enum(["container", "full"]);
-	headerBarFrame = z.enum(["full-bleed", "inset-shell"]);
 	headerBorderSchema = componentBorderSchema.extend({ position: z.enum([
 		"bottom",
 		"top",
@@ -4115,12 +4126,6 @@ var init_schema$2 = __esmMin((() => {
 		]).optional(),
 		hideOnShrink: z.boolean().optional()
 	}).optional();
-	navEffectsSchema = z.object({
-		underlineGradient: z.boolean().default(false),
-		glow: z.boolean().default(false),
-		glowColor: z.string().optional(),
-		neumorphic: z.boolean().default(false)
-	}).optional();
 	dropdownStyleSchema = z.object({
 		background: themeColorTokenSchema.default("surface"),
 		textColor: themeColorTokenSchema.default("text"),
@@ -4208,9 +4213,7 @@ var init_schema$2 = __esmMin((() => {
 		positioning: headerPositioning,
 		shrinkOnScroll: z.boolean(),
 		maxWidth: headerMaxWidth,
-		barFrame: headerBarFrame.optional(),
 		scrollTreatment: headerScrollTreatmentSchema,
-		logoOverride: mediaSchema.nullable().optional(),
 		background: headerBackgroundSchema.default({
 			type: "color",
 			color: "surface"
@@ -4222,13 +4225,11 @@ var init_schema$2 = __esmMin((() => {
 		navFontRole: z.enum(["body", "heading"]).optional(),
 		navTextSize: navLinkStyleSchema.shape.textSize,
 		interactionPalette: headerInteractionPaletteSchema.optional(),
-		navPlacement: z.enum(["end", "center"]).optional(),
 		container: headerContainerSchema,
 		border: headerBorderSchema,
 		shadow: componentShadowSchema.optional(),
 		logo: logoStyleSchema,
 		logoText: headerLogoTextSchema,
-		navEffects: navEffectsSchema,
 		navContainer: navContainerSchema,
 		navLinkStyle: navLinkStyleSchema.optional(),
 		ctaGap: headerCtaGapSchema.optional(),
@@ -7248,6 +7249,9 @@ function formatBookingDateParts(input, options) {
 function getBookingLocalDateKey(input) {
 	return formatDateKey$1(getLocalScheduleDate(new Date(input.startsAt), input.timeZone));
 }
+function compareLocalScheduleDates(left, right) {
+	return Date.UTC(left.year, left.month - 1, left.day) - Date.UTC(right.year, right.month - 1, right.day);
+}
 function parseBookingLocalDate(value) {
 	const match = LOCAL_DATE_PATTERN.exec(value.trim());
 	if (match === null || match.groups === void 0) throw new Error(`Invalid booking date format: "${value}" (expected YYYY-MM-DD)`);
@@ -7262,6 +7266,53 @@ function parseBookingLocalDate(value) {
 		day
 	};
 }
+function parseBookingUtcDateWindow(input) {
+	const timeZone = resolveBookingTimeZoneId(input.timeZone);
+	let startLocalDate;
+	try {
+		startLocalDate = parseBookingLocalDate(input.startDate);
+	} catch {
+		return {
+			ok: false,
+			field: "startDate",
+			reason: "invalid_date_format",
+			value: input.startDate
+		};
+	}
+	let endLocalDate;
+	try {
+		endLocalDate = parseBookingLocalDate(input.endDate);
+	} catch {
+		return {
+			ok: false,
+			field: "endDate",
+			reason: "invalid_date_format",
+			value: input.endDate
+		};
+	}
+	if (compareLocalScheduleDates(startLocalDate, endLocalDate) > 0) return {
+		ok: false,
+		field: "endDate",
+		reason: "invalid_date_range",
+		value: input.endDate
+	};
+	return {
+		ok: true,
+		value: {
+			timeZone,
+			startLocalDate,
+			endLocalDate,
+			startAt: localScheduleDateTimeToUtcDate(startLocalDate, START_OF_DAY, timeZone),
+			endExclusive: localScheduleDateTimeToUtcDate(addLocalScheduleDays(endLocalDate, 1), START_OF_DAY, timeZone)
+		}
+	};
+}
+function buildBookingUtcDateWindow(input) {
+	const result = parseBookingUtcDateWindow(input);
+	if (result.ok) return result.value;
+	if (result.reason === "invalid_date_range") throw new Error(`Invalid booking date range: startDate "${input.startDate}" must be on or before endDate "${input.endDate}"`);
+	throw new Error(`Invalid booking date format: "${result.value}" (expected YYYY-MM-DD)`);
+}
 function getLocalScheduleDate(date, timeZone) {
 	const parts = getZonedDateTimeParts(date, getSafeTimeZone(timeZone));
 	return {
@@ -7281,7 +7332,23 @@ function addLocalScheduleDays(date, days) {
 		day: utcDate.getUTCDate()
 	};
 }
-var DEFAULT_LOCALE, FALLBACK_TIMEZONE, DEFAULT_BOOKING_DATE_TIME_FORMAT, LOCAL_DATE_PATTERN, DATE_TIME_FORMATTER_CACHE_LIMIT, dateTimeFormatterCache;
+function localScheduleDateTimeToUtcDate(localDate, localTime, timeZone) {
+	const resolvedTimeZone = getSafeTimeZone(timeZone);
+	const targetLocalMs = Date.UTC(localDate.year, localDate.month - 1, localDate.day, localTime.hour, localTime.minute, localTime.second, 0);
+	let guess = targetLocalMs;
+	const seenGuesses = /* @__PURE__ */ new Set();
+	for (let iteration = 0; iteration < 4; iteration += 1) {
+		seenGuesses.add(guess);
+		const actual = getZonedDateTimeParts(new Date(guess), resolvedTimeZone);
+		const diff = Date.UTC(actual.year, actual.month - 1, actual.day, actual.hour, actual.minute, actual.second, 0) - targetLocalMs;
+		if (diff === 0) return new Date(guess);
+		const nextGuess = guess - diff;
+		if (seenGuesses.has(nextGuess)) return new Date(Math.max(guess, nextGuess));
+		guess = nextGuess;
+	}
+	return new Date(guess);
+}
+var DEFAULT_LOCALE, FALLBACK_TIMEZONE, DEFAULT_BOOKING_DATE_TIME_FORMAT, START_OF_DAY, LOCAL_DATE_PATTERN, DATE_TIME_FORMATTER_CACHE_LIMIT, dateTimeFormatterCache;
 var init_booking_date_time = __esmMin((() => {
 	init_result$1();
 	init_booking_time_zone();
@@ -7294,6 +7361,11 @@ var init_booking_date_time = __esmMin((() => {
 		hour: "numeric",
 		minute: "2-digit"
 	};
+	START_OF_DAY = {
+		hour: 0,
+		minute: 0,
+		second: 0
+	};
 	LOCAL_DATE_PATTERN = /^(?<year>\d{4})-(?<month>\d{2})-(?<day>\d{2})$/u;
 	DATE_TIME_FORMATTER_CACHE_LIMIT = 100;
 	dateTimeFormatterCache = /* @__PURE__ */ new Map();
@@ -7441,8 +7513,7 @@ var init_csv_render = __esmMin((() => {
 	init_csv_escape();
 	init_csv_filename();
 }));
-var init_csv_types = __esmMin((() => {}));
-var init_email_format = __esmMin((() => {}));
+var init_csv_types = __esmMin((() => {})), init_email_format = __esmMin((() => {}));
 var init_slug = __esmMin((() => {}));
 var init_uuid = __esmMin((() => {}));
 function sortStableJsonValue(value) {
@@ -14179,7 +14250,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 [];
@@ -14749,111 +14821,73 @@ var init_pricing = __esmMin((() => {
 }));
 //#endregion
 //#region ../calendar/src/grid.ts
-/** Format a date as YYYY-MM-DD using the runtime's local timezone. */
 function formatDateKey(date) {
-	return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, "0")}-${String(date.getDate()).padStart(2, "0")}`;
+	return `${String(date.year).padStart(4, "0")}-${String(date.month).padStart(2, "0")}-${String(date.day).padStart(2, "0")}`;
 }
-/**
-* True when `date` and `now` are the same local calendar day.
-* `now` defaults to `new Date()` so casual callers don't need to thread it,
-* but tests and snapshot-rendering should pass an explicit value.
-*/
-function isToday(date, now = /* @__PURE__ */ new Date()) {
-	return isSameLocalDay(date, now);
+function isToday(date, today) {
+	return isSameCalendarDay(date, today);
 }
-/** True when two dates fall on the same local calendar day. */
-function isSameLocalDay(left, right) {
-	return left.getFullYear() === right.getFullYear() && left.getMonth() === right.getMonth() && left.getDate() === right.getDate();
+function isSameCalendarDay(left, right) {
+	return left.year === right.year && left.month === right.month && left.day === right.day;
 }
-/**
-* Add (or subtract) months to a date, clamping the day-of-month to the
-* target month's last day. Avoids JS Date overflow (Jan 29 + 1 month → Mar 1
-* in non-leap years).
-*/
-function addMonths(date, months) {
-	const year = date.getFullYear();
-	const month = date.getMonth();
-	const day = date.getDate();
-	const hours = date.getHours();
-	const minutes = date.getMinutes();
-	const seconds = date.getSeconds();
-	const ms = date.getMilliseconds();
-	const base = new Date(year, month + months, 1, hours, minutes, seconds, ms);
-	const lastDayOfTargetMonth = new Date(base.getFullYear(), base.getMonth() + 1, 0).getDate();
-	base.setDate(Math.min(day, lastDayOfTargetMonth));
-	return base;
-}
-/** Add (or subtract) days while preserving local time-of-day fields. */
-function addDays(date, days) {
-	const result = new Date(date);
-	result.setDate(result.getDate() + days);
-	return result;
+function getStartOfMonth(date) {
+	return {
+		year: date.year,
+		month: date.month,
+		day: 1
+	};
 }
-/** Shift a calendar anchor by the natural unit for a viewport kind. */
-function shiftCalendarAnchorDate(date, view, steps) {
-	if (view === "week") return addDays(date, steps * 7);
-	return addMonths(date, steps);
+function getEndOfMonth(date) {
+	return addDays(addMonths(getStartOfMonth(date), 1), -1);
 }
-/**
-* Get an inclusive 3-month window around `date`, returned as ISO strings
-* with UTC midnight bounds. Suitable for prefetching event windows when
-* the consumer handles timezone conversion downstream.
-*/
-function getThreeMonthRange(date) {
-	const year = date.getFullYear();
-	const month = date.getMonth();
-	const prevStart = new Date(year, month - 1, 1);
-	const nextEnd = new Date(year, month + 2, 0);
+function addMonths(date, months) {
+	const target = new Date(Date.UTC(date.year, date.month - 1 + months, 1, 12));
+	const year = target.getUTCFullYear();
+	const month = target.getUTCMonth() + 1;
+	const lastDay = new Date(Date.UTC(year, month, 0, 12)).getUTCDate();
 	return {
-		from: `${formatDateKey(prevStart)}T00:00:00Z`,
-		to: `${formatDateKey(nextEnd)}T23:59:59Z`
+		year,
+		month,
+		day: Math.min(date.day, lastDay)
 	};
 }
-/**
-* Build the calendar days for a month view. Returns 42 dates (6 rows × 7
-* days) including padding from prior/next months for a stable grid.
-*/
+function addDays(date, days) {
+	const result = new Date(Date.UTC(date.year, date.month - 1, date.day + days, 12));
+	return {
+		year: result.getUTCFullYear(),
+		month: result.getUTCMonth() + 1,
+		day: result.getUTCDate()
+	};
+}
+function shiftCalendarAnchorDate(date, view, steps) {
+	return view === "week" ? addDays(date, steps * 7) : addMonths(date, steps);
+}
 function getMonthCalendarDays(year, month, startOfWeek) {
-	const firstDayOfMonth = new Date(year, month, 1);
-	const lastDayOfMonth = new Date(year, month + 1, 0);
-	let startOffset = firstDayOfMonth.getDay();
-	if (startOfWeek === "monday") startOffset = startOffset === 0 ? 6 : startOffset - 1;
-	const days = [];
-	for (let i = startOffset - 1; i >= 0; i--) days.push(new Date(year, month, -i));
-	for (let day = 1; day <= lastDayOfMonth.getDate(); day++) days.push(new Date(year, month, day));
-	while (days.length < 42) {
-		const nextDay = days.length - startOffset - lastDayOfMonth.getDate() + 1;
-		days.push(new Date(year, month + 1, nextDay));
-	}
-	return days;
+	const firstDay = {
+		year,
+		month,
+		day: 1
+	};
+	const dayOfWeek = getDayOfWeek(firstDay);
+	const gridStart = addDays(firstDay, -(startOfWeek === "monday" ? dayOfWeek === 0 ? 6 : dayOfWeek - 1 : dayOfWeek));
+	return Array.from({ length: 42 }, (_, index) => addDays(gridStart, index));
 }
-/** Build the 7 dates of the week containing `baseDate`. */
 function getWeekCalendarDays(baseDate, startOfWeek) {
-	const days = [];
-	const dayOfWeek = baseDate.getDay();
-	const daysToStart = startOfWeek === "monday" ? dayOfWeek === 0 ? 6 : dayOfWeek - 1 : dayOfWeek;
-	const weekStart = new Date(baseDate);
-	weekStart.setDate(baseDate.getDate() - daysToStart);
-	for (let i = 0; i < 7; i++) {
-		const date = new Date(weekStart);
-		date.setDate(weekStart.getDate() + i);
-		days.push(date);
-	}
-	return days;
+	const dayOfWeek = getDayOfWeek(baseDate);
+	const weekStart = addDays(baseDate, -(startOfWeek === "monday" ? dayOfWeek === 0 ? 6 : dayOfWeek - 1 : dayOfWeek));
+	return Array.from({ length: 7 }, (_, index) => addDays(weekStart, index));
+}
+function getDayOfWeek(date) {
+	return new Date(Date.UTC(date.year, date.month - 1, date.day, 12)).getUTCDay();
 }
-/** Build the 7 dates of the week containing `baseDate` as a fixed-width tuple. */
 function getWeekCalendarDayTuple(baseDate, startOfWeek) {
 	const days = getWeekCalendarDays(baseDate, startOfWeek);
 	assertWeekCalendarDays(days);
 	return days;
 }
 function assertWeekCalendarDays(days) {
-	if (days.length !== 7) throw new Error("Expected week calendar helper to return exactly 7 days");
+	if (days.length !== 7) throw new Error("Expected exactly 7 calendar days");
 }
-/**
-* Day-name labels reordered for the chosen week start. Pass a custom
-* `dayNames` array (length 7, Sunday-first) to localize.
-*/
 function getOrderedDayNames(startOfWeek, dayNames = DAY_NAMES) {
 	if (startOfWeek === "monday") {
 		const sunday = dayNames[0] ?? "Sun";
@@ -14861,22 +14895,17 @@ function getOrderedDayNames(startOfWeek, dayNames = DAY_NAMES) {
 	}
 	return [...dayNames];
 }
-/**
-* Header title for a calendar view.
-*   - month: "January 2025"
-*   - week:  "January 5 - 11, 2025" or "December 30 - January 5, 2025"
-*/
 function formatCalendarTitle(viewDate, view, days, monthNames = MONTH_NAMES) {
 	if (view === "week") {
 		const weekStart = days[0];
 		const weekEnd = days[6];
-		if (weekStart === void 0 || weekEnd === void 0) return `${monthNames[viewDate.getMonth()] ?? ""} ${viewDate.getFullYear()}`;
-		const startMonth = monthNames[weekStart.getMonth()] ?? "";
-		const endMonth = monthNames[weekEnd.getMonth()] ?? "";
-		if (weekStart.getMonth() === weekEnd.getMonth()) return `${startMonth} ${weekStart.getDate()} - ${weekEnd.getDate()}, ${weekEnd.getFullYear()}`;
-		return `${startMonth} ${weekStart.getDate()} - ${endMonth} ${weekEnd.getDate()}, ${weekEnd.getFullYear()}`;
+		if (weekStart === void 0 || weekEnd === void 0) return `${monthNames[viewDate.month - 1] ?? ""} ${viewDate.year}`;
+		const startMonth = monthNames[weekStart.month - 1] ?? "";
+		const endMonth = monthNames[weekEnd.month - 1] ?? "";
+		if (weekStart.month === weekEnd.month) return `${startMonth} ${weekStart.day} - ${weekEnd.day}, ${weekEnd.year}`;
+		return `${startMonth} ${weekStart.day} - ${endMonth} ${weekEnd.day}, ${weekEnd.year}`;
 	}
-	return `${monthNames[viewDate.getMonth()] ?? ""} ${viewDate.getFullYear()}`;
+	return `${monthNames[viewDate.month - 1] ?? ""} ${viewDate.year}`;
 }
 function buildCalendarViewport(input) {
 	const monthNames = input.monthNames ?? MONTH_NAMES;
@@ -14886,10 +14915,10 @@ function buildCalendarViewport(input) {
 			kind: "week",
 			anchorDate: input.anchorDate,
 			days,
-			title: formatCalendarTitle(input.anchorDate, "week", [...days], monthNames)
+			title: formatCalendarTitle(input.anchorDate, "week", days, monthNames)
 		};
 	}
-	const days = getMonthCalendarDays(input.anchorDate.getFullYear(), input.anchorDate.getMonth(), input.startOfWeek);
+	const days = getMonthCalendarDays(input.anchorDate.year, input.anchorDate.month, input.startOfWeek);
 	return {
 		kind: "month",
 		anchorDate: input.anchorDate,
@@ -15040,13 +15069,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,
@@ -15103,13 +15131,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) ?? []
 		};
 	});
@@ -15261,13 +15289,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;
 }
@@ -15495,10 +15522,10 @@ function formatEventTeacherLine(event) {
 * timezone). Thin domain wrapper over `groupItemsByDate` from the calendar
 * package; preserves the historical `Map<string, PublicEvent[]>` shape.
 */
-function groupEventsByDate(events) {
+function groupEventsByDate(events, calendarTimeZone) {
 	const grouped = groupItemsByDate(events, {
 		getStartsAt: (event) => event.startsAt,
-		getTimeZone: (event) => event.timeZone ?? "UTC"
+		getTimeZone: () => calendarTimeZone
 	});
 	const map = /* @__PURE__ */ new Map();
 	for (const [dateKey, bucket] of grouped) map.set(dateKey, [...bucket]);
@@ -18473,14 +18500,19 @@ function buildEventCollectionPresentationDisplay(source) {
 		emptyMessage: source.emptyMessage ?? "No upcoming events scheduled."
 	};
 }
-function buildEventCollectionHydration(source) {
+function buildEventCollectionHydration(source, now = /* @__PURE__ */ new Date()) {
+	const timeZone = toBookingTimeZone(source.bookingTimeZone);
 	return {
 		siteId: source.siteId,
 		stage: source.stage,
 		prefetchedEvents: source.events != null,
 		eventSurface: normalizeEventSurfaceScope(source.eventSurface),
 		filterEventPresets: normalizeEventSurfacePresetsCsv(source.filterEventPresets),
-		scheduleScope: normalizeEventScheduleScope(source.scheduleScope)
+		scheduleScope: normalizeEventScheduleScope(source.scheduleScope),
+		calendarContext: {
+			timeZone,
+			initialToday: getLocalScheduleDate(now, timeZone)
+		}
 	};
 }
 function buildEventCollectionListingDisplay(display, prefetchedEvents, className) {
@@ -18506,6 +18538,7 @@ function buildEventCollectionListingDisplay(display, prefetchedEvents, className
 var eventSurfaceScopeSchema$1, eventScheduleScopeSchema$1, eventCollectionFilterSourceSchemaShape, eventCollectionSourceSchemaShape, eventCollectionDisplaySchemaShape, eventCollectionHydrationSchema;
 var init_eventCollectionContract = __esmMin((() => {
 	init_cards();
+	init_src$3();
 	init_schemas();
 	init_shared$2();
 	init_contract_schemas();
@@ -18547,7 +18580,8 @@ var init_eventCollectionContract = __esmMin((() => {
 		buttonVariant: eventButtonVariantSchema.optional(),
 		buttonText: z.string().optional(),
 		emptyMessage: z.string().optional(),
-		className: z.string().optional()
+		className: z.string().optional(),
+		bookingTimeZone: z.string().optional()
 	};
 	eventCollectionDisplaySchemaShape = {
 		events: z.array(publicEventSchema),
@@ -18582,7 +18616,15 @@ var init_eventCollectionContract = __esmMin((() => {
 		prefetchedEvents: z.boolean(),
 		eventSurface: eventSurfaceScopeSchema$1,
 		filterEventPresets: z.string().nullable(),
-		scheduleScope: eventScheduleScopeSchema$1
+		scheduleScope: eventScheduleScopeSchema$1,
+		calendarContext: z.object({
+			timeZone: z.string().transform(toBookingTimeZone),
+			initialToday: z.object({
+				year: z.number().int(),
+				month: z.number().int().min(1).max(12),
+				day: z.number().int().min(1).max(31)
+			})
+		})
 	});
 }));
 //#endregion
@@ -23196,30 +23238,6 @@ function asHeaderStyleId(value) {
 	return value;
 }
 var init_headerLayoutTypes = __esmMin((() => {}));
-var clearSplitInteractionPalette;
-var init_headerInteractionPalette = __esmMin((() => {
-	init_interactionPalette();
-	init_lookOptionGroups();
-	clearSplitInteractionPalette = defineLookOptionGroup({
-		id: "interaction-palette",
-		label: "Hover colour",
-		defaultOptionId: "accent",
-		options: [
-			{
-				id: "accent",
-				label: "Accent"
-			},
-			{
-				id: "primary",
-				label: "Primary"
-			},
-			{
-				id: "secondary",
-				label: "Secondary"
-			}
-		]
-	});
-}));
 function supportedLayouts(ids) {
 	return ids.map(asHeaderLayoutId);
 }
@@ -23227,7 +23245,6 @@ var titleOnlyLogoAccommodation, inlineWordmarkLogoAccommodation, inlineMarkWithT
 var init_headerLayoutCatalog = __esmMin((() => {
 	init_logoBranding();
 	init_types$9();
-	init_headerInteractionPalette();
 	init_headerLayoutTypes();
 	titleOnlyLogoAccommodation = {
 		pattern: "title-only",
@@ -23384,43 +23401,37 @@ var init_headerLayoutCatalog = __esmMin((() => {
 			id: asHeaderStyleId("minimal"),
 			label: "Minimal",
 			description: "Quiet surface with simple color-change navigation.",
-			supportedLayoutIds: supportedLayouts(["classic", "centered"]),
-			navTypography: "plain"
+			supportedLayoutIds: supportedLayouts(["classic", "centered"])
 		},
 		{
 			id: asHeaderStyleId("fine-line"),
 			label: "Seamless",
 			description: "Borderless surface with underline hover for a quieter page transition.",
-			supportedLayoutIds: supportedLayouts(["classic", "centered"]),
-			navTypography: "plain"
+			supportedLayoutIds: supportedLayouts(["classic", "centered"])
 		},
 		{
 			id: asHeaderStyleId("soft-bar"),
 			label: "Soft Bar",
 			description: "Soft tinted surface with gentle pill hover states.",
-			supportedLayoutIds: supportedLayouts(["classic", "centered"]),
-			navTypography: "plain"
+			supportedLayoutIds: supportedLayouts(["classic", "centered"])
 		},
 		{
 			id: asHeaderStyleId("pill-nav"),
 			label: "Pill Nav",
 			description: "A calm pill navigation rail over a neutral header.",
-			supportedLayoutIds: supportedLayouts(["classic", "centered"]),
-			navTypography: "plain"
+			supportedLayoutIds: supportedLayouts(["classic", "centered"])
 		},
 		{
 			id: asHeaderStyleId("brand-bar"),
 			label: "Brand Bar",
 			description: "Solid brand surface with high-contrast navigation.",
-			supportedLayoutIds: supportedLayouts(["classic", "centered"]),
-			navTypography: "brand-caps"
+			supportedLayoutIds: supportedLayouts(["classic", "centered"])
 		},
 		{
 			id: asHeaderStyleId("brand-underline"),
 			label: "Brand Underline",
 			description: "Brand surface with underline-grow navigation.",
-			supportedLayoutIds: supportedLayouts(["classic"]),
-			navTypography: "brand-caps"
+			supportedLayoutIds: supportedLayouts(["classic"])
 		},
 		{
 			id: asHeaderStyleId("brand-pill"),
@@ -23430,69 +23441,55 @@ var init_headerLayoutCatalog = __esmMin((() => {
 				"classic",
 				"centered",
 				"floating"
-			]),
-			navTypography: "brand-caps"
+			])
 		},
 		{
 			id: asHeaderStyleId("brand-capsule"),
 			label: "Brand Capsule",
 			description: "Solid brand chrome designed as a floating capsule, with quiet-caps nav, a soft pill active state, and an inverted CTA pill.",
-			supportedLayoutIds: supportedLayouts(["classic"]),
-			navTypography: "quiet-caps"
+			supportedLayoutIds: supportedLayouts(["classic"])
 		},
 		{
 			id: asHeaderStyleId("serif-line"),
 			label: "Serif Line",
 			description: "Typographic logo treatment with understated underline navigation.",
-			supportedLayoutIds: supportedLayouts(["classic", "centered"]),
-			navTypography: "heading"
+			supportedLayoutIds: supportedLayouts(["classic", "centered"])
 		},
 		{
 			id: asHeaderStyleId("flat-tabs"),
 			label: "Flat Tabs",
 			description: "Flat block hover and active states with a Swiss utility feel.",
-			supportedLayoutIds: supportedLayouts(["classic", "centered"]),
-			navTypography: "quiet-caps"
+			supportedLayoutIds: supportedLayouts(["classic", "centered"])
 		},
 		{
 			id: asHeaderStyleId("glass"),
 			label: "Glass",
 			description: "Translucent chrome with frosted navigation backing.",
-			supportedLayoutIds: supportedLayouts(["floating"]),
-			navTypography: "plain"
+			supportedLayoutIds: supportedLayouts(["floating"])
 		},
 		{
 			id: asHeaderStyleId("minimal-surface"),
 			label: "Clear Split",
 			description: "Floating logo with transparent navigation and no shared shell.",
-			supportedLayoutIds: supportedLayouts(["floating"]),
-			navTypography: "plain",
-			openingForegroundTarget: "all",
-			scrollTreatment: "contrast-glass",
-			interactionPalette: clearSplitInteractionPalette
+			supportedLayoutIds: supportedLayouts(["floating"])
 		},
 		{
 			id: asHeaderStyleId("soft-shell"),
 			label: "Soft Shell",
 			description: "Floating rounded shell with soft pill navigation states.",
-			supportedLayoutIds: supportedLayouts(["floating"]),
-			navTypography: "plain"
+			supportedLayoutIds: supportedLayouts(["floating"])
 		},
 		{
 			id: asHeaderStyleId("split-glass"),
 			label: "Split Glass",
 			description: "Logo floats independently while the navigation sits in a glass rail.",
-			supportedLayoutIds: supportedLayouts(["floating"]),
-			navTypography: "quiet-caps",
-			openingForegroundTarget: "brand-only"
+			supportedLayoutIds: supportedLayouts(["floating"])
 		},
 		{
 			id: asHeaderStyleId("split-pill"),
 			label: "Split Pill",
 			description: "Logo floats independently with a soft pill-backed navigation rail.",
-			supportedLayoutIds: supportedLayouts(["floating"]),
-			navTypography: "heading",
-			openingForegroundTarget: "brand-only"
+			supportedLayoutIds: supportedLayouts(["floating"])
 		}
 	]);
 	new Map(headerLayoutCatalog.map((layout) => [layout.id, layout]));
@@ -23502,22 +23499,53 @@ var init_headerLayoutResolution = __esmMin((() => {
 	init_headerLayoutCatalog();
 	init_headerLayoutTypes();
 }));
+var init_headerInteractionPalette = __esmMin((() => {
+	init_interactionPalette();
+	init_lookOptionGroups();
+	defineLookOptionGroup({
+		id: "interaction-palette",
+		label: "Hover colour",
+		defaultOptionId: "accent",
+		options: [
+			{
+				id: "accent",
+				label: "Accent"
+			},
+			{
+				id: "primary",
+				label: "Primary"
+			},
+			{
+				id: "secondary",
+				label: "Secondary"
+			}
+		]
+	});
+}));
+var init_headerStyleDefaults = __esmMin((() => {
+	init_headerInteractionPalette();
+}));
 var init_headerNavStyles = __esmMin((() => {
 	init_types$9();
 }));
-var init_headerStyleCompiler = __esmMin((() => {
+var init_headerStyleRecipe = __esmMin((() => {
 	init_headerCtaVariants();
-	init_headerInteractionPalette();
 	init_headerLayoutCatalog();
 	init_headerLayoutTypes();
 	init_headerNavStyles();
 	init_types$9();
 }));
+var init_headerStyleCompiler = __esmMin((() => {
+	init_headerInteractionPalette();
+	init_headerStyleDefaults();
+	init_headerStyleRecipe();
+}));
 var init_headerLayoutStyles = __esmMin((() => {
 	init_headerLayoutTypes();
 	init_headerLayoutCatalog();
 	init_headerLayoutResolution();
 	init_headerStyleCompiler();
+	init_headerStyleDefaults();
 	init_headerLayoutTypes();
 }));
 //#endregion
@@ -24359,6 +24387,7 @@ var init_curatedSiteStyles = __esmMin((() => {
 	init_gradients();
 	init_headerLayoutStyles();
 	init_footerLooks();
+	init_headerStyleDefaults();
 	init_curatedChoices();
 	init_sourceCatalogs();
 	init_types$9();
@@ -26771,7 +26800,6 @@ var init_validation_constants = __esmMin((() => {
 		"layout.footerRootClass",
 		"layout.headerRootStyle",
 		"layout.headerSectionBackground",
-		"layout.classicNavMode",
 		"layout.footerRootStyle",
 		"ui.headerNavLinkClass",
 		"ui.headingClassFromAlignment",
@@ -35978,12 +36006,13 @@ var init_AgendaEventCard = __esmMin((() => {
 * @returns "Monday, January 13"
 */
 function formatAgendaDayHeader(date) {
-	const dayName = FULL_DAY_NAMES$1[date.getDay()];
-	const monthName = MONTH_NAMES[date.getMonth()];
-	return `${dayName ?? "Day"}, ${monthName ?? "Month"} ${date.getDate()}`;
+	const dayName = FULL_DAY_NAMES$1[getDayOfWeek(date)];
+	const monthName = MONTH_NAMES[date.month - 1];
+	return `${dayName ?? "Day"}, ${monthName ?? "Month"} ${date.day}`;
 }
 var FULL_DAY_NAMES$1, WeekAgendaView;
 var init_WeekAgendaView = __esmMin((() => {
+	init_src$1();
 	init_AgendaEventCard();
 	init_utils$3();
 	FULL_DAY_NAMES$1 = [
@@ -35995,14 +36024,14 @@ var init_WeekAgendaView = __esmMin((() => {
 		"Friday",
 		"Saturday"
 	];
-	WeekAgendaView = ({ days, events, showCapacity, emptyMessage = "No events scheduled" }) => {
-		const eventsByDate = groupEventsByDate(events);
+	WeekAgendaView = ({ days, events, showCapacity, emptyMessage = "No events scheduled", calendarTimeZone, today: currentDate }) => {
+		const eventsByDate = groupEventsByDate(events, calendarTimeZone);
 		return /* @__PURE__ */ jsx("div", {
 			className: "event-agenda-week",
 			children: days.map((date) => {
 				const dateKey = formatDateKey(date);
 				const dayEvents = eventsByDate.get(dateKey) || [];
-				const today = isToday(date);
+				const today = isToday(date, currentDate);
 				return /* @__PURE__ */ jsxs("div", {
 					className: `event-agenda-day ${today ? "event-agenda-day--today" : ""}`,
 					children: [/* @__PURE__ */ jsx("div", {
@@ -36033,11 +36062,37 @@ var init_WeekAgendaView = __esmMin((() => {
 	};
 }));
 //#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"
+		})
+	});
+}
+var init_CalendarNavigationChevron = __esmMin((() => {}));
+//#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,
@@ -36046,7 +36101,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
 	};
 }
 /**
@@ -36062,12 +36119,14 @@ function formatCompactTimeRange(event) {
 	if ((startMeridiem === "AM" || startMeridiem === "PM") && startMeridiem === endMeridiem) return `${start.slice(0, -3).trim()} – ${end}`;
 	return `${start} – ${end}`;
 }
-var SHORT_DAY_NAMES, LEGEND_ITEMS, WeekBoardCard, WeekBoardView;
+var SHORT_DAY_NAMES, LEGEND_ITEMS, WeekBoardCard, WeekBoardNavigationControls, WeekBoardLegend, WeekBoardLoadError, WeekBoardGrid, WeekBoardFooter, WeekBoardView;
 var init_WeekBoardView = __esmMin((() => {
 	init_clsx();
 	init_buttons();
+	init_src$1();
 	init_eventCapacity();
 	init_utils$3();
+	init_CalendarNavigationChevron();
 	SHORT_DAY_NAMES = [
 		"Sun",
 		"Mon",
@@ -36116,18 +36175,129 @@ var init_WeekBoardView = __esmMin((() => {
 			]
 		});
 	};
-	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);
+	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"
+				})
+			]
+		});
+	};
+	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))
+	});
+	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"
+			})]
+		});
+	};
+	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);
+		})
+	});
+	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 = ({ 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",
@@ -36139,59 +36309,34 @@ var init_WeekBoardView = __esmMin((() => {
 				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
 					}),
-					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(WeekBoardGrid, {
+						days,
+						eventsByDate,
+						showCapacity,
+						today
+					}),
+					/* @__PURE__ */ jsx(WeekBoardFooter, {
+						note: footerNoteText,
+						ctaHref: resolvedCtaHref,
+						ctaLabel,
+						ctaClassName
+					})
 				]
 			})
 		});
@@ -36204,6 +36349,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,
@@ -36265,10 +36411,10 @@ function formatEventTimeRange(event) {
 	return `${formatTime$2(event.startsAt, { timeZone })} - ${formatTime$2(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}`;
 }
 var DEFAULT_EVENT_CELL_COLOR, FULL_DAY_NAMES;
 var init_timetableModel = __esmMin((() => {
@@ -36339,15 +36485,15 @@ function renderListSsr(display, prefetchedEvents) {
 		renderEventCard: (event) => renderEventCard(event, listDisplay)
 	});
 }
-function renderCalendarSsr(display) {
+function renderCalendarSsr(display, hydration) {
 	const calendarView = display.defaultCalendarView;
-	const viewDate = /* @__PURE__ */ new Date();
+	const viewDate = hydration.calendarContext.initialToday;
 	const viewport = buildCalendarViewport({
 		view: calendarView,
 		anchorDate: viewDate,
 		startOfWeek: display.startOfWeek
 	});
-	const eventsByDate = groupEventsByDate([...display.events]);
+	const eventsByDate = groupEventsByDate([...display.events], hydration.calendarContext.timeZone);
 	const dayNames = getOrderedDayNames(display.startOfWeek);
 	return /* @__PURE__ */ jsxs("div", {
 		className: clsx("event-calendar", display.className ?? void 0),
@@ -36414,7 +36560,9 @@ function renderCalendarSsr(display) {
 				days: viewport.days,
 				events: [...display.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", {
@@ -36428,13 +36576,13 @@ function renderCalendarSsr(display) {
 					children: viewport.days.map((date) => {
 						const dateKey = formatDateKey(date);
 						const dayEvents = eventsByDate.get(dateKey) || [];
-						const isCurrentMonth = date.getMonth() === viewDate.getMonth();
-						const today = isToday(date);
+						const isCurrentMonth = date.month === viewDate.month;
+						const today = isToday(date, hydration.calendarContext.initialToday);
 						return /* @__PURE__ */ jsxs("div", {
 							className: clsx("event-calendar-day", !isCurrentMonth && "event-calendar-day--other-month", today && "event-calendar-day--today"),
 							children: [/* @__PURE__ */ jsx("div", {
 								className: "event-calendar-day-number",
-								children: date.getDate()
+								children: date.day
 							}), /* @__PURE__ */ jsxs("div", {
 								className: "event-calendar-events",
 								children: [dayEvents.slice(0, 3).map((event) => /* @__PURE__ */ jsxs("a", {
@@ -36472,8 +36620,8 @@ function renderCalendarSsr(display) {
 		]
 	});
 }
-function renderTimetableSsr(display) {
-	const viewDate = /* @__PURE__ */ new Date();
+function renderTimetableSsr(display, hydration) {
+	const viewDate = hydration.calendarContext.initialToday;
 	const viewport = buildCalendarViewport({
 		view: "week",
 		anchorDate: viewDate,
@@ -36482,7 +36630,8 @@ function renderTimetableSsr(display) {
 	const model = buildTimetableModel({
 		events: [...display.events],
 		viewDate,
-		startOfWeek: display.startOfWeek
+		startOfWeek: display.startOfWeek,
+		today: hydration.calendarContext.initialToday
 	});
 	const selectedDayKey = model.days.find((day) => day.isToday)?.dateKey ?? model.days[0]?.dateKey ?? "";
 	return /* @__PURE__ */ jsxs("div", {
@@ -36637,21 +36786,21 @@ function renderTimetableSsr(display) {
 		})]
 	});
 }
-function renderWeekBoardSsr(display) {
-	const days = getWeekCalendarDayTuple(/* @__PURE__ */ new Date(), display.startOfWeek);
-	return /* @__PURE__ */ jsx(WeekBoardView, {
-		days,
-		events: [...display.events],
-		showCapacity: display.showCapacity,
-		emptyMessage: display.emptyMessage,
-		title: display.boardTitle,
-		footerNote: display.footerNote,
-		ctaLabel: display.loadMoreText ?? display.buttonText,
-		ctaHref: display.seeAllUrl,
-		buttonVariant: display.buttonVariant,
-		elevated: display.elevated,
-		banded: display.banded
-	});
+function renderWeekBoardSsr(display, hydration) {
+	const today = hydration.calendarContext.initialToday;
+	const days = getWeekCalendarDayTuple(today, display.startOfWeek);
+	const navigation = {
+		kind: "static",
+		...buildWeekBoardNavigationState({
+			days,
+			title: formatCalendarTitle(today, "week", [...days])
+		}, today)
+	};
+	return /* @__PURE__ */ jsx(WeekBoardView, { ...buildWeekBoardViewProps({
+		...display,
+		calendarTimeZone: hydration.calendarContext.timeZone,
+		today
+	}, days, navigation) });
 }
 function formatHourLabel$1(hour) {
 	if (hour === 0) return "12 AM";
@@ -36677,13 +36826,13 @@ const EventCalendarSSR = (props) => {
 			content = renderListSsr(display, hydration.prefetchedEvents);
 			break;
 		case "timetable":
-			content = renderTimetableSsr(display);
+			content = renderTimetableSsr(display, hydration);
 			break;
 		case "week-board":
-			content = renderWeekBoardSsr(display);
+			content = renderWeekBoardSsr(display, hydration);
 			break;
 		case "calendar":
-			content = renderCalendarSsr(display);
+			content = renderCalendarSsr(display, hydration);
 			break;
 		default: content = assertNeverDisplayMode(display.displayMode);
 	}
@@ -45747,41 +45896,78 @@ var init_sessionStorage = __esmMin((() => {
 }));
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/event-registration/useEventRegistrationStripeReturn.ts
+function restorePendingPresentation(options, pending) {
+	options.setFormData(pending.formData);
+	options.setTicketSelections(pending.ticketSelections);
+	options.setTicketsCount(getTicketSelectionTotal(pending.ticketSelections));
+	if (pending.selectedEventId) {
+		const event = options.events.find((item) => item.selectionId === pending.selectedEventId) ?? null;
+		if (event) options.setSelectedEvent(event);
+	}
+	options.setSelectedAttendanceMode(pending.selectedAttendanceMode ?? null);
+	options.setPaymentSelection(pending.paymentSelection);
+}
+function showReturnReconciliation(options, message) {
+	options.setErrorMessage(message);
+	options.setStep("verifying-timeout");
+}
+async function handleCheckoutReturn(options, deps, checkoutAttemptIdRef) {
+	deps.cleanupStaleRegistrations();
+	const params = deps.consumeReturnParams();
+	if (params.registration !== "cancelled" && params.registration !== "success") return;
+	deps.scrollToBlock(EVENT_REGISTRATION_ANCHOR_ID);
+	const siteId = options.api.config.siteId;
+	const checkoutAttemptId = params.registration_attempt;
+	if (!siteId) return;
+	if (!checkoutAttemptId) {
+		showReturnReconciliation(options, "We could not identify this payment attempt. Please contact us before trying again.");
+		return;
+	}
+	const pending = deps.getPendingRegistration(siteId, checkoutAttemptId);
+	checkoutAttemptIdRef.current = checkoutAttemptId;
+	if (pending) restorePendingPresentation(options, pending);
+	try {
+		const outcome = params.registration === "success" ? params.session_id ? await options.api.resolveEventCheckoutReturn({
+			kind: "resolveSuccess",
+			checkoutAttemptId,
+			sessionId: params.session_id
+		}) : { kind: "notFound" } : await options.api.resolveEventCheckoutReturn({
+			kind: "abandon",
+			checkoutAttemptId
+		});
+		switch (outcome.kind) {
+			case "resolved":
+				options.setPendingRegistrationReference(outcome.reference);
+				options.setStep("verifying-payment");
+				return;
+			case "abandoned":
+				options.setErrorMessage("Your payment was cancelled. You can choose a payment option and try again.");
+				options.setStep("select-payment");
+				return;
+			case "notFound":
+				if (params.registration === "cancelled" && (options.registrationSubject?.kind === "occurrence" || pending?.reference.scope === "occurrence")) {
+					options.setErrorMessage("Your payment was cancelled. You can choose a payment option and try again.");
+					options.setStep("select-payment");
+					return;
+				}
+				break;
+			case "reconciliationRequired": break;
+		}
+		showReturnReconciliation(options, "We’re checking your payment. Please wait a moment before trying again.");
+	} catch {
+		showReturnReconciliation(options, "We could not check your payment yet. Please try again shortly.");
+	}
+}
 function useEventRegistrationStripeReturn(options) {
 	return useEventRegistrationStripeReturnWithDeps(options, eventRegistrationStripeReturnDeps);
 }
 function useEventRegistrationStripeReturnWithDeps(options, deps) {
-	const { api, events, pendingRegistrationReference, setErrorMessage, setFormData, setPaymentSelection, setPendingRegistrationReference, setRegistrationResult, setSelectedEvent, setSelectedAttendanceMode, setTicketSelections, setStep, setTicketsCount, step } = options;
+	const { api, pendingRegistrationReference, setErrorMessage, setRegistrationResult, setStep, step } = options;
 	const checkoutAttemptIdRef = useRef(null);
 	const verificationConfig = useMemo(() => step === "verifying-payment" && pendingRegistrationReference ? { reference: pendingRegistrationReference } : null, [step, pendingRegistrationReference]);
 	const verification = deps.usePaymentVerification(verificationConfig);
 	useEffect(() => {
-		deps.cleanupStaleRegistrations();
-		const returnParams = deps.consumeReturnParams();
-		const registrationStatus = returnParams.registration;
-		if (registrationStatus !== "cancelled" && registrationStatus !== "success") return;
-		deps.scrollToBlock(EVENT_REGISTRATION_ANCHOR_ID);
-		const siteId = api.config.siteId;
-		if (!siteId) return;
-		const checkoutAttemptId = returnParams[EVENT_REGISTRATION_CHECKOUT_ATTEMPT_PARAM];
-		if (!checkoutAttemptId) return;
-		const pending = deps.getPendingRegistration(siteId, checkoutAttemptId);
-		if (!pending) return;
-		checkoutAttemptIdRef.current = checkoutAttemptId;
-		setFormData(pending.formData);
-		setTicketSelections(pending.ticketSelections);
-		setTicketsCount(getTicketSelectionTotal(pending.ticketSelections));
-		if (pending.selectedEventId) {
-			const event = events.find((e) => e.selectionId === pending.selectedEventId) ?? null;
-			if (event) setSelectedEvent(event);
-		}
-		setSelectedAttendanceMode(pending.selectedAttendanceMode ?? null);
-		setPaymentSelection(pending.paymentSelection);
-		if (registrationStatus === "cancelled") setStep("select-payment");
-		else if (registrationStatus === "success") {
-			setPendingRegistrationReference(pending.reference);
-			setStep("verifying-payment");
-		}
+		handleCheckoutReturn(options, deps, checkoutAttemptIdRef);
 	}, []);
 	useEffect(() => {
 		if (verification.status === "completed") {
@@ -45815,7 +46001,11 @@ var init_useEventRegistrationStripeReturn = __esmMin((() => {
 	init_ticketSelectionLines();
 	eventRegistrationStripeReturnDeps = {
 		usePaymentVerification,
-		consumeReturnParams: () => consumeSearchParams(["registration", EVENT_REGISTRATION_CHECKOUT_ATTEMPT_PARAM]),
+		consumeReturnParams: () => consumeSearchParams([
+			"registration",
+			EVENT_REGISTRATION_CHECKOUT_ATTEMPT_PARAM,
+			"session_id"
+		]),
 		scrollToBlock,
 		cleanupStaleRegistrations,
 		clearPendingRegistration,
@@ -45876,7 +46066,7 @@ function useEventRegistrationSubmitWithDeps(options, deps) {
 		options.setStep("submitting");
 		try {
 			const prepared = prepareSubmitContext(options, target, method, passId, membershipId, selection);
-			if (prepared.subject.kind === "wholeSeries" && method === "stripe") return submitWholeSeriesCheckout(options, deps, {
+			if (prepared.subject.kind === "wholeSeries" && method === "stripe") return await submitWholeSeriesCheckout(options, deps, {
 				...prepared,
 				subject: prepared.subject
 			}, submitOptions);
@@ -45897,7 +46087,7 @@ function useEventRegistrationSubmitWithDeps(options, deps) {
 				claimToken: options.claimToken ?? void 0,
 				guests: prepared.guestsPayload
 			});
-			if (needsOccurrenceCheckout(result, method)) return submitOccurrenceCheckout(options, deps, prepared, result, method, submitOptions);
+			if (needsOccurrenceCheckout(result, method)) return await submitOccurrenceCheckout(options, deps, prepared, result, method, submitOptions);
 			options.setRegistrationResult(toRegistrationResult(result));
 			options.setStep("success");
 			return {
@@ -45980,6 +46170,7 @@ async function submitWholeSeriesCheckout(options, deps, prepared, submitOptions)
 		claimToken: options.claimToken ?? void 0,
 		discountCode: options.discountCode.trim() || void 0,
 		collectionOptionKind: prepared.selectionSnapshot.collectionOptionKind,
+		checkoutAttemptId,
 		...urls
 	});
 	if (result.scope !== "wholeSeries") throw new Error("Unexpected registration scope for event checkout.");
@@ -47373,7 +47564,10 @@ var init_EventRegistrationWizardActions = __esmMin((() => {
 }));
 //#endregion
 //#region ../commerce/src/purchase/types.ts
-var init_types$1 = __esmMin((() => {})), ORDER_STATUSES, ORDER_PAYMENT_METHODS, CHECKOUT_COMMIT_STATES, ORDER_CHECKOUT_RECONCILIATION_STATES, ORDER_ITEM_RECONCILIATION_STATES, ORDER_ITEM_COMMIT_STATES, RESERVATION_FINALIZATION_STATES, DISCOUNT_REDEMPTION_STATUSES, ORDER_ITEM_KINDS;
+var init_types$1 = __esmMin((() => {}));
+var init_allocation = __esmMin((() => {
+	init_src$3();
+})), ORDER_STATUSES, ORDER_PAYMENT_METHODS, CHECKOUT_COMMIT_STATES, ORDER_CHECKOUT_RECONCILIATION_STATES, ORDER_ITEM_RECONCILIATION_STATES, ORDER_ITEM_COMMIT_STATES, RESERVATION_FINALIZATION_STATES, DISCOUNT_REDEMPTION_STATUSES, ORDER_ITEM_KINDS;
 var init_orderTypes = __esmMin((() => {
 	ORDER_STATUSES = [
 		"pending",
@@ -47789,6 +47983,7 @@ var init_stripeMinimumCharge = __esmMin((() => {
 		THB: 1e3
 	};
 }));
+var init_stripeCheckoutReturnUrl = __esmMin((() => {}));
 var init_stateTransitions = __esmMin((() => {
 	init_src$3();
 	init_assertNever();
@@ -47797,6 +47992,7 @@ var init_stateTransitions = __esmMin((() => {
 //#region ../commerce/src/purchase/index.ts
 var init_purchase = __esmMin((() => {
 	init_types$1();
+	init_allocation();
 	init_orderTypes();
 	init_orderPlanningTypes();
 	init_bookingInstalmentSchedule();
@@ -47850,6 +48046,7 @@ var init_purchase = __esmMin((() => {
 	init_settlement();
 	init_shopRefundPlanning();
 	init_stripeMinimumCharge();
+	init_stripeCheckoutReturnUrl();
 	init_stateTransitions();
 }));
 //#endregion
@@ -103696,7 +103893,7 @@ var init_PaymentFailedStep = __esmMin((() => {
 var VerifyingTimeoutStep;
 var init_VerifyingTimeoutStep = __esmMin((() => {
 	init_shared();
-	VerifyingTimeoutStep = ({ onCheckAgain, supportEmail }) => {
+	VerifyingTimeoutStep = ({ onCheckAgain, supportEmail, title = "Your registration is saved", message = "We're still confirming your payment. This usually resolves within a few minutes. You'll receive a confirmation email once everything is verified." }) => {
 		return /* @__PURE__ */ jsx(TerminalPanel, {
 			tone: "warning",
 			className: "er-center",
@@ -103705,18 +103902,18 @@ var init_VerifyingTimeoutStep = __esmMin((() => {
 				variant: "warning",
 				children: /* @__PURE__ */ jsx(ClockIcon, {})
 			}),
-			title: "Your registration is saved",
+			title,
 			body: /* @__PURE__ */ jsx("p", {
 				className: "er-text--muted er-message",
-				children: "We're still confirming your payment. This usually resolves within a few minutes. You'll receive a confirmation email once everything is verified."
+				children: message
 			}),
 			actionsClassName: "er-button-group",
-			actions: /* @__PURE__ */ jsx("button", {
+			actions: onCheckAgain ? /* @__PURE__ */ jsx("button", {
 				type: "button",
 				onClick: onCheckAgain,
 				className: "er-btn er-btn--primary",
 				children: "Check Again"
-			}),
+			}) : void 0,
 			secondaryBody: supportEmail ? /* @__PURE__ */ jsxs("p", {
 				className: "er-text--sm er-text--muted er-message",
 				children: [
@@ -104018,7 +104215,9 @@ function EventRegistrationTerminalState(props) {
 			onRetry: () => wizard.setStep("select-payment")
 		});
 		case "verifying-timeout": return /* @__PURE__ */ jsx(VerifyingTimeoutStep, {
-			onCheckAgain: wizard.verification.retry,
+			onCheckAgain: wizard.verification.status === "timeout" ? wizard.verification.retry : void 0,
+			title: wizard.verification.status === "timeout" ? void 0 : "We’re checking your payment",
+			message: wizard.verification.status === "timeout" ? void 0 : wizard.errorMessage,
 			supportEmail: props.supportEmail
 		});
 		case "success": return wizard.registrationResult ? /* @__PURE__ */ jsx(SuccessStep, {
@@ -111149,25 +111348,34 @@ var init_TabBar = __esmMin((() => {
 }));
 //#endregion
 //#region ../blocks/src/system/runtime/hooks/useCalendarEvents.state.ts
-function calendarEventCacheLoadReducer(_state, action) {
+function calendarEventCacheLoadReducer(state, action) {
 	switch (action.type) {
-		case "started": return { kind: "loading" };
-		case "succeeded": return { kind: "idle" };
-		case "failed": return {
+		case "started": return {
+			kind: "loading",
+			scope: action.scope
+		};
+		case "succeeded": return sameCalendarLoadScope(state, action.scope) ? { kind: "idle" } : state;
+		case "failed": return sameCalendarLoadScope(state, action.scope) ? {
 			kind: "error",
+			scope: action.scope,
 			error: action.error
-		};
+		} : state;
 		default: return assertNever$11(action);
 	}
 }
-function toCalendarEventCacheLoadError(error) {
-	return toError(error, "Unknown error");
+function projectCalendarLoadState(state, scope) {
+	if (state.kind === "idle" || !sameCalendarLoadScope(state, scope)) return { kind: "idle" };
+	return state.kind === "loading" ? { kind: "loading" } : {
+		kind: "error",
+		error: state.error
+	};
 }
-function isCalendarEventCacheLoading(state) {
-	return state.kind === "loading";
+function sameCalendarLoadScope(state, scope) {
+	if (state.kind === "idle") return false;
+	return state.scope.filtersKey === scope.filtersKey && state.scope.anchorDate.year === scope.anchorDate.year && state.scope.anchorDate.month === scope.anchorDate.month && state.scope.anchorDate.day === scope.anchorDate.day;
 }
-function getCalendarEventCacheError(state) {
-	return state.kind === "error" ? state.error : null;
+function toCalendarEventCacheLoadError(error) {
+	return toError(error, "Unknown error");
 }
 var init_useCalendarEvents_state = __esmMin((() => {
 	init_dist$1();
@@ -111181,18 +111389,35 @@ var init_useCalendarEvents_state = __esmMin((() => {
 * Uses the Block API Client for type-safe API calls.
 * Must be used within a BlockApiProvider.
 */
+async function loadCalendarEventPages(loadPage, request, isCurrent) {
+	const events = [];
+	let afterStartsAt;
+	let afterId;
+	for (;;) {
+		const page = await loadPage({
+			...request,
+			afterStartsAt,
+			afterId,
+			limit: CALENDAR_FETCH_LIMIT
+		});
+		if (!isCurrent()) return null;
+		events.push(...page);
+		if (page.length < CALENDAR_FETCH_LIMIT) return events;
+		const last = page[page.length - 1];
+		if (!last) return events;
+		if (last.startsAt === afterStartsAt && last.occurrenceId === afterId) throw new Error("Calendar event pagination cursor did not advance");
+		afterStartsAt = last.startsAt;
+		afterId = last.occurrenceId;
+	}
+}
 /**
 * Generate a cache key for a month
 */
 function getMonthKey(date) {
-	return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, "0")}`;
+	return `${date.year}-${String(date.month).padStart(2, "0")}`;
 }
-/**
-* Owns calendar viewport state only: selected anchor date, derived visible
-* period, and navigation by the natural unit for the active view.
-*/
-function useCalendarViewport({ view = "month", startOfWeek = "monday", initialDate } = {}) {
-	const [viewDate, setViewDate] = useState(() => initialDate ?? /* @__PURE__ */ new Date());
+function useCalendarViewport({ view = "month", startOfWeek = "monday", initialDate }) {
+	const [viewDate, setViewDate] = useState(initialDate);
 	const viewport = useMemo(() => buildCalendarViewport({
 		view,
 		anchorDate: viewDate,
@@ -111217,15 +111442,44 @@ function useCalendarViewport({ view = "month", startOfWeek = "monday", initialDa
 		goToPrevious,
 		goToNext,
 		goToToday: useCallback(() => {
-			setViewDate(/* @__PURE__ */ new Date());
-		}, [])
+			setViewDate(initialDate);
+		}, [initialDate])
 	};
 }
+function addEventsToCalendarCache(cache, events, timeZone) {
+	for (const event of events) {
+		const monthKey = getMonthKey(getLocalScheduleDate(new Date(event.startsAt), timeZone));
+		const existing = cache.get(monthKey) ?? [];
+		if (!existing.some((cachedEvent) => cachedEvent.id === event.id)) cache.set(monthKey, [...existing, event]);
+	}
+}
+function useInitiallySeededCalendarCache(initialEvents, timeZone) {
+	const cacheRef = useRef(/* @__PURE__ */ new Map());
+	const seededRef = useRef(false);
+	if (!seededRef.current) {
+		addEventsToCalendarCache(cacheRef.current, initialEvents, timeZone);
+		seededRef.current = true;
+	}
+	return cacheRef;
+}
+function readEventsFromCalendarCache(cache, viewDate) {
+	const allEvents = [];
+	for (let offset = -1; offset <= 1; offset += 1) {
+		const monthEvents = cache.get(getMonthKey(addMonths(viewDate, offset))) ?? [];
+		allEvents.push(...monthEvents);
+	}
+	const seen = /* @__PURE__ */ new Set();
+	return allEvents.filter((event) => {
+		if (seen.has(event.id)) return false;
+		seen.add(event.id);
+		return true;
+	}).sort((left, right) => new Date(left.startsAt).getTime() - new Date(right.startsAt).getTime());
+}
 /**
 * Owns event loading and month-window caching for a supplied viewport anchor.
 * It does not decide navigation semantics or visible calendar days.
 */
-function useCalendarEventCache({ viewDate, initialEvents = [], preloadMonths = 1, filters, stage }) {
+function useCalendarEventCache({ viewDate, initialEvents = [], preloadMonths = 1, filters, stage, timeZone }) {
 	const { getPublicEvents } = useBlockApi();
 	const [loadState, dispatchLoadState] = useReducer(calendarEventCacheLoadReducer, { kind: "idle" });
 	const [cacheVersion, setCacheVersion] = useState(0);
@@ -111237,7 +111491,7 @@ function useCalendarEventCache({ viewDate, initialEvents = [], preloadMonths = 1
 		filters?.staffMemberId,
 		filters?.venueId
 	]);
-	const cacheRef = useRef(/* @__PURE__ */ new Map());
+	const cacheRef = useInitiallySeededCalendarCache(initialEvents, timeZone);
 	const loadedMonthsRef = useRef(/* @__PURE__ */ new Set());
 	const fetchingRef = useRef(/* @__PURE__ */ new Set());
 	const requestIdRef = useRef(0);
@@ -111249,24 +111503,26 @@ function useCalendarEventCache({ viewDate, initialEvents = [], preloadMonths = 1
 		loadedMonthsRef.current = /* @__PURE__ */ new Set();
 		fetchingRef.current = /* @__PURE__ */ new Set();
 		requestIdRef.current += 1;
-		if (initialEvents.length > 0) for (const event of initialEvents) {
-			const monthKey = getMonthKey(new Date(event.startsAt));
-			const existing = cacheRef.current.get(monthKey) || [];
-			if (!existing.some((e) => e.id === event.id)) cacheRef.current.set(monthKey, [...existing, event]);
-		}
+		addEventsToCalendarCache(cacheRef.current, initialEvents, timeZone);
 		setCacheVersion((v) => v + 1);
-	}, [filtersKey, initialEvents]);
-	const fetchEventsForRange = useCallback(async (from, to, targetMonths) => {
+	}, [
+		filtersKey,
+		initialEvents,
+		timeZone
+	]);
+	const fetchEventsForRange = useCallback(async (from, to, targetMonths, scope) => {
 		const monthsToFetch = targetMonths.filter((m) => !loadedMonthsRef.current.has(m) && !fetchingRef.current.has(m));
 		if (monthsToFetch.length === 0) return;
 		monthsToFetch.forEach((m) => fetchingRef.current.add(m));
 		const currentRequestId = ++requestIdRef.current;
-		dispatchLoadState({ type: "started" });
+		dispatchLoadState({
+			type: "started",
+			scope
+		});
 		try {
-			const result = await getPublicEvents({
+			const result = await loadCalendarEventPages(getPublicEvents, {
 				from,
 				to,
-				limit: CALENDAR_FETCH_LIMIT,
 				stage,
 				detailLevel: "listing",
 				eventSurface: filters?.eventSurface,
@@ -111275,23 +111531,27 @@ function useCalendarEventCache({ viewDate, initialEvents = [], preloadMonths = 1
 				categoryIds: filters?.categoryIds,
 				staffMemberId: filters?.staffMemberId,
 				venueId: filters?.venueId
-			});
-			if (currentRequestId === requestIdRef.current) {
-				for (const event of result) {
-					const monthKey = getMonthKey(new Date(event.startsAt));
-					const existing = cacheRef.current.get(monthKey) || [];
-					if (!existing.some((e) => e.id === event.id)) cacheRef.current.set(monthKey, [...existing, event]);
-				}
-				for (const month of monthsToFetch) {
-					loadedMonthsRef.current.add(month);
-					if (!cacheRef.current.has(month)) cacheRef.current.set(month, []);
-				}
-				setCacheVersion((v) => v + 1);
-				dispatchLoadState({ type: "succeeded" });
+			}, () => currentRequestId === requestIdRef.current);
+			if (result === null) return;
+			for (const event of result) {
+				const monthKey = getMonthKey(getLocalScheduleDate(new Date(event.startsAt), timeZone));
+				const existing = cacheRef.current.get(monthKey) || [];
+				if (!existing.some((e) => e.id === event.id)) cacheRef.current.set(monthKey, [...existing, event]);
+			}
+			for (const month of monthsToFetch) {
+				loadedMonthsRef.current.add(month);
+				if (!cacheRef.current.has(month)) cacheRef.current.set(month, []);
 			}
+			setCacheVersion((v) => v + 1);
+			dispatchLoadState({
+				type: "succeeded",
+				scope
+			});
 		} catch (err) {
+			monthsToFetch.forEach((m) => fetchingRef.current.delete(m));
 			if (currentRequestId === requestIdRef.current) dispatchLoadState({
 				type: "failed",
+				scope,
 				error: toCalendarEventCacheLoadError(err)
 			});
 		} finally {
@@ -111305,7 +111565,8 @@ function useCalendarEventCache({ viewDate, initialEvents = [], preloadMonths = 1
 		filters?.scheduleScope,
 		filters?.staffMemberId,
 		filters?.venueId,
-		stage
+		stage,
+		timeZone
 	]);
 	const ensureEventsLoaded = useCallback((date) => {
 		const targetMonths = [];
@@ -111315,74 +111576,71 @@ function useCalendarEventCache({ viewDate, initialEvents = [], preloadMonths = 1
 		}
 		const unloadedMonths = targetMonths.filter((m) => !loadedMonthsRef.current.has(m) && !fetchingRef.current.has(m));
 		if (unloadedMonths.length > 0) {
-			const range = getThreeMonthRange(date);
-			fetchEventsForRange(range.from, range.to, unloadedMonths);
+			const startDate = getStartOfMonth(addMonths(date, -preloadMonths));
+			const endDate = getEndOfMonth(addMonths(date, preloadMonths));
+			const range = buildBookingUtcDateWindow({
+				startDate: formatLocalScheduleDate(startDate),
+				endDate: formatLocalScheduleDate(endDate),
+				timeZone
+			});
+			const scope = {
+				anchorDate: date,
+				filtersKey
+			};
+			fetchEventsForRange(range.startAt.toISOString(), (/* @__PURE__ */ new Date(range.endExclusive.getTime() - 1)).toISOString(), unloadedMonths, scope);
 		}
-	}, [preloadMonths, fetchEventsForRange]);
+	}, [
+		preloadMonths,
+		fetchEventsForRange,
+		filtersKey,
+		timeZone
+	]);
 	useEffect(() => {
 		ensureEventsLoaded(viewDate);
 	}, [viewDate, ensureEventsLoaded]);
+	const retryCurrentView = useCallback(() => {
+		ensureEventsLoaded(viewDate);
+	}, [ensureEventsLoaded, viewDate]);
 	return {
-		events: useMemo(() => {
-			const allEvents = [];
-			for (let i = -1; i <= 1; i++) {
-				const monthKey = getMonthKey(addMonths(viewDate, i));
-				const monthEvents = cacheRef.current.get(monthKey) || [];
-				allEvents.push(...monthEvents);
-			}
-			const seen = /* @__PURE__ */ new Set();
-			return allEvents.filter((e) => {
-				if (seen.has(e.id)) return false;
-				seen.add(e.id);
-				return true;
-			}).sort((a, b) => new Date(a.startsAt).getTime() - new Date(b.startsAt).getTime());
-		}, [viewDate, cacheVersion]),
-		loading: isCalendarEventCacheLoading(loadState),
-		error: getCalendarEventCacheError(loadState)
+		events: useMemo(() => readEventsFromCalendarCache(cacheRef.current, viewDate), [viewDate, cacheVersion]),
+		loadState: projectCalendarLoadState(loadState, useMemo(() => ({
+			anchorDate: viewDate,
+			filtersKey
+		}), [filtersKey, viewDate])),
+		retryCurrentView
 	};
 }
-/**
-* Hook for calendar event management with month-based caching.
-*
-* Pre-fetches 3 months (previous, current, next) and caches by month.
-* Navigation within cached range is instant; fetches at boundaries.
-*
-* @example
-* ```tsx
-* const { events, viewDate, loading, goToPrevious, goToNext } = useCalendarEvents({
-*   siteId: 'site-123',
-*   initialEvents: serverEvents,
-* });
-* ```
-*/
-function useCalendarEvents({ siteId: _siteId, initialEvents = [], view = "month", startOfWeek = "monday", preloadMonths = 1, filters, stage }) {
+function useCalendarEvents({ siteId: _siteId, initialEvents = [], view = "month", startOfWeek = "monday", preloadMonths = 1, filters, stage, calendarContext }) {
 	const { viewDate, viewport, goToDate, goToPrevious, goToNext, goToToday } = useCalendarViewport({
 		view,
-		startOfWeek
+		startOfWeek,
+		initialDate: calendarContext.initialToday
 	});
-	const { events, loading, error } = useCalendarEventCache({
+	const { events, loadState, retryCurrentView } = useCalendarEventCache({
 		viewDate,
 		initialEvents,
 		preloadMonths,
 		filters,
-		stage
+		stage,
+		timeZone: calendarContext.timeZone
 	});
 	return {
 		events,
 		viewDate,
 		viewport,
-		loading,
-		error,
+		loadState,
 		setViewDate: useCallback((date) => {
 			goToDate(date);
 		}, [goToDate]),
 		goToPrevious,
 		goToNext,
-		goToToday
+		goToToday,
+		retryCurrentView
 	};
 }
 var CALENDAR_FETCH_LIMIT;
 var init_useCalendarEvents = __esmMin((() => {
+	init_src$3();
 	init_utils$3();
 	init_api();
 	init_listOptions();
@@ -111444,9 +111702,9 @@ var CalendarDayCell;
 var init_CalendarDayCell = __esmMin((() => {
 	init_utils$3();
 	init_EventModalContext();
-	CalendarDayCell = ({ date, events, isCurrentMonth }) => {
+	CalendarDayCell = ({ date, events, isCurrentMonth, today: currentDate }) => {
 		const { openEventModal, openDayModal } = useEventModal();
-		const today = isToday(date);
+		const today = isToday(date, currentDate);
 		const dayClasses = [
 			"event-calendar-day",
 			!isCurrentMonth && "event-calendar-day--other-month",
@@ -111462,7 +111720,7 @@ var init_CalendarDayCell = __esmMin((() => {
 			className: dayClasses,
 			children: [/* @__PURE__ */ jsx("div", {
 				className: "event-calendar-day-number",
-				children: date.getDate()
+				children: date.day
 			}), /* @__PURE__ */ jsxs("div", {
 				className: "event-calendar-events",
 				children: [events.slice(0, 3).map((event) => {
@@ -111574,7 +111832,7 @@ var init_EventDetailModal = __esmMin((() => {
 * Clicking an event triggers onSelectEvent (typically opens EventDetailModal).
 */
 function DayEventsModal({ date, events, showCapacity, onClose, onSelectEvent, portalRoot }) {
-	const formattedDate = formatDate$2(date.toISOString());
+	const formattedDate = formatDate$2(`${formatLocalScheduleDate(date)}T12:00:00Z`);
 	return /* @__PURE__ */ jsxs(ModalShell, {
 		title: formattedDate,
 		titleId: "ec-day-modal-title",
@@ -111609,6 +111867,7 @@ function DayEventsModal({ date, events, showCapacity, onClose, onSelectEvent, po
 	});
 }
 var init_DayEventsModal = __esmMin((() => {
+	init_src$3();
 	init_AgendaEventCard();
 	init_utils$3();
 	init_ModalShell();
@@ -111729,7 +111988,8 @@ function toEventCombinedControllerProps(props) {
 		buttonVariant: props.render.display.buttonVariant,
 		buttonText: props.render.display.buttonText,
 		emptyMessage: props.render.display.emptyMessage,
-		className: props.render.display.className ?? void 0
+		className: props.render.display.className ?? void 0,
+		calendarContext: props.render.hydration.calendarContext
 	};
 }
 var EventCombinedClient, EventCombinedIslandClient;
@@ -111752,7 +112012,7 @@ var init_EventCombined_client = __esmMin((() => {
 	EventCombinedClient = ({ events: initialEvents, siteId, stage, listLayout = "stack", listColumns = "3", eventsPerPage = 12, paginationAction = {
 		kind: "loadMore",
 		label: "Load more events"
-	}, startOfWeek = "monday", calendarTabViews = "both", defaultCalendarView, showFilters, showCategoryFilter = "auto", showVenueFilter, showStaffFilter, eventSurface, filterEventPresets, scheduleScope, filterCategoryIds, filterStaffMemberId, filterVenueId, showVenue, showMap, showCapacity, cardRole, buttonVariant = "primary", buttonText = "Book", emptyMessage = "No upcoming events scheduled.", className }) => {
+	}, startOfWeek = "monday", calendarTabViews = "both", defaultCalendarView, showFilters, showCategoryFilter = "auto", showVenueFilter, showStaffFilter, eventSurface, filterEventPresets, scheduleScope, filterCategoryIds, filterStaffMemberId, filterVenueId, showVenue, showMap, showCapacity, cardRole, buttonVariant = "primary", buttonText = "Book", emptyMessage = "No upcoming events scheduled.", className, calendarContext }) => {
 		const fetchInitialEventsOnMount = initialEvents == null;
 		const resolvedShowFilters = showFilters ?? true;
 		const resolvedShowVenueFilter = showVenueFilter ?? false;
@@ -111810,7 +112070,7 @@ var init_EventCombined_client = __esmMin((() => {
 			pageSize,
 			stage
 		});
-		const { events: calendarEventsRaw, viewDate, viewport, loading: calendarLoading, goToPrevious, goToNext, goToToday } = useCalendarEvents({
+		const { events: calendarEventsRaw, viewDate, viewport, loadState: calendarLoadState, goToPrevious, goToNext, goToToday } = useCalendarEvents({
 			siteId,
 			initialEvents: useMemo(() => {
 				return getEventRuntimeFiltersKey(initialListFilters) === getEventRuntimeFiltersKey(listFilters) ? initialEvents ?? [] : [];
@@ -111823,9 +112083,10 @@ var init_EventCombined_client = __esmMin((() => {
 			startOfWeek,
 			preloadMonths: 1,
 			filters: listFilters,
-			stage
+			stage,
+			calendarContext
 		});
-		const eventsByDate = useMemo(() => groupEventsByDate(calendarEventsRaw), [calendarEventsRaw]);
+		const eventsByDate = useMemo(() => groupEventsByDate(calendarEventsRaw, calendarContext.timeZone), [calendarContext.timeZone, calendarEventsRaw]);
 		const dayNames = useMemo(() => getOrderedDayNames(startOfWeek), [startOfWeek]);
 		const tabs = [{
 			id: "list",
@@ -111927,7 +112188,7 @@ var init_EventCombined_client = __esmMin((() => {
 									}),
 									/* @__PURE__ */ jsxs("h3", {
 										className: "event-calendar-title",
-										children: [viewport.title, calendarLoading && /* @__PURE__ */ jsx("span", {
+										children: [viewport.title, calendarLoadState.kind === "loading" && /* @__PURE__ */ jsx("span", {
 											className: "rb-ml-2 rb-caption status-muted",
 											children: "(loading...)"
 										})]
@@ -111966,7 +112227,9 @@ var init_EventCombined_client = __esmMin((() => {
 							days: viewport.days,
 							events: calendarEventsRaw,
 							emptyMessage: "No events scheduled",
-							showCapacity: resolvedShowCapacity
+							showCapacity: resolvedShowCapacity,
+							calendarTimeZone: calendarContext.timeZone,
+							today: calendarContext.initialToday
 						}) : /* @__PURE__ */ jsxs("div", {
 							className: "event-calendar-container",
 							children: [/* @__PURE__ */ jsx("div", {
@@ -111983,12 +112246,13 @@ var init_EventCombined_client = __esmMin((() => {
 									return /* @__PURE__ */ jsx(CalendarDayCell, {
 										date,
 										events: dayEvents,
-										isCurrentMonth: date.getMonth() === viewDate.getMonth()
+										isCurrentMonth: date.month === viewDate.month,
+										today: calendarContext.initialToday
 									}, dateKey);
 								})
 							})]
 						}),
-						calendarEventsRaw.length === 0 && !calendarLoading && /* @__PURE__ */ jsx("p", {
+						calendarEventsRaw.length === 0 && calendarLoadState.kind === "idle" && /* @__PURE__ */ jsx("p", {
 							className: "event-calendar-empty",
 							children: emptyMessage
 						})
@@ -112021,15 +112285,17 @@ var WeekTimetableView, TimeRail, TimetableDayColumn, TimetableEventButton;
 var init_WeekTimetableView = __esmMin((() => {
 	init_EventModalContext();
 	init_timetableModel();
-	WeekTimetableView = ({ viewDate, events, startOfWeek, showCapacity, emptyMessage = "No classes scheduled" }) => {
+	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 ?? "");
@@ -112209,21 +112475,6 @@ function buildDisplayFilterParams(display) {
 		filterVenueId: display.filterVenueId
 	});
 }
-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"
-		})
-	});
-}
 var EventCalendarClient, EventCalendarWeekBoardClient, EventCalendarTimetableClient, EventCalendarGridClient, EventCalendarChrome;
 var init_EventCalendar_client = __esmMin((() => {
 	init_EventCalendar_interactive();
@@ -112232,6 +112483,7 @@ var init_EventCalendar_client = __esmMin((() => {
 	init_useCalendarEvents();
 	init_useEventFilters();
 	init_CalendarDayCell();
+	init_CalendarNavigationChevron();
 	init_EventFilters();
 	init_utils$3();
 	init_EventModalContext();
@@ -112271,38 +112523,75 @@ var init_EventCalendar_client = __esmMin((() => {
 			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 });
 	};
-	EventCalendarWeekBoardClient = ({ display }) => {
-		const days = useMemo(() => getWeekCalendarDayTuple(/* @__PURE__ */ new Date(), display.startOfWeek), [display.startOfWeek]);
-		return /* @__PURE__ */ jsx(WeekBoardView, { ...buildWeekBoardViewProps(display, days) });
+	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) });
 	};
 	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,
@@ -112311,7 +112600,8 @@ var init_EventCalendar_client = __esmMin((() => {
 				events,
 				startOfWeek: display.startOfWeek,
 				emptyMessage: display.emptyMessage,
-				showCapacity: display.showCapacity
+				showCapacity: display.showCapacity,
+				today: hydration.calendarContext.initialToday
 			})
 		}), /* @__PURE__ */ jsx(EventModals, {
 			cardRole: display.cardRole,
@@ -112325,24 +112615,25 @@ var init_EventCalendar_client = __esmMin((() => {
 		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,
@@ -112350,7 +112641,9 @@ var init_EventCalendar_client = __esmMin((() => {
 				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", {
@@ -112367,11 +112660,12 @@ var init_EventCalendar_client = __esmMin((() => {
 						return /* @__PURE__ */ jsx(CalendarDayCell, {
 							date,
 							events: dayEvents,
-							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]
@@ -112382,7 +112676,7 @@ var init_EventCalendar_client = __esmMin((() => {
 			showCapacity: display.showCapacity
 		})] });
 	};
-	EventCalendarChrome = ({ children, display, calendarView, className, error, filters, headerTitle, loading, onNext, onPrevious, onToday }) => /* @__PURE__ */ jsxs("div", {
+	EventCalendarChrome = ({ children, display, calendarView, className, loadState, filters, headerTitle, onRetry, onNext, onPrevious, onToday }) => /* @__PURE__ */ jsxs("div", {
 		className: [
 			"event-calendar",
 			className,
@@ -112401,11 +112695,11 @@ var init_EventCalendar_client = __esmMin((() => {
 							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]
@@ -112415,7 +112709,7 @@ var init_EventCalendar_client = __esmMin((() => {
 							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", {
@@ -112429,14 +112723,14 @@ var init_EventCalendar_client = __esmMin((() => {
 				})]
 			}),
 			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"