@riverbankcms/sdk 0.143.0 → 0.144.0

package/dist/_dts/theme-core/src/surfaces/index.d.ts

@@ -2,3 +2,4 @@ export * from './foregroundContract';
 export * from './foregroundInteraction';
 export * from './foregroundRoles';
 export * from './resolveSurfaceForeground';
+export * from './logoVariant';

package/dist/_dts/theme-core/src/surfaces/logoVariant.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Whether a surface reads as light or dark, judged from the text foreground
+ * that was resolved for it: light text means a dark surface. `unknown` covers
+ * every foreground we cannot honestly classify.
+ */
+export type SurfaceTone = 'light' | 'dark' | 'unknown';
+/** Concrete hex behind a plain, opaque palette token, or null otherwise. */
+export declare function opaquePaletteHexForToken(expandedPalette: Readonly<Record<string, string>>, token: string | null | undefined): string | null;
+/**
+ * Tone of the surface a foreground token was resolved for.
+ *
+ * A token with opacity has no known underlay to composite against, and a raw
+ * or unrecognised token has no palette hex, so both are `unknown` rather than
+ * a guess.
+ */
+export declare function surfaceToneFromForegroundToken(expandedPalette: Readonly<Record<string, string>>, foregroundToken: string | null | undefined): SurfaceTone;
+export type LogoVariants<TLogo> = Readonly<{
+    forLightBackgrounds: TLogo | null;
+    forDarkBackgrounds: TLogo | null;
+}>;
+/**
+ * The logo to draw on a surface of the given tone. A missing variant falls
+ * back to the other one, and an unknown tone uses the light-backgrounds logo,
+ * which is what every site rendered before variants existed.
+ */
+export declare function selectLogoVariant<TLogo>(tone: SurfaceTone, variants: LogoVariants<TLogo>): TLogo | null;

package/dist/_dts/theme-core/src/utils/colorStyles.d.ts

@@ -58,6 +58,16 @@ export declare function cssVarValue(token: ThemeColorToken): string;
  * @returns CSSProperties with backgroundColor
  */
 export declare function backgroundColorStyle(token: ThemeColorToken): CSSProperties;
