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

package/lib/src/lib.js

@@ -30,8 +30,6 @@ export { minifyBrandPageMetadata, } from './utils/minify-brand-page-metadata';
 export * as brandPageUtils from './brand-page/utils';
 export { getOptimalLogoSize, calculateOptimizedLogoDimensions, applyLogoImageBase64UrlToBrandPageTemplateModel, recalculateLogoContentDimensions, recalculateHeaderLogoSizes, } from './brand-page/utils/logo.util';
 export { sanitizeRTEHtml } from './brand-page-maker/utils';
-// BP-5787: RTE JSON storage boundary helpers (render/normalise/sanitise/extract).
-export { renderRteToHtml, toRteJson, isTiptapDocument, sanitizeRteJson, getRteJsonPlainText, } from './brand-page-maker/utils';
 export { getPageSlugFromPageTitle } from './brand-page-maker/utils/slug.util';
 // AI-pipeline preview (longclaw per-turn snapshots): web-renderer's
 // /preview/ai-pipeline render page + manifest server route apply the agent's

package/lib/src/metadata-builder/builders/reorder-pages-builder.d.ts

@@ -0,0 +1,13 @@
+import type { BrandPageModel } from '../../brand-page/models';
+import { BaseMetadataBuilder, type BuilderResult, type MetadataBuilderRequest } from '../models';
+import type { Logger } from '../logger';
+export interface ReorderPagesPayload {
+    pageOrder: string[];
+}
+export declare class ReorderPagesBuilder extends BaseMetadataBuilder<ReorderPagesPayload> {
+    constructor(request: MetadataBuilderRequest<ReorderPagesPayload>, logger?: Logger);
+    validateAsync(): Promise<{
+        errors: string[];
+    }>;
+    buildAsync(model: BrandPageModel): Promise<BuilderResult>;
+}

package/lib/src/metadata-builder/builders/reorder-pages-builder.js

@@ -0,0 +1,49 @@
+import { BaseMetadataBuilder, } from '../models';
+export class ReorderPagesBuilder extends BaseMetadataBuilder {
+    constructor(request, logger) {
+        super(request, logger);
+    }
+    async validateAsync() {
+        const errors = [];
+        const payload = this.request.payload;
+        if (!payload?.pageOrder?.length) {
+            errors.push('page_order is required for reorder_pages');
+        }
+        return { errors };
+    }
+    async buildAsync(model) {
+        this.log('Build called');
+        const validation = await this.validateAsync();
+        if (validation.errors.length) {
+            return { request: this.request, model, errors: validation.errors };
+        }
+        const { pageOrder } = this.request.payload;
+        // Build pageId → routeId lookup from nav.routes
+        const pageIdToRouteId = new Map();
+        for (const route of model.nav.routes) {
+            pageIdToRouteId.set(route.pageId, route.id);
+        }
+        // Build new nav.orders from the flat page_order (array of pageIds)
+        const newOrders = [];
+        const seenRouteIds = new Set();
+        for (const pageId of pageOrder) {
+            const routeId = pageIdToRouteId.get(pageId);
+            if (!routeId)
+                continue;
+            newOrders.push({ routeId, subRoutes: [] });
+            seenRouteIds.add(routeId);
+        }
+        // Safety: append any routes not mentioned (don't lose pages)
+        for (const route of model.nav.routes) {
+            const routeId = pageIdToRouteId.get(route.pageId);
+            if (routeId && !seenRouteIds.has(routeId)) {
+                newOrders.push({ routeId, subRoutes: [] });
+            }
+        }
+        model.nav.orders = newOrders;
+        this.log({
+            message: `Reordered pages: ${pageOrder.join(', ')}`,
+        });
+        return { request: this.request, model };
+    }
+}

package/lib/src/metadata-builder/builders/update-content-text-builder.js

