@riverbankcms/sdk 0.145.0 → 0.146.0

package/dist/client/rendering.mjs

@@ -1619,7 +1619,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
@@ -2003,6 +2004,27 @@ var init_mailing_list_setup_parser = __esmMin((() => {
 	init_mailing_list_identifiers();
 	init_result$1();
 }));
+//#endregion
+//#region ../core/src/mailing-list-targeting.ts
+function sameMailingListPlacementTargeting(left, right) {
+	if (left.mode !== right.mode) return false;
+	if (left.mode === "default" || right.mode === "default") return true;
+	if (left.provider !== right.provider || left.selection.tag !== right.selection.tag) return false;
+	if (left.provider === "mailchimp" && (right.provider !== "mailchimp" || left.audienceId !== right.audienceId)) return false;
+	return sameIds(targetingSelectionIds(left), targetingSelectionIds(right));
+}
+function targetingSelectionIds(targeting) {
+	switch (targeting.provider) {
+		case "native": return targeting.selection.tag === "fixed" ? targeting.selection.topicIds : targeting.selection.offeredTopicIds;
+		case "brevo": return targeting.selection.tag === "fixed" ? targeting.selection.listIds : targeting.selection.offeredListIds;
+		case "mailchimp": return targeting.selection.tag === "fixed" ? targeting.selection.interestIds : targeting.selection.offeredInterestIds;
+	}
+}
+function sameIds(left, right) {
+	const leftIds = new Set(left);
+	const rightIds = new Set(right);
+	return leftIds.size === left.length && rightIds.size === right.length && leftIds.size === rightIds.size && [...leftIds].every((id) => rightIds.has(id));
+}
 function planMailingListChoicePresentation(targeting) {
 	if (targeting.mode === "default" || targeting.selection.tag === "fixed") return { tag: "hidden" };
 	switch (targeting.provider) {
@@ -2751,6 +2773,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();
@@ -13636,7 +13659,7 @@ var init_bookingConsent = __esmMin((() => {
 		checkboxLabel: z$1.string().min(1)
 	});
 	bookingConsentCarrierSchema = z$1.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();
@@ -13660,6 +13683,7 @@ var init_schemas = __esmMin((() => {
 		seriesSlug: z$1.string().optional(),
 		includeOccurrenceId: z$1.string().optional(),
 		readIntent: z$1.string().optional(),
+		detailAdmission: z$1.string().optional(),
 		detailLevel: z$1.string().optional(),
 		readProfile: z$1.string().optional()
 	};
@@ -13817,11 +13841,11 @@ var init_schemas = __esmMin((() => {
 			"series_archived",
 			"parent_archived",
 			"parent_inconsistent",
-			"not_public",
 			"already_started",
 			"enrollment_closed"
 		])
 	})]);
+	publicEventBookingClosedDetailSchema = z$1.discriminatedUnion("kind", [z$1.object({ kind: z$1.literal("opensSoon") }), z$1.object({ kind: z$1.literal("paused") })]);
 	publicRunSessionSchema = z$1.object({
 		occurrenceId: z$1.string(),
 		startsAt: z$1.string(),
@@ -13863,6 +13887,7 @@ var init_schemas = __esmMin((() => {
 		destination: publicEventDestinationSchema,
 		requiresRegistration: z$1.boolean(),
 		bookingAvailability: publicEventBookingAvailabilitySchema,
+		bookingClosedDetail: publicEventBookingClosedDetailSchema.optional(),
 		deliveryMode: z$1.enum([
 			"in_person",
 			"online",
@@ -30043,7 +30068,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$20(reason);
@@ -32879,6 +32903,7 @@ var init_social = __esmMin((() => {
 		"SocialInstagram",
 		"SocialLinkedIn",
 		"SocialTikTok",
+		"SocialWhatsApp",
 		"SocialX",
 		"SocialYouTube"
 	];
@@ -32915,6 +32940,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" })] }))
 	};
@@ -35186,6 +35212,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 : {
@@ -35211,16 +35242,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$20(source.newsletterBlockSubmission);
 		}
 		case "signed-footer": return {
 			tag: "signed-footer-source",
@@ -35289,6 +35325,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" }
 	};
@@ -35312,13 +35349,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$1.unknown().transform((value, ctx) => {
 		const parsed = parseMailingListRuntimeContext(value);
@@ -35359,6 +35397,11 @@ var init_newsletter_form_interactive = __esmMin((() => {
 		});
 		return z$1.NEVER;
 	});
+	mailingListSignupBlockSourceRefSchema = z$1.object({
+		tag: z$1.literal("block_ref"),
+		blockId: mailingListSignupBlockIdSchema,
+		contentVersionId: mailingListContentVersionIdSchema
+	});
 	signedMailingListSourceTokenSchema = z$1.string().trim().min(1).transform(parseRequiredMailingListSignedSourceToken);
 	newsletterSourceCommonSchema = z$1.object({
 		siteId: z$1.string().optional(),
@@ -35373,7 +35416,15 @@ var init_newsletter_form_interactive = __esmMin((() => {
 		newsletterSourceCommonSchema.extend({
 			source: z$1.literal("block"),
 			blockId: z$1.string().nullable().optional(),
-			contentVersionId: z$1.string().nullable().optional()
+			newsletterBlockSubmission: z$1.discriminatedUnion("tag", [
+				z$1.object({
+					tag: z$1.literal("ready"),
+					sourceRef: mailingListSignupBlockSourceRefSchema
+				}),
+				z$1.object({ tag: z$1.literal("unpublished-form") }),
+				z$1.object({ tag: z$1.literal("unpublished-settings") }),
+				z$1.object({ tag: z$1.literal("unavailable") })
+			])
 		}),
 		newsletterSourceCommonSchema.extend({
 			source: z$1.literal("signed-footer"),
@@ -35402,11 +35453,7 @@ var init_newsletter_form_interactive = __esmMin((() => {
 		target: z$1.discriminatedUnion("tag", [
 			z$1.object({
 				tag: z$1.literal("block-source"),
-				sourceRef: z$1.object({
-					tag: z$1.literal("block_ref"),
-					blockId: mailingListSignupBlockIdSchema,
-					contentVersionId: mailingListContentVersionIdSchema
-				}).nullable()
+				sourceRef: mailingListSignupBlockSourceRefSchema.nullable()
 			}),
 			z$1.object({
 				tag: z$1.literal("signed-footer-source"),
@@ -35415,7 +35462,11 @@ var init_newsletter_form_interactive = __esmMin((() => {
 					token: signedMailingListSourceTokenSchema
 				})
 			}),
-			z$1.object({ tag: z$1.literal("preview") })
+			z$1.object({ tag: z$1.literal("preview") }),
+			z$1.object({
+				tag: z$1.literal("unpublished-preview"),
+				reason: z$1.enum(["unpublished-form", "unpublished-settings"])
+			})
 		]),
 		setupRevision: z$1.number().int().positive().nullable(),
 		choiceProvider: z$1.enum([
@@ -97684,6 +97735,162 @@ 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.client.tsx
 function isUnknownArray$4(value) {
 	return Array.isArray(value);
@@ -97696,6 +97903,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();
@@ -97708,107 +97916,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);
@@ -101998,7 +102106,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,
@@ -102010,7 +102118,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))
@@ -102020,47 +102128,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),
@@ -102068,11 +102149,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,
@@ -102201,6 +102289,7 @@ var init_booking_form_default_ui = __esmMin((() => {
 	init_DiscountCodeDisclosure();
 	init_FieldValidationMessage();
 	init_BookingConsentAgreement();
+	init_CheckboxChoice();
 	init_booking_form_service_choices();
 }));
 //#endregion
@@ -102542,6 +102631,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();
@@ -107616,26 +107706,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,
@@ -107671,6 +107759,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`;
@@ -115445,6 +115534,148 @@ var init_shop = __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.client.state.ts
 function newsletterFormSubmissionReducer(state, action) {
 	switch (action.type) {
@@ -115537,6 +115768,10 @@ function resolveNewsletterSubmitTarget(input) {
 			tag: "unavailable",
 			reason: "preview_only_source"
 		};
+		case "unpublished-preview": return {
+			tag: "unavailable",
+			reason: "preview_only_source"
+		};
 		default: return assertNever$20(input);
 	}
 }
@@ -115559,6 +115794,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);
@@ -115568,7 +115804,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);
@@ -115600,7 +115835,7 @@ function NewsletterFormClient({ render }) {
 			reportNewsletterSignupRefusal(submitTarget.reason, { target: render.hydration.target });
 			dispatchSubmission({
 				type: "failed",
-				error: newsletterFormError(SIGNUPS_PAUSED_MESSAGE)
+				error: newsletterFormError(NEWSLETTER_SIGNUPS_PAUSED_MESSAGE)
 			});
 			return;
 		}
@@ -115608,7 +115843,7 @@ function NewsletterFormClient({ render }) {
 			reportNewsletterSignupRefusal("setup_not_configured");
 			dispatchSubmission({
 				type: "failed",
-				error: newsletterFormError(SIGNUPS_PAUSED_MESSAGE)
+				error: newsletterFormError(NEWSLETTER_SIGNUPS_PAUSED_MESSAGE)
 			});
 			return;
 		}
@@ -115616,7 +115851,7 @@ function NewsletterFormClient({ render }) {
 			reportNewsletterSignupRefusal("destination_unavailable", { setupRevision: render.hydration.setupRevision });
 			dispatchSubmission({
 				type: "failed",
-				error: newsletterFormError(SIGNUPS_PAUSED_MESSAGE)
+				error: newsletterFormError(NEWSLETTER_SIGNUPS_PAUSED_MESSAGE)
 			});
 			return;
 		}
@@ -115691,43 +115926,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",
@@ -115737,67 +115943,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),
@@ -115805,7 +115996,7 @@ function UnavailableNewsletterForm({ className }) {
 			tone: "error",
 			className: "fb-error",
 			role: "status",
-			children: SIGNUPS_PAUSED_MESSAGE
+			children: NEWSLETTER_SIGNUPS_PAUSED_MESSAGE
 		})
 	});
 }
@@ -115825,7 +116016,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;
 	}
@@ -115857,7 +116048,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;
@@ -115865,20 +116056,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.";
 }));
@@ -124986,6 +125175,7 @@ function EventRegistrationShell({ display }) {
 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({
@@ -125009,107 +125199,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", {
@@ -125157,7 +125247,7 @@ const FormNodeSSR = ({ blockId, value, submitLabel, successMessage, className, o
 //#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
@@ -125178,36 +125268,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),
@@ -125226,30 +125295,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
 						})
 					]
 				}),
@@ -126242,7 +126301,7 @@ const RENDERER_METADATA_PROP_KEYS = /* @__PURE__ */ new Set([
 	"blockContent",
 	"fragmentRegistry",
 	"previewAuthoring",
-	"contentVersionId",
+	"newsletterBlockSubmission",
 	"imageResolveContext"
 ]);
 function omitRendererMetadataProps(props) {
@@ -126298,7 +126357,7 @@ function resolveNodeMetadata(nodeType, context) {
 			pathBase: context.pathBase,
 			fragmentRegistry: context.fragmentRegistry
 		} : {},
-		...normalizedType === "newsletter-form" ? { contentVersionId: context.contentVersionId } : {},
+		...normalizedType === "newsletter-form" ? { newsletterBlockSubmission: context.newsletterBlockSubmission } : {},
 		...normalizedType === "media" && context.imageResolveContext ? { imageResolveContext: context.imageResolveContext } : {}
 	};
 }
@@ -126917,6 +126976,259 @@ function generateHoverEffects(axes, _space) {
 	};
 }
 //#endregion
+//#region ../theme-core/src/inputs/checkable.ts
+init_colorTokenParts();
+init_colorStyles();
+const CHECKABLE_SIZE = "1.375rem";
+/** Never fully round: a round checkbox reads as a radio. */
+const CHECKBOX_RADIUS = {
+	square: "0",
+	soft: "0.25rem",
+	rounded: "0.375rem",
+	pill: "0.375rem"
+};
+/** Tiles hold wrapping text, so pill themes get a generous radius, not a capsule. */
+const TILE_RADIUS = {
+	square: "0",
+	soft: "0.5rem",
+	rounded: "0.75rem",
+	pill: "1rem"
+};
+const ON_ACCENT_TOKENS = {
+	primary: "onPrimary",
+	secondary: "onSecondary",
+	accent: "onAccent"
+};
+/**
+* Colour for the tick/dot drawn on top of the accent fill. Uses the palette's
+* matching "on" token where there is one, falling back to white.
+*/
+/** The accent at full strength: `primary/70` becomes `primary`. */
+function solidAccentToken(accentToken) {
+	const parsed = parseColorTokenParts(accentToken);
+	return parsed.kind === "token" ? parsed.token : accentToken;
+}
+function checkableMarkColor(accentToken) {
+	const parsed = parseColorTokenParts(accentToken);
+	const onToken = parsed.kind === "token" ? ON_ACCENT_TOKENS[parsed.token] : void 0;
+	return onToken ? `rgb(var(--tb-${onToken}, 255 255 255))` : "rgb(255 255 255)";
+}
+function checkableSelectors(root) {
+	return {
+		checkbox: `${root} .form-checkbox`,
+		radio: `${root} .form-radio`,
+		check: `${root} .form-check`,
+		tile: `${root} .form-check--tile`
+	};
+}
+/** The box and circle themselves, unchecked. */
+function controlBaseCss(sel, input) {
+	const border = input.borderWidth === "0" ? "1px" : input.borderWidth;
+	return [
+		`${sel.checkbox},
+${sel.radio} {
+  appearance: none;
+  display: inline-grid;
+  place-content: center;
+  width: ${CHECKABLE_SIZE};
+  height: ${CHECKABLE_SIZE};
+  margin: 0;
+  flex-shrink: 0;
+  border: ${border} solid ${input.borderColor};
+  background-color: ${input.background};
+  color: inherit;
+  cursor: pointer;
+  transition: background-color 0.15s ease, border-color 0.15s ease, box-shadow 0.15s ease;
+}`,
+		`${sel.checkbox} {
+  border-radius: ${CHECKBOX_RADIUS[input.corners]};
+}`,
+		`${sel.radio} {
+  border-radius: 9999px;
+}`
+	];
+}
+/** The tick and dot, drawn with ::before so their colour is a theme token. */
+function controlMarkCss(sel, accentToken) {
+	return [
+		`${sel.checkbox}::before,
+${sel.radio}::before {
+  content: "";
+  background-color: ${checkableMarkColor(accentToken)};
+  transform: scale(0);
+  transition: transform 0.12s ease;
+}`,
+		`${sel.checkbox}::before {
+  width: 0.75rem;
+  height: 0.75rem;
+  clip-path: polygon(14% 52%, 0 67%, 38% 100%, 100% 22%, 85% 8%, 37% 70%);
+}`,
+		`${sel.radio}::before {
+  width: 0.5rem;
+  height: 0.5rem;
+  border-radius: 9999px;
+}`
+	];
+}
+function controlStateCss(sel, input) {
+	const accent = rgbColorValue(solidAccentToken(input.accentToken));
+	return [
+		`${sel.checkbox}:hover,
+${sel.radio}:hover,
+${sel.check}:hover > .form-checkbox,
+${sel.check}:hover > .form-radio {
+  border-color: ${accent};
+}`,
+		`${sel.checkbox}:checked,
+${sel.radio}:checked {
+  background-color: ${accent};
+  border-color: ${accent};
+}`,
+		`${sel.checkbox}:checked::before,
+${sel.radio}:checked::before {
+  transform: scale(1);
+}`,
+		`${sel.checkbox}:focus-visible,
+${sel.radio}:focus-visible {
+  outline: 2px solid ${accent};
+  outline-offset: 2px;
+}`,
+		`${sel.checkbox}:disabled,
+${sel.radio}:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}`
+	];
+}
+/** Label row: control lined up with the first line of wrapping text. */
+function checkRowCss(sel) {
+	return [
+		`${sel.check} {
+  display: flex;
+  align-items: flex-start;
+  gap: 0.75rem;
+  line-height: 1.5;
+  cursor: pointer;
+}`,
+		`${sel.check} > .form-checkbox,
+${sel.check} > .form-radio {
+  margin-top: 0.0625rem;
+  margin-top: max(0px, calc((1lh - ${CHECKABLE_SIZE}) / 2));
+}`,
+		`${sel.check}:has(> :disabled) {
+  cursor: not-allowed;
+}`
+	];
+}
+function agreementTileCss(sel, input) {
+	const accent = rgbColorValue(solidAccentToken(input.accentToken));
+	return [
+		`${sel.tile} {
+  padding: 0.875rem 1rem;
+  border: 1px solid color-mix(in srgb, currentColor 22%, transparent);
+  border-radius: ${TILE_RADIUS[input.corners]};
+  transition: border-color 0.15s ease, background-color 0.15s ease;
+}`,
+		`${sel.tile}:hover {
+  border-color: color-mix(in srgb, ${accent} 55%, transparent);
+}`,
+		`${sel.tile}:has(> .form-checkbox:checked) {
+  border-color: ${accent};
+  background-color: color-mix(in srgb, ${accent} 7%, transparent);
+}`,
+		`${sel.tile}:has(> .form-checkbox[aria-invalid="true"]) {
+  border-color: ${input.errorColor};
+}`
+	];
+}
+function checkableMediaCss(sel) {
+	return [`@media (prefers-reduced-motion: reduce) {
+  ${sel.checkbox}, ${sel.radio}, ${sel.checkbox}::before, ${sel.radio}::before, ${sel.tile} {
+    transition: none;
+  }
+}`, `@media (forced-colors: active) {
+  ${sel.checkbox}::before,
+  ${sel.radio}::before {
+    background-color: CanvasText;
+  }
+}`];
+}
+/**
+* Exposes the accent and mark colours so other choice controls (newsletter
+* topic chips) match the checkboxes without re-deriving the theme tokens.
+*/
+function checkableVarsCss(input) {
+	return [`${input.root} {
+  --rb-check-accent: ${rgbColorValue(solidAccentToken(input.accentToken))};
+  --rb-check-mark: ${checkableMarkColor(input.accentToken)};
+}`];
+}
+function generateCheckableCss(input) {
+	const sel = checkableSelectors(input.root);
+	return [
+		...checkableVarsCss(input),
+		...controlBaseCss(sel, input),
+		...controlMarkCss(sel, input.accentToken),
+		...controlStateCss(sel, input),
+		...checkRowCss(sel),
+		...agreementTileCss(sel, input),
+		...checkableMediaCss(sel)
+	].join("\n\n");
+}
+//#endregion
+//#region ../theme-core/src/inputs/inputGroup.ts
+/**
+* Input group: a field and an action (usually a themed button) sharing one
+* input-styled shell, e.g. the newsletter email + Sign up row.
+*
+* The shell `.form-input-group` takes the theme's `.form-input` rules (the
+* generators add it to that selector list, plus focus and error), so it
+* follows the site's input background, border, corners and shadow. This file
+* only adds the layout overrides and the borderless inner field.
+*/
+const INPUT_GROUP_SELECTOR = ".form-input-group";
+/** Shell focus ring follows the field only, not the button beside it. */
+const INPUT_GROUP_FOCUS_SELECTOR = ".form-input-group:has(> .form-input-group-field:focus-visible)";
+const INPUT_GROUP_ERROR_SELECTOR = ".form-input-group:has(> .form-input-group-field[aria-invalid=\"true\"])";
+const GROUP_INSET = "0.25rem";
+/**
+* @param root - scoped root selector
+* @param padding - the theme's input padding shorthand (`block inline`), so the
+*   inner field's text sits where a plain input's text would.
+*/
+function generateInputGroupCss(root, padding) {
+	const [block = padding, inline = block] = padding.trim().split(/\s+/);
+	return `${root} .form-input-group {
+  display: flex;
+  align-items: stretch;
+  gap: ${GROUP_INSET};
+  padding: ${GROUP_INSET};
+}
+
+${root} .form-input-group-field {
+  flex: 1 1 auto;
+  min-width: 0;
+  margin: 0;
+  border: 0;
+  border-radius: 0;
+  background: transparent;
+  box-shadow: none;
+  outline: none;
+  color: inherit;
+  font: inherit;
+  padding: calc(${block} - ${GROUP_INSET}) calc(${inline} - ${GROUP_INSET});
+}
+
+${root} .form-input-group-field::placeholder {
+  color: inherit;
+  opacity: 0.6;
+}
+
+${root} .form-input-group > :not(.form-input-group-field) {
+  flex-shrink: 0;
+}`;
+}
+//#endregion
 //#region ../theme-core/src/inputs/generateInputCss.ts
 init_types$11();
 init_constants$2();
@@ -126930,6 +127242,9 @@ const CORNER_MAP$1 = {
 	rounded: "1rem",
 	pill: "9999px"
 };
+function inputBackgroundValue(background) {
+	return background.type === "transparent" ? "transparent" : rgbColorValue(background.colorToken);
+}
 /**
 * Generate CSS for form input styling based on theme configuration
 *
@@ -126947,8 +127262,7 @@ const CORNER_MAP$1 = {
 function generateInputCss({ themeId, theme, inputSystem }) {
 	const rootSelector = `:where([data-theme-scope="${themeId}"])`;
 	const baseInputRules = [];
-	if (inputSystem.base.background.type === "transparent") baseInputRules.push("background-color: transparent");
-	else baseInputRules.push(`background-color: ${rgbColorValue(inputSystem.base.background.colorToken)}`);
+	baseInputRules.push(`background-color: ${inputBackgroundValue(inputSystem.base.background)}`);
 	baseInputRules.push(`color: ${rgbColorValue(inputSystem.base.textColorToken)}`);
 	const borderPx = parseBorderWidth(inputSystem.base.border.widthClass);
 	const borderStyle = inputSystem.base.border.style ?? "all";
@@ -127004,7 +127318,8 @@ function generateInputCss({ themeId, theme, inputSystem }) {
 	const focusSelectors = [
 		`${inputSelector}:focus-visible`,
 		`${textareaSelector}:focus-visible`,
-		`${selectSelector}:focus-visible`
+		`${selectSelector}:focus-visible`,
+		`${rootSelector} ${INPUT_GROUP_FOCUS_SELECTOR}`
 	];
 	const focusRules = [];
 	focusRules.push("outline: none");
@@ -127013,7 +127328,8 @@ function generateInputCss({ themeId, theme, inputSystem }) {
 	const errorSelectors = [
 		`${inputSelector}[aria-invalid="true"]`,
 		`${textareaSelector}[aria-invalid="true"]`,
-		`${selectSelector}[aria-invalid="true"]`
+		`${selectSelector}[aria-invalid="true"]`,
+		`${rootSelector} ${INPUT_GROUP_ERROR_SELECTOR}`
 	];
 	const errorRules = [];
 	errorRules.push(`border-color: ${rgbColorValue(inputSystem.error.borderColorToken)}`);
@@ -127028,53 +127344,25 @@ function generateInputCss({ themeId, theme, inputSystem }) {
 	disabledRules.push(`color: ${rgbColorValue(inputSystem.disabled.textColorToken)}`);
 	disabledRules.push(`opacity: ${inputSystem.disabled.opacity}`);
 	disabledRules.push("cursor: not-allowed");
-	const checkboxSelector = `${rootSelector} .form-checkbox`;
-	const radioSelector = `${rootSelector} .form-radio`;
-	const checkableRules = [];
-	checkableRules.push("appearance: none");
-	checkableRules.push("width: 1.125rem");
-	checkableRules.push("height: 1.125rem");
-	checkableRules.push("flex-shrink: 0");
-	checkableRules.push(`border: ${borderPx} solid ${rgbColorValue(inputSystem.base.border.colorToken)}`);
-	if (inputSystem.base.background.type === "transparent") checkableRules.push("background-color: transparent");
-	else checkableRules.push(`background-color: ${rgbColorValue(inputSystem.base.background.colorToken)}`);
-	checkableRules.push("cursor: pointer");
-	checkableRules.push("transition: background-color 0.2s ease, border-color 0.2s ease");
-	const checkboxSpecificRules = [...checkableRules];
-	checkboxSpecificRules.push(`border-radius: ${CORNER_MAP$1.soft}`);
-	const radioSpecificRules = [...checkableRules];
-	radioSpecificRules.push("border-radius: 9999px");
-	const checkboxCheckedSelector = `${checkboxSelector}:checked`;
-	const checkboxCheckedRules = [];
-	checkboxCheckedRules.push(`background-color: ${rgbColorValue(inputSystem.focus.ringColorToken)}`);
-	checkboxCheckedRules.push(`border-color: ${rgbColorValue(inputSystem.focus.ringColorToken)}`);
-	checkboxCheckedRules.push("background-image: url(\"data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='white' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e\")");
-	checkboxCheckedRules.push("background-size: 100% 100%");
-	checkboxCheckedRules.push("background-position: center");
-	checkboxCheckedRules.push("background-repeat: no-repeat");
-	const radioCheckedSelector = `${radioSelector}:checked`;
-	const radioCheckedRules = [];
-	radioCheckedRules.push(`background-color: ${rgbColorValue(inputSystem.focus.ringColorToken)}`);
-	radioCheckedRules.push(`border-color: ${rgbColorValue(inputSystem.focus.ringColorToken)}`);
-	radioCheckedRules.push("background-image: radial-gradient(circle, white 40%, transparent 40%)");
-	const checkboxFocusSelector = `${checkboxSelector}:focus-visible`;
-	const radioFocusSelector = `${radioSelector}:focus-visible`;
-	const checkableFocusRules = [];
-	checkableFocusRules.push("outline: none");
-	checkableFocusRules.push(`box-shadow: 0 0 0 ${inputSystem.focus.ringWidth}px ${rgbColorValue(inputSystem.focus.ringColorToken)}`);
+	const checkableCss = generateCheckableCss({
+		root: rootSelector,
+		borderWidth: borderPx,
+		borderColor: rgbColorValue(inputSystem.base.border.colorToken),
+		background: inputBackgroundValue(inputSystem.base.background),
+		corners: inputSystem.base.corners ?? theme.corners,
+		accentToken: inputSystem.focus.borderColorToken ?? inputSystem.focus.ringColorToken,
+		errorColor: rgbColorValue(inputSystem.error.borderColorToken)
+	});
 	const cssBlocks = [];
 	cssBlocks.push(`${labelSelector} {\n  ${labelRules.join(";\n  ")};\n}`);
-	cssBlocks.push(`${inputSelector} {\n  ${inputRules.join(";\n  ")};\n}`);
+	cssBlocks.push(`${inputSelector},\n${rootSelector} ${INPUT_GROUP_SELECTOR} {\n  ${inputRules.join(";\n  ")};\n}`);
 	cssBlocks.push(`${textareaSelector} {\n  ${textareaRules.join(";\n  ")};\n}`);
 	cssBlocks.push(`${selectSelector} {\n  ${selectRules.join(";\n  ")};\n}`);
 	cssBlocks.push(`${focusSelectors.join(",\n")} {\n  ${focusRules.join(";\n  ")};\n}`);
 	cssBlocks.push(`${errorSelectors.join(",\n")} {\n  ${errorRules.join(";\n  ")};\n}`);
 	cssBlocks.push(`${disabledSelectors.join(",\n")} {\n  ${disabledRules.join(";\n  ")};\n}`);
-	cssBlocks.push(`${checkboxSelector} {\n  ${checkboxSpecificRules.join(";\n  ")};\n}`);
-	cssBlocks.push(`${radioSelector} {\n  ${radioSpecificRules.join(";\n  ")};\n}`);
-	cssBlocks.push(`${checkboxCheckedSelector} {\n  ${checkboxCheckedRules.join(";\n  ")};\n}`);
-	cssBlocks.push(`${radioCheckedSelector} {\n  ${radioCheckedRules.join(";\n  ")};\n}`);
-	cssBlocks.push(`${checkboxFocusSelector},\n${radioFocusSelector} {\n  ${checkableFocusRules.join(";\n  ")};\n}`);
+	cssBlocks.push(generateInputGroupCss(rootSelector, padding));
+	cssBlocks.push(checkableCss);
 	return cssBlocks.join("\n\n");
 }
 //#endregion
@@ -133622,13 +133910,13 @@ const hours = stack({
 	as: "p",
 	className: "rb-caption rb-opacity-70"
 }, bind("module.timeZone"), when("module.timeZone"))], when("module.kind", { equals: "opening-hours" }));
-const socials = inline({ className: "rb-flex rb-flex-wrap rb-gap-x-5 rb-gap-y-3" }, [link({
+const socials = inline({ className: "rb-footer-socials" }, [link({
 	href: { $bind: { from: "social.href" } },
 	target: "_blank",
 	rel: "noreferrer noopener",
 	"aria-label": { $bind: { from: "social.label" } },
-	className: "rb-nav-text transition-theme-standard"
-}, [icon({ className: "rb-h-5 rb-w-5" }, bind("social.icon"), when("social.icon")), text({ as: "span" }, bind("social.label"), when("social.icon", { equals: null }))], repeat("module.socialLinks", "social"))], when("module.kind", { equals: "social-links" }));
+	className: "rb-footer-social-link rb-nav-text transition-theme-standard"
+}, [icon({ className: "rb-footer-social-icon" }, bind("social.icon"), when("social.icon")), text({ as: "span" }, bind("social.label"), when("social.icon", { equals: null }))], repeat("module.socialLinks", "social"))], when("module.kind", { equals: "social-links" }));
 const authoredCopy = richText({
 	className: "rb-prose rb-prose-sm rb-max-w-none",
 	style: textColorStyle("text/80")
@@ -139732,43 +140020,53 @@ function collectNestedPreviewFieldConstraintEntries(field, path) {
 		default: return assertNever$20(field);
 	}
 }
+function prepareDefaultBlockRender(manifest, props) {
+	if (!props.theme) throw new Error("Block rendering requires theme tokens; none were provided to makeDefaultBlockComponent");
+	if (!props.registry) throw new Error("Block rendering requires a component registry; none was provided");
+	const content = props.content;
+	const layout = resolveBlockLayout(manifest, content);
+	if (!layout) throw new Error(`Block manifest "${manifest.name}" requires a layout definition`);
+	const mergedContent = mergeContentWithBlockStyleOverrides(content, props.themeConfig, props.blockKind ?? manifest.name);
+	return {
+		registry: props.registry,
+		layout,
+		mergedContent,
+		fieldConstraints: buildPreviewFieldConstraints(manifest),
+		viewModel: buildBlockViewModel({
+			mergedContent,
+			data: props.data,
+			resolvedThemeConfig: resolveThemeConfigForBindings(props.themeConfig),
+			viewModelOverrides: props.viewModelOverrides
+		}),
+		themeForTransforms: withButtonSystem(props.theme, props.themeConfig)
+	};
+}
 function makeDefaultBlockComponent(args) {
-	const { manifest } = args;
-	return function DefaultBlockComponent({ content, data, registry, theme, themeConfig, transforms, viewModelOverrides, pathBase, blockId, contentVersionId, blockKind, blockBindings, editableRouteMetadataFieldIds, fragmentRegistry, imageResolveContext, previewAuthoring }) {
+	return function DefaultBlockComponent(props) {
 		const perf = beginBlockRenderMeasurement();
-		if (!theme) throw new Error("Block rendering requires theme tokens; none were provided to makeDefaultBlockComponent");
-		if (!registry) throw new Error("Block rendering requires a component registry; none was provided");
-		const layout = resolveBlockLayout(manifest, content);
-		if (!layout) throw new Error(`Block manifest "${manifest.name}" requires a layout definition`);
-		const fieldConstraints = buildPreviewFieldConstraints(manifest);
-		const mergedContent = mergeContentWithBlockStyleOverrides(content, themeConfig, blockKind ?? manifest.name);
-		const result = resolveTree(layout, {
-			registry,
-			viewModel: buildBlockViewModel({
-				mergedContent,
-				data,
-				resolvedThemeConfig: resolveThemeConfigForBindings(themeConfig),
-				viewModelOverrides
-			}),
-			transforms,
-			theme: withButtonSystem(theme, themeConfig),
-			pathBase,
-			blockId,
-			contentVersionId,
-			blockKind,
-			blockContent: mergedContent,
-			blockBindings,
-			editableRouteMetadataFieldIds,
-			fragmentRegistry,
-			fieldConstraints,
-			imageResolveContext,
-			previewAuthoring
+		const prepared = prepareDefaultBlockRender(args.manifest, props);
+		const result = resolveTree(prepared.layout, {
+			registry: prepared.registry,
+			viewModel: prepared.viewModel,
+			transforms: props.transforms,
+			theme: prepared.themeForTransforms,
+			pathBase: props.pathBase,
+			blockId: props.blockId,
+			newsletterBlockSubmission: props.newsletterBlockSubmission,
+			blockKind: props.blockKind,
+			blockContent: prepared.mergedContent,
+			blockBindings: props.blockBindings,
+			editableRouteMetadataFieldIds: props.editableRouteMetadataFieldIds,
+			fragmentRegistry: props.fragmentRegistry,
+			fieldConstraints: prepared.fieldConstraints,
+			imageResolveContext: props.imageResolveContext,
+			previewAuthoring: props.previewAuthoring
 		});
 		reportSlowBlockRender(perf, {
-			content,
-			blockId,
-			blockKind: blockKind ?? manifest.name,
-			manifestName: manifest.name
+			content: props.content,
+			blockId: props.blockId,
+			blockKind: props.blockKind ?? args.manifest.name,
+			manifestName: args.manifest.name
 		});
 		return result;
 	};
@@ -140386,6 +140684,40 @@ function resolveBlockData$1(blockId, dataLoaders, dataContext, routes) {
 	return dataLoaders && typeof dataLoaders === "object" && Object.keys(dataLoaders).length > 0 ? {} : void 0;
 }
 //#endregion
+//#region ../blocks/src/system/runtime/nodes/newsletter-form.block-submission.ts
+init_src$2();
+/** Authorise one block source for both public and preview rendering. */
+function planNewsletterBlockSubmission(placement) {
+	if (placement.stage === "published") {
+		const sourceRef = buildMailingListSignupBlockSourceRef(placement.blockId, placement.selectedContentVersionId);
+		return sourceRef ? {
+			tag: "ready",
+			sourceRef
+		} : { tag: "unavailable" };
+	}
+	if (placement.publishedPlacement) return planNewsletterPreviewSubmission({
+		blockId: placement.blockId,
+		publishedContentId: placement.publishedPlacement.id,
+		renderedContent: placement.renderedContent,
+		publishedContent: placement.publishedPlacement.content
+	});
+	if (placement.stage === "preview") return { tag: "unpublished-form" };
+	return { tag: "unavailable" };
+}
+/** Decide whether the visible draft can safely cite the published placement. */
+function planNewsletterPreviewSubmission(placement) {
+	if (!placement.publishedContentId) return { tag: "unpublished-form" };
+	if (!placement.publishedContent) return { tag: "unpublished-settings" };
+	const draft = parseMailingListPlacementTargeting(placement.renderedContent.targeting ?? { mode: "default" });
+	const published = parseMailingListPlacementTargeting(placement.publishedContent.targeting);
+	if (!draft.ok || !published.ok || !sameMailingListPlacementTargeting(draft.value, published.value)) return { tag: "unpublished-settings" };
+	const sourceRef = buildMailingListSignupBlockSourceRef(placement.blockId, placement.publishedContentId);
+	return sourceRef ? {
+		tag: "ready",
+		sourceRef
+	} : { tag: "unpublished-settings" };
+}
+//#endregion
 //#region ../blocks/src/pageRenderPreparation.ts
 /**
 * Stage two of the render plan.
@@ -140514,9 +140846,20 @@ function buildBlockOverrideProps(input) {
 		imageResolveContext: input.imageResolveContext,
 		blockId: block.id ?? null,
 		contentVersionId: block.contentVersionId ?? null,
+		...newsletterBlockProps(block, input.content, dataContext?.previewStage),
 		blockKind: block.kind
 	};
 }
+function newsletterBlockProps(block, renderedContent, stage) {
+	if (block.kind !== "block.newsletter-signup") return {};
+	return { newsletterBlockSubmission: planNewsletterBlockSubmission({
+		blockId: block.id,
+		selectedContentVersionId: block.contentVersionId ?? null,
+		publishedPlacement: block.publishedPlacement ?? null,
+		renderedContent,
+		stage
+	}) };
+}
 /** Site, transport and session context a block needs to call back to the API. */
 function blockSessionProps(dataContext) {
 	return {
@@ -140606,6 +140949,15 @@ function createBlockErrorBoundary() {
 const BlockErrorBoundary = createBlockErrorBoundary();
 //#endregion
 //#region ../blocks/src/pageRenderAdmission.ts
+/** Pair a published version with the content it authorises at the render boundary. */
+function readPublishedBlockPlacement(id, content) {
+	if (id == null && content == null) return null;
+	if (id == null || content == null) throw new Error("Published block placement requires both an ID and content");
+	return {
+		id,
+		content
+	};
+}
 function toPresentationPage(page) {
 	if (!page) return null;
 	return {
@@ -140616,6 +140968,8 @@ function toPresentationPage(page) {
 				kind: block.kind,
 				purpose: block.purpose,
 				...block.contentVersionId ? { contentVersionId: block.contentVersionId } : {},
+				...block.draftContentId !== void 0 ? { draftContentId: block.draftContentId } : {},
+				...block.publishedPlacement !== void 0 ? { publishedPlacement: block.publishedPlacement } : {},
 				...block.bindings ? { bindings: block.bindings } : {}
 			};
 			return block.admission.kind === "renderable" ? {
@@ -141363,6 +141717,9 @@ const containerResponsiveThemeCss = `/*
   .rb-h-4 {
     height: 1rem;
   }
+  .rb-h-5 {
+    height: 1.25rem;
+  }
   .rb-h-8 {
     height: 2rem;
   }
@@ -145328,6 +145685,10 @@ const containerResponsiveThemeCss = `/*
   margin-bottom: 0.25rem;
 }
 
+:where(.theme-scope) :where([data-block='event-registration']) .er-consent-check {
+  margin-top: 0.75rem;
+}
+
 :where(.theme-scope) :where([data-block='event-registration']) .er-required {
   color: var(--er-required);
 }
@@ -150047,13 +150408,6 @@ const containerResponsiveThemeCss = `/*
   margin: 0;
 }
 
-/* Inline field (checkbox, radio with label) */
-:where(.theme-scope) :where([data-block="form"]) .fb-inline {
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-}
-
 /* Success state */
 :where(.theme-scope) :where([data-block="form"]) .fb-success {
   background-color: var(--fb-success-bg);
@@ -152170,9 +152524,11 @@ const containerResponsiveThemeCss = `/*
  */
 
 /* Newsletter copy styling */
+/* Size only: weight, family and colour come from the theme's heading styles */
 :where(.theme-scope) :where([data-block="newsletter-signup"]) .newsletter-copy-title {
-  font-size: 1.5rem;
-  font-weight: 600;
+  font-size: clamp(1.75rem, 1.35rem + 1.6vw, 2.5rem);
+  line-height: 1.15;
+  text-wrap: balance;
 }
 
 :where(.theme-scope) :where([data-block="newsletter-signup"]) .newsletter-copy-subtitle {
@@ -152196,37 +152552,150 @@ const containerResponsiveThemeCss = `/*
   gap: var(--rb-gap-sm, 0.75rem);
 }
 
-/* Individual field styling */
+/* Extra preset fields (name, company...). Labels are visually hidden, so
+   these sit in a row above the email entry. */
+:where(.theme-scope) .newsletter-extra-fields {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(min(12rem, 100%), 1fr));
+  gap: 0.5rem;
+}
+
 :where(.theme-scope) .newsletter-field {
   display: flex;
   flex-direction: column;
   gap: 0.25rem;
+  text-align: left;
 }
 
-/* Topic choices (visitor picks what to hear about). Same treatment as the
-   form block's .fb-fieldset / .fb-inline, defined here because the newsletter
-   form also renders inside contact-newsletter and the site footer. */
-:where(.theme-scope) .newsletter-topics {
+/* Email entry: the email field and the themed submit button share one shell.
+   The shell's look (background, border, corners, focus ring) comes from the
+   theme's input system via .form-input-group; this only handles layout. */
+:where(.theme-scope) .newsletter-entry {
+  container-type: inline-size;
   display: flex;
   flex-direction: column;
-  gap: 0.5rem;
+  gap: 0.375rem;
+  text-align: left;
+}
+
+:where(.theme-scope) .newsletter-entry-group > button {
+  white-space: nowrap;
+}
+
+/* Too narrow for field and button side by side (phones, footer columns):
+   stack them inside the shell and keep pill themes from turning the taller
+   shell into a capsule. */
+@container (max-width: 22rem) {
+  :where(.theme-scope) .newsletter-entry .newsletter-entry-group {
+    flex-direction: column;
+    border-radius: min(var(--rb-input-radius, 0.5rem), 1rem);
+  }
+
+  :where(.theme-scope) .newsletter-entry .newsletter-entry-group > button {
+    width: 100%;
+    justify-content: center;
+  }
+}
+
+/* Topic choices (visitor picks what to hear about) as toggle chips. Each chip
+   is a real checkbox underneath; the chip is its visible face. */
+:where(.theme-scope) .newsletter-topics {
   border: none;
   padding: 0;
   margin: 0;
   min-width: 0;
 }
 
-:where(.theme-scope) .newsletter-topics > legend {
+:where(.theme-scope) .newsletter-topics-legend {
   padding: 0;
-  margin-bottom: 0.25rem;
+  margin-bottom: 0.625rem;
+  font-size: 0.9375rem;
+  color: var(--rb-surface-text-color, rgb(var(--tb-text, 17 24 39)));
 }
 
-:where(.theme-scope) .newsletter-topic-choice {
+:where(.theme-scope) .newsletter-topic-chips {
   display: flex;
-  align-items: center;
+  flex-wrap: wrap;
   gap: 0.5rem;
 }
 
+:where(.theme-scope) .newsletter-stacked .newsletter-topics-legend {
+  width: 100%;
+}
+
+:where(.theme-scope) .newsletter-stacked .newsletter-topic-chips {
+  justify-content: center;
+}
+
+:where(.theme-scope) .newsletter-topic-chip {
+  position: relative;
+  display: inline-flex;
+}
+
+:where(.theme-scope) .newsletter-topic-chip > input {
+  position: absolute;
+  inset: 0;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  opacity: 0;
+  cursor: pointer;
+}
+
+:where(.theme-scope) .newsletter-topic-chip > span {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.375rem;
+  padding: 0.4375rem 0.9375rem;
+  border: 1px solid color-mix(in srgb, currentColor 35%, transparent);
+  border-radius: var(--rb-button-radius, var(--rb-input-radius, 9999px));
+  font-size: 0.9375rem;
+  line-height: 1.3;
+  color: var(--rb-surface-text-color, rgb(var(--tb-text, 17 24 39)));
+  transition: background-color 0.15s ease, border-color 0.15s ease, color 0.15s ease;
+}
+
+/* Tick that grows in when the chip is on */
+:where(.theme-scope) .newsletter-topic-chip > span::before {
+  content: "";
+  width: 0;
+  height: 0.7em;
+  background-color: currentColor;
+  clip-path: polygon(14% 52%, 0 67%, 38% 100%, 100% 22%, 85% 8%, 37% 70%);
+  transition: width 0.15s ease;
+}
+
+:where(.theme-scope) .newsletter-topic-chip:hover > span {
+  border-color: currentColor;
+}
+
+/* Same accent and mark colours as the theme's checkboxes */
+:where(.theme-scope) .newsletter-topic-chip > input:checked + span {
+  background-color: var(--rb-check-accent, rgb(var(--tb-primary)));
+  border-color: var(--rb-check-accent, rgb(var(--tb-primary)));
+  color: var(--rb-check-mark, rgb(var(--tb-onPrimary, 255 255 255)));
+}
+
+:where(.theme-scope) .newsletter-topic-chip > input:checked + span::before {
+  width: 0.7em;
+}
+
+:where(.theme-scope) .newsletter-topic-chip > input:focus-visible + span {
+  outline: 2px solid var(--rb-check-accent, rgb(var(--tb-primary)));
+  outline-offset: 2px;
+}
+
+:where(.theme-scope) .newsletter-topic-chip > input:disabled + span {
+  opacity: 0.6;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  :where(.theme-scope) .newsletter-topic-chip > span,
+  :where(.theme-scope) .newsletter-topic-chip > span::before {
+    transition: none;
+  }
+}
+
 /* Error panel and field notes. The form block scopes these to its own
    data-block, so the newsletter form (which also renders in the footer)
    needs its own copy of the treatment. */
@@ -152244,13 +152713,7 @@ const containerResponsiveThemeCss = `/*
   color: var(--fb-error-text);
 }
 
-/* Required indicator */
-:where(.theme-scope) .newsletter-required {
-  color: rgb(var(--tb-primary));
-  margin-left: 0.125rem;
-}
-
-/* Submit button container */
+/* Submit button container (only when a preset has no email field) */
 :where(.theme-scope) .newsletter-submit {
   margin-top: 0.5rem;
 }
@@ -152262,52 +152725,29 @@ const containerResponsiveThemeCss = `/*
   justify-content: center;
 }
 
-/* Privacy note */
+/* Privacy note: quieter than the intro so the entry row leads */
 :where(.theme-scope) .newsletter-privacy-note {
   margin-top: 0.75rem;
-  font-size: 1rem;
-  line-height: 1.6;
-  color: var(--rb-surface-text-color, rgb(var(--tb-text, 17 24 39)));
+  font-size: 0.8125rem;
+  line-height: 1.5;
+  color: var(--rb-surface-supporting-color, var(--rb-surface-text-color, rgb(var(--tb-text, 17 24 39))));
+  opacity: 0.85;
   text-align: center;
 }
 
 /* =============================================================================
- * Inline Variant - Horizontal layout
+ * Inline Variant - left-aligned, wider entry row
  * =============================================================================
  */
 
-:where(.theme-scope) .newsletter-inline .newsletter-form-fields {
-  flex-direction: row;
-  align-items: flex-end;
-  flex-wrap: wrap;
-  gap: var(--rb-gap-sm, 0.75rem);
-}
-
-:where(.theme-scope) .newsletter-inline .newsletter-field {
-  flex: 1 1 auto;
-  min-width: 10rem;
-}
-
-:where(.theme-scope) .newsletter-inline .newsletter-submit {
-  margin-top: 0;
-  flex-shrink: 0;
-}
-
-:where(.theme-scope) .newsletter-inline .newsletter-topics {
-  flex-basis: 100%;
+:where(.theme-scope) .newsletter-inline .newsletter-form {
+  max-width: 40rem;
+  margin-left: 0;
+  margin-right: 0;
 }
 
-/* Mobile fallback for inline variant */
-@container rb-site (max-width: 640px) {
-@scope ([data-rb-responsive-mode="container"]) to (:scope [data-rb-responsive-mode]) {
-:where(.theme-scope) .newsletter-inline .newsletter-form-fields {
-    flex-direction: column;
-  }
-
-  :where(.theme-scope) .newsletter-inline .newsletter-field {
-    min-width: 100%;
-  }
-}
+:where(.theme-scope) .newsletter-inline .newsletter-privacy-note {
+  text-align: left;
 }
 
 /* =============================================================================
@@ -152445,12 +152885,6 @@ const containerResponsiveThemeCss = `/*
   margin: 0;
 }
 
-:where(.theme-scope) :where([data-block="contact-newsletter"]) .fb-inline {
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-}
-
 :where(.theme-scope) :where([data-block="contact-newsletter"]) .fb-success,
 :where(.theme-scope) :where([data-block="contact-newsletter"]) .fb-error,
 :where(.theme-scope) :where([data-block="contact-newsletter"]) .fb-empty {
@@ -154347,6 +154781,44 @@ const containerResponsiveThemeCss = `/*
     flex: 0 0 auto;
   }
 }
+}
+
+/* =============================================================================
+ * Site footer: social links
+ *
+ * Icon links get a 40px tap target with a hairline ring drawn from the link's
+ * own colour, so it follows the footer's text colour on any surface. Links
+ * without an icon (unknown platforms) stay plain text.
+ * =============================================================================
+ */
+
+:where(.theme-scope) .rb-footer-socials {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 0.75rem 1.25rem;
+}
+
+:where(.theme-scope) .rb-footer-social-link:has(> .rb-footer-social-icon) {
+  display: inline-grid;
+  place-items: center;
+  width: 2.5rem;
+  height: 2.5rem;
+  border: 1px solid color-mix(in srgb, currentColor 22%, transparent);
+  border-radius: 9999px;
+}
+
+:where(.theme-scope) .rb-footer-socials:has(.rb-footer-social-icon) {
+  gap: 0.5rem;
+}
+
+:where(.theme-scope) .rb-footer-social-link:has(> .rb-footer-social-icon):hover {
+  border-color: currentColor;
+}
+
+:where(.theme-scope) .rb-footer-social-icon {
+  width: 1.5rem;
+  height: 1.5rem;
 }`;
 //#endregion
 //#region ../theme-core/src/ThemeScopeCore.tsx
@@ -154744,7 +155216,7 @@ function toBlocksCommonProps(props) {
 	return {
 		page: props.page,
 		runtimeJoins: props.runtimeJoins,
-		dataContext: props.dataContext ? toBlocksPageRendererDataContext(props.dataContext) : void 0,
+		dataContext: toBlocksPageRendererDataContext(props.dataContext),
 		routeMap: props.routeMap,
 		wrapBlock: props.wrapBlock,
 		registry: props.registry,
@@ -154856,14 +155328,14 @@ function resolveSdkBookingTimeZone(timeZone) {
 }
 function buildPageRouteRenderContext(dataContext) {
 	return {
-		pathname: dataContext?.pathname,
-		occurrenceContext: dataContext?.occurrenceContext ?? null,
-		entrySubrouteContext: dataContext?.entrySubrouteContext ?? null,
-		contentEntry: dataContext?.contentEntry ?? null,
-		pageSurface: dataContext?.pageSurface ?? null,
-		subject: dataContext?.subject ?? null,
-		editableRouteMetadataFieldIds: dataContext?.editableRouteMetadataFieldIds ?? null,
-		previewStage: dataContext?.previewStage
+		pathname: dataContext.pathname,
+		occurrenceContext: dataContext.occurrenceContext ?? null,
+		entrySubrouteContext: dataContext.entrySubrouteContext ?? null,
+		contentEntry: dataContext.contentEntry ?? null,
+		pageSurface: dataContext.pageSurface ?? null,
+		subject: dataContext.subject ?? null,
+		editableRouteMetadataFieldIds: dataContext.editableRouteMetadataFieldIds ?? null,
+		previewStage: dataContext.previewStage
 	};
 }
 function PageContent(props) {
@@ -154877,10 +155349,10 @@ function PageContent(props) {
 			apiBaseUrl,
 			portalToken,
 			previewToken,
-			readAuthority: readAuthority ?? dataContext?.readAuthority,
+			readAuthority: readAuthority ?? dataContext.readAuthority,
 			resolvedData,
 			bookingOfferingPresets: bookingOfferingPresets ?? [],
-			mailingList: mailingList ?? dataContext?.mailingList,
+			mailingList: mailingList ?? dataContext.mailingList,
 			bookingTimeZone: resolveSdkBookingTimeZone(bookingTimeZone),
 			routes: routeMap,
 			pagesByIdentifier,
@@ -157101,21 +157573,39 @@ function buildSiteRenderSupport(site, mediaAssets) {
 function collectMediaAssetSidecar(mediaAssets) {
 	return Array.isArray(mediaAssets) && mediaAssets.length > 0 ? mediaAssets : void 0;
 }
-function convertPageResponseBlock(block) {
+function readBlockContentId(value, name) {
+	if (value === null || value === void 0) return null;
+	if (typeof value === "string") return value;
+	throw new Error(`Invalid ${name} in page: expected string or null`);
+}
+function readTransportedBlockIdentity(block, kind, stage) {
+	return {
+		draftContentId: readBlockContentId(block.draftContentId, "draft content id"),
+		publishedPlacement: stage === "preview" ? readPublishedBlockPlacement(readBlockContentId(block.publishedContentId, "published content id"), sanitizeNullableSdkRuntimeBlockContent(kind, readNestedContentRecord(block.publishedContent))) : null
+	};
+}
+function convertPageResponseBlock(block, stage) {
 	if (!isRecord$8(block)) throw new Error("Invalid block format in page API response");
+	const header = readTransportedBlockHeader(block);
+	const admission = readInvalidBlockAdmission(block.admission);
+	return {
+		...header,
+		...readTransportedBlockIdentity(block, header.kind, stage),
+		content: sanitizeSdkRuntimeBlockContent(header.kind, readContentRecord(block.content) ?? {}),
+		draftContent: sanitizeNullableSdkRuntimeBlockContent(header.kind, readNestedContentRecord(block.draftContent)),
+		...admission ? { admission } : {}
+	};
+}
+function readTransportedBlockHeader(block) {
 	if (typeof block.id !== "string" && block.id !== null) throw new Error(`Invalid block id in page: expected string or null, got ${typeof block.id}`);
 	if (typeof block.kind !== "string") throw new Error(`Invalid block kind in page: expected string, got ${typeof block.kind}`);
 	if (typeof block.purpose !== "string") throw new Error(`Invalid block purpose in page: expected string, got ${typeof block.purpose}`);
 	if (block.contentVersionId !== void 0 && block.contentVersionId !== null && typeof block.contentVersionId !== "string") throw new Error(`Invalid content version id in page: expected string or null, got ${typeof block.contentVersionId}`);
-	const admission = readInvalidBlockAdmission(block.admission);
 	return {
 		id: block.id,
 		...block.contentVersionId !== void 0 ? { contentVersionId: block.contentVersionId } : {},
 		kind: block.kind,
-		purpose: block.purpose,
-		content: sanitizeSdkRuntimeBlockContent(block.kind, readContentRecord(block.content) ?? {}),
-		draftContent: sanitizeNullableSdkRuntimeBlockContent(block.kind, readNestedContentRecord(block.draftContent)),
-		...admission ? { admission } : {}
+		purpose: block.purpose
 	};
 }
 function readInvalidBlockAdmission(value) {
@@ -157128,7 +157618,7 @@ function buildPageOutline(input) {
 		name: input.name,
 		path: input.path ?? input.fallbackPath,
 		purpose: input.purpose,
-		blocks: input.blocks.map(convertPageResponseBlock)
+		blocks: input.blocks.map((block) => convertPageResponseBlock(block, input.previewStage))
 	};
 }
 function buildRenderablePageOutline(input) {
@@ -157154,6 +157644,8 @@ function projectRenderablePageOutline(page) {
 function admitSdkRuntimePageBlock(block, customBlocks) {
 	const base = {
 		id: block.id,
+		draftContentId: block.draftContentId,
+		publishedPlacement: block.publishedPlacement,
 		...block.contentVersionId !== void 0 ? { contentVersionId: block.contentVersionId } : {},
 		kind: block.kind,
 		purpose: block.purpose,
@@ -157224,6 +157716,7 @@ function buildFooterRenderablePageOutline(siteData, blocks) {
 		fallbackPath: "/__footer",
 		purpose: "footer",
 		blocks,
+		previewStage: "published",
 		customBlocks: resolveSiteCustomBlocks(siteData)
 	});
 }
@@ -158393,6 +158886,13 @@ const EVENT_SERIES_REGISTRATION_ENDPOINT_DEFINITIONS = defineEndpointDefinitions
 		errors: [],
 		responseKind: "blob"
 	},
+	exportEventOfferingRegistrationsCsv: {
+		path: "/sites/{siteId}/bookings/event-offerings/{eventOfferingId}/registrations/export.csv",
+		method: "GET",
+		auth: "user",
+		errors: [],
+		responseKind: "blob"
+	},
 	updateEventSeriesRegistration: {
 		path: "/sites/{siteId}/bookings/event-series/{seriesId}/registrations/{registrationId}",
 		method: "PATCH",
@@ -158403,6 +158903,19 @@ const EVENT_SERIES_REGISTRATION_ENDPOINT_DEFINITIONS = defineEndpointDefinitions
 			"resource:not_found",
 			"server:internal_error"
 		]
+	},
+	saveEventSeriesRegistrationAnswers: {
+		path: "/sites/{siteId}/bookings/event-series/{seriesId}/registrations/{registrationId}/answers",
+		method: "PUT",
+		auth: "user",
+		responseKind: "json",
+		errors: [
+			"validation:invalid_input",
+			"auth:forbidden",
+			"resource:not_found",
+			"resource:conflict",
+			"server:internal_error"
+		]
 	}
 });
 //#endregion
@@ -158823,6 +159336,30 @@ const NEWSLETTER_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
 		responseKind: "json",
 		demoMutation: DEMO_MUTATION_BLOCKED_HIDDEN
 	},
+	scheduleNewsletterCampaign: {
+		path: "/sites/{siteId}/newsletter/campaigns/{campaignId}/schedule",
+		method: "POST",
+		tags: [TAG_TEMPLATES.site, TAG_TEMPLATES.siteNewsletter],
+		auth: "user",
+		responseKind: "json",
+		demoMutation: DEMO_MUTATION_BLOCKED_HIDDEN
+	},
+	unscheduleNewsletterCampaign: {
+		path: "/sites/{siteId}/newsletter/campaigns/{campaignId}/unschedule",
+		method: "POST",
+		tags: [TAG_TEMPLATES.site, TAG_TEMPLATES.siteNewsletter],
+		auth: "user",
+		responseKind: "json",
+		demoMutation: DEMO_MUTATION_BLOCKED_HIDDEN
+	},
+	stopNewsletterCampaign: {
+		path: "/sites/{siteId}/newsletter/campaigns/{campaignId}/stop",
+		method: "POST",
+		tags: [TAG_TEMPLATES.site, TAG_TEMPLATES.siteNewsletter],
+		auth: "user",
+		responseKind: "json",
+		demoMutation: DEMO_MUTATION_BLOCKED_HIDDEN
+	},
 	testSendNewsletterCampaign: {
 		path: "/sites/{siteId}/newsletter/campaigns/{campaignId}/test-send",
 		method: "POST",
@@ -158833,6 +159370,154 @@ const NEWSLETTER_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
 	}
 });
 //#endregion
+//#region ../api/src/sdkEventEndpointDefinitions.ts
+/**
+* The SDK's Event graph: the Events themselves and the occurrences of one run.
+* Extracted from `endpoints.ts` so this family can be read, and added to, on
+* its own. New entries here must declare `errors`; the
+* require-api-endpoint-errors lint enforces that here as in endpoints.ts.
+*/
+const SDK_EVENT_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
+	sdkListEvents: {
+		path: "/sdk/{siteId}/events",
+		method: "GET",
+		auth: "service",
+		responseKind: "json"
+	},
+	sdkUpsertEvent: {
+		path: "/sdk/{siteId}/events",
+		method: "POST",
+		auth: "service",
+		responseKind: "json",
+		errors: [
+			"validation:invalid_input",
+			"resource:not_found",
+			"resource:conflict",
+			"billing:plan_limit_exceeded",
+			"server:internal_error"
+		]
+	},
+	sdkGetEvent: {
+		path: "/sdk/{siteId}/events/{identifier}",
+		method: "GET",
+		auth: "service",
+		responseKind: "json"
+	},
+	sdkDeleteEvent: {
+		path: "/sdk/{siteId}/events/{identifier}",
+		method: "DELETE",
+		auth: "service",
+		responseKind: "json",
+		errors: [
+			"resource:not_found",
+			"resource:conflict",
+			"server:internal_error"
+		]
+	},
+	sdkTakeEventOffline: {
+		path: "/sdk/{siteId}/events/{identifier}/lifecycle",
+		method: "POST",
+		auth: "service",
+		responseKind: "json",
+		errors: [
+			"resource:not_found",
+			"validation:invalid_input",
+			"resource:conflict",
+			"server:internal_error"
+		]
+	},
+	sdkListEventOccurrences: {
+		path: "/sdk/{siteId}/events/{identifier}/runs/{runIdentifier}/occurrences",
+		method: "GET",
+		auth: "service",
+		responseKind: "json",
+		errors: [
+			"resource:not_found",
+			"validation:invalid_input",
+			"server:internal_error"
+		]
+	},
+	sdkAddEventOccurrence: {
+		path: "/sdk/{siteId}/events/{identifier}/runs/{runIdentifier}/occurrences",
+		method: "POST",
+		auth: "service",
+		responseKind: "json",
+		errors: [
+			"resource:not_found",
+			"validation:invalid_input",
+			"resource:conflict",
+			"server:internal_error"
+		]
+	},
+	sdkUpdateEventOccurrence: {
+		path: "/sdk/{siteId}/events/{identifier}/runs/{runIdentifier}/occurrences/{occurrenceId}",
+		method: "PATCH",
+		auth: "service",
+		responseKind: "json",
+		errors: [
+			"resource:not_found",
+			"validation:invalid_input",
+			"resource:conflict",
+			"server:internal_error"
+		]
+	},
+	sdkCancelEventOccurrence: {
+		path: "/sdk/{siteId}/events/{identifier}/runs/{runIdentifier}/occurrences/{occurrenceId}/cancel",
+		method: "POST",
+		auth: "service",
+		responseKind: "json",
+		errors: [
+			"resource:not_found",
+			"resource:conflict",
+			"server:internal_error"
+		]
+	},
+	sdkDeleteEventOccurrence: {
+		path: "/sdk/{siteId}/events/{identifier}/runs/{runIdentifier}/occurrences/{occurrenceId}",
+		method: "DELETE",
+		auth: "service",
+		responseKind: "json",
+		errors: [
+			"resource:not_found",
+			"resource:conflict",
+			"server:internal_error"
+		]
+	}
+});
+//#endregion
+//#region ../api/src/sdkPageDesignEndpointDefinitions.ts
+/**
+* SDK management endpoints for a page's draft design (issue 1497), spread into
+* `ENDPOINT_DEFINITIONS` like the other endpoint-definition modules. New
+* entries here must declare `errors`, which the require-api-endpoint-errors
+* lint enforces.
+*/
+const SDK_PAGE_DESIGN_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
+	sdkGetPageDesign: {
+		path: "/sdk/{siteId}/pages/{identifier}/design",
+		method: "GET",
+		auth: "service",
+		responseKind: "json",
+		errors: [
+			"resource:not_found",
+			"validation:invalid_input",
+			"server:internal_error"
+		]
+	},
+	sdkSavePageDesign: {
+		path: "/sdk/{siteId}/pages/{identifier}/design",
+		method: "POST",
+		auth: "service",
+		responseKind: "json",
+		errors: [
+			"resource:not_found",
+			"validation:invalid_input",
+			"resource:conflict",
+			"server:internal_error"
+		]
+	}
+});
+//#endregion
 //#region ../api/src/publicEventEndpointDefinitions.ts
 init_src$2();
 const PUBLIC_EVENT_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
@@ -159079,6 +159764,45 @@ const SITE_API_KEY_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
 	}
 });
 //#endregion
+//#region ../api/src/siteManagementEndpointDefinitions.ts
+const SITE_MANAGEMENT_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
+	createSite: {
+		path: "/sites/manage",
+		method: "POST",
+		tags: ["site"],
+		auth: "user",
+		responseKind: "json"
+	},
+	updateSite: {
+		path: "/sites/manage",
+		method: "PUT",
+		tags: ["site"],
+		auth: "user",
+		responseKind: "json"
+	},
+	changeSiteAddress: {
+		path: "/sites/{siteId}/address",
+		method: "PUT",
+		auth: "user",
+		responseKind: "json",
+		demoMutation: DEMO_MUTATION_BLOCKED_DISABLED
+	},
+	getSiteAddressAvailability: {
+		path: "/sites/{siteId}/address/availability",
+		method: "GET",
+		auth: "user",
+		responseKind: "json"
+	},
+	deleteSite: {
+		path: "/sites/{siteId}",
+		method: "DELETE",
+		tags: ["site", "site-{siteId}"],
+		auth: "user",
+		responseKind: "json",
+		demoMutation: DEMO_MUTATION_BLOCKED_HIDDEN
+	}
+});
+//#endregion
 //#region ../api/src/eventManagementEndpointDefinitions.ts
 const EVENT_MANAGEMENT_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
 	listEvents: {
@@ -159126,6 +159850,28 @@ const EVENT_MANAGEMENT_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
 			"server:internal_error"
 		]
 	},
+	/**
+	* The web address of an event's own page. A course page belongs to the
+	* event itself, so its address is written here rather than through a run.
+	*/
+	updateEventAddress: {
+		path: "/sites/{siteId}/bookings/events/{eventId}/address",
+		method: "PATCH",
+		tags: [
+			"site-{siteId}",
+			"event-series-{siteId}",
+			TAG_TEMPLATES.siteRoutableContent,
+			TAG_TEMPLATES.siteRedirects
+		],
+		auth: "user",
+		responseKind: "json",
+		errors: [
+			"validation:invalid_input",
+			"resource:not_found",
+			"resource:conflict",
+			"server:internal_error"
+		]
+	},
 	createWholeSeriesRun: {
 		path: "/sites/{siteId}/bookings/events/{eventId}/runs",
 		method: "POST",
@@ -159152,6 +159898,20 @@ const EVENT_MANAGEMENT_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
 			"server:internal_error"
 		]
 	},
+	updateCourseBookingSettings: {
+		path: "/sites/{siteId}/bookings/events/{eventId}/booking-settings",
+		method: "PATCH",
+		tags: ["site-{siteId}", "event-series-{siteId}"],
+		auth: "user",
+		responseKind: "json",
+		errors: [
+			"validation:invalid_input",
+			"auth:forbidden",
+			"resource:not_found",
+			"resource:conflict",
+			"server:internal_error"
+		]
+	},
 	cancelWholeSeriesRun: {
 		path: "/sites/{siteId}/bookings/events/{eventId}/runs/{runId}/cancellation",
 		method: "POST",
@@ -159164,6 +159924,28 @@ const EVENT_MANAGEMENT_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
 			"resource:conflict",
 			"server:internal_error"
 		]
+	},
+	/**
+	* The Content tab's one write: the short introduction, image and
+	* description of an event's page, published without its layout.
+	*/
+	saveEventPageWords: {
+		path: "/sites/{siteId}/page-surfaces/{pageSurfaceId}/words",
+		method: "PUT",
+		tags: [
+			TAG_TEMPLATES.siteCollection,
+			TAG_TEMPLATES.siteRoutableContent,
+			TAG_TEMPLATES.pageSurfaceById
+		],
+		auth: "user",
+		responseKind: "json",
+		errors: [
+			"auth:forbidden",
+			"validation:invalid_input",
+			"resource:not_found",
+			"resource:conflict",
+			"server:internal_error"
+		]
 	}
 });
 //#endregion
@@ -159597,19 +160379,56 @@ const BILLING_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({
 		responseKind: "json"
 	}
 });
+//#endregion
+//#region ../api/src/clientErrorReporting.ts
+const CLIENT_ERROR_REPORT_ENDPOINT_DEFINITIONS = defineEndpointDefinitions({ reportClientError: {
+	path: "/client/error-report",
+	method: "POST",
+	auth: "user",
+	errors: [],
+	responseKind: "json"
+} });
+const CLIENT_ERROR_REPORT_LIMITS = {
+	pathname: 1024,
+	name: 120,
+	message: 2e3,
+	stack: 8e3,
+	digest: 128,
+	componentStack: 8e3,
+	sourceLocation: 1024
+};
+const clientErrorEventSchema = z$1.enum([
+	"dashboard:route-error",
+	"dashboard:app-error",
+	"client:error-boundary",
+	"client:window-error",
+	"client:unhandled-rejection"
+]);
+z$1.object({
+	event: clientErrorEventSchema,
+	pathname: z$1.string().startsWith("/").max(CLIENT_ERROR_REPORT_LIMITS.pathname),
+	name: z$1.string().max(CLIENT_ERROR_REPORT_LIMITS.name),
+	message: z$1.string().max(CLIENT_ERROR_REPORT_LIMITS.message),
+	stack: z$1.string().max(CLIENT_ERROR_REPORT_LIMITS.stack).nullable(),
+	digest: z$1.string().max(CLIENT_ERROR_REPORT_LIMITS.digest).nullable(),
+	componentStack: z$1.string().max(CLIENT_ERROR_REPORT_LIMITS.componentStack).nullable(),
+	sourceLocation: z$1.string().max(CLIENT_ERROR_REPORT_LIMITS.sourceLocation).nullable()
+}).strict();
 ({
+	...CLIENT_ERROR_REPORT_ENDPOINT_DEFINITIONS,
 	...PUBLIC_NEWSLETTER_ENDPOINT_DEFINITIONS,
 	...ACCOUNT_ENDPOINT_DEFINITIONS,
 	...PUBLIC_ONBOARDING_ATTEMPT_ENDPOINT_DEFINITIONS,
 	...PUBLIC_EVENT_ENDPOINT_DEFINITIONS,
 	...GIFTING_ENDPOINT_DEFINITIONS,
 	...PUBLIC_READ_ENDPOINT_DEFINITIONS,
-	...BILLING_ENDPOINT_DEFINITIONS
+	...BILLING_ENDPOINT_DEFINITIONS,
+	...SITE_MANAGEMENT_ENDPOINT_DEFINITIONS
 }), TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteTheme, TAG_TEMPLATES.siteCollection, { ...SITE_API_KEY_ENDPOINT_DEFINITIONS }, TAG_TEMPLATES.site, TAG_TEMPLATES.siteBookingSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteBookingSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteEmailSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteEmailSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteEmailSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteEmailSettings, {
 	...NEWSLETTER_ENDPOINT_DEFINITIONS,
 	...APPOINTMENT_ENDPOINT_DEFINITIONS,
 	...EVENT_SERIES_REGISTRATION_ENDPOINT_DEFINITIONS
-}, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteById, TAG_TEMPLATES.siteBySlug, TAG_TEMPLATES.siteByDomain, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteById, TAG_TEMPLATES.siteBySlug, TAG_TEMPLATES.siteByDomain, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.workflowRunById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.routeById, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.site, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.navigationMenuById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.navigationMenuById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.navigationMenuById, TAG_TEMPLATES.navigationItemById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.navigationMenuById, TAG_TEMPLATES.navigationItemById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.navigationMenuById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.publicEvents, TAG_TEMPLATES.publicBookingServices, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteTheme, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteTheme, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteTheme, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteRedirects, TAG_TEMPLATES.siteRouteOutcomes, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteRedirects, TAG_TEMPLATES.siteRouteOutcomes, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.formSubmissionsBySlug, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.formSubmissionsBySlug, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.formSubmissionsBySlug, TAG_TEMPLATES.siteForms, { ...PUBLIC_BOOKING_AVAILABILITY_ENDPOINT_DEFINITIONS }, TAG_TEMPLATES.publicEventFilters, TAG_TEMPLATES.publicEvents, TAG_TEMPLATES.publicShop, TAG_TEMPLATES.publicCheckout, TAG_TEMPLATES.siteRoutableContent, { ...PUBLIC_EVENT_CHECKOUT_ENDPOINT_DEFINITIONS }, TAG_TEMPLATES.publicEvents, TAG_TEMPLATES.publicEvents, { ...EVENT_MANAGEMENT_ENDPOINT_DEFINITIONS }, { ...SDK_MEDIA_ENDPOINT_DEFINITIONS }, { ...SDK_ENDPOINT_DEFINITIONS }, { ...SDK_ENTRY_READ_ENDPOINTS };
+}, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteById, TAG_TEMPLATES.siteBySlug, TAG_TEMPLATES.siteByDomain, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteById, TAG_TEMPLATES.siteBySlug, TAG_TEMPLATES.siteByDomain, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.workflowRunById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.routeById, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.site, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.site, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.navigationMenuById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.navigationMenuById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.navigationMenuById, TAG_TEMPLATES.navigationItemById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.navigationMenuById, TAG_TEMPLATES.navigationItemById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteNavigation, TAG_TEMPLATES.navigationMenuById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteSettings, TAG_TEMPLATES.publicEvents, TAG_TEMPLATES.publicBookingServices, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteTheme, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteTheme, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.siteTheme, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteCollection, TAG_TEMPLATES.pageSurfaceById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.pageById, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteRedirects, TAG_TEMPLATES.siteRouteOutcomes, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteRedirects, TAG_TEMPLATES.siteRouteOutcomes, TAG_TEMPLATES.siteRoutableContent, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.formSubmissionsBySlug, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.formSubmissionsBySlug, TAG_TEMPLATES.siteForms, TAG_TEMPLATES.formSubmissionsBySlug, TAG_TEMPLATES.siteForms, { ...PUBLIC_BOOKING_AVAILABILITY_ENDPOINT_DEFINITIONS }, TAG_TEMPLATES.publicEventFilters, TAG_TEMPLATES.publicEvents, TAG_TEMPLATES.publicShop, TAG_TEMPLATES.publicCheckout, TAG_TEMPLATES.siteRoutableContent, { ...PUBLIC_EVENT_CHECKOUT_ENDPOINT_DEFINITIONS }, TAG_TEMPLATES.publicEvents, TAG_TEMPLATES.publicEvents, { ...EVENT_MANAGEMENT_ENDPOINT_DEFINITIONS }, { ...SDK_MEDIA_ENDPOINT_DEFINITIONS }, { ...SDK_ENDPOINT_DEFINITIONS }, { ...SDK_PAGE_DESIGN_ENDPOINT_DEFINITIONS }, { ...SDK_EVENT_ENDPOINT_DEFINITIONS }, { ...SDK_ENTRY_READ_ENDPOINTS };
 z$1.object({ refreshToken: z$1.string().min(1).max(4096) }).strict();
 z$1.object({
 	accessToken: z$1.string().min(1).max(4096),
@@ -160222,6 +161041,46 @@ z$1.object({ acceptExtraSiteCharge: z$1.boolean().optional() });
 //#region ../surfaces/src/index.ts
 const SURFACE_IDS = ["core", "macadamia"];
 const DEFAULT_SURFACE_ID = "core";
+/**
+* Root hosts for each surface, keyed by deployment tier. The tier-keyed shape
+* makes it impossible to mis-order entries: callers like
+* `buildSurfaceAwareDashboardOriginForSurfaceId` look up by tier directly
+* rather than relying on positional alignment between arrays.
+*/
+const SURFACE_ROOT_HOSTS = {
+	core: {
+		local: "localhost",
+		prod: "riverbankcms.com"
+	},
+	macadamia: {
+		local: "macadamia.localhost",
+		prod: "macadamia.studio"
+	}
+};
+const SURFACE_SITE_ROOT_HOSTS = {
+	core: {
+		local: "localhost",
+		prod: "riverbanksites.com"
+	},
+	macadamia: {
+		local: "macadamia.localhost",
+		prod: "macadamia.studio"
+	}
+};
+const SURFACE_SITE_ROOT_HOST_ALIASES = { core: { prod: ["preview.riverbanksites.com"] } };
+function surfaceHostTableValues(table) {
+	return Object.values(table).flatMap((byTier) => Object.values(byTier).flat());
+}
+function siteSlugLabelUnderRoot(host, siteRootHost) {
+	if (!host.endsWith(`.${siteRootHost}`)) return [];
+	return host.slice(0, host.length - siteRootHost.length - 1).split(".").slice(-1);
+}
+function deriveSurfaceOwnedSiteSlugs() {
+	const siteRootHosts = [...surfaceHostTableValues(SURFACE_SITE_ROOT_HOSTS), ...surfaceHostTableValues(SURFACE_SITE_ROOT_HOST_ALIASES)];
+	const labels = [...surfaceHostTableValues(SURFACE_ROOT_HOSTS), ...siteRootHosts].flatMap((host) => siteRootHosts.flatMap((root) => siteSlugLabelUnderRoot(host, root)));
+	return [...new Set(labels)].sort();
+}
+deriveSurfaceOwnedSiteSlugs();
 [...SURFACE_IDS.filter((surfaceId) => surfaceId !== DEFAULT_SURFACE_ID)];
 //#endregion
 //#region ../api/src/accountApi.ts
@@ -160865,6 +161724,7 @@ function parsePublicProductCategorySelector(value) {
 		productCategoryEntryId: record.productCategoryEntryId
 	};
 }
+z$1.enum(["public", "unlisted"], { error: "visibility must be 'public' or 'unlisted'" });
 //#endregion
 //#region ../api/src/bookingConfig.ts
 init_src$2();
@@ -162193,23 +163053,23 @@ async function loadPageWithDeps(deps, params) {
 	if ("pageSurface" in pageResponse) throw new Error("This path resolves to a page surface, not a page. Use loadContent() instead, which handles pages, entries, and page surfaces.");
 	const { page: pageData } = pageResponse;
 	const support = buildSiteRenderSupport(site, collectMediaAssetSidecar(pageResponse.mediaAssets));
+	const previewStage = preview ? "preview" : "published";
 	const pageOutline = buildRenderablePageOutline({
 		name: pageData.name,
 		path: pageData.path,
 		fallbackPath: path,
 		purpose: pageData.purpose,
 		blocks: pageData.blocks,
+		previewStage,
 		customBlocks: support.customBlocks
 	});
-	const previewStage = preview ? "preview" : "published";
-	const renderTarget = {
-		kind: "page",
-		pageId: pageId ?? pageData.id
-	};
 	const resolvedData = await resolveBlockDataWithDeps(deps, {
 		page: projectRenderablePageOutline(pageOutline),
 		siteId,
-		renderTarget,
+		renderTarget: {
+			kind: "page",
+			pageId: pageId ?? pageData.id
+		},
 		previewStage,
 		policy: createBlockDataLoadPolicy(dataLoaderOverrides, normalizeDataLoaderSearchParams(searchParams)),
 		client,
@@ -162222,6 +163082,7 @@ async function loadPageWithDeps(deps, params) {
 		sdkConfig: support.sdkConfig,
 		siteId,
 		resolvedData,
+		dataContext: { previewStage },
 		bookingOfferingPresets: support.bookingOfferingPresets,
 		mailingList: support.mailingList,
 		bookingTimeZone: support.bookingTimeZone,
@@ -164791,7 +165652,8 @@ async function processTemplatePage(input) {
 		block,
 		bindingContext: input.bindingContext,
 		slotContent: input.slotContent,
-		customBlocks: input.customBlocks
+		customBlocks: input.customBlocks,
+		previewStage: input.previewStage
 	}));
 	if (blocks.length === 0) return {
 		templatePage: null,
@@ -164822,7 +165684,7 @@ function resolveTemplateBlockSequence(input) {
 	if (slotKey) return selectBlocksForDeclaredEntrySlot({
 		declaredSlotKey: slotKey,
 		entrySlots: input.slotContent ?? []
-	}).map((slotBlock) => admitEntrySlotBlock(slotBlock, input.customBlocks));
+	}).map((slotBlock) => admitEntrySlotBlock(slotBlock, input.customBlocks, input.previewStage));
 	if (block.blockKind === "system.entry-slot") return [];
 	return [resolveTemplateBlock(block, input.bindingContext, input.customBlocks)];
 }
@@ -164856,10 +165718,11 @@ function readEntrySlotKey(block) {
 	const parsed = parseSlotKey(block.content?.slotKey);
 	return parsed.ok ? parsed.value : null;
 }
-function admitEntrySlotBlock(block, customBlocks) {
+function admitEntrySlotBlock(block, customBlocks, previewStage) {
 	const base = {
 		id: block.id ?? block.blockId ?? null,
 		contentVersionId: block.contentVersionId,
+		...entrySlotBlockIdentity(block, previewStage),
 		kind: block.kind,
 		purpose: block.purpose,
 		...isRecord(block.bindings) ? { bindings: block.bindings } : {}
@@ -164880,6 +165743,12 @@ function admitEntrySlotBlock(block, customBlocks) {
 		error: renderable.error
 	});
 }
+function entrySlotBlockIdentity(block, previewStage) {
+	return {
+		draftContentId: block.draftContentId ?? null,
+		publishedPlacement: previewStage === "preview" ? readPublishedBlockPlacement(block.publishedContentId, isRecord(block.publishedContent) && isRecord(block.publishedContent.data) ? block.publishedContent.data : null) : null
+	};
+}
 //#endregion
 //#region src/rendering/helpers/loadContent.ts
 /**
@@ -165051,15 +165920,18 @@ async function loadContentFromContentResponseWithDeps(deps, params) {
 			entry,
 			templatePage,
 			resolvedData,
-			dataContext: { contentEntry: {
-				...entry.content ?? {},
-				id: entry.id,
-				slug: entry.slug,
-				contentTypeSlug: entry.type,
-				_entryId: entry.id,
-				_entrySlug: entry.slug,
-				_contentTypeSlug: entry.type
-			} },
+			dataContext: {
+				previewStage,
+				contentEntry: {
+					...entry.content ?? {},
+					id: entry.id,
+					slug: entry.slug,
+					contentTypeSlug: entry.type,
+					_entryId: entry.id,
+					_entrySlug: entry.slug,
+					_contentTypeSlug: entry.type
+				}
+			},
 			...templateContentSupport
 		};
 	}
@@ -165120,6 +165992,7 @@ async function loadContentFromContentResponseWithDeps(deps, params) {
 			templatePage,
 			resolvedData,
 			dataContext: {
+				previewStage,
 				pageSurface: {
 					...pageSurface.content ?? {},
 					id: pageSurface.id,
@@ -165136,13 +166009,13 @@ async function loadContentFromContentResponseWithDeps(deps, params) {
 	const { page: pageData } = contentResponse;
 	const pageRecord = pageData;
 	const canonicalPagePath = pageData.path ?? pageRecord.path ?? "/";
-	const draftPagePath = pageRecord.draftPath ?? pageRecord.path ?? canonicalPagePath;
 	const pageOutline = buildRenderablePageOutline({
 		name: pageData.name,
 		path: canonicalPagePath,
 		fallbackPath: "/",
 		purpose: pageData.purpose,
 		blocks: pageData.blocks,
+		previewStage,
 		customBlocks: support.customBlocks
 	});
 	const resolvedData = await resolveBlockDataWithDeps(deps, {
@@ -165161,26 +166034,14 @@ async function loadContentFromContentResponseWithDeps(deps, params) {
 		type: "page",
 		pageId: pageRecord.id,
 		routeId: pageRecord.routeId ?? null,
-		pageMetadata: {
-			draftTitle: pageRecord.draftTitle ?? pageRecord.name ?? pageData.name,
-			draftPath: draftPagePath,
-			draftStatus: pageRecord.draftStatus ?? pageRecord.status ?? "draft",
-			title: pageRecord.name ?? pageData.name,
-			path: canonicalPagePath,
-			status: pageRecord.status ?? pageRecord.draftStatus ?? "draft",
-			publishedAt: pageRecord.publishedAt ?? null,
-			draftMetaTitle: pageRecord.draftMetaTitle ?? null,
-			draftMetaDescription: pageRecord.draftMetaDescription ?? null,
-			publishedMetaTitle: pageRecord.publishedMetaTitle ?? null,
-			publishedMetaDescription: pageRecord.publishedMetaDescription ?? null,
-			ogImageId: pageRecord.ogImageId ?? null
-		},
+		pageMetadata: projectPagePreviewMetadata(pageRecord, pageData.name, canonicalPagePath),
 		page: pageOutline,
 		runtimeJoins: pageData.runtimeJoins,
 		theme: support.theme,
 		siteId,
 		...support.customBlocks ? { customBlocks: support.customBlocks } : {},
 		resolvedData,
+		dataContext: { previewStage },
 		bookingOfferingPresets: support.bookingOfferingPresets,
 		mailingList: support.mailingList,
 		bookingTimeZone: support.bookingTimeZone,
@@ -165193,6 +166054,32 @@ async function loadContentFromContentResponseWithDeps(deps, params) {
 		...support.mediaAssets ? { mediaAssets: support.mediaAssets } : {}
 	};
 }
+function projectPagePreviewMetadata(page, pageName, canonicalPath) {
+	return {
+		...projectDraftPageMetadata(page, pageName, canonicalPath),
+		...projectPublishedPageMetadata(page, pageName, canonicalPath)
+	};
+}
+function projectDraftPageMetadata(page, pageName, canonicalPath) {
+	return {
+		draftTitle: page.draftTitle ?? page.name ?? pageName,
+		draftPath: page.draftPath ?? page.path ?? canonicalPath,
+		draftStatus: page.draftStatus ?? page.status ?? "draft",
+		draftMetaTitle: page.draftMetaTitle ?? null,
+		draftMetaDescription: page.draftMetaDescription ?? null
+	};
+}
+function projectPublishedPageMetadata(page, pageName, canonicalPath) {
+	return {
+		title: page.name ?? pageName,
+		path: canonicalPath,
+		status: page.status ?? page.draftStatus ?? "draft",
+		publishedAt: page.publishedAt ?? null,
+		publishedMetaTitle: page.publishedMetaTitle ?? null,
+		publishedMetaDescription: page.publishedMetaDescription ?? null,
+		ogImageId: page.ogImageId ?? null
+	};
+}
 /**
 * Type guard to check if API response is an entry
 */