@designcrowd/library.brand-page 5.18.1-undo-29 → 5.18.1-undo-32

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

@@ -146,7 +146,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         }>(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): 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;
@@ -844,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,15 @@ export default defineComponent({
     },
     mounted() {
         if (this.canUseRichTextEditor) {
+            // `switchAllContentToRTE` walks every content item on every page
+            // and rewraps plain-text titles/paragraphs in TipTap HTML so they
+            // render through the inline RTE. That's a hydration write — it
+            // happens whenever the Content sidebar tab mounts (incl. when the
+            // user clicks the header in the canvas) and produces no
+            // user-visible change. Arm the merge flag so the watcher folds
+            // the resulting flush into the current head entry instead of
+            // pushing a phantom undo step.
+            this.historyStore.mergeNextMutation();
             switchAllContentToRTE(this.pageSettingsStore, this.externalEditor, this.styleSettingsStore);
         }
     },

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

@@ -662,7 +662,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         }>(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): 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;

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

@@ -609,7 +609,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         }>(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): 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;

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

@@ -111,6 +111,7 @@ 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>;

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

@@ -136,7 +136,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         }>(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): 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;
@@ -300,6 +300,7 @@ 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>;

package/lib/src/shared/logo-settings/store/editable-logo-store.d.ts

@@ -186,6 +186,20 @@ export declare const useUiEditableLogoStore: import("pinia").StoreDefinition<"ui
     getEditableLogoVariationByVariationId(id: number): any;
     getEditableLogoVariationByBase64(base64: string): any;
     updateEditableLogoImageUrlAsync(defaultPrimaryText?: string, overrideLogoVariation?: number | undefined, layout?: string): Promise<void>;
