@riverbankcms/sdk 0.60.7 → 0.60.11

package/dist/client/rendering/client.mjs

@@ -466,6 +466,92 @@ function encodePublicProductCategorySelector(selector) {
       };
   }
 }
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
+function isJsonResponseContentType(contentType) {
+  if (!contentType) return false;
+  const mimeType = contentType.split(";", 1)[0]?.trim().toLowerCase() ?? "";
+  return mimeType === "application/json" || mimeType.endsWith("+json");
+}
+function getResponseContentType(response) {
+  return response.headers.get("content-type");
+}
+async function parseJsonBody(response) {
+  const rawText = await response.text();
+  if (rawText.trim().length === 0) {
+    return { kind: "empty-body" };
+  }
+  try {
+    return { kind: "success", value: JSON.parse(rawText) };
+  } catch {
+    return { kind: "invalid-json" };
+  }
+}
+function getBlockApiErrorDetails(data) {
+  if (!isRecord(data)) {
+    return {};
+  }
+  const nestedError = isRecord(data.error) ? data.error : void 0;
+  const message = typeof nestedError?.message === "string" ? nestedError.message : typeof data.message === "string" ? data.message : void 0;
+  const code = typeof nestedError?.code === "string" ? nestedError.code : typeof data.code === "string" ? data.code : void 0;
+  return { message, code };
+}
+function buildUnexpectedJsonResponseMessage(parseResult) {
+  switch (parseResult.kind) {
+    case "empty-body":
+      return "Expected JSON response body but received an empty response";
+    case "invalid-json":
+      return "Expected JSON response but received invalid JSON";
+  }
+}
+async function extractErrorDetails(response) {
+  const contentType = getResponseContentType(response);
+  const fallbackMessage = `Request failed: ${response.statusText}`;
+  if (!isJsonResponseContentType(contentType)) {
+    return {
+      message: `${fallbackMessage} (received ${contentType ?? "unknown content type"})`
+    };
+  }
+  const parseResult = await parseJsonBody(response);
+  switch (parseResult.kind) {
+    case "success": {
+      const details = getBlockApiErrorDetails(parseResult.value);
+      return {
+        message: details.message ?? fallbackMessage,
+        code: details.code
+      };
+    }
+    case "invalid-json":
+      return {
+        message: `${fallbackMessage} (received invalid JSON)`
+      };
+    case "empty-body":
+      return {
+        message: `${fallbackMessage} (received an empty response)`
+      };
+  }
+}
+async function parseJsonApiResponse(response) {
+  if (response.status === 204 || response.status === 205) {
+    return void 0;
+  }
+  const contentType = getResponseContentType(response);
+  if (!isJsonResponseContentType(contentType)) {
+    throw new BlockApiError(
+      `Expected JSON response but received ${contentType ?? "unknown content type"}`,
+      response.status
+    );
+  }
+  const parseResult = await parseJsonBody(response);
+  if (parseResult.kind !== "success") {
+    throw new BlockApiError(
+      buildUnexpectedJsonResponseMessage(parseResult),
+      response.status
+    );
+  }
+  return parseResult.value;
+}
 function getAuthHeaders(auth) {
   switch (auth.type) {
     case "api-key":
@@ -522,21 +608,10 @@ function createBlockApi(config) {
     const doFetch = async () => {
       const response = await fetch(url, fetchOptions);
       if (!response.ok) {
-        let errorMessage = `Request failed: ${response.statusText}`;
-        let errorCode;
-        try {
-          const errorData = await response.json();
-          if (typeof errorData.error?.message === "string") {
-            errorMessage = errorData.error.message;
-          } else if (typeof errorData.message === "string") {
-            errorMessage = errorData.message;
-          }
-          errorCode = errorData.error?.code || errorData.code;
-        } catch {
-        }
-        throw new BlockApiError(errorMessage, response.status, errorCode);
+        const details = await extractErrorDetails(response);
+        throw new BlockApiError(details.message, response.status, details.code);
       }
-      const json = await response.json();
+      const json = await parseJsonApiResponse(response);
       if (isApiSuccessResponse(json)) {
         return json.data;
       }
@@ -1521,6 +1596,15 @@ var init_layout = __esm({
 
 // ../theme-core/src/buttons/types.ts
 import { z } from "zod";
+function isVariantRole(value) {
+  return VARIANT_ROLES.includes(value);
+}
+function asSpecialVariantId(value) {
+  if (value.length === 0) {
+    throw new Error("SpecialVariantId must be a non-empty string");
+  }
+  return value;
+}
 var VARIANT_ROLES, DEFAULT_VARIANT_ALIAS_ID, cornerStyleSchema, shadowSizeSchema, textTransformSchema, fontWeightSchema, buttonTypographySchema, letterSpacingSchema, hoverTransformSchema, hoverColorSchema, buttonPaddingPresetSchema, gradientStyleSchema, gradientSharpnessSchema, prioritySchema, variantRoleSchema, buttonSizeNameSchema, PADDING_TOKEN_PATTERN, paddingShorthandSchema, buttonSizeConfigSchema, buttonSizesSchema, buttonGlobalSettingsSchema, gradientDirectionSchema, buttonBackgroundSchema, effectApplicationSchema, buttonBorderSchema, variantShadowSchema, variantEffectsSchema, variantSizeOverridesSchema, buttonVariantSchema, buttonSystemSchema;
 var init_types = __esm({
   "../theme-core/src/buttons/types.ts"() {
@@ -1673,6 +1757,41 @@ var init_types = __esm({
   }
 });
 
+// ../theme-core/src/buttons/classNames.ts
+function parseThemeButtonVariantId(value) {
+  const normalized = value?.trim() ?? "";
+  if (normalized.length === 0) {
+    return null;
+  }
+  if (normalized === DEFAULT_VARIANT_ALIAS_ID) {
+    return DEFAULT_VARIANT_ALIAS_ID;
+  }
+  return isVariantRole(normalized) ? normalized : asSpecialVariantId(normalized);
+}
+function themeButtonVariantClassNames(variant) {
+  if (variant === DEFAULT_VARIANT_ALIAS_ID) {
+    return [variant];
+  }
+  return [variant, `button-${variant}`];
+}
+function themeButtonSizeClassName(size) {
+  return `btn-${size}`;
+}
+function themeButtonClassName(spec) {
+  const classes = [
+    ...themeButtonVariantClassNames(spec.variant),
+    themeButtonSizeClassName(spec.size),
+    spec.extraClassName
+  ];
+  return classes.filter(Boolean).join(" ");
+}
+var init_classNames = __esm({
+  "../theme-core/src/buttons/classNames.ts"() {
+    "use strict";
+    init_types();
+  }
+});
+
 // ../theme-core/src/tokens/resolver.ts
 var init_resolver = __esm({
   "../theme-core/src/tokens/resolver.ts"() {
@@ -1812,6 +1931,7 @@ var init_generateButtonCss = __esm({
   "../theme-core/src/buttons/generateButtonCss.ts"() {
     "use strict";
     init_types();
+    init_classNames();
     init_resolver();
     init_generateEffectsCSS();
     init_constants();
@@ -2480,6 +2600,7 @@ var init_buttons = __esm({
   "../theme-core/src/buttons/index.ts"() {
     "use strict";
     init_types();
+    init_classNames();
     init_generateButtonCss();
     init_generateDefaultButtonSystem();
     init_constants();
@@ -3268,11 +3389,11 @@ var init_fileAssetLegacyProjection = __esm({
 });
 
 // ../media-core/src/typeGuards.ts
-function isRecord(value) {
+function isRecord2(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function asRecord(value) {
-  return isRecord(value) ? value : void 0;
+  return isRecord2(value) ? value : void 0;
 }
 var init_typeGuards = __esm({
   "../media-core/src/typeGuards.ts"() {
@@ -5013,7 +5134,7 @@ var init_Text = __esm({
 });
 
 // ../blocks/src/lib/typeGuards.ts
-function isRecord2(value) {
+function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var init_typeGuards2 = __esm({
@@ -5062,11 +5183,11 @@ function markdownToTipTapDoc(markdown) {
   };
 }
 function coerceRichTextDoc(value) {
-  const raw = isRecord2(value) && "doc" in value ? value.doc : value;
+  const raw = isRecord3(value) && "doc" in value ? value.doc : value;
   if (typeof raw === "string") {
     return markdownToTipTapDoc(raw);
   }
-  if (isRecord2(raw) && typeof raw.type === "string") {
+  if (isRecord3(raw) && typeof raw.type === "string") {
     return raw;
   }
   return null;
@@ -5126,11 +5247,12 @@ var init_basic = __esm({
         }
         return null;
       }
-      const resolvedVariantId = typeof variantId === "string" ? variantId.trim() : "";
-      const normalizedVariantId = resolvedVariantId === DEFAULT_VARIANT_ALIAS_ID ? "" : resolvedVariantId;
-      const variantClasses = normalizedVariantId ? [normalizedVariantId, `button-${normalizedVariantId}`] : [];
-      const sizeClass = `btn-${size}`;
-      const combinedClassName = [...variantClasses, sizeClass, className].filter(Boolean).join(" ");
+      const resolvedVariantId = parseThemeButtonVariantId(variantId);
+      const combinedClassName = resolvedVariantId ? themeButtonClassName({
+        variant: resolvedVariantId,
+        size,
+        extraClassName: className
+      }) : className;
       if (resolvedHref) {
         return /* @__PURE__ */ jsx10(
           "a",
@@ -6135,19 +6257,6 @@ var init_media2 = __esm({
   }
 });
 
-// ../blocks/src/system/runtime/shared/themedButtonClass.ts
-function themedButtonClass(spec) {
-  const { variant, size, extraClassName } = spec;
-  const normalizedVariant = variant.trim();
-  const variantClasses = normalizedVariant ? [normalizedVariant, `button-${normalizedVariant}`] : [];
-  return [...variantClasses, `btn-${size}`, extraClassName].filter(Boolean).join(" ");
-}
-var init_themedButtonClass = __esm({
-  "../blocks/src/system/runtime/shared/themedButtonClass.ts"() {
-    "use strict";
-  }
-});
-
 // ../blocks/src/system/runtime/nodes/file-download.tsx
 import { jsx as jsx13, jsxs } from "react/jsx-runtime";
 function isDownloadableMediaType(type) {
@@ -6221,7 +6330,7 @@ function FileDownloadNode({
       {
         href,
         download: filename,
-        className: themedButtonClass({
+        className: themeButtonClassName({
           variant,
           size: "md",
           extraClassName: "rb-inline-flex rb-shrink-0 rb-items-center rb-justify-center rb-gap-2"
@@ -6241,7 +6350,7 @@ var init_file_download = __esm({
     init_lucide_react();
     init_colorStyles();
     init_media2();
-    init_themedButtonClass();
+    init_buttons();
     init_media();
     FILE_DOWNLOAD_BUTTON_VARIANTS = ["primary", "secondary", "outline", "link"];
   }
@@ -9717,7 +9826,7 @@ var init_EventCard = __esm({
     init_EventCardIcons();
     init_eventCapacity();
     init_utils();
-    init_themedButtonClass();
+    init_buttons();
     EventCard = ({
       event,
       cardVariant = "default",
@@ -9743,7 +9852,7 @@ var init_EventCard = __esm({
       const isSoldOut = cta.hidden;
       const { available: spotsLeft } = getEventAvailability(event);
       const cardClass = `card-${cardVariant}`;
-      const buttonClass = themedButtonClass({ variant: buttonVariant, size: "md" });
+      const buttonClass = themeButtonClassName({ variant: buttonVariant, size: "md" });
       const title = event.title;
       const summary = event.presentation?.summary ?? event.description;
       const image = event.presentation?.image ?? null;
@@ -9825,7 +9934,7 @@ var init_EventCompactRow = __esm({
     "use strict";
     init_utils();
     init_EventCardIcons();
-    init_themedButtonClass();
+    init_buttons();
     EventCompactRow = ({
       event,
       buttonVariant = "primary",
@@ -9837,7 +9946,7 @@ var init_EventCompactRow = __esm({
       const price = formatEventPrice(event);
       const teacherLine = formatEventTeacherLine(event);
       const cta = resolveEventCta(event, buttonText);
-      const buttonClass = themedButtonClass({ variant: buttonVariant, size: "sm" });
+      const buttonClass = themeButtonClassName({ variant: buttonVariant, size: "sm" });
       return /* @__PURE__ */ jsxs17("div", { className: "event-compact-row", children: [
         /* @__PURE__ */ jsxs17("div", { className: "event-compact-row-content", children: [
           /* @__PURE__ */ jsxs17("div", { className: "event-compact-row-top", children: [
@@ -9909,7 +10018,7 @@ var init_EventSpotlight = __esm({
   "../blocks/src/system/runtime/nodes/events/EventSpotlight.tsx"() {
     "use strict";
     init_shared3();
-    init_themedButtonClass();
+    init_buttons();
     EventSpotlight = ({
       events,
       layout = "grid",
@@ -9931,7 +10040,7 @@ var init_EventSpotlight = __esm({
       }
       const containerClass = getContainerClass(layout, columns);
       const cardOrientation = getCardOrientation(layout);
-      const buttonClass = themedButtonClass({ variant: buttonVariant, size: "md" });
+      const buttonClass = themeButtonClassName({ variant: buttonVariant, size: "md" });
       return /* @__PURE__ */ jsxs19("div", { className: `event-spotlight-section ${className || ""}`, "data-block": "event-spotlight", children: [
         /* @__PURE__ */ jsx33("div", { className: `event-spotlight ${containerClass}`, children: normalizedEvents.map((event) => /* @__PURE__ */ jsx33(
           EventCard,
@@ -20312,7 +20421,16 @@ var init_view3 = __esm({
 import { Fragment as Fragment5, jsx as jsx37, jsxs as jsxs22 } from "react/jsx-runtime";
 function renderServerPendingAction(label, soldOut) {
   return /* @__PURE__ */ jsxs22(Fragment5, { children: [
-    /* @__PURE__ */ jsx37("button", { type: "button", className: "default", disabled: true, "aria-disabled": "true", children: soldOut ? "Sold out" : label }),
+    /* @__PURE__ */ jsx37(
+      "button",
+      {
+        type: "button",
+        className: themeButtonClassName({ variant: "default", size: "md" }),
+        disabled: true,
+        "aria-disabled": "true",
+        children: soldOut ? "Sold out" : label
+      }
+    ),
     !soldOut ? /* @__PURE__ */ jsx37("p", { className: "rb-caption status-muted", children: "Cart actions become interactive after page load." }) : null
   ] });
 }
@@ -20332,7 +20450,14 @@ function ProductListServerContent(props2) {
       ),
       actions: /* @__PURE__ */ jsxs22(Fragment5, { children: [
         renderServerPendingAction(card.actionLabel, card.soldOut),
-        card.path ? /* @__PURE__ */ jsx37("a", { href: card.path, className: "secondary btn-sm", children: "View details" }) : null
+        card.path ? /* @__PURE__ */ jsx37(
+          "a",
+          {
+            href: card.path,
+            className: themeButtonClassName({ variant: "secondary", size: "sm" }),
+            children: "View details"
+          }
+        ) : null
       ] })
     },
     card.productId
@@ -20375,6 +20500,7 @@ function CheckoutServerContent(props2) {
 var init_shop_commerce_server = __esm({
   "../blocks/src/system/runtime/nodes/shop-commerce.server.tsx"() {
     "use strict";
+    init_buttons();
     init_RichText();
     init_carousel_server();
     init_richText_coerce();
@@ -20923,7 +21049,7 @@ function renderCalendarGrid(display) {
         "button",
         {
           type: "button",
-          className: themedButtonClass({
+          className: themeButtonClassName({
             variant: display.buttonVariant,
             size: "sm"
           }),
@@ -21009,7 +21135,7 @@ function renderTimetableSsr(display) {
         "button",
         {
           type: "button",
-          className: themedButtonClass({
+          className: themeButtonClassName({
             variant: display.buttonVariant,
             size: "sm"
           }),
@@ -21137,7 +21263,7 @@ var init_EventCalendar_server = __esm({
     init_renderEventListItem();
     init_utils();
     init_timetableModel();
-    init_themedButtonClass();
+    init_buttons();
     EventCalendarSSR = (props2) => {
       const islandProps = buildEventCalendarInteractiveIslandProps(props2);
       const display = islandProps.render.display;
@@ -21268,7 +21394,7 @@ var init_form_server = __esm({
     "use strict";
     init_clsx();
     init_ssr();
-    init_themedButtonClass();
+    init_buttons();
     init_form_interactive();
     FormNodeSSR = ({
       blockId,
@@ -21406,7 +21532,7 @@ var init_form_server = __esm({
                 "button",
                 {
                   type: "submit",
-                  className: themedButtonClass({
+                  className: themeButtonClassName({
                     variant: "primary",
                     size: "md",
                     extraClassName: "rb-w-full rb-sm-w-auto"
@@ -21499,7 +21625,7 @@ function NewsletterFormSSR({
               "button",
               {
                 type: "submit",
-                className: themedButtonClass({ variant: "primary", size: "md" }),
+                className: themeButtonClassName({ variant: "primary", size: "md" }),
                 children: display.buttonLabel
               }
             ) })
@@ -21516,7 +21642,7 @@ var init_newsletter_form_server = __esm({
     "use strict";
     init_clsx();
     init_ssr();
-    init_themedButtonClass();
+    init_buttons();
     init_newsletter_form_interactive();
     newsletter_form_server_default = NewsletterFormSSR;
   }
@@ -21647,7 +21773,16 @@ function ShopSSR({
               PassCardView,
               {
                 display: pass,
-                action: /* @__PURE__ */ jsx50("button", { type: "button", className: "default", disabled: true, "aria-disabled": "true", children: pass.actionLabel })
+                action: /* @__PURE__ */ jsx50(
+                  "button",
+                  {
+                    type: "button",
+                    className: themeButtonClassName({ variant: "default", size: "md" }),
+                    disabled: true,
+                    "aria-disabled": "true",
+                    children: pass.actionLabel
+                  }
+                )
               },
               pass.id
             )),
@@ -21655,7 +21790,16 @@ function ShopSSR({
               MembershipCardView,
               {
                 display: membership,
-                action: /* @__PURE__ */ jsx50("button", { type: "button", className: "default", disabled: true, "aria-disabled": "true", children: membership.actionLabel })
+                action: /* @__PURE__ */ jsx50(
+                  "button",
+                  {
+                    type: "button",
+                    className: themeButtonClassName({ variant: "default", size: "md" }),
+                    disabled: true,
+                    "aria-disabled": "true",
+                    children: membership.actionLabel
+                  }
+                )
               },
               membership.id
             ))
@@ -21670,6 +21814,7 @@ var shop_server_default;
 var init_shop_server = __esm({
   "../blocks/src/system/runtime/nodes/shop.server.tsx"() {
     "use strict";
+    init_buttons();
     init_ssr();
     init_view3();
     init_shop_interactive();
@@ -25110,7 +25255,7 @@ function MultiStepForm({
           type: "button",
           onClick: goToPrevious,
           disabled: !canGoBack,
-          className: "outline btn-md",
+          className: themeButtonClassName({ variant: "outline", size: "md" }),
           children: backButtonLabel
         }
       ),
@@ -25120,7 +25265,11 @@ function MultiStepForm({
           type: "button",
           onClick: goToNext,
           disabled: !canGoNext,
-          className: "primary btn-md rb-flex-1",
+          className: themeButtonClassName({
+            variant: "primary",
+            size: "md",
+            extraClassName: "rb-flex-1"
+          }),
           children: [
             (isValidating || isSubmitting) && /* @__PURE__ */ jsx52(
               SpinnerNode,
@@ -25236,6 +25385,7 @@ var init_MultiStepForm = __esm({
   "../blocks/src/system/runtime/components/multi-step/MultiStepForm.tsx"() {
     "use strict";
     "use client";
+    init_buttons();
     init_MultiStepContext();
     init_useMultiStep();
     init_spinner();
@@ -26498,7 +26648,10 @@ function PaymentOptionSelectionStep({
           "button",
           {
             type: "button",
-            className: isSelected ? "primary btn-md" : "outline btn-md",
+            className: themeButtonClassName({
+              variant: isSelected ? "primary" : "outline",
+              size: "md"
+            }),
             style: paymentOptionLayoutStyle,
             onClick: () => updateData({
               selectedAppointmentPackageId: appointmentPackage.customerPassId,
@@ -26547,7 +26700,10 @@ function PaymentOptionSelectionStep({
           "button",
           {
             type: "button",
-            className: isSelected ? "primary btn-md" : "outline btn-md",
+            className: themeButtonClassName({
+              variant: isSelected ? "primary" : "outline",
+              size: "md"
+            }),
             style: paymentOptionLayoutStyle,
             onClick: () => updateData({
               selectedAppointmentPackageId: void 0,
@@ -26576,6 +26732,7 @@ var init_PaymentOptionSelectionStep = __esm({
   "../blocks/src/system/runtime/components/booking/PaymentOptionSelectionStep.tsx"() {
     "use strict";
     "use client";
+    init_buttons();
     init_api();
     init_MultiStepContext();
     init_booking_form_state();
@@ -28211,6 +28368,7 @@ var init_booking_form_client = __esm({
     init_noop();
     init_client2();
     init_src3();
+    init_buttons();
     init_api();
     init_MultiStepForm();
     init_SuccessMessage();
@@ -28448,7 +28606,7 @@ var init_booking_form_client = __esm({
             "button",
             {
               type: "button",
-              className: "secondary btn-sm",
+              className: themeButtonClassName({ variant: "secondary", size: "sm" }),
               onClick: clearFeedback,
               children: "Dismiss"
             }
@@ -29824,7 +29982,7 @@ var init_PaymentSelectionStep = __esm({
     init_lucide_react();
     init_utils3();
     init_spinner();
-    init_themedButtonClass();
+    init_buttons();
     init_CheckIcon2();
     init_SelectableOptionCard();
     PaymentSelectionStep = ({
@@ -29925,7 +30083,7 @@ var init_PaymentSelectionStep = __esm({
               "button",
               {
                 type: "button",
-                className: themedButtonClass({ variant: "primary", size: "md" }),
+                className: themeButtonClassName({ variant: "primary", size: "md" }),
                 disabled: !email.trim(),
                 onClick: onRequestLogin,
                 children: "Email me a login link"
@@ -31585,7 +31743,7 @@ function MagicLinkForm({
         "button",
         {
           type: "button",
-          className: classPrefix === "cp" ? "secondary" : `${classPrefix}-modal-btn ${classPrefix}-modal-btn--secondary`,
+          className: classPrefix === "cp" ? themeButtonClassName({ variant: "secondary", size: "md" }) : `${classPrefix}-modal-btn ${classPrefix}-modal-btn--secondary`,
           onClick: handleReset,
           children: "Try a different email"
         }
@@ -31613,7 +31771,7 @@ function MagicLinkForm({
       "button",
       {
         type: "submit",
-        className: classPrefix === "cp" ? "primary" : `${classPrefix}-modal-btn`,
+        className: classPrefix === "cp" ? themeButtonClassName({ variant: "primary", size: "md" }) : `${classPrefix}-modal-btn`,
         disabled: !email.trim() || loading,
         children: loading ? "Sending..." : buttonText
       }
@@ -31624,6 +31782,7 @@ var init_MagicLinkForm = __esm({
   "../blocks/src/system/runtime/nodes/shared/MagicLinkForm.tsx"() {
     "use strict";
     "use client";
+    init_buttons();
     init_api();
   }
 });
@@ -31649,7 +31808,7 @@ function EventRegistrationWizard(props2) {
   } = props2;
   const maxTicketsNum = parseInt(maxTickets, 10) || 5;
   const showSpamProtection = spamProtectionEnabled ?? isSpamProtectionEnabled();
-  const buttonClass = themedButtonClass({ variant: buttonVariant, size: "md" });
+  const buttonClass = themeButtonClassName({ variant: buttonVariant, size: "md" });
   const wizard = useEventRegistrationWizard({
     anchorId: EVENT_REGISTRATION_ANCHOR_ID,
     occurrenceContext: occurrenceContext ?? null,
@@ -31786,7 +31945,7 @@ var init_EventRegistrationWizard = __esm({
     init_useEventRegistrationWizard();
     init_MagicLinkForm();
     init_spinner();
-    init_themedButtonClass();
+    init_buttons();
     init_event_registration2();
     EVENT_REGISTRATION_ANCHOR_ID = "event-registration";
     EVENT_PORTAL_AUTH_COPY = {
@@ -32232,7 +32391,7 @@ function ErrorStep2({
   buttonVariant = "primary",
   onRetry
 }) {
-  const buttonClass = themedButtonClass({ variant: buttonVariant, size: "md" });
+  const buttonClass = themeButtonClassName({ variant: buttonVariant, size: "md" });
   return /* @__PURE__ */ jsxs73("div", { className: "cr-error", role: "alert", children: [
     /* @__PURE__ */ jsx100(StateIcon, { variant: "error", children: /* @__PURE__ */ jsx100(CrossIcon, {}) }),
     /* @__PURE__ */ jsx100("h3", { className: "cr-error__title", children: "Enrollment Failed" }),
@@ -32244,7 +32403,7 @@ var init_ErrorStep2 = __esm({
   "../blocks/src/system/runtime/nodes/course-registration/ErrorStep.tsx"() {
     "use strict";
     init_shared6();
-    init_themedButtonClass();
+    init_buttons();
   }
 });
 
@@ -32256,7 +32415,7 @@ function VerifyingTimeoutStep2({
   onCheckAgain,
   supportEmail
 }) {
-  const buttonClass = themedButtonClass({ variant: buttonVariant, size: "md" });
+  const buttonClass = themeButtonClassName({ variant: buttonVariant, size: "md" });
   return /* @__PURE__ */ jsxs74("div", { className: "cr-error", role: "alert", children: [
     /* @__PURE__ */ jsx101(StateIcon, { variant: "warning", children: /* @__PURE__ */ jsx101(ClockIcon, {}) }),
     /* @__PURE__ */ jsx101("h3", { className: "cr-error__title", children: "Payment Verification Taking Longer" }),
@@ -32273,7 +32432,7 @@ var init_VerifyingTimeoutStep2 = __esm({
   "../blocks/src/system/runtime/nodes/course-registration/VerifyingTimeoutStep.tsx"() {
     "use strict";
     init_shared6();
-    init_themedButtonClass();
+    init_buttons();
   }
 });
 
@@ -32285,7 +32444,7 @@ function PaymentFailedStep2({
   buttonVariant = "primary",
   onRetry
 }) {
-  const buttonClass = themedButtonClass({ variant: buttonVariant, size: "md" });
+  const buttonClass = themeButtonClassName({ variant: buttonVariant, size: "md" });
   return /* @__PURE__ */ jsxs75("div", { className: "cr-payment-failed", role: "alert", children: [
     /* @__PURE__ */ jsx102(StateIcon, { variant: "error", children: /* @__PURE__ */ jsx102(CrossIcon, {}) }),
     /* @__PURE__ */ jsx102("h3", { className: "cr-payment-failed__title", children: "Payment Failed" }),
@@ -32297,7 +32456,7 @@ var init_PaymentFailedStep2 = __esm({
   "../blocks/src/system/runtime/nodes/course-registration/PaymentFailedStep.tsx"() {
     "use strict";
     init_shared6();
-    init_themedButtonClass();
+    init_buttons();
   }
 });
 
@@ -33299,7 +33458,7 @@ function CourseRegistrationWizard(props2) {
     handleRetry,
     handleBookingModeChange
   } = useCourseRegistrationWizard(props2);
-  const buttonClass = themedButtonClass({ variant: buttonVariant, size: "md" });
+  const buttonClass = themeButtonClassName({ variant: buttonVariant, size: "md" });
   if (scopedCourses.length === 0) {
     return /* @__PURE__ */ jsx106(
       "div",
@@ -33709,7 +33868,7 @@ var init_CourseRegistrationWizard = __esm({
     init_PaymentFailedStep2();
     init_VerifyingTimeoutStep2();
     init_spinner();
-    init_themedButtonClass();
+    init_buttons();
   }
 });
 
@@ -33741,7 +33900,7 @@ var init_course_registration_client = __esm({
 import { useEffect as useEffect19, useRef as useRef10, useState as useState15 } from "react";
 import { jsx as jsx108 } from "react/jsx-runtime";
 function isLeafletApi(value) {
-  if (!isRecord2(value)) return false;
+  if (!isRecord3(value)) return false;
   return typeof value.map === "function" && typeof value.tileLayer === "function" && typeof value.marker === "function";
 }
 function loadLeaflet() {
@@ -34443,7 +34602,11 @@ function PassesMembershipsController({ render }) {
             "button",
             {
               type: "button",
-              className: "secondary btn-sm shop__return-dismiss",
+              className: themeButtonClassName({
+                variant: "secondary",
+                size: "sm",
+                extraClassName: "shop__return-dismiss"
+              }),
               onClick: () => dispatch({ type: "clearReturnNotice" }),
               children: "Dismiss"
             }
@@ -34460,7 +34623,11 @@ function PassesMembershipsController({ render }) {
                 "button",
                 {
                   type: "button",
-                  className: "default shop__cta",
+                  className: themeButtonClassName({
+                    variant: "default",
+                    size: "md",
+                    extraClassName: "shop__cta"
+                  }),
                   onClick: () => handleBuyPass(pass),
                   children: passDisplay.actionLabel
                 }
@@ -34487,7 +34654,11 @@ function PassesMembershipsController({ render }) {
                 "button",
                 {
                   type: "button",
-                  className: "default shop__cta",
+                  className: themeButtonClassName({
+                    variant: "default",
+                    size: "md",
+                    extraClassName: "shop__cta"
+                  }),
                   onClick: () => handleSubscribe(membership),
                   children: membershipDisplay.actionLabel
                 }
@@ -34531,12 +34702,20 @@ function PassesMembershipsController({ render }) {
               ] }) : null
             ] }),
             /* @__PURE__ */ jsxs83(ActionRow, { className: "shop__modal-warning-actions", children: [
-              /* @__PURE__ */ jsx112("button", { type: "button", className: "secondary", onClick: closeCheckout, children: "Cancel" }),
               /* @__PURE__ */ jsx112(
                 "button",
                 {
                   type: "button",
-                  className: "default",
+                  className: themeButtonClassName({ variant: "secondary", size: "md" }),
+                  onClick: closeCheckout,
+                  children: "Cancel"
+                }
+              ),
+              /* @__PURE__ */ jsx112(
+                "button",
+                {
+                  type: "button",
+                  className: themeButtonClassName({ variant: "default", size: "md" }),
                   onClick: handleConfirmDuplicate,
                   disabled: checkout2.submitting,
                   children: checkout2.submitting ? "Processing..." : "Subscribe Anyway"
@@ -34579,8 +34758,25 @@ function PassesMembershipsController({ render }) {
             ] }),
             checkout2.formError ? /* @__PURE__ */ jsx112("p", { className: "shop__modal-error", role: "alert", children: checkout2.formError }) : null,
             /* @__PURE__ */ jsxs83(ActionRow, { className: "shop__modal-actions", children: [
-              /* @__PURE__ */ jsx112("button", { type: "button", className: "secondary", onClick: closeCheckout, disabled: checkout2.submitting, children: "Cancel" }),
-              /* @__PURE__ */ jsx112("button", { type: "submit", className: "default", disabled: checkout2.submitting, children: checkout2.submitting ? "Processing..." : "Continue to Payment" })
+              /* @__PURE__ */ jsx112(
+                "button",
+                {
+                  type: "button",
+                  className: themeButtonClassName({ variant: "secondary", size: "md" }),
+                  onClick: closeCheckout,
+                  disabled: checkout2.submitting,
+                  children: "Cancel"
+                }
+              ),
+              /* @__PURE__ */ jsx112(
+                "button",
+                {
+                  type: "submit",
+                  className: themeButtonClassName({ variant: "default", size: "md" }),
+                  disabled: checkout2.submitting,
+                  children: checkout2.submitting ? "Processing..." : "Continue to Payment"
+                }
+              )
             ] })
           ] })
         ] })
@@ -34593,6 +34789,7 @@ var init_shop_client = __esm({
   "../blocks/src/system/runtime/nodes/shop.client.tsx"() {
     "use strict";
     "use client";
+    init_buttons();
     init_api();
     init_ModalShell();
     init_shared6();
@@ -34807,7 +35004,7 @@ var init_embla_carousel_autoplay_esm = __esm({
 function isObject(subject) {
   return Object.prototype.toString.call(subject) === "[object Object]";
 }
-function isRecord3(subject) {
+function isRecord4(subject) {
   return isObject(subject) || Array.isArray(subject);
 }
 function canUseDOM() {
@@ -34824,7 +35021,7 @@ function areOptionsEqual(optionsA, optionsB) {
     const valueA = optionsA[key];
     const valueB = optionsB[key];
     if (typeof valueA === "function") return `${valueA}` === `${valueB}`;
-    if (!isRecord3(valueA) || !isRecord3(valueB)) return valueA === valueB;
+    if (!isRecord4(valueA) || !isRecord4(valueB)) return valueA === valueB;
     return areOptionsEqual(valueA, valueB);
   });
 }
@@ -36918,7 +37115,7 @@ function ProductListController(props2) {
           "button",
           {
             type: "button",
-            className: "default",
+            className: themeButtonClassName({ variant: "default", size: "md" }),
             onClick: () => {
               const product = props2.render.hydration.products.find((candidate) => candidate.id === card.productId);
               if (!product) return;
@@ -36934,7 +37131,14 @@ function ProductListController(props2) {
             children: card.soldOut ? "Sold out" : card.actionLabel
           }
         ),
-        card.path ? /* @__PURE__ */ jsx114("a", { href: card.path, className: "secondary btn-sm", children: "View details" }) : null
+        card.path ? /* @__PURE__ */ jsx114(
+          "a",
+          {
+            href: card.path,
+            className: themeButtonClassName({ variant: "secondary", size: "sm" }),
+            children: "View details"
+          }
+        ) : null
       ] }),
       feedback: /* @__PURE__ */ jsx114(
         ShopAddFeedback,
@@ -37000,7 +37204,7 @@ function ProductDetailController(props2) {
         "button",
         {
           type: "button",
-          className: "default",
+          className: themeButtonClassName({ variant: "default", size: "md" }),
           disabled: display.soldOut,
           onClick: () => {
             if (!selectedProduct) return;
@@ -37050,15 +37254,31 @@ function CartController(props2) {
             onChange: item.quantityEditable ? (event) => cart2.updateQuantity(item.key, Number(event.target.value)) : void 0
           }
         ),
-        /* @__PURE__ */ jsx114("button", { type: "button", className: "secondary btn-sm", onClick: () => cart2.removeItem(item.key), children: "Remove" })
+        /* @__PURE__ */ jsx114(
+          "button",
+          {
+            type: "button",
+            className: themeButtonClassName({ variant: "secondary", size: "sm" }),
+            onClick: () => cart2.removeItem(item.key),
+            children: "Remove"
+          }
+        )
       ] }),
       footerActions: /* @__PURE__ */ jsxs85(Fragment19, { children: [
-        /* @__PURE__ */ jsx114("button", { type: "button", className: "secondary btn-sm", onClick: () => cart2.clear(), children: display.clearButtonText }),
         /* @__PURE__ */ jsx114(
           "button",
           {
             type: "button",
-            className: "default",
+            className: themeButtonClassName({ variant: "secondary", size: "sm" }),
+            onClick: () => cart2.clear(),
+            children: display.clearButtonText
+          }
+        ),
+        /* @__PURE__ */ jsx114(
+          "button",
+          {
+            type: "button",
+            className: themeButtonClassName({ variant: "default", size: "md" }),
             onClick: () => {
               window.location.href = resolveDedicatedCheckoutPath(window.location.pathname);
             },
@@ -37164,7 +37384,15 @@ function CheckoutController(props2) {
           )
         ] }),
         state.feedback.tag === "error" ? /* @__PURE__ */ jsx114("p", { className: "rb-caption status-muted", children: state.feedback.message }) : null,
-        /* @__PURE__ */ jsx114("button", { type: "submit", className: "default", disabled: state.submission === "submitting", children: state.submission === "submitting" ? "Loading\u2026" : display.submitButtonText })
+        /* @__PURE__ */ jsx114(
+          "button",
+          {
+            type: "submit",
+            className: themeButtonClassName({ variant: "default", size: "md" }),
+            disabled: state.submission === "submitting",
+            children: state.submission === "submitting" ? "Loading\u2026" : display.submitButtonText
+          }
+        )
       ] })
     }
   );
@@ -37174,6 +37402,7 @@ var init_shop_commerce = __esm({
   "../blocks/src/system/runtime/nodes/shop-commerce.tsx"() {
     "use strict";
     "use client";
+    init_buttons();
     init_api();
     init_RichText();
     init_carousel_client();
@@ -38870,7 +39099,7 @@ function HeaderCartDrawerItems(props2) {
           "button",
           {
             type: "button",
-            className: "secondary btn-sm",
+            className: themeButtonClassName({ variant: "secondary", size: "sm" }),
             onClick: () => props2.cart.removeItem(item.key),
             children: "Remove"
           }
@@ -38963,7 +39192,7 @@ function HeaderCartDrawer(props2) {
                   "button",
                   {
                     type: "button",
-                    className: "secondary",
+                    className: themeButtonClassName({ variant: "secondary", size: "md" }),
                     onClick: () => props2.cart.clear(),
                     disabled: display.state === "empty",
                     children: display.clearButtonText
@@ -38972,12 +39201,20 @@ function HeaderCartDrawer(props2) {
                 props2.checkoutHref && display.state === "ready" ? /* @__PURE__ */ jsx129(
                   "a",
                   {
-                    className: "default",
+                    className: themeButtonClassName({ variant: "default", size: "md" }),
                     href: props2.checkoutHref,
                     onClick: props2.onClose,
                     children: display.checkoutButtonText
                   }
-                ) : /* @__PURE__ */ jsx129("button", { type: "button", className: "default", disabled: true, children: display.checkoutButtonText })
+                ) : /* @__PURE__ */ jsx129(
+                  "button",
+                  {
+                    type: "button",
+                    className: themeButtonClassName({ variant: "default", size: "md" }),
+                    disabled: true,
+                    children: display.checkoutButtonText
+                  }
+                )
               ] })
             ]
           }
@@ -38990,6 +39227,7 @@ var init_HeaderCartDrawer = __esm({
   "../blocks/src/system/runtime/header/HeaderCartDrawer.tsx"() {
     "use strict";
     "use client";
+    init_buttons();
     init_display();
     init_ModalShell();
   }
@@ -39763,7 +40001,7 @@ var init_EventPaginatedListView_client = __esm({
     init_EventCompactRow();
     init_EmptyState();
     init_EventListing_view();
-    init_themedButtonClass();
+    init_buttons();
     EventPaginatedListView = ({
       filters,
       display,
@@ -39806,7 +40044,7 @@ var init_EventPaginatedListView_client = __esm({
                 {
                   type: "button",
                   onClick: loadMore,
-                  className: themedButtonClass({
+                  className: themeButtonClassName({
                     variant: display.buttonVariant,
                     size: "md"
                   }),
@@ -39820,7 +40058,7 @@ var init_EventPaginatedListView_client = __esm({
                 type: "button",
                 onClick: loadMore,
                 disabled: loading,
-                className: themedButtonClass({
+                className: themeButtonClassName({
                   variant: display.buttonVariant,
                   size: "md",
                   extraClassName: loading ? "rb-opacity-50 rb-cursor-wait" : null
@@ -39832,7 +40070,7 @@ var init_EventPaginatedListView_client = __esm({
               "a",
               {
                 href: seeAllUrl,
-                className: themedButtonClass({
+                className: themeButtonClassName({
                   variant: display.buttonVariant,
                   size: "md"
                 }),
@@ -41182,7 +41420,7 @@ var init_EventCombined_client = __esm({
     init_EventModalContext();
     init_EventModals();
     init_utils();
-    init_themedButtonClass();
+    init_buttons();
     EventCombinedClient = ({
       events: initialEvents,
       siteId,
@@ -41508,7 +41746,7 @@ var init_EventCombined_client = __esm({
                     {
                       type: "button",
                       onClick: goToToday,
-                      className: themedButtonClass({ variant: buttonVariant, size: "sm" }),
+                      className: themeButtonClassName({ variant: buttonVariant, size: "sm" }),
                       children: "Today"
                     }
                   )
@@ -41825,7 +42063,7 @@ var init_EventCalendar_client = __esm({
     init_EventModalContext();
     init_EventModals();
     init_WeekTimetableView();
-    init_themedButtonClass();
+    init_buttons();
     EventCalendarClient = ({
       render
     }) => {
@@ -42114,7 +42352,7 @@ var init_EventCalendar_client = __esm({
               {
                 type: "button",
                 onClick: onToday,
-                className: themedButtonClass({
+                className: themeButtonClassName({
                   variant: display.buttonVariant,
                   size: "sm"
                 }),
@@ -42130,7 +42368,7 @@ var init_EventCalendar_client = __esm({
               {
                 type: "button",
                 onClick: onToday,
-                className: themedButtonClass({
+                className: themeButtonClassName({
                   variant: display.buttonVariant,
                   size: "sm"
                 }),
@@ -42228,7 +42466,7 @@ var init_form_client = __esm({
     init_client2();
     init_src3();
     init_useFormSubmission();
-    init_themedButtonClass();
+    init_buttons();
     FormNodeClient = ({
       render
     }) => {
@@ -42370,7 +42608,7 @@ var init_form_client = __esm({
           "button",
           {
             type: "submit",
-            className: themedButtonClass({
+            className: themeButtonClassName({
               variant: "primary",
               size: "md",
               extraClassName: "rb-w-full rb-sm-w-auto"
@@ -42597,7 +42835,7 @@ function NewsletterFormClient({
           "button",
           {
             type: "submit",
-            className: themedButtonClass({ variant: "primary", size: "md" }),
+            className: themeButtonClassName({ variant: "primary", size: "md" }),
             disabled: isSubmitting,
             children: isSubmitting ? "Subscribing..." : render.display.buttonLabel
           }
@@ -42616,14 +42854,14 @@ var init_newsletter_form_client = __esm({
     init_client2();
     init_src3();
     init_api();
-    init_themedButtonClass();
+    init_buttons();
     newsletter_form_client_default = NewsletterFormClient;
   }
 });
 
 // ../blocks/src/system/runtime/components/registry.client.tsx
 import React53 from "react";
-function isRecord4(value) {
+function isRecord5(value) {
   return typeof value === "object" && value !== null;
 }
 function buildRenderFromLooseProps(runtime, mode, props2) {
@@ -42642,14 +42880,14 @@ function withRuntimeBackedEnvelope(source, runtime, render) {
 function normalizeLegacyInteractiveRenderProps(runtime, mode, props2) {
   const source = props2;
   const render = props2["render"];
-  if (!isRecord4(render)) {
+  if (!isRecord5(render)) {
     return withRuntimeBackedEnvelope(
       source,
       runtime,
       buildRenderFromLooseProps(runtime, mode, props2)
     );
   }
-  if (isRecord4(render["hydration"])) {
+  if (isRecord5(render["hydration"])) {
     return withRuntimeBackedEnvelope(
       source,
       runtime,
@@ -42659,7 +42897,7 @@ function normalizeLegacyInteractiveRenderProps(runtime, mode, props2) {
       }
     );
   }
-  if (!isRecord4(render["display"])) {
+  if (!isRecord5(render["display"])) {
     return withRuntimeBackedEnvelope(
       source,
       runtime,