@riverbankcms/sdk 0.80.0 → 0.82.0

package/dist/client/{chunk-6GVVWSPU.mjs → chunk-EQKYMX4N.mjs}

@@ -1,17 +1,17 @@
 "use client";
 import { LeafletStaticMap } from './chunk-XSV6KW4D.mjs';
-import { MagicLinkForm, useWaitlistClaim } from './chunk-T6UIP6UZ.mjs';
-import { usePolling } from './chunk-VDS5YFLX.mjs';
-import { SpinnerNode } from './chunk-CE7IBGVW.mjs';
+import { MagicLinkForm, useWaitlistClaim } from './chunk-ZF4XEWDM.mjs';
+import { usePolling } from './chunk-CSZGLBYR.mjs';
+import { SpinnerNode } from './chunk-SBBSMFFG.mjs';
 import { useDiscountCodeUi } from './chunk-ZFHRN6W2.mjs';
-import { TabBarFragment, logoutPortal, StepIndicator, DiscountCodeDisclosure, TerminalPanel, StateIcon, formatPrice, CrossIcon, ClockIcon, consumeSearchParam, LoggedInAsUser, CheckIcon } from './chunk-Y37KDO7P.mjs';
+import { createBodyThemePortalRoot, TabBarFragment, logoutPortal, StepIndicator, DiscountCodeDisclosure, TerminalPanel, StateIcon, formatPrice, CrossIcon, ClockIcon, consumeSearchParam, LoggedInAsUser, CheckIcon } from './chunk-CHAB5ACD.mjs';
 import { getFieldValidationControlProps, FieldValidationMessage } from './chunk-3DCJ45Z2.mjs';
-import { ModalShell } from './chunk-3PEDD5KJ.mjs';
-import { isSpamProtectionEnabled, AltchaWidget, getChallengeUrl } from './chunk-YLMKMCSJ.mjs';
+import { ModalShell } from './chunk-DVNUDUVT.mjs';
+import { isSpamProtectionEnabled, AltchaWidget, getChallengeUrl } from './chunk-GFSQNTRW.mjs';
 import { useBlockApi, FeedbackMessage } from './chunk-UDNSI5PY.mjs';
