@designcrowd/library.brand-page 6.0.6-json-prereq-7 → 6.0.6-undo-2

package/lib/src/{CreatedOnBrandCrowd-de-de-SPVLPi8n.js → CreatedOnBrandCrowd-de-de-BSFTp6yl.js}

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

package/lib/src/{CreatedOnBrandCrowd-en-us-CvtrCPHd.js → CreatedOnBrandCrowd-en-us-rPQrOY1L.js}

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

package/lib/src/{CreatedOnBrandCrowd-es-es-BSsac7jB.js → CreatedOnBrandCrowd-es-es-awd8-QFa.js}

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

package/lib/src/{CreatedOnBrandCrowd-fr-fr-BauENV2a.js → CreatedOnBrandCrowd-fr-ca-CwJ4J7Ow.js}

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

package/lib/src/{CreatedOnBrandCrowd-fr-ca-BauENV2a.js → CreatedOnBrandCrowd-fr-fr-CwJ4J7Ow.js}

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

package/lib/src/{CreatedOnBrandCrowd-pt-pt-Be0hawmr.js → CreatedOnBrandCrowd-pt-br-BXYfTLlD.js}

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

package/lib/src/{CreatedOnBrandCrowd-pt-br-Be0hawmr.js → CreatedOnBrandCrowd-pt-pt-BXYfTLlD.js}

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

package/lib/src/{CreatedOnDcom-de-de-CTjE2Tmn.js → CreatedOnDcom-de-de-kX6u1lNK.js}

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

package/lib/src/{CreatedOnDcom-en-us-DnZRp5Pg.js → CreatedOnDcom-en-us-Bkq5sgFs.js}

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

package/lib/src/{CreatedOnDcom-es-es-J-9qvjy8.js → CreatedOnDcom-es-es-zCAC9ujj.js}

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

package/lib/src/{CreatedOnDcom-fr-ca-BDNHqm4G.js → CreatedOnDcom-fr-ca-BYz6Wzg5.js}

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

package/lib/src/{CreatedOnDcom-fr-fr-B_2-ceuO.js → CreatedOnDcom-fr-fr-CN-wAaSH.js}

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

package/lib/src/{CreatedOnDcom-pt-br-76lJVrAY.js → CreatedOnDcom-pt-br-BrK4Ngg-.js}

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

package/lib/src/{CreatedOnDcom-pt-pt-TQp3CNcu.js → CreatedOnDcom-pt-pt-AfI_g7xJ.js}

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

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