+/**
+ * Converts a text color token to a CSS color value that follows the enclosing
+ * surface. The semantic text tokens (`text`, `heading`, `mutedText`) resolve
+ * to the surface foreground variables, so text adapts when a section's
+ * background changes; any other token is a fixed theme color.
+ *
+ * @param token - Theme color token
+ * @returns CSS color value
+ */
+export declare function textColorValue(token: ThemeColorToken): string;
 /**
  * Creates a text color style object from a theme token.
  *

package/dist/_dts/ui/src/editor-item-card.d.ts

@@ -0,0 +1,116 @@
+import * as React from 'react';
+/**
+ * The card an editor uses for one item in an ordered list: a block on a page,
+ * a field on a form, an item in a repeater.
+ *
+ * It owns presentation only: the surface, the header layout, the disclosure
+ * and its accessibility contract, and how actions are drawn. Which actions an
+ * item offers, when they are available, reordering, drag state and focus
+ * restoration all belong to the editor that renders it.
+ */
+export type EditorItemCardControl = Readonly<{
+    label: string;
+    disabled?: boolean;
+    onSelect: () => void;
+    ref?: React.Ref<HTMLButtonElement>;
+}>;
+export type EditorItemCardInlineAction = EditorItemCardControl & Readonly<{
+    key: string;
+    icon: React.ReactNode;
+}>;
+export type EditorItemCardMenuItem = Readonly<{
+    key: string;
+    label: string;
+    icon: React.ReactNode;
+    tone?: 'default' | 'destructive';
+    disabled?: boolean;
+    onSelect: () => void;
+}>;
+export type EditorItemCardMenuGroup = Readonly<{
+    key: string;
+    items: readonly EditorItemCardMenuItem[];
+}>;
+export type EditorItemCardMenu = Readonly<{
+    /** Accessible name for the trigger, e.g. "More actions for Hero". */
+    label: string;
+    disabled?: boolean;
+    ref?: React.Ref<HTMLButtonElement>;
+    groups: readonly EditorItemCardMenuGroup[];
+}>;
+export type EditorItemCardActionsProps = Readonly<{
+    move?: Readonly<{
+        earlier: EditorItemCardControl;
+        later: EditorItemCardControl;
+    }>;
+    /** Controls that render their own trigger, such as a settings dialog. */
+    slot?: React.ReactNode;
+    inline?: readonly EditorItemCardInlineAction[];
+    menu?: EditorItemCardMenu;
+    className?: string;
+    testId?: string;
+}>;
+/**
+ * `locked` renders no drag handle and no actions at all. There is deliberately
+ * no way to show them disabled: a control that never works reads as broken.
+ */
+export type EditorItemCardAffordances = Readonly<{
+    kind: 'full';
+    dragHandle?: React.ReactNode;
+    actions?: EditorItemCardActionsProps;
+}> | Readonly<{
+    kind: 'locked';
+}>;
+export type EditorItemCardDisclosure = Readonly<{
+    kind: 'collapsible';
+    open: boolean;
+    onOpenChange: (open: boolean) => void;
+    /** Stable id for the content region; generated when omitted. */
+    contentId?: string;
+}> | Readonly<{
+    kind: 'static';
+}>;
+export type EditorItemCardState = 'default' | 'error' | 'highlighted';
+export type EditorItemCardProps = Omit<React.ComponentProps<'div'>, 'title' | 'children'> & Readonly<{
+    title: string;
+    subtitle?: React.ReactNode;
+    /** Status shown beside the title, e.g. a validation hint. */
+    titleAdornment?: React.ReactNode;
+    state?: EditorItemCardState;
+    disclosure: EditorItemCardDisclosure;
+    affordances: EditorItemCardAffordances;
+    /** When false the header's controls are inert, e.g. while handlers load. */
+    interactive?: boolean;
+    /** Prefix for the header's test ids. */
+    testIdPrefix?: string;
+    children?: React.ReactNode;
+}>;
+export declare function EditorItemCard({ title, subtitle, titleAdornment, state, disclosure: requestedDisclosure, affordances, interactive, testIdPrefix, children, className, ...rootProps }: EditorItemCardProps): React.ReactElement;
+/**
+ * The action row, usable on its own by item presentations that aren't a
+ * header card (for example a thumbnail tile).
+ */
+export declare function EditorItemCardActions({ move, slot, inline, menu, className, testId, }: EditorItemCardActionsProps): React.ReactElement;
+export type EditorItemCardDragHandleProps = React.ButtonHTMLAttributes<HTMLButtonElement> & {
+    /**
+     * Keeps the handle's space so titles stay aligned down a list, but makes it
+     * invisible and inert — e.g. while the item is expanded.
+     */
+    concealed?: boolean;
+};
+export declare const EditorItemCardDragHandle: React.ForwardRefExoticComponent<React.ButtonHTMLAttributes<HTMLButtonElement> & {
+    /**
+     * Keeps the handle's space so titles stay aligned down a list, but makes it
+     * invisible and inert — e.g. while the item is expanded.
+     */
+    concealed?: boolean;
+} & React.RefAttributes<HTMLButtonElement>>;
+export type EditorItemInsertDividerProps = Readonly<{
+    /** Visible action text, e.g. "Insert block" or "Insert field". */
+    label: string;
+    onSelect: () => void;
+}>;
+/**
+ * The gap between two items in an editor list. Its insert action appears
+ * when the gap is hovered or when keyboard focus reaches it.
+ */
+export declare function EditorItemInsertDivider({ label, onSelect }: EditorItemInsertDividerProps): React.ReactElement;

package/dist/_dts/ui/src/index.d.ts

@@ -4,6 +4,7 @@ export { SplitButton, type SplitButtonMenuItem, type SplitButtonProps, } from '.
 export { ButtonGroup, ButtonGroupSeparator, ButtonGroupText, buttonGroupVariants, } from './button-group';
 export { Card, CardHeader, CardTitle, CardDescription, CardContent, CardFooter, } from './card';
 export { Surface, surfaceVariants, type SurfaceProps } from './surface';
