@designcrowd/library.brand-page 6.0.6-undo-11 → 6.0.6-undo-12

package/lib/src/{CreatedOnBrandCrowd-de-de-DGLT4mjc.js → CreatedOnBrandCrowd-de-de-BoBmsU5p.js}

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

package/lib/src/{CreatedOnBrandCrowd-en-us-dyPp4NQB.js → CreatedOnBrandCrowd-en-us-VTBk9ZeK.js}

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

package/lib/src/{CreatedOnBrandCrowd-es-es-pxoT8xpT.js → CreatedOnBrandCrowd-es-es-CwYO5ZGB.js}

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

package/lib/src/{CreatedOnBrandCrowd-fr-fr-Bpvv3YSe.js → CreatedOnBrandCrowd-fr-ca-ZNEyNVVj.js}

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

package/lib/src/{CreatedOnBrandCrowd-fr-ca-Bpvv3YSe.js → CreatedOnBrandCrowd-fr-fr-ZNEyNVVj.js}

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

package/lib/src/{CreatedOnBrandCrowd-pt-pt-DqKwinmI.js → CreatedOnBrandCrowd-pt-br-D1q4-n_v.js}

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

package/lib/src/{CreatedOnBrandCrowd-pt-br-DqKwinmI.js → CreatedOnBrandCrowd-pt-pt-D1q4-n_v.js}

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

package/lib/src/{CreatedOnDcom-de-de-DhhAudIO.js → CreatedOnDcom-de-de-CFvvAm2h.js}

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

package/lib/src/{CreatedOnDcom-en-us-DZhMl0Ro.js → CreatedOnDcom-en-us-B5WlETVx.js}

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

package/lib/src/{CreatedOnDcom-es-es-brPE0-Lo.js → CreatedOnDcom-es-es-CatVjoa9.js}

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

package/lib/src/{CreatedOnDcom-fr-ca-CzKZrAVq.js → CreatedOnDcom-fr-ca-uyrRJVf9.js}

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

package/lib/src/{CreatedOnDcom-fr-fr-JLjx-E9X.js → CreatedOnDcom-fr-fr-CKSa6Crw.js}

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

package/lib/src/{CreatedOnDcom-pt-br-B_4Ot1uS.js → CreatedOnDcom-pt-br-BIcGDf-8.js}

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

package/lib/src/{CreatedOnDcom-pt-pt-By5SiPq_.js → CreatedOnDcom-pt-pt-BhKpuziQ.js}

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

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

