@riverbankcms/sdk 0.144.0 → 0.146.0

package/dist/client/rendering/client.mjs

@@ -1018,7 +1018,7 @@ function parseEventPageSurfaceDestinationMode(value) {
 	return value === "cms-managed" || value === "system-managed" ? value : void 0;
 }
 function parseEventPageSurfaceSubject(value) {
-	if (!isRecord$29(value)) return err$2({ kind: "notObject" });
+	if (!isRecord$30(value)) return err$2({ kind: "notObject" });
 	switch (value.kind) {
 		case "eventSeries": {
 			const eventSeriesId = parseEventSeriesId(value.eventSeriesId);
@@ -1073,7 +1073,7 @@ function parseEventSeriesIdList(values) {
 	}
 	return ok$2(parsed);
 }
-function isRecord$29(value) {
+function isRecord$30(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var init_event_page_surface_subject = __esmMin((() => {
@@ -1525,7 +1525,76 @@ var init_booking_date_time = __esmMin((() => {
 }));
 //#endregion
 //#region ../core/src/booking-consent.ts
-var init_booking_consent = __esmMin((() => {})), init_dated_offering_settlement = __esmMin((() => {
+var init_booking_consent = __esmMin((() => {}));
+//#endregion
+//#region ../core/src/appointment-service-categories.ts
+/**
+* Groups services under their categories.
+*
+* A service whose `categoryId` names no category in `categories` lands in
+* Other. The composite foreign key keeps that from happening with stored data,
+* so this is only the total, safe answer for a caller holding a stale list.
+*/
+function layoutServicesByCategory(categories, services, options) {
+	if (categories.length === 0) return {
+		kind: "uncategorized-site",
+		services: [...services]
+	};
+	const buckets = new Map(categories.map((category) => [category.id, []]));
+	const other = [];
+	for (const service of services) {
+		const bucket = service.categoryId === null ? void 0 : buckets.get(service.categoryId);
+		if (bucket !== void 0) bucket.push(service);
+		else other.push(service);
+	}
+	const groups = [];
+	for (const category of categories) {
+		const groupServices = buckets.get(category.id) ?? [];
+		if (groupServices.length === 0 && !options.keepEmptyGroups) continue;
+		groups.push({
+			category,
+			services: groupServices
+		});
+	}
+	if (groups.length === 0 && !options.keepEmptyGroups) return {
+		kind: "uncategorized-site",
+		services: other
+	};
+	return {
+		kind: "categorized-site",
+		groups,
+		other
+	};
+}
+/**
+* Selects the public view for an optional category filter.
+*
+* It takes the category and service lists rather than a prebuilt layout
+* because the public layout has already dropped empty categories, and then an
+* empty category (`single` with no services) could not be told apart from a
+* deleted one (`fallback-all`).
+*/
+function selectCategoryView(categories, services, filterCategoryId) {
+	const publicLayout = () => layoutServicesByCategory(categories, services, { keepEmptyGroups: false });
+	if (filterCategoryId === null || filterCategoryId === void 0) return {
+		kind: "all",
+		layout: publicLayout()
+	};
+	const category = categories.find((candidate) => candidate.id === filterCategoryId);
+	if (category === void 0) return {
+		kind: "fallback-all",
+		missingCategoryId: filterCategoryId,
+		layout: publicLayout()
+	};
+	return {
+		kind: "single",
+		group: {
+			category,
+			services: services.filter((service) => service.categoryId === filterCategoryId)
+		}
+	};
+}
+var init_appointment_service_categories = __esmMin((() => {})), init_dated_offering_settlement = __esmMin((() => {
 	init_result$1();
 }));
 var init_person_records = __esmMin((() => {
@@ -1557,7 +1626,8 @@ var init_business_address = __esmMin((() => {
 var init_try_async = __esmMin((() => {
 	init_result$1();
 }));
-var init_narrow_result = __esmMin((() => {})), init_editor_state = __esmMin((() => {}));
+var init_narrow_result = __esmMin((() => {}));
+var init_editor_state = __esmMin((() => {})), init_block_content_identity = __esmMin((() => {}));
 var init_sensitive_collection = __esmMin((() => {}));
 //#endregion
 //#region ../core/src/assertNever.ts
@@ -1579,7 +1649,7 @@ var init_public_profile = __esmMin((() => {
 var init_public_experience = __esmMin((() => {}));
 //#endregion
 //#region ../core/src/rich-text.ts
-function isRecord$27(value) {
+function isRecord$28(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function hasOnlyKeys(value, allowed) {
@@ -1590,10 +1660,10 @@ function isDenseArrayOf(value, predicate) {
 	return true;
 }
 function isTipTapMark(value) {
-	return isRecord$27(value) && hasOnlyKeys(value, markKeys) && typeof value.type === "string" && value.type.length > 0 && (value.attrs === void 0 || isRecord$27(value.attrs));
+	return isRecord$28(value) && hasOnlyKeys(value, markKeys) && typeof value.type === "string" && value.type.length > 0 && (value.attrs === void 0 || isRecord$28(value.attrs));
 }
 function isTipTapNode(value) {
-	if (!isRecord$27(value) || !hasOnlyKeys(value, nodeKeys) || typeof value.type !== "string" || value.type.length === 0 || value.type === "doc" || value.attrs !== void 0 && !isRecord$27(value.attrs) || value.marks !== void 0 && (!Array.isArray(value.marks) || !isDenseArrayOf(value.marks, isTipTapMark)) || value.content !== void 0 && (!Array.isArray(value.content) || !isDenseArrayOf(value.content, isTipTapNode))) return false;
+	if (!isRecord$28(value) || !hasOnlyKeys(value, nodeKeys) || typeof value.type !== "string" || value.type.length === 0 || value.type === "doc" || value.attrs !== void 0 && !isRecord$28(value.attrs) || value.marks !== void 0 && (!Array.isArray(value.marks) || !isDenseArrayOf(value.marks, isTipTapMark)) || value.content !== void 0 && (!Array.isArray(value.content) || !isDenseArrayOf(value.content, isTipTapNode))) return false;
 	if (value.type === "text") return typeof value.text === "string" && value.text.length > 0 && value.content === void 0;
 	return value.text === void 0;
 }
@@ -1638,10 +1708,10 @@ var init_mailing_list_identifiers = __esmMin((() => {
 //#endregion
 //#region ../core/src/mailing-list-targeting-parser.ts
 function parseMailingListPlacementTargeting(value) {
-	if (!isRecord$26(value)) return targetingError("shape");
+	if (!isRecord$27(value)) return targetingError("shape");
 	if (value.mode === "default") return ok$2({ mode: "default" });
 	if (value.mode !== "custom") return targetingError("mode");
-	if (!isRecord$26(value.selection)) return targetingError("selection");
+	if (!isRecord$27(value.selection)) return targetingError("selection");
 	switch (value.provider) {
 		case "native": return parseNativeTargeting(value.selection);
 		case "brevo": return parseBrevoTargeting(value.selection);
@@ -1650,7 +1720,7 @@ function parseMailingListPlacementTargeting(value) {
 	}
 }
 function parseMailingListVisitorSelection(value) {
-	if (!isRecord$26(value)) return visitorSelectionError$1("shape");
+	if (!isRecord$27(value)) return visitorSelectionError$1("shape");
 	switch (value.provider) {
 		case "native": {
 			const topicIds = parseVisitorIds(value.topicIds, parseNewsletterListId);
@@ -1783,7 +1853,7 @@ function parseVisitorIds(value, parseId) {
 	}
 	return parsed;
 }
-function isRecord$26(value) {
+function isRecord$27(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function targetingError(field) {
@@ -1840,7 +1910,7 @@ var init_mailing_list_setup = __esmMin((() => {
 //#endregion
 //#region ../core/src/mailing-list-setup-parser.ts
 function parseMailingListGlobalForm(value) {
-	if (!isRecord$22(value)) return formError("shape");
+	if (!isRecord$23(value)) return formError("shape");
 	const fields = parseGlobalFields(value.fields);
 	if (fields === null) return formError("fields");
 	if (typeof value.includeOptionalPhone !== "boolean") return formError("includeOptionalPhone");
@@ -1859,7 +1929,7 @@ function parseMailingListGlobalForm(value) {
 	});
 }
 function parseGlobalFields(value) {
-	if (!isRecord$22(value) || typeof value.preset !== "string") return null;
+	if (!isRecord$23(value) || typeof value.preset !== "string") return null;
 	switch (value.preset) {
 		case "emailOnly": return { preset: "emailOnly" };
 		case "emailName": return isRequirement(value.name) ? {
@@ -1896,7 +1966,7 @@ function parseOptionalString(value) {
 function isRequirement(value) {
 	return value === "required" || value === "optional";
 }
-function isRecord$22(value) {
+function isRecord$23(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function formError(field) {
@@ -1954,7 +2024,7 @@ var init_mailing_list_targeting = __esmMin((() => {
 //#endregion
 //#region ../core/src/mailing-list-runtime.ts
 function parseMailingListRuntimeContext(value) {
-	if (!isRecord$21(value)) return invalidRuntimeContext();
+	if (!isRecord$22(value)) return invalidRuntimeContext();
 	if (value.tag === "not_configured") return ok$2({ tag: "not_configured" });
 	if (value.tag !== "configured") return invalidRuntimeContext();
 	const revision = parseMailingListSetupRevision(value.revision);
@@ -1969,7 +2039,7 @@ function parseMailingListRuntimeContext(value) {
 	});
 }
 function parseRuntimeProvider(value) {
-	if (!isRecord$21(value)) return null;
+	if (!isRecord$22(value)) return null;
 	switch (value.provider) {
 		case "native": return parseNativeRuntimeProvider(value);
 		case "brevo": return parseBrevoRuntimeProvider(value);
@@ -2001,7 +2071,7 @@ function parseMailchimpRuntimeProvider(value) {
 	if (defaultAudienceId === null) return null;
 	const audiences = [];
 	for (const audience of value.audiences) {
-		if (!isRecord$21(audience)) return null;
+		if (!isRecord$22(audience)) return null;
 		const id = parseMailchimpAudienceId(audience.id);
 		const name = parseName(audience.name);
 		if (id === null || name === null || !Array.isArray(audience.interests)) return null;
@@ -2022,7 +2092,7 @@ function parseMailchimpRuntimeProvider(value) {
 function parseMailchimpInterests(value) {
 	const interests = [];
 	for (const interest of value) {
-		if (!isRecord$21(interest)) return null;
+		if (!isRecord$22(interest)) return null;
 		const id = parseMailchimpInterestId(interest.id);
 		const name = parseName(interest.name);
 		const categoryName = parseName(interest.categoryName);
@@ -2039,7 +2109,7 @@ function parseNamedItems(value, parseId) {
 	if (!Array.isArray(value)) return null;
 	const items = [];
 	for (const item of value) {
-		if (!isRecord$21(item)) return null;
+		if (!isRecord$22(item)) return null;
 		const id = parseId(item.id);
 		const name = parseName(item.name);
 		if (id === null || name === null) return null;
@@ -2055,7 +2125,7 @@ function parseName(value) {
 	const name = value.trim();
 	return name.length > 0 ? name : null;
 }
-function isRecord$21(value) {
+function isRecord$22(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function invalidRuntimeContext() {
@@ -2080,15 +2150,6 @@ function parseMailingListContentVersionId(value) {
 	const parsed = parseContentVersionId(value);
 	return parsed.ok ? parsed.value : null;
 }
-function buildMailingListSignupBlockSourceRef(blockId, contentVersionId) {
-	const parsedBlockId = parseMailingListBlockId(blockId);
-	const parsedContentVersionId = parseMailingListContentVersionId(contentVersionId);
-	return parsedBlockId !== null && parsedContentVersionId !== null ? {
-		tag: "block_ref",
-		blockId: parsedBlockId,
-		contentVersionId: parsedContentVersionId
-	} : null;
-}
 var init_mailing_list_submission = __esmMin((() => {
 	init_branded();
 }));
@@ -2496,6 +2557,7 @@ var init_src$2 = __esmMin((() => {
 	init_booking_instalments();
 	init_booking_date_time();
 	init_booking_consent();
+	init_appointment_service_categories();
 	init_dated_offering_settlement();
 	init_person_records();
 	init_rectification();
@@ -2507,6 +2569,7 @@ var init_src$2 = __esmMin((() => {
 	init_narrow_result();
 	init_non_empty_array();
 	init_editor_state();
+	init_block_content_identity();
 	init_sensitive_collection();
 	init_assertNever$1();
 	init_participants();
@@ -2680,11 +2743,11 @@ var init_storagePathDomain = __esmMin((() => {}));
 var init_fileAssetLegacyProjection = __esmMin((() => {}));
 //#endregion
 //#region ../media-core/src/typeGuards.ts
-function isRecord$19(value) {
+function isRecord$20(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function asRecord$1(value) {
-	return isRecord$19(value) ? value : void 0;
+	return isRecord$20(value) ? value : void 0;
 }
 var init_typeGuards$1 = __esmMin((() => {}));
 function isFileJsonObject(value) {
@@ -2694,7 +2757,7 @@ function isFileJsonValue(value) {
 	if (value === null || typeof value === "string" || typeof value === "boolean") return true;
 	if (typeof value === "number") return Number.isFinite(value);
 	if (Array.isArray(value)) return value.every(isFileJsonValue);
-	return isRecord$19(value) && isFileJsonObject(value);
+	return isRecord$20(value) && isFileJsonObject(value);
 }
 var init_filePersistence = __esmMin((() => {
 	init_src$2();
@@ -3002,7 +3065,7 @@ function isCmsMediaObjectType(value) {
 	return typeof value === "string" && CMS_MEDIA_OBJECT_TYPES.includes(value);
 }
 function isCmsMediaObject(value) {
-	if (!isRecord$19(value)) return false;
+	if (!isRecord$20(value)) return false;
 	const type = value.type;
 	if (!isCmsMediaObjectType(type)) return false;
 	if ("attrs" in value) return false;
@@ -3013,7 +3076,7 @@ function collectMediaObjects(value, out, location = "") {
 		value.forEach((item, index) => collectMediaObjects(item, out, `${location}[${index}]`));
 		return;
 	}
-	if (!isRecord$19(value)) return;
+	if (!isRecord$20(value)) return;
 	if (isCmsMediaObject(value)) out.push({
 		obj: value,
 		location
@@ -3047,8 +3110,8 @@ function walkAndCollectImageAttrs(value, out, location = "") {
 		value.forEach((item, index) => walkAndCollectImageAttrs(item, out, `${location}[${index}]`));
 		return;
 	}
-	if (!isRecord$19(value)) return;
-	if (value.type === "image" && isRecord$19(value.attrs)) out.push({
+	if (!isRecord$20(value)) return;
+	if (value.type === "image" && isRecord$20(value.attrs)) out.push({
 		attrs: value.attrs,
 		location: location ? `${location}.attrs` : "attrs"
 	});
@@ -3108,7 +3171,7 @@ function mediaIdentifierOrFallback(current, fallback) {
 var init_renderableMediaAsset = __esmMin((() => {}));
 //#endregion
 //#region ../media-core/src/contentMediaAudit.ts
-function isRecord$18(value) {
+function isRecord$19(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function summarizeContentMediaValue(value) {
@@ -3119,7 +3182,7 @@ function summarizeContentMediaValue(value) {
 	}
 	if (value === null) return "null";
 	if (Array.isArray(value)) return `array(${value.length})`;
-	if (isRecord$18(value)) return `object(${Object.keys(value).sort().join(",")})`;
+	if (isRecord$19(value)) return `object(${Object.keys(value).sort().join(",")})`;
 	return typeof value;
 }
 function auditMediaValue(context, path, allowedMediaTypes, value) {
@@ -3143,9 +3206,9 @@ function auditMediaValue(context, path, allowedMediaTypes, value) {
 			allowedMediaTypes
 		}];
 	}
-	const hasValidIdentifier = isRecord$18(value) && typeof value.identifier === "string" && value.identifier.trim().length > 0;
-	const hasValidExplicitType = isRecord$18(value) && (!("type" in value) || typeof value.type === "string" && allowedMediaTypes.includes(value.type));
-	const hasRetiredEnvironmentField = isRecord$18(value) && ("assetId" in value || "storagePath" in value || "storageBucket" in value || "src" in value || "mimeType" in value || looksLikeUuid(value.id));
+	const hasValidIdentifier = isRecord$19(value) && typeof value.identifier === "string" && value.identifier.trim().length > 0;
+	const hasValidExplicitType = isRecord$19(value) && (!("type" in value) || typeof value.type === "string" && allowedMediaTypes.includes(value.type));
+	const hasRetiredEnvironmentField = isRecord$19(value) && ("assetId" in value || "storagePath" in value || "storageBucket" in value || "src" in value || "mimeType" in value || looksLikeUuid(value.id));
 	if (hasValidIdentifier && hasValidExplicitType && !hasRetiredEnvironmentField) return [];
 	return [{
 		tag: "malformed-object",
@@ -3156,7 +3219,7 @@ function auditMediaValue(context, path, allowedMediaTypes, value) {
 	}];
 }
 function auditFields(context, fields, value, parentPath) {
-	if (!isRecord$18(value)) return [];
+	if (!isRecord$19(value)) return [];
 	const findings = [];
 	for (const field of fields) {
 		if (!(field.id in value)) continue;
@@ -3173,7 +3236,7 @@ function auditFields(context, fields, value, parentPath) {
 				if (!Array.isArray(fieldValue)) break;
 				for (const [index, item] of fieldValue.entries()) {
 					const itemPath = [...fieldPath, index];
-					if (!isRecord$18(item)) {
+					if (!isRecord$19(item)) {
 						findings.push({
 							tag: "missing-schema",
 							context,
@@ -3207,7 +3270,7 @@ var init_contentMediaAudit = __esmMin((() => {
 }));
 //#endregion
 //#region ../media-core/src/contentMediaAuditFieldAdapter.ts
-function isRecord$17(value) {
+function isRecord$18(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function unknownArray(value) {
@@ -3216,7 +3279,7 @@ function unknownArray(value) {
 function fieldsArray(value) {
 	const directFields = unknownArray(value);
 	if (directFields) return directFields;
-	if (!isRecord$17(value)) return null;
+	if (!isRecord$18(value)) return null;
 	return unknownArray(value.fields);
 }
 function nestedFields(field) {
@@ -3281,7 +3344,7 @@ function mergeFields(fields) {
 }
 function adaptFields(rawFields, flattenRepeaterGroups = false, defaultFileKinds = ["document"]) {
 	return mergeFields(rawFields.flatMap((rawField) => {
-		if (!isRecord$17(rawField)) return [];
+		if (!isRecord$18(rawField)) return [];
 		const { id, type } = rawField;
 		if (typeof id !== "string" || !id || typeof type !== "string") return [];
 		if (type === "media" || type === "file") return [{
@@ -3289,7 +3352,7 @@ function adaptFields(rawFields, flattenRepeaterGroups = false, defaultFileKinds
 			id,
 			allowedMediaTypes: allowedMediaTypes(rawField, type, defaultFileKinds)
 		}];
-		if (flattenRepeaterGroups && type === "group" && isRecord$17(rawField.ui) && rawField.ui.flattenInRepeater === true) return adaptFields(nestedFields(rawField), false, defaultFileKinds);
+		if (flattenRepeaterGroups && type === "group" && isRecord$18(rawField.ui) && rawField.ui.flattenInRepeater === true) return adaptFields(nestedFields(rawField), false, defaultFileKinds);
 		if (type === "group" || type === "modal") return [{
 			kind: "object",
 			id,
@@ -3298,14 +3361,14 @@ function adaptFields(rawFields, flattenRepeaterGroups = false, defaultFileKinds
 		if (type === "tabGroup") return [{
 			kind: "object",
 			id,
-			fields: adaptFields((unknownArray(rawField.tabs) ?? []).flatMap((tab) => isRecord$17(tab) ? unknownArray(tab.fields) ?? [] : []), false, defaultFileKinds)
+			fields: adaptFields((unknownArray(rawField.tabs) ?? []).flatMap((tab) => isRecord$18(tab) ? unknownArray(tab.fields) ?? [] : []), false, defaultFileKinds)
 		}];
 		if (type !== "repeater") return [];
-		if (isRecord$17(rawField.itemTypes)) return [{
+		if (isRecord$18(rawField.itemTypes)) return [{
 			kind: "repeater",
 			id,
 			mode: "variants",
-			variants: Object.entries(rawField.itemTypes).flatMap(([typeId, itemType]) => isRecord$17(itemType) && Array.isArray(itemType.fields) ? [{
+			variants: Object.entries(rawField.itemTypes).flatMap(([typeId, itemType]) => isRecord$18(itemType) && Array.isArray(itemType.fields) ? [{
 				typeId,
 				fields: adaptFields(itemType.fields, true, defaultFileKinds)
 			}] : []),
@@ -7715,6 +7778,15 @@ function asSiteStyleId(value) {
 function asDesignSystemTemplateId(value) {
 	return brandNonEmptyString(value, "DesignSystemTemplateId");
 }
+function toNonEmptyReadonlyArray(values) {
+	const [first, ...rest] = values;
+	return first === void 0 ? null : [first, ...rest];
+}
+function requireNonEmptyReadonlyArray(values, message = "Expected a non-empty array.") {
+	const result = toNonEmptyReadonlyArray(values);
+	if (!result) throw new Error(message);
+	return result;
+}
 function makeBoundaryId(previousBlockId, nextBlockId) {
 	return asDesignBoundaryId(`boundary:${encodeURIComponent(previousBlockId)}:${encodeURIComponent(nextBlockId)}`);
 }
@@ -7888,16 +7960,18 @@ var init_rawStyleFields = __esmMin((() => {
 		"_frameStyles",
 		"_sectionStyles",
 		"_containerStyles",
-		"_cardStyles",
-		"_transitionStyles",
-		"styleGroup"
+		"_cardStyles"
 	];
 	themeV2BlockSpecificRawStyleFieldNames = [
 		"_contentCardStyles",
 		"_heroLayoutStyles",
 		"_textCardStyles"
 	];
-	themeV2NormalEditorRawStyleFieldNames = [...themeV2RuntimeStyleFieldNames, ...themeV2BlockSpecificRawStyleFieldNames];
+	themeV2NormalEditorRawStyleFieldNames = [
+		...themeV2RuntimeStyleFieldNames,
+		...themeV2BlockSpecificRawStyleFieldNames,
+		"styleGroup"
+	];
 	new Set(themeV2NormalEditorRawStyleFieldNames);
 	[...themeV2RuntimeStyleFieldNames, ...themeV2BlockSpecificRawStyleFieldNames];
 	pageDesignEditorBackgroundOverrideOwner = "page-design-editor";
@@ -7989,7 +8063,7 @@ var init_interactionPalette = __esmMin((() => {
 //#endregion
 //#region ../theme-core/src/boxBackgroundSchema.ts
 function normalizeAuthoringOpacity(value) {
-	if (!isRecord$16(value)) return value;
+	if (!isRecord$17(value)) return value;
 	return {
 		...value,
 		opacity: normalizeOpacity(value.opacity)
@@ -7998,7 +8072,7 @@ function normalizeAuthoringOpacity(value) {
 function normalizeOpacity(value) {
 	return typeof value === "number" && value > 1 && value <= 100 ? value / 100 : value;
 }
-function isRecord$16(value) {
+function isRecord$17(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var boxBackgroundOverlaySchema, commonSchema, mediaPresentationSchema, boxBackgroundSchema;
@@ -8817,7 +8891,7 @@ var init_media$1 = __esmMin((() => {
 /**
 * Strict record guard: excludes null, primitives, and arrays.
 */
-function isRecord$15(value) {
+function isRecord$16(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var init_typeGuards = __esmMin((() => {}));
@@ -8967,7 +9041,7 @@ var init_bookingConsent = __esmMin((() => {
 		checkboxLabel: z.string().min(1)
 	});
 	z.union([blockBookingConsentSchema, bookingRequirementConsentFieldSchema]);
-})), publicEventLoaderQuerySchemaShape, eventPresetSchema, eventScheduleScopeSchema$2, publicEventRecurrenceSchema, eventDestinationModeSchema, publicEventDestinationSchema, eventVenueSchema, eventCategorySchema, accessRestrictionSchema, publicCurrencySchema, publicCentsSchema, publicPositiveCentsSchema, publicIsoDateTimeSchema, publicEventAttendanceModeSchema, publicEventAttendanceModeAvailabilitySchema, publicEventPricingOptionAvailabilitySchema, publicEventPricingOptionSchema, publicEventPricingSchema, publicTeamMemberSummarySchema, publicEventBookingAvailabilitySchema, publicRunSessionSchema, publicWholeSeriesRunSchema, publicEventBaseSchema, publicEventSchema, publicEventsArraySchema;
+})), publicEventLoaderQuerySchemaShape, eventPresetSchema, eventScheduleScopeSchema$2, publicEventRecurrenceSchema, eventDestinationModeSchema, publicEventDestinationSchema, eventVenueSchema, eventCategorySchema, accessRestrictionSchema, publicCurrencySchema, publicCentsSchema, publicPositiveCentsSchema, publicIsoDateTimeSchema, publicEventAttendanceModeSchema, publicEventAttendanceModeAvailabilitySchema, publicEventPricingOptionAvailabilitySchema, publicEventPricingOptionSchema, publicEventPricingSchema, publicTeamMemberSummarySchema, publicEventBookingAvailabilitySchema, publicEventBookingClosedDetailSchema, publicRunSessionSchema, publicWholeSeriesRunSchema, publicEventBaseSchema, publicEventSchema, publicEventsArraySchema;
 var init_schemas = __esmMin((() => {
 	init_media$1();
 	init_richTextSchema();
@@ -8991,6 +9065,7 @@ var init_schemas = __esmMin((() => {
 		seriesSlug: z.string().optional(),
 		includeOccurrenceId: z.string().optional(),
 		readIntent: z.string().optional(),
+		detailAdmission: z.string().optional(),
 		detailLevel: z.string().optional(),
 		readProfile: z.string().optional()
 	};
@@ -9148,11 +9223,11 @@ var init_schemas = __esmMin((() => {
 			"series_archived",
 			"parent_archived",
 			"parent_inconsistent",
-			"not_public",
 			"already_started",
 			"enrollment_closed"
 		])
 	})]);
+	publicEventBookingClosedDetailSchema = z.discriminatedUnion("kind", [z.object({ kind: z.literal("opensSoon") }), z.object({ kind: z.literal("paused") })]);
 	publicRunSessionSchema = z.object({
 		occurrenceId: z.string(),
 		startsAt: z.string(),
@@ -9194,6 +9269,7 @@ var init_schemas = __esmMin((() => {
 		destination: publicEventDestinationSchema,
 		requiresRegistration: z.boolean(),
 		bookingAvailability: publicEventBookingAvailabilitySchema,
+		bookingClosedDetail: publicEventBookingClosedDetailSchema.optional(),
 		deliveryMode: z.enum([
 			"in_person",
 			"online",
@@ -9922,7 +9998,7 @@ function encodePublicProductCategorySelector(selector) {
 			};
 	}
 }
-function isRecord$14(value) {
+function isRecord$15(value) {
 	return typeof value === "object" && value !== null;
 }
 function isJsonResponseContentType(contentType) {
@@ -9946,15 +10022,15 @@ async function parseJsonBody(response) {
 	}
 }
 function isFieldError(value) {
-	return isRecord$14(value) && !Array.isArray(value) && typeof value.field === "string" && typeof value.code === "string" && typeof value.message === "string";
+	return isRecord$15(value) && !Array.isArray(value) && typeof value.field === "string" && typeof value.code === "string" && typeof value.message === "string";
 }
 function fieldErrorsFromUnknown(value) {
 	if (!Array.isArray(value)) return void 0;
 	return value.every(isFieldError) ? value : void 0;
 }
 function getBlockApiErrorDetails(data) {
-	if (!isRecord$14(data)) return {};
-	const nestedError = isRecord$14(data.error) ? data.error : void 0;
+	if (!isRecord$15(data)) return {};
+	const nestedError = isRecord$15(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;
 	const fieldErrors = fieldErrorsFromUnknown(nestedError?.fieldErrors) ?? fieldErrorsFromUnknown(data.fieldErrors);
@@ -10968,11 +11044,11 @@ var UnsafePathSegmentError = class extends Error {
 function assertSafePathSegments(segments) {
 	for (const segment of segments) if (typeof segment === "string" && UNSAFE_PATH_SEGMENTS.has(segment)) throw new UnsafePathSegmentError(segment);
 }
-function isRecord$13(value) {
+function isRecord$14(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isPathContainer(value) {
-	return Array.isArray(value) || isRecord$13(value);
+	return Array.isArray(value) || isRecord$14(value);
 }
 function getContainerValue(container, segment) {
 	if (typeof segment === "number") return Array.isArray(container) ? container[segment] : void 0;
@@ -13652,6 +13728,7 @@ var init_social = __esmMin((() => {
 		"SocialInstagram",
 		"SocialLinkedIn",
 		"SocialTikTok",
+		"SocialWhatsApp",
 		"SocialX",
 		"SocialYouTube"
 	];
@@ -13688,6 +13765,7 @@ var init_social = __esmMin((() => {
 			/* @__PURE__ */ jsx("path", { d: "M10.5 9v10" })
 		] })),
 		SocialTikTok: createIcon("SocialTikTokIcon", /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("path", { d: "M14 4v11.5a4.5 4.5 0 1 1-4-4.47" }), /* @__PURE__ */ jsx("path", { d: "M14 4c.7 3 2.4 4.5 5 4.5" })] })),
+		SocialWhatsApp: createIcon("SocialWhatsAppIcon", /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("path", { d: "M3.5 20.5 4.8 16.4A8.5 8.5 0 1 1 8 19.3Z" }), /* @__PURE__ */ jsx("path", { d: "M9.2 8.2c.2-.5.9-.6 1.2-.1l.8 1.4c.2.3.1.7-.2 1l-.5.5c.5 1.1 1.4 2 2.5 2.5l.5-.5c.3-.3.7-.4 1-.2l1.4.8c.5.3.4 1-.1 1.2-2.9 1.1-7.7-3.7-6.6-6.6Z" })] })),
 		SocialX: createIcon("SocialXIcon", /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("path", { d: "m5 4 14 16" }), /* @__PURE__ */ jsx("path", { d: "M19 4 5 20" })] })),
 		SocialYouTube: createIcon("SocialYouTubeIcon", /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("path", { d: "M21 12c0 3.5-.5 5.5-1.3 6.3S16.5 19.5 12 19.5s-6.9-.4-7.7-1.2S3 15.5 3 12s.5-5.5 1.3-6.3S7.5 4.5 12 4.5s6.9.4 7.7 1.2S21 8.5 21 12Z" }), /* @__PURE__ */ jsx("path", { d: "m10 9 5 3-5 3Z" })] }))
 	};
@@ -13957,7 +14035,7 @@ function parseSiteIconStyleGuideVersionId(value) {
 //#region ../blocks/src/system/icons/value.ts
 init_semantic();
 const NO_BLOCK_ICON_VALUE = { kind: "none" };
-function isRecord$12(value) {
+function isRecord$13(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function parseBlockIconValue(value) {
@@ -13965,7 +14043,7 @@ function parseBlockIconValue(value) {
 		kind: "semantic",
 		iconId: value
 	};
-	if (!isRecord$12(value)) return NO_BLOCK_ICON_VALUE;
+	if (!isRecord$13(value)) return NO_BLOCK_ICON_VALUE;
 	switch (value.kind) {
 		case "none": return NO_BLOCK_ICON_VALUE;
 		case "semantic": return isSemanticIconId(value.iconId) ? {
@@ -14038,7 +14116,7 @@ function buildGeneratedBlockIconRenderAssetLookupFromUnknown(value) {
 	if (!Array.isArray(value)) return { kind: "invalid_asset_list" };
 	const inputs = [];
 	for (const [index, item] of value.entries()) {
-		if (!isRecord$12(item)) return {
+		if (!isRecord$13(item)) return {
 			kind: "invalid_asset_entry",
 			index,
 			reason: "not_object"
@@ -14158,11 +14236,11 @@ function resolveFeatureCardGeneratedIconSizePx(value) {
 	const parsed = parseFeatureCardGeneratedIconSizePx(value);
 	return parsed.ok ? parsed.value : unsafeAsFeatureCardGeneratedIconSizePx(FEATURE_CARD_GENERATED_ICON_SIZE_PX.default);
 }
-function isRecord$11(value) {
+function isRecord$12(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function toPlainTextFromTipTap(value) {
-	if (!isRecord$11(value)) return "";
+	if (!isRecord$12(value)) return "";
 	if (typeof value.text === "string") return value.text;
 	const content = value.content;
 	if (!Array.isArray(content)) return "";
@@ -15453,18 +15531,43 @@ const publicAppointmentServiceSchema = z.object({
 	pricing: publicPricingSchema.optional(),
 	priceAmount: z.number().nullable(),
 	priceCurrency: z.string().nullable(),
-	location: publicLocationSchema
+	location: publicLocationSchema,
+	categoryId: z.string().nullable().optional().transform((value) => value ?? null)
+});
+const publicServiceCategorySchema = z.object({
+	id: z.string().min(1),
+	name: z.string(),
+	description: z.string().nullable().optional().transform((value) => value ?? null)
 });
-const publicAppointmentServicesSchema = z.array(publicAppointmentServiceSchema);
+/**
+* The loader hands over the catalogue `{ services, categories }` (issue 1403).
+* A bare services array is still accepted and read as a site with no
+* categories, so callers from before categories keep the flat list.
+*/
+const publicAppointmentServicesSchema = z.union([z.array(publicAppointmentServiceSchema).transform((services) => ({
+	services,
+	categories: []
+})), z.object({
+	services: z.array(publicAppointmentServiceSchema),
+	categories: z.array(publicServiceCategorySchema)
+})]);
 const EMPTY_MESSAGE = "No appointments are available right now.";
 const ERROR_MESSAGE = "Appointments are temporarily unavailable. Please try again shortly.";
+const OTHER_GROUP_KEY = "other";
+const OTHER_GROUP_HEADING = "Other";
 function parseServices(value) {
 	const result = publicAppointmentServicesSchema.safeParse(value);
 	return result.success ? {
 		kind: "valid",
-		services: result.data
+		services: result.data.services,
+		categories: result.data.categories
 	} : { kind: "invalid" };
 }
+function readCategoryFilter(value) {
+	if (typeof value !== "string") return null;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : null;
+}
 function formatAppointmentDuration(durationMinutes) {
 	return `${durationMinutes} min`;
 }
@@ -15538,8 +15641,44 @@ function buildRows(services, pathname, servicePathPrefix) {
 		detailsHref: servicePathPrefix && service.slug ? `${servicePathPrefix.replace(/\/$/, "")}/${encodeURIComponent(service.slug)}` : null
 	}));
 }
+const EMPTY_VIEW = {
+	kind: "empty",
+	message: EMPTY_MESSAGE
+};
+function categoryGroup(category, services, toRows) {
+	return {
+		key: category.id,
+		heading: category.name,
+		intro: category.description,
+		rows: toRows(services)
+	};
+}
+function viewFromLayout(layout, toRows) {
+	switch (layout.kind) {
+		case "uncategorized-site": return layout.services.length === 0 ? EMPTY_VIEW : {
+			kind: "items",
+			rows: toRows(layout.services)
+		};
+		case "categorized-site": {
+			const groups = layout.groups.map((group) => categoryGroup(group.category, group.services, toRows));
+			const other = layout.other.length === 0 ? [] : [{
+				key: OTHER_GROUP_KEY,
+				heading: OTHER_GROUP_HEADING,
+				intro: null,
+				rows: toRows(layout.other)
+			}];
+			const allGroups = [...groups, ...other];
+			return allGroups.length === 0 ? EMPTY_VIEW : {
+				kind: "groups",
+				groups: allGroups
+			};
+		}
+		default: return assertNever$22(layout);
+	}
+}
 function buildAppointmentServicesView(input) {
-	if (!input.pathname) return {
+	const pathname = input.pathname;
+	if (!pathname) return {
 		kind: "error",
 		message: ERROR_MESSAGE
 	};
@@ -15548,76 +15687,128 @@ function buildAppointmentServicesView(input) {
 		kind: "error",
 		message: ERROR_MESSAGE
 	};
-	if (parsed.services.length === 0) return {
-		kind: "empty",
-		message: EMPTY_MESSAGE
-	};
-	return {
-		kind: "items",
-		rows: buildRows(parsed.services, input.pathname, input.servicePathPrefix ?? null)
-	};
+	const toRows = (services) => buildRows(services, pathname, input.servicePathPrefix ?? null);
+	const view = selectCategoryView(parsed.categories, parsed.services, readCategoryFilter(input.categoryId));
+	switch (view.kind) {
+		case "single": return view.group.services.length === 0 ? EMPTY_VIEW : {
+			kind: "groups",
+			groups: [categoryGroup(view.group.category, view.group.services, toRows)]
+		};
+		case "all":
+		case "fallback-all": return viewFromLayout(view.layout, toRows);
+		default: return assertNever$22(view);
+	}
+}
+function AppointmentServiceRows({ rows, RowTitle }) {
+	return /* @__PURE__ */ jsx("div", {
+		className: "appointment-services-rows rb-flex rb-flex-col",
+		children: rows.map((row) => /* @__PURE__ */ jsxs("article", {
+			className: "appointment-services-row rb-border-b rb-border-border rb-py-4",
+			children: [
+				/* @__PURE__ */ jsxs("div", {
+					className: "appointment-services-row-main rb-min-w-0",
+					children: [
+						/* @__PURE__ */ jsx(RowTitle, {
+							className: "appointment-services-row-title rb-text-lg rb-font-medium rb-leading-tight",
+							children: row.detailsHref ? /* @__PURE__ */ jsx("a", {
+								href: row.detailsHref,
+								children: row.title
+							}) : row.title
+						}),
+						row.description ? /* @__PURE__ */ jsx("p", {
+							className: "appointment-services-row-description rb-text-sm rb-leading-6 status-muted",
+							children: row.description
+						}) : null,
+						/* @__PURE__ */ jsxs("p", {
+							className: "appointment-services-row-meta rb-caption status-muted",
+							children: [row.durationLabel, row.locationLabel ? ` · ${row.locationLabel}` : ""]
+						})
+					]
+				}),
+				row.priceLabel ? /* @__PURE__ */ jsx("span", {
+					className: "appointment-services-row-price rb-text-lg",
+					children: row.priceLabel
+				}) : null,
+				/* @__PURE__ */ jsx(ThemedButtonLink, {
+					variant: "secondary",
+					size: "sm",
+					extraClassName: "appointment-services-row-action",
+					href: row.href,
+					label: "Check times",
+					screenReaderSuffix: ` for ${row.title}`
+				})
+			]
+		}, row.id))
+	});
+}
+function AppointmentServiceGroups({ groups, hasSectionHeading, idPrefix }) {
+	const GroupHeading = hasSectionHeading ? "h3" : "h2";
+	const RowTitle = hasSectionHeading ? "h4" : "h3";
+	return /* @__PURE__ */ jsx("div", {
+		className: "appointment-services-groups rb-flex rb-flex-col rb-gap-10",
+		children: groups.map((group) => {
+			const headingId = `${idPrefix}-group-${group.key}`;
+			return /* @__PURE__ */ jsxs("section", {
+				className: "appointment-services-group rb-flex rb-flex-col rb-gap-2",
+				"aria-labelledby": headingId,
+				"data-appointment-services-group": group.key,
+				children: [/* @__PURE__ */ jsxs("div", {
+					className: "appointment-services-group-heading",
+					children: [/* @__PURE__ */ jsx(GroupHeading, {
+						id: headingId,
+						className: "appointment-services-group-title rb-text-sm rb-font-semibold rb-uppercase rb-tracking-wide",
+						children: group.heading
+					}), group.intro ? /* @__PURE__ */ jsx("p", {
+						className: "appointment-services-group-intro rb-text-sm rb-leading-6 rb-max-w-prose status-muted",
+						children: group.intro
+					}) : null]
+				}), /* @__PURE__ */ jsx(AppointmentServiceRows, {
+					rows: group.rows,
+					RowTitle
+				})]
+			}, group.key);
+		})
+	});
 }
-function AppointmentServicesNode({ sectionHeading, services, pathname, servicePathPrefix, className }) {
+function AppointmentServicesNode({ sectionHeading, categoryId, services, pathname, servicePathPrefix, blockId, className }) {
 	const view = buildAppointmentServicesView({
 		services,
+		categoryId,
 		pathname: typeof pathname === "string" ? pathname : void 0,
 		servicePathPrefix: typeof servicePathPrefix === "string" ? servicePathPrefix : null
 	});
 	const rootClassName = `appointment-services ${className ?? ""}`.trim();
-	const RowTitle = sectionHeading ? "h3" : "h2";
-	if (view.kind === "error" || view.kind === "empty") return /* @__PURE__ */ jsx("div", {
-		className: rootClassName,
-		"data-appointment-services-state": view.kind,
-		children: /* @__PURE__ */ jsx("p", {
-			className: "rb-caption status-muted",
-			role: "status",
-			children: view.message
-		})
-	});
-	return /* @__PURE__ */ jsx("div", {
-		className: `${rootClassName} rb-flex rb-flex-col`,
-		"data-appointment-services-state": "populated",
-		children: /* @__PURE__ */ jsx("div", {
-			className: "appointment-services-rows rb-flex rb-flex-col",
-			children: view.rows.map((row) => /* @__PURE__ */ jsxs("article", {
-				className: "appointment-services-row rb-border-b rb-border-border rb-py-4",
-				children: [
-					/* @__PURE__ */ jsxs("div", {
-						className: "appointment-services-row-main rb-min-w-0",
-						children: [
-							/* @__PURE__ */ jsx(RowTitle, {
-								className: "appointment-services-row-title rb-text-lg rb-font-medium rb-leading-tight",
-								children: row.detailsHref ? /* @__PURE__ */ jsx("a", {
-									href: row.detailsHref,
-									children: row.title
-								}) : row.title
-							}),
-							row.description ? /* @__PURE__ */ jsx("p", {
-								className: "appointment-services-row-description rb-text-sm rb-leading-6 status-muted",
-								children: row.description
-							}) : null,
-							/* @__PURE__ */ jsxs("p", {
-								className: "appointment-services-row-meta rb-caption status-muted",
-								children: [row.durationLabel, row.locationLabel ? ` · ${row.locationLabel}` : ""]
-							})
-						]
-					}),
-					row.priceLabel ? /* @__PURE__ */ jsx("span", {
-						className: "appointment-services-row-price rb-text-lg",
-						children: row.priceLabel
-					}) : null,
-					/* @__PURE__ */ jsx(ThemedButtonLink, {
-						variant: "secondary",
-						size: "sm",
-						extraClassName: "appointment-services-row-action",
-						href: row.href,
-						label: "Check times",
-						screenReaderSuffix: ` for ${row.title}`
-					})
-				]
-			}, row.id))
-		})
-	});
+	const hasSectionHeading = Boolean(sectionHeading);
+	switch (view.kind) {
+		case "error":
+		case "empty": return /* @__PURE__ */ jsx("div", {
+			className: rootClassName,
+			"data-appointment-services-state": view.kind,
+			children: /* @__PURE__ */ jsx("p", {
+				className: "rb-caption status-muted",
+				role: "status",
+				children: view.message
+			})
+		});
+		case "items": return /* @__PURE__ */ jsx("div", {
+			className: `${rootClassName} rb-flex rb-flex-col`,
+			"data-appointment-services-state": "populated",
+			children: /* @__PURE__ */ jsx(AppointmentServiceRows, {
+				rows: view.rows,
+				RowTitle: hasSectionHeading ? "h3" : "h2"
+			})
+		});
+		case "groups": return /* @__PURE__ */ jsx("div", {
+			className: `${rootClassName} rb-flex rb-flex-col`,
+			"data-appointment-services-state": "populated",
+			children: /* @__PURE__ */ jsx(AppointmentServiceGroups, {
+				groups: view.groups,
+				hasSectionHeading,
+				idPrefix: `appointment-services-${blockId ?? "block"}`
+			})
+		});
+		default: return assertNever$22(view);
+	}
 }
 //#endregion
 //#region ../blocks/src/contracts/runtime.ts
@@ -15786,7 +15977,7 @@ function successSubmissionFeedback(message) {
 		message
 	};
 }
-function isRecord$9(value) {
+function isRecord$10(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function deepEqualJsonValue(left, right) {
@@ -15796,8 +15987,8 @@ function deepEqualJsonValue(left, right) {
 		if (left.length !== right.length) return false;
 		return left.every((item, index) => deepEqualJsonValue(item, right[index]));
 	}
-	if (isRecord$9(left) || isRecord$9(right)) {
-		if (!isRecord$9(left) || !isRecord$9(right)) return false;
+	if (isRecord$10(left) || isRecord$10(right)) {
+		if (!isRecord$10(left) || !isRecord$10(right)) return false;
 		const leftKeys = Object.keys(left).sort();
 		if (!deepEqualJsonValue(leftKeys, Object.keys(right).sort())) return false;
 		return leftKeys.every((key) => deepEqualJsonValue(left[key], right[key]));
@@ -15979,12 +16170,12 @@ function resolveBookingSiteId(siteId, form) {
 	return siteId || form?.siteId || "";
 }
 function normalizeBookingFormConfig(form) {
-	if (!isRecord$8(form)) return null;
+	if (!isRecord$9(form)) return null;
 	const id = readNonEmptyString(form.id);
 	const name = readNonEmptyString(form.name);
 	if (!id || !name) return null;
-	const schemaSource = isRecord$8(form.schema) ? form.schema : isRecord$8(form.schemaJson) ? form.schemaJson : null;
-	const settingsSource = isRecord$8(form.settings) ? form.settings : isRecord$8(form.settingsJson) ? form.settingsJson : null;
+	const schemaSource = isRecord$9(form.schema) ? form.schema : isRecord$9(form.schemaJson) ? form.schemaJson : null;
+	const settingsSource = isRecord$9(form.settings) ? form.settings : isRecord$9(form.settingsJson) ? form.settingsJson : null;
 	return {
 		id,
 		name,
@@ -16004,8 +16195,8 @@ function normalizeBookingServices(services) {
 	};
 	if (!services) return [];
 	if (Array.isArray(services)) return services.filter(isBookingFormService).map(normalizeService);
-	if (isRecord$8(services) && "services" in services) return Array.isArray(services.services) ? services.services.filter(isBookingFormService).map(normalizeService) : [];
-	return isRecord$8(services) ? Object.values(services).filter(isBookingFormService).map(normalizeService) : [];
+	if (isRecord$9(services) && "services" in services) return Array.isArray(services.services) ? services.services.filter(isBookingFormService).map(normalizeService) : [];
+	return isRecord$9(services) ? Object.values(services).filter(isBookingFormService).map(normalizeService) : [];
 }
 function normalizeBookingSchema(value) {
 	if (!value) return void 0;
@@ -16016,7 +16207,7 @@ function normalizeBookingSchema(value) {
 	};
 }
 function readBookingFormField(value) {
-	if (!isRecord$8(value)) return null;
+	if (!isRecord$9(value)) return null;
 	const id = readNonEmptyString(value.id);
 	const label = readNonEmptyString(value.label);
 	const type = readBookingFieldType(value.type);
@@ -16059,7 +16250,7 @@ function readBookingFieldOptions(value) {
 	return options.length > 0 ? options : void 0;
 }
 function readBookingFieldOption(value) {
-	if (!isRecord$8(value)) return null;
+	if (!isRecord$9(value)) return null;
 	const optionValue = readNonEmptyString(value.value);
 	const label = readNonEmptyString(value.label);
 	return optionValue && label ? {
@@ -16079,7 +16270,7 @@ function normalizeBookingSettings(value) {
 	};
 }
 function isBookingFormService(value) {
-	return isRecord$8(value) && typeof value.id === "string" && typeof value.siteId === "string" && typeof value.title === "string" && (value.consent === void 0 || blockBookingConsentSchema.safeParse(value.consent).success);
+	return isRecord$9(value) && typeof value.id === "string" && typeof value.siteId === "string" && typeof value.title === "string" && (value.consent === void 0 || blockBookingConsentSchema.safeParse(value.consent).success);
 }
 function collectBookingCustomFields(data) {
 	const customFields = {};
@@ -16129,7 +16320,7 @@ function readStringArray(value) {
 	const strings = value.filter((item) => typeof item === "string");
 	return strings.length > 0 ? strings : void 0;
 }
-function isRecord$8(value) {
+function isRecord$9(value) {
 	return typeof value === "object" && value !== null;
 }
 function getBookingServicePaymentSelectionMode(service) {
@@ -16329,6 +16520,32 @@ var init_booking_form_state = __esmMin((() => {
 	init_booking_form_reserved_fields();
 	init_booking_form_consent();
 }));
+//#endregion
+//#region ../blocks/src/system/runtime/nodes/booking-form.service-categories.ts
+function isRecord$8(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function readCategory(value) {
+	if (!isRecord$8(value)) return [];
+	const { id, name, description } = value;
+	if (typeof id !== "string" || id.trim() === "" || typeof name !== "string") return [];
+	return [{
+		id,
+		name,
+		description: typeof description === "string" ? description : null
+	}];
+}
+/**
+* The ordered service categories carried by a catalogue-shaped services
+* source (`{ services, categories }`). Every other shape has none, which
+* reads as a site without categories. Order is preserved: the database owns
+* it.
+*/
+function normalizeBookingServiceCategories(services) {
+	if (!isRecord$8(services) || !Array.isArray(services.categories)) return [];
+	return services.categories.flatMap(readCategory);
+}
+var init_booking_form_service_categories = __esmMin((() => {}));
 var bookingFieldOptionSchema, standardBookingFieldRules, standardBookingFieldSchema, bookingFieldSchema, bookingSettingsSchema, bookingSourceFormSchema;
 var init_booking_runtime_sources = __esmMin((() => {
 	init_noop();
@@ -16413,11 +16630,12 @@ function buildBookingFormInteractiveIslandProps(props) {
 		source: props
 	});
 }
-var blockBookingPaymentTermsAvailabilitySchema, bookingServiceSchema, bookingServicesSourceSchema, bookingConfigSchema, bookingSourceSchema, bookingDisplaySchema, bookingHydrationSchema, bookingRenderSchema, bookingFormIslandMetaCodec, bookingFormIslandMetaKeys, bookingFormBlockRuntime, bookingFormInteractiveIslandPropsCodec;
+var blockBookingPaymentTermsAvailabilitySchema, bookingServiceSchema, bookingServiceCategorySchema, bookingServicesSourceSchema, bookingConfigSchema, bookingSourceSchema, bookingDisplaySchema, bookingHydrationSchema, bookingRenderSchema, bookingFormIslandMetaCodec, bookingFormIslandMetaKeys, bookingFormBlockRuntime, bookingFormInteractiveIslandPropsCodec;
 var init_booking_form_interactive = __esmMin((() => {
 	init_islands();
 	init_runtime();
 	init_booking_form_state();
+	init_booking_form_service_categories();
 	init_booking_runtime_sources();
 	init_bookingPaymentTerms();
 	init_bookingConsent();
@@ -16440,11 +16658,20 @@ var init_booking_form_interactive = __esmMin((() => {
 		priceCurrency: z.string().nullable().optional(),
 		paymentTerms: blockBookingPaymentTermsSchema.optional(),
 		paymentTermsAvailability: blockBookingPaymentTermsAvailabilitySchema.optional(),
-		consent: blockBookingConsentSchema.optional()
+		consent: blockBookingConsentSchema.optional(),
+		categoryId: z.string().nullable().optional()
+	});
+	bookingServiceCategorySchema = z.object({
+		id: z.string(),
+		name: z.string(),
+		description: z.string().nullable()
 	});
 	bookingServicesSourceSchema = z.union([
 		z.array(bookingServiceSchema),
-		z.object({ services: z.array(bookingServiceSchema).optional() }),
+		z.object({
+			services: z.array(bookingServiceSchema).optional(),
+			categories: z.array(bookingServiceCategorySchema).optional()
+		}),
 		z.record(z.string(), bookingServiceSchema)
 	]);
 	bookingConfigSchema = z.object({
@@ -16497,6 +16724,7 @@ var init_booking_form_interactive = __esmMin((() => {
 		rebookContext: z.object({ kind: z.literal("portal_rebook") }).nullable().optional(),
 		form: bookingConfigSchema.nullable(),
 		services: z.array(bookingServiceSchema),
+		serviceCategories: z.array(bookingServiceCategorySchema).optional(),
 		spamProtectionEnabled: z.boolean().optional()
 	});
 	bookingRenderSchema = z.object({
@@ -16532,6 +16760,7 @@ var init_booking_form_interactive = __esmMin((() => {
 					rebookContext: source.rebookContext ?? null,
 					form,
 					services,
+					serviceCategories: normalizeBookingServiceCategories(source.services),
 					spamProtectionEnabled: source.spamProtectionEnabled
 				}
 			};
@@ -17333,7 +17562,6 @@ function closedEventBookingLabel(reason) {
 		case "series_archived":
 		case "parent_archived":
 		case "parent_inconsistent":
-		case "not_public":
 		case "already_started":
 		case "enrollment_closed": return "Registration closed";
 		default: return assertNever$22(reason);
@@ -23071,17 +23299,256 @@ var init_cardRoleVocabulary = __esmMin((() => {
 	Object.keys(legacyItemSurfaceCardRoles);
 	cardRoleWithLegacyAliasSchema = z.preprocess((value) => cardRoleFromLegacyVocabulary(value) ?? value, cardRoleSchema);
 }));
-var init_compositionBudget = __esmMin((() => {
-	init_types$8();
+var init_runtimeBackgroundResolution = __esmMin((() => {
+	init_boxBackgroundSchema();
+	init_surfaces();
+	init_rawStyleFields();
 }));
-var defaultHeaderBrandPreferences;
-var init_compilationPlan = __esmMin((() => {
-	defaultHeaderBrandPreferences = {
-		brandDisplay: "auto",
-		logoSize: "auto"
-	};
+var transitionCatalogueFamilies, mediumHeight, compactHeight, largeHeight, transitionCatalogueEntries;
+var init_transitionCatalogue = __esmMin((() => {
+	init_types$8();
+	transitionCatalogueFamilies = [
+		{
+			id: "gradient",
+			label: "Gradient"
+		},
+		{
+			id: "wave",
+			label: "Wave"
+		},
+		{
+			id: "angle",
+			label: "Angle"
+		}
+	];
+	mediumHeight = "6rem + 2px";
+	compactHeight = "4.5rem + 2px";
+	largeHeight = "7rem + 2px";
+	transitionCatalogueEntries = defineExactCatalog()([
+		{
+			intent: "soft-fade-short",
+			optionId: asBoundaryOptionId("break:soft"),
+			family: "gradient",
+			variantId: "soft",
+			label: "Soft",
+			variantLabel: "Soft",
+			treatment: {
+				kind: "soft-fade",
+				height: "medium",
+				curve: "soft"
+			},
+			size: "medium",
+			heightExpression: mediumHeight,
+			shape: { kind: "fade" }
+		},
+		{
+			intent: "soft-fade-long",
+			optionId: asBoundaryOptionId("break:spacious"),
+			family: "gradient",
+			variantId: "spacious",
+			label: "Spacious",
+			variantLabel: "Spacious",
+			treatment: {
+				kind: "soft-fade",
+				height: "large",
+				curve: "spacious"
+			},
+			size: "spacious",
+			heightExpression: "10rem",
+			shape: { kind: "fade" }
+		},
+		{
+			intent: "soft-fade-expansive",
+			optionId: asBoundaryOptionId("break:expansive"),
+			family: "gradient",
+			variantId: "expansive",
+			label: "Expansive",
+			variantLabel: "Expansive",
+			treatment: {
+				kind: "soft-fade",
+				height: "expansive",
+				curve: "expansive"
+			},
+			size: "expansive",
+			heightExpression: "14rem",
+			shape: { kind: "fade" }
+		},
+		{
+			intent: "wave-edge-balanced",
+			optionId: asBoundaryOptionId("break:wave-balanced"),
+			family: "wave",
+			variantId: "balanced",
+			label: "Balanced wave",
+			variantLabel: "Balanced",
+			treatment: {
+				kind: "wave-edge",
+				height: "medium",
+				amplitude: "balanced",
+				rhythm: "double",
+				symmetry: "symmetrical"
+			},
+			size: "medium",
+			heightExpression: mediumHeight,
+			shape: {
+				kind: "wave",
+				mask: "balanced"
+			}
+		},
+		{
+			intent: "wave-edge",
+			optionId: asBoundaryOptionId("break:wave"),
+			family: "wave",
+			variantId: "classic",
+			label: "Classic wave",
+			variantLabel: "Classic",
+			treatment: {
+				kind: "wave-edge",
+				height: "medium",
+				amplitude: "balanced",
+				rhythm: "double",
+				symmetry: "asymmetrical"
+			},
+			size: "medium",
+			heightExpression: mediumHeight,
+			shape: {
+				kind: "wave",
+				mask: "classic"
+			}
+		},
+		{
+			intent: "wave-edge-gentle",
+			optionId: asBoundaryOptionId("break:wave-gentle"),
+			family: "wave",
+			variantId: "gentle",
+			label: "Gentle wave",
+			variantLabel: "Gentle",
+			treatment: {
+				kind: "wave-edge",
+				height: "compact",
+				amplitude: "subtle",
+				rhythm: "single",
+				symmetry: "symmetrical"
+			},
+			size: "compact",
+			heightExpression: compactHeight,
+			shape: {
+				kind: "wave",
+				mask: "gentle"
+			}
+		},
+		{
+			intent: "wave-edge-bold",
+			optionId: asBoundaryOptionId("break:wave-bold"),
+			family: "wave",
+			variantId: "bold",
+			label: "Bold wave",
+			variantLabel: "Bold",
+			treatment: {
+				kind: "wave-edge",
+				height: "large",
+				amplitude: "bold",
+				rhythm: "double",
+				symmetry: "symmetrical"
+			},
+			size: "large",
+			heightExpression: largeHeight,
+			shape: {
+				kind: "wave",
+				mask: "bold"
+			}
+		},
+		{
+			intent: "wave-edge-drift",
+			optionId: asBoundaryOptionId("break:wave-drift"),
+			family: "wave",
+			variantId: "drift",
+			label: "Drift wave",
+			variantLabel: "Drift",
+			treatment: {
+				kind: "wave-edge",
+				height: "medium",
+				amplitude: "balanced",
+				rhythm: "double",
+				symmetry: "drift"
+			},
+			size: "medium",
+			heightExpression: mediumHeight,
+			shape: {
+				kind: "wave",
+				mask: "drift"
+			}
+		},
+		{
+			intent: "angle-edge-subtle",
+			optionId: asBoundaryOptionId("break:angle-subtle"),
+			family: "angle",
+			variantId: "subtle",
+			label: "Subtle angle",
+			variantLabel: "Subtle",
+			treatment: {
+				kind: "angle-edge",
+				height: "compact",
+				slope: "subtle",
+				direction: "forward"
+			},
+			size: "compact",
+			heightExpression: compactHeight,
+			shape: {
+				kind: "angle",
+				polygon: {
+					startTopPercent: 34,
+					endTopPercent: 18
+				}
+			}
+		},
+		{
+			intent: "angle-edge",
+			optionId: asBoundaryOptionId("break:angle-balanced"),
+			family: "angle",
+			variantId: "balanced",
+			label: "Balanced angle",
+			variantLabel: "Balanced",
+			treatment: {
+				kind: "angle-edge",
+				height: "medium",
+				slope: "balanced",
+				direction: "forward"
+			},
+			size: "medium",
+			heightExpression: mediumHeight,
+			shape: {
+				kind: "angle",
+				polygon: {
+					startTopPercent: 42,
+					endTopPercent: 8
+				}
+			}
+		},
+		{
+			intent: "angle-edge-steep",
+			optionId: asBoundaryOptionId("break:angle-steep"),
+			family: "angle",
+			variantId: "steep",
+			label: "Steep angle",
+			variantLabel: "Steep",
+			treatment: {
+				kind: "angle-edge",
+				height: "large",
+				slope: "steep",
+				direction: "forward"
+			},
+			size: "large",
+			heightExpression: largeHeight,
+			shape: {
+				kind: "angle",
+				polygon: {
+					startTopPercent: 54,
+					endTopPercent: 0
+				}
+			}
+		}
+	]);
 }));
-var init_schemaVersionedJson = __esmMin((() => {}));
 //#endregion
 //#region ../theme-core/src/site-styles/sectionTransitions.ts
 function boundaryRuntimeMetrics(family, size, heightExpression) {
@@ -23092,46 +23559,120 @@ function boundaryRuntimeMetrics(family, size, heightExpression) {
 		reserveCss: `calc((${heightExpression}) / 2)`
 	};
 }
-var noneBoundaryOption, softBoundaryOption, spaciousBoundaryOption;
+/**
+* The catalogue's compile-time coverage check guarantees an entry per
+* decorative intent, so a miss here is a broken invariant, not bad input.
+*/
+function requireCatalogueValue(values, intent) {
+	const value = values.get(intent);
+	if (value === void 0) throw new Error(`Transition catalogue has no entry for ${intent}`);
+	return value;
+}
+function boundaryOptionForTransitionIntent(intent) {
+	return requireCatalogueValue(boundaryOptionByIntent, intent);
+}
+function transitionVariantForEntry(entry) {
+	return {
+		familyId: entry.family,
+		variantId: entry.variantId,
+		label: entry.variantLabel,
+		boundaryOption: boundaryOptionForTransitionIntent(entry.intent)
+	};
+}
+function stableTreatmentKey(treatment) {
+	switch (treatment.kind) {
+		case "none": return "none";
+		case "soft-fade": return `${treatment.kind}:${treatment.height}:${treatment.curve}`;
+		case "wave-edge": return [
+			treatment.kind,
+			treatment.height,
+			treatment.amplitude,
+			treatment.rhythm,
+			treatment.symmetry
+		].join(":");
+		case "angle-edge": return [
+			treatment.kind,
+			treatment.height,
+			treatment.slope,
+			treatment.direction
+		].join(":");
+		case "legacy-unsupported": return `${treatment.kind}:${treatment.boundaryOptionId}`;
+	}
+}
+var noneBoundaryOption, boundaryOptionByIntent, softBoundaryOption, spaciousBoundaryOption, boundaryOptions, noneTransitionVariant, sectionTransitionFamilies;
 var init_sectionTransitions = __esmMin((() => {
 	init_types$8();
-	boundaryRuntimeMetrics("gradient", "medium", "6rem + 2px"), boundaryRuntimeMetrics("gradient", "spacious", "10rem"), boundaryRuntimeMetrics("gradient", "expansive", "14rem"), boundaryRuntimeMetrics("wave", "medium", "6rem + 2px"), boundaryRuntimeMetrics("wave", "medium", "6rem + 2px"), boundaryRuntimeMetrics("wave", "compact", "4.5rem + 2px"), boundaryRuntimeMetrics("wave", "large", "7rem + 2px"), boundaryRuntimeMetrics("wave", "medium", "6rem + 2px"), boundaryRuntimeMetrics("angle", "medium", "6rem + 2px"), boundaryRuntimeMetrics("angle", "compact", "4.5rem + 2px"), boundaryRuntimeMetrics("angle", "large", "7rem + 2px");
+	init_transitionCatalogue();
+	new Map(transitionCatalogueEntries.map((entry) => [entry.intent, entry]));
+	new Map(transitionCatalogueEntries.map((entry) => [entry.intent, boundaryRuntimeMetrics(entry.family, entry.size, entry.heightExpression)]));
 	noneBoundaryOption = {
 		id: asBoundaryOptionId("break:none"),
 		label: "None",
 		transitionAfter: "none",
 		treatment: { kind: "none" }
 	};
-	softBoundaryOption = {
-		id: asBoundaryOptionId("break:soft"),
-		label: "Soft",
-		transitionAfter: "soft-fade-short",
-		treatment: {
-			kind: "soft-fade",
-			height: "medium",
-			curve: "soft"
-		}
+	boundaryOptionByIntent = new Map(transitionCatalogueEntries.map((entry) => [entry.intent, {
+		id: entry.optionId,
+		label: entry.label,
+		transitionAfter: entry.intent,
+		treatment: entry.treatment
+	}]));
+	softBoundaryOption = boundaryOptionForTransitionIntent("soft-fade-short");
+	spaciousBoundaryOption = boundaryOptionForTransitionIntent("soft-fade-long");
+	boundaryOptionForTransitionIntent("soft-fade-expansive");
+	boundaryOptionForTransitionIntent("wave-edge");
+	boundaryOptionForTransitionIntent("wave-edge-balanced");
+	boundaryOptionForTransitionIntent("wave-edge-gentle");
+	boundaryOptionForTransitionIntent("wave-edge-bold");
+	boundaryOptionForTransitionIntent("wave-edge-drift");
+	boundaryOptionForTransitionIntent("angle-edge-subtle");
+	boundaryOptionForTransitionIntent("angle-edge");
+	boundaryOptionForTransitionIntent("angle-edge-steep");
+	boundaryOptions = [noneBoundaryOption, ...transitionCatalogueEntries.map((entry) => boundaryOptionForTransitionIntent(entry.intent))];
+	noneTransitionVariant = {
+		familyId: "none",
+		variantId: "none",
+		label: "None",
+		boundaryOption: noneBoundaryOption
 	};
-	spaciousBoundaryOption = {
-		id: asBoundaryOptionId("break:spacious"),
-		label: "Spacious",
-		transitionAfter: "soft-fade-long",
-		treatment: {
-			kind: "soft-fade",
-			height: "large",
-			curve: "spacious"
-		}
+	sectionTransitionFamilies = [{
+		id: "none",
+		label: "None",
+		variants: [noneTransitionVariant]
+	}, ...transitionCatalogueFamilies.map((family) => ({
+		id: family.id,
+		label: family.label,
+		variants: requireNonEmptyReadonlyArray(transitionCatalogueEntries.filter((entry) => entry.family === family.id).map(transitionVariantForEntry), `Transition family ${family.id} has no catalogue entries.`)
+	}))];
+	new Map(boundaryOptions.map((option) => [option.id, option]));
+	new Map(boundaryOptions.map((option) => [stableTreatmentKey(option.treatment), option]));
+	new Map(sectionTransitionFamilies.flatMap((family) => family.variants.map((variant) => [variant.boundaryOption.id, variant])));
+	new Map(sectionTransitionFamilies.map((family) => [family.id, family]));
+}));
+function requireThemeColorToken$1(value) {
+	const token = parseThemeColorToken(value);
+	if (!token) throw new Error(`Expected a theme color token. Received: ${value}`);
+	return token;
+}
+var init_sectionBoundaryComposition = __esmMin((() => {
+	init_themeColorTokens();
+	init_runtimeBackgroundResolution();
+	init_sectionTransitions();
+	init_types$8();
+	requireThemeColorToken$1("background");
+}));
+var init_compositionBudget = __esmMin((() => {
+	init_types$8();
+	init_sectionBoundaryComposition();
+}));
+var defaultHeaderBrandPreferences;
+var init_compilationPlan = __esmMin((() => {
+	defaultHeaderBrandPreferences = {
+		brandDisplay: "auto",
+		logoSize: "auto"
 	};
-	asBoundaryOptionId("break:expansive");
-	asBoundaryOptionId("break:wave");
-	asBoundaryOptionId("break:wave-balanced");
-	asBoundaryOptionId("break:wave-gentle");
-	asBoundaryOptionId("break:wave-bold");
-	asBoundaryOptionId("break:wave-drift");
-	asBoundaryOptionId("break:angle-subtle");
-	asBoundaryOptionId("break:angle-balanced");
-	asBoundaryOptionId("break:angle-steep");
 }));
+var init_schemaVersionedJson = __esmMin((() => {}));
 function addDuplicateStringIssues(ctx, input) {
 	const seen = /* @__PURE__ */ new Set();
 	const duplicates = /* @__PURE__ */ new Set();
@@ -23160,14 +23701,11 @@ function validateUniquePageDesignPins(intent, ctx) {
 		label: "block Look pin"
 	});
 	addDuplicateStringIssues(ctx, {
-		values: intent.boundaryPins.map((pin) => boundaryKey(pin.previousBlockId, pin.nextBlockId)),
+		values: intent.boundaryPins.map((pin) => makeBoundaryId(pin.previousBlockId, pin.nextBlockId)),
 		path: ["boundaryPins"],
 		label: "boundary pin"
 	});
 }
-function boundaryKey(previousBlockId, nextBlockId) {
-	return makeBoundaryId(previousBlockId, nextBlockId);
-}
 var pageDesignUserPinnedAppearanceChoiceSchema, pageDesignUserPinnedBoundaryChoiceSchema, pageDesignBoundaryTreatmentSchema, pageDesignUserPinnedBoundaryTreatmentChoiceSchema, pageDesignBlockLookPinSchema, pageDesignBoundaryPinSchema, legacyPageDesignBoundaryPinSchema;
 var init_pageDesignIntent = __esmMin((() => {
 	init_types$8();
@@ -26207,6 +26745,33 @@ var init_designState = __esmMin((() => {
 		authority: styleAuthoritySchema
 	}).strict();
 }));
+var init_pageFlowPresets = __esmMin((() => {
+	init_sectionTransitions();
+	init_types$8();
+	asPageFlowPresetId("flow:quiet"), noneBoundaryOption.id, asPageFlowPresetId("flow:balanced"), softBoundaryOption.id, asPageFlowPresetId("flow:expressive"), spaciousBoundaryOption.id;
+})), init_lookResolution = __esmMin((() => {
+	init_appearancePresets();
+	init_types$8();
+}));
+var init_siteStyleBlockPolicies = __esmMin((() => {
+	init_lookResolution();
+	init_appearancePresets();
+	init_pageDesignIntent();
+	init_types$8();
+	asPageFlowPresetId("generated-default");
+	asSiteStyleId("site-style:south-west-twerk-school");
+	asAppearancePresetId("hero-brand-scrim-fixed-frame");
+	asLayoutVariantKey("classic");
+	asLayoutVariantKey("micro");
+	asBoundaryOptionId("break:wave");
+}));
+var init_joinTreatment = __esmMin((() => {
+	init_pageFlowPresets();
+	init_pageDesignIntent();
+	init_sectionTransitions();
+	init_siteStyleBlockPolicies();
+	init_types$8();
+}));
 var init_imageSurfaceBackground = __esmMin((() => {
 	init_types$8();
 }));
@@ -26247,8 +26812,9 @@ var init_runtimeCompiler = __esmMin((() => {
 	init_styles();
 	init_designState();
 	init_types$8();
+	init_joinTreatment();
+	init_rawStyleFields();
 	init_accessibleSurfaces();
-	init_sectionTransitions();
 	init_tokens();
 	init_gradients();
 	init_imageSurfaceBackground();
@@ -26285,8 +26851,7 @@ var init_runtimeCompiler = __esmMin((() => {
 				color: "surface",
 				opacity: .88
 			}
-		},
-		transitionClassName: (transition, fromSurface, toSurface) => transition === "none" ? null : `site-style-transition-${transition}-from-${fromSurface}-to-${toSurface}`
+		}
 	});
 	defaultComponentRuntimeRules = defineComponentRuntimeRules({
 		panelFrames: {
@@ -28022,22 +28587,12 @@ var init_curatedSiteStyles = __esmMin((() => {
 	];
 	new Map(curatedSiteStyles.map((style) => [style.id, style]));
 }));
-var init_pageDesignEditorCapabilities = __esmMin((() => {})), init_lookResolution = __esmMin((() => {
-	init_appearancePresets();
-	init_types$8();
-}));
-var init_siteStyleBlockPolicies = __esmMin((() => {
-	init_lookResolution();
-	init_appearancePresets();
+var init_pageDesignEditorCapabilities = __esmMin((() => {}));
+var init_pageDesignEditorBoundaries = __esmMin((() => {
 	init_pageDesignIntent();
-	init_types$8();
+	init_joinTreatment();
 	init_sectionTransitions();
-	asPageFlowPresetId("generated-default");
-	asSiteStyleId("site-style:south-west-twerk-school");
-	asAppearancePresetId("hero-brand-scrim-fixed-frame");
-	asLayoutVariantKey("classic");
-	asLayoutVariantKey("micro");
-	asBoundaryOptionId("break:wave");
+	init_types$8();
 }));
 var init_pageDesignEditorModel = __esmMin((() => {
 	init_curatedSiteStyles();
@@ -28046,8 +28601,9 @@ var init_pageDesignEditorModel = __esmMin((() => {
 	init_siteStyleBlockPolicies();
 	init_pageDesignIntent();
 	init_types$8();
+	init_pageFlowPresets();
+	init_pageDesignEditorBoundaries();
 	init_sectionTransitions();
-	asPageFlowPresetId("flow:quiet"), noneBoundaryOption.id, asPageFlowPresetId("flow:balanced"), softBoundaryOption.id, asPageFlowPresetId("flow:expressive"), spaciousBoundaryOption.id;
 })), init_concretePalette = __esmMin((() => {
 	init_colors();
 })), blockDesignFallback;
@@ -28056,7 +28612,6 @@ var init_resolver = __esmMin((() => {
 	blockDesignFallback = {
 		sectionSurface: "base",
 		contentFrame: plainFrame,
-		transitionAfter: "none",
 		sectionHeight: "default",
 		heroLegibility: "none",
 		imageSurfaceTreatment: { kind: "none" },
@@ -28067,7 +28622,7 @@ var init_resolver = __esmMin((() => {
 		accordionIconTreatment: null,
 		composition: null
 	};
-	blockDesignFallback.sectionSurface, blockDesignFallback.contentFrame, blockDesignFallback.transitionAfter, blockDesignFallback.sectionHeight, blockDesignFallback.heroLegibility, blockDesignFallback.imageSurfaceTreatment, blockDesignFallback.imageSurfaceMotion, blockDesignFallback.tileTreatment, blockDesignFallback.eventListTreatment, blockDesignFallback.eyebrowTreatment, blockDesignFallback.accordionIconTreatment, blockDesignFallback.composition;
+	blockDesignFallback.sectionSurface, blockDesignFallback.contentFrame, blockDesignFallback.sectionHeight, blockDesignFallback.heroLegibility, blockDesignFallback.imageSurfaceTreatment, blockDesignFallback.imageSurfaceMotion, blockDesignFallback.tileTreatment, blockDesignFallback.eventListTreatment, blockDesignFallback.eyebrowTreatment, blockDesignFallback.accordionIconTreatment, blockDesignFallback.composition;
 }));
 function parseSiteChromeBackgroundColorToken(value) {
 	const token = parseBackgroundAppearanceColorToken(value);
@@ -28156,11 +28711,6 @@ var init_headerRecompile = __esmMin((() => {
 	init_headerBrandPresentation();
 	init_siteChromeNavPreferences();
 }));
-var init_runtimeBackgroundResolution = __esmMin((() => {
-	init_boxBackgroundSchema();
-	init_surfaces();
-	init_rawStyleFields();
-}));
 var init_previewRuntimeCapabilities = __esmMin((() => {
 	init_types$8();
 }));
@@ -28180,8 +28730,8 @@ var init_previewCustomization = __esmMin((() => {
 	init_types$8();
 }));
 var init_previewCompiler = __esmMin((() => {
+	init_sectionTransitions();
 	init_schema$2();
-	init_tokens();
 	init_curated();
 	init_concretePalette();
 	init_curatedSiteStyles();
@@ -28191,7 +28741,6 @@ var init_previewCompiler = __esmMin((() => {
 	init_headerRecompile();
 	init_siteChromeNavPreferences();
 	init_runtimeCompiler();
-	init_rawStyleFields();
 	init_runtimeBackgroundResolution();
 	init_previewRuntimeCapabilities();
 	init_siteStyleThemeCompiler();
@@ -28201,6 +28750,7 @@ var init_previewCompiler = __esmMin((() => {
 	init_pageDesignIntent();
 	init_previewCustomization();
 	init_curatedChoices();
+	init_joinTreatment();
 	init_types$8();
 }));
 var init_contentTemplateRuntimeCompiler = __esmMin((() => {
@@ -28302,6 +28852,7 @@ var init_generatedDesignPipeline = __esmMin((() => {
 	init_curatedSiteStyles();
 	init_lookResolution();
 	init_headerOpeningSection();
+	init_joinTreatment();
 	init_resolver();
 	init_runtimeCompiler();
 	init_types$8();
@@ -28670,6 +29221,7 @@ var init_site_styles = __esmMin((() => {
 	init_headerRecompile();
 	init_headerOpeningForeground();
 	init_headerOpeningSection();
+	init_joinTreatment();
 	init_lookResolution();
 	init_lookOptionGroups();
 	init_logoBranding();
@@ -28689,6 +29241,7 @@ var init_site_styles = __esmMin((() => {
 	init_runtimeCompiler();
 	init_runtimeBackgroundResolution();
 	init_sectionTransitions();
+	init_sectionBoundaryComposition();
 	init_siteChromeBackgrounds();
 	init_siteChromeNavPreferences();
 	init_siteStyleThemeCompiler();
@@ -28696,6 +29249,7 @@ var init_site_styles = __esmMin((() => {
 	init_sourceCatalogs();
 	init_styleTags();
 	init_tokenRecipes();
+	init_transitionCatalogue();
 	init_siteStyleTypography();
 	init_themeParity();
 	init_types$8();
@@ -29177,7 +29731,8 @@ var init_schema = __esmMin((() => {
 		"eventCategories",
 		"eventSeries",
 		"venues",
-		"staffMembers"
+		"staffMembers",
+		"appointmentServiceCategories"
 	];
 	mediaDeliverySchema = z.object({
 		sizes: z.string().optional(),
@@ -36634,6 +37189,11 @@ function withOptionalPhone(fields, includePhone) {
 var init_newsletter_form_types = __esmMin((() => {}));
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/newsletter-form.interactive.ts
+function newsletterBlockSubmissionMessage(target) {
+	if (target.tag === "block-source") return target.sourceRef ? null : NEWSLETTER_SIGNUPS_PAUSED_MESSAGE;
+	if (target.tag !== "unpublished-preview") return null;
+	return target.reason === "unpublished-form" ? "Publish this form to test a signup here." : "This form's signup settings are unpublished. Publish it to test a signup here.";
+}
 function buildNewsletterDisplay(source) {
 	const context = source.mailingList;
 	const form = context?.tag === "configured" ? context.form : {
@@ -36659,16 +37219,21 @@ function buildNewsletterDisplay(source) {
 }
 function projectNewsletterFormHydrationTarget(source) {
 	switch (source.source) {
-		case "block": {
-			const sourceRef = buildMailingListSignupBlockSourceRef(source.blockId, source.contentVersionId);
-			if (sourceRef?.tag === "block_ref") return {
+		case "block": switch (source.newsletterBlockSubmission.tag) {
+			case "unpublished-form":
+			case "unpublished-settings": return {
+				tag: "unpublished-preview",
+				reason: source.newsletterBlockSubmission.tag
+			};
+			case "ready": return {
 				tag: "block-source",
-				sourceRef
+				sourceRef: source.newsletterBlockSubmission.sourceRef
 			};
-			return {
+			case "unavailable": return {
 				tag: "block-source",
 				sourceRef: null
 			};
+			default: return assertNever$22(source.newsletterBlockSubmission);
 		}
 		case "signed-footer": return {
 			tag: "signed-footer-source",
@@ -36737,6 +37302,7 @@ function buildNewsletterFormInteractiveIslandProps(props) {
 	const decoded = newsletterFormBlockRuntime.contracts.source.decode(props);
 	const source = isDecodeSuccess(decoded) ? decoded.value : {
 		...props,
+		...props.source === "block" ? { newsletterBlockSubmission: { tag: "unavailable" } } : {},
 		mailingList: void 0,
 		targeting: { mode: "default" }
 	};
@@ -36760,13 +37326,14 @@ function parseRequiredMailingListSignedSourceToken(value) {
 	if (!parsed) throw new Error("Mailing-list signup signed source ref requires token");
 	return parsed;
 }
-var newsletterButtonVariantSchema, mailingListContextSchema, mailingListTargetingSchema, newsletterFieldSchema, mailingListSignupBlockIdSchema, mailingListContentVersionIdSchema, signedMailingListSourceTokenSchema, newsletterSourceCommonSchema, newsletterSourceSchema, newsletterDisplaySchema, newsletterHydrationSchema, newsletterRenderSchema, newsletterIslandMetaCodec, newsletterIslandMetaKeys, newsletterFormBlockRuntime, newsletterFormInteractiveIslandPropsCodec;
+var NEWSLETTER_SIGNUPS_PAUSED_MESSAGE, newsletterButtonVariantSchema, mailingListContextSchema, mailingListTargetingSchema, newsletterFieldSchema, mailingListSignupBlockIdSchema, mailingListContentVersionIdSchema, mailingListSignupBlockSourceRefSchema, signedMailingListSourceTokenSchema, newsletterSourceCommonSchema, newsletterSourceSchema, newsletterDisplaySchema, newsletterHydrationSchema, newsletterRenderSchema, newsletterIslandMetaCodec, newsletterIslandMetaKeys, newsletterFormBlockRuntime, newsletterFormInteractiveIslandPropsCodec;
 var init_newsletter_form_interactive = __esmMin((() => {
 	init_src$2();
 	init_islands();
 	init_runtime();
 	init_newsletter_form_types();
 	init_buttonRoles();
+	NEWSLETTER_SIGNUPS_PAUSED_MESSAGE = "We can’t accept signups right now. Please try again later.";
 	newsletterButtonVariantSchema = blockButtonRoleSchema;
 	mailingListContextSchema = z.unknown().transform((value, ctx) => {
 		const parsed = parseMailingListRuntimeContext(value);
@@ -36807,6 +37374,11 @@ var init_newsletter_form_interactive = __esmMin((() => {
 		});
 		return z.NEVER;
 	});
+	mailingListSignupBlockSourceRefSchema = z.object({
+		tag: z.literal("block_ref"),
+		blockId: mailingListSignupBlockIdSchema,
+		contentVersionId: mailingListContentVersionIdSchema
+	});
 	signedMailingListSourceTokenSchema = z.string().trim().min(1).transform(parseRequiredMailingListSignedSourceToken);
 	newsletterSourceCommonSchema = z.object({
 		siteId: z.string().optional(),
@@ -36821,7 +37393,15 @@ var init_newsletter_form_interactive = __esmMin((() => {
 		newsletterSourceCommonSchema.extend({
 			source: z.literal("block"),
 			blockId: z.string().nullable().optional(),
-			contentVersionId: z.string().nullable().optional()
+			newsletterBlockSubmission: z.discriminatedUnion("tag", [
+				z.object({
+					tag: z.literal("ready"),
+					sourceRef: mailingListSignupBlockSourceRefSchema
+				}),
+				z.object({ tag: z.literal("unpublished-form") }),
+				z.object({ tag: z.literal("unpublished-settings") }),
+				z.object({ tag: z.literal("unavailable") })
+			])
 		}),
 		newsletterSourceCommonSchema.extend({
 			source: z.literal("signed-footer"),
@@ -36850,11 +37430,7 @@ var init_newsletter_form_interactive = __esmMin((() => {
 		target: z.discriminatedUnion("tag", [
 			z.object({
 				tag: z.literal("block-source"),
-				sourceRef: z.object({
-					tag: z.literal("block_ref"),
-					blockId: mailingListSignupBlockIdSchema,
-					contentVersionId: mailingListContentVersionIdSchema
-				}).nullable()
+				sourceRef: mailingListSignupBlockSourceRefSchema.nullable()
 			}),
 			z.object({
 				tag: z.literal("signed-footer-source"),
@@ -36863,7 +37439,11 @@ var init_newsletter_form_interactive = __esmMin((() => {
 					token: signedMailingListSourceTokenSchema
 				})
 			}),
-			z.object({ tag: z.literal("preview") })
+			z.object({ tag: z.literal("preview") }),
+			z.object({
+				tag: z.literal("unpublished-preview"),
+				reason: z.enum(["unpublished-form", "unpublished-settings"])
+			})
 		]),
 		setupRevision: z.number().int().positive().nullable(),
 		choiceProvider: z.enum([
@@ -39364,10 +39944,167 @@ function FeedbackMessage({ tone, treatment = "panel", children, className, id, t
 }
 var init_FeedbackMessage = __esmMin((() => {}));
 //#endregion
+//#region ../blocks/src/system/runtime/shared/components/CheckboxChoice.tsx
+/**
+* The customer-facing checkbox every block renders. Styling comes from the
+* theme's input CSS (`.form-check`, `.form-checkbox`), so it follows each
+* site's input colours, borders and corners.
+*/
+function CheckboxChoice({ label, presentation = "row", className, ...inputProps }) {
+	return /* @__PURE__ */ jsxs("label", {
+		className: clsx("form-check", presentation === "tile" && "form-check--tile", className),
+		children: [/* @__PURE__ */ jsx("input", {
+			...inputProps,
+			type: "checkbox",
+			className: "form-checkbox"
+		}), /* @__PURE__ */ jsx("span", {
+			className: "form-check-label",
+			children: label
+		})]
+	});
+}
+var init_CheckboxChoice = __esmMin((() => {
+	init_clsx();
+}));
+//#endregion
+//#region ../blocks/src/system/runtime/nodes/form.fields.tsx
+function fieldBasics(field) {
+	return {
+		inputId: `f_${field.id}`,
+		label: String(field.label ?? field.id),
+		required: Boolean(field.required)
+	};
+}
+function textInputType(type) {
+	return type === "email" || type === "url" || type === "tel" || type === "number" ? type : "text";
+}
+function textInputConstraints(field, inputType) {
+	if (inputType === "number") return {
+		...typeof field.min === "number" ? { min: field.min } : {},
+		...typeof field.max === "number" ? { max: field.max } : {}
+	};
+	return {
+		...typeof field.minLength === "number" ? { minLength: field.minLength } : {},
+		...typeof field.maxLength === "number" ? { maxLength: field.maxLength } : {},
+		...typeof field.pattern === "string" && field.pattern ? { pattern: field.pattern } : {}
+	};
+}
+function LabelledField({ basics, children }) {
+	return /* @__PURE__ */ jsxs("div", {
+		className: "fb-field",
+		children: [/* @__PURE__ */ jsx("label", {
+			htmlFor: basics.inputId,
+			className: "form-label",
+			children: basics.label
+		}), children]
+	});
+}
+function TextareaField({ field }) {
+	const basics = fieldBasics(field);
+	return /* @__PURE__ */ jsx(LabelledField, {
+		basics,
+		children: /* @__PURE__ */ jsx("textarea", {
+			id: basics.inputId,
+			name: field.id,
+			required: basics.required,
+			placeholder: field.placeholder,
+			rows: field.rows,
+			className: "form-textarea"
+		})
+	});
+}
+function SelectField({ field }) {
+	const basics = fieldBasics(field);
+	const options = field.options ?? [];
+	const multiple = Boolean(field.multiple);
+	return /* @__PURE__ */ jsx(LabelledField, {
+		basics,
+		children: /* @__PURE__ */ jsxs("select", {
+			id: basics.inputId,
+			name: field.id,
+			multiple,
+			required: basics.required,
+			className: "form-select",
+			children: [!multiple && /* @__PURE__ */ jsx("option", {
+				value: "",
+				children: "Select…"
+			}), options.map((opt) => /* @__PURE__ */ jsx("option", {
+				value: opt.value,
+				children: opt.label
+			}, opt.value))]
+		})
+	});
+}
+function RadioField({ field }) {
+	const basics = fieldBasics(field);
+	const options = field.options ?? [];
+	return /* @__PURE__ */ jsxs("fieldset", {
+		className: "fb-fieldset",
+		children: [/* @__PURE__ */ jsx("legend", {
+			className: "form-label",
+			children: basics.label
+		}), options.map((opt) => /* @__PURE__ */ jsxs("label", {
+			className: "form-check",
+			children: [/* @__PURE__ */ jsx("input", {
+				type: "radio",
+				name: field.id,
+				value: opt.value,
+				required: basics.required,
+				className: "form-radio"
+			}), /* @__PURE__ */ jsx("span", {
+				className: "form-check-label",
+				children: opt.label
+			})]
+		}, opt.value))]
+	});
+}
+function TextInputField({ field, type }) {
+	const basics = fieldBasics(field);
+	const inputType = textInputType(type);
+	return /* @__PURE__ */ jsx(LabelledField, {
+		basics,
+		children: /* @__PURE__ */ jsx("input", {
+			id: basics.inputId,
+			name: field.id,
+			type: inputType,
+			required: basics.required,
+			placeholder: field.placeholder,
+			...textInputConstraints(field, inputType),
+			className: "form-input"
+		})
+	});
+}
+function FormFieldControl({ field }) {
+	const type = String(field.type ?? "text");
+	switch (type) {
+		case "textarea": return /* @__PURE__ */ jsx(TextareaField, { field });
+		case "select": return /* @__PURE__ */ jsx(SelectField, { field });
+		case "radio": return /* @__PURE__ */ jsx(RadioField, { field });
+		case "checkbox":
+		case "consent": {
+			const basics = fieldBasics(field);
+			return /* @__PURE__ */ jsx(CheckboxChoice, {
+				name: field.id,
+				required: basics.required,
+				label: basics.label,
+				presentation: type === "consent" ? "tile" : "row"
+			});
+		}
+		default: return /* @__PURE__ */ jsx(TextInputField, {
+			field,
+			type
+		});
+	}
+}
+var init_form_fields = __esmMin((() => {
+	init_CheckboxChoice();
+}));
+//#endregion
 //#region ../blocks/src/system/runtime/nodes/form.server.tsx
 init_clsx();
 init_ThemedButton();
 init_FeedbackMessage();
+init_form_fields();
 init_form_interactive();
 const FormNodeSSR = ({ blockId, value, submitLabel, successMessage, className, onSubmit, action = "/api/forms/submit", siteId, apiBaseUrl, spamProtectionEnabled }) => {
 	const islandProps = buildFormInteractiveIslandProps({
@@ -39391,107 +40128,7 @@ const FormNodeSSR = ({ blockId, value, submitLabel, successMessage, className, o
 		})]
 	});
 	const groups = display.groups;
-	const renderField = (field) => {
-		const inputId = `f_${field.id}`;
-		const label = String(field.label ?? field.id);
-		const required = Boolean(field.required);
-		const type = String(field.type ?? "text");
-		if (type === "textarea") return /* @__PURE__ */ jsxs("div", {
-			className: "fb-field",
-			children: [/* @__PURE__ */ jsx("label", {
-				htmlFor: inputId,
-				className: "form-label",
-				children: label
-			}), /* @__PURE__ */ jsx("textarea", {
-				id: inputId,
-				name: field.id,
-				required,
-				placeholder: field.placeholder,
-				rows: field.rows,
-				className: "form-textarea"
-			})]
-		}, field.id);
-		if (type === "select") {
-			const options = field.options ?? [];
-			const multiple = Boolean(field.multiple);
-			return /* @__PURE__ */ jsxs("div", {
-				className: "fb-field",
-				children: [/* @__PURE__ */ jsx("label", {
-					htmlFor: inputId,
-					className: "form-label",
-					children: label
-				}), /* @__PURE__ */ jsxs("select", {
-					id: inputId,
-					name: field.id,
-					multiple,
-					required,
-					className: "form-select",
-					children: [!multiple && /* @__PURE__ */ jsx("option", {
-						value: "",
-						children: "Select…"
-					}), options.map((opt) => /* @__PURE__ */ jsx("option", {
-						value: opt.value,
-						children: opt.label
-					}, opt.value))]
-				})]
-			}, field.id);
-		}
-		if (type === "radio") {
-			const options = field.options ?? [];
-			return /* @__PURE__ */ jsxs("fieldset", {
-				className: "fb-fieldset",
-				children: [/* @__PURE__ */ jsx("legend", {
-					className: "form-label",
-					children: label
-				}), options.map((opt) => /* @__PURE__ */ jsxs("label", {
-					className: "fb-inline form-label",
-					children: [/* @__PURE__ */ jsx("input", {
-						type: "radio",
-						name: field.id,
-						value: opt.value,
-						required,
-						className: "form-radio"
-					}), /* @__PURE__ */ jsx("span", { children: opt.label })]
-				}, opt.value))]
-			}, field.id);
-		}
-		if (type === "checkbox" || type === "consent") return /* @__PURE__ */ jsxs("label", {
-			className: "fb-inline form-label",
-			children: [/* @__PURE__ */ jsx("input", {
-				type: "checkbox",
-				name: field.id,
-				required,
-				className: "form-checkbox"
-			}), /* @__PURE__ */ jsx("span", { children: label })]
-		}, field.id);
-		const inputType = type === "email" || type === "url" || type === "tel" || type === "number" ? type : "text";
-		const extra = {};
-		if (inputType === "text" || inputType === "email" || inputType === "url" || inputType === "tel") {
-			if (typeof field.minLength === "number") extra.minLength = field.minLength;
-			if (typeof field.maxLength === "number") extra.maxLength = field.maxLength;
-			if (typeof field.pattern === "string" && field.pattern) extra.pattern = field.pattern;
-		}
-		if (inputType === "number") {
-			if (typeof field.min === "number") extra.min = field.min;
-			if (typeof field.max === "number") extra.max = field.max;
-		}
-		return /* @__PURE__ */ jsxs("div", {
-			className: "fb-field",
-			children: [/* @__PURE__ */ jsx("label", {
-				htmlFor: inputId,
-				className: "form-label",
-				children: label
-			}), /* @__PURE__ */ jsx("input", {
-				id: inputId,
-				name: field.id,
-				type: inputType,
-				required,
-				placeholder: field.placeholder,
-				...extra,
-				className: "form-input"
-			})]
-		}, field.id);
-	};
+	const renderField = (field) => /* @__PURE__ */ jsx(FormFieldControl, { field }, field.id);
 	return /* @__PURE__ */ jsxs("div", {
 		...getIslandRootProps("form", blockId),
 		children: [/* @__PURE__ */ jsx(IslandPropsScript, { value: islandProps }), /* @__PURE__ */ jsxs("form", {
@@ -39537,9 +40174,173 @@ const FormNodeSSR = ({ blockId, value, submitLabel, successMessage, className, o
 	});
 };
 //#endregion
+//#region ../blocks/src/system/runtime/shared/components/FieldValidationMessage.tsx
+function getFieldValidationControlProps({ message, messageId, describedBy }) {
+	const hasMessage = Boolean(message);
+	const ariaDescribedBy = [describedBy, hasMessage ? messageId : void 0].filter((part) => typeof part === "string" && part.length > 0).join(" ");
+	return {
+		"aria-invalid": hasMessage ? "true" : void 0,
+		"aria-describedby": ariaDescribedBy || void 0
+	};
+}
+function FieldValidationMessage({ id, children, className, live = "assertive" }) {
+	return /* @__PURE__ */ jsx("p", {
+		id,
+		className,
+		"data-field-validation-message": true,
+		"data-field-validation-tone": "error",
+		role: "alert",
+		"aria-live": live === "off" ? void 0 : live,
+		children
+	});
+}
+var init_FieldValidationMessage = __esmMin((() => {}));
+//#endregion
+//#region ../blocks/src/system/runtime/nodes/newsletter-form.parts.tsx
+/** Splits the preset's fields into the email (joined with the button) and the rest. */
+function partitionNewsletterFields(fields) {
+	const email = fields.find((field) => field.type === "email") ?? null;
+	return {
+		email,
+		extra: fields.filter((field) => field !== email)
+	};
+}
+function NewsletterExtraField({ field, disabled, error }) {
+	const inputId = inputIdFor(field);
+	const errorId = `${inputId}-error`;
+	return /* @__PURE__ */ jsxs("div", {
+		className: "fb-field newsletter-field",
+		children: [
+			/* @__PURE__ */ jsx("label", {
+				htmlFor: inputId,
+				className: "rb-sr-only",
+				children: field.label
+			}),
+			/* @__PURE__ */ jsx("input", {
+				id: inputId,
+				name: field.id,
+				type: field.type,
+				required: field.required,
+				placeholder: field.placeholder ?? field.label,
+				className: "form-input",
+				disabled,
+				...getFieldValidationControlProps({
+					message: error,
+					messageId: errorId
+				})
+			}),
+			error ? /* @__PURE__ */ jsx(FieldValidationMessage, {
+				id: errorId,
+				className: "fb-error",
+				children: error
+			}) : null
+		]
+	});
+}
+/** The email field and submit button sharing one input-styled shell. */
+function NewsletterEmailEntry({ field, buttonVariant, buttonLabel, disabled, error }) {
+	const inputId = inputIdFor(field);
+	const errorId = `${inputId}-error`;
+	return /* @__PURE__ */ jsxs("div", {
+		className: "newsletter-entry",
+		children: [/* @__PURE__ */ jsxs("div", {
+			className: "form-input-group newsletter-entry-group",
+			children: [
+				/* @__PURE__ */ jsx("label", {
+					htmlFor: inputId,
+					className: "rb-sr-only",
+					children: field.label
+				}),
+				/* @__PURE__ */ jsx("input", {
+					id: inputId,
+					name: field.id,
+					type: "email",
+					required: field.required,
+					placeholder: field.placeholder ?? field.label,
+					className: "form-input-group-field",
+					autoComplete: "email",
+					disabled,
+					...getFieldValidationControlProps({
+						message: error,
+						messageId: errorId
+					})
+				}),
+				/* @__PURE__ */ jsx(ThemedButton, {
+					type: "submit",
+					variant: buttonVariant,
+					size: "md",
+					disabled,
+					label: buttonLabel
+				})
+			]
+		}), error ? /* @__PURE__ */ jsx(FieldValidationMessage, {
+			id: errorId,
+			className: "fb-error",
+			children: error
+		}) : null]
+	});
+}
+/**
+* The submit action: joined to the email field when the preset has one
+* (every current preset does), otherwise a plain themed button.
+*/
+function NewsletterSubmitRow({ emailField, buttonVariant, buttonLabel, disabled, error }) {
+	if (emailField) return /* @__PURE__ */ jsx(NewsletterEmailEntry, {
+		field: emailField,
+		buttonVariant,
+		buttonLabel,
+		disabled,
+		error
+	});
+	return /* @__PURE__ */ jsx("div", {
+		className: "newsletter-submit",
+		children: /* @__PURE__ */ jsx(ThemedButton, {
+			type: "submit",
+			variant: buttonVariant,
+			size: "md",
+			disabled,
+			label: buttonLabel
+		})
+	});
+}
+/** Visitor-chosen topics as toggle chips. Real checkboxes underneath. */
+function NewsletterTopicChips({ choices, disabled, error }) {
+	const errorId = `newsletter_${TOPIC_CHOICE_FIELD_ID}-error`;
+	return /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsxs("fieldset", {
+		className: "newsletter-topics",
+		"aria-describedby": error ? errorId : void 0,
+		children: [/* @__PURE__ */ jsx("legend", {
+			className: "newsletter-topics-legend",
+			children: "What would you like to hear about?"
+		}), /* @__PURE__ */ jsx("div", {
+			className: "newsletter-topic-chips",
+			children: choices.map((choice) => /* @__PURE__ */ jsxs("label", {
+				className: "newsletter-topic-chip",
+				children: [/* @__PURE__ */ jsx("input", {
+					type: "checkbox",
+					name: TOPIC_CHOICE_FIELD_ID,
+					value: choice.id,
+					disabled
+				}), /* @__PURE__ */ jsx("span", { children: choice.label })]
+			}, choice.id))
+		})]
+	}), error ? /* @__PURE__ */ jsx(FieldValidationMessage, {
+		id: errorId,
+		className: "fb-error",
+		children: error
+	}) : null] });
+}
+var TOPIC_CHOICE_FIELD_ID, inputIdFor;
+var init_newsletter_form_parts = __esmMin((() => {
+	init_ThemedButton();
+	init_FieldValidationMessage();
+	TOPIC_CHOICE_FIELD_ID = "mailingListChoice";
+	inputIdFor = (field) => `newsletter_${field.id}`;
+}));
+//#endregion
 //#region ../blocks/src/system/runtime/nodes/newsletter-form.server.tsx
 init_clsx();
-init_ThemedButton();
+init_newsletter_form_parts();
 init_newsletter_form_interactive();
 /**
 * Newsletter Form Server Component
@@ -39560,36 +40361,15 @@ function NewsletterFormSSR(props) {
 	});
 	const display = islandProps.render.display;
 	const fields = display.fields;
+	const submissionMessage = newsletterBlockSubmissionMessage(islandProps.render.hydration.target);
 	if (display.availability === "unavailable") return /* @__PURE__ */ jsx("div", {
 		className: clsx("newsletter-form-ssr", className),
 		children: /* @__PURE__ */ jsx("p", {
 			role: "status",
-			children: "We can’t accept signups right now. Please try again later."
+			children: NEWSLETTER_SIGNUPS_PAUSED_MESSAGE
 		})
 	});
-	const renderField = (field) => {
-		const inputId = `newsletter_${field.id}`;
-		return /* @__PURE__ */ jsxs("div", {
-			className: "fb-field newsletter-field",
-			children: [/* @__PURE__ */ jsxs("label", {
-				htmlFor: inputId,
-				className: "form-label",
-				children: [field.label, field.required && /* @__PURE__ */ jsx("span", {
-					className: "newsletter-required",
-					"aria-hidden": "true",
-					children: "*"
-				})]
-			}), /* @__PURE__ */ jsx("input", {
-				id: inputId,
-				name: field.id,
-				type: field.type,
-				required: field.required,
-				placeholder: field.placeholder,
-				className: "form-input",
-				autoComplete: field.type === "email" ? "email" : void 0
-			})]
-		}, field.id);
-	};
+	const { email: emailField, extra: extraFields } = partitionNewsletterFields(fields);
 	return /* @__PURE__ */ jsxs("div", {
 		...getIslandRootProps("newsletter-form", blockId),
 		className: clsx("newsletter-form-ssr", className),
@@ -39608,30 +40388,20 @@ function NewsletterFormSSR(props) {
 				/* @__PURE__ */ jsxs("div", {
 					className: "newsletter-form-fields",
 					children: [
-						fields.map(renderField),
-						islandProps.render.hydration.choicePresentation === "visitor_choice" ? /* @__PURE__ */ jsxs("fieldset", {
-							className: "fb-fieldset newsletter-topics",
-							children: [/* @__PURE__ */ jsx("legend", {
-								className: "form-label",
-								children: "What would you like to hear about?"
-							}), display.choices.map((choice) => /* @__PURE__ */ jsxs("label", {
-								className: "fb-inline form-label newsletter-topic-choice",
-								children: [/* @__PURE__ */ jsx("input", {
-									type: "checkbox",
-									name: "mailingListChoice",
-									value: choice.id,
-									className: "form-checkbox"
-								}), /* @__PURE__ */ jsx("span", { children: choice.label })]
-							}, choice.id))]
+						islandProps.render.hydration.choicePresentation === "visitor_choice" ? /* @__PURE__ */ jsx(NewsletterTopicChips, { choices: display.choices }) : null,
+						extraFields.length > 0 ? /* @__PURE__ */ jsx("div", {
+							className: "newsletter-extra-fields",
+							children: extraFields.map((field) => /* @__PURE__ */ jsx(NewsletterExtraField, { field }, field.id))
 						}) : null,
-						/* @__PURE__ */ jsx("div", {
-							className: "newsletter-submit",
-							children: /* @__PURE__ */ jsx(ThemedButton, {
-								type: "submit",
-								variant: display.buttonVariant,
-								size: "md",
-								label: display.buttonLabel
-							})
+						/* @__PURE__ */ jsx(NewsletterSubmitRow, {
+							emailField,
+							buttonVariant: display.buttonVariant,
+							buttonLabel: display.buttonLabel,
+							disabled: submissionMessage !== null
+						}),
+						submissionMessage && /* @__PURE__ */ jsx("p", {
+							role: "status",
+							children: submissionMessage
 						})
 					]
 				}),
@@ -44117,6 +44887,7 @@ var init_booking_form_headless_state = __esmMin((() => {
 	init_src$2();
 	init_dist$1();
 	init_booking_form_state();
+	init_booking_form_service_categories();
 	init_booking_form_validationErrors();
 	init_booking_form_field_values();
 	unsafeAsBookingFieldId = (id) => id;
@@ -44681,6 +45452,7 @@ function useHeadlessBookingFlow(options) {
 		data,
 		services: {
 			items: options.services,
+			categories: readServiceCategories(options),
 			selected: selectedService,
 			defaultServiceId,
 			requiresSelection: Boolean(options.requiresServiceSelection)
@@ -44745,6 +45517,9 @@ function useHeadlessBookingFlow(options) {
 		actions
 	};
 }
+function readServiceCategories(options) {
+	return options.serviceCategories ?? EMPTY_SERVICE_CATEGORIES;
+}
 function navigateToCheckout(checkoutUrl) {
 	window.location.href = checkoutUrl;
 }
@@ -44758,6 +45533,7 @@ function useLatestRef(value) {
 	}, [value]);
 	return ref;
 }
+var EMPTY_SERVICE_CATEGORIES;
 var init_useHeadlessBookingFlow = __esmMin((() => {
 	init_client();
 	init_src();
@@ -44773,6 +45549,7 @@ var init_useHeadlessBookingFlow = __esmMin((() => {
 	init_bookingPaymentOptions();
 	init_useHeadlessBookingFlow_state();
 	init_booking_form_validationErrors();
+	EMPTY_SERVICE_CATEGORIES = [];
 }));
 //#endregion
 //#region ../blocks/src/system/runtime/hooks/usePolling.state.ts
@@ -45411,28 +46188,6 @@ var init_DiscountCodeDisclosure = __esmMin((() => {
 	};
 }));
 //#endregion
-//#region ../blocks/src/system/runtime/shared/components/FieldValidationMessage.tsx
-function getFieldValidationControlProps({ message, messageId, describedBy }) {
-	const hasMessage = Boolean(message);
-	const ariaDescribedBy = [describedBy, hasMessage ? messageId : void 0].filter((part) => typeof part === "string" && part.length > 0).join(" ");
-	return {
-		"aria-invalid": hasMessage ? "true" : void 0,
-		"aria-describedby": ariaDescribedBy || void 0
-	};
-}
-function FieldValidationMessage({ id, children, className, live = "assertive" }) {
-	return /* @__PURE__ */ jsx("p", {
-		id,
-		className,
-		"data-field-validation-message": true,
-		"data-field-validation-tone": "error",
-		role: "alert",
-		"aria-live": live === "off" ? void 0 : live,
-		children
-	});
-}
-var init_FieldValidationMessage = __esmMin((() => {}));
-//#endregion
 //#region ../blocks/src/system/runtime/shared/components/BookingConsentAgreement.tsx
 function BookingConsentAgreement({ agreement, showTitle = true, title, titleId }) {
 	return /* @__PURE__ */ jsxs(Fragment, { children: [showTitle ? /* @__PURE__ */ jsxs("div", {
@@ -45457,10 +46212,102 @@ var init_BookingConsentAgreement = __esmMin((() => {
 	init_RichText();
 }));
 //#endregion
-//#region ../blocks/src/system/runtime/nodes/booking-form.default-ui.tsx
+//#region ../blocks/src/system/runtime/nodes/booking-form.service-choices.tsx
 function optionCardClassName(isSelected) {
 	return `rb-option-card${isSelected ? " rb-option-card--selected" : ""}`;
 }
+function SelectedCheck() {
+	return /* @__PURE__ */ jsx("div", {
+		className: "rb-option-check",
+		children: /* @__PURE__ */ jsx(CheckIcon, {})
+	});
+}
+/**
+* The service buttons. A site with no categories keeps its single grid; a
+* categorised site gets a heading per category, then "Other", above the same
+* grid (issue 1403). Empty categories are skipped, and there are no intros
+* here, to keep the step compact.
+*/
+function DefaultServiceChoices({ booking }) {
+	const layout = layoutServicesByCategory(booking.services.categories, booking.services.items.map((service) => ({
+		service,
+		categoryId: service.categoryId ?? null
+	})), { keepEmptyGroups: false });
+	switch (layout.kind) {
+		case "uncategorized-site": return /* @__PURE__ */ jsxs("div", {
+			className: "rb-reg-stack rb-reg-stack--sm",
+			children: [/* @__PURE__ */ jsx("span", {
+				className: "ab-subtitle",
+				children: "Service"
+			}), /* @__PURE__ */ jsx(ServiceChoiceGrid, {
+				booking,
+				choices: layout.services
+			})]
+		});
+		case "categorized-site": return /* @__PURE__ */ jsx("div", {
+			className: "rb-reg-stack",
+			children: [...layout.groups.map((group) => ({
+				key: group.category.id,
+				heading: group.category.name,
+				choices: group.services
+			})), ...layout.other.length > 0 ? [{
+				key: "other",
+				heading: "Other",
+				choices: layout.other
+			}] : []].map((group) => /* @__PURE__ */ jsxs("div", {
+				className: "rb-reg-stack rb-reg-stack--sm",
+				"data-booking-service-group": group.key,
+				children: [/* @__PURE__ */ jsx("h3", {
+					className: "ab-subtitle",
+					children: group.heading
+				}), /* @__PURE__ */ jsx(ServiceChoiceGrid, {
+					booking,
+					choices: group.choices
+				})]
+			}, group.key))
+		});
+		default: return assertNever$11(layout);
+	}
+}
+function ServiceChoiceGrid({ booking, choices }) {
+	const selectedServiceId = booking.services.selected?.id;
+	return /* @__PURE__ */ jsx("div", {
+		className: "rb-reg-grid",
+		children: choices.map(({ service }) => {
+			const isSelected = selectedServiceId === service.id;
+			return /* @__PURE__ */ jsxs("button", {
+				type: "button",
+				onClick: () => booking.actions.selectService(service.id),
+				className: optionCardClassName(isSelected),
+				"aria-pressed": isSelected,
+				children: [/* @__PURE__ */ jsxs("div", {
+					className: "rb-flex-1",
+					children: [
+						/* @__PURE__ */ jsx("div", {
+							className: "ab-subtitle",
+							children: service.title
+						}),
+						service.description ? /* @__PURE__ */ jsx("div", {
+							className: "ab-text rb-on-surface--muted",
+							children: service.description
+						}) : null,
+						service.durationMinutes ? /* @__PURE__ */ jsxs("div", {
+							className: "ab-text rb-on-surface--muted",
+							children: [service.durationMinutes, " minutes"]
+						}) : null
+					]
+				}), isSelected ? /* @__PURE__ */ jsx(SelectedCheck, {}) : null]
+			}, service.id);
+		})
+	});
+}
+var init_booking_form_service_choices = __esmMin((() => {
+	init_src$2();
+	init_dist$1();
+	init_CheckIcon$1();
+}));
+//#endregion
+//#region ../blocks/src/system/runtime/nodes/booking-form.default-ui.tsx
 function formatBookingAmount(amount, currency) {
 	return formatCurrencyAmount(amount, currency, { decimals: "auto" });
 }
@@ -45551,7 +46398,6 @@ function DefaultBookingStepContent({ booking, errorSummaryId }) {
 function DefaultServiceSelectionStep({ booking }) {
 	const services = booking.services.items;
 	const resources = booking.resources.items;
-	const selectedServiceId = booking.services.selected?.id;
 	const selectedResourceId = booking.resources.selectedResourceId;
 	const showServiceSelect = booking.services.requiresSelection || services.length > 1;
 	const showResourceSelect = booking.resources.requiresSelection || resources.length > 1;
@@ -45566,41 +46412,7 @@ function DefaultServiceSelectionStep({ booking }) {
 				className: "ab-text rb-on-surface--muted",
 				children: "Choose the service you'd like to book"
 			})] }),
-			showServiceSelect ? /* @__PURE__ */ jsxs("div", {
-				className: "rb-reg-stack rb-reg-stack--sm",
-				children: [/* @__PURE__ */ jsx("span", {
-					className: "ab-subtitle",
-					children: "Service"
-				}), /* @__PURE__ */ jsx("div", {
-					className: "rb-reg-grid",
-					children: services.map((service) => {
-						const isSelected = selectedServiceId === service.id;
-						return /* @__PURE__ */ jsxs("button", {
-							type: "button",
-							onClick: () => booking.actions.selectService(service.id),
-							className: optionCardClassName(isSelected),
-							"aria-pressed": isSelected,
-							children: [/* @__PURE__ */ jsxs("div", {
-								className: "rb-flex-1",
-								children: [
-									/* @__PURE__ */ jsx("div", {
-										className: "ab-subtitle",
-										children: service.title
-									}),
-									service.description ? /* @__PURE__ */ jsx("div", {
-										className: "ab-text rb-on-surface--muted",
-										children: service.description
-									}) : null,
-									service.durationMinutes ? /* @__PURE__ */ jsxs("div", {
-										className: "ab-text rb-on-surface--muted",
-										children: [service.durationMinutes, " minutes"]
-									}) : null
-								]
-							}), isSelected ? /* @__PURE__ */ jsx(SelectedCheck, {}) : null]
-						}, service.id);
-					})
-				})]
-			}) : null,
+			showServiceSelect ? /* @__PURE__ */ jsx(DefaultServiceChoices, { booking }) : null,
 			booking.resources.state.tag === "loading" ? /* @__PURE__ */ jsxs("div", {
 				className: "ab-center",
 				children: [/* @__PURE__ */ jsx(SpinnerNode, {
@@ -45990,7 +46802,7 @@ function DefaultFieldInput({ describedBy, error, errorId, field, onBlur, onChang
 		case "radio": return /* @__PURE__ */ jsx("div", {
 			className: "rb-space-y-2",
 			children: field.field.options?.map((option) => /* @__PURE__ */ jsxs("label", {
-				className: "rb-flex rb-items-center rb-gap-2 rb-cursor-pointer",
+				className: "form-check",
 				children: [/* @__PURE__ */ jsx("input", {
 					type: "radio",
 					name: field.id,
@@ -46002,7 +46814,7 @@ function DefaultFieldInput({ describedBy, error, errorId, field, onBlur, onChang
 					...validationProps,
 					className: "form-radio"
 				}), /* @__PURE__ */ jsx("span", {
-					className: "rb-caption",
+					className: "form-check-label",
 					children: option.label
 				})]
 			}, option.value))
@@ -46012,47 +46824,20 @@ function DefaultFieldInput({ describedBy, error, errorId, field, onBlur, onChang
 				const checkedValues = toStringArray(value);
 				return /* @__PURE__ */ jsx("div", {
 					className: "rb-space-y-2",
-					children: field.field.options.map((option) => /* @__PURE__ */ jsxs("label", {
-						className: "rb-flex rb-items-center rb-gap-2 rb-cursor-pointer",
-						children: [/* @__PURE__ */ jsx("input", {
-							type: "checkbox",
-							name: field.id,
-							value: option.value,
-							checked: checkedValues.includes(option.value),
-							onChange: (event) => {
-								onChange(event.target.checked ? [...checkedValues, option.value] : checkedValues.filter((item) => item !== option.value));
-							},
-							onBlur,
-							...validationProps,
-							className: "form-checkbox"
-						}), /* @__PURE__ */ jsx("span", {
-							className: "rb-caption",
-							children: option.label
-						})]
+					children: field.field.options.map((option) => /* @__PURE__ */ jsx(CheckboxChoice, {
+						name: field.id,
+						value: option.value,
+						checked: checkedValues.includes(option.value),
+						onChange: (event) => {
+							onChange(event.target.checked ? [...checkedValues, option.value] : checkedValues.filter((item) => item !== option.value));
+						},
+						onBlur,
+						...validationProps,
+						label: option.label
 					}, option.value))
 				});
 			}
-			return /* @__PURE__ */ jsxs("label", {
-				className: "rb-flex rb-items-center rb-gap-2 rb-cursor-pointer",
-				children: [/* @__PURE__ */ jsx("input", {
-					type: "checkbox",
-					id: field.inputId,
-					name: field.id,
-					checked: Boolean(value),
-					onChange: (event) => onChange(event.target.checked),
-					onBlur,
-					required: field.required,
-					...validationProps,
-					className: "form-checkbox"
-				}), /* @__PURE__ */ jsx("span", {
-					className: "rb-caption",
-					children: field.field.placeholder || field.label
-				})]
-			});
-		case "booking_requirement_consent": return /* @__PURE__ */ jsxs("label", {
-			className: "rb-flex rb-items-start rb-gap-2 rb-cursor-pointer",
-			children: [/* @__PURE__ */ jsx("input", {
-				type: "checkbox",
+			return /* @__PURE__ */ jsx(CheckboxChoice, {
 				id: field.inputId,
 				name: field.id,
 				checked: Boolean(value),
@@ -46060,11 +46845,18 @@ function DefaultFieldInput({ describedBy, error, errorId, field, onBlur, onChang
 				onBlur,
 				required: field.required,
 				...validationProps,
-				className: "form-checkbox rb-mt-0.5"
-			}), /* @__PURE__ */ jsx("span", {
-				className: "rb-caption",
-				children: field.field.checkboxLabel
-			})]
+				label: field.field.placeholder || field.label
+			});
+		case "booking_requirement_consent": return /* @__PURE__ */ jsx(CheckboxChoice, {
+			id: field.inputId,
+			name: field.id,
+			checked: Boolean(value),
+			onChange: (event) => onChange(event.target.checked),
+			onBlur,
+			required: field.required,
+			...validationProps,
+			label: field.field.checkboxLabel,
+			presentation: "tile"
 		});
 		case "number": return /* @__PURE__ */ jsx("input", {
 			...commonProps,
@@ -46179,12 +46971,6 @@ function DefaultBookingErrorSummary({ errors, id }) {
 		children: [errors.formError ? /* @__PURE__ */ jsx("p", { children: /* @__PURE__ */ jsx("strong", { children: errors.formError }) }) : null, Object.entries(errors.fieldErrors).map(([key, message]) => /* @__PURE__ */ jsx("p", { children: message }, key))]
 	});
 }
-function SelectedCheck() {
-	return /* @__PURE__ */ jsx("div", {
-		className: "rb-option-check",
-		children: /* @__PURE__ */ jsx(CheckIcon, {})
-	});
-}
 var init_booking_form_default_ui = __esmMin((() => {
 	init_src$2();
 	init_ThemedButton();
@@ -46194,12 +46980,13 @@ var init_booking_form_default_ui = __esmMin((() => {
 	init_DatePicker();
 	init_TimeSlotSelector();
 	init_spinner$1();
-	init_CheckIcon$1();
 	init_StepIndicator$1();
 	init_FeedbackMessage();
 	init_DiscountCodeDisclosure();
 	init_FieldValidationMessage();
 	init_BookingConsentAgreement();
+	init_CheckboxChoice();
+	init_booking_form_service_choices();
 }));
 //#endregion
 //#region ../blocks/src/system/runtime/shared/utils/checkoutUrls.ts
@@ -46665,6 +47452,7 @@ var init_SelectableOptionCard = __esmMin((() => {}));
 //#endregion
 //#region ../blocks/src/system/runtime/shared/components/index.ts
 var init_components = __esmMin((() => {
+	init_CheckboxChoice();
 	init_CheckIcon$1();
 	init_ClockIcon();
 	init_CrossIcon();
@@ -46758,6 +47546,7 @@ var init_booking_form_client = __esmMin((() => {
 			formId: render.hydration.formId ?? form?.id ?? "booking-form",
 			form,
 			services,
+			serviceCategories: render.hydration.serviceCategories,
 			initialServiceId,
 			initialResourceId,
 			initialData: render.hydration.initialData ?? void 0,
@@ -51666,26 +52455,24 @@ function EventConsentField({ consent, error, formData, idBase, onChange }) {
 				title: consent.title,
 				titleId: `${idBase}-consent-title`
 			}),
-			/* @__PURE__ */ jsxs("label", {
-				className: "er-label rb-flex rb-items-start rb-gap-2 rb-cursor-pointer",
-				children: [
-					/* @__PURE__ */ jsx("input", {
-						"aria-describedby": error ? errorId : void 0,
-						className: "form-checkbox rb-mt-0.5",
-						checked: formData.consentAccepted === true,
-						onChange: (event) => onChange({
-							...formData,
-							consentAccepted: event.target.checked
-						}),
-						type: "checkbox"
-					}),
+			/* @__PURE__ */ jsx(CheckboxChoice, {
+				"aria-describedby": error ? errorId : void 0,
+				"aria-invalid": error ? true : void 0,
+				checked: formData.consentAccepted === true,
+				onChange: (event) => onChange({
+					...formData,
+					consentAccepted: event.target.checked
+				}),
+				label: /* @__PURE__ */ jsxs(Fragment, { children: [
 					consent.checkboxLabel,
 					" ",
 					/* @__PURE__ */ jsx("span", {
 						className: "er-required",
 						children: "*"
 					})
-				]
+				] }),
+				presentation: "tile",
+				className: "er-consent-check"
 			}),
 			error ? /* @__PURE__ */ jsx(FieldValidationMessage, {
 				id: errorId,
@@ -51721,6 +52508,7 @@ var init_AttendeeDetailsStep = __esmMin((() => {
 	init_LoggedInAsUser();
 	init_FieldValidationMessage();
 	init_BookingConsentAgreement();
+	init_CheckboxChoice();
 	AttendeeDetailsStep = ({ formData, onChange, errors, emailLocked = false, onLogout, ticketsCount = 1, requireGuestDetails = false, guests = [], onGuestsChange, guestErrors = {}, guestSectionShake = false, onGuestShakeEnd, consent }) => {
 		const idBase = useId();
 		const nameId = `${idBase}-name`;
@@ -107840,7 +108628,7 @@ var init_event_registration_client = __esmMin((() => {
 * Loads Leaflet CSS/JS from CDN to avoid bundling in the blocks package.
 */
 function isLeafletApi(value) {
-	if (!isRecord$15(value)) return false;
+	if (!isRecord$16(value)) return false;
 	return typeof value.map === "function" && typeof value.tileLayer === "function" && typeof value.marker === "function";
 }
 function loadLeaflet() {
@@ -116107,6 +116895,7 @@ var init_form_client = __esmMin((() => {
 	init_useFormSubmission();
 	init_ThemedButton();
 	init_FeedbackMessage();
+	init_form_fields();
 	FormNodeClient = ({ render }) => {
 		const form = render.display.form;
 		const { submit, state } = useFormSubmission();
@@ -116119,107 +116908,7 @@ var init_form_client = __esmMin((() => {
 			children: "Missing or unknown form."
 		});
 		const groups = render.display.groups;
-		const renderField = (field) => {
-			const inputId = `f_${field.id}`;
-			const label = String(field.label ?? field.id);
-			const required = Boolean(field.required);
-			const type = String(field.type ?? "text");
-			if (type === "textarea") return /* @__PURE__ */ jsxs("div", {
-				className: "fb-field",
-				children: [/* @__PURE__ */ jsx("label", {
-					htmlFor: inputId,
-					className: "form-label",
-					children: label
-				}), /* @__PURE__ */ jsx("textarea", {
-					id: inputId,
-					name: field.id,
-					required,
-					placeholder: field.placeholder,
-					rows: field.rows,
-					className: "form-textarea"
-				})]
-			}, field.id);
-			if (type === "select") {
-				const options = field.options ?? [];
-				const multiple = Boolean(field.multiple);
-				return /* @__PURE__ */ jsxs("div", {
-					className: "fb-field",
-					children: [/* @__PURE__ */ jsx("label", {
-						htmlFor: inputId,
-						className: "form-label",
-						children: label
-					}), /* @__PURE__ */ jsxs("select", {
-						id: inputId,
-						name: field.id,
-						multiple,
-						required,
-						className: "form-select",
-						children: [!multiple && /* @__PURE__ */ jsx("option", {
-							value: "",
-							children: "Select…"
-						}), options.map((opt) => /* @__PURE__ */ jsx("option", {
-							value: opt.value,
-							children: opt.label
-						}, opt.value))]
-					})]
-				}, field.id);
-			}
-			if (type === "radio") {
-				const options = field.options ?? [];
-				return /* @__PURE__ */ jsxs("fieldset", {
-					className: "fb-fieldset",
-					children: [/* @__PURE__ */ jsx("legend", {
-						className: "form-label",
-						children: label
-					}), options.map((opt) => /* @__PURE__ */ jsxs("label", {
-						className: "fb-inline form-label",
-						children: [/* @__PURE__ */ jsx("input", {
-							type: "radio",
-							name: field.id,
-							value: opt.value,
-							required,
-							className: "form-radio"
-						}), /* @__PURE__ */ jsx("span", { children: opt.label })]
-					}, opt.value))]
-				}, field.id);
-			}
-			if (type === "checkbox" || type === "consent") return /* @__PURE__ */ jsxs("label", {
-				className: "fb-inline form-label",
-				children: [/* @__PURE__ */ jsx("input", {
-					type: "checkbox",
-					name: field.id,
-					required,
-					className: "form-checkbox"
-				}), /* @__PURE__ */ jsx("span", { children: label })]
-			}, field.id);
-			const inputType = type === "email" || type === "url" || type === "tel" || type === "number" ? type : "text";
-			const extra = {};
-			if (inputType === "text" || inputType === "email" || inputType === "url" || inputType === "tel") {
-				if (typeof field.minLength === "number") extra.minLength = field.minLength;
-				if (typeof field.maxLength === "number") extra.maxLength = field.maxLength;
-				if (typeof field.pattern === "string" && field.pattern) extra.pattern = field.pattern;
-			}
-			if (inputType === "number") {
-				if (typeof field.min === "number") extra.min = field.min;
-				if (typeof field.max === "number") extra.max = field.max;
-			}
-			return /* @__PURE__ */ jsxs("div", {
-				className: "fb-field",
-				children: [/* @__PURE__ */ jsx("label", {
-					htmlFor: inputId,
-					className: "form-label",
-					children: label
-				}), /* @__PURE__ */ jsx("input", {
-					id: inputId,
-					name: field.id,
-					type: inputType,
-					required,
-					placeholder: field.placeholder,
-					...extra,
-					className: "form-input"
-				})]
-			}, field.id);
-		};
+		const renderField = (field) => /* @__PURE__ */ jsx(FormFieldControl, { field }, field.id);
 		const handleSubmit = async (e) => {
 			e.preventDefault();
 			const formData = new FormData(e.currentTarget);
@@ -116478,6 +117167,16 @@ var init_newsletter_form_client_state = __esmMin((() => {
 }));
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/newsletter-form.submission.ts
+/**
+* Logs a refusal with its reason so a QA session can tell the cases apart in
+* the console, since the visitor-facing copy deliberately does not.
+*/
+function reportNewsletterSignupRefusal(reason, detail = {}) {
+	console.warn("[newsletter-form] Signup refused before sending", {
+		reason,
+		...detail
+	});
+}
 function mapNewsletterFormFieldsToSubscriberInput(fields) {
 	return {
 		email: readSubmittedText(fields.email),
@@ -116498,7 +117197,11 @@ function resolveNewsletterSubmitTarget(input) {
 		case "signed-footer-source": return publishedSourceTarget(input.sourceRef);
 		case "preview": return {
 			tag: "unavailable",
-			reason: "missing_block_source"
+			reason: "preview_only_source"
+		};
+		case "unpublished-preview": return {
+			tag: "unavailable",
+			reason: "preview_only_source"
 		};
 		default: return assertNever$22(input);
 	}
@@ -116522,6 +117225,7 @@ var init_newsletter_form_submission = __esmMin((() => {
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/newsletter-form.client.tsx
 function NewsletterFormClient({ render }) {
+	const submissionMessage = newsletterBlockSubmissionMessage(render.hydration.target);
 	const api = useBlockApi();
 	const [submissionState, dispatchSubmission] = useReducer(newsletterFormSubmissionReducer, initialNewsletterFormSubmissionState);
 	const [altchaSolution, setAltchaSolution] = useState(null);
@@ -116531,7 +117235,6 @@ function NewsletterFormClient({ render }) {
 		if (succeeded) successRef.current?.focus();
 	}, [succeeded]);
 	const showSpamProtection = render.hydration.spamProtectionEnabled ?? isSpamProtectionEnabled();
-	const fields = render.display.fields;
 	const handleSubmit = async (e) => {
 		e.preventDefault();
 		const formData = new FormData(e.currentTarget);
@@ -116560,22 +117263,33 @@ function NewsletterFormClient({ render }) {
 		}
 		const submitTarget = resolveNewsletterSubmitTarget(render.hydration.target);
 		if (submitTarget.tag === "unavailable") {
+			reportNewsletterSignupRefusal(submitTarget.reason, { target: render.hydration.target });
+			dispatchSubmission({
+				type: "failed",
+				error: newsletterFormError(NEWSLETTER_SIGNUPS_PAUSED_MESSAGE)
+			});
+			return;
+		}
+		if (render.hydration.setupRevision === null) {
+			reportNewsletterSignupRefusal("setup_not_configured");
 			dispatchSubmission({
 				type: "failed",
-				error: newsletterFormError(SIGNUPS_PAUSED_MESSAGE)
+				error: newsletterFormError(NEWSLETTER_SIGNUPS_PAUSED_MESSAGE)
 			});
 			return;
 		}
-		if (render.hydration.setupRevision === null || render.display.availability === "unavailable") {
+		if (render.display.availability === "unavailable") {
+			reportNewsletterSignupRefusal("destination_unavailable", { setupRevision: render.hydration.setupRevision });
 			dispatchSubmission({
 				type: "failed",
-				error: newsletterFormError(SIGNUPS_PAUSED_MESSAGE)
+				error: newsletterFormError(NEWSLETTER_SIGNUPS_PAUSED_MESSAGE)
 			});
 			return;
 		}
 		const selection = readVisitorSelection(formData, render.hydration);
 		const selectionError = visitorSelectionError(selection);
 		if (selectionError) {
+			if (selection.tag === "unusable") reportNewsletterSignupRefusal("choices_unusable", { choiceProvider: render.hydration.choiceProvider });
 			dispatchSubmission({
 				type: "failed",
 				error: selectionError
@@ -116643,43 +117357,14 @@ function NewsletterFormClient({ render }) {
 					autoComplete: "off",
 					"aria-hidden": "true"
 				}),
-				/* @__PURE__ */ jsxs("div", {
-					className: "newsletter-form-fields",
-					children: [
-						fields.map((field) => /* @__PURE__ */ jsx(NewsletterField, {
-							field,
-							submitting,
-							error: getNewsletterSubmissionFieldError(submissionState, field.id)
-						}, field.id)),
-						render.hydration.choicePresentation === "visitor_choice" ? /* @__PURE__ */ jsx(NewsletterTopicChoices, {
-							choices: render.display.choices,
-							submitting,
-							error: getNewsletterSubmissionFieldError(submissionState, TOPIC_CHOICE_FIELD_ID)
-						}) : null,
-						showSpamProtection && /* @__PURE__ */ jsx("div", {
-							className: "newsletter-altcha",
-							children: /* @__PURE__ */ jsx(AltchaWidget, {
-								challengeUrl: getChallengeUrl(),
-								onSolutionChange: setAltchaSolution
-							})
-						}),
-						formError && /* @__PURE__ */ jsx(FeedbackMessage, {
-							tone: "error",
-							className: "fb-error",
-							role: "alert",
-							children: formError
-						}),
-						/* @__PURE__ */ jsx("div", {
-							className: "newsletter-submit",
-							children: /* @__PURE__ */ jsx(ThemedButton, {
-								type: "submit",
-								variant: render.display.buttonVariant,
-								size: "md",
-								disabled: submitting,
-								label: submitting ? "Subscribing..." : render.display.buttonLabel
-							})
-						})
-					]
+				/* @__PURE__ */ jsx(NewsletterFormFields, {
+					render,
+					submissionState,
+					submitting,
+					submissionMessage,
+					formError,
+					showSpamProtection,
+					onAltchaSolution: setAltchaSolution
 				}),
 				render.display.privacyNote && /* @__PURE__ */ jsx("p", {
 					className: "newsletter-privacy-note",
@@ -116689,67 +117374,52 @@ function NewsletterFormClient({ render }) {
 		})
 	});
 }
-function NewsletterField({ field, submitting, error }) {
-	const inputId = `newsletter_${field.id}`;
-	const errorId = `${inputId}-error`;
+function NewsletterFormFields({ render, submissionState, submitting, submissionMessage, formError, showSpamProtection, onAltchaSolution }) {
+	const { email: emailField, extra: extraFields } = partitionNewsletterFields(render.display.fields);
+	const fieldError = (id) => getNewsletterSubmissionFieldError(submissionState, id);
 	return /* @__PURE__ */ jsxs("div", {
-		className: "fb-field newsletter-field",
+		className: "newsletter-form-fields",
 		children: [
-			/* @__PURE__ */ jsxs("label", {
-				htmlFor: inputId,
-				className: "form-label",
-				children: [field.label, field.required && /* @__PURE__ */ jsx("span", {
-					className: "newsletter-required",
-					"aria-hidden": "true",
-					children: "*"
-				})]
-			}),
-			/* @__PURE__ */ jsx("input", {
-				id: inputId,
-				name: field.id,
-				type: field.type,
-				required: field.required,
-				placeholder: field.placeholder,
-				className: "form-input",
-				autoComplete: field.type === "email" ? "email" : void 0,
+			render.hydration.choicePresentation === "visitor_choice" ? /* @__PURE__ */ jsx(NewsletterTopicChips, {
+				choices: render.display.choices,
 				disabled: submitting,
-				...getFieldValidationControlProps({
-					message: error,
-					messageId: errorId
+				error: fieldError(TOPIC_CHOICE_FIELD_ID)
+			}) : null,
+			extraFields.length > 0 ? /* @__PURE__ */ jsx("div", {
+				className: "newsletter-extra-fields",
+				children: extraFields.map((field) => /* @__PURE__ */ jsx(NewsletterExtraField, {
+					field,
+					disabled: submitting,
+					error: fieldError(field.id)
+				}, field.id))
+			}) : null,
+			showSpamProtection && /* @__PURE__ */ jsx("div", {
+				className: "newsletter-altcha",
+				children: /* @__PURE__ */ jsx(AltchaWidget, {
+					challengeUrl: getChallengeUrl(),
+					onSolutionChange: onAltchaSolution
 				})
 			}),
-			error && /* @__PURE__ */ jsx(FieldValidationMessage, {
-				id: errorId,
+			formError && /* @__PURE__ */ jsx(FeedbackMessage, {
+				tone: "error",
 				className: "fb-error",
-				children: error
+				role: "alert",
+				children: formError
+			}),
+			/* @__PURE__ */ jsx(NewsletterSubmitRow, {
+				emailField,
+				buttonVariant: render.display.buttonVariant,
+				buttonLabel: submitting ? "Subscribing..." : render.display.buttonLabel,
+				disabled: submitting || submissionMessage !== null,
+				error: emailField ? fieldError(emailField.id) : null
+			}),
+			submissionMessage && /* @__PURE__ */ jsx("p", {
+				role: "status",
+				children: submissionMessage
 			})
 		]
 	});
 }
-function NewsletterTopicChoices({ choices, submitting, error }) {
-	const errorId = `newsletter_${TOPIC_CHOICE_FIELD_ID}-error`;
-	return /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsxs("fieldset", {
-		className: "fb-fieldset newsletter-topics",
-		"aria-describedby": error ? errorId : void 0,
-		children: [/* @__PURE__ */ jsx("legend", {
-			className: "form-label",
-			children: "What would you like to hear about?"
-		}), choices.map((choice) => /* @__PURE__ */ jsxs("label", {
-			className: "fb-inline form-label newsletter-topic-choice",
-			children: [/* @__PURE__ */ jsx("input", {
-				type: "checkbox",
-				name: TOPIC_CHOICE_FIELD_ID,
-				value: choice.id,
-				className: "form-checkbox",
-				disabled: submitting
-			}), /* @__PURE__ */ jsx("span", { children: choice.label })]
-		}, choice.id))]
-	}), error && /* @__PURE__ */ jsx(FieldValidationMessage, {
-		id: errorId,
-		className: "fb-error",
-		children: error
-	})] });
-}
 function UnavailableNewsletterForm({ className }) {
 	return /* @__PURE__ */ jsx("div", {
 		className: clsx("newsletter-form", className ?? void 0),
@@ -116757,7 +117427,7 @@ function UnavailableNewsletterForm({ className }) {
 			tone: "error",
 			className: "fb-error",
 			role: "status",
-			children: SIGNUPS_PAUSED_MESSAGE
+			children: NEWSLETTER_SIGNUPS_PAUSED_MESSAGE
 		})
 	});
 }
@@ -116777,7 +117447,7 @@ function transportFailureMessage(err) {
 function visitorSelectionError(selection) {
 	switch (selection.tag) {
 		case "nothing_chosen": return newsletterFieldError(TOPIC_CHOICE_FIELD_ID, "Choose at least one email topic.");
-		case "unusable": return newsletterFormError(SIGNUPS_PAUSED_MESSAGE);
+		case "unusable": return newsletterFormError(NEWSLETTER_SIGNUPS_PAUSED_MESSAGE);
 		case "not_offered":
 		case "chosen": return null;
 	}
@@ -116809,7 +117479,7 @@ function publicSignupError(outcome) {
 		case "unavailable": switch (outcome.reason) {
 			case "configuration_unavailable":
 			case "authentication_failed":
-			case "target_unavailable": return SIGNUPS_PAUSED_MESSAGE;
+			case "target_unavailable": return NEWSLETTER_SIGNUPS_PAUSED_MESSAGE;
 			case "stale_configuration": return "This signup form has changed. Refresh the page, then try again.";
 			case "rate_limited": return TOO_MANY_ATTEMPTS_MESSAGE;
 			case "temporarily_unavailable": return RETRY_SHORTLY_MESSAGE;
@@ -116817,20 +117487,18 @@ function publicSignupError(outcome) {
 		case "uncertain": return "We could not confirm whether your signup completed. Please wait a moment, then try again.";
 	}
 }
-var TOPIC_CHOICE_FIELD_ID, SIGNUPS_PAUSED_MESSAGE, RETRY_SHORTLY_MESSAGE, TOO_MANY_ATTEMPTS_MESSAGE;
+var RETRY_SHORTLY_MESSAGE, TOO_MANY_ATTEMPTS_MESSAGE;
 var init_newsletter_form_client = __esmMin((() => {
 	init_clsx();
 	init_client();
 	init_src();
 	init_api$1();
 	init_src$2();
-	init_ThemedButton();
 	init_FeedbackMessage();
-	init_FieldValidationMessage();
+	init_newsletter_form_parts();
 	init_newsletter_form_client_state();
 	init_newsletter_form_submission();
-	TOPIC_CHOICE_FIELD_ID = "mailingListChoice";
-	SIGNUPS_PAUSED_MESSAGE = "We can’t accept signups right now. Please try again later.";
+	init_newsletter_form_interactive();
 	RETRY_SHORTLY_MESSAGE = "We couldn’t confirm your signup. Please try again in a little while.";
 	TOO_MANY_ATTEMPTS_MESSAGE = "There have been too many signup attempts. Please wait a moment and try again.";
 }));
@@ -117058,6 +117726,10 @@ init_surfaces();
 //#region ../theme-core/src/accordions/defaults.ts
 init_curatedSiteStyles();
 //#endregion
+//#region ../theme-core/src/inputs/checkable.ts
+init_colorTokenParts();
+init_colorStyles();
+//#endregion
 //#region ../theme-core/src/inputs/generateInputCss.ts
 init_types$11();
 init_constants$2();
@@ -117086,17 +117758,12 @@ init_paintTargets();
 //#region ../theme-core/src/footer/generateFooterCss.ts
 init_resolver$1();
 //#endregion
+//#region ../theme-core/src/layout/boundaryCss.ts
+init_sectionTransitions();
+init_transitionCatalogue();
+//#endregion
 //#region ../theme-core/src/layout/generateLayoutCss.ts
 init_breakpoints();
-init_sectionTransitions();
-svgDataUrl("<svg viewBox='0 0 1440 72' xmlns='http://www.w3.org/2000/svg' preserveAspectRatio='none'><path d='M0 72V46C130 55 260 24 420 30C590 36 690 62 860 42C1035 21 1160 47 1305 36C1365 31 1415 33 1440 38V72H0Z' fill='white'/></svg>");
-svgDataUrl("<svg viewBox='0 0 1440 72' xmlns='http://www.w3.org/2000/svg' preserveAspectRatio='none'><path d='M0 72V42C120 24 240 24 360 42C480 60 600 60 720 42C840 24 960 24 1080 42C1200 60 1320 60 1440 42V72H0Z' fill='white'/></svg>");
-svgDataUrl("<svg viewBox='0 0 1440 72' xmlns='http://www.w3.org/2000/svg' preserveAspectRatio='none'><path d='M0 72V43C180 32 300 32 480 43C660 54 780 54 960 43C1140 32 1260 32 1440 43V72H0Z' fill='white'/></svg>");
-svgDataUrl("<svg viewBox='0 0 1440 72' xmlns='http://www.w3.org/2000/svg' preserveAspectRatio='none'><path d='M0 72V44C90 14 270 14 360 44C450 74 630 74 720 44C810 14 990 14 1080 44C1170 74 1350 74 1440 44V72H0Z' fill='white'/></svg>");
-svgDataUrl("<svg viewBox='0 0 1440 72' xmlns='http://www.w3.org/2000/svg' preserveAspectRatio='none'><path d='M0 72V39C115 31 205 54 340 48C505 41 610 16 760 33C920 51 1015 64 1160 44C1280 27 1375 35 1440 50V72H0Z' fill='white'/></svg>");
-function svgDataUrl(svg) {
-	return `data:image/svg+xml,${encodeURIComponent(svg)}`;
-}
 //#endregion
 //#region ../theme-core/src/status/generateStatusCss.ts
 init_surfaces();