@designcrowd/library.brand-page 5.18.3-undo-35 → 5.18.3-undo-38

package/package.json

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

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

@@ -36,6 +36,7 @@ import {
 import { useExternalRichTextEditor } from '@brand-page-maker/composables/rich-text-editor/useRichTextEditor';
 import { useUiStyleSettingsStore } from '@shared/style-settings/store';
 import { STYLE_THEME_KEYS } from '@brand-page/constants';
+import { useHistoryStore } from '@brand-page-maker/stores/history/history-store';
 
 export default defineComponent({
   mixins: [PageMixin],
@@ -51,6 +52,7 @@ export default defineComponent({
     const eventTracker = useEventTracker();
     const { externalEditor } = useExternalRichTextEditor();
     const styleSettingsStore = useUiStyleSettingsStore();
+    const historyStore = useHistoryStore();
 
     return {
       items: computed(() => contentSettingsStore.items),
@@ -84,6 +86,7 @@ export default defineComponent({
       eventTracker,
       externalEditor,
       styleSettingsStore,
+      historyStore,
     };
   },
   data() {
@@ -301,6 +304,8 @@ export default defineComponent({
           }
         }
 
+        // RTE rewrap on section selection — fold into current head.
+        this.historyStore.mergeNextMutation();
         transformToRTE(
           this.pageSettingsStore,
           this.externalEditor,

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);
     };