+export { EditorItemCard, EditorItemCardActions, EditorItemCardDragHandle, EditorItemInsertDivider, type EditorItemCardActionsProps, type EditorItemCardAffordances, type EditorItemCardControl, type EditorItemCardDisclosure, type EditorItemCardDragHandleProps, type EditorItemCardInlineAction, type EditorItemCardMenu, type EditorItemCardMenuGroup, type EditorItemCardMenuItem, type EditorItemCardProps, type EditorItemCardState, type EditorItemInsertDividerProps, } from './editor-item-card';
 export { Collapsible, CollapsibleTrigger, CollapsibleContent, } from './collapsible';
 export { Disclosure, DisclosureTrigger, DisclosureContent, } from './disclosure';
 export { Dialog, DialogTrigger, DialogPortal, DialogClose, DialogOverlay, DialogContent, DialogHeader, DialogFooter, DialogTitle, DialogDescription, } from './dialog';

package/dist/client/{BookingConsentAgreement-BoCtvzzu.mjs → BookingConsentAgreement-DoAILrkN.mjs}

@@ -1,8 +1,7 @@
 "use client";
-import { O as clsx } from "./colorStyles-3013aRAY.mjs";
-import { Ft as assertNever$2, pn as formatCurrencyAmount } from "./propsDecoder-CIZ-hbIG.mjs";
-import { a as CheckIcon } from "./scrollToBlock-BPZl0gPZ.mjs";
-import { n as RichText } from "./checkoutUrls-FL6lRkrt.mjs";
+import { _n as formatCurrencyAmount, zt as assertNever$2 } from "./propsDecoder-DPXtCZWP.mjs";
+import { a as CheckIcon } from "./scrollToBlock-0-C3DVhK.mjs";
+import { n as RichText } from "./checkoutUrls-CW3-78uu.mjs";
 import { useCallback, useEffect, useReducer, useRef } from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 //#region ../core/src/date-math.ts
@@ -613,56 +612,6 @@ function usePolling(config) {
 	};
 }
 //#endregion