@@ -1,23 +1,6 @@
 import {} from '../../brand-page/models';
 import { BaseMetadataBuilder, BUILDER_TYPES, } from '../models';
-import { hasRTEContent, replaceTextInRTE, isTiptapDocument, renderRteToHtml, toRteJson, } from '../../brand-page-maker/utils';
-/**
- * BP-5787 — replace the text of an RTE field while preserving formatting, for
- * either storage form. JSON is rendered to HTML, edited via the existing
- * HTML-preserving replace, then converted back to JSON; plain/legacy strings
- * keep the original behaviour.
- */
-const updateRteFieldValue = (existing, newText) => {
-    const wasJson = isTiptapDocument(existing);
-    const existingHtml = wasJson ? renderRteToHtml(existing) : existing;
-    if (existingHtml &&
-        typeof existingHtml === 'string' &&
-        hasRTEContent(existingHtml)) {
-        const updatedHtml = replaceTextInRTE(existingHtml, newText);
-        return wasJson ? toRteJson(updatedHtml) : updatedHtml;
-    }
-    return newText;
-};
+import { hasRTEContent, replaceTextInRTE } from '../../brand-page-maker/utils';
 export const buildUpdateTextRequest = (id, payload) => {
     return {
         id,
@@ -33,7 +16,11 @@ const updateTextField = (target, fieldName, newText) => {
         const array = target[arrayName];
         if (Array.isArray(array) && array[+index]) {
             const existingText = array[+index][property];
-            const updatedValue = updateRteFieldValue(existingText, newText);
+            const updatedValue = existingText &&
+                typeof existingText === 'string' &&
+                hasRTEContent(existingText)
+                ? replaceTextInRTE(existingText, newText)
+                : newText;
             // Create a new array with the updated item to trigger reactivity
             const newArray = [...array];
             newArray[+index] = {
@@ -45,7 +32,15 @@ const updateTextField = (target, fieldName, newText) => {
     }
     else {
         // Simple field
-        target[fieldName] = updateRteFieldValue(target[fieldName], newText);
+        const existingText = target[fieldName];
+        if (existingText &&
+            typeof existingText === 'string' &&
+            hasRTEContent(existingText)) {
+            target[fieldName] = replaceTextInRTE(existingText, newText);
+        }
+        else {
+            target[fieldName] = newText;
+        }
     }
 };
 export class UpdateContentTextBuilder extends BaseMetadataBuilder {

package/lib/src/metadata-builder/builders/update-content-text-style-builder.js

@@ -35,16 +35,14 @@ const mergeStyles = (currentStyle, stylesToUpdate, textStyleOptions) => {
     });
     return merged;
 };
-// BP-5787 — apply a style to RTE text natively. applyStyleToRTEText runs Tiptap
-// commands on the doc (string or JSON in) and returns JSON — no HTML round-trip.
 const updateRTEText = (text, style) => {
-    if (!hasRTEContent(text)) {
+    if (!text || typeof text !== 'string' || !hasRTEContent(text)) {
         return text;
     }
     const { externalEditor } = useExternalRichTextEditor();
-    const updated = applyStyleToRTEText(externalEditor, text, style);
+    const updatedText = applyStyleToRTEText(externalEditor, text, style);
     externalEditor.destroy();
-    return updated;
+    return updatedText;
 };
 const findStyleKey = (target, property) => {
     // Try exact match first (e.g., 'testimonialsStyle')

package/lib/src/metadata-builder/helpers/rte.helpers.d.ts

@@ -1,6 +1,6 @@
 import type { TextStyleDeclaration } from '../../brand-page';
 import type { Editor } from '@tiptap/vue-3';
-export declare const applyStyleToRTEText: (externalEditor: Editor, contentText: unknown, newContentStyle: TextStyleDeclaration) => unknown;
+export declare const applyStyleToRTEText: (externalEditor: Editor, contentText: string, newContentStyle: TextStyleDeclaration) => string;
 /**
  * Converts a Tiptap JSON document (ProseMirror document model) to an HTML
  * string using a headless Tiptap Editor instance.

package/lib/src/metadata-builder/helpers/rte.helpers.js

@@ -7,11 +7,7 @@ export const applyStyleToRTEText = (externalEditor, contentText, newContentStyle
     if (!contentText) {
         return contentText;
     }
-    // BP-5787: operate natively on the Tiptap doc. setContent accepts a JSON
-    // document or an HTML string; the style is applied via editor commands and
-    // the result is returned as JSON — no HTML round-trip.
-    const content = typeof contentText === 'string' &&
-        contentText.includes(ESCAPED_NEWLINE_CHARACTER)
+    const content = contentText.includes(ESCAPED_NEWLINE_CHARACTER)
         ? getRenderText(contentText)
         : contentText;
     externalEditor.commands.setContent(content);
@@ -57,7 +53,8 @@ export const applyStyleToRTEText = (externalEditor, contentText, newContentStyle
             ? chain.setItalic()
             : chain.unsetItalic();
     chain.run();
-    return externalEditor.getJSON();
+    const html = externalEditor.getHTML();
+    return html;
 };
 /**
  * Converts a Tiptap JSON document (ProseMirror document model) to an HTML

package/lib/src/shared/content-settings/components/GenericTextInput.mixin.js

@@ -144,20 +144,7 @@ export default defineComponent({
         },
     },
     watch: {
-        value(newVal, oldVal) {
-            // BP-5787: RTE values are Tiptap JSON objects. The parent (TextItemsField)
-            // re-clones its items array (cloneDeep) on ANY change — including a sibling
-            // field's style sync — yielding a NEW object reference with identical text
-            // content. For objects Vue fires this watcher on reference change, so that
-            // spurious re-clone would overwrite `_value` and clobber an in-flight edit
-            // (a mark applied but not yet debounced to the store), silently dropping
-            // the user's formatting. Strings never hit this (same content = same
-            // reference = no fire), so mirror that: ignore re-clones whose content is
-            // unchanged from the previous prop value.
-            if (this.showRichTextEditor &&
-                JSON.stringify(newVal) === JSON.stringify(oldVal)) {
-                return;
-            }
+        value(newVal) {
             this._value = newVal;
             if (this.showRichTextEditor) {
                 const textValue = escapeContentText(this._value);

package/lib/src/shared/content-settings/components/content-settings/ContentSettings.mixin.d.ts

@@ -147,7 +147,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/shared/content-settings/components/content-settings/ReplaceImageSettingsForContent.mixin.d.ts

@@ -676,7 +676,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/shared/content-settings/components/content-settings-item/ContentSettingsItemField.mixin.d.ts

@@ -620,7 +620,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/shared/content-settings/components/content-settings-item/ContentSettingsItemField.mixin.js

@@ -8,7 +8,7 @@ import { SIDE_BAR_TAB_NAMES } from '@brand-page-maker/constants';
 import { ITEM_FIELD_TYPES } from '@brand-page-maker/models';
 import { useUiPageSettingsStore } from '../../../page-settings/store';
 import { PAGE_SECTIONS } from '../../../page-settings/models';
-import { getPlainTextFromRTE, replaceTextInRTE, RTE_ALLOWED_SECTION_TYPES, isRTEManagedStyleField, isTiptapDocument, renderRteToHtml, toRteJson, } from '@brand-page-maker/utils';
+import { getPlainTextFromRTE, replaceTextInRTE, RTE_ALLOWED_SECTION_TYPES, isRTEManagedStyleField, } from '@brand-page-maker/utils';
 import { isDefaultContentText } from '@shared/content-settings/utils';
 import { useUiLogoSettingsStore } from '../../../logo-settings/store';
 const RTE_DISALLOWED_FIELD_NAMES = ['buttonText'];
@@ -262,17 +262,8 @@ export default defineComponent({
         },
         onUseGeneratedText(generatedText) {
             let formattedText = generatedText;
-            // BP-5787: preserve the field's formatting when dropping in AI text.
-            // replaceTextInRTE is HTML-based, so JSON is rendered/parsed around it
-            // (cold AI path, shared editor); string fields use it directly.
-            if (this.showRichTextEditor) {
-                if (isTiptapDocument(this.value)) {
-                    formattedText =
-                        toRteJson(replaceTextInRTE(renderRteToHtml(this.value), generatedText)) ?? generatedText;
-                }
-                else if (typeof this.value === 'string') {
-                    formattedText = replaceTextInRTE(this.value, generatedText);
-                }
+            if (this.showRichTextEditor && typeof this.value === 'string') {
+                formattedText = replaceTextInRTE(this.value, generatedText);
             }
             this.contentSettingsStore.updateItemValue({
                 id: this.id,

package/lib/src/shared/content-settings/components/text-style-field/TextStyleField.mixin.d.ts

@@ -383,6 +383,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     onLetterSpacingChange(spacing: string): void;
     onLineHeightChange(lineHeight: string): void;
     generateFontFamilySelectorKey(): string;
+    syncTextStyleTypeSelection(): void;
 }, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:modelValue"[], "update:modelValue", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     id: {
         type: StringConstructor;

package/lib/src/shared/content-settings/components/text-style-field/TextStyleField.mixin.js

@@ -124,13 +124,7 @@ export default defineComponent({
         this.debounceOnTextSizeChange = debounce(this.onTextSizeChange, TEXT_SIZE_CHANGE_DEBOUNCE_WAIT_IN_MS);
         this.debounceOnLetterSpacingChange = debounce(this.onLetterSpacingChange, TEXT_SIZE_CHANGE_DEBOUNCE_WAIT_IN_MS);
         this.debounceOnLineHeightChange = debounce(this.onLineHeightChange, TEXT_SIZE_CHANGE_DEBOUNCE_WAIT_IN_MS);
-        const value = this.value;
-        if (value.textStyleType) {
-            const textStyleTypeOption = this.textStyleTypeOptions.find((x) => x.value === value.textStyleType);
-            if (textStyleTypeOption) {
-                textStyleTypeOption.isSelected = true;
-            }
-        }
+        this.syncTextStyleTypeSelection();
     },
     computed: {
         selectedTextStyle() {
@@ -320,9 +314,26 @@ export default defineComponent({
         generateFontFamilySelectorKey() {
             return `fontFamilySelector-${this.id}-${Date.now()}`;
         },
+        // Re-derive the text-style-type selection from the current `value`.
+        // Seeded in created() and re-run whenever `value` changes (e.g. undo/redo
+        // restores the model) so the dropdown title and `selectedTextStyle`
+        // reflect the model rather than a stale local flag. (BP-5811 / BP-5817)
+        syncTextStyleTypeSelection() {
+            const value = this.value;
+            this.textStyleTypeOptions.forEach((option) => {
+                // The leading Boolean(...) guard is deliberate — do NOT simplify to
+                // `option.value === value?.textStyleType`. The "none" option's value
+                // is `undefined`, so that form would SELECT it whenever no style is
+                // set, whereas the convention (see emitChange) is all-flags-false
+                // when there is no textStyleType.
+                option.isSelected =
+                    Boolean(value?.textStyleType) && option.value === value.textStyleType;
+            });
+        },
     },
     watch: {
         value() {
+            this.syncTextStyleTypeSelection();
             this.$nextTick(() => {
                 this.fontFamilySelectorKey = this.generateFontFamilySelectorKey();
             });

package/lib/src/shared/logo-settings/components/LogoSettings.mixin.d.ts

@@ -134,7 +134,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/shared/page-settings/components/page-settings/PageSettings.mixin.d.ts

@@ -3856,7 +3856,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/shared/page-settings/components/page-settings-section-styles/PageSettingsSectionStyles.mixin.d.ts

@@ -4425,7 +4425,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/shared/publish-brand-page-with-state/PublishBrandPageModalWithState.mixin.d.ts

@@ -184,7 +184,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/shared/style-settings/components/StyleSettings.mixin.d.ts

@@ -582,7 +582,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/utils/minify-brand-page-metadata.js

@@ -1,5 +1,5 @@
 import { BRAND_PAGE_TYPES, } from '../brand-page/models';
-import { hasRTEContent, isTiptapDocument } from '../brand-page-maker/utils';
+import { hasRTEContent } from '../brand-page-maker/utils';
 import { useExternalRichTextEditor } from '../brand-page-maker/composables/rich-text-editor/useRichTextEditor';
 import { findAssetKey, resolveLogoData, } from './build-asset-manifest';
 const BUTTON_TYPES = [
@@ -17,9 +17,6 @@ const BUTTON_TYPES = [
     'tiktok',
 ];
 const convertText = (value, editor) => {
-    // Already Tiptap JSON (BP-5787 storage) — keep as-is.
-    if (isTiptapDocument(value))
-        return value;
     if (typeof value !== 'string' || !value)
         return undefined;
     if (hasRTEContent(value)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@designcrowd/library.brand-page",
   "description": "A collection of Maker/Designer applications",
-  "version": "6.0.6-json-prereq-7",
+  "version": "6.0.6-undo-2",
   "author": "Design.com Eng",
   "license": "UNLICENSED",
   "type": "module",

package/src/brand-page/components/text-wrapper/TextWrapper.vue

@@ -16,13 +16,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import {
-  hasRTEContent,
-  getPlainTextFromRTE,
-  renderRteToHtml,
-  isTiptapDocument,
-  type RichTextValue,
-} from '@brand-page-maker/utils';
+import { hasRTEContent, getPlainTextFromRTE } from '@brand-page-maker/utils';
 import {
   type FluidTextData,
   type TextStyleDeclaration,
@@ -38,8 +32,7 @@ import {
 
 interface Props {
   textStyle: TextStyleDeclaration | undefined;
-  // BP-5787: an RTE field is a legacy inline-HTML string or a Tiptap JSON doc.
-  text: RichTextValue;
+  text: string;
   element?: string;
   slug?: string;
 }
@@ -81,20 +74,16 @@ const textStyleRTE = computed(() => {
   };
 });
 
-// Render either form (legacy HTML string or Tiptap JSON) to final HTML.
-// For a string this returns it unchanged, so the legacy path is unaffected.
-const renderedHtml = computed(() => renderRteToHtml(props.text));
-
 const isRTEContent = computed(() => {
-  return isTiptapDocument(props.text) || hasRTEContent(renderedHtml.value);
+  return hasRTEContent(props.text);
 });
 
 const sanitizeText = computed(() => {
-  if (isRTEContent.value && !getPlainTextFromRTE(renderedHtml.value)) {
+  if (isRTEContent.value && !getPlainTextFromRTE(props.text)) {
     return '';
   }
 
-  return renderedHtml.value;
+  return props.text;
 });
 
 const fontSize = computed<any>(() => props.textStyle.fontSize);
@@ -166,7 +155,7 @@ const applyScale = () => {
   }
 
   const fontSizeMatchInRTEText = [
-    ...renderedHtml.value.matchAll(
+    ...props.text.matchAll(
       /style="(?:[^"]*?)\bfont-size\s*:\s*(?<fontSize>[^;"']+)[^"]*?"/gm,
     ),
   ].map((x) => parseFloat(x.groups?.fontSize || '1em'));

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

@@ -29,15 +29,6 @@ import { EMPTY_LOGO_IMAGE_MODEL, LogoStyles } from './logo.model';
 import type { LogoImageModel, LogoTemplateImageModel } from './logo.model';
 import cloneDeep from 'lodash.clonedeep';
 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';
@@ -281,7 +272,7 @@ export interface TextContent extends Content {
   /**
    * For BrandPage/BrandContact only
    */
-  text: RichTextValue;
+  text: string;
   /**
    * For BrandSite
    */
@@ -305,9 +296,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;
@@ -328,7 +319,7 @@ export interface MapContent extends Content {
 
 export interface MailingListContent extends Content {
   acceptedFields?: 'emailOnly' | 'nameAndEmail';
-  title: RichTextValue;
+  title: string;
   buttonText: string;
   titleStyle: TextStyleDeclaration;
   buttonTextStyle: TextStyleDeclaration;
@@ -387,10 +378,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;
@@ -410,8 +401,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;
@@ -441,8 +432,8 @@ export 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;
@@ -466,8 +457,8 @@ export interface TextShapeItem extends TextMediaItem {
 export interface ShapeItem extends ImageItem {
   colorReplacements: ColorReplacement[];
   mediaType: MediaType;
-  title?: RichTextValue;
-  paragraph?: RichTextValue;
+  title?: string;
+  paragraph?: string;
 
   // overrides for personalisation
   titleOverride?: string;
@@ -476,9 +467,9 @@ export interface ShapeItem extends ImageItem {
 
 export interface TestimonialItems {
   imageUrl: string;
-  name: RichTextValue;
-  position: RichTextValue;
-  testimonials: RichTextValue;
+  name: string;
+  position: string;
+  testimonials: string;
   colorReplacements: ColorReplacement[];
   mediaType: string;
   size?: string;
@@ -492,7 +483,7 @@ export interface TestimonialItems {
 }
 
 export interface TextItem {
-  text: RichTextValue;
+  text: string;
   textStyle: TextStyleDeclaration;
 
   // overrides for personalisation
@@ -514,8 +505,8 @@ export interface ImagesSectionContent extends Content, MediaSection {
 }
 
 export interface MediaSection extends Content {
-  title: RichTextValue;
-  description: RichTextValue;
+  title: string;
+  description: string;
   displayStyle: ImagesSectionContentDisplayStyle;
   items: TextShapeItem[] | TextMediaItem[];
   titleStyle: TextStyleDeclaration;
@@ -534,7 +525,7 @@ export interface ColorReplacement {
 
 export interface TestimonialSectionContent extends Content {
   type: 'testimonial-section';
-  title: RichTextValue;
+  title: string;
   displayStyle: string;
   items: TestimonialItems[];
   titleStyle: TextStyleDeclaration;
@@ -549,8 +540,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;
@@ -577,7 +568,7 @@ export type SocialLinksIconDisplayStyle =
 
 export interface SocialLinksContent extends Content {
   type: 'social-links';
-  title: RichTextValue;
+  title: string;
   links: LinksItem[];
   iconDisplayStyle: SocialLinksIconDisplayStyle;
   iconFillStyles: BrandPageCssStyle;
@@ -604,8 +595,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/src/brand-page/utils/__snapshots__/migration.util.test.ts.snap

@@ -457,7 +457,7 @@ exports[`migration.util > Banner Contents - text Align and Font Family should no
       },
     },
     "userPromptContentKey": undefined,
-    "v": 18,
+    "v": 17,
   },
   "useOldLogoRenderSize": true,
 }
@@ -903,7 +903,7 @@ exports[`migration.util > migrateBrandPageModel should return brand page model w
       },
     },
     "userPromptContentKey": undefined,
-    "v": 18,
+    "v": 17,
   },
   "useOldLogoRenderSize": true,
 }
@@ -1356,7 +1356,7 @@ exports[`migration.util > migrateBrandPageModel should return brand page model w
       },
     },
     "userPromptContentKey": undefined,
-    "v": 18,
+    "v": 17,
   },
   "useOldLogoRenderSize": true,
 }