+    /**
+     * Stamp `editableLogoVariations[*].base64` across every consumer in
+     * `brandPageData`: header/footer logo sections (desktop + mobile)
+     * and every `LogoContent` block on every page. Used by the live edit
+     * path after a fabric-render POST AND by the undo/redo BYO branch
+     * after `restoreVariationsForDraftToken` has rehydrated the cache.
+     *
+     * The history store strips `logoImageBase64Url` from snapshots to
+     * keep them under the 25 MB per-entry cap, so something has to
+     * write the base64 back into `brandPageData` after restore — for
+     * designed logos it's the awaited fabric-render call; for BYO it's
+     * this method.
+     */
+    stampLogoBase64IntoBrandPageData(overrideLogoVariation?: number): void;
     /**
      * Restore the variations grid for `logoDraftToken` from the per-token
      * cache. Called by `_syncLogoSettingsFromSnapshot` during undo/redo.

package/lib/src/shared/logo-settings/store/editable-logo-store.js

@@ -218,6 +218,32 @@ export const useUiEditableLogoStore = defineStore('uiEditableLogo', {
         async updateEditableLogoImageUrlAsync(defaultPrimaryText, overrideLogoVariation, layout) {
             const tasks = this.editableLogoVariations.map((x) => this.updateEditableLogoImageByVariationAsync(x, defaultPrimaryText, layout));
             await Promise.all(tasks);
+            this.stampLogoBase64IntoBrandPageData(overrideLogoVariation);
+            // Stash the freshly rendered variation set under the active draft
+            // token so undo can restore it later without re-rendering. This is
+            // the only place in production that meaningfully populates
+            // `editableLogoVariations` (BYO upload + designed-logo setStateAsync
+            // both funnel here), so caching here keeps every distinct draft's
+            // grid available for the lifetime of the session.
+            if (this.logoDraftToken) {
+                this.variationsByDraftToken[this.logoDraftToken] =
+                    this.editableLogoVariations.map((v) => ({ ...v }));
+            }
+        },
+        /**
+         * Stamp `editableLogoVariations[*].base64` across every consumer in
+         * `brandPageData`: header/footer logo sections (desktop + mobile)
+         * and every `LogoContent` block on every page. Used by the live edit
+         * path after a fabric-render POST AND by the undo/redo BYO branch
+         * after `restoreVariationsForDraftToken` has rehydrated the cache.
+         *
+         * The history store strips `logoImageBase64Url` from snapshots to
+         * keep them under the 25 MB per-entry cap, so something has to
+         * write the base64 back into `brandPageData` after restore — for
+         * designed logos it's the awaited fabric-render call; for BYO it's
+         * this method.
+         */
+        stampLogoBase64IntoBrandPageData(overrideLogoVariation) {
             const pageSettingStore = useUiPageSettingsStore();
             [PAGE_SECTIONS.header, PAGE_SECTIONS.footer].forEach((section) => {
                 [VIEWPORTS.desktop, VIEWPORTS.mobile].forEach((viewport) => {
@@ -243,16 +269,6 @@ export const useUiEditableLogoStore = defineStore('uiEditableLogo', {
                     }
                 });
             });
-            // Stash the freshly rendered variation set under the active draft
-            // token so undo can restore it later without re-rendering. This is
-            // the only place in production that meaningfully populates
-            // `editableLogoVariations` (BYO upload + designed-logo setStateAsync
-            // both funnel here), so caching here keeps every distinct draft's
-            // grid available for the lifetime of the session.
-            if (this.logoDraftToken) {
-                this.variationsByDraftToken[this.logoDraftToken] =
-                    this.editableLogoVariations.map((v) => ({ ...v }));
-            }
         },
         /**
          * Restore the variations grid for `logoDraftToken` from the per-token

package/lib/src/shared/page-settings/components/page-settings/PageSettings.mixin.d.ts

@@ -3848,7 +3848,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         }>(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): 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;

package/lib/src/shared/page-settings/components/page-settings-section-styles/PageSettingsSectionStyles.mixin.d.ts

@@ -4287,6 +4287,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         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("@shared/logo-settings/store").EditableLogoVariation, defaultPrimaryText?: string | undefined, layout?: string | undefined): Promise<import("../../../../clients/fabric-render-client").ModifyLogoDataResponse | null>;
@@ -4407,7 +4408,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         }>(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): 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;

package/lib/src/shared/publish-brand-page-with-state/PublishBrandPageModalWithState.mixin.d.ts

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

package/lib/src/shared/style-settings/components/StyleSettings.mixin.d.ts

@@ -577,7 +577,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         }>(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): 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;

package/package.json

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

package/src/brand-page-maker/stores/brandpage-maker/brandpage-maker-store.ts

@@ -33,6 +33,7 @@ import type {
 import type { UserFeatures } from '../user';
 import { useBrandPageMakerUserStore } from '../user';
 import { defineStore } from 'pinia';
+import { toRaw } from 'vue';
 import { useUiStore } from '../ui';
 import type { LogoSettingsState } from '@shared/logo-settings/store';
 import {
@@ -894,7 +895,7 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
       //    text, support text, logo colors, fonts), `editableLogoStore.logoEdits`
       //    is restored from that string so the sidebar form fields and the
       //    save-time fabric-render POST both pick up the pre-edit state.
-      this._syncLogoSettingsFromSnapshot(snapshot, logoEditsStr);
+      await this._syncLogoSettingsFromSnapshot(snapshot, logoEditsStr);
 
       // 9. If the sidebar is editing a content item that no longer exists in
       //    the restored page, fall back to the Content tab so the user doesn't
@@ -914,15 +915,24 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
       this._navigateToActivePage(activePageId);
     },
 
-    _syncLogoSettingsFromSnapshot(
+    async _syncLogoSettingsFromSnapshot(
       snapshot: BrandPageModel,
       logoEditsStr?: string,
-    ): void {
+    ): Promise<void> {
       const logoSettingsStore = useUiLogoSettingsStore();
       const editableLogoStore = useUiEditableLogoStore();
       const logoStore = useLogoStore();
       const containerStore = useBrandPageContainerStore();
 
+      // Snapshot the pre-restore logo identity BEFORE we $patch logoEdits.
+      // Used below to short-circuit the fabric-render call when the entry
+      // we're restoring has the same logoEdits + draft token as the live
+      // state — i.e. only non-logo state changed between the two entries.
+      const prevLogoEditsStr = JSON.stringify(
+        toRaw(editableLogoStore.logoEdits),
+      );
+      const prevDraftToken = editableLogoStore.logoDraftToken;
+
       // Restore `editableLogoStore.logoEdits` first — sidecar to `brandPageData`,
       // captured per-entry. Wholesale-replace via `$patch` so a previous
       // entry's textObjects/colors don't leak through (e.g. switching
@@ -981,6 +991,22 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
 
       editableLogoStore.setLogoDraftToken(draftToken);
 
+      // Did the logo identity actually change between the two entries?
+      // If both `logoEdits` and the draft token match what was already
+      // live, the cached `editableLogoVariations` is still the right
+      // render and we just need to stamp it back into `brandPageData`
+      // (history-store strips `logoImageBase64Url` from snapshots, so
+      // the page-level base64 fields are now empty).
+      const logoUnchanged =
+        prevDraftToken === draftToken &&
+        (logoEditsStr === undefined || logoEditsStr === prevLogoEditsStr);
+
+      if (logoUnchanged) {
+        editableLogoStore.stampLogoBase64IntoBrandPageData();
+
+        return;
+      }
+
       const isByo = !!draft?.isByo;
 
       if (isByo) {
@@ -988,41 +1014,45 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
         // `variationsByDraftToken` keyed off that token always matches the
         // base64 the user saw at capture. No re-render — the uploaded
         // image bytes are the source of truth and there's nothing for
-        // fabric-render to derive.
-        editableLogoStore.restoreVariationsForDraftToken(draftToken);
+        // fabric-render to derive. After restoring the variations cache,
+        // stamp the base64 back across header/footer/per-page logo
+        // content; the snapshot itself doesn't carry `logoImageBase64Url`.
+        if (editableLogoStore.restoreVariationsForDraftToken(draftToken)) {
+          editableLogoStore.stampLogoBase64IntoBrandPageData();
+        }
 
         return;
       }
 
-      // Designed (non-BYO) logo. The draft token is reused across every
-      // form-field edit, so any per-token cache only ever holds the latest
-      // render — undoing past it would leave `editableLogoVariations` (and
-      // every consumer that reads from it: the sidebar preview, the
-      // canvas, post-undo save metadata, recalculateLogoSizes) showing
-      // the post-edit base64 while the form fields show pre-edit state.
-      //
-      // Fire-and-forget the same render the live edit path runs:
+      // Designed (non-BYO) logo whose form state actually differs from
+      // the live state. The draft token is reused across every form-field
+      // edit, so the per-token cache only holds the latest render —
+      // re-issue the same fabric-render call the live edit path runs.
       // `updateEditableLogoImageUrlAsync` POSTs the freshly-restored
-      // `logoEdits` to fabric-render and writes the returned base64 across
-      // every header/footer + per-page logo content + `editableLogoVariations`.
-      // The undo/redo apply itself stays synchronous; the canvas updates
-      // a moment later when fabric-render responds.
+      // `logoEdits`, writes the returned base64 across every header/footer
+      // + per-page logo content + `editableLogoVariations`.
       //
-      // Arm `mergeNextMutation` so the watcher folds the post-render
-      // mutation back into the entry we just restored instead of pushing
-      // a phantom entry.
+      // Awaited (not fire-and-forget): two undos in quick succession would
+      // otherwise kick off two parallel render bursts whose `Promise.all`
+      // tasks interleave, leaving each variation showing whichever request
+      // happened to win the race rather than the variation that belongs
+      // to the snapshot the user landed on. Awaiting also keeps the call
+      // inside the `applyHistorySnapshot`/`isApplyingSnapshot` window, so
+      // the post-render writeback is naturally suppressed by the existing
+      // watcher guard — no `mergeNextMutation()` needed.
       if (
         containerStore.isPrePurchase &&
         logoEditsStr &&
         logoStore.logoTemplateAsset
       ) {
-        useHistoryStore().mergeNextMutation();
-        editableLogoStore.updateEditableLogoImageUrlAsync().catch((error) => {
+        try {
+          await editableLogoStore.updateEditableLogoImageUrlAsync();
+        } catch (error) {
           console.error(
             'brandpage-maker-store: failed to re-render logo on history apply',
             error,
           );
-        });
+        }
       }
     },
 

package/src/brand-page-maker/stores/history/history-store.test.ts

@@ -22,16 +22,6 @@ const mockPageNavigationStore = {
   activePageId: '',
 };
 
-const mockShopConfigStore: { paymentConfig: unknown } = {
-  paymentConfig: undefined,
-};
-
-const mockPageSettingsStore: {
-  pages: { contents: { settings: { content: Record<string, unknown> } }[] }[];
-} = {
-  pages: [],
-};
-
 vi.mock('../brandpage-maker/brandpage-maker-store', () => ({
   useBrandPageMakerStore: vi.fn(() => mockMakerStore),
 }));
@@ -46,14 +36,6 @@ vi.mock('@shared/page-navigation/store/page-navigation-store', () => ({
   usePageNavigationStore: vi.fn(() => mockPageNavigationStore),
 }));
 
-vi.mock('@shared/ecommerce-settings/store/shop-settings-store', () => ({
-  useShopConfigStore: vi.fn(() => mockShopConfigStore),
-}));
-
-vi.mock('@shared/page-settings/store', () => ({
-  useUiPageSettingsStore: vi.fn(() => mockPageSettingsStore),
-}));
-
 // Mutate the mock between captures so each capture produces a distinct
 // snapshot. The store now drops byte-identical captures (BP-5506: prevents
 // undo/redo steps that do nothing visible), so tests that previously relied
@@ -86,8 +68,6 @@ describe('history-store (single stack + JSON-string snapshots)', () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (mockMakerStore.brandPageData as any).v = 1;
     mockPageNavigationStore.activePageId = '';
-    mockShopConfigStore.paymentConfig = undefined;
-    mockPageSettingsStore.pages = [];
   });
 
   it('captures baseline and initialises the pointer to 0', async () => {
@@ -187,6 +167,35 @@ describe('history-store (single stack + JSON-string snapshots)', () => {
     expect(store.currentIndex).toBe(1);
   });
 
+  it('captures pre-purchase logo edits even when brandPageData is byte-identical', async () => {
+    // Pre-purchase logo-tab edits (text/color/font) live on
+    // `editableLogoStore.logoEdits` (sidecar) and the rendered base64 is
+    // stripped from snapshots to stay under the 25 MB cap. Two
+    // consecutive logo edits therefore produce identical snapshot bytes
+    // — without comparing the sidecar, every logo edit would dedup as
+    // a no-op and history would silently stop growing.
+    const editableLogoStore = useUiEditableLogoStore();
+
+    editableLogoStore.logoEdits.textObjects = [
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      { id: 't1', role: 'primary-text', text: 'Acme' } as any,
+    ];
+
+    const store = useHistoryStore();
+
+    await store.captureBaseline();
+    expect(store.entries.length).toBe(1);
+
+    // User changes the logo text — only the sidecar mutates. Snapshot
+    // bytes are identical (no brandPageData diff). Must still commit.
+    editableLogoStore.logoEdits.textObjects[0].text = 'AcmeCo';
+
+    const r = store.capture({ source: 'manual_edit', actor: 'user' });
+
+    expect(r).toBe('committed');
+    expect(store.entries.length).toBe(2);
+  });
+
   // BP-5506 phantom-undo prevention via the `mergeNextMutation()` flag.
   // Hydration write sites (TipTap mount, lazy paymentConfig fill,
   // stale-page-ref clear) call this immediately before the imperative
@@ -402,121 +411,6 @@ describe('history-store (single stack + JSON-string snapshots)', () => {
     });
   });
 
-  // BP-5506 follow-up: paymentConfig is the user's Stripe Connect linkage
-  // (backend-confirmed, per project guardrails). It must be invariant
-  // under undo/redo regardless of what other edits the user makes — the
-  // restore-time re-stamp in `applySnapshotString` re-derives every live
-  // wrapper's `paymentConfig` from `shopConfigStore.paymentConfig` after
-  // each undo / redo apply. Snapshot bytes themselves can carry whatever
-  // value `brandPageData` happened to have at capture time (including
-  // undefined for sections the user never opened); the re-stamp is what
-  // makes the contract hold.
-  describe('paymentConfig invariance under undo/redo', () => {
-    it('re-stamps wrapper.paymentConfig from shopStore on undo', async () => {
-      const store = useHistoryStore();
-
-      // Live shop store has the user's Stripe linkage.
-      mockShopConfigStore.paymentConfig = {
-        id: 'live-stripe',
-        name: 'Stripe',
-        status: 'Active',
-      };
-
-      // Live page settings has a tipping section whose wrapper holds
-      // paymentConfig = undefined (e.g. the user has just undone past the
-      // baseline and `applyHistorySnapshot` rebuilt content from a
-      // paymentConfig-free snapshot).
-      mockPageSettingsStore.pages = [
-        {
-          contents: [
-            {
-              settings: {
-                content: {
-                  type: 'support-me',
-                  supportMeConfig: {
-                    paymentOptions: [],
-                    paymentConfig: undefined,
-                  },
-                },
-              },
-            },
-          ],
-        },
-      ];
-
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (mockMakerStore.brandPageData as any).pages = [
-        {
-          id: 'p',
-          contents: [{ type: 'support-me', supportMeConfig: {} }],
-        },
-      ];
-      await store.captureBaseline();
-      captureMutated(store);
-
-      // Undo back to baseline. The mock applyHistorySnapshot is a no-op,
-      // but the restore-side re-stamp inside `applySnapshotString` should
-      // still run after it resolves.
-      await store.undo();
-
-      // Live wrapper now reflects shopStore.paymentConfig.
-      const wrapper =
-        mockPageSettingsStore.pages[0].contents[0].settings.content
-          .supportMeConfig;
-
-      expect((wrapper as { paymentConfig: unknown }).paymentConfig).toEqual({
-        id: 'live-stripe',
-        name: 'Stripe',
-        status: 'Active',
-      });
-    });
-
-    it('re-stamps to undefined when shopStore has no paymentConfig', async () => {
-      const store = useHistoryStore();
-
-      // No Stripe linkage in the shop store.
-      mockShopConfigStore.paymentConfig = undefined;
-
-      mockPageSettingsStore.pages = [
-        {
-          contents: [
-            {
-              settings: {
-                content: {
-                  type: 'support-me',
-                  supportMeConfig: {
-                    paymentConfig: { id: 'stale', name: 'Stripe' },
-                  },
-                },
-              },
-            },
-          ],
-        },
-      ];
-
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (mockMakerStore.brandPageData as any).pages = [
-        {
-          id: 'p',
-          contents: [{ type: 'support-me', supportMeConfig: {} }],
-        },
-      ];
-      await store.captureBaseline();
-      captureMutated(store);
-
-      await store.undo();
-
-      const wrapper =
-        mockPageSettingsStore.pages[0].contents[0].settings.content
-          .supportMeConfig;
-
-      // Stale value cleared; live wrapper now matches shopStore (undefined).
-      expect(
-        (wrapper as { paymentConfig: unknown }).paymentConfig,
-      ).toBeUndefined();
-    });
-  });
-
   it('reentrancy guard: capture no-ops when isApplyingSnapshot is true', async () => {
     const store = useHistoryStore();