-//#region ../blocks/src/system/runtime/nodes/spinner.tsx
-function resolveColorStyle(color) {
-	switch (color) {
-		case void 0: return;
-		case "inherit": return { color: "inherit" };
-		case "foreground": return { color: "rgb(var(--tb-foreground))" };
-		case "text": return { color: "rgb(var(--tb-text))" };
-		default: return;
-	}
-}
-function SpinnerNode({ className, size = "md", color, strokeWidth = 3, srLabel, style, ...rest }) {
-	const hasExplicitAriaLabel = typeof rest["aria-label"] === "string" && rest["aria-label"].trim().length > 0;
-	const accessibilityProps = srLabel ? {
-		role: "status",
-		"aria-live": "polite"
-	} : hasExplicitAriaLabel ? {} : { "aria-hidden": true };
-	const trackStroke = color === "inherit" ? "currentColor" : "var(--rb-spinner-track-color)";
-	const trackOpacity = color === "inherit" ? .25 : 1;
-	return /* @__PURE__ */ jsxs("span", {
-		...accessibilityProps,
-		className: clsx("rb-spinner", size ? `rb-spinner--${size}` : null, color === "inherit" ? "rb-spinner--inherit" : null, className),
-		style: {
-			...resolveColorStyle(color),
-			...style ?? {}
-		},
-		...rest,
-		children: [/* @__PURE__ */ jsxs("svg", {
-			viewBox: "0 0 24 24",
-			fill: "none",
-			"aria-hidden": "true",
-			children: [/* @__PURE__ */ jsx("circle", {
-				cx: "12",
-				cy: "12",
-				r: "10",
-				stroke: trackStroke,
-				strokeWidth,
-				opacity: trackOpacity
-			}), /* @__PURE__ */ jsx("path", {
-				d: "M12 2a10 10 0 0 1 10 10",
-				stroke: "currentColor",
-				strokeWidth,
-				strokeLinecap: "round"
-			})]
-		}), srLabel ? /* @__PURE__ */ jsx("span", {
-			className: "rb-sr-only",
-			children: srLabel
-		}) : null]
-	});
-}
-//#endregion
 //#region ../blocks/src/system/runtime/shared/components/StepIndicator.tsx
 /**
 * Shared step indicator component for registration wizards.
@@ -748,4 +697,4 @@ function BookingConsentAgreement({ agreement, showTitle = true, title, titleId }
 	})] });
 }
 //#endregion
-export { buildBookingPaymentSelectionViewModel as a, usePolling as i, StepIndicator as n, resolveBookingPaymentDueNowCents as o, SpinnerNode as r, formatPrice as s, BookingConsentAgreement as t };
+export { resolveBookingPaymentDueNowCents as a, buildBookingPaymentSelectionViewModel as i, StepIndicator as n, formatPrice as o, usePolling as r, BookingConsentAgreement as t };

package/dist/client/{DiscountCodeDisclosure-B5S30nZk.mjs → DiscountCodeDisclosure-X528hUTf.mjs}

@@ -1,5 +1,5 @@
 "use client";
-import { ft as themeButtonClassName } from "./propsDecoder-CIZ-hbIG.mjs";
+import { t as ThemedButton } from "./ThemedButton-BwNFVwi4.mjs";
 import { useId } from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
 //#region ../blocks/src/system/runtime/api/types/discounts.ts
@@ -38,14 +38,8 @@ const themeFormClasses = {
 	label: "form-label",
 	row: "rb-flex rb-flex-col rb-gap-2 rb-sm-flex-row",
 	input: "form-input",
-	apply: themeButtonClassName({
-		variant: "secondary",
-		size: "sm"
-	}),
-	remove: themeButtonClassName({
-		variant: "secondary",
-		size: "sm"
-	}),
+	apply: "",
+	remove: "",
 	hint: "rb-caption status-muted",
 	feedback: "rb-caption"
 };
@@ -53,6 +47,22 @@ function getDiscountCodeDisclosureClasses(surface) {
 	if (surface === "theme-form") return themeFormClasses;
 	return BLOCK_DISCOUNT_CODE_DISCLOSURE_CLASSES[surface];
 }
+function DiscountActionButton(props) {
+	return props.surface === "theme-form" ? /* @__PURE__ */ jsx(ThemedButton, {
+		type: "button",
+		variant: "secondary",
+		size: "sm",
+		label: props.label,
+		onClick: props.onClick,
+		disabled: props.disabled
+	}) : /* @__PURE__ */ jsx("button", {
+		type: "button",
+		className: props.className,
+		onClick: props.onClick,
+		disabled: props.disabled,
+		children: props.label
+	});
+}
 function DiscountCodeDisclosure({ surface, isOpen, code, onOpen, onChange, onRemove, onApply, id, toggleLabel = "Have a discount code?", label = "Discount code", placeholder = "Enter code", applyLabel = "Apply", removeLabel = "Remove", hint = "Applied at checkout.", feedback = null, isApplying = false, applyDisabled = false, disabled = false }) {
 	const generatedId = useId();
 	const inputId = id ?? `discount-code-${generatedId}`;
@@ -94,19 +104,19 @@ function DiscountCodeDisclosure({ surface, isOpen, code, onOpen, onChange, onRem
 							autoComplete: "off",
 							disabled: disabled || isApplying
 						}),
-						onApply ? /* @__PURE__ */ jsx("button", {
-							type: "button",
+						onApply ? /* @__PURE__ */ jsx(DiscountActionButton, {
+							surface,
 							className: classes.apply,
+							label: isApplying ? "Applying..." : applyLabel,
 							onClick: onApply,
-							disabled: disabled || isApplying || applyDisabled,
-							children: isApplying ? "Applying..." : applyLabel
+							disabled: disabled || isApplying || applyDisabled
 						}) : null,
-						/* @__PURE__ */ jsx("button", {
-							type: "button",
+						/* @__PURE__ */ jsx(DiscountActionButton, {
+							surface,
 							className: classes.remove,
+							label: removeLabel,
 							onClick: onRemove,
-							disabled: disabled || isApplying,
-							children: removeLabel
+							disabled: disabled || isApplying
 						})
 					]
 				}),

package/dist/client/{EventCombined.client-CeZ2-zSt.mjs → EventCombined.client-DSBVwq5m.mjs}

@@ -1,10 +1,11 @@
 "use client";
-import { O as clsx } from "./colorStyles-3013aRAY.mjs";
-import { $ as formatDateKey, $t as getLocalScheduleDate, B as planCalendarMonthRanges, F as calendarPageResponseError, H as buildEventRuntimeFilters, I as calendarQueryKey, J as getContainerClass, L as calendarWindowBounds, P as calendarMonthDate, Q as buildCalendarViewport, R as calendarWindowMonths$1, U as getEventRuntimeFiltersKey, Y as MONTH_NAMES, Z as addMonths, Zt as formatLocalScheduleDate, at as shiftCalendarAnchorDate, et as getDayOfWeek, ft as themeButtonClassName, it as isToday, q as getCardOrientation, rt as isSameCalendarDay, tt as getOrderedDayNames } from "./propsDecoder-CIZ-hbIG.mjs";
-import { a as EventCardClient, i as EventPaginatedListView, n as useEventPagination, o as EventFilters, r as toError, s as formatEventTeacherLine, t as useEventFilters } from "./useEventFilters-CFU21QZo.mjs";
-import { o as formatEventRemainingPlaces, p as isEventFull, t as formatEventPrice } from "./pricing-ChinRYFt.mjs";
-import { a as formatTime, d as resolveEventLinkProps, o as groupEventsByDate, s as resolveEventTimeZone, t as formatDate, u as resolveEventCta } from "./dates-BnzVksi4.mjs";
-import { n as useBlockApi } from "./context-BOimxE3U.mjs";
+import { O as clsx } from "./colorStyles-CuJBiS-1.mjs";
+import { F as calendarMonthKey, G as buildEventRuntimeFilters, I as calendarPageResponseError, K as getEventRuntimeFiltersKey, L as calendarQueryKey, P as calendarMonthDate, Q as MONTH_NAMES, R as calendarWindowBounds, V as planCalendarMonthRanges, W as getBlockApiReadStage, X as getCardOrientation, Z as getContainerClass, ct as shiftCalendarAnchorDate, et as addMonths, it as getOrderedDayNames, nt as formatDateKey, ot as isSameCalendarDay, rn as getLocalScheduleDate, rt as getDayOfWeek, st as isToday, tn as formatLocalScheduleDate, tt as buildCalendarViewport, z as calendarWindowMonths$1 } from "./propsDecoder-DPXtCZWP.mjs";
+import { a as EventCardClient, i as EventPaginatedListView, n as useEventPagination, o as EventFilters, r as toError, s as formatEventTeacherLine, t as useEventFilters } from "./useEventFilters-zvnnE1ro.mjs";
+import { o as formatEventRemainingPlaces, p as isEventFull, t as formatEventPrice } from "./pricing-Bl1CAl28.mjs";
+import { a as formatTime, d as resolveEventLinkProps, o as groupEventsByDate, s as resolveEventTimeZone, t as formatDate, u as resolveEventCta } from "./dates-ClFx7Epy.mjs";
+import { n as useBlockApi } from "./context-CDLCfDep.mjs";
+import { n as ThemedButtonLink, t as ThemedButton } from "./ThemedButton-BwNFVwi4.mjs";
 import { t as createBodyThemePortalRoot } from "./themePortalRoot-AGs4cE7t.mjs";
 import { t as ModalShell } from "./ModalShell-CqkBvBIC.mjs";
 import React, { createContext, useCallback, useContext, useEffect, useId, useMemo, useRef, useState } from "react";
@@ -95,9 +96,6 @@ const TabBar = ({ tabs, activeTab, onTabChange, className }) => {
 };
 //#endregion
 //#region ../blocks/src/system/runtime/hooks/useCalendarEvents.state.ts
-function calendarMonthKey(date) {
-	return `${date.year}-${String(date.month).padStart(2, "0")}`;
-}
 function calendarWindowMonths(date, radius) {
 	const months = [];
 	for (let offset = -radius; offset <= radius; offset++) months.push(calendarMonthKey(addMonths(date, offset)));
@@ -134,10 +132,9 @@ function planCalendarRequest(state, months, retry) {
 		const month = state.get(key);
 		return !month || month.kind === "partial" || retry && month.kind === "failed";
 	});
-	const first = missing[0];
-	if (!first) return null;
-	const month = state.get(first);
-	const continuation = month && (month.kind === "partial" || month.kind === "failed") ? month.continuation : void 0;
+	if (missing.length === 0) return null;
+	const continuedMonth = missing.map((key) => state.get(key)).find((month) => month?.kind === "partial") ?? (retry ? missing.map((key) => state.get(key)).find((month) => month?.kind === "failed") : void 0);
+	const continuation = continuedMonth?.kind === "partial" || continuedMonth?.kind === "failed" ? continuedMonth.continuation : void 0;
 	if (continuation) return {
 		...continuation,
 		months: continuation.months.filter((key) => state.get(key)?.kind !== "ready")
@@ -330,40 +327,55 @@ function useCalendarViewport({ view = "month", startOfWeek = "monday", initialDa
 		}, [today])
 	};
 }
+function prepareCalendarRead(siteId, stage, filters, readProfile) {
+	return siteId ? {
+		kind: "ready",
+		key: calendarQueryKey(siteId, stage, {
+			...filters,
+			readProfile
+		})
+	} : {
+		kind: "missing-site-config",
+		error: /* @__PURE__ */ new Error("Calendar is missing site configuration")
+	};
+}
 /**
 * The reducer owns month data and request ownership. The hook only performs I/O.
 * Requests for other months remain useful until the query context changes.
 */
-function useCalendarEventCache({ readProfile = "listing-card", viewDate, calendarWindow, preloadMonths = 1, filters, stage, timeZone }) {
+function useCalendarEventCache({ readProfile = "listing-card", viewDate, calendarWindow, preloadMonths = 1, filters, timeZone }) {
 	const { getPublicEventCalendarWindow, config } = useBlockApi();
+	const stage = getBlockApiReadStage(config);
 	const filtersKey = getEventRuntimeFiltersKey(filters);
+	const preparation = useMemo(() => prepareCalendarRead(config.siteId, stage, filters, readProfile), [
+		config.siteId,
+		filtersKey,
+		stage,
+		readProfile
+	]);
 	const context = useMemo(() => ({
 		getPublicEventCalendarWindow,
 		filters,
 		stage,
 		timeZone,
-		key: calendarQueryKey(config.siteId ?? "", stage, {
-			...filters,
-			readProfile
-		})
+		preparation
 	}), [
 		getPublicEventCalendarWindow,
-		config.siteId,
 		filtersKey,
 		stage,
 		timeZone,
-		readProfile
+		preparation
 	]);
 	const activeContext = useRef(context);
 	activeContext.current = context;
-	const seed = () => calendarWindow?.scope.key === context.key && calendarWindow.scope.timeZone === timeZone ? seedCalendarWindow(calendarWindow) : /* @__PURE__ */ new Map();
+	const seed = () => context.preparation.kind === "ready" && calendarWindow?.scope.key === context.preparation.key && calendarWindow.scope.timeZone === timeZone ? seedCalendarWindow(calendarWindow) : /* @__PURE__ */ new Map();
 	const [snapshot, setSnapshot] = useState(() => ({
 		context,
 		cache: seed()
 	}));
 	if (snapshot.context !== context) setSnapshot({
 		context,
-		cache: /* @__PURE__ */ new Map()
+		cache: seed()
 	});
 	const months = useMemo(() => calendarWindowMonths(viewDate, preloadMonths), [
 		viewDate.year,
@@ -371,13 +383,15 @@ function useCalendarEventCache({ readProfile = "listing-card", viewDate, calenda
 		preloadMonths
 	]);
 	const displayMonths = useMemo(() => calendarWindowMonths(viewDate, 1), [viewDate.year, viewDate.month]);
-	const request = useMemo(() => snapshot.context === context ? planCalendarRequest(snapshot.cache, months, false) : null, [
+	const request = useMemo(() => snapshot.context === context && context.preparation.kind === "ready" ? planCalendarRequest(snapshot.cache, months, false) : null, [
 		snapshot,
 		context,
 		months
 	]);
 	const launched = useRef(/* @__PURE__ */ new WeakSet());
 	const runRequest = useCallback(async (planned) => {
+		const preparation = context.preparation;
+		if (preparation.kind !== "ready") return;
 		if (launched.current.has(planned)) return;
 		launched.current.add(planned);
 		const apply = (action) => setSnapshot((current) => current.context === context ? {
@@ -394,7 +408,6 @@ function useCalendarEventCache({ readProfile = "listing-card", viewDate, calenda
 				const page = await context.getPublicEventCalendarWindow({
 					...context.filters,
 					readProfile,
-					stage: context.stage,
 					...planned.window,
 					afterStartsAt: cursor?.startsAt,
 					afterId: cursor?.occurrenceId,
@@ -402,7 +415,7 @@ function useCalendarEventCache({ readProfile = "listing-card", viewDate, calenda
 				});
 				if (activeContext.current !== context) return;
 				const invalid = calendarPageResponseError(page, {
-					key: context.key,
+					key: preparation.key,
 					timeZone,
 					window: planned.window,
 					cursor
@@ -444,11 +457,14 @@ function useCalendarEventCache({ readProfile = "listing-card", viewDate, calenda
 	]);
 	return {
 		events: selectCalendarEvents(snapshot.cache, displayMonths),
-		loadState: projectCalendarLoadState(snapshot.cache, months),
+		loadState: context.preparation.kind === "ready" ? projectCalendarLoadState(snapshot.cache, months) : {
+			kind: "error",
+			error: context.preparation.error
+		},
 		retryCurrentView
 	};
 }
-function useCalendarEvents({ readProfile, siteId: _siteId, calendarWindow, view = "month", startOfWeek = "monday", preloadMonths = 1, filters, stage, calendarContext }) {
+function useCalendarEvents({ readProfile, siteId: _siteId, calendarWindow, view = "month", startOfWeek = "monday", preloadMonths = 1, filters, calendarContext }) {
 	const today = useCalendarToday(calendarContext);
 	const { viewDate, viewport, goToDate, goToPrevious, goToNext, goToToday } = useCalendarViewport({
 		view,
@@ -462,7 +478,6 @@ function useCalendarEvents({ readProfile, siteId: _siteId, calendarWindow, view
 		calendarWindow,
 		preloadMonths,
 		filters,
-		stage,
 		timeZone: calendarContext.timeZone
 	});
 	return {
@@ -709,10 +724,6 @@ function AgendaLinkCard({ event, showCapacity, showVenue, buttonVariant, buttonT
 	const price = formatEventPrice(event);
 	const capacity = showCapacity ? formatEventRemainingPlaces(event) : null;
 	const cta = resolveEventCta(event, buttonText);
-	const buttonClass = themeButtonClassName({
-		variant: buttonVariant,
-		size: "sm"
-	});
 	return /* @__PURE__ */ jsxs("article", {
 		className: "event-agenda-card event-agenda-card--agenda",
 		children: [
@@ -764,12 +775,14 @@ function AgendaLinkCard({ event, showCapacity, showVenue, buttonVariant, buttonT
 				}), cta.hidden ? /* @__PURE__ */ jsx("span", {
 					className: "event-agenda-card-status status-muted",
 					children: cta.label
-				}) : /* @__PURE__ */ jsx("a", {
+				}) : /* @__PURE__ */ jsx(ThemedButtonLink, {
 					href: cta.href,
 					target: cta.external ? "_blank" : void 0,
 					rel: cta.external ? "noopener noreferrer" : void 0,
-					className: `${buttonClass} event-agenda-card-cta`,
-					children: cta.label
+					variant: buttonVariant,
+					size: "sm",
+					extraClassName: "event-agenda-card-cta",
+					label: cta.label
 				})]
 			})
 		]
@@ -1064,7 +1077,6 @@ function toEventCombinedControllerProps(props) {
 	return {
 		events: props.render.hydration.prefetchedEvents ? [...props.render.display.events] : void 0,
 		siteId: props.render.hydration.siteId,
-		stage: props.render.hydration.stage,
 		listLayout: props.render.display.listLayout,
 		listColumns: props.render.display.listColumns,
 		eventsPerPage: props.render.display.eventsPerPage,
@@ -1122,14 +1134,12 @@ const EventCombinedCalendarHeader = ({ calendarView, title, loadState, onPreviou
 				children: /* @__PURE__ */ jsx(CalendarNavigationChevron, { direction: "next" })
 			})
 		]
-	}), /* @__PURE__ */ jsx("button", {
+	}), /* @__PURE__ */ jsx(ThemedButton, {
 		type: "button",
 		onClick: onToday,
-		className: themeButtonClassName({
-			variant: buttonVariant,
-			size: "sm"
-		}),
-		children: "Today"
+		variant: buttonVariant,
+		size: "sm",
+		label: "Today"
 	})]
 });
 const EventCombinedCalendarTab = ({ calendarTabViews, calendarView, calendarViewOptions, onCalendarViewChange, calendarEvents, eventsByDate, viewDate, viewport, calendarLoadState, dayNames, calendarContext, today, goToPrevious, goToNext, goToToday, emptyMessage, showCapacity, showVenue, cardRole, buttonVariant, buttonText, showEmptyState }) => /* @__PURE__ */ jsxs(EventModalProvider, { children: [/* @__PURE__ */ jsxs("div", {
@@ -1198,7 +1208,7 @@ const EventCombinedCalendarTab = ({ calendarTabViews, calendarView, calendarView
 * Tabbed view with List and Calendar tabs.
 * List tab includes filtering; Calendar tab shows month/week view.
 */
-const EventCombinedClient = ({ events: initialEvents, siteId, stage, listLayout = "stack", listColumns = "3", eventsPerPage = 12, paginationAction = {
+const EventCombinedClient = ({ events: initialEvents, siteId, 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, seriesIds, filterCategoryIds, filterStaffMemberId, filterVenueId, showVenue, showMap, showCapacity, cardRole, buttonVariant = "primary", buttonText = "Book", emptyMessage = "No upcoming events scheduled.", className, calendarContext, calendarWindow }) => {
@@ -1252,8 +1262,7 @@ const EventCombinedClient = ({ events: initialEvents, siteId, stage, listLayout
 		fetchInitialOnMount: fetchInitialEventsOnMount,
 		initialFilters: initialListFilters,
 		filters: listFilters,
-		pageSize,
-		stage
+		pageSize
 	});
 	const { events: calendarEventsRaw, viewDate, today, viewport, loadState: calendarLoadState, goToPrevious, goToNext, goToToday } = useCalendarEvents({
 		siteId,
@@ -1261,7 +1270,6 @@ const EventCombinedClient = ({ events: initialEvents, siteId, stage, listLayout
 		startOfWeek,
 		preloadMonths: 1,
 		filters: listFilters,
-		stage,
 		calendarContext,
 		calendarWindow
 	});

package/dist/client/{EventListing.client-DJN3j8B3.mjs → EventListing.client-DmFAX7Vb.mjs}

@@ -1,6 +1,6 @@
 "use client";
-import { H as buildEventRuntimeFilters } from "./propsDecoder-CIZ-hbIG.mjs";
-import { i as EventPaginatedListView, n as useEventPagination, o as EventFilters, t as useEventFilters } from "./useEventFilters-CFU21QZo.mjs";
+import { G as buildEventRuntimeFilters } from "./propsDecoder-DPXtCZWP.mjs";
+import { i as EventPaginatedListView, n as useEventPagination, o as EventFilters, t as useEventFilters } from "./useEventFilters-zvnnE1ro.mjs";
 import { useId, useMemo } from "react";
 import { jsx } from "react/jsx-runtime";
 //#region ../blocks/src/system/runtime/nodes/events/EventListing.client.tsx
@@ -32,8 +32,7 @@ const EventListingController = ({ render }) => {
 		fetchInitialOnMount: hydration.fetchInitialEventsOnMount,
 		initialFilters: initialListFilters,
 		filters: listFilters,
-		pageSize: hydration.eventsPerPage,
-		stage: hydration.stage
+		pageSize: hydration.eventsPerPage
 	});
 	return /* @__PURE__ */ jsx(EventPaginatedListView, {
 		display,

package/dist/client/{LeafletStaticMap-RjtGzDQT.mjs → LeafletStaticMap-BAqXdfhq.mjs}

@@ -1,5 +1,5 @@
 "use client";
-import { Pt as isRecord } from "./propsDecoder-CIZ-hbIG.mjs";
+import { Rt as isRecord } from "./propsDecoder-DPXtCZWP.mjs";
 import { useEffect, useRef, useState } from "react";
 import { jsx } from "react/jsx-runtime";
 //#region ../blocks/src/system/runtime/nodes/shared/LeafletStaticMap.tsx