@designcrowd/library.brand-page 6.0.25 → 6.0.26-json-prereq-2

package/lib/src/{CreatedOnBrandCrowd-de-de-CS3ct0wa.js → CreatedOnBrandCrowd-de-de-CKBqjDH3.js}

@@ -1,5 +1,5 @@
 import { openBlock as e, createElementBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-BVHFYSLL.js";
+import { _ as t } from "./lib-Db6j9fQZ.js";
 const i = {}, h = {
   width: "275",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-en-us-CmBcnDu6.js → CreatedOnBrandCrowd-en-us-CRXiimvT.js}

@@ -1,5 +1,5 @@
 import { openBlock as e, createElementBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-BVHFYSLL.js";
+import { _ as t } from "./lib-Db6j9fQZ.js";
 const i = {}, h = {
   width: "251",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-es-es-BdTuJtqV.js → CreatedOnBrandCrowd-es-es-DCYdY6sj.js}

@@ -1,5 +1,5 @@
 import { openBlock as e, createElementBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-BVHFYSLL.js";
+import { _ as t } from "./lib-Db6j9fQZ.js";
 const i = {}, h = {
   width: "250",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-fr-fr-Cx_H9X6l.js → CreatedOnBrandCrowd-fr-ca-Dk7LOhxE.js}

@@ -1,5 +1,5 @@
 import { openBlock as e, createElementBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-BVHFYSLL.js";
+import { _ as t } from "./lib-Db6j9fQZ.js";
 const i = {}, h = {
   width: "237",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-fr-ca-Cx_H9X6l.js → CreatedOnBrandCrowd-fr-fr-Dk7LOhxE.js}

@@ -1,5 +1,5 @@
 import { openBlock as e, createElementBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-BVHFYSLL.js";
+import { _ as t } from "./lib-Db6j9fQZ.js";
 const i = {}, h = {
   width: "237",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-pt-pt-BZZ9hjUi.js → CreatedOnBrandCrowd-pt-br-Cp4ufHJP.js}

@@ -1,5 +1,5 @@
 import { openBlock as e, createElementBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-BVHFYSLL.js";
+import { _ as t } from "./lib-Db6j9fQZ.js";
 const i = {}, h = {
   width: "263",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-pt-br-BZZ9hjUi.js → CreatedOnBrandCrowd-pt-pt-Cp4ufHJP.js}

@@ -1,5 +1,5 @@
 import { openBlock as e, createElementBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-BVHFYSLL.js";
+import { _ as t } from "./lib-Db6j9fQZ.js";
 const i = {}, h = {
   width: "263",
   height: "36",

package/lib/src/{CreatedOnDcom-de-de-SbONDQN1.js → CreatedOnDcom-de-de-ZSLkWMwM.js}

@@ -1,5 +1,5 @@
 import { openBlock as H, createElementBlock as V, createStaticVNode as t } from "vue";
-import { _ as e } from "./lib-BVHFYSLL.js";
+import { _ as e } from "./lib-Db6j9fQZ.js";
 const M = {}, Z = {
   width: "242",
   height: "36",

package/lib/src/{CreatedOnDcom-en-us-Beno1_gw.js → CreatedOnDcom-en-us-BgdIGfT3.js}

@@ -1,5 +1,5 @@
 import { openBlock as H, createElementBlock as V, createStaticVNode as t } from "vue";
-import { _ as e } from "./lib-BVHFYSLL.js";
+import { _ as e } from "./lib-Db6j9fQZ.js";
 const i = {}, M = {
   width: "231",
   height: "36",

package/lib/src/{CreatedOnDcom-es-es-BBE_zdRu.js → CreatedOnDcom-es-es-D0KemkCZ.js}

@@ -1,5 +1,5 @@
 import { openBlock as H, createElementBlock as V, createStaticVNode as t } from "vue";
-import { _ as e } from "./lib-BVHFYSLL.js";
+import { _ as e } from "./lib-Db6j9fQZ.js";
 const M = {}, Z = {
   width: "230",
   height: "36",

package/lib/src/{CreatedOnDcom-fr-ca-C6pgDB5x.js → CreatedOnDcom-fr-ca-BuwNjNbC.js}

@@ -1,5 +1,5 @@
 import { openBlock as H, createElementBlock as V, createStaticVNode as t } from "vue";
-import { _ as e } from "./lib-BVHFYSLL.js";
+import { _ as e } from "./lib-Db6j9fQZ.js";
 const i = {}, l = {
   width: "216",
   height: "36",

package/lib/src/{CreatedOnDcom-fr-fr-FD1eqtg3.js → CreatedOnDcom-fr-fr-DCQcsFPf.js}

@@ -1,5 +1,5 @@
 import { openBlock as H, createElementBlock as V, createStaticVNode as t } from "vue";
-import { _ as e } from "./lib-BVHFYSLL.js";
+import { _ as e } from "./lib-Db6j9fQZ.js";
 const i = {}, l = {
   width: "216",
   height: "36",

package/lib/src/{CreatedOnDcom-pt-br-BiSx3OwM.js → CreatedOnDcom-pt-br-DD-oLAS1.js}

@@ -1,5 +1,5 @@
 import { openBlock as H, createElementBlock as V, createStaticVNode as t } from "vue";
-import { _ as M } from "./lib-BVHFYSLL.js";
+import { _ as M } from "./lib-Db6j9fQZ.js";
 const Z = {}, e = {
   width: "232",
   height: "36",

package/lib/src/{CreatedOnDcom-pt-pt-Dn4DmKGA.js → CreatedOnDcom-pt-pt-D8qLq2wW.js}

@@ -1,5 +1,5 @@
 import { openBlock as H, createElementBlock as V, createStaticVNode as t } from "vue";
-import { _ as M } from "./lib-BVHFYSLL.js";
+import { _ as M } from "./lib-Db6j9fQZ.js";
 const Z = {}, e = {
   width: "232",
   height: "36",

package/lib/src/brand-page/components/contact-form/ContactForm.mixin.js

@@ -6,7 +6,7 @@ import brandPageClient from '../../clients/brand-page.client';
 import { isEmail } from '../../../utils/validator.util';
 import { ALIGN_CARD_CENTER, ALIGN_CARD_CENTER_IMAGE, ALIGN_CENTERED, ALIGN_LEFT_FULL_IMAGE, ALIGN_RIGHT_FULL_IMAGE, DISPLAY_STYLE_COLLAPSED, RECAPTCHA_ACTION_CONTACT_FORM, TEXT_ONLY, } from '../../constants';
 import { getRenderText, contentPaddingStyle as toContentPaddingStyle, mutedTextForBackground, backgroundColorFromStyle, } from '@brand-page/utils';
-import { hasRTEContent } from '@brand-page-maker/utils';
+import { hasRTEContent, getPlainTextFromRTE } from '@brand-page-maker/utils';
 import { useReCaptcha } from '../../composables/recaptcha.composable';
 export default defineComponent({
     props: {
@@ -120,7 +120,10 @@ export default defineComponent({
                 isEmail(this.viewModel.responseEmail));
         },
         title() {
-            return this.viewModel.title && this.viewModel.title.trim() !== ''
+            // BP-5787: title may be RTE JSON (not a string), so `.trim()` would
+            // throw — read the visible text via getPlainTextFromRTE to decide
+            // whether to fall back to the default.
+            return getPlainTextFromRTE(this.viewModel.title)
                 ? this.viewModel.title
                 : 'Contact Us';
         },

package/lib/src/brand-page/models/index.d.ts

@@ -7,6 +7,14 @@ import { TextStyles } from './styles.model';
 import { LogoStyles } from './logo.model';
 import type { LogoImageModel, LogoTemplateImageModel } from './logo.model';
 import type { BrandPagePaymentConfig } from './payment.model';
+import type { JSONContent } from '@tiptap/vue-3';
+/**
+ * BP-5787 — a rich-text field is either a legacy inline-HTML string or a
+ * Tiptap JSON document. Typing RTE content fields as RichTextValue (instead of
+ * `string`) forces every consumer to handle both forms — surfacing at compile
+ * time any code that assumes a plain string (e.g. `.replace`, `.length`).
+ */
+export type RichTextValue = string | JSONContent;
 export * from './brand-page-context.model';
 export * from './payment.model';
 export * from './content.model';
@@ -148,7 +156,7 @@ export interface TextContent extends Content {
     /**
      * For BrandPage/BrandContact only
      */
-    text: string;
+    text: RichTextValue;
     /**
      * For BrandSite
      */
@@ -171,9 +179,9 @@ export interface TextContent extends Content {
 }
 export interface ProfileContent extends Content {
     avatarImageUrl: string;
-    name: string;
-    title: string;
-    description: string;
+    name: RichTextValue;
+    title: RichTextValue;
+    description: RichTextValue;
     backgroundColor: BrandPageCssStyle;
     colorReplacements: ColorReplacement[];
     mediaType?: string;
@@ -191,7 +199,7 @@ export interface MapContent extends Content {
 }
 export interface MailingListContent extends Content {
     acceptedFields?: 'emailOnly' | 'nameAndEmail';
-    title: string;
+    title: RichTextValue;
     buttonText: string;
     titleStyle: TextStyleDeclaration;
     buttonTextStyle: TextStyleDeclaration;
@@ -243,10 +251,10 @@ export interface FormField {
 export interface ContactFormContent extends Content {
     type: 'contact-form';
     displayStyle: string;
-    title: string;
-    description: string;
+    title: RichTextValue;
+    description: RichTextValue;
     buttonText: string;
-    successMessage: string;
+    successMessage: RichTextValue;
     fields: FormField[];
     responseEmail: string;
     imageUrl?: string;
@@ -265,8 +273,8 @@ export interface ContactFormContent extends Content {
 export interface BannerSectionContent extends Content {
     type: 'banner-section';
     imageUrl: string;
-    title: string;
-    description: string;
+    title: RichTextValue;
+    description: RichTextValue;
     buttonText: string | false;
     url: string;
     email?: string;
@@ -293,8 +301,8 @@ export declare const MEDIA_TYPES: {
 };
 export type MediaType = keyof typeof MEDIA_TYPES;
 export interface TextMediaItem extends ImageItem {
-    title: string;
-    paragraph: string;
+    title: RichTextValue;
+    paragraph: RichTextValue;
     itemsId: number;
     buttonText?: string | false;
     buttonPageId?: string;
@@ -313,8 +321,8 @@ export interface TextShapeItem extends TextMediaItem {
 export interface ShapeItem extends ImageItem {
     colorReplacements: ColorReplacement[];
     mediaType: MediaType;
-    title?: string;
-    paragraph?: string;
+    title?: RichTextValue;
+    paragraph?: RichTextValue;
     titleOverride?: string;
     paragraphOverride?: string;
 }
@@ -322,9 +330,9 @@ export interface TestimonialItems {
     /** Stable per-item identifier. See ImageItem.id. */
     id: string;
     imageUrl: string;
-    name: string;
-    position: string;
-    testimonials: string;
+    name: RichTextValue;
+    position: RichTextValue;
+    testimonials: RichTextValue;
     colorReplacements: ColorReplacement[];
     mediaType: string;
     size?: string;
@@ -337,7 +345,7 @@ export interface TestimonialItems {
 export interface TextItem {
     /** Stable per-item identifier. See ImageItem.id. */
     id: string;
-    text: string;
+    text: RichTextValue;
     textStyle: TextStyleDeclaration;
     textOverride?: string;
 }
@@ -354,8 +362,8 @@ export interface ImagesSectionContent extends Content, MediaSection {
     enablePopup: boolean;
 }
 export interface MediaSection extends Content {
-    title: string;
-    description: string;
+    title: RichTextValue;
+    description: RichTextValue;
     displayStyle: ImagesSectionContentDisplayStyle;
     items: TextShapeItem[] | TextMediaItem[];
     titleStyle: TextStyleDeclaration;
@@ -372,7 +380,7 @@ export interface ColorReplacement {
 }
 export interface TestimonialSectionContent extends Content {
     type: 'testimonial-section';
-    title: string;
+    title: RichTextValue;
     displayStyle: string;
     items: TestimonialItems[];
     titleStyle: TextStyleDeclaration;
@@ -386,8 +394,8 @@ export interface TestimonialSectionContent extends Content {
 export interface AboutSectionContent extends Content {
     type: 'about-section';
     imageUrl: string;
-    title: string;
-    paragraph: string;
+    title: RichTextValue;
+    paragraph: RichTextValue;
     displayStyle: string;
     titleStyle: TextStyleDeclaration;
     paragraphStyle: TextStyleDeclaration;
@@ -411,7 +419,7 @@ export declare const SOCIAL_LINKS_ICON_DISPLAY_STYLES: {
 export type SocialLinksIconDisplayStyle = keyof typeof SOCIAL_LINKS_ICON_DISPLAY_STYLES;
 export interface SocialLinksContent extends Content {
     type: 'social-links';
-    title: string;
+    title: RichTextValue;
     links: LinksItem[];
     iconDisplayStyle: SocialLinksIconDisplayStyle;
     iconFillStyles: BrandPageCssStyle;
@@ -434,8 +442,8 @@ export interface DividerSectionContent extends Content {
 }
 export interface BookingSectionContent extends Content {
     type: 'booking-section';
-    title: string;
-    description: string;
+    title: RichTextValue;
+    description: RichTextValue;
     buttonText: string;
     url: string;
     email?: string;

package/lib/src/brand-page/utils/migration/migration-20.d.ts

@@ -0,0 +1,2 @@
+import type { MigrationData } from '../migration.util';
+export declare const migration20: (migrationResult: MigrationData) => Promise<MigrationData>;

package/lib/src/brand-page/utils/migration/migration-20.js

@@ -0,0 +1,66 @@
+import { hasRTEContent, toRteJson, resolveHtmlParser, } from '../../../brand-page-maker/utils';
+/**
+ * BP-5787 — migrate existing inline-HTML RTE content to Tiptap JSON.
+ *
+ * The editor emits, and the renderer reads, Tiptap JSON. Existing
+ * published/saved sites still hold RTE fields as HTML strings. This converts
+ * them on load, in EVERY environment:
+ *   - maker (browser): the loaded model is JSON, so the next save persists JSON.
+ *   - web-renderer (SSR / server API routes): converted on read, so old sites
+ *     are normalised without a re-save and downstream code can treat RTE as JSON.
+ *
+ * This is a one-time, versioned migration (runAlways is NOT set): legacy sites
+ * are at model version < 20 and convert on first load in any environment; once
+ * `v` is stamped to 20 the conversion is skipped. This is only safe because the
+ * AI section builders now emit Tiptap JSON directly (they no longer write HTML),
+ * so there is no recurring post-load source of HTML to normalise.
+ *
+ * HTML→JSON parsing needs a DOM parser. Rather than mutate a global `window`,
+ * the parser is resolved once (native `DOMParser` in the browser, a jsdom
+ * `DOMParser` instance on the server) and threaded explicitly through the
+ * conversion — see resolveHtmlParser / toRteJson. No global state is touched, so
+ * the pass is safe on any server runtime and under concurrent requests.
+ *
+ * Scope: only HTML-RTE strings (hasRTEContent) are converted. Plain strings,
+ * numbers, and already-JSON docs are left untouched, so the migration is
+ * idempotent (re-running on JSON content is a no-op — non-string values are
+ * skipped). Nested RTE inside item arrays (textItems, testimonials, images…)
+ * is handled by recursing into arrays; style objects are intentionally not
+ * descended into (they never hold RTE content).
+ */
+const convertRteStringsToJson = (value, parser) => {
+    if (Array.isArray(value)) {
+        value.forEach((item) => convertRteStringsToJson(item, parser));
+        return;
+    }
+    if (!value || typeof value !== 'object')
+        return;
+    const record = value;
+    Object.keys(record).forEach((key) => {
+        const field = record[key];
+        if (typeof field === 'string' && hasRTEContent(field)) {
+            const json = toRteJson(field, parser);
+            if (json)
+                record[key] = json;
+        }
+        else if (Array.isArray(field)) {
+            convertRteStringsToJson(field, parser);
+        }
+    });
+};
+const convertModel = (brandPageModel, parser) => {
+    for (const page of brandPageModel.pages) {
+        for (const content of page.contents) {
+            convertRteStringsToJson(content, parser);
+        }
+    }
+};
+export const migration20 = async (migrationResult) => {
+    const { brandPageModel } = migrationResult;
+    // Resolve a DOM parser for this environment (native in the browser, a jsdom
+    // instance on the server — never touching globals), then convert every
+    // HTML-RTE field to Tiptap JSON with it.
+    const parser = await resolveHtmlParser();
+    convertModel(brandPageModel, parser);
+    return migrationResult;
+};

package/lib/src/brand-page/utils/migration.util.js

@@ -22,6 +22,7 @@ import { migration16 } from './migration/migration-16';
 import { migration17 } from './migration/migration-17';
 import { migration18 } from './migration/migration-18';
 import { migration19 } from './migration/migration-19';
+import { migration20 } from './migration/migration-20';
 const MIGRATION_TABLE = [
     {
         version: 1,
@@ -149,6 +150,16 @@ const MIGRATION_TABLE = [
         runAlways: true,
         description: 'BP-5800: seed the button fill colour as each block’s own container colour so it is independent of the site button (existing sites render unchanged) — backgroundStyle for mailing-list, request-payment and support-me (all types); cardStyle for the BP/BC contact form (skipped on brand-site)',
     },
+    {
+        version: 20,
+        migrateFn: migration20,
+        // One-time versioned migration (NOT runAlways): legacy sites (v < 20)
+        // convert on their first load in any environment — the maker (browser DOM)
+        // and web-renderer SSR (migration-20 installs a jsdom window). It no longer
+        // needs to re-run every load because the AI section builders now emit Tiptap
+        // JSON directly, so there is no recurring post-load source of HTML to catch.
+        description: 'BP-5787: convert inline-HTML RTE content to Tiptap JSON on first load (client or server); AI builders emit JSON directly, so this runs once per site',
+    },
 ];
 export const GetLatestModelVersion = () => Math.max(...MIGRATION_TABLE.map((x) => x.version));
 export const migrateBrandPageModel = async (brandPageModel, options) => {

package/lib/src/brand-page/utils/text.util.d.ts

@@ -1,5 +1,5 @@
 export declare const getRenderText: (text: string) => string;
-export declare const escapeContentText: (text: string | undefined) => string | undefined;
+export declare const escapeContentText: (text: unknown) => string | undefined;
 export declare const decodeHtmlEntities: (text: string) => string;
 export declare const unescapeContentText: (text: string) => string;
 export declare const encodeContentText: (text: string | undefined) => string | undefined;

package/lib/src/brand-page/utils/text.util.js

@@ -1,11 +1,43 @@
 import { ESCAPED_NEWLINE_CHARACTER } from '../../constants/ui';
+/**
+ * BP-5787 — a Tiptap JSON document is an object with `type: 'doc'`.
+ * Inlined here (rather than importing from brand-page-maker) to avoid a
+ * circular import: rich-text-editor.util imports getRenderText from this file.
+ */
+const isTiptapDoc = (value) => typeof value === 'object' &&
+    value !== null &&
+    value.type === 'doc';
+const jsonDocPlainText = (doc) => {
+    const parts = [];
+    const walk = (node) => {
+        if (typeof node?.text === 'string')
+            parts.push(node.text);
+        node?.content?.forEach(walk);
+    };
+    walk(doc);
+    return parts.join(' ').replace(/\s+/g, ' ').trim();
+};
 export const getRenderText = (text) => {
+    // BP-5787: RTE fields may now be Tiptap JSON objects. Non-strings pass
+    // through untouched so the renderer (TextWrapper) handles them via its
+    // JSON-aware path, instead of throwing on `.replace`.
+    if (typeof text !== 'string') {
+        return text;
+    }
     return text.replace(new RegExp(`(${ESCAPED_NEWLINE_CHARACTER}|\\n)`, 'g'), '<br/>');
 };
+// Accepts a legacy inline-HTML string or a Tiptap JSON document (BP-5787):
+// for JSON it returns the concatenated visible text; for HTML it strips tags.
 export const escapeContentText = (text) => {
     if (!text) {
         return text;
     }
+    if (isTiptapDoc(text)) {
+        return jsonDocPlainText(text);
+    }
+    if (typeof text !== 'string') {
+        return undefined;
+    }
     return text
         .replace(/(<([^>]+)>)/gi, '')
         .replace(/(\r\n|\r|\n)/g, ESCAPED_NEWLINE_CHARACTER);

package/lib/src/brand-page/utils/vcard.util.js

@@ -150,9 +150,9 @@ const processSocialLinks = (socialLinksContent, vcardLines, addedEntries) => {
     });
 };
 const addProfileInfo = (profile, vcardLines) => {
-    const name = sanitizeForVCard(profile.name || '');
-    const title = sanitizeForVCard(profile.title || '');
-    const description = sanitizeForVCard(profile.description || '');
+    const name = sanitizeForVCard(getPlainTextFromRTE(profile.name) || '');
+    const title = sanitizeForVCard(getPlainTextFromRTE(profile.title) || '');
+    const description = sanitizeForVCard(getPlainTextFromRTE(profile.description) || '');
     if (name) {
         const nameParts = name.trim().split(/\s+/);
         const lastName = nameParts.length > 1 ? nameParts.pop() || '' : '';
@@ -205,6 +205,6 @@ const downloadVCard = (vcard, filename) => {
 export const saveContact = (brandPageData) => {
     const vcard = generateVCard(brandPageData);
     const profile = findProfileContent(brandPageData);
-    const filename = generateVCardFilename(profile?.name);
+    const filename = generateVCardFilename(getPlainTextFromRTE(profile?.name));
     downloadVCard(vcard, filename);
 };

package/lib/src/brand-page/utils/view-model.util.d.ts

@@ -28,6 +28,7 @@ interface ViewModelMappingOptions {
     setVideoUrlsWithToken?: (token: string, videoUrl: string, previewImageUrl: string, assetId: string) => void;
 }
 export declare const getBrandPageViewModelFromBrandPageModel: (model: BrandPageModel, brandPageToken: string | undefined, showBrandCrowdLogo: boolean | undefined, options: ViewModelMappingOptions) => BrandPageViewModel;
+export declare const resolvePageIdsInRteJson: (doc: unknown, nav: NavViewModel, options: ViewModelMappingOptions) => unknown;
 export declare const isLogoViewModel: (viewModel: ContentViewModel) => viewModel is LogoViewModel;
 /** for service.brand-page website preview by logo draft token */
 export declare const applyLogoImageToBrandPageViewModel: (viewModel: BrandPageViewModel, logoImage: LogoImageModel) => BrandPageViewModel;

package/lib/src/brand-page/utils/view-model.util.js

@@ -10,7 +10,7 @@ import { isValidSvgUrl } from './image.util';
 import { isLogoContent } from './model.util';
 import { getBoxShadowValue } from './button.util';
 import { findNavItemByPageId, getRouteNameByPageIndex, getRouteParamsByPage, } from './route.util';
-import { hasRTEContent } from '../../brand-page-maker/utils';
+import { hasRTEContent, isTiptapDocument } from '../../brand-page-maker/utils';
 import { getPageIdFromHref, isHrefPageId, } from '../../brand-page-maker/composables/rich-text-editor/hyperlink';
 const BUTTON_BORDER_RADIUS = '9999px';
 const CONTENT_BORDER_RADIUS = '48px';
@@ -864,13 +864,75 @@ const mapPageIdReferencesToRelativePaths = (pages, nav, options) => {
         });
     });
 };
+// Resolve a `pageid:<id>` internal-link href to the published relative path.
+// Returns the resolved href, or null when `href` is not an internal pageid link
+// (external/absolute links are left untouched). Falls back to the site root when
+// the pageid can't be matched to a nav route.
+const resolvePageIdHref = (href, nav, options) => {
+    // Only process internal links (no protocol, doesn't start with /)
+    if (!href || href.match(/^(https?:\/\/|\/)/) || !isHrefPageId(href)) {
+        return null;
+    }
+    const pageId = getPageIdFromHref(href);
+    const route = findNavItemByPageId(nav.navItems, pageId);
+    const brandPageSlugRoute = options.brandPageSlug
+        ? `/${options.brandPageSlug}`
+        : '/';
+    if (route) {
+        if (route.isRoot) {
+            return brandPageSlugRoute;
+        }
+        return `${brandPageSlugRoute}${brandPageSlugRoute === '/' ? '' : '/'}${route.relativePath}`;
+    }
+    // fallback to root if pageid cannot be resolved.
+    return brandPageSlugRoute;
+};
+// BP-5847: walk a Tiptap JSON doc and rewrite every link mark whose href is a
+// `pageid:` reference into its published relative path. Returns a NEW doc when
+// something changed (so the shared model doc is never mutated), else the same
+// reference.
+export const resolvePageIdsInRteJson = (doc, nav, options) => {
+    let changed = false;
+    const walk = (node) => {
+        if (!node || typeof node !== 'object') {
+            return node;
+        }
+        let next = node;
+        if (Array.isArray(node.marks)) {
+            const marks = node.marks.map((mark) => {
+                if (mark?.type === 'link' && typeof mark.attrs?.href === 'string') {
+                    const resolved = resolvePageIdHref(mark.attrs.href, nav, options);
+                    if (resolved !== null) {
+                        changed = true;
+                        return { ...mark, attrs: { ...mark.attrs, href: resolved } };
+                    }
+                }
+                return mark;
+            });
+            next = { ...next, marks };
+        }
+        if (Array.isArray(node.content)) {
+            next = { ...next, content: node.content.map(walk) };
+        }
+        return next;
+    };
+    const result = walk(doc);
+    return changed ? result : doc;
+};
 const dynamicallyMapPageIdInHyperlinksToRelativePaths = (content, nav, options) => {
     Object.keys(content).forEach((key) => {
         const value = content[key];
         if (value === undefined || value === null) {
             return;
         }
-        if (typeof value === 'object' && (key === 'items' || key === 'textItems')) {
+        if (isTiptapDocument(value)) {
+            // BP-5847: RTE fields may now be Tiptap JSON. Resolve pageid link marks
+            // here too, or internal links render as raw `pageid:` and don't navigate.
+            content[key] =
+                resolvePageIdsInRteJson(value, nav, options);
+        }
+        else if (typeof value === 'object' &&
+            (key === 'items' || key === 'textItems')) {
             if (Array.isArray(value)) {
                 value.forEach((item) => {
                     dynamicallyMapPageIdInHyperlinksToRelativePaths(item, nav, options);
@@ -882,24 +944,10 @@ const dynamicallyMapPageIdInHyperlinksToRelativePaths = (content, nav, options)
         }
         else if (typeof value === 'string' && hasRTEContent(value)) {
             content[key] = value.replace(/<a\s+([^>]*?)href="([^"]*?)"([^>]*?)>/gi, (match, existingAttrsStart, href, existingAttrsEnd) => {
-                // Only process internal links (no protocol, doesn't start with /)
-                if (href && !href.match(/^(https?:\/\/|\/)/) && isHrefPageId(href)) {
-                    const pageId = getPageIdFromHref(href);
-                    const route = findNavItemByPageId(nav.navItems, pageId);
-                    const brandPageSlugRoute = options.brandPageSlug
-                        ? `/${options.brandPageSlug}`
-                        : '/';
-                    if (route) {
-                        let href = `${brandPageSlugRoute}`;
-                        if (!route.isRoot) {
-                            href = `${brandPageSlugRoute}${brandPageSlugRoute === '/' ? '' : '/'}${route.relativePath}`;
-                        }
-                        return `<a ${existingAttrsStart}href="${href}"${existingAttrsEnd}>`;
-                    }
-                    // fallback to root if pageid cannot be resolved.
-                    return `<a ${existingAttrsStart}href="${brandPageSlugRoute}"${existingAttrsEnd}>`;
-                }
-                return match;
+                const resolved = resolvePageIdHref(href, nav, options);
+                return resolved === null
+                    ? match
+                    : `<a ${existingAttrsStart}href="${resolved}"${existingAttrsEnd}>`;
             });
         }
     });

package/lib/src/brand-page/view-models.d.ts

@@ -1,4 +1,4 @@
-import type { ButtonWithModalContent, ProfileContent, TextContent, VideoContent, ImageContent, ContentType, ButtonStyles, LogoStyles, MapContent, ImageGalleryContent, GalleryStyles, MailingListContent, RequestPaymentContent, ShopContent, SupportMeContent, ContactFormContent, BannerSectionContent, BrandPageType, SocialLinksContent, TestimonialSectionContent, AboutSectionContent, DividerSectionContent, ShapesSectionContent, ButtonLinkType, PageHeaderMobile, PageHeaderDesktop, PageFooterMobile, PageFooterDesktop, TextMediaItem, TextShapeItem, TextStyleDeclaration, AspectRatio, LogoImageModel, LogoTemplateImageModel, CookieOptions, BookingSectionContent, MediaTypes, TextStyles, BackgroundStyle, BackgroundShape, PersonalisationRole, SaveContactOptions } from './models';
+import type { ButtonWithModalContent, ProfileContent, TextContent, VideoContent, ImageContent, ContentType, ButtonStyles, LogoStyles, MapContent, ImageGalleryContent, GalleryStyles, MailingListContent, RequestPaymentContent, ShopContent, SupportMeContent, ContactFormContent, BannerSectionContent, BrandPageType, SocialLinksContent, TestimonialSectionContent, AboutSectionContent, DividerSectionContent, ShapesSectionContent, ButtonLinkType, PageHeaderMobile, PageHeaderDesktop, PageFooterMobile, PageFooterDesktop, TextMediaItem, TextShapeItem, TextStyleDeclaration, AspectRatio, LogoImageModel, LogoTemplateImageModel, CookieOptions, BookingSectionContent, MediaTypes, TextStyles, BackgroundStyle, BackgroundShape, PersonalisationRole, SaveContactOptions, RichTextValue } from './models';
 import type { ImagesSectionContentDisplayStyle } from './constants';
 export type ViewModelType = 'button' | 'image' | 'image-gallery' | 'logo' | 'map' | 'mailing-list' | 'profile' | 'support-me' | 'request-payment' | 'text' | 'video' | 'contact-form' | 'banner-section' | 'images-section' | 'about-section' | 'divider-section' | 'testimonial-section' | 'social-links' | 'shapes-section' | 'shop-section' | 'booking-section';
 export interface ContentViewModel {
@@ -94,8 +94,8 @@ export interface TextImageSectionViewModel {
     id: string;
     type: 'images-section';
     role: ContentType;
-    title: string;
-    description: string;
+    title: RichTextValue;
+    description: RichTextValue;
     displayStyle: ImagesSectionContentDisplayStyle;
     aspectRatio: AspectRatio;
     areImagesFullWidth: boolean;

package/lib/src/brand-page-maker/__fixtures__/complex-rte.fixture.d.ts

@@ -0,0 +1,22 @@
+/**
+ * BP-5787 — golden-master fixture for the RTE HTML→JSON migration.
+ *
+ * A single rich-text value that exercises every mark/node the editor can emit,
+ * so one snapshot guards the whole serialisation surface. Captured as a baseline
+ * on the current HTML pipeline; after the migration the JSON pipeline must
+ * reproduce byte-identical rendered output (see rte-render-parity.test.ts).
+ *
+ * Coverage:
+ *  - block nodes: heading (h2), paragraph, text-align (center / right)
+ *  - inline marks: bold, italic, underline, strike
+ *  - textStyle attrs: fontFamily, fontSize (em), letterSpacing (em), lineHeight (unitless)
+ *  - colour: theme TOKEN ref (var(--logo-text-color)) AND a literal hex (#FF0000)
+ *  - highlight (background colour via <mark>)
+ *  - links: internal (target=_self) and external (target=_blank rel=noopener)
+ */
+export declare const COMPLEX_RTE_HTML = "<h2 style=\"text-align: center\"><span style=\"color: var(--logo-text-color)\">Themed heading</span></h2><p><strong>bold</strong> <em>italic</em> <u>underline</u> <s>strike</s> <span style=\"font-family: Montserrat; font-size: 1.5em; letter-spacing: 0.05em; line-height: 1.4\">styled span</span> <mark data-color=\"#ffe08a\" style=\"background-color: #ffe08a\">highlight</mark> <span style=\"color: #FF0000\">literal hex</span> <a target=\"_self\" href=\"/about\">internal link</a> <a target=\"_blank\" rel=\"noopener noreferrer nofollow\" href=\"https://example.com\">external link</a></p><p style=\"text-align: right\">second paragraph, right-aligned</p>";
+/**
+ * The theme-token CSS variable that MUST survive the HTML→JSON round-trip
+ * (BP-5787 stores token refs instead of flattening them to rgb()).
+ */
+export declare const THEME_TOKEN_REF = "var(--logo-text-color)";