@@ -345,8 +345,12 @@ export const useHistoryStore = defineStore('history', () => {
     //   1. Diff `cameFromIndex` against target — pages present in target
     //      but absent from source are being restored/added; navigate there
     //      (undo-of-delete, redo-of-add).
-    //   2. Walk back from targetIndex for the closest entry whose
-    //      activePageId still exists (undo-of-add and non-page edits).
+    //   2. Walk back from the NEWER of the two entries: the mutation being
+    //      applied-or-reverted is always the newer entry's, so its stamp is
+    //      the page where that change is visible. Undo therefore stays on
+    //      the page the user just edited instead of teleporting to the
+    //      previous entry's page; older entries are the fallback when the
+    //      stamped page doesn't survive the restore (undo-of-add).
     async function applySnapshotString(snapshotStr, targetIndex, cameFromIndex) {
         const brandPageMakerStore = useBrandPageMakerStore();
         let snapshot;
@@ -384,9 +388,13 @@ export const useHistoryStore = defineStore('history', () => {
                 // Source snapshot unparseable — fall through to walk-back.
             }
         }
-        // Step 2: walk-back fallback for non-page-structural edits.
+        // Step 2: walk back from the newer entry — for undo that's the entry
+        // being undone (stamped with the page the user made that edit on),
+        // for redo it's the target. Starting at targetIndex here teleported
+        // undo to the PREVIOUS entry's page whenever consecutive entries were
+        // captured on different pages.
         if (!resolvedActivePageId) {
-            for (let i = targetIndex; i >= 0; i--) {
+            for (let i = Math.max(targetIndex, cameFromIndex); i >= 0; i--) {
                 const candidate = entries.value[i]?.activePageId;
                 if (candidate && restoredPageIds.has(candidate)) {
                     resolvedActivePageId = candidate;

package/lib/src/index.mjs

@@ -1,4 +1,4 @@
-import { A as T, a as E, b as s, c as I, d as S, e as N, f as e, B as A, g as O, h as C, i as t, j as G, k as D, l as P, m as R, n as L, o, p as M, q as r, r as n, s as b, t as l, u as F, v as i, w as c, x as g, y as B, z as Y, C as U, D as d, E as u, F as H, G as p, H as y, I as K, J as m, K as k, L as V, M as X, N as v, O as h, P as f, Q as W, R as x, S as z, T as w, U as Z, V as j, W as q, X as J, Y as Q, Z as $, $ as aa, a0 as _a, a1 as Ta, a2 as Ea, a3 as sa, a4 as Ia, a5 as Sa, a6 as Na, a7 as ea, a8 as Aa, a9 as Oa, aa as Ca, ab as ta, ac as Ga, ad as Da, ae as Pa, af as Ra, ag as La, ah as oa, ai as Ma, aj as ra, ak as na, al as ba, am as la, an as Fa, ao as ia, ap as ca, aq as ga, ar as Ba, as as Ya, at as Ua, au as da, av as ua, aw as Ha, ax as pa, ay as ya, az as Ka, aA as ma, aB as ka, aC as Va, aD as Xa, aE as va, aF as ha, aG as fa, aH as Wa, aI as xa, aJ as za, aK as wa, aL as Za, aM as ja, aN as qa, aO as Ja, aP as Qa, aQ as $a, aR as a_, aS as __, aT as T_, aU as E_, aV as s_, aW as I_, aX as S_, aY as N_, aZ as e_, a_ as A_, a$ as O_, b0 as C_, b1 as t_, b2 as G_, b3 as D_, b4 as P_, b5 as R_, b6 as L_, b7 as o_, b8 as M_, b9 as r_, ba as n_, bb as b_, bc as l_, bd as F_, be as i_, bf as c_, bg as g_, bh as B_, bi as Y_, bj as U_, bk as d_, bl as u_, bm as H_, bn as p_, bo as y_, bp as K_, bq as m_, br as k_, bs as V_, bt as X_, bu as v_, bv as h_, bw as f_, bx as W_, by as x_, bz as z_, bA as w_, bB as Z_, bC as j_, bD as q_, bE as J_, bF as Q_, bG as $_, bH as aT, bI as _T, bJ as TT, bK as ET, bL as sT, bM as IT, bN as ST, bO as NT, bP as eT, bQ as AT, bR as OT, bS as CT, bT as tT, bU as GT, bV as DT, bW as PT, bX as RT, bY as LT, bZ as oT, b_ as MT, b$ as rT, c0 as nT, c1 as bT, c2 as lT, c3 as FT, c4 as iT, c5 as cT, c6 as gT, c7 as BT, c8 as YT, c9 as UT, ca as dT, cb as uT, cc as HT, cd as pT, ce as yT, cf as KT, cg as mT, ch as kT, ci as VT, cj as XT, ck as vT, cl as hT, cm as fT, cn as WT, co as xT, cp as zT, cq as wT, cr as ZT, cs as jT, ct as qT, cu as JT } from "./lib-C0lwMScz.js";
+import { A as T, a as E, b as s, c as I, d as S, e as N, f as e, B as A, g as O, h as C, i as t, j as G, k as D, l as P, m as R, n as L, o, p as M, q as r, r as n, s as b, t as l, u as F, v as i, w as c, x as g, y as B, z as Y, C as U, D as d, E as u, F as H, G as p, H as y, I as K, J as m, K as k, L as V, M as X, N as v, O as h, P as f, Q as W, R as x, S as z, T as w, U as Z, V as j, W as q, X as J, Y as Q, Z as $, $ as aa, a0 as _a, a1 as Ta, a2 as Ea, a3 as sa, a4 as Ia, a5 as Sa, a6 as Na, a7 as ea, a8 as Aa, a9 as Oa, aa as Ca, ab as ta, ac as Ga, ad as Da, ae as Pa, af as Ra, ag as La, ah as oa, ai as Ma, aj as ra, ak as na, al as ba, am as la, an as Fa, ao as ia, ap as ca, aq as ga, ar as Ba, as as Ya, at as Ua, au as da, av as ua, aw as Ha, ax as pa, ay as ya, az as Ka, aA as ma, aB as ka, aC as Va, aD as Xa, aE as va, aF as ha, aG as fa, aH as Wa, aI as xa, aJ as za, aK as wa, aL as Za, aM as ja, aN as qa, aO as Ja, aP as Qa, aQ as $a, aR as a_, aS as __, aT as T_, aU as E_, aV as s_, aW as I_, aX as S_, aY as N_, aZ as e_, a_ as A_, a$ as O_, b0 as C_, b1 as t_, b2 as G_, b3 as D_, b4 as P_, b5 as R_, b6 as L_, b7 as o_, b8 as M_, b9 as r_, ba as n_, bb as b_, bc as l_, bd as F_, be as i_, bf as c_, bg as g_, bh as B_, bi as Y_, bj as U_, bk as d_, bl as u_, bm as H_, bn as p_, bo as y_, bp as K_, bq as m_, br as k_, bs as V_, bt as X_, bu as v_, bv as h_, bw as f_, bx as W_, by as x_, bz as z_, bA as w_, bB as Z_, bC as j_, bD as q_, bE as J_, bF as Q_, bG as $_, bH as aT, bI as _T, bJ as TT, bK as ET, bL as sT, bM as IT, bN as ST, bO as NT, bP as eT, bQ as AT, bR as OT, bS as CT, bT as tT, bU as GT, bV as DT, bW as PT, bX as RT, bY as LT, bZ as oT, b_ as MT, b$ as rT, c0 as nT, c1 as bT, c2 as lT, c3 as FT, c4 as iT, c5 as cT, c6 as gT, c7 as BT, c8 as YT, c9 as UT, ca as dT, cb as uT, cc as HT, cd as pT, ce as yT, cf as KT, cg as mT, ch as kT, ci as VT, cj as XT, ck as vT, cl as hT, cm as fT, cn as WT, co as xT, cp as zT, cq as wT, cr as ZT, cs as jT, ct as qT, cu as JT } from "./lib-CtSZjhZb.js";
 import { createPinia as $T, setActivePinia as aE } from "pinia";
 export {
   T as ABOUT_SECTION_SETTINGS_CONFIG,

package/lib/src/{lib-C0lwMScz.js → lib-CtSZjhZb.js}

@@ -66487,10 +66487,10 @@ const Fi = /* @__PURE__ */ p9(JU1), QU1 = (e, t, n) => {
     D2(() => n.context.isDesignCom, async () => {
       const M = r9().toLowerCase(), S = n.context.isDesignCom ? "Dcom" : "BrandCrowd";
       try {
-        const { default: _ } = await PV(/* @__PURE__ */ Object.assign({ "./watermark/CreatedOnBrandCrowd-de-de.vue": () => import("./CreatedOnBrandCrowd-de-de-DGLT4mjc.js"), "./watermark/CreatedOnBrandCrowd-en-us.vue": () => import("./CreatedOnBrandCrowd-en-us-dyPp4NQB.js"), "./watermark/CreatedOnBrandCrowd-es-es.vue": () => import("./CreatedOnBrandCrowd-es-es-pxoT8xpT.js"), "./watermark/CreatedOnBrandCrowd-fr-ca.vue": () => import("./CreatedOnBrandCrowd-fr-ca-Bpvv3YSe.js"), "./watermark/CreatedOnBrandCrowd-fr-fr.vue": () => import("./CreatedOnBrandCrowd-fr-fr-Bpvv3YSe.js"), "./watermark/CreatedOnBrandCrowd-pt-br.vue": () => import("./CreatedOnBrandCrowd-pt-br-DqKwinmI.js"), "./watermark/CreatedOnBrandCrowd-pt-pt.vue": () => import("./CreatedOnBrandCrowd-pt-pt-DqKwinmI.js"), "./watermark/CreatedOnDcom-de-de.vue": () => import("./CreatedOnDcom-de-de-DhhAudIO.js"), "./watermark/CreatedOnDcom-en-us.vue": () => import("./CreatedOnDcom-en-us-DZhMl0Ro.js"), "./watermark/CreatedOnDcom-es-es.vue": () => import("./CreatedOnDcom-es-es-brPE0-Lo.js"), "./watermark/CreatedOnDcom-fr-ca.vue": () => import("./CreatedOnDcom-fr-ca-CzKZrAVq.js"), "./watermark/CreatedOnDcom-fr-fr.vue": () => import("./CreatedOnDcom-fr-fr-JLjx-E9X.js"), "./watermark/CreatedOnDcom-pt-br.vue": () => import("./CreatedOnDcom-pt-br-B_4Ot1uS.js"), "./watermark/CreatedOnDcom-pt-pt.vue": () => import("./CreatedOnDcom-pt-pt-By5SiPq_.js") }), `./watermark/CreatedOn${S}-${M}.vue`, 3);
+        const { default: _ } = await PV(/* @__PURE__ */ Object.assign({ "./watermark/CreatedOnBrandCrowd-de-de.vue": () => import("./CreatedOnBrandCrowd-de-de-BoBmsU5p.js"), "./watermark/CreatedOnBrandCrowd-en-us.vue": () => import("./CreatedOnBrandCrowd-en-us-VTBk9ZeK.js"), "./watermark/CreatedOnBrandCrowd-es-es.vue": () => import("./CreatedOnBrandCrowd-es-es-CwYO5ZGB.js"), "./watermark/CreatedOnBrandCrowd-fr-ca.vue": () => import("./CreatedOnBrandCrowd-fr-ca-ZNEyNVVj.js"), "./watermark/CreatedOnBrandCrowd-fr-fr.vue": () => import("./CreatedOnBrandCrowd-fr-fr-ZNEyNVVj.js"), "./watermark/CreatedOnBrandCrowd-pt-br.vue": () => import("./CreatedOnBrandCrowd-pt-br-D1q4-n_v.js"), "./watermark/CreatedOnBrandCrowd-pt-pt.vue": () => import("./CreatedOnBrandCrowd-pt-pt-D1q4-n_v.js"), "./watermark/CreatedOnDcom-de-de.vue": () => import("./CreatedOnDcom-de-de-CFvvAm2h.js"), "./watermark/CreatedOnDcom-en-us.vue": () => import("./CreatedOnDcom-en-us-B5WlETVx.js"), "./watermark/CreatedOnDcom-es-es.vue": () => import("./CreatedOnDcom-es-es-CatVjoa9.js"), "./watermark/CreatedOnDcom-fr-ca.vue": () => import("./CreatedOnDcom-fr-ca-uyrRJVf9.js"), "./watermark/CreatedOnDcom-fr-fr.vue": () => import("./CreatedOnDcom-fr-fr-CKSa6Crw.js"), "./watermark/CreatedOnDcom-pt-br.vue": () => import("./CreatedOnDcom-pt-br-BIcGDf-8.js"), "./watermark/CreatedOnDcom-pt-pt.vue": () => import("./CreatedOnDcom-pt-pt-BhKpuziQ.js") }), `./watermark/CreatedOn${S}-${M}.vue`, 3);
         i.value = _;
       } catch {
-        const { default: x } = await PV(/* @__PURE__ */ Object.assign({ "./watermark/CreatedOnBrandCrowd-en-us.vue": () => import("./CreatedOnBrandCrowd-en-us-dyPp4NQB.js"), "./watermark/CreatedOnDcom-en-us.vue": () => import("./CreatedOnDcom-en-us-DZhMl0Ro.js") }), `./watermark/CreatedOn${S}-en-us.vue`, 3);
+        const { default: x } = await PV(/* @__PURE__ */ Object.assign({ "./watermark/CreatedOnBrandCrowd-en-us.vue": () => import("./CreatedOnBrandCrowd-en-us-VTBk9ZeK.js"), "./watermark/CreatedOnDcom-en-us.vue": () => import("./CreatedOnDcom-en-us-B5WlETVx.js") }), `./watermark/CreatedOn${S}-en-us.vue`, 3);
         i.value = x;
       }
     }, {
@@ -78717,7 +78717,7 @@ const s0 = (e) => {
       }
     }
     if (!F1)
-      for (let x1 = q; x1 >= 0; x1--) {
+      for (let x1 = Math.max(q, r1); x1 >= 0; x1--) {
         const O1 = t.value[x1]?.activePageId;
         if (O1 && U1.has(O1)) {
           F1 = O1;

package/package.json

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

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

@@ -816,6 +816,40 @@ describe('history-store (single stack + JSON-string snapshots)', () => {
       );
     });
 
+    it('undo stays on the page where the undone edit was made (both pages survive the restore)', async () => {
+      // Baseline: home + page-2 both exist, user is on home.
+      mockPageNavigationStore.activePageId = 'page-home';
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (mockMakerStore.brandPageData as any).pages = [
+        { id: 'page-home', contents: [] },
+        { id: 'page-2', contents: [] },
+      ];
+
+      const store = useHistoryStore();
+
+      await store.captureBaseline();
+
+      // User navigates to page-2 and edits content there. No page was
+      // added or removed, so the structural diff (step 1) finds nothing
+      // and resolution falls to the walk-back.
+      mockPageNavigationStore.activePageId = 'page-2';
+      captureMutated(store);
+
+      mockMakerStore.applyHistorySnapshot.mockClear();
+      await store.undo();
+
+      // The change being reverted lives on page-2 — the entry being
+      // undone is stamped with it and the page survives the restore, so
+      // the user stays there instead of teleporting to the baseline's
+      // page-home (the pre-fix behavior).
+      expect(mockMakerStore.applyHistorySnapshot).toHaveBeenCalledWith(
+        expect.anything(),
+        'page-2',
+        expect.any(String),
+        false,
+      );
+    });
+
     it('walks back when the captured activePageId no longer exists in the restored snapshot (page-add undo)', async () => {
       // Baseline: only page-home, user is on page-home.
       mockPageNavigationStore.activePageId = 'page-home';

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

@@ -471,8 +471,12 @@ export const useHistoryStore = defineStore('history', () => {
   //   1. Diff `cameFromIndex` against target — pages present in target
   //      but absent from source are being restored/added; navigate there
   //      (undo-of-delete, redo-of-add).
-  //   2. Walk back from targetIndex for the closest entry whose
-  //      activePageId still exists (undo-of-add and non-page edits).
+  //   2. Walk back from the NEWER of the two entries: the mutation being
+  //      applied-or-reverted is always the newer entry's, so its stamp is
+  //      the page where that change is visible. Undo therefore stays on
+  //      the page the user just edited instead of teleporting to the
+  //      previous entry's page; older entries are the fallback when the
+  //      stamped page doesn't survive the restore (undo-of-add).
   async function applySnapshotString(
     snapshotStr: string,
     targetIndex: number,
@@ -522,9 +526,13 @@ export const useHistoryStore = defineStore('history', () => {
       }
     }
 
-    // Step 2: walk-back fallback for non-page-structural edits.
+    // Step 2: walk back from the newer entry — for undo that's the entry
+    // being undone (stamped with the page the user made that edit on),
+    // for redo it's the target. Starting at targetIndex here teleported
+    // undo to the PREVIOUS entry's page whenever consecutive entries were
+    // captured on different pages.
     if (!resolvedActivePageId) {
-      for (let i = targetIndex; i >= 0; i--) {
+      for (let i = Math.max(targetIndex, cameFromIndex); i >= 0; i--) {
         const candidate = entries.value[i]?.activePageId;
 
         if (candidate && restoredPageIds.has(candidate)) {