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

package/lib/src/{CreatedOnBrandCrowd-de-de-DD0OBnij.js → CreatedOnBrandCrowd-de-de-x7BcD7Sj.js}

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

package/lib/src/{CreatedOnBrandCrowd-en-us-DysrpsmM.js → CreatedOnBrandCrowd-en-us-CG-ThD_q.js}

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

package/lib/src/{CreatedOnBrandCrowd-es-es-B6twGr9h.js → CreatedOnBrandCrowd-es-es-aab4_Re2.js}

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

package/lib/src/{CreatedOnBrandCrowd-fr-fr-yxl0ih_4.js → CreatedOnBrandCrowd-fr-ca-Drl8X5uh.js}

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

package/lib/src/{CreatedOnBrandCrowd-fr-ca-yxl0ih_4.js → CreatedOnBrandCrowd-fr-fr-Drl8X5uh.js}

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

package/lib/src/{CreatedOnBrandCrowd-pt-pt-BtXDrIcx.js → CreatedOnBrandCrowd-pt-br-8Ib7T70i.js}

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

package/lib/src/{CreatedOnBrandCrowd-pt-br-BtXDrIcx.js → CreatedOnBrandCrowd-pt-pt-8Ib7T70i.js}

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

package/lib/src/{CreatedOnDcom-de-de-ho_ROy1L.js → CreatedOnDcom-de-de-FJtydzc5.js}

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

package/lib/src/{CreatedOnDcom-en-us-C91p9kls.js → CreatedOnDcom-en-us-BMiXru6P.js}

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

package/lib/src/{CreatedOnDcom-es-es-B3FYmObE.js → CreatedOnDcom-es-es-B8Srdnku.js}

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

package/lib/src/{CreatedOnDcom-fr-ca-D40m7fPx.js → CreatedOnDcom-fr-ca-tcXGiBNt.js}

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

package/lib/src/{CreatedOnDcom-fr-fr-Cd57oYyc.js → CreatedOnDcom-fr-fr-nE1cuUEU.js}

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

package/lib/src/{CreatedOnDcom-pt-br-Du57mWxG.js → CreatedOnDcom-pt-br-DxCCXCg8.js}

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

package/lib/src/{CreatedOnDcom-pt-pt-fYoPZWwr.js → CreatedOnDcom-pt-pt-Csabip9G.js}

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

package/lib/src/brand-page/utils/logo.util.d.ts

