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

package/lib/src/{CreatedOnBrandCrowd-de-de-COk1RbBS.js → CreatedOnBrandCrowd-de-de-BxL6mTJW.js}

@@ -1,5 +1,5 @@
 import { openBlock as e, createElementBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-CcYKXNUY.js";
+import { _ as t } from "./lib-YRlMax_i.js";
 const i = {}, h = {
   width: "275",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-en-us-CB3iIEMt.js → CreatedOnBrandCrowd-en-us-BPbjqfkj.js}

@@ -1,5 +1,5 @@
 import { openBlock as e, createElementBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-CcYKXNUY.js";
+import { _ as t } from "./lib-YRlMax_i.js";
 const i = {}, h = {
   width: "251",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-es-es-CRU0kUB6.js → CreatedOnBrandCrowd-es-es-DDsoe143.js}

@@ -1,5 +1,5 @@
 import { openBlock as e, createElementBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-CcYKXNUY.js";
+import { _ as t } from "./lib-YRlMax_i.js";
 const i = {}, h = {
   width: "250",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-fr-fr-C5DdVGnT.js → CreatedOnBrandCrowd-fr-ca-Dak7ppy_.js}

@@ -1,5 +1,5 @@
 import { openBlock as e, createElementBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-CcYKXNUY.js";
+import { _ as t } from "./lib-YRlMax_i.js";
 const i = {}, h = {
   width: "237",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-fr-ca-C5DdVGnT.js → CreatedOnBrandCrowd-fr-fr-Dak7ppy_.js}

@@ -1,5 +1,5 @@
 import { openBlock as e, createElementBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-CcYKXNUY.js";
+import { _ as t } from "./lib-YRlMax_i.js";
 const i = {}, h = {
   width: "237",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-pt-pt-2L9tw0-m.js → CreatedOnBrandCrowd-pt-br-BUAneEVD.js}

@@ -1,5 +1,5 @@
 import { openBlock as e, createElementBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-CcYKXNUY.js";
+import { _ as t } from "./lib-YRlMax_i.js";
 const i = {}, h = {
   width: "263",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-pt-br-2L9tw0-m.js → CreatedOnBrandCrowd-pt-pt-BUAneEVD.js}

@@ -1,5 +1,5 @@
 import { openBlock as e, createElementBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-CcYKXNUY.js";
+import { _ as t } from "./lib-YRlMax_i.js";
 const i = {}, h = {
   width: "263",
   height: "36",

package/lib/src/{CreatedOnDcom-de-de-BDHBukLE.js → CreatedOnDcom-de-de-BJ00bTz_.js}

@@ -1,5 +1,5 @@
 import { openBlock as H, createElementBlock as V, createStaticVNode as t } from "vue";
-import { _ as e } from "./lib-CcYKXNUY.js";
+import { _ as e } from "./lib-YRlMax_i.js";
 const M = {}, Z = {
   width: "242",
   height: "36",

package/lib/src/{CreatedOnDcom-en-us-D0vKhTnI.js → CreatedOnDcom-en-us-B0V1M9Hs.js}

@@ -1,5 +1,5 @@
 import { openBlock as H, createElementBlock as V, createStaticVNode as t } from "vue";
-import { _ as e } from "./lib-CcYKXNUY.js";
+import { _ as e } from "./lib-YRlMax_i.js";
 const i = {}, M = {
   width: "231",
   height: "36",

package/lib/src/{CreatedOnDcom-es-es-CCYUHgfO.js → CreatedOnDcom-es-es-YDMLB7u6.js}

@@ -1,5 +1,5 @@
 import { openBlock as H, createElementBlock as V, createStaticVNode as t } from "vue";
-import { _ as e } from "./lib-CcYKXNUY.js";
+import { _ as e } from "./lib-YRlMax_i.js";
 const M = {}, Z = {
   width: "230",
   height: "36",

package/lib/src/{CreatedOnDcom-fr-ca-DnPc5h-w.js → CreatedOnDcom-fr-ca-DppQ26s1.js}

@@ -1,5 +1,5 @@
 import { openBlock as H, createElementBlock as V, createStaticVNode as t } from "vue";
-import { _ as e } from "./lib-CcYKXNUY.js";
+import { _ as e } from "./lib-YRlMax_i.js";
 const i = {}, l = {
   width: "216",
   height: "36",

package/lib/src/{CreatedOnDcom-fr-fr-CvWbnzbp.js → CreatedOnDcom-fr-fr-0Xi-3slB.js}

@@ -1,5 +1,5 @@
 import { openBlock as H, createElementBlock as V, createStaticVNode as t } from "vue";
-import { _ as e } from "./lib-CcYKXNUY.js";
+import { _ as e } from "./lib-YRlMax_i.js";
 const i = {}, l = {
   width: "216",
   height: "36",

package/lib/src/{CreatedOnDcom-pt-br-DdMZYZog.js → CreatedOnDcom-pt-br-De-wHqSu.js}

@@ -1,5 +1,5 @@
 import { openBlock as H, createElementBlock as V, createStaticVNode as t } from "vue";
-import { _ as M } from "./lib-CcYKXNUY.js";
+import { _ as M } from "./lib-YRlMax_i.js";
 const Z = {}, e = {
   width: "232",
   height: "36",

package/lib/src/{CreatedOnDcom-pt-pt-BPvriH9Y.js → CreatedOnDcom-pt-pt-CQGAsn5D.js}

@@ -1,5 +1,5 @@
 import { openBlock as H, createElementBlock as V, createStaticVNode as t } from "vue";
-import { _ as M } from "./lib-CcYKXNUY.js";
+import { _ as M } from "./lib-YRlMax_i.js";
 const Z = {}, e = {
   width: "232",
   height: "36",

package/lib/src/brand-page-maker/composables/rich-text-editor/useRichTextEditor.js

@@ -73,6 +73,19 @@ export const useExternalRichTextEditor = () => {
     };
 };
 export const useRichTextEditor = (model, props, emit, fontSettings, fontStyleDropdownRef, selectedGlobalTextStyles, onSelectTextStyleType, updateRichTextEditor, textStyleTypeOptions, markedText, isHyperlinkPopupOpen, selectedLinkTypeValue) => {
+    const historyStore = useHistoryStore();
+    // TipTap rehydrates `model.value` on first mount and writes the
+    // canonical HTML back via `editor.on('update', ...)` — even when the
+    // user-visible text is unchanged (it normalises whitespace, wraps plain
+    // text in `<p>`, expands `%0A` to `<br>`, mirrors the resolved textStyle
+    // as inline `<strong>`/`<span style="...">`/`<mark>` tags, etc). Each of
+    // those rehydration writes mutates `brandPageData` and would otherwise
+    // surface as a phantom undo entry the first time the user opens a
+    // sidebar or clicks into a section. Arming the merge flag folds the
+    // resulting watcher flush into the current head instead of pushing.
+    // Idempotent — every editor on the page mounting at once collapses
+    // into the same merge.
+    historyStore.mergeNextMutation();
     const editor = new Editor({
         content: model.value ?? '',
         editable: !props.readOnly,
@@ -263,7 +276,6 @@ export const useRichTextEditor = (model, props, emit, fontSettings, fontStyleDro
         const sanitizedData = sanitiseClientSideRTE(editor.getHTML());
         emit('update:modelValue', sanitizedData.sanitizedHtml);
     });
-    const historyStore = useHistoryStore();
     editor.on('selectionUpdate', () => {
         // Skip while a history snapshot is being applied — `setContent` fires
         // selectionUpdate before the editor has fully rehydrated, which causes

package/lib/src/brand-page-maker/stores/brandpage-maker/brandpage-maker-store.js

@@ -605,6 +605,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
             // entry's textObjects/colors don't leak through (e.g. switching
@@ -638,9 +639,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) {
                 editableLogoStore.setEnableEditMode(!draft.isByo);
@@ -649,7 +648,41 @@ 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);
+                });
+            }
         },
         /**
          * Restore the active page after a history apply. The id passed in is

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

@@ -72,6 +72,7 @@ export declare const useHistoryStore: import("pinia").StoreDefinition<"history",
     }) => '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;
@@ -92,6 +93,7 @@ export declare const useHistoryStore: import("pinia").StoreDefinition<"history",
     }) => '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;
@@ -112,9 +114,10 @@ export declare const useHistoryStore: import("pinia").StoreDefinition<"history",
     }) => '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" | "getCurrentSizeBytes" | "getCurrentEntryCount">>;
+}, "reset" | "undo" | "redo" | "captureBaseline" | "capture" | "captureTemplateSwitch" | "captureAiChangeset" | "mergeNextMutation" | "getCurrentSizeBytes" | "getCurrentEntryCount">>;