@designcrowd/library.brand-page 5.18.3-undo-37 → 5.18.3-undo-40

package/package.json

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

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

@@ -286,10 +286,8 @@ export default defineComponent({
     this.brandPageMakerStore.setIsBrandPageLoaded(true);
 
     // Capture baseline for undo/redo when the feature is active for this
-    // session. `useUndoRedoFlag` requires both the LaunchDarkly feature
-    // (`userStore.features.canUseUndoRedo`) AND the maker being a brand-site
-    // — V1 scope is brand-site only; brand-page and brand-contact don't get
-    // undo/redo. See useUndoRedoFlag.ts for the rationale.
+    // session — see useUndoRedoFlag.ts for the gate (LaunchDarkly flag +
+    // brand-site + non-admin maker).
     if (useUndoRedoFlag().value) {
       useHistoryStore().captureBaseline();
     }

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

@@ -3,8 +3,8 @@ 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. Two
- * conditions must hold:
+ * Returns whether undo/redo is active for the current maker session. All
+ * three conditions must hold:
  *
  *   1. `userStore.features.canUseUndoRedo` is true. The flag is populated by
  *      the consumer (BrandCrowd.Net / web-renderer) via the
@@ -12,15 +12,19 @@ import { useBrandPageMakerStore } from '@brand-page-maker/stores/brandpage-maker
  *      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. The flag itself is global on LaunchDarkly so it can't
- *      gate this on its own — `isBrandSite` is the per-session
- *      discriminator.
+ *      out of scope.
+ *   3. 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(): ComputedRef<boolean> {
   const userStore = useBrandPageMakerUserStore();
   const brandPageMakerStore = useBrandPageMakerStore();
 
   return computed(
-    () => userStore.features.canUseUndoRedo && brandPageMakerStore.isBrandSite,
+    () =>
+      userStore.features.canUseUndoRedo &&
+      brandPageMakerStore.isBrandSite &&
+      !userStore.isAdmin,
   );
 }

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

@@ -33,6 +33,11 @@ export interface HistoryEntry {
 const CAPTURE_DEBOUNCE_MS = 1700;
 const CAPTURE_MAX_WAIT_MS = 10000;
 
+// Merge bursts flush quickly — sync hydration writes land in <50ms,
+// user typing takes >150ms, so a short debounce keeps user input out
+// of the merge.
+const MERGE_DEBOUNCE_MS = 50;
+
 // FR-12 / FR-13 / FR-13c. 25 MB per-entry accommodates a high-res BYO logo
 // rendered into 4 viewport sections + per-page logo blocks. Oversize
 // entries are skipped with telemetry; 100 MB total evicts oldest
@@ -355,7 +360,11 @@ export const useHistoryStore = defineStore('history', () => {
         mergeArmed.value = false;
       }
 
-      idleTimerId = setTimeout(flush, CAPTURE_DEBOUNCE_MS);
+      const idle = pendingTimerIsMerge
+        ? MERGE_DEBOUNCE_MS
+        : CAPTURE_DEBOUNCE_MS;
+
+      idleTimerId = setTimeout(flush, idle);
       maxWaitTimerId = setTimeout(flush, CAPTURE_MAX_WAIT_MS);
     };