@designcrowd/library.brand-page 6.0.6-tracker-1 → 6.0.6-undo-3

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/shared/content-settings/components/GenericTextInput.mixin.d.ts

@@ -84,6 +84,8 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     isDirty: boolean;
     emitChangeDebounce: DebounceHandle | undefined;
     lengthError: boolean;
+    burstIsHydration: boolean | undefined;
+    pendingWriteIsHydration: boolean;
 }, {
     errorMessage(): string | undefined;
     isErrorVisible(): boolean;
@@ -96,6 +98,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
 }, {
     onFocus(): void;
     onBlur(): void;
+    onRteModelValue(newVal: string, meta?: {
+        isHydration?: boolean;
+    }): void;
     emitChange(): void;
 }, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "on-toggle-state-change")[], "update:modelValue" | "on-toggle-state-change", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     attrs: {

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

@@ -99,6 +99,13 @@ export default defineComponent({
             isDirty: false,
             emitChangeDebounce: undefined,
             lengthError: false,
+            // Whether every write in the current debounce burst was an RTE
+            // hydration write-back (see UpdateItemValuePayload.isHydrationWrite).
+            // undefined = no burst pending; any user write downgrades it to false.
+            burstIsHydration: undefined,
+            // One-shot channel from onRteModelValue into the `text` setter for
+            // the write currently being applied.
+            pendingWriteIsHydration: false,
         };
     },
     computed: {
@@ -128,6 +135,13 @@ export default defineComponent({
                 return unescapeContentText(this.value);
             },
             set(newVal) {
+                // A burst is hydration only if EVERY write in it is hydration —
+                // one real keystroke downgrades the whole burst to a user edit
+                // (the canonicalisation then rides inside that legitimate entry).
+                const writeIsHydration = this.pendingWriteIsHydration;
+                this.pendingWriteIsHydration = false;
+                this.burstIsHydration =
+                    this.burstIsHydration !== false && writeIsHydration;
                 if (newVal === false) {
                     this._value = false;
                 }
@@ -162,11 +176,15 @@ export default defineComponent({
                 this._oldValue = this._value || '';
                 this._value = false;
             }
+            // Toggling is a user action — downgrade any pending hydration burst
+            // so this emit commits as a normal entry.
+            this.burstIsHydration = false;
             this.emitChange();
         },
         showRichTextEditor(newVal) {
             if (!newVal && this._value && typeof this._value === 'string') {
                 this._value = encodeContentText(this._value);
+                this.burstIsHydration = false;
                 this.emitChange();
             }
         },
@@ -186,11 +204,22 @@ export default defineComponent({
         onBlur() {
             this.isDirty = false;
         },
+        // RTE branch handler: receives the hydration meta the RichTextEditor
+        // attaches to its update:modelValue emits (a plain v-model binding
+        // would drop the second argument), records it for the `text` setter,
+        // then applies the write.
+        onRteModelValue(newVal, meta) {
+            this.pendingWriteIsHydration = meta?.isHydration === true;
+            this.text = newVal;
+        },
         emitChange() {
+            const isHydrationWrite = this.burstIsHydration === true;
+            this.burstIsHydration = undefined;
             this.$emit('update:modelValue', {
                 id: this.id,
                 name: this.name,
                 value: this._value,
+                ...(isHydrationWrite ? { isHydrationWrite: true } : {}),
             });
         },
     },

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;
@@ -549,7 +549,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         pushMode(item: import("../../store").ContentSettingsModeStackItem): void;
         resetMode(): void;
         updateItemValue(payload: import("../../models").UpdateItemValuePayload<unknown>): void;
-        updateMultipleItemValues({ id, name, value, }: import("../../models").UpdateMultipleItemValuesPayload<any>): void;
+        updateMultipleItemValues({ id, name, value, isHydrationWrite, }: import("../../models").UpdateMultipleItemValuesPayload<any>): void;
         updateTextStyleType({ id, name, value, }: import("../../models").UpdateMultipleItemValuesPayload<any>): void;
         updateTextStyles({ id, name, value, }: import("../../models").UpdateMultipleItemValuesPayload<any>): void;
         getTextStyles({ id, name }: {
@@ -924,7 +924,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         reset: () => void;
         getCurrentSizeBytes: () => number;
         getCurrentEntryCount: () => number;
-    }, "reset" | "undo" | "redo" | "captureBaseline" | "capture" | "captureTemplateSwitch" | "captureAiChangeset" | "mergeNextMutation" | "getCurrentSizeBytes" | "getCurrentEntryCount">>;
+    }, "reset" | "captureBaseline" | "capture" | "captureTemplateSwitch" | "captureAiChangeset" | "mergeNextMutation" | "undo" | "redo" | "getCurrentSizeBytes" | "getCurrentEntryCount">>;
     externalEditor: import("@tiptap/vue-3").Editor;
 }, {
     categoryTabs: CategoryTab[];

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

@@ -399,7 +399,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         pushMode(item: import("../../store").ContentSettingsModeStackItem): void;
         resetMode(): void;
         updateItemValue(payload: import("../../models").UpdateItemValuePayload<unknown>): void;
-        updateMultipleItemValues({ id, name, value, }: import("../../models").UpdateMultipleItemValuesPayload<any>): void;
+        updateMultipleItemValues({ id, name, value, isHydrationWrite, }: import("../../models").UpdateMultipleItemValuesPayload<any>): void;
         updateTextStyleType({ id, name, value, }: import("../../models").UpdateMultipleItemValuesPayload<any>): void;
         updateTextStyles({ id, name, value, }: import("../../models").UpdateMultipleItemValuesPayload<any>): void;
         getTextStyles({ id, name }: {
@@ -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/ContentSettingsItem.mixin.d.ts

@@ -385,7 +385,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         pushMode(item: import("../../store").ContentSettingsModeStackItem): void;
         resetMode(): void;
         updateItemValue(payload: UpdateItemValuePayload<unknown>): void;
-        updateMultipleItemValues({ id, name, value, }: import("../../models").UpdateMultipleItemValuesPayload<any>): void;
+        updateMultipleItemValues({ id, name, value, isHydrationWrite, }: import("../../models").UpdateMultipleItemValuesPayload<any>): void;
         updateTextStyleType({ id, name, value, }: import("../../models").UpdateMultipleItemValuesPayload<any>): void;
         updateTextStyles({ id, name, value, }: import("../../models").UpdateMultipleItemValuesPayload<any>): void;
         getTextStyles({ id, name }: {

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

@@ -427,7 +427,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         pushMode(item: import("../../store").ContentSettingsModeStackItem): void;
         resetMode(): void;
         updateItemValue(payload: UpdateItemValuePayload<unknown>): void;
-        updateMultipleItemValues({ id, name, value, }: import("../../models").UpdateMultipleItemValuesPayload<any>): void;
+        updateMultipleItemValues({ id, name, value, isHydrationWrite, }: import("../../models").UpdateMultipleItemValuesPayload<any>): void;
         updateTextStyleType({ id, name, value, }: import("../../models").UpdateMultipleItemValuesPayload<any>): void;
         updateTextStyles({ id, name, value, }: import("../../models").UpdateMultipleItemValuesPayload<any>): void;
         getTextStyles({ id, name }: {
@@ -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/email-field/EmailField.mixin.d.ts

@@ -81,6 +81,8 @@ declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import
     isDirty: boolean;
     emitChangeDebounce: import("lodash.debounce").DebounceHandle | undefined;
     lengthError: boolean;
+    burstIsHydration: boolean | undefined;
+    pendingWriteIsHydration: boolean;
 }, {
     errorMessage(): string | undefined;
     isErrorVisible(): boolean;
@@ -93,6 +95,9 @@ declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import
 }, {
     onFocus(): void;
     onBlur(): void;
+    onRteModelValue(newVal: string, meta?: {
+        isHydration?: boolean;
+    }): void;
     emitChange(): void;
 }, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "on-toggle-state-change")[], "update:modelValue" | "on-toggle-state-change", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     attrs: {

package/lib/src/shared/content-settings/components/focused-content-item-settings/FocusedContentItemSettings.mixin.d.ts

@@ -378,7 +378,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         pushMode(item: import("../../store").ContentSettingsModeStackItem): void;
         resetMode(): void;
         updateItemValue(payload: UpdateItemValuePayload<unknown>): void;
-        updateMultipleItemValues({ id, name, value, }: import("../../models").UpdateMultipleItemValuesPayload<any>): void;
+        updateMultipleItemValues({ id, name, value, isHydrationWrite, }: import("../../models").UpdateMultipleItemValuesPayload<any>): void;
         updateTextStyleType({ id, name, value, }: import("../../models").UpdateMultipleItemValuesPayload<any>): void;
         updateTextStyles({ id, name, value, }: import("../../models").UpdateMultipleItemValuesPayload<any>): void;
         getTextStyles({ id, name }: {

package/lib/src/shared/content-settings/components/payment-config-field/PaymentConfigField.mixin.d.ts

@@ -483,73 +483,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         collapseAllSections(): void;
         setPreviousSelectedDisplayStyle(viewport: string, displayStyle: string): void;
     }>;
-    historyStore: import("pinia").Store<"history", Pick<{
-        entries: import("vue").ShallowRef<import("@brand-page-maker/stores/history/history-store").HistoryEntry[], import("@brand-page-maker/stores/history/history-store").HistoryEntry[]>;
-        currentIndex: import("vue").Ref<number, number>;
-        isApplyingSnapshot: import("vue").Ref<boolean, boolean>;
-        snapshotAppliedToken: import("vue").Ref<number, number>;
-        baselineCaptured: import("vue").Ref<boolean, boolean>;
-        canUndo: import("vue").ComputedRef<boolean>;
-        canRedo: import("vue").ComputedRef<boolean>;
-        captureBaseline: () => void;
-        capture: (args: {
-            source: import("@brand-page-maker/stores/history/history-store").HistoryEntry["source"];
-            actor: import("@brand-page-maker/stores/history/history-store").HistoryEntry["actor"];
-            label?: string;
-        }) => "committed" | "oversized" | "noop" | "skipped";
-        captureTemplateSwitch: (label?: string) => "committed" | "oversized" | "noop" | "skipped";
-        captureAiChangeset: (label?: string) => "committed" | "oversized" | "noop" | "skipped";
-        mergeNextMutation: () => void;
-        undo: () => Promise<void>;
-        redo: () => Promise<void>;
-        reset: () => void;
-        getCurrentSizeBytes: () => number;
-        getCurrentEntryCount: () => number;
-    }, "entries" | "currentIndex" | "isApplyingSnapshot" | "snapshotAppliedToken" | "baselineCaptured">, Pick<{
-        entries: import("vue").ShallowRef<import("@brand-page-maker/stores/history/history-store").HistoryEntry[], import("@brand-page-maker/stores/history/history-store").HistoryEntry[]>;
-        currentIndex: import("vue").Ref<number, number>;
-        isApplyingSnapshot: import("vue").Ref<boolean, boolean>;
-        snapshotAppliedToken: import("vue").Ref<number, number>;
-        baselineCaptured: import("vue").Ref<boolean, boolean>;
-        canUndo: import("vue").ComputedRef<boolean>;
-        canRedo: import("vue").ComputedRef<boolean>;
-        captureBaseline: () => void;
-        capture: (args: {
-            source: import("@brand-page-maker/stores/history/history-store").HistoryEntry["source"];
-            actor: import("@brand-page-maker/stores/history/history-store").HistoryEntry["actor"];
-            label?: string;
-        }) => "committed" | "oversized" | "noop" | "skipped";
-        captureTemplateSwitch: (label?: string) => "committed" | "oversized" | "noop" | "skipped";
-        captureAiChangeset: (label?: string) => "committed" | "oversized" | "noop" | "skipped";
-        mergeNextMutation: () => void;
-        undo: () => Promise<void>;
-        redo: () => Promise<void>;
-        reset: () => void;
-        getCurrentSizeBytes: () => number;
-        getCurrentEntryCount: () => number;
-    }, "canUndo" | "canRedo">, Pick<{
-        entries: import("vue").ShallowRef<import("@brand-page-maker/stores/history/history-store").HistoryEntry[], import("@brand-page-maker/stores/history/history-store").HistoryEntry[]>;
-        currentIndex: import("vue").Ref<number, number>;
-        isApplyingSnapshot: import("vue").Ref<boolean, boolean>;
-        snapshotAppliedToken: import("vue").Ref<number, number>;
-        baselineCaptured: import("vue").Ref<boolean, boolean>;
-        canUndo: import("vue").ComputedRef<boolean>;
-        canRedo: import("vue").ComputedRef<boolean>;
-        captureBaseline: () => void;
-        capture: (args: {
-            source: import("@brand-page-maker/stores/history/history-store").HistoryEntry["source"];
-            actor: import("@brand-page-maker/stores/history/history-store").HistoryEntry["actor"];
-            label?: string;
-        }) => "committed" | "oversized" | "noop" | "skipped";
-        captureTemplateSwitch: (label?: string) => "committed" | "oversized" | "noop" | "skipped";
-        captureAiChangeset: (label?: string) => "committed" | "oversized" | "noop" | "skipped";
-        mergeNextMutation: () => void;
-        undo: () => Promise<void>;
-        redo: () => Promise<void>;
-        reset: () => void;
-        getCurrentSizeBytes: () => number;
-        getCurrentEntryCount: () => number;
-    }, "reset" | "undo" | "redo" | "captureBaseline" | "capture" | "captureTemplateSwitch" | "captureAiChangeset" | "mergeNextMutation" | "getCurrentSizeBytes" | "getCurrentEntryCount">>;
 }, {
     selectedPaymentConfig: BrandPagePaymentConfig | undefined;
     isCurrencyUpdating: boolean;

package/lib/src/shared/content-settings/components/payment-config-field/PaymentConfigField.mixin.js

@@ -4,7 +4,6 @@ import { useShopConfigStore } from '@shared/ecommerce-settings/store/shop-settin
 import { paymentConfigTr } from '@src/composables/useTranslate';
 import brandPageClient from '../../../../clients/brand-page-client';
 import { useUiPageSettingsStore } from '@shared/page-settings/store';
-import { useHistoryStore } from '@brand-page-maker/stores/history/history-store';
 export default defineComponent({
     props: {
         id: {
@@ -30,7 +29,6 @@ export default defineComponent({
         const uiPageSettingsStore = useUiPageSettingsStore();
         const eventManagerStore = useEventManagerStore();
         const shopConfigStore = useShopConfigStore();
-        const historyStore = useHistoryStore();
         return {
             brandPageToken: computed(() => brandPageContainerStore.brandPageToken),
             isPaymentConfigSetupVisible: computed(() => !brandPageContainerStore.isPrePurchase),
@@ -38,7 +36,6 @@ export default defineComponent({
             eventManagerStore,
             shopConfigStore,
             uiPageSettingsStore,
-            historyStore,
         };
     },
     emits: ['update:modelValue'],
@@ -97,14 +94,15 @@ export default defineComponent({
                 ...this.value,
                 paymentConfig: this.shopConfigStore.paymentConfig,
             };
+            // Lazy paymentConfig hydration — a hydration write, not a user edit.
+            // The flag makes the content-settings store fold it into the current
+            // undo head at write time (see UpdateItemValuePayload.isHydrationWrite).
             const payload = {
                 id: this.id,
                 name: this.name,
                 value,
+                isHydrationWrite: true,
             };
-            // Lazy paymentConfig hydration — fold into current head instead
-            // of pushing a phantom entry.
-            this.historyStore.mergeNextMutation();
             this.$emit('update:modelValue', payload);
         }
     },

package/lib/src/shared/content-settings/components/tel-field/TelField.mixin.d.ts

@@ -81,6 +81,8 @@ declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import
     isDirty: boolean;
     emitChangeDebounce: import("lodash.debounce").DebounceHandle | undefined;
     lengthError: boolean;
+    burstIsHydration: boolean | undefined;
+    pendingWriteIsHydration: boolean;
 }, {
     errorMessage(): string | undefined;
     isErrorVisible(): boolean;
@@ -93,6 +95,9 @@ declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import
 }, {
     onFocus(): void;
     onBlur(): void;
+    onRteModelValue(newVal: string, meta?: {
+        isHydration?: boolean;
+    }): void;
     emitChange(): void;
 }, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "on-toggle-state-change")[], "update:modelValue" | "on-toggle-state-change", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     attrs: {

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

@@ -81,6 +81,8 @@ declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import
     isDirty: boolean;
     emitChangeDebounce: import("lodash.debounce").DebounceHandle | undefined;
     lengthError: boolean;
+    burstIsHydration: boolean | undefined;
+    pendingWriteIsHydration: boolean;
 }, {
     errorMessage(): string | undefined;
     isErrorVisible(): boolean;
@@ -93,6 +95,9 @@ declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import
 }, {
     onFocus(): void;
     onBlur(): void;
+    onRteModelValue(newVal: string, meta?: {
+        isHydration?: boolean;
+    }): void;
     emitChange(): void;
 }, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "on-toggle-state-change")[], "update:modelValue" | "on-toggle-state-change", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     attrs: {

package/lib/src/shared/content-settings/components/text-items-field/TextItemsField.mixin.d.ts

@@ -53,6 +53,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     textEmptyErrorMessage: any;
     textMaxLengthErrorMessage: any;
     isInternalWatchEnabled: boolean;
+    burstIsHydration: boolean | undefined;
 }, {}, {
     onDelete(index: number): void;
     onAddNewItem(): void;
@@ -64,6 +65,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         id: string;
         name: string;
         value: string;
+        isHydrationWrite?: boolean;
     }, index: number): void;
     setTextStyleOption(payload: {
         id: string;

package/lib/src/shared/content-settings/components/text-items-field/TextItemsField.mixin.js

@@ -66,6 +66,11 @@ export default defineComponent({
         textEmptyErrorMessage: TEXT_EMPTY(),
         textMaxLengthErrorMessage: MAX_LENGTH_ERROR_MESSAGE(),
         isInternalWatchEnabled: true,
+        // Second burst layer on top of GenericTextInput's (this field re-wraps
+        // per-item TextareaField payloads into one textItems array payload
+        // behind its own debounce). Hydration only if EVERY write in the burst
+        // was hydration; any user action downgrades it. undefined = no burst.
+        burstIsHydration: undefined,
     }),
     async created() {
         this.options = cloneDeep(this.value);
@@ -77,6 +82,8 @@ export default defineComponent({
     methods: {
         onDelete(index) {
             this.options = this.options.filter((_o, i) => i !== index);
+            // Deleting is a user action — downgrade any pending hydration burst.
+            this.burstIsHydration = false;
             if (this.changeDebounce) {
                 this.changeDebounce();
             }
@@ -86,6 +93,7 @@ export default defineComponent({
             this.addOption();
         },
         addOption() {
+            this.burstIsHydration = false;
             this.options.push({
                 text: '',
                 textStyle: {
@@ -107,14 +115,19 @@ export default defineComponent({
             return decodeHtmlEntities(text);
         },
         emitChange() {
+            const isHydrationWrite = this.burstIsHydration === true;
+            this.burstIsHydration = undefined;
             const payload = {
                 id: this.id,
                 name: this.name,
                 value: this.options,
+                ...(isHydrationWrite ? { isHydrationWrite: true } : {}),
             };
             this.$emit('update:model-value', payload);
         },
         onItemsChange(items) {
+            // Reordering is a user action — downgrade any pending hydration burst.
+            this.burstIsHydration = false;
             const payload = {
                 id: this.id,
                 name: this.name,
@@ -128,11 +141,17 @@ export default defineComponent({
             this.$emit('update:model-value', payload);
         },
         onTextAreaTextChange(payload, index) {
+            // Carry the hydration flag from the per-item TextareaField burst into
+            // this field's own burst (AND rule — one user write downgrades it).
+            this.burstIsHydration =
+                this.burstIsHydration !== false && payload.isHydrationWrite === true;
             this.options[index].text = payload.value;
             this.isModified[index] = true;
         },
         setTextStyleOption(payload, index) {
             this.options[index].textStyle = payload.value;
+            // Style edits are user actions — downgrade any pending hydration burst.
+            this.burstIsHydration = false;
             this.emitChange();
         },
         onBlurOverride(value, index) {

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/content-settings/components/textarea-field/TextareaField.mixin.d.ts

@@ -95,6 +95,8 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     isDirty: boolean;
     emitChangeDebounce: import("lodash.debounce").DebounceHandle | undefined;
     lengthError: boolean;
+    burstIsHydration: boolean | undefined;
+    pendingWriteIsHydration: boolean;
 }, {
     errorMessage(): string | undefined;
     isErrorVisible(): boolean;
@@ -107,6 +109,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
 }, {
     onFocus(): void;
     onBlur(): void;
+    onRteModelValue(newVal: string, meta?: {
+        isHydration?: boolean;
+    }): void;
     emitChange(): void;
 }, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "on-toggle-state-change")[], "update:modelValue" | "on-toggle-state-change", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     attrs: {

package/lib/src/shared/content-settings/components/url-field/UrlField.mixin.d.ts

@@ -88,6 +88,8 @@ declare const _default: import("vue").DefineComponent<{}, {}, Record<string, any
     isDirty: boolean;
     emitChangeDebounce: import("lodash.debounce").DebounceHandle | undefined;
     lengthError: boolean;
+    burstIsHydration: boolean | undefined;
+    pendingWriteIsHydration: boolean;
 }, {
     errorMessage(): string | undefined;
     isErrorVisible(): boolean;
@@ -100,6 +102,9 @@ declare const _default: import("vue").DefineComponent<{}, {}, Record<string, any
 }, {
     onFocus(): void;
     onBlur(): void;
+    onRteModelValue(newVal: string, meta?: {
+        isHydration?: boolean;
+    }): void;
     emitChange(): void;
 }, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "on-toggle-state-change")[], "update:modelValue" | "on-toggle-state-change", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     attrs: {

package/lib/src/shared/content-settings/components/youtube-video-field/YoutubeVideoField.mixin.d.ts

@@ -84,6 +84,8 @@ declare const _default: import("vue").DefineComponent<{}, {}, Record<string, any
     isDirty: boolean;
     emitChangeDebounce: import("lodash.debounce").DebounceHandle | undefined;
     lengthError: boolean;
+    burstIsHydration: boolean | undefined;
+    pendingWriteIsHydration: boolean;
 }, {
     errorMessage(): string | undefined;
     isErrorVisible(): boolean;
@@ -96,6 +98,9 @@ declare const _default: import("vue").DefineComponent<{}, {}, Record<string, any
 }, {
     onFocus(): void;
     onBlur(): void;
+    onRteModelValue(newVal: string, meta?: {
+        isHydration?: boolean;
+    }): void;
     emitChange(): void;
 }, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "on-toggle-state-change")[], "update:modelValue" | "on-toggle-state-change", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     attrs: {

package/lib/src/shared/content-settings/models.d.ts

@@ -88,12 +88,23 @@ export interface UpdateItemValuePayload<T> {
     name: string;
     value: T;
     multipleValues?: boolean;
+    /**
+     * Marks this write as a hydration write-back (e.g. the RTE rewriting the
+     * model into canonical HTML on mount) rather than a user edit. The
+     * content-settings store arms the undo history's merge flag synchronously
+     * before applying a flagged write, so it folds into the current history
+     * head instead of pushing a phantom entry (BP-5810). The flag travels
+     * with the value so it survives the debounced field → store hops.
+     */
+    isHydrationWrite?: boolean;
 }
 export interface UpdateMultipleItemValuesPayload<T extends object> {
     id: string;
     name: string;
     value: T;
     index?: number;
+    /** See UpdateItemValuePayload.isHydrationWrite. */
+    isHydrationWrite?: boolean;
 }
 export interface ValidateItemPayload {
     id: string;