@@ -7,14 +7,6 @@ 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';
@@ -149,7 +141,7 @@ export interface TextContent extends Content {
     /**
      * For BrandPage/BrandContact only
      */
-    text: RichTextValue;
+    text: string;
     /**
      * For BrandSite
      */
@@ -172,9 +164,9 @@ export interface TextContent extends Content {
 }
 export interface ProfileContent extends Content {
     avatarImageUrl: string;
-    name: RichTextValue;
-    title: RichTextValue;
-    description: RichTextValue;
+    name: string;
+    title: string;
+    description: string;
     backgroundColor: BrandPageCssStyle;
     colorReplacements: ColorReplacement[];
     mediaType?: string;
@@ -192,7 +184,7 @@ export interface MapContent extends Content {
 }
 export interface MailingListContent extends Content {
     acceptedFields?: 'emailOnly' | 'nameAndEmail';
-    title: RichTextValue;
+    title: string;
     buttonText: string;
     titleStyle: TextStyleDeclaration;
     buttonTextStyle: TextStyleDeclaration;
@@ -243,10 +235,10 @@ export interface FormField {
 export interface ContactFormContent extends Content {
     type: 'contact-form';
     displayStyle: string;
-    title: RichTextValue;
-    description: RichTextValue;
+    title: string;
+    description: string;
     buttonText: string;
-    successMessage: RichTextValue;
+    successMessage: string;
     fields: FormField[];
     responseEmail: string;
     imageUrl?: string;
@@ -265,8 +257,8 @@ export interface ContactFormContent extends Content {
 export interface BannerSectionContent extends Content {
     type: 'banner-section';
     imageUrl: string;
-    title: RichTextValue;
-    description: RichTextValue;
+    title: string;
+    description: string;
     buttonText: string | false;
     url: string;
     email?: string;
@@ -293,8 +285,8 @@ export declare const MEDIA_TYPES: {
 };
 export type MediaType = keyof typeof MEDIA_TYPES;
 export interface TextMediaItem extends ImageItem {
-    title: RichTextValue;
-    paragraph: RichTextValue;
+    title: string;
+    paragraph: string;
     itemsId: number;
     buttonText?: string | false;
     buttonPageId?: string;
@@ -313,16 +305,16 @@ export interface TextShapeItem extends TextMediaItem {
 export interface ShapeItem extends ImageItem {
     colorReplacements: ColorReplacement[];
     mediaType: MediaType;
-    title?: RichTextValue;
-    paragraph?: RichTextValue;
+    title?: string;
+    paragraph?: string;
     titleOverride?: string;
     paragraphOverride?: string;
 }
 export interface TestimonialItems {
     imageUrl: string;
-    name: RichTextValue;
-    position: RichTextValue;
-    testimonials: RichTextValue;
+    name: string;
+    position: string;
+    testimonials: string;
     colorReplacements: ColorReplacement[];
     mediaType: string;
     size?: string;
@@ -333,7 +325,7 @@ export interface TestimonialItems {
     positionOverride?: string;
 }
 export interface TextItem {
-    text: RichTextValue;
+    text: string;
     textStyle: TextStyleDeclaration;
     textOverride?: string;
 }
@@ -350,8 +342,8 @@ export interface ImagesSectionContent extends Content, MediaSection {
     enablePopup: boolean;
 }
 export interface MediaSection extends Content {
-    title: RichTextValue;
-    description: RichTextValue;
+    title: string;
+    description: string;
     displayStyle: ImagesSectionContentDisplayStyle;
     items: TextShapeItem[] | TextMediaItem[];
     titleStyle: TextStyleDeclaration;
@@ -368,7 +360,7 @@ export interface ColorReplacement {
 }
 export interface TestimonialSectionContent extends Content {
     type: 'testimonial-section';
-    title: RichTextValue;
+    title: string;
     displayStyle: string;
     items: TestimonialItems[];
     titleStyle: TextStyleDeclaration;
@@ -382,8 +374,8 @@ export interface TestimonialSectionContent extends Content {
 export interface AboutSectionContent extends Content {
     type: 'about-section';
     imageUrl: string;
-    title: RichTextValue;
-    paragraph: RichTextValue;
+    title: string;
+    paragraph: string;
     displayStyle: string;
     titleStyle: TextStyleDeclaration;
     paragraphStyle: TextStyleDeclaration;
@@ -405,7 +397,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: RichTextValue;
+    title: string;
     links: LinksItem[];
     iconDisplayStyle: SocialLinksIconDisplayStyle;
     iconFillStyles: BrandPageCssStyle;
@@ -428,8 +420,8 @@ export interface DividerSectionContent extends Content {
 }
 export interface BookingSectionContent extends Content {
     type: 'booking-section';
-    title: RichTextValue;
-    description: RichTextValue;
+    title: string;
+    description: string;
     buttonText: string;
     url: string;
     email?: string;

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

@@ -30,6 +30,20 @@ export declare const calculateOptimizedLogoDimensions: (logoData: {
     width: string;
     height: string;
 };
+/**
+ * Resolves the "current" logo image from a brand-page MODEL (the raw,
+ * deserialized shape — not the live stores, whose contents are wrapped in
+ * `settings.content`).
+ *
+ * Brand-site keeps its logo in the page header; brand-page and brand-contact
+ * keep it as a logo CONTENT block on the home page — the same `isBrandSite ?
+ * header : content` split the logo-settings store getters/setter use. This is
+ * the single source of truth for model-level logo reads: initial load and
+ * history-restore both call it so the two paths can't drift. They previously
+ * hard-coded `=== brandPage`, which silently excluded brand-contact and read a
+ * stale header logo on undo.
+ */
+export declare const getLogoImageFromModel: (model: BrandPageModel) => LogoImageModel | undefined;
 export declare const recalculateLogoContentDimensions: (pageData: any, editableLogoVariations: {
     variationId: number;
     width: number;

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

@@ -225,6 +225,25 @@ export const calculateOptimizedLogoDimensions = (logoData, currentWidth, current
     }
     return { width: currentWidth, height: currentHeight };
 };
+/**
+ * Resolves the "current" logo image from a brand-page MODEL (the raw,
+ * deserialized shape — not the live stores, whose contents are wrapped in
+ * `settings.content`).
+ *
+ * Brand-site keeps its logo in the page header; brand-page and brand-contact
+ * keep it as a logo CONTENT block on the home page — the same `isBrandSite ?
+ * header : content` split the logo-settings store getters/setter use. This is
+ * the single source of truth for model-level logo reads: initial load and
+ * history-restore both call it so the two paths can't drift. They previously
+ * hard-coded `=== brandPage`, which silently excluded brand-contact and read a
+ * stale header logo on undo.
+ */
+export const getLogoImageFromModel = (model) => {
+    if (model.brandPageType === BRAND_PAGE_TYPES.brandSite) {
+        return model.pageHeaderDesktop?.logoImage;
+    }
+    return model.pages?.[0]?.contents?.find(isLogoContent)?.logoImage;
+};
 export const recalculateLogoContentDimensions = async (pageData, editableLogoVariations, logoImage, isPrePurchase) => {
     try {
         let logoData;

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

@@ -20,7 +20,6 @@ import { migration14 } from './migration/migration-14';
 import { migration15 } from './migration/migration-15';
 import { migration16 } from './migration/migration-16';
 import { migration17 } from './migration/migration-17';
-import { migration18 } from './migration/migration-18';
 const MIGRATION_TABLE = [
     {
         version: 1,
@@ -133,16 +132,6 @@ const MIGRATION_TABLE = [
         runAlways: true,
         description: 'Padding Control backfill (BP-5699 Tier 2 + BP-5700 Store): backfill existing top/bottom spacing as explicit padding for text (12px), images/social links/shapes/booking (32px), store (16px), contact form (per layout), banner and about (per display style)',
     },
-    {
-        version: 18,
-        migrateFn: migration18,
-        // runAlways: normalise RTE to JSON on every load. Idempotent (only HTML
-        // strings are converted; JSON is skipped), so it also catches content the
-        // AI section builders still emit as HTML — converting it on the next read
-        // without a new migration or changes to those builders.
-        runAlways: true,
-        description: 'BP-5787: convert inline-HTML RTE content to Tiptap JSON on load (lazy migrate-on-read for web-renderer; persisted on next maker save; also normalises AI-built HTML)',
-    },
 ];
 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: unknown) => string | undefined;
+export declare const escapeContentText: (text: string | undefined) => 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,43 +1,11 @@
 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(getPlainTextFromRTE(profile.name) || '');
-    const title = sanitizeForVCard(getPlainTextFromRTE(profile.title) || '');
-    const description = sanitizeForVCard(getPlainTextFromRTE(profile.description) || '');
+    const name = sanitizeForVCard(profile.name || '');
+    const title = sanitizeForVCard(profile.title || '');
+    const description = sanitizeForVCard(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(getPlainTextFromRTE(profile?.name));
+    const filename = generateVCardFilename(profile?.name);
     downloadVCard(vcard, filename);
 };

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

@@ -28,7 +28,6 @@ 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, isTiptapDocument } from '../../brand-page-maker/utils';
+import { hasRTEContent } 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';
@@ -863,75 +863,13 @@ 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 (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 (typeof value === 'object' && (key === 'items' || key === 'textItems')) {
             if (Array.isArray(value)) {
                 value.forEach((item) => {
                     dynamicallyMapPageIdInHyperlinksToRelativePaths(item, nav, options);
@@ -943,10 +881,24 @@ const dynamicallyMapPageIdInHyperlinksToRelativePaths = (content, nav, options)
         }
         else if (typeof value === 'string' && hasRTEContent(value)) {
             content[key] = value.replace(/<a\s+([^>]*?)href="([^"]*?)"([^>]*?)>/gi, (match, existingAttrsStart, href, existingAttrsEnd) => {
-                const resolved = resolvePageIdHref(href, nav, options);
-                return resolved === null
-                    ? match
-                    : `<a ${existingAttrsStart}href="${resolved}"${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;
             });
         }
     });

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, RichTextValue } 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 } 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: RichTextValue;
-    description: RichTextValue;
+    title: string;
+    description: string;
     displayStyle: ImagesSectionContentDisplayStyle;
     aspectRatio: AspectRatio;
     areImagesFullWidth: boolean;

package/lib/src/brand-page-maker/components/action-bar/ActionBar.mixin.d.ts

@@ -118,7 +118,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             content: TContent;
         }>(payload: P): Promise<void>;
         _captureTemplateSwitchIfEnabled(): void;
-        applyHistorySnapshot(snapshot: import("@brand-page/models").BrandPageModel, activePageId?: string, logoEditsStr?: string): Promise<void>;
+        applyHistorySnapshot(snapshot: import("@brand-page/models").BrandPageModel, activePageId?: string, logoEditsStr?: string, selectedTemplateId?: string | false): Promise<void>;
         _syncLogoSettingsFromSnapshot(snapshot: import("@brand-page/models").BrandPageModel, logoEditsStr?: string): Promise<void>;
         _navigateToActivePage(activePageId?: string): void;
         _fallbackSidebarIfSelectedContentMissing(snapshot: import("@brand-page/models").BrandPageModel): void;

package/lib/src/brand-page-maker/components/brand-page-maker/BrandPageMaker.mixin.d.ts

@@ -163,7 +163,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             content: TContent;
         }>(payload: P): Promise<void>;
         _captureTemplateSwitchIfEnabled(): void;
-        applyHistorySnapshot(snapshot: import("@brand-page").BrandPageModel, activePageId?: string, logoEditsStr?: string): Promise<void>;
+        applyHistorySnapshot(snapshot: import("@brand-page").BrandPageModel, activePageId?: string, logoEditsStr?: string, selectedTemplateId?: string | false): Promise<void>;
         _syncLogoSettingsFromSnapshot(snapshot: import("@brand-page").BrandPageModel, logoEditsStr?: string): Promise<void>;
         _navigateToActivePage(activePageId?: string): void;
         _fallbackSidebarIfSelectedContentMissing(snapshot: import("@brand-page").BrandPageModel): void;

package/lib/src/brand-page-maker/components/brand-page-maker/BrandPageMaker.mixin.js

@@ -196,7 +196,7 @@ export default defineComponent({
         this.brandPageMakerStore.setIsBrandPageLoaded(true);
         // Capture baseline for undo/redo when the feature is active for this
         // session — see useUndoRedoFlag.ts for the gate (LaunchDarkly flag +
-        // brand-site + non-admin maker).
+        // non-admin maker; all three brands).
         if (useUndoRedoFlag().value) {
             useHistoryStore().captureBaseline();
         }

package/lib/src/brand-page-maker/components/brand-page-maker/BrandPageMakerTemplateSettings.mixin.d.ts

@@ -107,7 +107,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             content: TContent;
         }>(payload: P): Promise<void>;
         _captureTemplateSwitchIfEnabled(): void;
-        applyHistorySnapshot(snapshot: import("../../../lib").BrandPageModel, activePageId?: string, logoEditsStr?: string): Promise<void>;
+        applyHistorySnapshot(snapshot: import("../../../lib").BrandPageModel, activePageId?: string, logoEditsStr?: string, selectedTemplateId?: string | false): Promise<void>;
         _syncLogoSettingsFromSnapshot(snapshot: import("../../../lib").BrandPageModel, logoEditsStr?: string): Promise<void>;
         _navigateToActivePage(activePageId?: string): void;
         _fallbackSidebarIfSelectedContentMissing(snapshot: import("../../../lib").BrandPageModel): void;

package/lib/src/brand-page-maker/components/brandpage-maker-page/BrandPageMakerPage.mixin.d.ts

@@ -626,7 +626,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             content: TContent;
         }>(payload: P): Promise<void>;
         _captureTemplateSwitchIfEnabled(): void;
-        applyHistorySnapshot(snapshot: import("@brand-page").BrandPageModel, activePageId?: string, logoEditsStr?: string): Promise<void>;
+        applyHistorySnapshot(snapshot: import("@brand-page").BrandPageModel, activePageId?: string, logoEditsStr?: string, selectedTemplateId?: string | false): Promise<void>;
         _syncLogoSettingsFromSnapshot(snapshot: import("@brand-page").BrandPageModel, logoEditsStr?: string): Promise<void>;
         _navigateToActivePage(activePageId?: string): void;
         _fallbackSidebarIfSelectedContentMissing(snapshot: import("@brand-page").BrandPageModel): void;

package/lib/src/brand-page-maker/components/brandpage-settings/ReplaceImageSettingsForBrandPageSettings.mixin.d.ts

@@ -113,7 +113,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             content: TContent;
         }>(payload: P): Promise<void>;
         _captureTemplateSwitchIfEnabled(): void;
-        applyHistorySnapshot(snapshot: import("../../../brand-page").BrandPageModel, activePageId?: string, logoEditsStr?: string): Promise<void>;
+        applyHistorySnapshot(snapshot: import("../../../brand-page").BrandPageModel, activePageId?: string, logoEditsStr?: string, selectedTemplateId?: string | false): Promise<void>;
         _syncLogoSettingsFromSnapshot(snapshot: import("../../../brand-page").BrandPageModel, logoEditsStr?: string): Promise<void>;
         _navigateToActivePage(activePageId?: string): void;
         _fallbackSidebarIfSelectedContentMissing(snapshot: import("../../../brand-page").BrandPageModel): void;