@riverbankcms/sdk 0.85.0 → 0.89.1

package/dist/client/{chunk-3C2VTPWI.mjs → chunk-CQKKFEQD.mjs}

@@ -1,17 +1,19 @@
 "use client";
-import { LeafletStaticMap } from './chunk-XSV6KW4D.mjs';
-import { MagicLinkForm, useWaitlistClaim } from './chunk-3DTWLTXM.mjs';
-import { usePolling } from './chunk-ZKUO52W3.mjs';
-import { SpinnerNode } from './chunk-SYIJ5JO2.mjs';
+import { LeafletStaticMap } from './chunk-ZT5XE7FK.mjs';
+import { resolveCoursePricingState, useWaitlistClaim, MagicLinkForm, formatCoursePriceAmount, formatCoursePriceDisplay } from './chunk-RSQWWUAD.mjs';
+import { CreditCard, Ticket, Star, Sparkles } from './chunk-6N7YRNYU.mjs';
+import { usePolling } from './chunk-LQFDYWPJ.mjs';
+import { SpinnerNode } from './chunk-FHU6PFPM.mjs';
 import { useDiscountCodeUi } from './chunk-ZFHRN6W2.mjs';
-import { createBodyThemePortalRoot, TabBarFragment, logoutPortal, StepIndicator, DiscountCodeDisclosure, TerminalPanel, StateIcon, formatPrice, CrossIcon, ClockIcon, consumeSearchParam, LoggedInAsUser, CheckIcon } from './chunk-7UCLJ5SP.mjs';
+import { createBodyThemePortalRoot, TabBarFragment, logoutPortal, consumeSearchParam, StepIndicator, DiscountCodeDisclosure, TerminalPanel, StateIcon, formatPrice, CrossIcon, ClockIcon, LoggedInAsUser, CheckIcon } from './chunk-EY42X22F.mjs';
 import { getFieldValidationControlProps, FieldValidationMessage } from './chunk-3DCJ45Z2.mjs';
-import { ModalShell } from './chunk-DVNUDUVT.mjs';
+import { ModalShell } from './chunk-WBQG7VJA.mjs';
 import { isSpamProtectionEnabled, AltchaWidget, getChallengeUrl } from './chunk-SDIYSQAY.mjs';
-import { useBlockApi, FeedbackMessage } from './chunk-UDNSI5PY.mjs';
-import { buildEventRuntimeFilters, buildEventCalendarListingRender, groupEventsByDate, getOrderedDayNames, formatDateKey, getEventRuntimeFiltersKey, themeButtonClassName, normalizeCsvIds, normalizeOptionalId, normalizeEventBlockKind, normalizeCsvString, EventCompactRow, EmptyState, getContainerClass, getCardOrientation, isToday, MAX_EVENTS_PER_DAY, formatTime, WIZARD_STEPS, getWizardStepsForContext, getStepNumber, resolveCoursePricingState, resolveRuntimeEventPricing, formatEventPrice, formatEventDateParts, DateTimeTile, EventCard, buildCalendarViewport, shiftCalendarAnchorDate, addMonths, getThreeMonthRange, buildTimetableModel, formatDate, toRegistrationEvents, isEventContentType, findPreSelectedEvent, resolveRegistrationTarget, findEventByOccurrenceId, resolveEventRequiresPayment, resolveDiscountContext, formatCoursePriceAmount, formatCoursePriceDisplay, MONTH_NAMES, getEventAvailability, formatEventTeacherLine, CreditCard, Ticket, Star, Sparkles, assertNever11 } from './chunk-VGDBVNOO.mjs';
-import { publicEventPricingType, getBookingLocalDateKey, toScheduledBookingDateTime, toBookingTimeZone, publicEventPricingCurrency, formatBookingDateTime, publicEventPricingMode, publicEventScalarPrice, publicEventTicketTypes, formatBookingDate, formatBookingTime } from './chunk-ZE5G642V.mjs';
-import React9, { createContext, useId, useMemo, useState, useRef, useEffect, useCallback, useContext, useReducer } from 'react';
+import { useBlockApi, FeedbackMessage } from './chunk-STJ2NCQM.mjs';
+import { buildEventRuntimeFilters, buildEventCalendarListingRender, groupEventsByDate, getOrderedDayNames, formatDateKey, getEventRuntimeFiltersKey, themeButtonClassName, normalizeCsvIds, normalizeOptionalId, normalizeEventBlockKind, normalizeCsvString, EventCompactRow, EmptyState, getContainerClass, getCardOrientation, isToday, MAX_EVENTS_PER_DAY, formatTime, WIZARD_STEPS, getWizardStepsForContext, getStepNumber, formatEventPriceDisplay, resolveRuntimeEventPricing, formatEventPrice, formatEventDateParts, DateTimeTile, assertNever11, EventCard, buildCalendarViewport, shiftCalendarAnchorDate, addMonths, getThreeMonthRange, buildTimetableModel, formatDate, toRegistrationEvents, isEventContentType, findPreSelectedEvent, resolveRegistrationTarget, findEventByOccurrenceId, resolveEventRequiresPayment, resolveDiscountContext, MONTH_NAMES, getEventAvailability, formatEventTeacherLine } from './chunk-UQFY4AHX.mjs';
+import { publicEventPricingType, getBookingLocalDateKey, toScheduledBookingDateTime, toBookingTimeZone, publicEventPricingCurrency, formatBookingDateTime, publicEventPricingMode, publicEventScalarPrice, publicEventTicketTypes, formatCurrencyAmount, formatBookingDate, formatBookingTime } from './chunk-25W2EQUN.mjs';
+import React9, { createContext, useId, useMemo, useReducer, useState, useRef, useEffect, useCallback, useContext } from 'react';
+import { createPortal } from 'react-dom';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 
 function StepIndicator2(props) {
@@ -2744,6 +2746,12 @@ function EventPortalAuthPrompt(props) {
     /* @__PURE__ */ jsx("button", { type: "button", className: "er-portal-auth-link", onClick: props.onRequestLogin, children: props.copy.buttonText })
   ] });
 }
