@designcrowd/library.brand-page 5.17.25-undo-21 → 5.17.25

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

@@ -40,13 +40,6 @@ import { useUiBackgroundSettingsStore } from '@shared/background-settings/store'
 import { useBrandPageMakerUserStore } from '../user';
 import { useBrandPageContainerStore } from '../brandpage-container';
 import { useUiTemplateSettingsStore } from '@shared/template-settings/store';
-import { useUiNavigationStyleSettingsStore } from '@shared/navigation-style-settings/store';
-import {
-  CONTENT_SETTINGS_MODES,
-  useUiContentSettingsStore,
-} from '@shared/content-settings/store';
-import { useUiSideBarStore } from '@shared/side-bar/store';
-import { SIDE_BAR_TAB_NAMES } from '@brand-page-maker/constants';
 import { PAGE_SECTIONS } from '@shared/page-settings/models';
 import { FabricRenderClient } from '../../../clients/fabric-render-client';
 import { setLocaleAsync } from '@src/composables/useTranslate';
@@ -567,163 +560,4 @@ describe('brand page maker store module', () => {
     // Assert
     expect(setDesignTemplateTokenSpy).not.toHaveBeenCalled();
   });
-
-  // BP-5506 regression: applyHistorySnapshot must replace nested navigation
-  // style refs as a whole, not deep-merge them. The previous bug was that
-  // object-form $patch would leave keys present in the live state but absent
-  // from the snapshot in place — e.g. switching nav button styles then
-  // undoing would leave the new style's borderColor / borderRadius applied.
-  test('applyHistorySnapshot replaces navigation styles wholesale (no key bleed across undo)', async () => {
-    // Arrange — initialise the maker so `applyHistorySnapshot` has a
-    // populated set of dependent stores to write into.
-    const makerStore = useBrandPageMakerStore();
-    const navigationStyleSettingsStore = useUiNavigationStyleSettingsStore();
-
-    await makerStore.initialise(INITIALISE_PAYLOAD);
-
-    // Build snapshot A — the "older" state we'll undo back to. Keep the
-    // navigation simple: only borderRadius is set on selectedButtonStyle.
-    const snapshotA = {
-      ...makerStore.brandPageData,
-      pageHeaderDesktop: {
-        ...makerStore.brandPageData.pageHeaderDesktop,
-        navigation: {
-          ...makerStore.brandPageData.pageHeaderDesktop?.navigation,
-          selectedButtonStyle: {
-            borderRadius: '0px',
-          },
-        },
-      },
-    } as BrandPageModel;
-
-    // Build snapshot B — the "newer" state with extra keys that the
-    // older snapshot does NOT have. If $patch deep-merged, these would
-    // survive an undo back to A.
-    const snapshotB = {
-      ...snapshotA,
-      pageHeaderDesktop: {
-        ...snapshotA.pageHeaderDesktop,
-        navigation: {
-          ...snapshotA.pageHeaderDesktop?.navigation,
-          selectedButtonStyle: {
-            borderRadius: '12px',
-            borderColor: 'rgb(255, 0, 0)',
-            borderStyle: 'dashed',
-            borderWidth: '4px',
-          },
-        },
-      },
-    } as BrandPageModel;
-
-    // Act — apply newer first (simulates the user making the edit), then
-    // older (simulates the undo). NavigationDesktop's constructor folds
-    // its input over a defaults object, so we read the resulting state
-    // and assert against the keys that came from snapshotB but NOT from
-    // snapshotA.
-    await makerStore.applyHistorySnapshot(snapshotB);
-    await makerStore.applyHistorySnapshot(snapshotA);
-
-    // Assert — after the undo, no keys from B should bleed through onto
-    // A's selectedButtonStyle. Specifically the values that are unique to
-    // B (red dashed border) must not be present.
-    const restored =
-      navigationStyleSettingsStore.navigation[PAGE_SECTIONS.header][
-        VIEWPORTS.desktop
-      ];
-    const restoredSelected = restored.selectedButtonStyle;
-
-    expect(restoredSelected.borderRadius).toBe('0px');
-    // The B-only values must not survive the undo. NavigationStyles'
-    // constructor seeds defaults for selectedButtonStyle, so we assert
-    // the *exact* B-only values are gone rather than a strict superset.
-    expect(restoredSelected.borderColor).not.toBe('rgb(255, 0, 0)');
-    expect(restoredSelected.borderStyle).not.toBe('dashed');
-    expect(restoredSelected.borderWidth).not.toBe('4px');
-  });
-
-  // BP-5506 regression: undoing a page-add must clear the URL/active-page
-  // back to a page that exists in the restored snapshot. The page-tabs
-  // carousel keys "selected" off the route URL; after `setNav` removes the
-  // added route, no nav item matches the URL slug and the highlight
-  // disappears. `applyHistorySnapshot` accepts an `activePageId` and writes
-  // it through `pageNavigationStore.setCurrentActivePage` so the routeStore
-  // and `currentPage` getter realign.
-  test('applyHistorySnapshot updates pageNavigation.activePageId when given a valid id', async () => {
-    const makerStore = useBrandPageMakerStore();
-    const pageNavigationStore = usePageNavigationStore();
-
-    await makerStore.initialise(INITIALISE_PAYLOAD);
-
-    const restoredPageId = pageNavigationStore.routes[0]?.pageId;
-
-    expect(restoredPageId).toBeDefined();
-
-    pageNavigationStore.activePageId = '';
-
-    await makerStore.applyHistorySnapshot(
-      makerStore.brandPageData,
-      restoredPageId,
-    );
-
-    expect(pageNavigationStore.activePageId).toBe(restoredPageId);
-  });
-
-  test('applyHistorySnapshot falls back to first/default route when no activePageId is provided', async () => {
-    const makerStore = useBrandPageMakerStore();
-    const pageNavigationStore = usePageNavigationStore();
-
-    await makerStore.initialise(INITIALISE_PAYLOAD);
-
-    const expectedFirstId =
-      pageNavigationStore.getFirstOrDefaultRoute()?.pageId;
-
-    expect(expectedFirstId).toBeDefined();
-
-    pageNavigationStore.activePageId = 'stale-page-id-not-in-nav';
-
-    await makerStore.applyHistorySnapshot(makerStore.brandPageData);
-
-    expect(pageNavigationStore.activePageId).toBe(expectedFirstId);
-  });
-
-  // BP-5506 regression: when undoing a content add, the selected item
-  // disappears. The fallback must restore the Content tab's natural
-  // landing state (mode = edit, selectedItemId = null), not just switch
-  // tabs — otherwise `<FocusedContentItemSettings>` keeps rendering for
-  // a missing item and paints a blank panel.
-  test('applyHistorySnapshot resets sidebar to default Content tab when selected item is gone', async () => {
-    const makerStore = useBrandPageMakerStore();
-    const contentSettingsStore = useUiContentSettingsStore();
-    const sideBarStore = useUiSideBarStore();
-
-    await makerStore.initialise(INITIALISE_PAYLOAD);
-
-    // Simulate the user opening a content item's focused settings.
-    const orphanItemId = 'orphan-content-id-not-in-snapshot';
-
-    contentSettingsStore.pushMode({
-      mode: CONTENT_SETTINGS_MODES.focusedContentItem,
-      selectedItemId: orphanItemId,
-    });
-    contentSettingsStore.selectedItemId = orphanItemId;
-    sideBarStore.setSelectedTabName({
-      tabName: SIDE_BAR_TAB_NAMES.CONTENT_SETTINGS,
-    });
-
-    // Pre-condition: panel is showing the focused content item.
-    expect(contentSettingsStore.mode).toBe(
-      CONTENT_SETTINGS_MODES.focusedContentItem,
-    );
-    expect(contentSettingsStore.selectedItemId).toBe(orphanItemId);
-
-    // Snapshot does NOT contain orphanItemId — simulates undo of an add.
-    await makerStore.applyHistorySnapshot(makerStore.brandPageData);
-
-    // Post-condition: same shape as a fresh Content tab click.
-    expect(contentSettingsStore.mode).toBe(CONTENT_SETTINGS_MODES.edit);
-    expect(contentSettingsStore.selectedItemId).toBeNull();
-    expect(sideBarStore.selectedTabName).toBe(
-      SIDE_BAR_TAB_NAMES.CONTENT_SETTINGS,
-    );
-  });
 });

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

