@orion-studios/payload-studio 0.6.0-beta.122 → 0.6.0-beta.124

package/dist/builder-v2/client.js

@@ -828,6 +828,15 @@ var snapshotModel = (model, emptyListAttr) => {
   if (emptyListAttr && !attributes[emptyListAttr]) {
     attributes[emptyListAttr] = "[]";
   }
+  if (emptyListAttr === "data-orion-items-json") {
+    const block = parseJsonRecord(attributes["data-orion-block"]);
+    if (Object.keys(block).length > 0) {
+      attributes["data-orion-block"] = serializeJsonRecord({
+        ...block,
+        items: parseJsonArray(attributes[emptyListAttr])
+      });
+    }
+  }
   return {
     attributes,
     style: { ...model.getStyle?.() || {} }
@@ -2177,16 +2186,28 @@ function GrapesPageEditor({
     const currentItems = parseItemsJson(attrs["data-orion-items-json"]);
     const nextItems = updater(currentItems);
     const block = parseOrionBlockAttribute(attrs["data-orion-block"]);
-    component.addAttributes?.({
-      "data-orion-items-json": JSON.stringify(nextItems),
-      ...Object.keys(block).length > 0 ? {
-        "data-orion-block": serializeOrionBlockAttribute({
+    const before = snapshotComponent(component);
+    if (before && currentItems.length === 0) {
+      before.attributes["data-orion-items-json"] = "[]";
+      if (Object.keys(block).length > 0) {
+        before.attributes["data-orion-block"] = serializeOrionBlockAttribute({
           ...block,
-          items: nextItems
-        })
-      } : {}
+          items: []
+        });
+      }
+    }
+    withoutUndoTracking2(() => {
+      component.addAttributes?.({
+        "data-orion-items-json": JSON.stringify(nextItems),
+        ...Object.keys(block).length > 0 ? {
+          "data-orion-block": serializeOrionBlockAttribute({
+            ...block,
+            items: nextItems
+          })
+        } : {}
+      });
     });
-    rememberComponentSnapshot(component);
+    pushCustomHistoryEntry(before, snapshotComponent(component));
     setSelectionSummary(summarizeSelectedComponent(component));
   };
   const refreshSelectedState = (component) => {
@@ -2623,6 +2644,23 @@ function GrapesPageEditor({
     return snapshot;
   };
   const getPreviousComponentSnapshot = (component) => component ? lastComponentSnapshotRef.current.get(component) || snapshotComponent(component) : null;
+  const withoutUndoTracking2 = (callback) => {
+    const undoManager = editorRef.current?.UndoManager;
+    if (typeof undoManager?.skip === "function") {
+      undoManager.skip(callback);
+      return;
+    }
+    if (typeof undoManager?.stop === "function" && typeof undoManager?.start === "function") {
+      undoManager.stop();
+      try {
+        callback();
+      } finally {
+        undoManager.start();
+      }
+      return;
+    }
+    callback();
+  };
   const isComponentAttached = (component) => Boolean(component.parent?.());
   const addComponentFromSnapshot = (snapshot) => {
     const parent = snapshot.parent;

package/dist/builder-v2/client.mjs

@@ -704,6 +704,15 @@ var snapshotModel = (model, emptyListAttr) => {
   if (emptyListAttr && !attributes[emptyListAttr]) {
     attributes[emptyListAttr] = "[]";
   }
+  if (emptyListAttr === "data-orion-items-json") {
+    const block = parseJsonRecord(attributes["data-orion-block"]);
+    if (Object.keys(block).length > 0) {
+      attributes["data-orion-block"] = serializeJsonRecord({
+        ...block,
+        items: parseJsonArray(attributes[emptyListAttr])
+      });
+    }
+  }
   return {
     attributes,
     style: { ...model.getStyle?.() || {} }
@@ -2053,16 +2062,28 @@ function GrapesPageEditor({
     const currentItems = parseItemsJson(attrs["data-orion-items-json"]);
     const nextItems = updater(currentItems);
     const block = parseOrionBlockAttribute(attrs["data-orion-block"]);
-    component.addAttributes?.({
-      "data-orion-items-json": JSON.stringify(nextItems),
-      ...Object.keys(block).length > 0 ? {
-        "data-orion-block": serializeOrionBlockAttribute({
+    const before = snapshotComponent(component);
+    if (before && currentItems.length === 0) {
+      before.attributes["data-orion-items-json"] = "[]";
+      if (Object.keys(block).length > 0) {
+        before.attributes["data-orion-block"] = serializeOrionBlockAttribute({
           ...block,
-          items: nextItems
-        })
-      } : {}
+          items: []
+        });
+      }
+    }
+    withoutUndoTracking2(() => {
+      component.addAttributes?.({
+        "data-orion-items-json": JSON.stringify(nextItems),
+        ...Object.keys(block).length > 0 ? {
+          "data-orion-block": serializeOrionBlockAttribute({
+            ...block,
+            items: nextItems
+          })
+        } : {}
+      });
     });
-    rememberComponentSnapshot(component);
+    pushCustomHistoryEntry(before, snapshotComponent(component));
     setSelectionSummary(summarizeSelectedComponent(component));
   };
   const refreshSelectedState = (component) => {
@@ -2499,6 +2520,23 @@ function GrapesPageEditor({
     return snapshot;
   };
   const getPreviousComponentSnapshot = (component) => component ? lastComponentSnapshotRef.current.get(component) || snapshotComponent(component) : null;
+  const withoutUndoTracking2 = (callback) => {
+    const undoManager = editorRef.current?.UndoManager;
+    if (typeof undoManager?.skip === "function") {
+      undoManager.skip(callback);
+      return;
+    }
+    if (typeof undoManager?.stop === "function" && typeof undoManager?.start === "function") {
+      undoManager.stop();
+      try {
+        callback();
+      } finally {
+        undoManager.start();
+      }
+      return;
+    }
+    callback();
+  };
   const isComponentAttached = (component) => Boolean(component.parent?.());
   const addComponentFromSnapshot = (snapshot) => {
     const parent = snapshot.parent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-studios/payload-studio",
-  "version": "0.6.0-beta.122",
+  "version": "0.6.0-beta.124",
   "description": "Base CMS, builder, and custom admin toolkit for Orion Studios websites",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",