+function getActiveTicketTypes(event) {
+  return event?.pricing.kind === "ticket_types" ? event.pricing.ticketTypes.filter((ticketType) => ticketType.isActive).sort((left, right) => left.sortOrder - right.sortOrder) : [];
+}
+function formatTicketTypePrice(ticketType, currency) {
+  return formatCurrencyAmount(ticketType.priceAmount, currency, { decimals: "auto" });
+}
 function EventRegistrationWizard(props) {
   const {
     occurrenceContext,
@@ -2763,6 +2771,8 @@ function EventRegistrationWizard(props) {
   const maxTicketsNum = normalizeEventRegistrationMaxTickets(maxTickets);
   const showSpamProtection = spamProtectionEnabled ?? isSpamProtectionEnabled();
   const buttonClass = themeButtonClassName({ variant: buttonVariant, size: "md" });
+  const registrationRootClassName = `event-registration ${className || ""}`;
+  const registrationRootRef = React9.useRef(null);
   const wizard = useEventRegistrationWizard({
     anchorId: EVENT_REGISTRATION_ANCHOR_ID,
     occurrenceContext: occurrenceContext ?? null,
@@ -2770,13 +2780,44 @@ function EventRegistrationWizard(props) {
     events: events ?? [],
     maxTicketsNum
   });
+  const [bookingOverlayOpen, setBookingOverlayOpen] = useState(false);
+  const [floatingPortalRoot, setFloatingPortalRoot] = useState(null);
+  useEffect(() => {
+    const sourceEl = registrationRootRef.current;
+    if (!sourceEl) return;
+    const portal = createBodyThemePortalRoot(sourceEl);
+    if (!portal) return;
+    setFloatingPortalRoot(portal.root);
+    return () => {
+      setFloatingPortalRoot(null);
+      portal.cleanup();
+    };
+  }, []);
   if (wizard.scopedEvents.length === 0 && !wizard.occurrenceContext) {
-    return /* @__PURE__ */ jsx("div", { id: EVENT_REGISTRATION_ANCHOR_ID, className: `event-registration ${className || ""}`, "data-block": "event-registration", children: /* @__PURE__ */ jsx("div", { className: "er-empty", children: /* @__PURE__ */ jsx("p", { className: "er-empty__text", children: "No events available for registration." }) }) });
+    return /* @__PURE__ */ jsx(
+      "div",
+      {
+        ref: registrationRootRef,
+        id: EVENT_REGISTRATION_ANCHOR_ID,
+        className: registrationRootClassName,
+        "data-block": "event-registration",
+        children: /* @__PURE__ */ jsx("div", { className: "er-empty", children: /* @__PURE__ */ jsx("p", { className: "er-empty__text", children: "No events available for registration." }) })
+      }
+    );
   }
   const allowedStatuses = getRegistrableStatuses(wizard.api.config.isPreview);
   const hasRegistrableEvents = wizard.scopedEvents.some((event) => !event.status || allowedStatuses.includes(event.status));
   if (!hasRegistrableEvents && !wizard.occurrenceContext) {
-    return /* @__PURE__ */ jsx("div", { id: EVENT_REGISTRATION_ANCHOR_ID, className: `event-registration ${className || ""}`, "data-block": "event-registration", children: /* @__PURE__ */ jsx("div", { className: "er-empty", children: /* @__PURE__ */ jsx("p", { className: "er-empty__text", children: "Registration is not currently available for this event." }) }) });
+    return /* @__PURE__ */ jsx(
+      "div",
+      {
+        ref: registrationRootRef,
+        id: EVENT_REGISTRATION_ANCHOR_ID,
+        className: registrationRootClassName,
+        "data-block": "event-registration",
+        children: /* @__PURE__ */ jsx("div", { className: "er-empty", children: /* @__PURE__ */ jsx("p", { className: "er-empty__text", children: "Registration is not currently available for this event." }) })
+      }
+    );
   }
   const isWizardStep = WIZARD_STEPS.includes(wizard.step);
   const activeWizardSteps = useMemo(
@@ -2818,13 +2859,15 @@ function EventRegistrationWizard(props) {
   const currentStepNumber = getStepNumber(wizard.step, activeWizardSteps);
   const summaryEvent = wizard.selectedEvent ?? wizard.preSelectedEvent;
   const summaryEventPricingType = summaryEvent ? publicEventPricingType(summaryEvent.pricing) : "free";
+  const summaryPriceLabel = summaryEvent ? formatEventPriceDisplay(summaryEvent.pricing) : null;
+  const summaryAvailabilityLabel = summaryEvent?.availableSpots === null || summaryEvent?.availableSpots === void 0 ? null : summaryEvent.availableSpots > 0 ? `${summaryEvent.availableSpots} spots left` : summaryEvent.waitlistEnabled ? "Waitlist available" : "Fully booked";
   const waitlistClaimRequiresPortalLogin = wizard.waitlistClaim.requiresPortalLogin && wizard.portalAuthState !== "authenticated" && wizard.portalAuthState !== "checking";
   const portalAuthCopy = waitlistClaimRequiresPortalLogin ? {
     ...EVENT_PORTAL_AUTH_COPY["waitlist-claim"],
     description: wizard.waitlistClaim.loginMessage ?? "Log in to continue with your waitlist claim."
   } : EVENT_PORTAL_AUTH_COPY.membership;
   const showPortalAuthPrompt = waitlistClaimRequiresPortalLogin || wizard.step === "select-tickets" && wizard.portalAuthState !== "authenticated" && wizard.portalAuthState !== "checking" && summaryEventPricingType !== "free";
-  return /* @__PURE__ */ jsx("div", { id: EVENT_REGISTRATION_ANCHOR_ID, className: `event-registration ${className || ""}`, "data-block": "event-registration", children: /* @__PURE__ */ jsxs("div", { className: "er-container", children: [
+  const renderRegistrationSurface = (variant) => /* @__PURE__ */ jsxs("div", { className: `er-container${variant === "overlay" ? " er-container--overlay" : ""}`, children: [
     isWizardStep && /* @__PURE__ */ jsxs("div", { className: "er-payment-layout er-payment-layout--no-sidebar", children: [
       /* @__PURE__ */ jsxs("div", { className: "er-payment-layout-main", children: [
         totalSteps > 1 && /* @__PURE__ */ jsx(StepIndicator2, { currentStep: currentStepNumber, totalSteps, stepLabels }),
@@ -2892,7 +2935,100 @@ function EventRegistrationWizard(props) {
       }
     ),
     wizard.step === "error" && /* @__PURE__ */ jsx(ErrorStep, { message: wizard.errorMessage, onRetry: wizard.handleRetry })
-  ] }) });
+  ] });
+  const isEmbedded = (className ?? "").includes("event-registration--embedded");
+  const overlayEnabled = props.overlayEnabled === true;
+  if (isEmbedded || !overlayEnabled) {
+    return /* @__PURE__ */ jsx(
+      "div",
+      {
+        ref: registrationRootRef,
+        id: EVENT_REGISTRATION_ANCHOR_ID,
+        className: registrationRootClassName,
+        "data-block": "event-registration",
+        children: renderRegistrationSurface("inline")
+      }
+    );
+  }
+  const bookingSummaryMeta = [summaryPriceLabel, summaryAvailabilityLabel].filter(Boolean).join(" \xB7 ");
+  const bookingTicketTypes = getActiveTicketTypes(summaryEvent);
+  const bookingTicketTypesCurrency = summaryEvent?.pricing.kind === "ticket_types" ? summaryEvent.pricing.currency : null;
+  const renderBookingEntry = (base) => /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsxs("div", { className: `${base}__info`, children: [
+      /* @__PURE__ */ jsx("span", { className: `${base}__title`, children: "Book this event" }),
+      bookingSummaryMeta && /* @__PURE__ */ jsx("span", { className: `${base}__meta`, children: bookingSummaryMeta }),
+      base === "er-booking-teaser" && bookingTicketTypesCurrency && bookingTicketTypes.length > 0 ? /* @__PURE__ */ jsx("div", { className: "er-booking-teaser__tickets", children: bookingTicketTypes.map((ticketType) => /* @__PURE__ */ jsxs("div", { className: "er-booking-teaser__ticket", children: [
+        /* @__PURE__ */ jsx("span", { className: "er-booking-teaser__ticket-name", children: ticketType.name }),
+        /* @__PURE__ */ jsx("strong", { children: formatTicketTypePrice(ticketType, bookingTicketTypesCurrency) })
+      ] }, ticketType.id)) }) : null
+    ] }),
+    /* @__PURE__ */ jsx(
+      "button",
+      {
+        type: "button",
+        className: `${base}__cta ${buttonClass}`,
+        onClick: () => setBookingOverlayOpen(true),
+        children: "Book now"
+      }
+    )
+  ] });
+  const floatingBookingUi = !bookingOverlayOpen && isWizardStep ? /* @__PURE__ */ jsx("div", { className: "er-booking-bar", children: /* @__PURE__ */ jsx("div", { className: "er-booking-bar__inner", children: renderBookingEntry("er-booking-bar") }) }) : null;
+  const floatingBookingLayer = floatingPortalRoot ? createPortal(
+    /* @__PURE__ */ jsx("div", { className: registrationRootClassName, "data-block": "event-registration", children: floatingBookingUi }),
+    floatingPortalRoot
+  ) : floatingBookingUi;
+  const bookingOverlayLayer = bookingOverlayOpen ? /* @__PURE__ */ jsx(
+    ModalShell,
+    {
+      title: "Book this event",
+      titleId: "event-registration-booking-title",
+      onClose: () => setBookingOverlayOpen(false),
+      portal: floatingPortalRoot != null,
+      portalRoot: floatingPortalRoot,
+      portalWrapperClassName: registrationRootClassName,
+      portalWrapperProps: { "data-block": "event-registration" },
+      overlayClassName: "er-booking-overlay",
+      modalClassName: "er-booking-overlay__panel",
+      renderHeader: ({ closeButtonRef, onClose, title, titleId }) => /* @__PURE__ */ jsxs("div", { className: "er-booking-overlay__header", children: [
+        /* @__PURE__ */ jsx("h2", { className: "er-booking-overlay__title", id: titleId, children: title }),
+        /* @__PURE__ */ jsx(
+          "button",
+          {
+            ref: closeButtonRef,
+            type: "button",
+            className: "er-booking-overlay__close",
+            onClick: onClose,
+            "aria-label": "Close booking",
+            children: "\xD7"
+          }
+        )
+      ] }),
+      children: renderRegistrationSurface("overlay")
+    }
+  ) : null;
+  return /* @__PURE__ */ jsxs(
+    "div",
+    {
+      ref: registrationRootRef,
+      id: EVENT_REGISTRATION_ANCHOR_ID,
+      className: registrationRootClassName,
+      "data-block": "event-registration",
+      children: [
+        isWizardStep ? (
+          // In-flow: a lightweight teaser at the block's position. The full wizard
+          // lives in the sheet, so there is only ever one form surface mounted.
+          /* @__PURE__ */ jsx("div", { className: "er-booking-teaser", children: renderBookingEntry("er-booking-teaser") })
+        ) : (
+          // Terminal states (success, error, payment verification on redirect
+          // return) render in the page where the visitor lands, unless the sheet is
+          // open and already showing them.
+          !bookingOverlayOpen && renderRegistrationSurface("inline")
+        ),
+        floatingBookingLayer,
+        bookingOverlayLayer
+      ]
+    }
+  );
 }
 function isPastOccurrence(startsAt) {
   if (!startsAt) return false;
@@ -3081,6 +3217,32 @@ function TeamMemberName({
 }) {
   return profilePath ? /* @__PURE__ */ jsx("a", { href: profilePath, className: "rb-hover-opacity-80", children: /* @__PURE__ */ jsx("strong", { children: name }) }) : /* @__PURE__ */ jsx("strong", { children: name });
 }
+function formatTicketTypePrice2(ticketType, currency) {
+  return formatCurrencyAmount(ticketType.priceAmount, currency, { decimals: "auto" });
+}
+function getActiveTicketTypes2(event) {
+  return event.pricing.kind === "ticket_types" ? event.pricing.ticketTypes.filter((ticketType) => ticketType.isActive).sort((left, right) => left.sortOrder - right.sortOrder) : [];
+}
+function TicketTypePriceList({
+  ticketTypes,
+  currency
+}) {
+  if (ticketTypes.length === 0) return null;
+  return /* @__PURE__ */ jsx("div", { className: "rb-mt-3 rb-flex rb-flex-col rb-gap-2", children: ticketTypes.map((ticketType) => /* @__PURE__ */ jsxs(
+    "div",
+    {
+      className: "rb-flex rb-items-start rb-justify-between rb-gap-4",
+      children: [
+        /* @__PURE__ */ jsxs("div", { children: [
+          /* @__PURE__ */ jsx("p", { children: ticketType.name }),
+          ticketType.description ? /* @__PURE__ */ jsx("p", { className: "rb-caption status-muted", children: ticketType.description }) : null
+        ] }),
+        /* @__PURE__ */ jsx("p", { children: /* @__PURE__ */ jsx("strong", { children: formatTicketTypePrice2(ticketType, currency) }) })
+      ]
+    },
+    ticketType.id
+  )) });
+}
 function EventDetailsView({
   selection,
   showVenue,
@@ -3115,6 +3277,7 @@ function EventDetailsView({
   const shouldShowCoursePricing = showCost && !isDropIn && coursePricing !== null;
   const shouldShowEventCost = showCost && isPaid && !isDropIn && coursePricing === null;
   const eventCostLabel = shouldShowEventCost ? formatEventPrice(selected) : null;
+  const ticketTypes = shouldShowEventCost ? getActiveTicketTypes2(selected) : [];
   const acceptedItems = [];
   if (showAcceptedPasses) {
     acceptedItems.push(...applicablePasses.map((p) => p.name));
@@ -3171,6 +3334,7 @@ function EventDetailsView({
           /* @__PURE__ */ jsx("div", { className: "rb-label rb-mb-2", children: "Cost" }),
           /* @__PURE__ */ jsx("p", { children: /* @__PURE__ */ jsx("strong", { children: eventCostLabel }) }),
           autoApplyDiscount ? /* @__PURE__ */ jsx("p", { className: "rb-caption rb-mt-1", children: formatAutoApplyDiscountLine(autoApplyDiscount, eventPricingCurrency) }) : null,
+          /* @__PURE__ */ jsx(TicketTypePriceList, { ticketTypes, currency: eventPricingCurrency }),
           hasAcceptedItems ? /* @__PURE__ */ jsxs("p", { className: "rb-caption rb-mt-1", children: [
             "You can also attend with: ",
             acceptedItems.join(", ")
@@ -3534,9 +3698,74 @@ var EventPaginatedListView = ({
     }
   );
 };
+
+// ../blocks/src/system/runtime/hooks/loadStateError.ts
+function toError(error, fallbackMessage) {
+  return error instanceof Error ? error : new Error(fallbackMessage);
+}
+
+// ../blocks/src/system/runtime/hooks/useEventPagination.state.ts
+function createInitialEventPaginationLoadState(events, pageSize) {
+  return {
+    kind: "ready",
+    events,
+    hasMore: hasMoreEventPages(events, pageSize)
+  };
+}
+function eventPaginationLoadReducer(state, action) {
+  switch (action.type) {
+    case "started":
+      return {
+        kind: "loading",
+        events: state.events,
+        hasMore: action.reset ? true : state.hasMore
+      };
+    case "succeeded":
+      return {
+        kind: "ready",
+        events: action.events,
+        hasMore: action.hasMore
+      };
+    case "failed":
+      return {
+        kind: "error",
+        events: state.events,
+        hasMore: state.hasMore,
+        error: action.error
+      };
+    case "synced":
+      return createInitialEventPaginationLoadState(action.events, action.pageSize);
+    default:
+      return assertNever11(action);
+  }
+}
 function getEventIdentity(event) {
   return event.occurrenceId || event.id;
 }
+function mergeEventPaginationEvents(existingEvents, newEvents) {
+  const existingIds = new Set(existingEvents.map(getEventIdentity));
+  const uniqueNew = newEvents.filter(
+    (event) => !existingIds.has(getEventIdentity(event))
+  );
+  return [...existingEvents, ...uniqueNew];
+}
+function toEventPaginationLoadError(error) {
+  return toError(error, "Unknown error");
+}
+function getEventPaginationEvents(state) {
+  return state.events;
+}
+function isEventPaginationLoading(state) {
+  return state.kind === "loading";
+}
+function getEventPaginationError(state) {
+  return state.kind === "error" ? state.error : null;
+}
+function hasMoreEventPages(events, pageSize) {
+  return events.length >= pageSize;
+}
+
+// ../blocks/src/system/runtime/hooks/useEventPagination.ts
 function getEventsKey(events) {
   return events.map((e) => `${getEventIdentity(e)}:${e.startsAt}`).join("|");
 }
@@ -3559,10 +3788,15 @@ function useEventPagination({
   useEffect(() => {
     initialEventsRef.current = initialEvents;
   }, [initialEventsKey]);
-  const [events, setEvents] = useState(initialEvents);
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState(null);
-  const [hasMore, setHasMore] = useState(initialEvents.length >= pageSize);
+  const [loadState, dispatchLoadState] = useReducer(
+    eventPaginationLoadReducer,
+    { events: initialEvents, pageSize },
+    ({ events: events2, pageSize: initialPageSize }) => createInitialEventPaginationLoadState(events2, initialPageSize)
+  );
+  const events = getEventPaginationEvents(loadState);
+  const loading = isEventPaginationLoading(loadState);
+  const error = getEventPaginationError(loadState);
+  const hasMore = loadState.hasMore;
   const normalizedCategoryIds = normalizeCsvString(filters?.categoryIds);
   const normalizedStaffMemberId = normalizeOptionalId(filters?.staffMemberId);
   const normalizedVenueId = normalizeOptionalId(filters?.venueId);
@@ -3587,9 +3821,11 @@ function useEventPagination({
     if (loadingRef.current) return;
     if (!hasMoreRef.current && !options.reset) return;
     const currentRequestId = ++requestIdRef.current;
-    setLoading(true);
+    dispatchLoadState({ type: "started", reset: options.reset });
     loadingRef.current = true;
-    setError(null);
+    if (options.reset) {
+      hasMoreRef.current = true;
+    }
     try {
       const currentEvents = eventsRef.current;
       const lastEvent = options.reset ? void 0 : currentEvents[currentEvents.length - 1];
@@ -3610,29 +3846,25 @@ function useEventPagination({
         venueId: normalizedVenueId ?? void 0
       });
       if (currentRequestId === requestIdRef.current) {
-        if (options.reset) {
-          setEvents(newEvents);
-          eventsRef.current = newEvents;
-        } else {
-          setEvents((prev) => {
-            const existingIds = new Set(prev.map(getEventIdentity));
-            const uniqueNew = newEvents.filter((e) => !existingIds.has(getEventIdentity(e)));
-            const updated = [...prev, ...uniqueNew];
-            eventsRef.current = updated;
-            return updated;
-          });
-        }
-        const nextHasMore = newEvents.length >= pageSize;
-        setHasMore(nextHasMore);
+        const nextEvents = options.reset ? newEvents : mergeEventPaginationEvents(eventsRef.current, newEvents);
+        const nextHasMore = hasMoreEventPages(newEvents, pageSize);
+        dispatchLoadState({
+          type: "succeeded",
+          events: nextEvents,
+          hasMore: nextHasMore
+        });
+        eventsRef.current = [...nextEvents];
         hasMoreRef.current = nextHasMore;
       }
     } catch (err) {
       if (currentRequestId === requestIdRef.current) {
-        setError(err instanceof Error ? err : new Error("Unknown error"));
+        dispatchLoadState({
+          type: "failed",
+          error: toEventPaginationLoadError(err)
+        });
       }
     } finally {
       if (currentRequestId === requestIdRef.current) {
-        setLoading(false);
         loadingRef.current = false;
       }
     }
@@ -3674,19 +3906,20 @@ function useEventPagination({
     try {
       if (filtersMatchInitial) {
         if (!prevFiltersMatchInitial || prevInitialEventsKey !== initialEventsKey) {
-          setEvents(latestInitialEvents);
+          dispatchLoadState({
+            type: "synced",
+            events: latestInitialEvents,
+            pageSize
+          });
           eventsRef.current = latestInitialEvents;
         }
-        const nextHasMore = latestInitialEvents.length >= pageSize;
+        const nextHasMore = hasMoreEventPages(latestInitialEvents, pageSize);
         if (hasMoreRef.current !== nextHasMore) {
-          setHasMore(nextHasMore);
           hasMoreRef.current = nextHasMore;
         }
-        if (error !== null) setError(null);
         return;
       }
       if (prevFiltersMatchInitial || prevFiltersKey !== filtersKey) {
-        setHasMore(true);
         hasMoreRef.current = true;
         void fetchPage({ reset: true });
       }
@@ -3695,7 +3928,7 @@ function useEventPagination({
       prevInitialEventsKeyRef.current = initialEventsKey;
       prevFiltersKeyRef.current = filtersKey;
     }
-  }, [error, fetchPage, filtersKey, filtersMatchInitial, initialEventsKey, pageSize]);
+  }, [fetchPage, filtersKey, filtersMatchInitial, initialEventsKey, pageSize]);
   return {
     events,
     loading,
@@ -3704,6 +3937,43 @@ function useEventPagination({
     loadMore
   };
 }
+
+// ../blocks/src/system/runtime/hooks/useEventFilters.state.ts
+var EMPTY_EVENT_FILTERS = Object.freeze({
+  categories: [],
+  venues: [],
+  staffMembers: [],
+  labels: Object.freeze({ courseOption: "Course" })
+});
+function createInitialEventFiltersLoadState() {
+  return { kind: "idle", filters: EMPTY_EVENT_FILTERS };
+}
+function eventFiltersLoadReducer(state, action) {
+  switch (action.type) {
+    case "started":
+      return { kind: "loading", filters: state.filters };
+    case "succeeded":
+      return { kind: "loaded", filters: action.filters };
+    case "failed":
+      return { kind: "error", filters: state.filters, error: action.error };
+    default:
+      return assertNever11(action);
+  }
+}
+function toEventFiltersLoadError(error) {
+  return toError(error, "Failed to load filters");
+}
+function getEventFiltersData(state) {
+  return state.filters;
+}
+function isEventFiltersLoading(state) {
+  return state.kind === "loading";
+}
+function getEventFiltersError(state) {
+  return state.kind === "error" ? state.error : null;
+}
+
+// ../blocks/src/system/runtime/hooks/useEventFilters.ts
 function useEventFilters({
   showCategoryFilter = "auto",
   showVenueFilter = false,
@@ -3717,14 +3987,14 @@ function useEventFilters({
   preFilterScheduleScope
 } = {}) {
   const api = useBlockApi();
-  const [filters, setFilters] = useState({
-    categories: [],
-    venues: [],
-    staffMembers: [],
-    labels: { courseOption: "Course" }
-  });
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState(null);
+  const [loadState, dispatchLoadState] = useReducer(
+    eventFiltersLoadReducer,
+    void 0,
+    createInitialEventFiltersLoadState
+  );
+  const filters = getEventFiltersData(loadState);
+  const loading = isEventFiltersLoading(loadState);
+  const error = getEventFiltersError(loadState);
   const [selectedKind, setSelectedKindState] = useState("all");
   const [selectedCategoryId, setSelectedCategoryId] = useState("all");
   const [selectedStaffMemberId, setSelectedStaffMemberId] = useState("all");
@@ -3759,7 +4029,7 @@ function useEventFilters({
     const needFilters = showCategoryFilter !== "never" && fixedKind !== "courses" || showVenueFilter || showStaffFilter;
     if (!needFilters) return;
     hasFetchedRef.current = true;
-    setLoading(true);
+    dispatchLoadState({ type: "started" });
     api.getEventFilters({
       categoryIds: allowedCategoryIds.length > 0 ? allowedCategoryIds.join(",") : void 0,
       venueId: fixedVenueId ?? void 0,
@@ -3769,12 +4039,12 @@ function useEventFilters({
       eventPresets: fixedEventPresets,
       scheduleScope: fixedScheduleScope
     }).then((data) => {
-      setFilters(data);
-      setError(null);
+      dispatchLoadState({ type: "succeeded", filters: data });
     }).catch((err) => {
-      setError(err instanceof Error ? err : new Error("Failed to load filters"));
-    }).finally(() => {
-      setLoading(false);
+      dispatchLoadState({
+        type: "failed",
+        error: toEventFiltersLoadError(err)
+      });
     });
   }, [
     allowedCategoryIds,
@@ -4106,6 +4376,31 @@ var TabBar = ({
     }
   );
 };
+
+// ../blocks/src/system/runtime/hooks/useCalendarEvents.state.ts
+function calendarEventCacheLoadReducer(_state, action) {
+  switch (action.type) {
+    case "started":
+      return { kind: "loading" };
+    case "succeeded":
+      return { kind: "idle" };
+    case "failed":
+      return { kind: "error", error: action.error };
+    default:
+      return assertNever11(action);
+  }
+}
+function toCalendarEventCacheLoadError(error) {
+  return toError(error, "Unknown error");
+}
+function isCalendarEventCacheLoading(state) {
+  return state.kind === "loading";
+}
+function getCalendarEventCacheError(state) {
+  return state.kind === "error" ? state.error : null;
+}
+
+// ../blocks/src/system/runtime/hooks/useCalendarEvents.ts
 var CALENDAR_FETCH_LIMIT = 200;
 function getMonthKey(date) {
   return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, "0")}`;
@@ -4149,8 +4444,10 @@ function useCalendarEventCache({
   stage
 }) {
   const { getPublicEvents } = useBlockApi();
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState(null);
+  const [loadState, dispatchLoadState] = useReducer(
+    calendarEventCacheLoadReducer,
+    { kind: "idle" }
+  );
   const [cacheVersion, setCacheVersion] = useState(0);
   const filtersKey = useMemo(
     () => getEventRuntimeFiltersKey(filters),
@@ -4195,8 +4492,7 @@ function useCalendarEventCache({
     if (monthsToFetch.length === 0) return;
     monthsToFetch.forEach((m) => fetchingRef.current.add(m));
     const currentRequestId = ++requestIdRef.current;
-    setLoading(true);
-    setError(null);
+    dispatchLoadState({ type: "started" });
     try {
       const result = await getPublicEvents({
         from,
@@ -4228,16 +4524,17 @@ function useCalendarEventCache({
           }
         }
         setCacheVersion((v) => v + 1);
+        dispatchLoadState({ type: "succeeded" });
       }
     } catch (err) {
       if (currentRequestId === requestIdRef.current) {
-        setError(err instanceof Error ? err : new Error("Unknown error"));
+        dispatchLoadState({
+          type: "failed",
+          error: toCalendarEventCacheLoadError(err)
+        });
       }
     } finally {
       monthsToFetch.forEach((m) => fetchingRef.current.delete(m));
-      if (currentRequestId === requestIdRef.current) {
-        setLoading(false);
-      }
     }
   }, [
     getPublicEvents,
@@ -4287,8 +4584,8 @@ function useCalendarEventCache({
   }, [viewDate, cacheVersion]);
   return {
     events,
-    loading,
-    error
+    loading: isCalendarEventCacheLoading(loadState),
+    error: getCalendarEventCacheError(loadState)
   };
 }
 function useCalendarEvents({

package/dist/client/{chunk-7UCLJ5SP.mjs → chunk-EY42X22F.mjs}

@@ -1,6 +1,6 @@
-import { FeedbackMessage } from './chunk-UDNSI5PY.mjs';
-import { themeButtonClassName } from './chunk-VGDBVNOO.mjs';
-import { clsx_default } from './chunk-ZE5G642V.mjs';
+import { FeedbackMessage } from './chunk-STJ2NCQM.mjs';
+import { themeButtonClassName } from './chunk-UQFY4AHX.mjs';
+import { formatCurrencyAmount, clsx_default } from './chunk-25W2EQUN.mjs';
 import { useId } from 'react';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 
@@ -213,10 +213,7 @@ var DEFAULT_CURRENCY = "GBP";
 
 // ../blocks/src/system/runtime/shared/utils/formatting.ts
 function formatPrice(cents, currency = DEFAULT_CURRENCY, locale) {
-  return new Intl.NumberFormat(locale, {
-    style: "currency",
-    currency: currency.toUpperCase()
-  }).format(cents / 100);
+  return formatCurrencyAmount(cents, currency, { locale });
 }
 
 // ../blocks/src/system/runtime/shared/utils/portalLogout.ts

package/dist/client/{chunk-SYIJ5JO2.mjs → chunk-FHU6PFPM.mjs}

@@ -1,4 +1,4 @@
-import { clsx_default } from './chunk-ZE5G642V.mjs';
+import { clsx_default } from './chunk-25W2EQUN.mjs';
 import { jsxs, jsx } from 'react/jsx-runtime';
 
 function resolveColorStyle(color) {

package/dist/client/{chunk-ZKUO52W3.mjs → chunk-LQFDYWPJ.mjs}

@@ -1,5 +1,5 @@
 "use client";
-import { assertNever11 } from './chunk-VGDBVNOO.mjs';
+import { assertNever11 } from './chunk-UQFY4AHX.mjs';
 import { useReducer, useRef, useCallback, useEffect } from 'react';
 
 // ../blocks/src/system/runtime/hooks/usePolling.state.ts