@@ -30,6 +30,20 @@ export declare const calculateOptimizedLogoDimensions: (logoData: {
     width: string;
     height: string;
 };
+/**
+ * Resolves the "current" logo image from a brand-page MODEL (the raw,
+ * deserialized shape — not the live stores, whose contents are wrapped in
+ * `settings.content`).
+ *
+ * Brand-site keeps its logo in the page header; brand-page and brand-contact
+ * keep it as a logo CONTENT block on the home page — the same `isBrandSite ?
+ * header : content` split the logo-settings store getters/setter use. This is
+ * the single source of truth for model-level logo reads: initial load and
+ * history-restore both call it so the two paths can't drift. They previously
+ * hard-coded `=== brandPage`, which silently excluded brand-contact and read a
+ * stale header logo on undo.
+ */
+export declare const getLogoImageFromModel: (model: BrandPageModel) => LogoImageModel | undefined;
 export declare const recalculateLogoContentDimensions: (pageData: any, editableLogoVariations: {
     variationId: number;
     width: number;

package/lib/src/brand-page/utils/logo.util.js

@@ -225,6 +225,25 @@ export const calculateOptimizedLogoDimensions = (logoData, currentWidth, current
     }
     return { width: currentWidth, height: currentHeight };
 };
+/**
+ * Resolves the "current" logo image from a brand-page MODEL (the raw,
+ * deserialized shape — not the live stores, whose contents are wrapped in
+ * `settings.content`).
+ *
+ * Brand-site keeps its logo in the page header; brand-page and brand-contact
+ * keep it as a logo CONTENT block on the home page — the same `isBrandSite ?
+ * header : content` split the logo-settings store getters/setter use. This is
+ * the single source of truth for model-level logo reads: initial load and
+ * history-restore both call it so the two paths can't drift. They previously
+ * hard-coded `=== brandPage`, which silently excluded brand-contact and read a
+ * stale header logo on undo.
+ */
+export const getLogoImageFromModel = (model) => {
+    if (model.brandPageType === BRAND_PAGE_TYPES.brandSite) {
+        return model.pageHeaderDesktop?.logoImage;
+    }
+    return model.pages?.[0]?.contents?.find(isLogoContent)?.logoImage;
+};
 export const recalculateLogoContentDimensions = async (pageData, editableLogoVariations, logoImage, isPrePurchase) => {
     try {
         let logoData;

package/lib/src/brand-page-maker/components/action-bar/ActionBar.mixin.d.ts

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

package/lib/src/brand-page-maker/components/brand-page-maker/BrandPageMaker.mixin.d.ts

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

package/lib/src/brand-page-maker/components/brand-page-maker/BrandPageMaker.mixin.js

@@ -196,7 +196,7 @@ export default defineComponent({
         this.brandPageMakerStore.setIsBrandPageLoaded(true);
         // Capture baseline for undo/redo when the feature is active for this
         // session — see useUndoRedoFlag.ts for the gate (LaunchDarkly flag +
-        // brand-site + non-admin maker).
+        // non-admin maker; all three brands).
         if (useUndoRedoFlag().value) {
             useHistoryStore().captureBaseline();
         }

package/lib/src/brand-page-maker/components/brand-page-maker/BrandPageMakerTemplateSettings.mixin.d.ts

@@ -107,7 +107,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             content: TContent;
         }>(payload: P): Promise<void>;
         _captureTemplateSwitchIfEnabled(): void;
-        applyHistorySnapshot(snapshot: import("../../../lib").BrandPageModel, activePageId?: string, logoEditsStr?: string): Promise<void>;
+        applyHistorySnapshot(snapshot: import("../../../lib").BrandPageModel, activePageId?: string, logoEditsStr?: string, selectedTemplateId?: string | false): Promise<void>;
         _syncLogoSettingsFromSnapshot(snapshot: import("../../../lib").BrandPageModel, logoEditsStr?: string): Promise<void>;
         _navigateToActivePage(activePageId?: string): void;
         _fallbackSidebarIfSelectedContentMissing(snapshot: import("../../../lib").BrandPageModel): void;

package/lib/src/brand-page-maker/components/brandpage-maker-page/BrandPageMakerPage.mixin.d.ts

@@ -433,7 +433,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         pushMode(item: import("@shared/content-settings/store").ContentSettingsModeStackItem): void;
         resetMode(): void;
         updateItemValue(payload: import("@shared/content-settings/models").UpdateItemValuePayload<unknown>): void;
-        updateMultipleItemValues({ id, name, value, }: import("@shared/content-settings/models").UpdateMultipleItemValuesPayload<any>): void;
+        updateMultipleItemValues({ id, name, value, isHydrationWrite, }: import("@shared/content-settings/models").UpdateMultipleItemValuesPayload<any>): void;
         updateTextStyleType({ id, name, value, }: import("@shared/content-settings/models").UpdateMultipleItemValuesPayload<any>): void;
         updateTextStyles({ id, name, value, }: import("@shared/content-settings/models").UpdateMultipleItemValuesPayload<any>): void;
         getTextStyles({ id, name }: {
@@ -626,7 +626,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;
@@ -1250,7 +1250,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">>;
 }, {
     isDraggingContent: boolean;
     isContentSelected: boolean;

package/lib/src/brand-page-maker/components/brandpage-settings/ReplaceImageSettingsForBrandPageSettings.mixin.d.ts

@@ -113,7 +113,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/brand-page-maker/components/preview/Preview.mixin.d.ts

@@ -93,8 +93,8 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         default: undefined;
     };
 }>> & Readonly<{}>, {
-    deviceMode: "desktop" | "mobile";
     runtimeEnvironment: string;
+    deviceMode: "desktop" | "mobile";
 }, {}, {
     HelloBar: any;
     BrandPageMakerPage: import("vue").DefineComponent<{}, {}, any>;

package/lib/src/brand-page-maker/components/seo-settings/SeoPageSettings.mixin.d.ts

@@ -391,7 +391,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;
@@ -481,8 +481,8 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     "onUpdate-settings"?: ((...args: any[]) => any) | undefined;
 }>, {
     pageTitle: string;
-    brandPageType: string;
     designDraftToken: string;
+    brandPageType: string;
     pageDescription: string;
     isMaker: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/lib/src/brand-page-maker/components/seo-settings/UrlSettings.mixin.d.ts

@@ -392,7 +392,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/brand-page-maker/components/social-share/SocialShare.mixin.d.ts

@@ -123,7 +123,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/brand-page-maker/components/template-preview/TemplatePreview.mixin.d.ts

@@ -441,7 +441,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/brand-page-maker/composables/rich-text-editor/useRichTextEditor.js

@@ -74,9 +74,6 @@ export const useExternalRichTextEditor = () => {
 };
 export const useRichTextEditor = (model, props, emit, fontSettings, fontStyleDropdownRef, selectedGlobalTextStyles, onSelectTextStyleType, updateRichTextEditor, textStyleTypeOptions, markedText, isHyperlinkPopupOpen, selectedLinkTypeValue) => {
     const historyStore = useHistoryStore();
-    // TipTap rehydrates and writes back canonical HTML on mount — fold
-    // that into the current head instead of pushing a phantom entry.
-    historyStore.mergeNextMutation();
     const editor = new Editor({
         content: model.value ?? '',
         editable: !props.readOnly,
@@ -257,6 +254,13 @@ export const useRichTextEditor = (model, props, emit, fontSettings, fontStyleDro
         }
     });
     editor.on('transaction', ({ transaction }) => {
+        // Style detection only makes sense for user styling — an unfocused
+        // editor's transactions are mount rehydration / programmatic setContent
+        // churn, and clearing textStyleType from those would push a phantom
+        // style write into the model (BP-5810 family).
+        if (!editor.isFocused) {
+            return;
+        }
         if (isStyleChanged(transaction) && props.styles.textStyleType) {
             onSelectTextStyleType({
                 label: 'None',
@@ -266,7 +270,24 @@ export const useRichTextEditor = (model, props, emit, fontSettings, fontStyleDro
     // Update model when editor content changes
     editor.on('update', () => {
         const sanitizedData = sanitiseClientSideRTE(editor.getHTML());
-        emit('update:modelValue', sanitizedData.sanitizedHtml);
+        // An update fired while the editor is unfocused is TipTap rewriting the
+        // model back into its canonical HTML during mount rehydration or a
+        // programmatic setContent — not a user edit. Tag the emit so the write
+        // folds into the current undo head instead of pushing a phantom entry
+        // (BP-5810). The flag travels WITH the value through the debounced
+        // field → store chain and arms the history merge at the moment of the
+        // store write — arming here at emit time would lapse before the
+        // debounce fires. Genuine edits happen while focused and commit
+        // normally.
+        //
+        // Known limitation: a programmatic toolbar command run on an editor the
+        // user hasn't focused yet would also merge (losing that undo step). Today
+        // the RTE only mounts inside an already-open settings drawer and the user
+        // focuses it before formatting, so this doesn't occur — revisit if a
+        // consumer ever drives toolbar actions on an unfocused editor.
+        emit('update:modelValue', sanitizedData.sanitizedHtml, {
+            isHydration: !editor.isFocused,
+        });
     });
     editor.on('selectionUpdate', () => {
         // Skip while a history snapshot is being applied — `setContent` fires

package/lib/src/brand-page-maker/composables/useUndoRedoFlag.d.ts

@@ -1,16 +1,15 @@
 import { type ComputedRef } from 'vue';
 /**
- * Returns whether undo/redo is active for the current maker session. All
- * three conditions must hold:
+ * Returns whether undo/redo is active for the current maker session. Both
+ * conditions must hold:
  *
  *   1. `userStore.features.canUseUndoRedo` is true. The flag is populated by
  *      the consumer (BrandCrowd.Net / web-renderer) via the
  *      `WebsiteDesignUserFeatures.CanUseUndoRedo` boolean on the ViewModel —
- *      same precedent as RichTextEditor / GettyVideos / AITextGenerator.
- *   2. The maker is a brand-site (Website Maker). V1 scope is brand-site
- *      only; brand-page (single-page profile) and brand-contact (vCard) are
- *      out of scope.
- *   3. The session is NOT in admin-maker mode (`userStore.isAdmin`). The
+ *      same precedent as RichTextEditor / GettyVideos / AITextGenerator. The
+ *      one flag governs all three brands (brand-site, brand-page,
+ *      brand-contact) — there is no per-brand gating.
+ *   2. The session is NOT in admin-maker mode (`userStore.isAdmin`). The
  *      admin maker uses the same components but a different editing flow
  *      (template authoring) where undo/redo is out of scope.
  */

package/lib/src/brand-page-maker/composables/useUndoRedoFlag.js

@@ -1,25 +1,20 @@
 import { computed } from 'vue';
 import { useBrandPageMakerUserStore } from '@brand-page-maker/stores/user';
-import { useBrandPageMakerStore } from '@brand-page-maker/stores/brandpage-maker/brandpage-maker-store';
 /**
- * Returns whether undo/redo is active for the current maker session. All
- * three conditions must hold:
+ * Returns whether undo/redo is active for the current maker session. Both
+ * conditions must hold:
  *
  *   1. `userStore.features.canUseUndoRedo` is true. The flag is populated by
  *      the consumer (BrandCrowd.Net / web-renderer) via the
  *      `WebsiteDesignUserFeatures.CanUseUndoRedo` boolean on the ViewModel —
- *      same precedent as RichTextEditor / GettyVideos / AITextGenerator.
- *   2. The maker is a brand-site (Website Maker). V1 scope is brand-site
- *      only; brand-page (single-page profile) and brand-contact (vCard) are
- *      out of scope.
- *   3. The session is NOT in admin-maker mode (`userStore.isAdmin`). The
+ *      same precedent as RichTextEditor / GettyVideos / AITextGenerator. The
+ *      one flag governs all three brands (brand-site, brand-page,
+ *      brand-contact) — there is no per-brand gating.
+ *   2. The session is NOT in admin-maker mode (`userStore.isAdmin`). The
  *      admin maker uses the same components but a different editing flow
  *      (template authoring) where undo/redo is out of scope.
  */
 export function useUndoRedoFlag() {
     const userStore = useBrandPageMakerUserStore();
-    const brandPageMakerStore = useBrandPageMakerStore();
-    return computed(() => userStore.features.canUseUndoRedo &&
-        brandPageMakerStore.isBrandSite &&
-        !userStore.isAdmin);
+    return computed(() => userStore.features.canUseUndoRedo && !userStore.isAdmin);
 }

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

@@ -211,7 +211,7 @@ export declare const useBrandPageMakerStore: import("pinia").StoreDefinition<"br
      * feature flag is on — see `BrandPageMaker.mixin.ts`).
      */
     _captureTemplateSwitchIfEnabled(): void;
-    applyHistorySnapshot(snapshot: BrandPageModel, activePageId?: string, logoEditsStr?: string): Promise<void>;
+    applyHistorySnapshot(snapshot: BrandPageModel, activePageId?: string, logoEditsStr?: string, selectedTemplateId?: string | false): Promise<void>;
     _syncLogoSettingsFromSnapshot(snapshot: BrandPageModel, logoEditsStr?: string): Promise<void>;
     /**
      * Restore the active page after a history apply. The id passed in is

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

@@ -494,7 +494,7 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
                 return;
             historyStore.captureTemplateSwitch();
         },
-        async applyHistorySnapshot(snapshot, activePageId, logoEditsStr) {
+        async applyHistorySnapshot(snapshot, activePageId, logoEditsStr, selectedTemplateId) {
             const styleSettingsStore = useUiStyleSettingsStore();
             const navigationStyleSettingsStore = useUiNavigationStyleSettingsStore();
             const backgroundSettingsStore = useUiBackgroundSettingsStore();
@@ -574,6 +574,15 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
             this.ogDescription = snapshot.ogDescription;
             this.cookieOptions = snapshot.cookieOptions;
             this.saveContactSettings = snapshot.saveContactSettings;
+            // 7b. Restore the selected-template pointer that drives the templates
+            //     sidebar highlight. It's a UI pointer, not part of the persisted
+            //     model, so it rides along as a history-entry sidecar (like
+            //     `activePageId`). Its watchers only reset scroll position (no
+            //     template re-application), so setting it here is safe during apply.
+            //     (BP-5813)
+            if (selectedTemplateId !== undefined) {
+                this.setSelectedTemplateId({ templateId: selectedTemplateId });
+            }
             // 8. Re-sync the logo-settings sidebar's `selectedLogoImage` from the
             //    restored header logo. The preview rehydrates via the page contents,
             //    but `uiLogoSettings` holds its own copy that drives the sidebar
@@ -622,9 +631,7 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
                     console.error('brandpage-maker-store: failed to restore logoEdits', error);
                 }
             }
-            const logoImage = snapshot.brandPageType === BRAND_PAGE_TYPES.default
-                ? snapshot.pages?.[0]?.contents?.find((c) => c.type === 'logo')?.logoImage
-                : snapshot.pageHeaderDesktop?.logoImage;
+            const logoImage = logoUtil.getLogoImageFromModel(snapshot);
             if (!logoImage)
                 return;
             logoSettingsStore.setState({
@@ -848,9 +855,7 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
                 this.setBrandPageType({
                     brandPageType: _brandPageType,
                 });
-                let logoImage = brandPageModel.brandPageType === BRAND_PAGE_TYPES.default
-                    ? brandPageModel.pages?.[0].contents.find((c) => c.type === 'logo')?.logoImage
-                    : brandPageModel.pageHeaderDesktop?.logoImage;
+                let logoImage = logoUtil.getLogoImageFromModel(brandPageModel);
                 if (!logoImage?.logoDraftToken) {
                     logoImage = logoUtil.safeGetLogoImageFromLogoImageUrl(logoVariationImageUrls[0]);
                 }

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

@@ -16,6 +16,12 @@ export interface HistoryEntry {
     activePageId: string;
     /** JSON-stringified `editableLogoStore.logoEdits`. Undefined if logo tab never opened. */
     logoEdits?: string;
+    /**
+     * Selected template id at capture time — drives the templates sidebar
+     * highlight. `false` when no template is selected. Sidecar to
+     * `brandPageData` (not part of the persisted model), like `activePageId`.
+     */
+    selectedTemplateId?: string | false;
 }
 export declare const useHistoryStore: import("pinia").StoreDefinition<"history", Pick<{
     entries: import("vue").ShallowRef<HistoryEntry[], HistoryEntry[]>;
@@ -83,4 +89,4 @@ export declare const useHistoryStore: import("pinia").StoreDefinition<"history",
     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">>;

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

@@ -97,6 +97,9 @@ export const useHistoryStore = defineStore('history', () => {
     function getCurrentActivePageId() {
         return usePageNavigationStore().activePageId ?? '';
     }
+    function getCurrentSelectedTemplateId() {
+        return useBrandPageMakerStore().selectedTemplateId;
+    }
     function serializeCurrentLogoEdits() {
         try {
             const editableLogoStore = useUiEditableLogoStore();
@@ -150,6 +153,7 @@ export const useHistoryStore = defineStore('history', () => {
             sizeBytes: args.snapshot.length,
             activePageId: args.activePageId,
             logoEdits: args.logoEdits,
+            selectedTemplateId: args.selectedTemplateId,
         };
         // FR-11: truncate redo tail, then append.
         const next = entries.value.slice(0, currentIndex.value + 1);
@@ -209,6 +213,7 @@ export const useHistoryStore = defineStore('history', () => {
                 return;
             const activePageId = getCurrentActivePageId();
             const logoEdits = serializeCurrentLogoEdits();
+            const selectedTemplateId = getCurrentSelectedTemplateId();
             // Settle window: fold post-init reactive cascades back into the
             // baseline so undo doesn't light up before the user has done
             // anything.
@@ -228,6 +233,7 @@ export const useHistoryStore = defineStore('history', () => {
                         sizeBytes: snapshot.length,
                         activePageId,
                         logoEdits,
+                        selectedTemplateId,
                     },
                 ];
                 return;
@@ -241,6 +247,7 @@ export const useHistoryStore = defineStore('history', () => {
                     sizeBytes: snapshot.length,
                     activePageId,
                     logoEdits,
+                    selectedTemplateId,
                 };
                 entries.value = next;
                 return;
@@ -251,6 +258,7 @@ export const useHistoryStore = defineStore('history', () => {
                 actor: 'user',
                 activePageId,
                 logoEdits,
+                selectedTemplateId,
             });
         };
         // Monotonic — first mutation arms; subsequent ones inside the window
@@ -299,6 +307,7 @@ export const useHistoryStore = defineStore('history', () => {
                 sizeBytes: snapshot.length,
                 activePageId: getCurrentActivePageId(),
                 logoEdits: serializeCurrentLogoEdits(),
+                selectedTemplateId: getCurrentSelectedTemplateId(),
             },
         ];
         currentIndex.value = 0;
@@ -318,6 +327,7 @@ export const useHistoryStore = defineStore('history', () => {
             snapshot,
             activePageId: getCurrentActivePageId(),
             logoEdits: serializeCurrentLogoEdits(),
+            selectedTemplateId: getCurrentSelectedTemplateId(),
             ...args,
         });
     }
@@ -393,7 +403,7 @@ export const useHistoryStore = defineStore('history', () => {
         pendingTimerIsMerge = false;
         cancelPendingAutoCapture();
         try {
-            await brandPageMakerStore.applyHistorySnapshot(snapshot, resolvedActivePageId, targetEntry?.logoEdits);
+            await brandPageMakerStore.applyHistorySnapshot(snapshot, resolvedActivePageId, targetEntry?.logoEdits, targetEntry?.selectedTemplateId);
         }
         finally {
             isApplyingSnapshot.value = false;