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

package/package.json

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

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

@@ -921,6 +921,7 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
       const logoSettingsStore = useUiLogoSettingsStore();
       const editableLogoStore = useUiEditableLogoStore();
       const logoStore = useLogoStore();
+      const containerStore = useBrandPageContainerStore();
 
       // Restore `editableLogoStore.logoEdits` first — sidecar to `brandPageData`,
       // captured per-entry. Wholesale-replace via `$patch` so a previous
@@ -967,9 +968,7 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
       // and BYO upload stamps `templateAsset` onto the registered draft when
       // it lands — so the registered draft is enough to fully restore the
       // sidebar's design/upload chooser without storing anything inside
-      // each history entry. The variations grid is restored from the
-      // editable-logo store's per-token cache (populated by every
-      // `updateEditableLogoImageUrlAsync` render).
+      // each history entry.
       const draft = logoStore.getLogoDraftAssetByToken(draftToken);
 
       if (draft) {
@@ -981,7 +980,50 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
       }
 
       editableLogoStore.setLogoDraftToken(draftToken);
-      editableLogoStore.restoreVariationsForDraftToken(draftToken);
+
+      const isByo = !!draft?.isByo;
+
+      if (isByo) {
+        // BYO uploads register a fresh `logoDraftToken` per upload, so
+        // `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);
+
+        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:
+      // `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.
+      //
+      // Arm `mergeNextMutation` so the watcher folds the post-render
+      // mutation back into the entry we just restored instead of pushing
+      // a phantom entry.
+      if (
+        containerStore.isPrePurchase &&
+        logoEditsStr &&
+        logoStore.logoTemplateAsset
+      ) {
+        useHistoryStore().mergeNextMutation();
+        editableLogoStore.updateEditableLogoImageUrlAsync().catch((error) => {
+          console.error(
+            'brandpage-maker-store: failed to re-render logo on history apply',
+            error,
+          );
+        });
+      }
     },
 
     /**