@riverbankcms/sdk 0.79.0 → 0.81.0

package/dist/client/{carousel-5EIULWBI.mjs → carousel-ELXWSBLA.mjs}

@@ -1,7 +1,7 @@
-import { normalizeCarouselProps, CarouselNodeClient } from './chunk-UDS3NTWA.mjs';
+import { normalizeCarouselProps, CarouselNodeClient } from './chunk-G56BSZAM.mjs';
 import { mountReactIsland } from './chunk-N7PBWBWQ.mjs';
-import { defineIslandPropsDecoder } from './chunk-R5ESWNKX.mjs';
-import './chunk-AUJ5DBZJ.mjs';
+import { defineIslandPropsDecoder } from './chunk-NX6X3GRF.mjs';
+import './chunk-7BXX7WXH.mjs';
 import { jsx } from 'react/jsx-runtime';
 
 var decode = defineIslandPropsDecoder("carousel");

package/dist/client/{cart-DOP3FNI4.mjs → cart-6SSCPYY5.mjs}

@@ -1,15 +1,15 @@
-import { mountShopBlockIsland, CartClient } from './chunk-YLDYVRZL.mjs';
-import './chunk-TYONZMST.mjs';
-import './chunk-UDS3NTWA.mjs';
+import { mountShopBlockIsland, CartClient } from './chunk-NP47RHIX.mjs';
+import './chunk-TCJS3NY5.mjs';
+import './chunk-G56BSZAM.mjs';
 import './chunk-I2MMZO53.mjs';
 import './chunk-ZFHRN6W2.mjs';
-import './chunk-CCNTDRCF.mjs';
+import './chunk-PA2LJH2M.mjs';
 import './chunk-3DCJ45Z2.mjs';
 import './chunk-3PEDD5KJ.mjs';
 import './chunk-UDNSI5PY.mjs';
 import './chunk-N7PBWBWQ.mjs';
-import { defineIslandPropsDecoder } from './chunk-R5ESWNKX.mjs';
-import './chunk-AUJ5DBZJ.mjs';
+import { defineIslandPropsDecoder } from './chunk-NX6X3GRF.mjs';
+import './chunk-7BXX7WXH.mjs';
 
 // src/rendering/islands/enhancers/cart.tsx
 var decode = defineIslandPropsDecoder("cart");

package/dist/client/{checkout-BVMF6FBV.mjs → checkout-UFQ34HPV.mjs}

@@ -1,15 +1,15 @@
-import { mountShopBlockIsland, CheckoutClient } from './chunk-YLDYVRZL.mjs';
-import './chunk-TYONZMST.mjs';
-import './chunk-UDS3NTWA.mjs';
+import { mountShopBlockIsland, CheckoutClient } from './chunk-NP47RHIX.mjs';
+import './chunk-TCJS3NY5.mjs';
+import './chunk-G56BSZAM.mjs';
 import './chunk-I2MMZO53.mjs';
 import './chunk-ZFHRN6W2.mjs';
-import './chunk-CCNTDRCF.mjs';
+import './chunk-PA2LJH2M.mjs';
 import './chunk-3DCJ45Z2.mjs';
 import './chunk-3PEDD5KJ.mjs';
 import './chunk-UDNSI5PY.mjs';
 import './chunk-N7PBWBWQ.mjs';
-import { defineIslandPropsDecoder } from './chunk-R5ESWNKX.mjs';
-import './chunk-AUJ5DBZJ.mjs';
+import { defineIslandPropsDecoder } from './chunk-NX6X3GRF.mjs';
+import './chunk-7BXX7WXH.mjs';
 
 // src/rendering/islands/enhancers/checkout.tsx
 var decode = defineIslandPropsDecoder("checkout");

package/dist/client/{chunk-44K2U3QI.mjs → chunk-76JUETXQ.mjs}

@@ -1,16 +1,16 @@
 "use client";
 import { LeafletStaticMap } from './chunk-XSV6KW4D.mjs';
-import { MagicLinkForm, useWaitlistClaim } from './chunk-GG4M2NP6.mjs';
-import { usePolling } from './chunk-V6M5FCR5.mjs';
-import { SpinnerNode } from './chunk-CE7IBGVW.mjs';
+import { MagicLinkForm, useWaitlistClaim } from './chunk-V6XI4M2Q.mjs';
+import { usePolling } from './chunk-IUEDYLFJ.mjs';
+import { SpinnerNode } from './chunk-RMWMT3ZD.mjs';
 import { useDiscountCodeUi } from './chunk-ZFHRN6W2.mjs';
-import { TabBarFragment, logoutPortal, StepIndicator, DiscountCodeDisclosure, TerminalPanel, StateIcon, formatPrice, CrossIcon, ClockIcon, consumeSearchParam, LoggedInAsUser, CheckIcon } from './chunk-CCNTDRCF.mjs';
+import { TabBarFragment, logoutPortal, StepIndicator, DiscountCodeDisclosure, TerminalPanel, StateIcon, formatPrice, CrossIcon, ClockIcon, consumeSearchParam, LoggedInAsUser, CheckIcon } from './chunk-PA2LJH2M.mjs';
 import { getFieldValidationControlProps, FieldValidationMessage } from './chunk-3DCJ45Z2.mjs';
 import { ModalShell } from './chunk-3PEDD5KJ.mjs';
 import { isSpamProtectionEnabled, AltchaWidget, getChallengeUrl } from './chunk-YLMKMCSJ.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-R5ESWNKX.mjs';
