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

package/src/shared/content-settings/store/content-settings-store.ts

@@ -36,6 +36,7 @@ import {
   useBrandPageMakerStore,
   useVideoStore,
 } from '@brand-page-maker/stores';
+import { useHistoryStore } from '@brand-page-maker/stores/history/history-store';
 import { useUiSideBarStore } from '../../side-bar/store';
 import {
   createDefaultContentItemGroupState,
@@ -389,6 +390,16 @@ export const useUiContentSettingsStore = defineStore('uiContentSettings', {
         return;
       }
 
+      // Hydration write-backs (RTE canonical HTML on mount, lazy config
+      // hydration, stale-id clears) fold into the current undo head instead
+      // of pushing an entry. Arming here — same tick as the write — is what
+      // makes the merge reliable: the flag travelled with the payload
+      // through the debounced field chain, so emit-time arming would lapse
+      // before the write lands (BP-5810).
+      if (payload.isHydrationWrite) {
+        useHistoryStore().mergeNextMutation();
+      }
+
       item.settings.content[payload.name] = payload.value;
 
       this.validateItem({
@@ -402,6 +413,7 @@ export const useUiContentSettingsStore = defineStore('uiContentSettings', {
       id,
       name,
       value,
+      isHydrationWrite,
     }: UpdateMultipleItemValuesPayload<any>): void {
       const item = this.items.find((i) => i.id === id);
 
@@ -409,6 +421,11 @@ export const useUiContentSettingsStore = defineStore('uiContentSettings', {
         return;
       }
 
+      // Same hydration-write contract as updateItemValue.
+      if (isHydrationWrite) {
+        useHistoryStore().mergeNextMutation();
+      }
+
       item.settings.content = vueDeepMerge(item.settings.content, value);
       this.validateItem({ id, name });
       this.onContentChanged();