@riverbankcms/sdk 0.130.2 → 0.134.0

package/dist/client/{accordion-_boYwHHi.mjs → accordion-DFXpLvwg.mjs}

@@ -1,4 +1,4 @@
-import { t as defineIslandPropsDecoder } from "./propsDecoder-CBPGXEYX.mjs";
+import { t as defineIslandPropsDecoder } from "./propsDecoder-CeUMxI9a.mjs";
 //#region src/rendering/islands/enhancers/accordion.ts
 const decode = defineIslandPropsDecoder("accordion");
 function parseDefaultValues(value) {

package/dist/client/{bookingForm--AqEfyBX.mjs → bookingForm-sI05d3lk.mjs}

@@ -1,15 +1,15 @@
 "use client";
 import { S as unsafeAsPassId, _ as unsafeAsAppointmentResourceId, b as unsafeAsFormId, v as unsafeAsAppointmentServiceId, y as unsafeAsCustomerPassId } from "./colorStyles-CrxJrPjJ.mjs";
-import { n as buildBookingPaymentSelectionViewModel, t as usePolling } from "./usePolling-Cls91SD2.mjs";
-import { At as formatLocalScheduleDate, Ct as reportWorkflowError, Mt as parseBookingLocalDate, Nt as resolveBookingTimeZoneId, Ot as formatBookingInstant, St as okWith, Tt as addLocalScheduleDays, Ut as formatCurrencyAmount, Z as themeButtonClassName, _t as BOOKING_FORM_DATA_RESERVED_KEYS, at as formatBookingSubmissionPreparationError, bt as err, ct as getBookingSuccessMessage, dt as prepareBookingSubmission, ft as resolveAppointmentCheckoutVerificationState, gt as toSelectedCollectionOptionKind, ht as resolveDefaultBookingServiceId, it as formatBookingCentsAsCurrencyInput, lt as isBookingServiceSlidingAmountInRange, mt as resolveBookingSiteId, nt as logger, ot as getBookingRedirectStateFromLocation, pt as resolveBookingPaymentStep, rt as deriveBookingFormViewState, st as getBookingServiceSlidingScale, t as defineIslandPropsDecoder, ut as parseBookingCurrencyInputToCents, vt as assertNever, wt as reportWorkflowSuccess, yt as clearWorkflowFeedback } from "./propsDecoder-CBPGXEYX.mjs";
-import { n as useBlockApi, t as BlockApiProvider } from "./context-B83PiNzm.mjs";
+import { n as buildBookingPaymentSelectionViewModel, t as usePolling } from "./usePolling-UN4WKnaM.mjs";
+import { $ as themeButtonClassName, At as okWith, Bt as parseBookingLocalDate, Ct as isBookingRequirementConsentFieldId, Dt as clearWorkflowFeedback, Et as assertNever, It as formatBookingInstant, Mt as reportWorkflowSuccess, Nt as addLocalScheduleDays, Ot as err, Rt as formatLocalScheduleDate, St as BOOKING_FORM_DATA_RESERVED_KEYS, Vt as resolveBookingTimeZoneId, Zt as formatCurrencyAmount, _t as resolveBookingSiteId, at as logger, bt as projectSelectedAppointmentConsentIntoForm, ct as formatBookingSubmissionPreparationError, dt as getBookingSuccessMessage, ft as isBookingServiceSlidingAmountInRange, gt as resolveBookingPaymentStep, ht as resolveAppointmentCheckoutVerificationState, jt as reportWorkflowError, lt as getBookingRedirectStateFromLocation, mt as prepareBookingSubmission, ot as deriveBookingFormViewState, pt as parseBookingCurrencyInputToCents, st as formatBookingCentsAsCurrencyInput, t as defineIslandPropsDecoder, ut as getBookingServiceSlidingScale, vt as resolveDefaultBookingServiceId, xt as resolveSelectedAppointmentConsent, yt as toSelectedCollectionOptionKind } from "./propsDecoder-CeUMxI9a.mjs";
+import { n as useBlockApi, t as BlockApiProvider } from "./context-TSK1CGx8.mjs";
 import { n as isSpamProtectionEnabled, r as AltchaWidget, t as getChallengeUrl } from "./src-B833rYRr.mjs";
-import { a as CheckIcon, i as StateIcon, n as useDiscountCodeUi, r as TerminalPanel, t as scrollToBlock } from "./scrollToBlock-DZ73aEX6.mjs";
-import { t as DiscountCodeDisclosure } from "./DiscountCodeDisclosure-BPZ-yfGI.mjs";
-import { n as SpinnerNode, t as StepIndicator } from "./StepIndicator-CLjQhkDb.mjs";
+import { a as CheckIcon, i as StateIcon, n as useDiscountCodeUi, r as TerminalPanel, t as scrollToBlock } from "./scrollToBlock-lPr1oqxB.mjs";
+import { t as DiscountCodeDisclosure } from "./DiscountCodeDisclosure-CfuPOHD0.mjs";
+import { n as StepIndicator, r as SpinnerNode, t as BookingConsentAgreement } from "./BookingConsentAgreement-BxgpGEFD.mjs";
 import { t as FeedbackMessage } from "./FeedbackMessage-CtLvvS_d.mjs";
 import { n as getFieldValidationControlProps, t as FieldValidationMessage } from "./FieldValidationMessage-AYanWFb-.mjs";
-import { t as buildCheckoutReturnUrls } from "./checkoutUrls-Ct8Mxna3.mjs";
+import { t as buildCheckoutReturnUrls } from "./checkoutUrls-DQYC_Br-.mjs";
 import { t as mountReactIsland } from "./reactMount-SY8AVRof.mjs";
 import { t as buildRouteIslandApiConfig } from "./routeIslandApiConfig-UNsfPcYq.mjs";
 import React, { useCallback, useEffect, useLayoutEffect, useMemo, useReducer, useRef, useState } from "react";
@@ -38,6 +38,11 @@ const SuccessMessage = ({ message, resourceName, className }) => {
 	});
 };
 //#endregion