-import { getBookingLocalDateKey, toScheduledBookingDateTime, toBookingTimeZone, formatBookingDateTime, formatBookingDate, formatBookingTime } from './chunk-AUJ5DBZJ.mjs';
+import { buildEventRuntimeFilters, buildEventCalendarListingRender, groupEventsByDate, getOrderedDayNames, formatDateKey, getEventRuntimeFiltersKey, themeButtonClassName, normalizeCsvIds, normalizeOptionalId, normalizeEventBlockKind, normalizeCsvString, EventCompactRow, EmptyState, getContainerClass, getCardOrientation, isToday, MAX_EVENTS_PER_DAY, formatTime, resolveCoursePricingState, formatEventDateParts, formatCoursePriceAmount, DateTimeTile, EventCard, buildCalendarViewport, shiftCalendarAnchorDate, addMonths, getThreeMonthRange, buildTimetableModel, formatDate, isEventContentType, formatCoursePriceDisplay, MONTH_NAMES, formatEventPrice, getEventAvailability, formatEventTeacherLine, CreditCard, Ticket, Star, Sparkles, assertNever11 } from './chunk-NX6X3GRF.mjs';
+import { getBookingLocalDateKey, toScheduledBookingDateTime, toBookingTimeZone, formatBookingDateTime, formatBookingDate, formatBookingTime } from './chunk-7BXX7WXH.mjs';
 import { createContext, useId, useMemo, useState, useRef, useEffect, useCallback, useContext, useReducer } from 'react';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 
@@ -3355,9 +3355,7 @@ var EventPaginatedListView = ({
   error,
   hasMore,
   loadMore,
-  paginationMode = "loadMore",
-  seeAllUrl,
-  loadMoreText,
+  paginationAction,
   hasActiveFilters,
   onResetFilters,
   resetFiltersText
@@ -3397,7 +3395,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 +3406,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 +3447,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 +3464,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 +3901,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 +3960,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 +3995,7 @@ var EventListingController = ({
       error,
       hasMore,
       loadMore,
-      paginationMode: hydration.paginationMode,
-      seeAllUrl: hydration.seeAllUrl,
-      loadMoreText: hydration.loadMoreText,
+      paginationAction: hydration.paginationAction,
       hasActiveFilters,
       onResetFilters: resetFilters
     }
@@ -4059,36 +4023,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 +4125,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 +4198,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,
@@ -4392,15 +4395,13 @@ function formatAgendaDayHeader(date) {
   return `${dayName}, ${monthName} ${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);
@@ -4572,7 +4573,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 +4603,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 +4626,7 @@ var EventCombinedClient = ({
   showCapacity,
   // Styling
   buttonVariant = "primary",
-  buttonText = "Book now",
+  buttonText = "Book",
   emptyMessage = "No upcoming events scheduled.",
   className
 }) => {
@@ -4677,14 +4678,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 +4698,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 +4719,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 +4734,8 @@ var EventCombinedClient = ({
   } = useCalendarEvents({
     siteId,
     initialEvents: calendarInitialEvents,
+    view: calendarView,
+    startOfWeek,
     preloadMonths: 1,
     filters: listFilters,
     stage
@@ -4744,22 +4748,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 +4817,7 @@ var EventCombinedClient = ({
             error: eventsError,
             hasMore,
             loadMore,
-            loadMoreText: loadMoreButtonText,
+            paginationAction,
             hasActiveFilters,
             onResetFilters: resetFilters
           }
@@ -4883,7 +4875,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 +4917,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(
@@ -5189,7 +5180,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 +5224,7 @@ var EventCalendarTimetableClient = ({ render }) => {
   const {
     events,
     viewDate,
+    viewport,
     loading,
     error,
     goToPrevious,
@@ -5241,18 +5233,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 +5248,7 @@ var EventCalendarTimetableClient = ({ render }) => {
         className: "event-calendar--timetable",
         error,
         filters: filtersNode,
-        headerTitle,
+        headerTitle: viewport.title,
         loading,
         onNext: goToNext,
         onPrevious: goToPrevious,
@@ -5297,6 +5283,7 @@ var EventCalendarGridClient = ({ render }) => {
   const {
     events,
     viewDate,
+    viewport,
     loading,
     error,
     goToPrevious,
@@ -5305,6 +5292,8 @@ var EventCalendarGridClient = ({ render }) => {
   } = useCalendarEvents({
     siteId: hydration.siteId,
     initialEvents: calendarInitialEvents,
+    view: calendarView,
+    startOfWeek: display.startOfWeek,
     preloadMonths: 1,
     filters: listFilters,
     stage: hydration.stage
@@ -5314,20 +5303,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 +5311,7 @@ var EventCalendarGridClient = ({ render }) => {
         calendarView,
         error,
         filters: filtersNode,
-        headerTitle,
+        headerTitle: viewport.title,
         loading,
         onNext: goToNext,
         onPrevious: goToPrevious,
@@ -5344,7 +5319,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 +5407,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,