@designcrowd/library.brand-page 5.18.3-button-fix-1 → 5.18.3-undo-35

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/content-settings/ContentSettings.mixin.d.ts

@@ -134,16 +134,21 @@ declare const _default: import("vue").DefineComponent<{}, {
         hideChangeTemplateConfirmModal(): void;
         onBackgroundChanged(): void;
         onChangeTemplateConfirmModalCancel(): void;
-        onChangeTemplateConfirmModalConfirm(): void;
+        onChangeTemplateConfirmModalConfirm(): Promise<void>;
         onContentChanged(): void;
         onStyleChanged(): void;
-        onTemplateSelected(payload: import("@brand-page-maker/stores").OnTemplateSelectedPayload): void;
+        onTemplateSelected(payload: import("@brand-page-maker/stores").OnTemplateSelectedPayload): Promise<void>;
         setSelectedTabName(payload: any): void;
         showNextNotificationMessage(): Promise<void>;
         updateContent<TContent extends Content, P extends {
             id: string;
             content: TContent;
         }>(payload: P): Promise<void>;
+        _captureTemplateSwitchIfEnabled(): void;
+        applyHistorySnapshot(snapshot: import("@brand-page").BrandPageModel, activePageId?: string | undefined, logoEditsStr?: string | undefined): Promise<void>;
+        _syncLogoSettingsFromSnapshot(snapshot: import("@brand-page").BrandPageModel, logoEditsStr?: string | undefined): Promise<void>;
+        _navigateToActivePage(activePageId?: string | undefined): void;
+        _fallbackSidebarIfSelectedContentMissing(snapshot: import("@brand-page").BrandPageModel): void;
         export(): import("@brand-page").BrandPageModel;
         setBrandPageType({ brandPageType }: {
             brandPageType: "default" | "brandSite" | "brandContact";
@@ -784,6 +789,22 @@ declare const _default: import("vue").DefineComponent<{}, {
     }>;
     eventTracker: {
         sendShippingToggleEvent: (isEnabled: boolean) => void;
+        sendUndoEvent: (props: {
+            entries_count: number;
+            actor: string | undefined;
+        }) => void;
+        sendRedoEvent: (props: {
+            entries_count: number;
+            actor: string | undefined;
+        }) => void;
+        sendHistoryCappedEvent: (props: {
+            entries_count: number;
+            size_bytes: number;
+        }) => void;
+        sendHistoryOversizedEvent: (props: {
+            attempted_bytes: number;
+            source: string;
+        }) => void;
         sendSaveContactEvent: () => void;
         sendStartForFreeEvent: () => void;
         sendFooterLinkClickEvent: (linkType: "watermark_logo" | "create_your_website") => void;
@@ -823,6 +844,70 @@ declare const _default: import("vue").DefineComponent<{}, {
         sendAiSendPromptEvent: (ctaLocation: string) => void;
         sendAiStopGenerationEvent: (ctaLocation: 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>;
+        baselineCaptured: import("vue").Ref<boolean, boolean>;
+        canUndo: import("vue").ComputedRef<boolean>;
+        canRedo: import("vue").ComputedRef<boolean>;
+        captureBaseline: () => void;
+        capture: (args: {
+            source: "manual_edit" | "template_switch" | "ai_changeset" | "rich_text";
+            actor: "user" | "ai_builder";
+            label?: string | undefined;
+        }) => "committed" | "oversized" | "noop" | "skipped";
+        captureTemplateSwitch: (label?: string | undefined) => "committed" | "oversized" | "noop" | "skipped";
+        captureAiChangeset: (label?: string | undefined) => "committed" | "oversized" | "noop" | "skipped";
+        mergeNextMutation: () => void;
+        undo: () => Promise<void>;
+        redo: () => Promise<void>;
+        reset: () => void;
+        getCurrentSizeBytes: () => number;
+        getCurrentEntryCount: () => number;
+    }, "entries" | "currentIndex" | "isApplyingSnapshot" | "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>;
+        baselineCaptured: import("vue").Ref<boolean, boolean>;
+        canUndo: import("vue").ComputedRef<boolean>;
+        canRedo: import("vue").ComputedRef<boolean>;
+        captureBaseline: () => void;
+        capture: (args: {
+            source: "manual_edit" | "template_switch" | "ai_changeset" | "rich_text";
+            actor: "user" | "ai_builder";
+            label?: string | undefined;
+        }) => "committed" | "oversized" | "noop" | "skipped";
+        captureTemplateSwitch: (label?: string | undefined) => "committed" | "oversized" | "noop" | "skipped";
+        captureAiChangeset: (label?: string | undefined) => "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>;
+        baselineCaptured: import("vue").Ref<boolean, boolean>;
+        canUndo: import("vue").ComputedRef<boolean>;
+        canRedo: import("vue").ComputedRef<boolean>;
+        captureBaseline: () => void;
+        capture: (args: {
+            source: "manual_edit" | "template_switch" | "ai_changeset" | "rich_text";
+            actor: "user" | "ai_builder";
+            label?: string | undefined;
+        }) => "committed" | "oversized" | "noop" | "skipped";
+        captureTemplateSwitch: (label?: string | undefined) => "committed" | "oversized" | "noop" | "skipped";
+        captureAiChangeset: (label?: string | undefined) => "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">>;
     externalEditor: import("@tiptap/vue-3").Editor;
 }, {
     categoryTabs: CategoryTab[];

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

@@ -11,6 +11,7 @@ import { useExternalRichTextEditor } from '@brand-page-maker/composables/rich-te
 import { switchAllContentToRTE, transformToRTE, RTE_ALLOWED_SECTION_TYPES, } from '@brand-page-maker/utils';
 import { useUiStyleSettingsStore } from '../../../style-settings/store';
 import { usePageNavigationStore } from '../../../../shared/page-navigation/store/page-navigation-store';
+import { useHistoryStore } from '@brand-page-maker/stores/history/history-store';
 export default defineComponent({
     setup() {
         const brandPageMakerStore = useBrandPageMakerStore();
@@ -20,6 +21,7 @@ export default defineComponent({
         const styleSettingsStore = useUiStyleSettingsStore();
         const userStore = useBrandPageMakerUserStore();
         const eventTracker = useEventTracker();
+        const historyStore = useHistoryStore();
         const { externalEditor } = useExternalRichTextEditor();
         return {
             mode: computed(() => contentSettingsStore.mode),
@@ -36,6 +38,7 @@ export default defineComponent({
             pageSettingsStore,
             styleSettingsStore,
             eventTracker,
+            historyStore,
             externalEditor,
         };
     },
@@ -52,6 +55,8 @@ export default defineComponent({
     },
     mounted() {
         if (this.canUseRichTextEditor) {
+            // RTE rewrap on tab mount — fold into current head.
+            this.historyStore.mergeNextMutation();
             switchAllContentToRTE(this.pageSettingsStore, this.externalEditor, this.styleSettingsStore);
         }
     },

package/lib/src/shared/content-settings/components/content-settings/ContentSettings.stories.js

@@ -26,6 +26,7 @@ export const Sample = () => {
         canUseGettyVideos: true,
         canUseGoogleAdsense: false,
         googleAdsenseEnabled: false,
+        canUseUndoRedo: false,
     };
     const pinia = setupStoryPinia();
     const contentSettingsStore = useUiContentSettingsStore();

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

@@ -650,16 +650,21 @@ declare const _default: import("vue").DefineComponent<{}, {
         hideChangeTemplateConfirmModal(): void;
         onBackgroundChanged(): void;
         onChangeTemplateConfirmModalCancel(): void;
-        onChangeTemplateConfirmModalConfirm(): void;
+        onChangeTemplateConfirmModalConfirm(): Promise<void>;
         onContentChanged(): void;
         onStyleChanged(): void;
-        onTemplateSelected(payload: import("@brand-page-maker/stores").OnTemplateSelectedPayload): void;
+        onTemplateSelected(payload: import("@brand-page-maker/stores").OnTemplateSelectedPayload): Promise<void>;
         setSelectedTabName(payload: any): void;
         showNextNotificationMessage(): Promise<void>;
         updateContent<TContent extends import("@brand-page").Content, P extends {
             id: string;
             content: TContent;
         }>(payload: P): Promise<void>;
+        _captureTemplateSwitchIfEnabled(): void;
+        applyHistorySnapshot(snapshot: import("@brand-page").BrandPageModel, activePageId?: string | undefined, logoEditsStr?: string | undefined): Promise<void>;
+        _syncLogoSettingsFromSnapshot(snapshot: import("@brand-page").BrandPageModel, logoEditsStr?: string | undefined): Promise<void>;
+        _navigateToActivePage(activePageId?: string | undefined): void;
+        _fallbackSidebarIfSelectedContentMissing(snapshot: import("@brand-page").BrandPageModel): void;
         export(): import("@brand-page").BrandPageModel;
         setBrandPageType({ brandPageType }: {
             brandPageType: "default" | "brandSite" | "brandContact";
@@ -732,6 +737,22 @@ declare const _default: import("vue").DefineComponent<{}, {
     }>;
     bpEventTracker: {
         sendShippingToggleEvent: (isEnabled: boolean) => void;
+        sendUndoEvent: (props: {
+            entries_count: number;
+            actor: string | undefined;
+        }) => void;
+        sendRedoEvent: (props: {
+            entries_count: number;
+            actor: string | undefined;
+        }) => void;
+        sendHistoryCappedEvent: (props: {
+            entries_count: number;
+            size_bytes: number;
+        }) => void;
+        sendHistoryOversizedEvent: (props: {
+            attempted_bytes: number;
+            source: string;
+        }) => void;
         sendSaveContactEvent: () => void;
         sendStartForFreeEvent: () => void;
         sendFooterLinkClickEvent: (linkType: "watermark_logo" | "create_your_website") => void;

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

@@ -474,6 +474,22 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     }>;
     eventTracker: {
         sendShippingToggleEvent: (isEnabled: boolean) => void;
+        sendUndoEvent: (props: {
+            entries_count: number;
+            actor: string | undefined;
+        }) => void;
+        sendRedoEvent: (props: {
+            entries_count: number;
+            actor: string | undefined;
+        }) => void;
+        sendHistoryCappedEvent: (props: {
+            entries_count: number;
+            size_bytes: number;
+        }) => void;
+        sendHistoryOversizedEvent: (props: {
+            attempted_bytes: number;
+            source: string;
+        }) => void;
         sendSaveContactEvent: () => void;
         sendStartForFreeEvent: () => void;
         sendFooterLinkClickEvent: (linkType: "watermark_logo" | "create_your_website") => void;

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

@@ -597,16 +597,21 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         hideChangeTemplateConfirmModal(): void;
         onBackgroundChanged(): void;
         onChangeTemplateConfirmModalCancel(): void;
-        onChangeTemplateConfirmModalConfirm(): void;
+        onChangeTemplateConfirmModalConfirm(): Promise<void>;
         onContentChanged(): void;
         onStyleChanged(): void;
-        onTemplateSelected(payload: import("@brand-page-maker/stores").OnTemplateSelectedPayload): void;
+        onTemplateSelected(payload: import("@brand-page-maker/stores").OnTemplateSelectedPayload): Promise<void>;
         setSelectedTabName(payload: any): void;
         showNextNotificationMessage(): Promise<void>;
         updateContent<TContent extends Content, P extends {
             id: string;
             content: TContent;
         }>(payload: P): Promise<void>;
+        _captureTemplateSwitchIfEnabled(): void;
+        applyHistorySnapshot(snapshot: import("@brand-page").BrandPageModel, activePageId?: string | undefined, logoEditsStr?: string | undefined): Promise<void>;
+        _syncLogoSettingsFromSnapshot(snapshot: import("@brand-page").BrandPageModel, logoEditsStr?: string | undefined): Promise<void>;
+        _navigateToActivePage(activePageId?: string | undefined): void;
+        _fallbackSidebarIfSelectedContentMissing(snapshot: import("@brand-page").BrandPageModel): void;
         export(): import("@brand-page").BrandPageModel;
         setBrandPageType({ brandPageType }: {
             brandPageType: "default" | "brandSite" | "brandContact";

package/lib/src/shared/content-settings/components/draggable-item-list/DraggableItemList.mixin.d.ts

@@ -59,6 +59,8 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     schema: string;
     textIcon: string;
     textIcons: string[];
+    focusedIndex: number | null;
+    focusedDisplay: string;
 }, {
     items: {
         get(): DraggableItem[];
@@ -79,6 +81,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     setItemValue(index: number, itemValue: string): void;
     onColorReplacementsChange(payload: UpdateItemValuePayload<ColorReplacement[]>, index: number): void;
     onFocusOverride(index: number, itemValue: string): void;
+    inputDisplayValue(index: number): string;
     onBlurOverride(index: number, itemValue: string): void;
     isImageUrl(url: string): boolean;
 }, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:model-value" | "on-intent-image-replace" | "on-color-replacements-change")[], "update:model-value" | "on-intent-image-replace" | "on-color-replacements-change", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{

package/lib/src/shared/content-settings/components/draggable-item-list/DraggableItemList.mixin.js

@@ -70,6 +70,12 @@ export default defineComponent({
         schema: 'https',
         textIcon: 'globe',
         textIcons: [],
+        // Display-only override for the focused URL input. While a row is
+        // focused we strip the schema visually but MUST NOT mutate modelValue —
+        // doing so would land in the store and trigger a spurious undo/redo
+        // history entry between focus and blur (BP-5506).
+        focusedIndex: null,
+        focusedDisplay: '',
     }),
     computed: {
         items: {
@@ -143,14 +149,25 @@ export default defineComponent({
             this.$emit('on-color-replacements-change', payload, index);
         },
         onFocusOverride(index, itemValue) {
-            const value = [...this.modelValue];
             const match = URL_RE.exec(itemValue);
             if (match) {
                 this.schema = match[1];
-                value[index][this.valuePropName] = match[2];
+                this.focusedIndex = index;
+                this.focusedDisplay = match[2];
+            }
+            else {
+                this.focusedIndex = index;
+                this.focusedDisplay = itemValue;
             }
         },
+        inputDisplayValue(index) {
+            return this.focusedIndex === index
+                ? this.focusedDisplay
+                : this.itemValue(index);
+        },
         onBlurOverride(index, itemValue) {
+            this.focusedIndex = null;
+            this.focusedDisplay = '';
             const value = [...this.modelValue];
             let isValid = true;
             if (isEmail(itemValue)) {

package/lib/src/shared/content-settings/components/form-fields-field/FormFieldsField.mixin.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref } from 'vue';
+import { defineComponent, ref, watch } from 'vue';
 import { formFieldsTr } from '@src/composables/useTranslate';
 export default defineComponent({
     props: {
@@ -45,16 +45,26 @@ export default defineComponent({
                 type: 'phone',
             },
         ];
+        const valueWithState = ref(props.value.map((field) => ({
+            field,
+            isCollapsed: true,
+            isTypeDropdownOpen: false,
+        })));
+        // Re-sync when the store-bound value changes externally (e.g. undo/redo
+        // via history-store). Preserve per-row UI flags (isCollapsed,
+        // isTypeDropdownOpen) by index so an undo doesn't snap rows back to
+        // collapsed state.
+        watch(() => props.value, (newVal) => {
+            valueWithState.value = newVal.map((field, index) => ({
+                field,
+                isCollapsed: valueWithState.value[index]?.isCollapsed ?? true,
+                isTypeDropdownOpen: valueWithState.value[index]?.isTypeDropdownOpen ?? false,
+            }));
+        });
         return {
             formFieldsTr,
             typeList,
-            valueWithState: ref(props.value.map((field) => {
-                return {
-                    field: field,
-                    isCollapsed: true,
-                    isTypeDropdownOpen: false,
-                };
-            })),
+            valueWithState,
         };
     },
     methods: {

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

@@ -483,6 +483,70 @@ 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>;
+        baselineCaptured: import("vue").Ref<boolean, boolean>;
+        canUndo: import("vue").ComputedRef<boolean>;
+        canRedo: import("vue").ComputedRef<boolean>;
+        captureBaseline: () => void;
+        capture: (args: {
+            source: "manual_edit" | "template_switch" | "ai_changeset" | "rich_text";
+            actor: "user" | "ai_builder";
+            label?: string | undefined;
+        }) => "committed" | "oversized" | "noop" | "skipped";
+        captureTemplateSwitch: (label?: string | undefined) => "committed" | "oversized" | "noop" | "skipped";
+        captureAiChangeset: (label?: string | undefined) => "committed" | "oversized" | "noop" | "skipped";
+        mergeNextMutation: () => void;
+        undo: () => Promise<void>;
+        redo: () => Promise<void>;
+        reset: () => void;
+        getCurrentSizeBytes: () => number;
+        getCurrentEntryCount: () => number;
+    }, "entries" | "currentIndex" | "isApplyingSnapshot" | "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>;
+        baselineCaptured: import("vue").Ref<boolean, boolean>;
+        canUndo: import("vue").ComputedRef<boolean>;
+        canRedo: import("vue").ComputedRef<boolean>;
+        captureBaseline: () => void;
+        capture: (args: {
+            source: "manual_edit" | "template_switch" | "ai_changeset" | "rich_text";
+            actor: "user" | "ai_builder";
+            label?: string | undefined;
+        }) => "committed" | "oversized" | "noop" | "skipped";
+        captureTemplateSwitch: (label?: string | undefined) => "committed" | "oversized" | "noop" | "skipped";
+        captureAiChangeset: (label?: string | undefined) => "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>;
+        baselineCaptured: import("vue").Ref<boolean, boolean>;
+        canUndo: import("vue").ComputedRef<boolean>;
+        canRedo: import("vue").ComputedRef<boolean>;
+        captureBaseline: () => void;
+        capture: (args: {
+            source: "manual_edit" | "template_switch" | "ai_changeset" | "rich_text";
+            actor: "user" | "ai_builder";
+            label?: string | undefined;
+        }) => "committed" | "oversized" | "noop" | "skipped";
+        captureTemplateSwitch: (label?: string | undefined) => "committed" | "oversized" | "noop" | "skipped";
+        captureAiChangeset: (label?: string | undefined) => "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,6 +4,7 @@ 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: {
@@ -29,6 +30,7 @@ export default defineComponent({
         const uiPageSettingsStore = useUiPageSettingsStore();
         const eventManagerStore = useEventManagerStore();
         const shopConfigStore = useShopConfigStore();
+        const historyStore = useHistoryStore();
         return {
             brandPageToken: computed(() => brandPageContainerStore.brandPageToken),
             isPaymentConfigSetupVisible: computed(() => !brandPageContainerStore.isPrePurchase),
@@ -36,6 +38,7 @@ export default defineComponent({
             eventManagerStore,
             shopConfigStore,
             uiPageSettingsStore,
+            historyStore,
         };
     },
     emits: ['update:modelValue'],
@@ -99,6 +102,9 @@ export default defineComponent({
                 name: this.name,
                 value,
             };
+            // 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/logo-settings/components/EditLogoSettings.mixin.d.ts

@@ -93,6 +93,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             logoTemplateMetadata: string;
             isLogoDraftSaved: boolean;
             isTextOnlyLogo: boolean;
+            variationsByDraftToken: Record<string, import("../store/editable-logo-store").EditableLogoVariation[]>;
         } & import("pinia").PiniaCustomStateProperties<import("../store/editable-logo-store").EditableLogoState>) => () => string | undefined;
     }, {
         setStateAsync(payload: {
@@ -110,6 +111,8 @@ declare const _default: import("vue").DefineComponent<{}, {
         getEditableLogoVariationByVariationId(id: number): any;
         getEditableLogoVariationByBase64(base64: string): any;
         updateEditableLogoImageUrlAsync(defaultPrimaryText?: string | undefined, overrideLogoVariation?: number | undefined, layout?: string | undefined): Promise<void>;
+        stampLogoBase64IntoBrandPageData(overrideLogoVariation?: number | undefined): void;
+        restoreVariationsForDraftToken(logoDraftToken: string): boolean;
         updateMetadataAsync(defaultPrimaryText?: string | undefined, resetLogoTemplateMetadata?: boolean, layout?: string | undefined): Promise<void>;
         updateEditableLogoImageByVariationAsync(editableLogoVariation: import("../store/editable-logo-store").EditableLogoVariation, defaultPrimaryText?: string | undefined, layout?: string | undefined): Promise<import("../../../clients/fabric-render-client").ModifyLogoDataResponse | null>;
         getDraftMetadata(logoDraftToken: string): string | undefined;
@@ -247,6 +250,22 @@ declare const _default: import("vue").DefineComponent<{}, {
     }>;
     eventTracker: {
         sendShippingToggleEvent: (isEnabled: boolean) => void;
+        sendUndoEvent: (props: {
+            entries_count: number;
+            actor: string | undefined;
+        }) => void;
+        sendRedoEvent: (props: {
+            entries_count: number;
+            actor: string | undefined;
+        }) => void;
+        sendHistoryCappedEvent: (props: {
+            entries_count: number;
+            size_bytes: number;
+        }) => void;
+        sendHistoryOversizedEvent: (props: {
+            attempted_bytes: number;
+            source: string;
+        }) => void;
         sendSaveContactEvent: () => void;
         sendStartForFreeEvent: () => void;
         sendFooterLinkClickEvent: (linkType: "watermark_logo" | "create_your_website") => void;

package/lib/src/shared/logo-settings/components/EditLogoSettings.mixin.js

@@ -65,6 +65,17 @@ export default defineComponent({
             return 'tw-font-bold tw-text-xs';
         },
     },
+    watch: {
+        // Keeps the design/upload tab in sync with `enableEditMode` whenever it
+        // flips outside the user's tab clicks — undo/redo restoring a BYO upload
+        // (mode → false) or a designed logo (mode → true). User clicks within
+        // the same mode don't change `enableEditMode` and don't trigger this.
+        showEditLogoSetting(enabled) {
+            this.selectedTab = enabled
+                ? this.tabsWithTranslations[0]
+                : this.tabsWithTranslations[1];
+        },
+    },
     methods: {
         disableTextToggle(currentTextEnabled) {
             if (!this.isTextOnlyLogo || !currentTextEnabled) {

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

@@ -124,16 +124,21 @@ declare const _default: import("vue").DefineComponent<{}, {
         hideChangeTemplateConfirmModal(): void;
         onBackgroundChanged(): void;
         onChangeTemplateConfirmModalCancel(): void;
-        onChangeTemplateConfirmModalConfirm(): void;
+        onChangeTemplateConfirmModalConfirm(): Promise<void>;
         onContentChanged(): void;
         onStyleChanged(): void;
-        onTemplateSelected(payload: import("@brand-page-maker/stores").OnTemplateSelectedPayload): void;
+        onTemplateSelected(payload: import("@brand-page-maker/stores").OnTemplateSelectedPayload): Promise<void>;
         setSelectedTabName(payload: any): void;
         showNextNotificationMessage(): Promise<void>;
         updateContent<TContent extends import("../../../brand-page").Content, P extends {
             id: string;
             content: TContent;
         }>(payload: P): Promise<void>;
+        _captureTemplateSwitchIfEnabled(): void;
+        applyHistorySnapshot(snapshot: import("../../../brand-page").BrandPageModel, activePageId?: string | undefined, logoEditsStr?: string | undefined): Promise<void>;
+        _syncLogoSettingsFromSnapshot(snapshot: import("../../../brand-page").BrandPageModel, logoEditsStr?: string | undefined): Promise<void>;
+        _navigateToActivePage(activePageId?: string | undefined): void;
+        _fallbackSidebarIfSelectedContentMissing(snapshot: import("../../../brand-page").BrandPageModel): void;
         export(): import("../../../brand-page").BrandPageModel;
         setBrandPageType({ brandPageType }: {
             brandPageType: "default" | "brandSite" | "brandContact";
@@ -277,6 +282,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             logoTemplateMetadata: string;
             isLogoDraftSaved: boolean;
             isTextOnlyLogo: boolean;
+            variationsByDraftToken: Record<string, import("../store").EditableLogoVariation[]>;
         } & import("pinia").PiniaCustomStateProperties<import("../store").EditableLogoState>) => () => string | undefined;
     }, {
         setStateAsync(payload: {
@@ -294,6 +300,8 @@ declare const _default: import("vue").DefineComponent<{}, {
         getEditableLogoVariationByVariationId(id: number): any;
         getEditableLogoVariationByBase64(base64: string): any;
         updateEditableLogoImageUrlAsync(defaultPrimaryText?: string | undefined, overrideLogoVariation?: number | undefined, layout?: string | undefined): Promise<void>;
+        stampLogoBase64IntoBrandPageData(overrideLogoVariation?: number | undefined): void;
+        restoreVariationsForDraftToken(logoDraftToken: string): boolean;
         updateMetadataAsync(defaultPrimaryText?: string | undefined, resetLogoTemplateMetadata?: boolean, layout?: string | undefined): Promise<void>;
         updateEditableLogoImageByVariationAsync(editableLogoVariation: import("../store").EditableLogoVariation, defaultPrimaryText?: string | undefined, layout?: string | undefined): Promise<import("../../../clients/fabric-render-client").ModifyLogoDataResponse | null>;
         getDraftMetadata(logoDraftToken: string): string | undefined;