@@ -59,7 +59,6 @@ import {
   BRANDPAGE_DEFAULT_SAVE_MESSAGE_DESCRIPTION,
   MAKER_MOBILE_BREAKPOINT,
   MESSAGE_VISIBLE_DURATION,
-  SIDE_BAR_TAB_NAMES,
 } from '@brand-page-maker/constants';
 import { useUiSideBarStore } from '@shared/side-bar/store';
 import { delayInMS } from '../../../utils/ui-util';
@@ -101,7 +100,6 @@ import { useConsent } from '@brand-page/composables/consent.composable';
 import { commonTr, errorTr } from '@src/composables/useTranslate';
 import { UPGRADE_CTA_LOCATIONS } from '../../composables/useEventTracker';
 import { useVideoStore } from '../video';
-import { useHistoryStore } from '../history/history-store';
 import { findValuesByKey } from '../../../helpers/ts.helper';
 import { useLogoStore } from '../logo-store';
 
@@ -666,16 +664,6 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
           description: payload.noDescription ? '' : description,
         },
       });
-
-      // Any successful save re-baselines the undo stack so a user can't
-      // undo back past the persisted state. This covers Save Progress /
-      // Publish AND settings-only saves (updateBrandPage,
-      // updateSensitiveContent, admin saveTemplate) — settings-tab
-      // actions persist the metadata, so allowing undo to roll them
-      // back would let the local stack drift from what's saved.
-      // reset() no-ops in non-undo-redo sessions (no baseline = nothing
-      // to clear).
-      useHistoryStore().reset();
     },
     hideChangeTemplateConfirmModal() {
       this.setIsChangeTemplateConfirmModalVisible({
@@ -689,11 +677,10 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
       this.setSelectedTemplateId({ templateId: false });
       this.hideChangeTemplateConfirmModal();
     },
-    async onChangeTemplateConfirmModalConfirm() {
-      await this.applySelectedTemplate();
+    onChangeTemplateConfirmModalConfirm() {
+      this.applySelectedTemplate();
       this.hideChangeTemplateConfirmModal();
       this.isModifiedAfterTemplateApplied = false;
-      this._captureTemplateSwitchIfEnabled();
     },
     onContentChanged() {
       this.setIsModifiedAfterTemplateApplied();
@@ -701,7 +688,7 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
     onStyleChanged(): void {
       this.setIsModifiedAfterTemplateApplied();
     },
-    async onTemplateSelected(payload: OnTemplateSelectedPayload) {
+    onTemplateSelected(payload: OnTemplateSelectedPayload) {
       this.setSelectedTemplateId({
         templateId: payload.templateId,
       });
@@ -711,8 +698,7 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
           isVisible: true,
         });
       } else {
-        await this.applySelectedTemplate();
-        this._captureTemplateSwitchIfEnabled();
+        this.applySelectedTemplate();
       }
     },
     setSelectedTabName(payload) {
@@ -749,275 +735,6 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
       const uiContentSettingsStore = useUiContentSettingsStore();
 
       uiContentSettingsStore.updateContent<TContent>(payload);
-
-      // NOTE (Bolt 1, 2026-04-23): this action is not the actual edit path used
-      // by the UI — sidebar inputs call uiContentSettingsStore.updateItemValue
-      // directly. History capture is driven by a deep `watch(brandPageData, ...)`
-      // installed in history-store once the baseline is captured, so we do not
-      // need to instrument this action. Kept here as a pass-through because
-      // removing it may affect other callers.
-    },
-    /**
-     * Restore every store that the `brandPageData` getter reads from, so undo
-     * and redo bring back the EXACT document state captured at snapshot time.
-     *
-     * `initialiseStoresByBrandPageModelAsync` is too narrow for undo/redo — it
-     * only rehydrates pages, sections, and nav structure, which is enough for
-     * the AI-apply path but leaves navigation styles, backgrounds, button/text/
-     * logo/gallery styles, shop config, and several own-store fields unchanged.
-     * This action mirrors the full hydration surface of `applySelectedTemplate`
-     * (minus the template-specific logo/personalisation logic) so a restore is
-     * a complete round-trip of what `brandPageData` returns.
-     *
-     * Called ONLY by history-store during undo/redo. The history store sets
-     * `isApplyingSnapshot=true` across this call to prevent the deep-watcher
-     * on `brandPageData` from re-capturing the restored state.
-     */
-    /**
-     * Force-commit a `template_switch` entry to the history store, if the
-     * history store has a baseline (which only happens when the undo/redo
-     * feature flag is on — see `BrandPageMaker.mixin.ts`).
-     */
-    _captureTemplateSwitchIfEnabled(): void {
-      const historyStore = useHistoryStore();
-
-      if (!historyStore.baselineCaptured) return;
-
-      historyStore.captureTemplateSwitch();
-    },
-    async applyHistorySnapshot(
-      snapshot: BrandPageModel,
-      activePageId?: string,
-    ): Promise<void> {
-      const styleSettingsStore = useUiStyleSettingsStore();
-      const navigationStyleSettingsStore = useUiNavigationStyleSettingsStore();
-      const backgroundSettingsStore = useUiBackgroundSettingsStore();
-      const pageNavigationStore = usePageNavigationStore();
-      const shopStore = useShopConfigStore();
-
-      // 1. Pages + header/footer sections (also covers content items).
-      this.initialisePagesForCurrentPage({
-        pages: snapshot.pages,
-        sections: {
-          [PAGE_SECTIONS.header]: {
-            [VIEWPORTS.desktop]: snapshot.pageHeaderDesktop,
-            [VIEWPORTS.mobile]: snapshot.pageHeaderMobile,
-          },
-          [PAGE_SECTIONS.footer]: {
-            [VIEWPORTS.desktop]: snapshot.pageFooterDesktop,
-            [VIEWPORTS.mobile]: snapshot.pageFooterMobile,
-          },
-        },
-      });
-
-      // 2. Page-level nav structure (routes, orders).
-      pageNavigationStore.setNav({ nav: snapshot.nav });
-
-      // 3. Navigation STYLES (header/footer nav colors, alignment, etc.) —
-      //    this is the bit that was being dropped before.
-      // Use function-form $patch so each nested style object is replaced as a
-      // whole reference. The object-form $patch (used by setState) deep-merges
-      // and would leave keys present in the live state but absent from the
-      // snapshot in place — e.g. switching button styles then undoing would
-      // leave the new style's borderRadius/borderStyle/borderWidth applied.
-      navigationStyleSettingsStore.$patch((state) => {
-        state.navigation[PAGE_SECTIONS.header][VIEWPORTS.desktop] =
-          new NavigationDesktop(snapshot.pageHeaderDesktop?.navigation);
-        state.navigation[PAGE_SECTIONS.header][VIEWPORTS.mobile] =
-          new NavigationMobile(snapshot.pageHeaderMobile?.navigation);
-      });
-
-      // 4. Global styles (logo, button, text, gallery). Same whole-reference
-      //    replacement reasoning as step 3.
-      styleSettingsStore.$patch((state) => {
-        state.buttonStyles = snapshot.styles.buttonStyles;
-        state.logoStyles = snapshot.styles.logoStyles;
-        state.textStyles = snapshot.styles.textStyles;
-        state.galleryStyles = snapshot.styles.galleryStyles;
-      });
-
-      // 5. Background styles. Same whole-reference replacement reasoning as
-      //    step 3 — `setBackgroundStyles` calls per-field setters that
-      //    `Object.assign` partials onto the live `style` and
-      //    `backgroundShapeStyle` objects, so keys from the previous mode
-      //    (e.g. background image url, shape style props) would survive an
-      //    undo back to a state that doesn't have them.
-      backgroundSettingsStore.$patch((state) => {
-        state.backgroundStyles = snapshot.styles.backgroundStyles;
-      });
-      backgroundSettingsStore.onBackgroundChanged();
-
-      // 6. Shop products are derived from shop-content blocks inside `pages`,
-      // so they're already implicitly restored at step 1. Re-run the shop
-      // store's derivation to keep `products` in sync with the snapshot
-      // pages. paymentConfig is intentionally NOT restored — selecting it is
-      // backend-confirmed (Stripe Connect / payment-provider linkage) per
-      // project-guardrails.md, so it must persist across undo. We pass the
-      // live paymentConfig back in to preserve it.
-      shopStore.initialiseShopStore({
-        paymentConfig: shopStore.paymentConfig,
-        pages: snapshot.pages ?? [],
-      });
-
-      // 7. Own-store scalar fields surfaced by the brandPageData getter.
-      if (snapshot.isModifiedAfterTemplateApplied !== undefined) {
-        this.isModifiedAfterTemplateApplied =
-          snapshot.isModifiedAfterTemplateApplied;
-      }
-
-      if (snapshot.brandPageType) {
-        this.setBrandPageType({ brandPageType: snapshot.brandPageType });
-      }
-
-      this.faviconUrl = snapshot.faviconUrl;
-      this.ogImageUrl = snapshot.ogImageUrl;
-      this.measurementID = snapshot.measurementID;
-      this.adsenseID = snapshot.adsenseID;
-      this.ogTitle = snapshot.ogTitle;
-      this.ogDescription = snapshot.ogDescription;
-      this.cookieOptions = snapshot.cookieOptions;
-      this.saveContactSettings = snapshot.saveContactSettings;
-
-      // 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
-      //    "current logo" state — same pattern as `initialiseStoresByBrandPageModelAsync`.
-      //    Also restores the variations grid + template asset for the
-      //    snapshot's draft token (both are sidecars to `brandPageData` —
-      //    BYO upload mutates them out of band).
-      this._syncLogoSettingsFromSnapshot(snapshot);
-
-      // 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
-      //    stare at a blank settings panel.
-      this._fallbackSidebarIfSelectedContentMissing(snapshot);
-
-      // 10. Switch to the page the user was viewing when this entry was
-      //     captured (or the closest still-existing page if the captured
-      //     page was the one being undone-away). The history store does the
-      //     walk-back resolution and passes us a pageId that's guaranteed to
-      //     exist in the restored nav — or undefined if no entry walking
-      //     back has a viable id, in which case we fall through to the
-      //     first/default route. Without this, the page-tabs carousel keeps
-      //     highlighting whatever page slug is in the URL (which can no
-      //     longer match any nav item after a page-add undo) and the
-      //     sidebar's `currentPage` getter silently falls back to page 0.
-      this._navigateToActivePage(activePageId);
-    },
-
-    _syncLogoSettingsFromSnapshot(snapshot: BrandPageModel): void {
-      const logoSettingsStore = useUiLogoSettingsStore();
-      const editableLogoStore = useUiEditableLogoStore();
-      const logoStore = useLogoStore();
-
-      const logoImage =
-        snapshot.brandPageType === BRAND_PAGE_TYPES.default
-          ? (
-              snapshot.pages?.[0]?.contents?.find(
-                (c) => c.type === 'logo',
-              ) as any
-            )?.logoImage
-          : snapshot.pageHeaderDesktop?.logoImage;
-
-      if (!logoImage) return;
-
-      logoSettingsStore.setState({
-        newState: { selectedLogoImage: logoImage },
-      });
-
-      const draftToken: string | undefined = logoImage.logoDraftToken;
-
-      if (!draftToken) return;
-
-      // Re-derive `enableEditMode` and the active template asset from the
-      // logo-store's draft registry. Drafts are append-only for the session,
-      // 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).
-      const draft = logoStore.getLogoDraftAssetByToken(draftToken);
-
-      if (draft) {
-        editableLogoStore.setEnableEditMode(!draft.isByo);
-
-        if (draft.templateAsset) {
-          logoStore.setLogoTemplateAsset(draft.templateAsset);
-        }
-      }
-
-      editableLogoStore.setLogoDraftToken(draftToken);
-      editableLogoStore.restoreVariationsForDraftToken(draftToken);
-    },
-
-    /**
-     * Restore the active page after a history apply. The id passed in is
-     * already validated against the restored nav by the history store; if
-     * it's undefined (no entry walking back had a viable page), fall back
-     * to the first/default route so the URL, `routeStore.currentRoute.params`,
-     * `pageNavigation.activePageId`, and the page-tab highlight all line up.
-     *
-     * `setCurrentActivePage` is called explicitly in addition to
-     * `navigateToPageByPageId` because `navigateToPageByPageId` is a no-op
-     * when the router instance is undefined (e.g. SSR / unit tests), but the
-     * Pinia state must still be updated so the sidebar's `currentPage`
-     * getter returns the right page.
-     */
-    _navigateToActivePage(activePageId?: string): void {
-      const pageNavigationStore = usePageNavigationStore();
-
-      let targetPageId = activePageId;
-
-      if (!targetPageId) {
-        const fallbackRoute = pageNavigationStore.routes.length
-          ? pageNavigationStore.getFirstOrDefaultRoute()
-          : undefined;
-
-        targetPageId = fallbackRoute?.pageId;
-      }
-
-      if (!targetPageId) return;
-
-      pageNavigationStore.setCurrentActivePage({ pageId: targetPageId });
-      navigateToPageByPageId(targetPageId);
-    },
-
-    _fallbackSidebarIfSelectedContentMissing(snapshot: BrandPageModel): void {
-      const contentSettingsStore = useUiContentSettingsStore();
-      const sideBarStore = useUiSideBarStore();
-
-      const selectedItemId = contentSettingsStore.selectedItemId;
-
-      if (!selectedItemId) return;
-
-      const existingContentIds = new Set<string>();
-
-      snapshot.pages?.forEach((page) => {
-        page.contents?.forEach((content) => {
-          if (content?.id) existingContentIds.add(content.id);
-        });
-      });
-
-      if (existingContentIds.has(selectedItemId)) return;
-
-      // The previously-selected content was undone away. Restore the
-      // Content tab's natural landing state — the same shape produced
-      // when the user clicks the Content tab fresh — instead of leaving
-      // the sidebar stuck rendering `<FocusedContentItemSettings>` for
-      // a missing item, which paints a blank panel.
-      //
-      // `resetMode()` pops the modeStack back to the base `edit` entry
-      // (the default landing mode); clearing `selectedItemId` releases
-      // the pointer to the now-deleted item.
-      sideBarStore.setSelectedTabName({
-        tabName: SIDE_BAR_TAB_NAMES.CONTENT_SETTINGS,
-      });
-      contentSettingsStore.resetMode();
-      contentSettingsStore.selectedItemId = null;
-      contentSettingsStore.selectedItemFieldName = null;
-      contentSettingsStore.selectedItemIndex = null;
-      contentSettingsStore.selectedItemValue = null;
     },
     export(): BrandPageModel {
       const data = this.brandPageData;

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

@@ -14,11 +14,6 @@ export interface LogoDraftAsset {
   tick: number;
   isByo: boolean;
   logoEditUrl?: string;
-  // The `logoTemplateAsset` active when this draft was created. Stamped at
-  // upload/setState time so undo/redo can restore the right template token
-  // + isByo flag from a snapshot's `logoDraftToken` alone — without us
-  // bloating each history entry with a copy of the asset.
-  templateAsset?: LogoTemplateAsset;
 }
 
 export interface LogoStoreState {

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

@@ -34,7 +34,6 @@ export const useBrandPageMakerUserStore = defineStore('brandPageMakerUser', {
       canUseAITextGenerator: false,
       canUseGoogleAdsense: false,
       googleAdsenseEnabled: false,
-      canUseUndoRedo: true,
     },
     emailAddress: '',
     hasPremiumSubscription: false,

package/src/bundles/bundled-translations.json

@@ -1145,9 +1145,7 @@
   "quickLinkBar": {
     "myWebPageLabel": "My web page:",
     "copyButton": "Copy",
-    "copiedButton": "Copied!",
-    "undoLabel": "Undo",
-    "redoLabel": "Redo"
+    "copiedButton": "Copied!"
   },
   "saveContactSettings": {
     "saveContentInfo": "Let visitors save your contact information when they view your Digital Business Card",

package/src/constants/ui.ts

@@ -15,7 +15,6 @@ export interface UIUserFeatures {
   canUseAITextGenerator: boolean;
   canUseGoogleAdsense: boolean;
   googleAdsenseEnabled: boolean;
-  canUseUndoRedo: boolean;
 }
 
 export const TEMPLATE_FIRST_PAGE_NO = 1;

package/src/shared/content-settings/components/content-settings/ContentSettings.stories.ts

@@ -33,7 +33,6 @@ export const Sample = (): any => {
     canUseGoogleAdsense: false,
     googleAdsenseEnabled: false,
     canUseAITextGenerator: true,
-    canUseUndoRedo: false,
   };
 
   const pinia = setupStoryPinia();

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

@@ -76,12 +76,6 @@ export default defineComponent({
     schema: 'https',
     textIcon: 'globe',
     textIcons: [] as string[],
-    // 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 as number | null,
-    focusedDisplay: '',
   }),
   computed: {
     items: {
@@ -168,26 +162,15 @@ export default defineComponent({
     },
 
     onFocusOverride(index: number, itemValue: string): void {
+      const value = [...this.modelValue];
       const match = URL_RE.exec(itemValue);
 
       if (match) {
         this.schema = match[1];
-        this.focusedIndex = index;
-        this.focusedDisplay = match[2];
-      } else {
-        this.focusedIndex = index;
-        this.focusedDisplay = itemValue;
+        value[index][this.valuePropName] = match[2];
       }
     },
-    inputDisplayValue(index: number): string {
-      return this.focusedIndex === index
-        ? this.focusedDisplay
-        : this.itemValue(index);
-    },
     onBlurOverride(index: number, itemValue: string): void {
-      this.focusedIndex = null;
-      this.focusedDisplay = '';
-
       const value = [...this.modelValue];
 
       let isValid = true;

package/src/shared/content-settings/components/draggable-item-list/DraggableItemList.vue

@@ -70,7 +70,7 @@
                     hasError[index],
                 }"
                 :placeholder="placeholderPrefix"
-                :value="inputDisplayValue(index)"
+                :value="itemValue(index)"
                 :data-test-tag="'image-url-text-input'"
                 @focus="onFocusOverride(index, $event.target.value)"
                 @blur="onBlurOverride(index, $event.target.value)"

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, watch } from 'vue';
+import { defineComponent, ref } from 'vue';
 import type { PropType } from 'vue';
 import type { FormField } from '@brand-page';
 import { formFieldsTr } from '@src/composables/useTranslate';
@@ -49,34 +49,18 @@ export default defineComponent({
       },
     ];
 
-    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,
+      valueWithState: ref(
+        props.value.map((field) => {
+          return {
+            field: field,
+            isCollapsed: true,
+            isTypeDropdownOpen: false,
+          };
+        }),
+      ),
     };
   },
   methods: {