-import { buildEventCalendarListingRender, getWeekCalendarDays, formatCalendarTitle, groupEventsByDate, getOrderedDayNames, getMonthCalendarDays, formatDateKey, themeButtonClassName, normalizeEventBlockKind, EventCompactRow, EmptyState, getContainerClass, getCardOrientation, addMonths, getThreeMonthRange, isToday, MAX_EVENTS_PER_DAY, formatTime, resolveCoursePricingState, formatEventDateParts, formatCoursePriceAmount, DateTimeTile, normalizeIdList, EventCard, buildTimetableModel, formatDate, isEventContentType, formatCoursePriceDisplay, MONTH_NAMES, formatEventPrice, getEventAvailability, formatEventTeacherLine, CreditCard, Ticket, Star, Sparkles, assertNever11 } from './chunk-PUOELU4O.mjs';
-import { getBookingLocalDateKey, toScheduledBookingDateTime, toBookingTimeZone, formatBookingDateTime, formatBookingDate, formatBookingTime } from './chunk-AUJ5DBZJ.mjs';
-import { createContext, useId, useMemo, useState, useRef, useEffect, useCallback, useContext, useReducer } from 'react';
+import { buildEventRuntimeFilters, buildEventCalendarListingRender, groupEventsByDate, getOrderedDayNames, formatDateKey, getEventRuntimeFiltersKey, themeButtonClassName, normalizeCsvIds, normalizeOptionalId, normalizeEventBlockKind, normalizeCsvString, EventCompactRow, EmptyState, getContainerClass, getCardOrientation, isToday, MAX_EVENTS_PER_DAY, formatTime, resolveCoursePricingState, formatEventPrice, formatEventDateParts, DateTimeTile, EventCard, buildCalendarViewport, shiftCalendarAnchorDate, addMonths, getThreeMonthRange, buildTimetableModel, formatDate, isEventContentType, formatCoursePriceAmount, formatCoursePriceDisplay, MONTH_NAMES, getEventAvailability, formatEventTeacherLine, CreditCard, Ticket, Star, Sparkles, assertNever11 } from './chunk-RJHTCTCZ.mjs';
+import { publicEventPricingType, getBookingLocalDateKey, toScheduledBookingDateTime, toBookingTimeZone, publicEventPricingCurrency, formatBookingDateTime, publicEventPricingMode, publicEventScalarPrice, publicEventTicketTypes, formatBookingDate, formatBookingTime } from './chunk-S3MKFGOG.mjs';
+import React9, { createContext, useId, useMemo, useState, useRef, useEffect, useCallback, useContext, useReducer } from 'react';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 
 function StepIndicator2(props) {
@@ -281,12 +281,15 @@ function getTicketTypeAvailabilityLabel(ticketType) {
 }
 function getVisibleTicketTypes(input) {
   const eligibilityTicketTypes = input.eligibility?.ticketTypes;
-  const eventTicketTypes = input.event?.ticketTypes;
-  const source = eligibilityTicketTypes && eligibilityTicketTypes.length > 0 ? eligibilityTicketTypes : eventTicketTypes ?? [];
+  const eventTicketTypes = input.event ? publicEventTicketTypes(input.event.pricing) : [];
+  const source = eligibilityTicketTypes && eligibilityTicketTypes.length > 0 ? eligibilityTicketTypes : eventTicketTypes;
   return source.filter(
     (ticketType) => ticketType.isActive && (!input.selectedAttendanceMode || (ticketType.attendanceScope ?? "both") === "both" || (ticketType.attendanceScope ?? "both") === input.selectedAttendanceMode)
   );
 }
+function getImplicitSingleAvailableTicketType(ticketTypes) {
+  return ticketTypes.length === 1 && ticketTypes[0]?.availability.kind === "available" ? ticketTypes[0] : null;
+}
 function findSelectedTicketType(input) {
   if (!input.selectedTicketTypeId) {
     return null;
@@ -668,6 +671,13 @@ function cleanupStaleRegistrations() {
     console.warn("[sessionStorage] Cleanup failed:", error);
   }
 }
+function getEventSelectionMode(events) {
+  const firstSeriesId = events[0]?.seriesId;
+  if (events.length > 1 && firstSeriesId && events.every((event) => event.seriesId === firstSeriesId)) {
+    return "date";
+  }
+  return "event";
+}
 var EventSelectionStep = ({
   events,
   selectedEvent,
@@ -675,8 +685,10 @@ var EventSelectionStep = ({
   showVenue,
   showCapacity
 }) => {
+  const selectionMode = getEventSelectionMode(events);
+  const isDateSelection = selectionMode === "date";
   return /* @__PURE__ */ jsxs("div", { className: "er-stack", children: [
-    /* @__PURE__ */ jsx("h3", { className: "er-title", children: "Select an Event" }),
+    /* @__PURE__ */ jsx("h3", { className: "er-title", children: isDateSelection ? "Choose a date" : "Select an event" }),
     /* @__PURE__ */ jsx("div", { className: "er-event-grid", children: events.map((event) => {
       const isSelected = selectedEvent?.publicEventId === event.publicEventId;
       const isSoldOut = event.capacity !== null && event.availableSpots === 0;
@@ -702,19 +714,18 @@ var EventSelectionStep = ({
           onClick: () => !isUnavailable && onSelect(event),
           disabled: isUnavailable,
           className: cardClasses,
-          children: /* @__PURE__ */ jsxs("div", { className: "er-row er-row--between", children: [
-            /* @__PURE__ */ jsxs("div", { children: [
-              /* @__PURE__ */ jsx("h4", { className: "er-event-title", children: event.title }),
+          children: /* @__PURE__ */ jsxs("div", { className: "er-event-option", children: [
+            /* @__PURE__ */ jsxs("div", { className: "er-event-option-main", children: [
+              /* @__PURE__ */ jsx("h4", { className: "er-event-title", children: isDateSelection ? formatDate2(event.startsAt, { timeZone }) : event.title }),
               /* @__PURE__ */ jsxs("p", { className: "er-text er-text--muted", children: [
-                formatDate2(event.startsAt, { timeZone }),
-                " ",
-                "at",
-                " ",
-                formatTime2(event.startsAt, { timeZone })
-              ] }),
-              showVenue && event.venue && /* @__PURE__ */ jsx("p", { className: "er-text er-text--faint", children: event.venue.name })
+                isDateSelection ? formatTime2(event.startsAt, { timeZone }) : `${formatDate2(event.startsAt, { timeZone })} at ${formatTime2(event.startsAt, { timeZone })}`,
+                showVenue && event.venue && /* @__PURE__ */ jsxs(Fragment, { children: [
+                  /* @__PURE__ */ jsx("span", { "aria-hidden": "true", children: " \xB7 " }),
+                  event.venue.name
+                ] })
+              ] })
             ] }),
-            showCapacity && event.capacity !== null && /* @__PURE__ */ jsx("span", { className: badgeClasses, children: canJoinWaitlist ? "Waitlist" : isUnavailable ? "Sold Out" : `${event.availableSpots} spots left` })
+            showCapacity && event.capacity !== null && /* @__PURE__ */ jsx("span", { className: badgeClasses, children: canJoinWaitlist ? "Waitlist" : isUnavailable ? "Sold Out" : `${event.availableSpots ?? 0} spots left` })
           ] })
         },
         event.publicEventId
@@ -732,7 +743,7 @@ function getEventAttendanceModeLabel(mode) {
 }
 function TicketCounter(props) {
   const { ticketsCount, maxAllowed, onTicketsChange } = props;
-  return /* @__PURE__ */ jsxs("div", { className: "er-row", children: [
+  return /* @__PURE__ */ jsxs("div", { className: "er-row er-counter", children: [
     /* @__PURE__ */ jsx(
       "button",
       {
@@ -756,6 +767,24 @@ function TicketCounter(props) {
     )
   ] });
 }
+function TicketCounterLimit(props) {
+  return /* @__PURE__ */ jsxs("p", { className: "er-ticket-counter-limit", children: [
+    /* @__PURE__ */ jsx("span", { children: props.maximumLabel }),
+    props.availabilityLabel ? /* @__PURE__ */ jsxs(Fragment, { children: [
+      /* @__PURE__ */ jsx("br", {}),
+      /* @__PURE__ */ jsx("span", { children: props.availabilityLabel })
+    ] }) : null
+  ] });
+}
+function getTicketTypeCounterAvailabilityLabel(input) {
+  if (input.selectedRemainingCapacity !== null) {
+    return `${input.selectedRemainingCapacity} remaining for this ticket type`;
+  }
+  if (input.eventAvailableSpots != null) {
+    return `${input.eventAvailableSpots} spots available`;
+  }
+  return null;
+}
 function getAttendanceModeDetail(attendanceMode) {
   if (attendanceMode.availableSpots === null) {
     return "Unlimited spots";
@@ -819,14 +848,19 @@ var TicketSelectionStep = ({
   const waitlistEnabled = selectedModeAvailability?.waitlistEnabled ?? event?.waitlistEnabled ?? false;
   const isSoldOut = availableSpots === 0;
   const canJoinWaitlist = isSoldOut && waitlistEnabled === true;
-  const usesTicketTypes = event?.pricingMode === "ticket_types" && !canJoinWaitlist;
+  const eventPricingMode = event ? publicEventPricingMode(event.pricing) : void 0;
+  const eventPricingCurrency = event ? publicEventPricingCurrency(event.pricing) : null;
+  const usesTicketTypes = eventPricingMode === "ticket_types" && !canJoinWaitlist;
   const visibleTicketTypes = usesTicketTypes ? getVisibleTicketTypes({
     event,
     eligibility: null,
     selectedAttendanceMode
   }) : [];
   const selectedTicketType = usesTicketTypes ? visibleTicketTypes.find((ticketType) => ticketType.id === selectedTicketTypeId) ?? null : null;
-  const selectedRemainingCapacity = selectedTicketType?.availability.remainingCapacity ?? null;
+  const implicitTicketType = usesTicketTypes ? getImplicitSingleAvailableTicketType(visibleTicketTypes) : null;
+  const effectiveSelectedTicketType = selectedTicketType ?? implicitTicketType;
+  const shouldShowTicketTypeTiles = usesTicketTypes && implicitTicketType === null;
+  const selectedRemainingCapacity = effectiveSelectedTicketType?.availability.remainingCapacity ?? null;
   const noSellableTicketTypes = usesTicketTypes && (visibleTicketTypes.length === 0 || visibleTicketTypes.every((ticketType) => ticketType.availability.kind === "unavailable"));
   const maxAllowed = getMaxAllowedTicketCount({
     canJoinWaitlist,
@@ -834,8 +868,13 @@ var TicketSelectionStep = ({
     maxTickets,
     availableSpots,
     selectedTicketTypeRemainingCapacity: selectedRemainingCapacity,
-    hasSelectedTicketType: selectedTicketType !== null
+    hasSelectedTicketType: effectiveSelectedTicketType !== null
   });
+  const selectedTicketTypeAvailabilityLabel = getTicketTypeCounterAvailabilityLabel({
+    selectedRemainingCapacity,
+    eventAvailableSpots: event?.availableSpots
+  });
+  const eventAvailabilityLabel = !canJoinWaitlist && event?.availableSpots != null ? `${event.availableSpots} spots available` : null;
   if (deliveryMode === "hybrid" && !selectedAttendanceMode) {
     return /* @__PURE__ */ jsxs("div", { className: "er-stack", children: [
       /* @__PURE__ */ jsx("h3", { className: "er-title", children: "How will you attend?" }),
@@ -869,30 +908,53 @@ var TicketSelectionStep = ({
       )
     ] }) : null,
     usesTicketTypes ? /* @__PURE__ */ jsxs(Fragment, { children: [
-      /* @__PURE__ */ jsx("h3", { className: "er-title", children: "Choose a ticket type" }),
-      /* @__PURE__ */ jsx("div", { className: "er-payment-tiles", role: "list", "aria-label": "Ticket types", children: visibleTicketTypes.map((ticketType) => {
-        const availabilityLabel = getTicketTypeAvailabilityLabel(ticketType);
-        const disabled = ticketType.availability.kind === "unavailable";
-        const isSelected = selectedTicketTypeId === ticketType.id;
-        const priceLabel = ticketType.priceAmount > 0 ? formatPrice(ticketType.priceAmount, event?.currency ?? DEFAULT_EVENT_CURRENCY) : "Free";
-        return /* @__PURE__ */ jsx("div", { role: "listitem", children: /* @__PURE__ */ jsxs(
-          "button",
-          {
-            type: "button",
-            className: `er-payment-tile${isSelected && !disabled ? " er-payment-tile--selected" : ""}${disabled ? " er-payment-tile--disabled" : ""}`,
-            disabled,
-            onClick: () => onTicketTypeChange?.(ticketType.id),
-            children: [
-              /* @__PURE__ */ jsx("div", { className: "er-payment-tile-label", children: ticketType.name }),
-              /* @__PURE__ */ jsx("div", { className: "er-payment-tile-detail", children: priceLabel }),
-              ticketType.description ? /* @__PURE__ */ jsx("div", { className: "er-payment-tile-detail", children: ticketType.description }) : null,
-              availabilityLabel ? /* @__PURE__ */ jsx("div", { className: "er-payment-tile-detail", children: availabilityLabel }) : null
-            ]
-          }
-        ) }, ticketType.id);
-      }) }),
-      noSellableTicketTypes ? /* @__PURE__ */ jsx("p", { className: "er-text er-text--muted", children: "No ticket types are currently available." }) : !selectedTicketType ? /* @__PURE__ */ jsx("p", { className: "er-text er-text--muted", children: "Select one ticket type to continue." }) : selectedTicketType.availability.kind === "unavailable" ? /* @__PURE__ */ jsx("p", { className: "er-text er-text--muted", children: getTicketTypeAvailabilityLabel(selectedTicketType) ?? "This ticket type is unavailable." }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+      shouldShowTicketTypeTiles ? /* @__PURE__ */ jsxs(Fragment, { children: [
+        /* @__PURE__ */ jsx("h3", { className: "er-title", children: "Choose a ticket type" }),
+        /* @__PURE__ */ jsx("div", { className: "er-payment-tiles", role: "list", "aria-label": "Ticket types", children: visibleTicketTypes.map((ticketType) => {
+          const availabilityLabel = getTicketTypeAvailabilityLabel(ticketType);
+          const disabled = ticketType.availability.kind === "unavailable";
+          const isSelected = selectedTicketTypeId === ticketType.id;
+          const priceLabel = ticketType.priceAmount > 0 ? formatPrice(ticketType.priceAmount, eventPricingCurrency ?? DEFAULT_EVENT_CURRENCY) : "Free";
+          return /* @__PURE__ */ jsx("div", { role: "listitem", children: /* @__PURE__ */ jsxs(
+            "button",
+            {
+              type: "button",
+              className: `er-payment-tile${isSelected && !disabled ? " er-payment-tile--selected" : ""}${disabled ? " er-payment-tile--disabled" : ""}`,
+              disabled,
+              onClick: () => onTicketTypeChange?.(ticketType.id),
+              children: [
+                /* @__PURE__ */ jsx("div", { className: "er-payment-tile-label", children: ticketType.name }),
+                /* @__PURE__ */ jsx("div", { className: "er-payment-tile-detail", children: priceLabel }),
+                ticketType.description ? /* @__PURE__ */ jsx("div", { className: "er-payment-tile-detail", children: ticketType.description }) : null,
+                availabilityLabel ? /* @__PURE__ */ jsx("div", { className: "er-payment-tile-detail", children: availabilityLabel }) : null
+              ]
+            }
+          ) }, ticketType.id);
+        }) })
+      ] }) : null,
+      noSellableTicketTypes ? /* @__PURE__ */ jsx("p", { className: "er-text er-text--muted", children: "No ticket types are currently available." }) : !effectiveSelectedTicketType ? /* @__PURE__ */ jsx("p", { className: "er-text er-text--muted", children: "Select one ticket type to continue." }) : effectiveSelectedTicketType.availability.kind === "unavailable" ? /* @__PURE__ */ jsx("p", { className: "er-text er-text--muted", children: getTicketTypeAvailabilityLabel(effectiveSelectedTicketType) ?? "This ticket type is unavailable." }) : /* @__PURE__ */ jsxs(Fragment, { children: [
         /* @__PURE__ */ jsx("h3", { className: "er-title", children: "How many tickets?" }),
+        /* @__PURE__ */ jsxs("div", { className: "er-ticket-counter-group", children: [
+          /* @__PURE__ */ jsx(
+            TicketCounter,
+            {
+              ticketsCount,
+              maxAllowed,
+              onTicketsChange
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            TicketCounterLimit,
+            {
+              maximumLabel: `${maxAllowed} tickets maximum`,
+              availabilityLabel: selectedTicketTypeAvailabilityLabel
+            }
+          )
+        ] })
+      ] })
+    ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+      /* @__PURE__ */ jsx("h3", { className: "er-title", children: canJoinWaitlist ? "How many waitlist spots?" : "How many tickets?" }),
+      /* @__PURE__ */ jsxs("div", { className: "er-ticket-counter-group", children: [
         /* @__PURE__ */ jsx(
           TicketCounter,
           {
@@ -901,29 +963,13 @@ var TicketSelectionStep = ({
             onTicketsChange
           }
         ),
-        /* @__PURE__ */ jsxs("p", { className: "er-text er-text--muted", children: [
-          maxAllowed,
-          " tickets maximum",
-          selectedRemainingCapacity !== null ? ` (${selectedRemainingCapacity} remaining for this ticket type)` : "",
-          selectedRemainingCapacity === null && event?.availableSpots != null ? ` (${event.availableSpots} spots available)` : ""
-        ] })
-      ] })
-    ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
-      /* @__PURE__ */ jsx("h3", { className: "er-title", children: canJoinWaitlist ? "How many waitlist spots?" : "How many tickets?" }),
-      /* @__PURE__ */ jsx(
-        TicketCounter,
-        {
-          ticketsCount,
-          maxAllowed,
-          onTicketsChange
-        }
-      ),
-      /* @__PURE__ */ jsxs("p", { className: "er-text er-text--muted", children: [
-        maxAllowed,
-        " ",
-        canJoinWaitlist ? "waitlist spots" : "tickets",
-        " maximum",
-        !canJoinWaitlist && event?.availableSpots != null && ` (${event.availableSpots} spots available)`
+        /* @__PURE__ */ jsx(
+          TicketCounterLimit,
+          {
+            maximumLabel: `${maxAllowed} ${canJoinWaitlist ? "waitlist spots" : "tickets"} maximum`,
+            availabilityLabel: eventAvailabilityLabel
+          }
+        )
       ] })
     ] }),
     canJoinWaitlist && /* @__PURE__ */ jsx("p", { className: "er-text er-text--muted", children: "This event is currently full. Continue to join the waitlist if a spot opens up." })
@@ -1791,8 +1837,8 @@ function EventRegistrationSummaryBar(props) {
   const summaryTimeZone = wizard.occurrenceContext?.timeZone ?? summaryEvent?.timeZone ?? null;
   const occurrenceOverrideTitle = wizard.occurrenceContext?.overrides?.title;
   const summaryTitle = occurrenceOverrideTitle ?? summaryEvent?.title ?? "";
-  const summaryPrice = wizard.selectedTicketType?.priceAmount ?? wizard.eligibility?.price ?? summaryEvent?.price ?? 0;
-  const summaryCurrency = summaryEvent?.currency ?? DEFAULT_EVENT_CURRENCY;
+  const summaryPrice = wizard.selectedTicketType?.priceAmount ?? wizard.eligibility?.price ?? (summaryEvent ? publicEventScalarPrice(summaryEvent.pricing) : null) ?? 0;
+  const summaryCurrency = (summaryEvent ? publicEventPricingCurrency(summaryEvent.pricing) : null) ?? DEFAULT_EVENT_CURRENCY;
   const teamMemberNames = (summaryEvent?.teamMembers ?? []).map((teamMember) => teamMember.name).filter(Boolean);
   const subtotalCents = Math.max(0, summaryPrice * wizard.ticketsCount);
   const autoAppliedDiscount = wizard.discountCode.trim().length > 0 ? null : wizard.autoAppliedDiscount;
@@ -2139,7 +2185,7 @@ function resolveEventRequiresPayment(input) {
   if (!input.event) {
     return false;
   }
-  return input.event.pricingType !== "free";
+  return publicEventPricingType(input.event.pricing) !== "free";
 }
 function resolveDiscountContext(input) {
   const selection = input.paymentSelection.method ? input.paymentSelection : null;
@@ -2171,8 +2217,7 @@ function toRegistrationEvent(event) {
   return {
     ...event,
     publicEventId: event.id,
-    registrationOccurrenceId: event.occurrenceId,
-    ticketTypes: event.ticketTypes ?? []
+    registrationOccurrenceId: event.occurrenceId
   };
 }
 function toRegistrationEvents(events) {
@@ -2397,7 +2442,7 @@ function useEventRegistrationWizard(options) {
   );
   const ticketTypeSelectionRequired = useMemo(() => {
     const event = selectedEvent ?? preSelectedEvent;
-    if (!event || event.pricingMode !== "ticket_types") {
+    if (!event || publicEventPricingMode(event.pricing) !== "ticket_types") {
       return false;
     }
     if ((event.deliveryMode ?? "in_person") === "hybrid" && !selectedAttendanceMode) {
@@ -2412,12 +2457,17 @@ function useEventRegistrationWizard(options) {
   );
   useEffect(() => {
     const event = selectedEvent ?? preSelectedEvent;
-    if (!event || event.pricingMode !== "ticket_types") {
+    if (!event || publicEventPricingMode(event.pricing) !== "ticket_types") {
       if (selectedTicketTypeId !== null) {
         setSelectedTicketTypeId(null);
       }
       return;
     }
+    const implicitTicketType = getImplicitSingleAvailableTicketType(visibleTicketTypes);
+    if (implicitTicketType && selectedTicketTypeId !== implicitTicketType.id) {
+      setSelectedTicketTypeId(implicitTicketType.id);
+      return;
+    }
     if (selectedTicketTypeId && !visibleTicketTypes.some((ticketType) => ticketType.id === selectedTicketTypeId)) {
       setSelectedTicketTypeId(null);
     }
@@ -2527,7 +2577,7 @@ function useEventRegistrationWizard(options) {
   const discountSubtotalCents = useMemo(() => {
     if (discountContext?.type !== "event") return void 0;
     const event = selectedEvent ?? preSelectedEvent;
-    const eventPriceCents = selectedTicketType?.priceAmount ?? eligibility?.price ?? event?.price ?? 0;
+    const eventPriceCents = selectedTicketType?.priceAmount ?? eligibility?.price ?? (event ? publicEventScalarPrice(event.pricing) : null) ?? 0;
     return Math.max(0, eventPriceCents * ticketsCount);
   }, [discountContext, selectedTicketType, eligibility, selectedEvent, preSelectedEvent, ticketsCount]);
   const discountUi = useDiscountCodeUi({ api, discountContext, subtotalCents: discountSubtotalCents });
@@ -2664,6 +2714,13 @@ var EVENT_PORTAL_AUTH_COPY = {
     buttonText: "Email me a login link to continue \u2192"
   }
 };
+function EventPortalAuthPrompt(props) {
+  return /* @__PURE__ */ jsxs("div", { className: "er-portal-auth", children: [
+    /* @__PURE__ */ jsx("p", { className: "er-portal-auth-title", children: props.copy.title }),
+    /* @__PURE__ */ jsx("p", { className: "er-portal-auth-text", children: props.copy.description }),
+    /* @__PURE__ */ jsx("button", { type: "button", className: "er-portal-auth-link", onClick: props.onRequestLogin, children: props.copy.buttonText })
+  ] });
+}
 function EventRegistrationWizard(props) {
   const {
     occurrenceContext,
@@ -2714,10 +2771,11 @@ function EventRegistrationWizard(props) {
     ]
   );
   const totalSteps = activeWizardSteps.length;
+  const eventSelectionStepLabel = getEventSelectionMode(wizard.scopedEvents) === "date" ? "Date" : "Event";
   const stepLabels = activeWizardSteps.map((s) => {
     switch (s) {
       case "select-event":
-        return "Event";
+        return eventSelectionStepLabel;
       case "select-tickets":
         return "Tickets";
       case "enter-details":
@@ -2736,16 +2794,24 @@ function EventRegistrationWizard(props) {
   });
   const currentStepNumber = getStepNumber(wizard.step, activeWizardSteps);
   const summaryEvent = wizard.selectedEvent ?? wizard.preSelectedEvent;
+  const summaryEventPricingType = summaryEvent ? publicEventPricingType(summaryEvent.pricing) : "free";
   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 showPortalAuthSidebar = waitlistClaimRequiresPortalLogin || wizard.portalAuthState !== "authenticated" && wizard.portalAuthState !== "checking" && summaryEvent?.pricingType !== "free" && wizard.step !== "select-event";
+  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: [
-    isWizardStep && /* @__PURE__ */ jsxs("div", { className: `er-payment-layout ${!showPortalAuthSidebar ? "er-payment-layout--no-sidebar" : ""}`, 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 }),
+        showPortalAuthPrompt && /* @__PURE__ */ jsx(
+          EventPortalAuthPrompt,
+          {
+            copy: portalAuthCopy,
+            onRequestLogin: () => wizard.setShowMagicLinkModal(true)
+          }
+        ),
         /* @__PURE__ */ jsx(
           EventRegistrationWizardContent,
           {
@@ -2756,11 +2822,6 @@ function EventRegistrationWizard(props) {
           }
         )
       ] }),
-      showPortalAuthSidebar && /* @__PURE__ */ jsx("div", { className: "er-payment-layout-sidebar", children: /* @__PURE__ */ jsxs("div", { className: "er-portal-auth", children: [
-        /* @__PURE__ */ jsx("p", { className: "er-portal-auth-title", children: portalAuthCopy.title }),
-        /* @__PURE__ */ jsx("p", { className: "er-portal-auth-text", children: portalAuthCopy.description }),
-        /* @__PURE__ */ jsx("button", { type: "button", className: "er-portal-auth-link", onClick: () => wizard.setShowMagicLinkModal(true), children: portalAuthCopy.buttonText })
-      ] }) }),
       wizard.showMagicLinkModal && /* @__PURE__ */ jsx("div", { className: "er-modal-overlay", onClick: () => wizard.setShowMagicLinkModal(false), children: /* @__PURE__ */ jsxs("div", { className: "er-modal", onClick: (e) => e.stopPropagation(), children: [
         /* @__PURE__ */ jsx(
           "button",
@@ -3024,10 +3085,12 @@ function EventDetailsView({
     priceCents: selected.course.priceCents,
     currency: selected.course.currency
   }) : null;
-  const isPaid = selected.pricingType === "paid";
-  const eventPrice = selected.price ?? null;
+  const eventPricingType = publicEventPricingType(selected.pricing);
+  const eventPricingCurrency = publicEventPricingCurrency(selected.pricing) ?? "USD";
+  const isPaid = eventPricingType === "paid";
   const shouldShowCoursePricing = showCost && !isDropIn && coursePricing !== null;
   const shouldShowEventCost = showCost && isPaid && !isDropIn && coursePricing === null;
+  const eventCostLabel = shouldShowEventCost ? formatEventPrice(selected) : null;
   const acceptedItems = [];
   if (showAcceptedPasses) {
     acceptedItems.push(...applicablePasses.map((p) => p.name));
@@ -3082,8 +3145,8 @@ function EventDetailsView({
           }
         ) : shouldShowEventCost ? /* @__PURE__ */ jsxs("div", { className: "rb-mt-6", children: [
           /* @__PURE__ */ jsx("div", { className: "rb-label rb-mb-2", children: "Cost" }),
-          eventPrice !== null ? /* @__PURE__ */ jsx("p", { children: /* @__PURE__ */ jsx("strong", { children: formatCoursePriceAmount(eventPrice, selected.currency ?? "USD") }) }) : /* @__PURE__ */ jsx("p", { className: "rb-caption status-muted", children: "See checkout for details" }),
-          autoApplyDiscount ? /* @__PURE__ */ jsx("p", { className: "rb-caption rb-mt-1", children: formatAutoApplyDiscountLine(autoApplyDiscount, selected.currency ?? "USD") }) : null,
+          /* @__PURE__ */ jsx("p", { children: /* @__PURE__ */ jsx("strong", { children: eventCostLabel }) }),
+          autoApplyDiscount ? /* @__PURE__ */ jsx("p", { className: "rb-caption rb-mt-1", children: formatAutoApplyDiscountLine(autoApplyDiscount, eventPricingCurrency) }) : null,
           hasAcceptedItems ? /* @__PURE__ */ jsxs("p", { className: "rb-caption rb-mt-1", children: [
             "You can also attend with: ",
             acceptedItems.join(", ")
@@ -3355,9 +3418,7 @@ var EventPaginatedListView = ({
   error,
   hasMore,
   loadMore,
-  paginationMode = "loadMore",
-  seeAllUrl,
-  loadMoreText,
+  paginationAction,
   hasActiveFilters,
   onResetFilters,
   resetFiltersText
@@ -3397,7 +3458,7 @@ var EventPaginatedListView = ({
             }
           )
         ] }) : null,
-        paginationMode === "loadMore" && hasMore && !error ? /* @__PURE__ */ jsx("div", { className: "rb-mt-8 rb-text-center", children: /* @__PURE__ */ jsx(
+        paginationAction.kind === "loadMore" && hasMore && !error ? /* @__PURE__ */ jsx("div", { className: "rb-mt-8 rb-text-center", children: /* @__PURE__ */ jsx(
           "button",
           {
             type: "button",
@@ -3408,18 +3469,18 @@ var EventPaginatedListView = ({
               size: "md",
               extraClassName: loading ? "rb-opacity-50 rb-cursor-wait" : null
             }),
-            children: loading ? "Loading..." : loadMoreText
+            children: loading ? "Loading..." : paginationAction.label
           }
         ) }) : null,
-        paginationMode === "seeAllLink" && seeAllUrl && hasMore ? /* @__PURE__ */ jsx("div", { className: "rb-mt-8 rb-text-center", children: /* @__PURE__ */ jsx(
+        paginationAction.kind === "seeAllLink" && hasMore ? /* @__PURE__ */ jsx("div", { className: "rb-mt-8 rb-text-center", children: /* @__PURE__ */ jsx(
           "a",
           {
-            href: seeAllUrl,
+            href: paginationAction.href,
             className: themeButtonClassName({
               variant: display.buttonVariant,
               size: "md"
             }),
-            children: loadMoreText
+            children: paginationAction.label
           }
         ) }) : null
       ] }),
@@ -3449,41 +3510,9 @@ var EventPaginatedListView = ({
     }
   );
 };
-
-// ../blocks/src/system/runtime/hooks/utils/normalize.ts
-function normalizeOptionalId(value) {
-  const trimmed = typeof value === "string" ? value.trim() : void 0;
-  return trimmed ? trimmed : void 0;
-}
-function normalizeCsvIds(value) {
-  if (!value) return [];
-  const parts = Array.isArray(value) ? value.filter((entry) => typeof entry === "string") : typeof value === "string" ? value.split(",") : [];
-  return normalizeIdList(parts);
-}
-function normalizeCsvString(value) {
-  const ids = normalizeCsvIds(value);
-  return ids.length > 0 ? ids.join(",") : void 0;
-}
-
-// ../blocks/src/system/runtime/hooks/useEventPagination.ts
 function getEventIdentity(event) {
   return event.occurrenceId || event.id;
 }
-function getFiltersKey(filters) {
-  const categoryIds = normalizeCsvString(filters?.categoryIds);
-  const staffMemberId = normalizeOptionalId(filters?.staffMemberId);
-  const venueId = normalizeOptionalId(filters?.venueId);
-  const eventPresets = normalizeCsvString(filters?.eventPresets);
-  return JSON.stringify({
-    categoryIds,
-    staffMemberId,
-    venueId,
-    kind: filters?.kind ?? null,
-    eventSurface: filters?.eventSurface ?? null,
-    eventPresets,
-    scheduleScope: filters?.scheduleScope ?? null
-  });
-}
 function getEventsKey(events) {
   return events.map((e) => `${getEventIdentity(e)}:${e.startsAt}`).join("|");
 }
@@ -3498,8 +3527,8 @@ function useEventPagination({
   stage
 }) {
   const { getPublicEvents } = useBlockApi();
-  const initialFiltersKey = getFiltersKey(initialFilters);
-  const filtersKey = getFiltersKey(filters);
+  const initialFiltersKey = getEventRuntimeFiltersKey(initialFilters);
+  const filtersKey = getEventRuntimeFiltersKey(filters);
   const filtersMatchInitial = filtersKey === initialFiltersKey;
   const initialEventsKey = useMemo(() => getEventsKey(initialEvents), [initialEvents]);
   const initialEventsRef = useRef(initialEvents);
@@ -3935,14 +3964,14 @@ var EventListingController = ({
     [display.events]
   );
   const initialListFilters = useMemo(
-    () => ({
-      kind: hydration.eventKind === "all" ? void 0 : hydration.eventKind,
-      eventSurface: hydration.eventSurface === "all" ? void 0 : hydration.eventSurface,
-      eventPresets: hydration.filterEventPresets ?? void 0,
-      scheduleScope: hydration.scheduleScope === "any" ? void 0 : hydration.scheduleScope,
-      categoryIds: hydration.filterCategoryIds ?? void 0,
-      staffMemberId: hydration.filterStaffMemberId ?? void 0,
-      venueId: hydration.filterVenueId ?? void 0
+    () => buildEventRuntimeFilters({
+      eventKind: hydration.eventKind,
+      eventSurface: hydration.eventSurface,
+      filterEventPresets: hydration.filterEventPresets,
+      scheduleScope: hydration.scheduleScope,
+      filterCategoryIds: hydration.filterCategoryIds,
+      filterStaffMemberId: hydration.filterStaffMemberId,
+      filterVenueId: hydration.filterVenueId
     }),
     [
       hydration.eventKind,
@@ -3994,7 +4023,7 @@ var EventListingController = ({
     fetchInitialOnMount: hydration.fetchInitialEventsOnMount,
     initialFilters: initialListFilters,
     filters: listFilters,
-    pageSize: parseInt(hydration.eventsPerPage, 10) || 12,
+    pageSize: hydration.eventsPerPage,
     stage: hydration.stage
   });
   return /* @__PURE__ */ jsx(
@@ -4029,9 +4058,7 @@ var EventListingController = ({
       error,
       hasMore,
       loadMore,
-      paginationMode: hydration.paginationMode,
-      seeAllUrl: hydration.seeAllUrl,
-      loadMoreText: hydration.loadMoreText,
+      paginationAction: hydration.paginationAction,
       hasActiveFilters,
       onResetFilters: resetFilters
     }
@@ -4059,36 +4086,50 @@ var CALENDAR_FETCH_LIMIT = 200;
 function getMonthKey(date) {
   return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, "0")}`;
 }
-function getFiltersKey2(filters) {
-  const categoryIds = normalizeCsvString(filters?.categoryIds);
-  const staffMemberId = normalizeOptionalId(filters?.staffMemberId);
-  const venueId = normalizeOptionalId(filters?.venueId);
-  const eventPresets = normalizeCsvString(filters?.eventPresets);
-  return JSON.stringify({
-    categoryIds,
-    staffMemberId,
-    venueId,
-    kind: filters?.kind ?? null,
-    eventSurface: filters?.eventSurface ?? null,
-    eventPresets,
-    scheduleScope: filters?.scheduleScope ?? null
-  });
+function useCalendarViewport({
+  view = "month",
+  startOfWeek = "monday",
+  initialDate
+} = {}) {
+  const [viewDate, setViewDate] = useState(() => initialDate ?? /* @__PURE__ */ new Date());
+  const viewport = useMemo(
+    () => buildCalendarViewport({ view, anchorDate: viewDate, startOfWeek }),
+    [startOfWeek, view, viewDate]
+  );
+  const goToPrevious = useCallback(() => {
+    setViewDate((current) => shiftCalendarAnchorDate(current, view, -1));
+  }, [view]);
+  const goToNext = useCallback(() => {
+    setViewDate((current) => shiftCalendarAnchorDate(current, view, 1));
+  }, [view]);
+  const goToDate = useCallback((date) => {
+    setViewDate(date);
+  }, []);
+  const goToToday = useCallback(() => {
+    setViewDate(/* @__PURE__ */ new Date());
+  }, []);
+  return {
+    viewDate,
+    viewport,
+    goToDate,
+    goToPrevious,
+    goToNext,
+    goToToday
+  };
 }
-function useCalendarEvents({
-  siteId: _siteId,
-  // Deprecated: siteId now comes from BlockApiProvider context
+function useCalendarEventCache({
+  viewDate,
   initialEvents = [],
   preloadMonths = 1,
   filters,
   stage
 }) {
   const { getPublicEvents } = useBlockApi();
-  const [viewDate, setViewDate] = useState(() => /* @__PURE__ */ new Date());
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState(null);
   const [cacheVersion, setCacheVersion] = useState(0);
   const filtersKey = useMemo(
-    () => getFiltersKey2(filters),
+    () => getEventRuntimeFiltersKey(filters),
     [
       filters?.categoryIds,
       filters?.eventPresets,
@@ -4147,9 +4188,8 @@ function useCalendarEvents({
         staffMemberId: filters?.staffMemberId,
         venueId: filters?.venueId
       });
-      const events2 = result;
       if (currentRequestId === requestIdRef.current) {
-        for (const event of events2) {
+        for (const event of result) {
           const eventDate = new Date(event.startsAt);
           const monthKey = getMonthKey(eventDate);
           const existing = cacheRef.current.get(monthKey) || [];
@@ -4221,18 +4261,44 @@ function useCalendarEvents({
       (a, b) => new Date(a.startsAt).getTime() - new Date(b.startsAt).getTime()
     );
   }, [viewDate, cacheVersion]);
-  const goToPrevious = useCallback(() => {
-    setViewDate((current) => addMonths(current, -1));
-  }, []);
-  const goToNext = useCallback(() => {
-    setViewDate((current) => addMonths(current, 1));
-  }, []);
-  const goToToday = useCallback(() => {
-    setViewDate(/* @__PURE__ */ new Date());
-  }, []);
+  return {
+    events,
+    loading,
+    error
+  };
+}
+function useCalendarEvents({
+  siteId: _siteId,
+  // Deprecated: siteId now comes from BlockApiProvider context
+  initialEvents = [],
+  view = "month",
+  startOfWeek = "monday",
+  preloadMonths = 1,
+  filters,
+  stage
+}) {
+  const {
+    viewDate,
+    viewport,
+    goToDate,
+    goToPrevious,
+    goToNext,
+    goToToday
+  } = useCalendarViewport({ view, startOfWeek });
+  const { events, loading, error } = useCalendarEventCache({
+    viewDate,
+    initialEvents,
+    preloadMonths,
+    filters,
+    stage
+  });
+  const setViewDate = useCallback((date) => {
+    goToDate(date);
+  }, [goToDate]);
   return {
     events,
     viewDate,
+    viewport,
     loading,
     error,
     setViewDate,
@@ -4389,18 +4455,16 @@ var FULL_DAY_NAMES = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "F
 function formatAgendaDayHeader(date) {
   const dayName = FULL_DAY_NAMES[date.getDay()];
   const monthName = MONTH_NAMES[date.getMonth()];
-  return `${dayName}, ${monthName} ${date.getDate()}`;
+  return `${dayName ?? "Day"}, ${monthName ?? "Month"} ${date.getDate()}`;
 }
 var WeekAgendaView = ({
-  viewDate,
+  days,
   events,
-  startOfWeek,
   showCapacity,
   emptyMessage = "No events scheduled"
 }) => {
-  const weekDays = getWeekCalendarDays(viewDate, startOfWeek);
   const eventsByDate = groupEventsByDate(events);
-  return /* @__PURE__ */ jsx("div", { className: "event-agenda-week", children: weekDays.map((date) => {
+  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);
@@ -4431,6 +4495,7 @@ function EventDetailModal({
   event,
   showCapacity,
   onClose,
+  portalRoot,
   cardVariant = "default",
   buttonVariant = "primary",
   buttonText,
@@ -4443,6 +4508,8 @@ function EventDetailModal({
       title,
       titleId: "ec-event-modal-title",
       onClose,
+      portal: portalRoot != null,
+      portalRoot,
       overlayClassName: "ec-modal-overlay",
       modalClassName: "ec-modal ec-modal--event",
       renderSrOnlyTitle: true,
@@ -4481,7 +4548,8 @@ function DayEventsModal({
   events,
   showCapacity,
   onClose,
-  onSelectEvent
+  onSelectEvent,
+  portalRoot
 }) {
   const formattedDate = formatDate(date.toISOString());
   return /* @__PURE__ */ jsxs(
@@ -4490,6 +4558,8 @@ function DayEventsModal({
       title: formattedDate,
       titleId: "ec-day-modal-title",
       onClose,
+      portal: portalRoot != null,
+      portalRoot,
       overlayClassName: "ec-modal-overlay",
       modalClassName: "ec-modal ec-modal--day",
       renderHeader: ({ closeButtonRef, onClose: onClose2 }) => /* @__PURE__ */ jsx(
@@ -4531,38 +4601,63 @@ function EventModals({
   buttonVariant,
   buttonText
 }) {
+  const markerRef = React9.useRef(null);
+  const [portalRoot, setPortalRoot] = React9.useState(null);
   const { modalState, openEventModal, closeModal } = useEventModal();
+  React9.useEffect(() => {
+    const sourceEl = markerRef.current;
+    if (!sourceEl) return;
+    const portal = createBodyThemePortalRoot(sourceEl);
+    if (!portal) return;
+    const blockRoot = document.createElement("div");
+    blockRoot.setAttribute("data-block", "event-calendar");
+    portal.root.appendChild(blockRoot);
+    setPortalRoot(blockRoot);
+    return () => {
+      setPortalRoot(null);
+      portal.cleanup();
+    };
+  }, []);
+  const marker = /* @__PURE__ */ jsx("span", { ref: markerRef, hidden: true, "aria-hidden": "true" });
   if (modalState.type === "closed") {
-    return null;
+    return marker;
   }
   if (modalState.type === "event") {
-    return /* @__PURE__ */ jsx(
-      EventDetailModal,
-      {
-        event: modalState.event,
-        onClose: closeModal,
-        cardVariant,
-        buttonVariant,
-        buttonText,
-        showCapacity
-      }
-    );
+    return /* @__PURE__ */ jsxs(Fragment, { children: [
+      marker,
+      /* @__PURE__ */ jsx(
+        EventDetailModal,
+        {
+          event: modalState.event,
+          onClose: closeModal,
+          portalRoot,
+          cardVariant,
+          buttonVariant,
+          buttonText,
+          showCapacity
+        }
+      )
+    ] });
   }
   if (modalState.type === "day") {
-    return /* @__PURE__ */ jsx(
-      DayEventsModal,
-      {
-        date: modalState.date,
-        events: modalState.events,
-        onClose: closeModal,
-        onSelectEvent: (event) => {
-          openEventModal(event);
-        },
-        showCapacity
-      }
-    );
+    return /* @__PURE__ */ jsxs(Fragment, { children: [
+      marker,
+      /* @__PURE__ */ jsx(
+        DayEventsModal,
+        {
+          date: modalState.date,
+          events: modalState.events,
+          onClose: closeModal,
+          onSelectEvent: (event) => {
+            openEventModal(event);
+          },
+          portalRoot,
+          showCapacity
+        }
+      )
+    ] });
   }
-  return null;
+  return marker;
 }
 function toEventCombinedControllerProps(props) {
   return {
@@ -4572,7 +4667,7 @@ function toEventCombinedControllerProps(props) {
     listLayout: props.render.display.listLayout,
     listColumns: props.render.display.listColumns,
     eventsPerPage: props.render.display.eventsPerPage,
-    loadMoreText: props.render.display.loadMoreText,
+    paginationAction: props.render.display.paginationAction,
     startOfWeek: props.render.display.startOfWeek,
     calendarTabViews: props.render.display.calendarTabViews,
     showFilters: props.render.display.showFilters,
@@ -4602,8 +4697,8 @@ var EventCombinedClient = ({
   // List options
   listLayout = "stack",
   listColumns = "3",
-  eventsPerPage = "12",
-  loadMoreText,
+  eventsPerPage = 12,
+  paginationAction = { kind: "loadMore", label: "Load more events" },
   // Calendar options
   startOfWeek = "monday",
   calendarTabViews = "both",
@@ -4625,7 +4720,7 @@ var EventCombinedClient = ({
   showCapacity,
   // Styling
   buttonVariant = "primary",
-  buttonText = "Book now",
+  buttonText = "Book",
   emptyMessage = "No upcoming events scheduled.",
   className
 }) => {
@@ -4677,14 +4772,14 @@ var EventCombinedClient = ({
     preFilterScheduleScope: resolvedScheduleScope
   });
   const initialListFilters = useMemo(
-    () => ({
-      kind: eventKind === "courses" || eventKind === "events" ? eventKind : void 0,
-      eventSurface: resolvedEventSurface === "all" ? void 0 : resolvedEventSurface,
-      eventPresets: filterEventPresets ?? void 0,
-      scheduleScope: resolvedScheduleScope === "any" ? void 0 : resolvedScheduleScope,
-      categoryIds: filterCategoryIds ?? void 0,
-      staffMemberId: filterStaffMemberId ?? void 0,
-      venueId: filterVenueId ?? void 0
+    () => buildEventRuntimeFilters({
+      eventKind,
+      eventSurface: resolvedEventSurface,
+      filterEventPresets,
+      scheduleScope: resolvedScheduleScope,
+      filterCategoryIds,
+      filterStaffMemberId,
+      filterVenueId
     }),
     [
       eventKind,
@@ -4697,7 +4792,7 @@ var EventCombinedClient = ({
     ]
   );
   const listFilters = useMemo(() => getFilterParams(), [getFilterParams]);
-  const pageSize = parseInt(eventsPerPage, 10) || 12;
+  const pageSize = eventsPerPage;
   const initialListEvents = useMemo(
     () => (initialEvents ?? []).slice(0, pageSize),
     [initialEvents, pageSize]
@@ -4718,13 +4813,14 @@ var EventCombinedClient = ({
     stage
   });
   const calendarInitialEvents = useMemo(() => {
-    const initialKey = JSON.stringify(initialListFilters);
-    const currentKey = JSON.stringify(listFilters);
+    const initialKey = getEventRuntimeFiltersKey(initialListFilters);
+    const currentKey = getEventRuntimeFiltersKey(listFilters);
     return initialKey === currentKey ? initialEvents ?? [] : [];
   }, [initialEvents, initialListFilters, listFilters]);
   const {
     events: calendarEventsRaw,
     viewDate,
+    viewport,
     loading: calendarLoading,
     goToPrevious,
     goToNext,
@@ -4732,6 +4828,8 @@ var EventCombinedClient = ({
   } = useCalendarEvents({
     siteId,
     initialEvents: calendarInitialEvents,
+    view: calendarView,
+    startOfWeek,
     preloadMonths: 1,
     filters: listFilters,
     stage
@@ -4744,22 +4842,10 @@ var EventCombinedClient = ({
     () => getOrderedDayNames(startOfWeek),
     [startOfWeek]
   );
-  const calendarDays = useMemo(() => {
-    return getMonthCalendarDays(
-      viewDate.getFullYear(),
-      viewDate.getMonth(),
-      startOfWeek
-    );
-  }, [viewDate, startOfWeek]);
-  const headerTitle = useMemo(
-    () => formatCalendarTitle(viewDate, calendarView, calendarDays),
-    [viewDate, calendarView, calendarDays]
-  );
   const tabs = [
     { id: "list", label: "List" },
     { id: "calendar", label: "Calendar" }
   ];
-  const loadMoreButtonText = loadMoreText || "Load more";
   const containerClass = getContainerClass(listLayout, listColumns);
   const cardOrientation = getCardOrientation(listLayout);
   const listDisplay = {
@@ -4825,7 +4911,7 @@ var EventCombinedClient = ({
             error: eventsError,
             hasMore,
             loadMore,
-            loadMoreText: loadMoreButtonText,
+            paginationAction,
             hasActiveFilters,
             onResetFilters: resetFilters
           }
@@ -4883,7 +4969,7 @@ var EventCombinedClient = ({
                   }
                 ),
                 /* @__PURE__ */ jsxs("h3", { className: "event-calendar-title", children: [
-                  headerTitle,
+                  viewport.title,
                   calendarLoading && /* @__PURE__ */ jsx("span", { className: "rb-ml-2 rb-caption status-muted", children: "(loading...)" })
                 ] }),
                 /* @__PURE__ */ jsx(
@@ -4925,18 +5011,17 @@ var EventCombinedClient = ({
                 }
               )
             ] }),
-            calendarView === "week" ? /* @__PURE__ */ jsx(
+            viewport.kind === "week" ? /* @__PURE__ */ jsx(
               WeekAgendaView,
               {
-                viewDate,
+                days: viewport.days,
                 events: calendarEventsRaw,
-                startOfWeek,
                 emptyMessage: "No events scheduled",
                 showCapacity: resolvedShowCapacity
               }
             ) : /* @__PURE__ */ jsxs("div", { className: "event-calendar-container", children: [
               /* @__PURE__ */ jsx("div", { className: "event-calendar-day-headers", children: dayNames.map((day) => /* @__PURE__ */ jsx("div", { className: "event-calendar-day-header", children: day }, day)) }),
-              /* @__PURE__ */ jsx("div", { className: "event-calendar-grid", children: calendarDays.map((date) => {
+              /* @__PURE__ */ jsx("div", { className: "event-calendar-grid", children: viewport.days.map((date) => {
                 const dateKey = formatDateKey(date);
                 const dayEvents = eventsByDate.get(dateKey) || [];
                 return /* @__PURE__ */ jsx(
@@ -5171,7 +5256,7 @@ function formatHourLabel(hour) {
 }
 function hourToTickPercent(hour, hours) {
   const startHour = hours[0] ?? 0;
-  const endHour = hours.at(-1) ?? startHour + 1;
+  const endHour = hours[hours.length - 1] ?? startHour + 1;
   const range = Math.max(1, endHour - startHour);
   return (hour - startHour) / range * 100;
 }
@@ -5189,7 +5274,7 @@ var EventCalendarClient = ({
         listLayout: display.listLayout,
         listColumns: display.listColumns,
         eventsPerPage: display.eventsPerPage,
-        loadMoreText: display.loadMoreText,
+        paginationAction: display.paginationAction,
         startOfWeek: display.startOfWeek,
         calendarTabViews: display.calendarTabViews,
         showFilters: display.showFilters,
@@ -5233,6 +5318,7 @@ var EventCalendarTimetableClient = ({ render }) => {
   const {
     events,
     viewDate,
+    viewport,
     loading,
     error,
     goToPrevious,
@@ -5241,18 +5327,12 @@ var EventCalendarTimetableClient = ({ render }) => {
   } = useCalendarEvents({
     siteId: hydration.siteId,
     initialEvents: calendarInitialEvents,
+    view: "week",
+    startOfWeek: display.startOfWeek,
     preloadMonths: 1,
     filters: listFilters,
     stage: hydration.stage
   });
-  const calendarDays = useMemo(
-    () => getWeekCalendarDays(viewDate, display.startOfWeek),
-    [display.startOfWeek, viewDate]
-  );
-  const headerTitle = useMemo(
-    () => formatCalendarTitle(viewDate, "week", calendarDays),
-    [calendarDays, viewDate]
-  );
   return /* @__PURE__ */ jsxs(EventModalProvider, { children: [
     /* @__PURE__ */ jsx(
       EventCalendarChrome,
@@ -5262,7 +5342,7 @@ var EventCalendarTimetableClient = ({ render }) => {
         className: "event-calendar--timetable",
         error,
         filters: filtersNode,
-        headerTitle,
+        headerTitle: viewport.title,
         loading,
         onNext: goToNext,
         onPrevious: goToPrevious,
@@ -5297,6 +5377,7 @@ var EventCalendarGridClient = ({ render }) => {
   const {
     events,
     viewDate,
+    viewport,
     loading,
     error,
     goToPrevious,
@@ -5305,6 +5386,8 @@ var EventCalendarGridClient = ({ render }) => {
   } = useCalendarEvents({
     siteId: hydration.siteId,
     initialEvents: calendarInitialEvents,
+    view: calendarView,
+    startOfWeek: display.startOfWeek,
     preloadMonths: 1,
     filters: listFilters,
     stage: hydration.stage
@@ -5314,20 +5397,6 @@ var EventCalendarGridClient = ({ render }) => {
     () => getOrderedDayNames(display.startOfWeek),
     [display.startOfWeek]
   );
-  const calendarDays = useMemo(() => {
-    if (calendarView === "week") {
-      return getWeekCalendarDays(viewDate, display.startOfWeek);
-    }
-    return getMonthCalendarDays(
-      viewDate.getFullYear(),
-      viewDate.getMonth(),
-      display.startOfWeek
-    );
-  }, [calendarView, display.startOfWeek, viewDate]);
-  const headerTitle = useMemo(
-    () => formatCalendarTitle(viewDate, calendarView, calendarDays),
-    [viewDate, calendarView, calendarDays]
-  );
   return /* @__PURE__ */ jsxs(EventModalProvider, { children: [
     /* @__PURE__ */ jsxs(
       EventCalendarChrome,
@@ -5336,7 +5405,7 @@ var EventCalendarGridClient = ({ render }) => {
         calendarView,
         error,
         filters: filtersNode,
-        headerTitle,
+        headerTitle: viewport.title,
         loading,
         onNext: goToNext,
         onPrevious: goToPrevious,
@@ -5344,7 +5413,7 @@ var EventCalendarGridClient = ({ render }) => {
         children: [
           /* @__PURE__ */ jsxs("div", { className: "event-calendar-container", children: [
             /* @__PURE__ */ jsx("div", { className: "event-calendar-day-headers", children: dayNames.map((day) => /* @__PURE__ */ jsx("div", { className: "event-calendar-day-header", children: day }, day)) }),
-            /* @__PURE__ */ jsx("div", { className: "event-calendar-grid", children: calendarDays.map((date) => {
+            /* @__PURE__ */ jsx("div", { className: "event-calendar-grid", children: viewport.days.map((date) => {
               const dateKey = formatDateKey(date);
               const dayEvents = eventsByDate.get(dateKey) || [];
               return /* @__PURE__ */ jsx(
@@ -5432,43 +5501,21 @@ function usePrefetchedCalendarEvents(display, listFilters) {
     ]
   );
   return useMemo(() => {
-    const initialKey = JSON.stringify(initialFilters);
-    const currentKey = JSON.stringify(listFilters);
+    const initialKey = getEventRuntimeFiltersKey(initialFilters);
+    const currentKey = getEventRuntimeFiltersKey(listFilters);
     return initialKey === currentKey ? [...display.events] : [];
   }, [display.events, initialFilters, listFilters]);
 }
 function buildDisplayFilterParams(display) {
-  const params = {};
-  if (display.eventSurface !== "all") {
-    params.eventSurface = display.eventSurface;
-  }
-  if (display.filterEventPresets) {
-    params.eventPresets = display.filterEventPresets;
-  }
-  if (display.scheduleScope !== "any") {
-    params.scheduleScope = display.scheduleScope;
-  }
-  if (display.eventKind === "courses") {
-    params.kind = "courses";
-    if (display.filterVenueId) params.venueId = display.filterVenueId;
-    if (display.filterStaffMemberId) {
-      params.staffMemberId = display.filterStaffMemberId;
-    }
-    return params;
-  }
-  if (display.filterCategoryIds) {
-    params.categoryIds = display.filterCategoryIds;
-  }
-  if (display.eventKind === "events") {
-    params.kind = "events";
-  }
-  if (display.filterVenueId) {
-    params.venueId = display.filterVenueId;
-  }
-  if (display.filterStaffMemberId) {
-    params.staffMemberId = display.filterStaffMemberId;
-  }
-  return params;
+  return buildEventRuntimeFilters({
+    eventKind: display.eventKind,
+    eventSurface: display.eventSurface,
+    filterEventPresets: display.filterEventPresets,
+    scheduleScope: display.scheduleScope,
+    filterCategoryIds: display.filterCategoryIds,
+    filterStaffMemberId: display.filterStaffMemberId,
+    filterVenueId: display.filterVenueId
+  });
 }
 var EventCalendarChrome = ({
   children,