+//#region ../blocks/src/system/runtime/hooks/useSelectedAppointmentConsentForm.ts
+function useSelectedAppointmentConsentForm(form, selectedService) {
+	return useMemo(() => projectSelectedAppointmentConsentIntoForm(form, resolveSelectedAppointmentConsent(selectedService)), [form, selectedService]);
+}
+//#endregion
 //#region ../blocks/src/utils/date-formatting.ts
 /**
 * Resolve the browser/runtime timezone for booking surfaces.
@@ -682,6 +687,19 @@ function clearBookingFieldError(errors, fieldId) {
 	};
 }
 //#endregion
+//#region ../blocks/src/system/runtime/nodes/booking-form.field-values.ts
+function collectInitialBookingFieldValues(initialData) {
+	const values = {};
+	for (const [key, value] of Object.entries(initialData)) if (!BOOKING_FORM_DATA_RESERVED_KEYS.has(key) && !isBookingRequirementConsentFieldId(key) && isBookingFieldValue(value)) values[key] = value;
+	return values;
+}
+function omitBookingConsentEntries(record) {
+	return Object.fromEntries(Object.entries(record).filter(([key]) => !isBookingRequirementConsentFieldId(key)));
+}
+function isBookingFieldValue(value) {
+	return value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean" || Array.isArray(value) && value.every((item) => typeof item === "string");
+}
+//#endregion
 //#region ../blocks/src/system/runtime/nodes/booking-form.headless.state.ts
 const unsafeAsBookingFieldId = (id) => id;
 function createInitialBookingFlowReducerState(input) {
@@ -693,7 +711,7 @@ function createInitialBookingFlowReducerState(input) {
 		selectedResourceId: toOptionalAppointmentResourceId(toOptionalString(initialData.resourceId) ?? input.defaultResourceId),
 		selectedDate: toOptionalString(initialData.selectedDate),
 		selectedSlot: null,
-		fieldValues: collectInitialFieldValues(initialData),
+		fieldValues: collectInitialBookingFieldValues(initialData),
 		touchedFields: {},
 		attemptedStepIds: {},
 		discountCode: toOptionalString(initialData.discountCode) ?? "",
@@ -705,14 +723,6 @@ function createInitialBookingFlowReducerState(input) {
 		feedback: { kind: "none" }
 	};
 }
-function collectInitialFieldValues(initialData) {
-	const values = {};
-	for (const [key, value] of Object.entries(initialData)) {
-		if (BOOKING_FORM_DATA_RESERVED_KEYS.has(key) || !isBookingFieldValue(value)) continue;
-		values[key] = value;
-	}
-	return values;
-}
 function toOptionalString(value) {
 	if (typeof value !== "string") return void 0;
 	const trimmed = value.trim();
@@ -731,9 +741,6 @@ function toOptionalAppointmentResourceId(value) {
 function toOptionalCustomerPassId(value) {
 	return toOptionalBrandedId(value, unsafeAsCustomerPassId);
 }
-function isBookingFieldValue(value) {
-	return value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean" || Array.isArray(value) && value.every((item) => typeof item === "string");
-}
 /**
 * Send the flow back to the date step when the slot it was holding went away,
 * leaving a scoped feedback message. A completed booking is left alone.
@@ -755,17 +762,7 @@ function applyAvailabilitySelectionInvalidation(state, invalidation) {
 }
 function bookingFlowReducer(state, event) {
 	switch (event.type) {
-		case "service-selected": return {
-			...state,
-			selectedServiceId: event.serviceId,
-			selectedResourceId: void 0,
-			selectedDate: void 0,
-			selectedSlot: null,
-			selectedAppointmentPackageId: void 0,
-			selectedSlidingAmountInput: "",
-			selectedCollectionOptionKind: void 0,
-			validationErrors: clearBookingFormError(state.validationErrors)
-		};
+		case "service-selected": return applyBookingServiceSelection(state, event.serviceId);
 		case "resource-selected": return {
 			...state,
 			selectedResourceId: event.resourceId ?? void 0,
@@ -872,6 +869,24 @@ function bookingFlowReducer(state, event) {
 		default: return assertNever(event);
 	}
 }
+function applyBookingServiceSelection(state, serviceId) {
+	return {
+		...state,
+		selectedServiceId: serviceId,
+		selectedResourceId: void 0,
+		selectedDate: void 0,
+		selectedSlot: null,
+		selectedAppointmentPackageId: void 0,
+		selectedSlidingAmountInput: "",
+		selectedCollectionOptionKind: void 0,
+		fieldValues: omitBookingConsentEntries(state.fieldValues),
+		touchedFields: omitBookingConsentEntries(state.touchedFields),
+		validationErrors: {
+			...clearBookingFormError(state.validationErrors),
+			fieldErrors: omitBookingConsentEntries(state.validationErrors.fieldErrors)
+		}
+	};
+}
 function clearAvailabilityFeedback(feedback) {
 	return feedback.kind === "error" && feedback.scope === "availability" ? { kind: "none" } : feedback;
 }
@@ -1032,7 +1047,8 @@ function validateBookingFields(input) {
 	return errors;
 }
 function validateBookingField(field, value) {
-	if (field.required && isBlankFieldValue(value)) return `${field.label} is required`;
+	const requiredError = validateRequiredBookingField(field, value);
+	if (requiredError) return requiredError;
 	if (isBlankFieldValue(value)) return null;
 	const strValue = typeof value === "string" ? value : String(value);
 	if (field.type === "email") return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(strValue) ? null : "Please enter a valid email address";
@@ -1061,6 +1077,10 @@ function validateBookingField(field, value) {
 	}
 	return null;
 }
+function validateRequiredBookingField(field, value) {
+	if (field.type === "booking_requirement_consent") return value === true ? null : `${field.label} is required`;
+	return field.required && isBlankFieldValue(value) ? `${field.label} is required` : null;
+}
 function deriveBookingFlowSteps(input) {
 	const stepResolution = buildBookingStepResolution({
 		form: input.form,
@@ -1132,7 +1152,8 @@ function deriveBookingFieldViews(input) {
 	return (input.form?.schema?.fields ?? []).map((field) => {
 		const fieldId = unsafeAsBookingFieldId(field.id);
 		const inputId = `${input.idPrefix}-${fieldId}`;
-		const helpTextId = field.helpText ? `${inputId}-help` : null;
+		const helpText = field.type === "booking_requirement_consent" ? null : field.helpText ?? null;
+		const helpTextId = helpText ? `${inputId}-help` : null;
 		const fieldValue = input.values[field.id] ?? null;
 		const localError = input.touched?.[field.id] ? validateBookingField(field, fieldValue) : null;
 		const error = input.errors[field.id] ?? localError;
@@ -1142,17 +1163,17 @@ function deriveBookingFieldViews(input) {
 			field,
 			id: fieldId,
 			label: field.label,
-			type: field.type,
 			value: fieldValue,
 			required: Boolean(field.required),
 			error,
-			helpText: field.helpText ?? null,
+			helpText,
 			inputId,
 			labelId: `${inputId}-label`,
 			helpTextId,
 			errorId,
 			describedBy,
-			ariaInvalid: Boolean(error)
+			ariaInvalid: Boolean(error),
+			type: field.type
 		};
 	});
 }
@@ -1346,6 +1367,7 @@ function useHeadlessBookingFlow(options) {
 	const selectedServiceId = state.selectedServiceId ?? defaultServiceId;
 	const selectedResourceId = state.selectedResourceId ?? defaultResourceId;
 	const selectedService = options.services.find((service) => service.id === selectedServiceId) ?? null;
+	const runtimeForm = useSelectedAppointmentConsentForm(options.form, selectedService);
 	const lastSlidingServiceIdRef = useRef(null);
 	useEffect(() => {
 		const selectedId = selectedService?.id ?? null;
@@ -1386,7 +1408,7 @@ function useHeadlessBookingFlow(options) {
 		viewerTimeZone
 	]);
 	const stepState = useMemo(() => deriveBookingFlowSteps({
-		form: options.form,
+		form: runtimeForm,
 		services: options.services,
 		data,
 		defaultServiceId,
@@ -1402,7 +1424,7 @@ function useHeadlessBookingFlow(options) {
 		defaultServiceId,
 		defaultResourceId,
 		options.enableAppointmentPackages,
-		options.form,
+		runtimeForm,
 		options.requiresResourceSelection,
 		options.requiresServiceSelection,
 		options.services,
@@ -1456,13 +1478,13 @@ function useHeadlessBookingFlow(options) {
 		state.selectedSlot
 	]);
 	const fields = useMemo(() => deriveBookingFieldViews({
-		form: options.form,
+		form: runtimeForm,
 		values: state.fieldValues,
 		errors: state.validationErrors.fieldErrors,
 		touched: state.touchedFields,
 		idPrefix: `booking-${options.formId}`
 	}), [
-		options.form,
+		runtimeForm,
 		options.formId,
 		state.fieldValues,
 		state.touchedFields,
@@ -1582,7 +1604,7 @@ function useHeadlessBookingFlow(options) {
 	const latestRef = useLatestRef({
 		state,
 		data,
-		form: options.form,
+		form: runtimeForm,
 		formId: formKey,
 		services: options.services,
 		defaultServiceId,
@@ -1834,7 +1856,7 @@ function useHeadlessBookingFlow(options) {
 		phase: state.phase
 	});
 	const view = resolveHeadlessBookingView({
-		form: options.form,
+		form: runtimeForm,
 		feedback: state.feedback
 	});
 	const appointmentPackagesModel = resolveAppointmentPackagesModel({
@@ -2608,7 +2630,11 @@ function DefaultDynamicField({ booking, field }) {
 	return /* @__PURE__ */ jsxs("div", {
 		className: "rb-space-y-2",
 		children: [
-			/* @__PURE__ */ jsxs("label", {
+			field.field.type === "booking_requirement_consent" ? /* @__PURE__ */ jsx(BookingConsentAgreement, {
+				agreement: field.field.agreement,
+				title: field.label,
+				titleId: field.labelId
+			}) : /* @__PURE__ */ jsxs("label", {
 				id: field.labelId,
 				htmlFor: field.inputId,
 				className: "form-label",
@@ -2653,7 +2679,7 @@ function DefaultFieldInput({ describedBy, error, errorId, field, onBlur, onChang
 		required: field.required,
 		...validationProps
 	};
-	switch (field.type) {
+	switch (field.field.type) {
 		case "textarea": return /* @__PURE__ */ jsx("textarea", {
 			...commonProps,
 			value: strValue,
@@ -2767,7 +2793,7 @@ function DefaultFieldInput({ describedBy, error, errorId, field, onBlur, onChang
 				className: "form-checkbox rb-mt-0.5"
 			}), /* @__PURE__ */ jsx("span", {
 				className: "rb-caption",
-				children: field.field.placeholder || field.label
+				children: field.field.checkboxLabel
 			})]
 		});
 		case "number": return /* @__PURE__ */ jsx("input", {
@@ -2836,10 +2862,10 @@ function DefaultBookingDiscount({ booking }) {
 			children: /* @__PURE__ */ jsxs("p", {
 				className: "ab-text",
 				children: [
-					"Discount available: ",
-					booking.discount.autoAppliedDiscount.publicLabel,
+					"Discount available:",
 					" ",
-					"will apply automatically at checkout."
+					booking.discount.autoAppliedDiscount.publicLabel,
+					" will apply automatically at checkout."
 				]
 			})
 		}) : null]