@measured/puck 0.19.0-canary.765b5e2b → 0.19.0-canary.7a515f67

package/dist/index.js

@@ -9,9 +9,6 @@ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __typeError = (msg) => {
-  throw TypeError(msg);
-};
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __spreadValues = (a, b) => {
   for (var prop in b || (b = {}))
@@ -64,10 +61,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
-var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -176,13 +169,13 @@ __export(core_exports, {
   Puck: () => Puck,
   Render: () => Render,
   createUsePuck: () => createUsePuck,
-  mapSlots: () => mapSlotsPublic,
   migrate: () => migrate,
   overrideKeys: () => overrideKeys,
   renderContext: () => renderContext,
   resolveAllData: () => resolveAllData,
   transformProps: () => transformProps,
-  usePuck: () => usePuck
+  usePuck: () => usePuck,
+  walkTree: () => walkTree
 });
 module.exports = __toCommonJS(core_exports);
 init_react_import();
@@ -795,7 +788,7 @@ init_react_import();
 // reducer/actions/set.ts
 init_react_import();
 
-// lib/data/walk-tree.ts
+// lib/data/walk-app-state.ts
 init_react_import();
 
 // lib/data/for-each-slot.ts
@@ -884,8 +877,8 @@ var stripSlots = (data) => {
   });
 };
 
-// lib/data/walk-tree.ts
-function walkTree(state, config, mapContent = (content) => content, mapNodeOrSkip = (item) => item) {
+// lib/data/walk-app-state.ts
+function walkAppState(state, config, mapContent = (content) => content, mapNodeOrSkip = (item) => item) {
   var _a;
   let newZones = {};
   const newZoneIndex = {};
@@ -1018,7 +1011,7 @@ var setAction = (state, action, appStore) => {
     console.warn(
       "`set` is expensive and may cause unnecessary re-renders. Consider using a more atomic action instead."
     );
-    return walkTree(newState, appStore.config);
+    return walkAppState(newState, appStore.config);
   }
   return __spreadValues(__spreadValues({}, state), action.state(state));
 };
@@ -1047,18 +1040,116 @@ var getIdsForParent = (zoneCompound, state) => {
   return ((node == null ? void 0 : node.path) || []).map((p) => p.split(":")[0]);
 };
 
+// lib/data/populate-ids.ts
+init_react_import();
+
+// lib/data/walk-tree.ts
+init_react_import();
+
+// lib/data/map-slots.ts
+init_react_import();
+function mapSlotsAsync(_0, _1) {
+  return __async(this, arguments, function* (item, map, recursive = true, isSlot2 = isSlot) {
+    const props = __spreadValues({}, item.props);
+    const propKeys = Object.keys(props);
+    for (let i = 0; i < propKeys.length; i++) {
+      const propKey = propKeys[i];
+      const itemType = "type" in item ? item.type : "root";
+      if (isSlot2(itemType, propKey, props[propKey])) {
+        const content = props[propKey];
+        const mappedContent = recursive ? yield Promise.all(
+          content.map((item2) => __async(this, null, function* () {
+            return yield mapSlotsAsync(item2, map, recursive, isSlot2);
+          }))
+        ) : content;
+        props[propKey] = yield map(mappedContent, propKey);
+      }
+    }
+    return __spreadProps(__spreadValues({}, item), { props });
+  });
+}
+function mapSlotsSync(item, map, isSlot2 = isSlot) {
+  var _a, _b;
+  const props = __spreadValues({}, item.props);
+  const propKeys = Object.keys(props);
+  for (let i = 0; i < propKeys.length; i++) {
+    const propKey = propKeys[i];
+    const itemType = "type" in item ? item.type : "root";
+    if (isSlot2(itemType, propKey, props[propKey])) {
+      const content = props[propKey];
+      const mappedContent = content.map((item2) => {
+        return mapSlotsSync(item2, map, isSlot2);
+      });
+      props[propKey] = (_b = map(mappedContent, (_a = props.id) != null ? _a : "root", propKey)) != null ? _b : mappedContent;
+    }
+  }
+  return __spreadProps(__spreadValues({}, item), { props });
+}
+
+// lib/data/walk-tree.ts
+function walkTree(data, config, callbackFn) {
+  var _a, _b;
+  const isSlot2 = createIsSlotConfig(config);
+  const walkItem = (item) => {
+    return mapSlotsSync(
+      item,
+      (content, parentId, propName) => callbackFn(content, { parentId, propName }),
+      isSlot2
+    );
+  };
+  if ("props" in data) {
+    return walkItem(data);
+  }
+  const _data = data;
+  const zones = (_a = _data.zones) != null ? _a : {};
+  const mappedContent = _data.content.map(walkItem);
+  return {
+    root: walkItem(_data.root),
+    content: (_b = callbackFn(mappedContent, {
+      parentId: "root",
+      propName: "default-zone"
+    })) != null ? _b : mappedContent,
+    zones: Object.keys(zones).reduce(
+      (acc, zoneCompound) => __spreadProps(__spreadValues({}, acc), {
+        [zoneCompound]: zones[zoneCompound].map(walkItem)
+      }),
+      {}
+    )
+  };
+}
+
+// lib/data/populate-ids.ts
+var populateIds = (data, config, override = false) => {
+  const id = generateId(data.type);
+  return walkTree(
+    __spreadProps(__spreadValues({}, data), {
+      props: override ? __spreadProps(__spreadValues({}, data.props), { id }) : __spreadValues({ id }, data.props)
+    }),
+    config,
+    (contents) => contents.map((item) => {
+      const id2 = generateId(item.type);
+      return __spreadProps(__spreadValues({}, item), {
+        props: override ? __spreadProps(__spreadValues({}, item.props), { id: id2 }) : __spreadValues({ id: id2 }, item.props)
+      });
+    })
+  );
+};
+
 // reducer/actions/insert.ts
 function insertAction(state, action, appStore) {
   const id = action.id || generateId(action.componentType);
-  const emptyComponentData = {
-    type: action.componentType,
-    props: __spreadProps(__spreadValues({}, appStore.config.components[action.componentType].defaultProps || {}), {
-      id
-    })
-  };
+  const emptyComponentData = populateIds(
+    {
+      type: action.componentType,
+      props: __spreadProps(__spreadValues({}, appStore.config.components[action.componentType].defaultProps || {}), {
+        id
+      })
+    },
+    appStore.config
+  );
   const [parentId] = action.destinationZone.split(":");
   const idsInPath = getIdsForParent(action.destinationZone, state);
-  return walkTree(
+  return walkAppState(
     state,
     appStore.config,
     (content, zoneCompound) => {
@@ -1096,25 +1187,26 @@ var replaceAction = (state, action, appStore) => {
       `Can't change the id during a replace action. Please us "remove" and "insert" to define a new node.`
     );
   }
-  return walkTree(
+  const data = populateIds(action.data, appStore.config);
+  return walkAppState(
     state,
     appStore.config,
     (content, zoneCompound) => {
       const newContent = [...content];
       if (zoneCompound === action.destinationZone) {
-        newContent[action.destinationIndex] = action.data;
+        newContent[action.destinationIndex] = data;
       }
       return newContent;
     },
     (childItem, path) => {
       const pathIds = path.map((p) => p.split(":")[0]);
-      if (childItem.props.id === action.data.props.id) {
-        return action.data;
+      if (childItem.props.id === data.props.id) {
+        return data;
       } else if (childItem.props.id === parentId) {
         return childItem;
       } else if (idsInPath.indexOf(childItem.props.id) > -1) {
         return childItem;
-      } else if (pathIds.indexOf(action.data.props.id) > -1) {
+      } else if (pathIds.indexOf(data.props.id) > -1) {
         return childItem;
       }
       return null;
@@ -1125,7 +1217,7 @@ var replaceAction = (state, action, appStore) => {
 // reducer/actions/replace-root.ts
 init_react_import();
 var replaceRootAction = (state, action, appStore) => {
-  return walkTree(
+  return walkAppState(
     state,
     appStore.config,
     (content) => content,
@@ -1164,7 +1256,7 @@ function duplicateAction(state, action, appStore) {
       id: generateId(item.type)
     })
   });
-  const modified = walkTree(
+  const modified = walkAppState(
     state,
     appStore.config,
     (content, zoneCompound) => {
@@ -1229,7 +1321,7 @@ var moveAction = (state, action, appStore) => {
   if (!item) return state;
   const idsInSourcePath = getIdsForParent(action.sourceZone, state);
   const idsInDestinationPath = getIdsForParent(action.destinationZone, state);
-  return walkTree(
+  return walkAppState(
     state,
     appStore.config,
     (content, zoneCompound) => {
@@ -1287,7 +1379,7 @@ var removeAction = (state, action, appStore) => {
     },
     [item.props.id]
   );
-  const newState = walkTree(
+  const newState = walkAppState(
     state,
     appStore.config,
     (content, zoneCompound) => {
@@ -1378,14 +1470,14 @@ var setDataAction = (state, action, appStore) => {
     console.warn(
       "`setData` is expensive and may cause unnecessary re-renders. Consider using a more atomic action instead."
     );
-    return walkTree(
+    return walkAppState(
       __spreadProps(__spreadValues({}, state), {
         data: __spreadValues(__spreadValues({}, state.data), action.data)
       }),
       appStore.config
     );
   }
-  return walkTree(
+  return walkAppState(
     __spreadProps(__spreadValues({}, state), {
       data: __spreadValues(__spreadValues({}, state.data), action.data(state.data))
     }),
@@ -1770,7 +1862,7 @@ var import_react7 = require("react");
 init_react_import();
 var flattenData = (state, config) => {
   const data = [];
-  walkTree(
+  walkAppState(
     state,
     config,
     (content) => content,
@@ -1935,7 +2027,8 @@ var createFieldsSlice = (_set, _get) => {
   return {
     fields: {},
     loading: false,
-    lastResolvedData: {}
+    lastResolvedData: {},
+    id: void 0
   };
 };
 var useRegisterFieldsSlice = (appStore, id) => {
@@ -1956,7 +2049,7 @@ var useRegisterFieldsSlice = (appStore, id) => {
       let lastFields = fields;
       if (reset) {
         appStore.setState((s) => ({
-          fields: __spreadProps(__spreadValues({}, s.fields), { fields: defaultFields })
+          fields: __spreadProps(__spreadValues({}, s.fields), { fields: defaultFields, id })
         }));
         lastFields = defaultFields;
       }
@@ -1984,12 +2077,13 @@ var useRegisterFieldsSlice = (appStore, id) => {
           fields: {
             fields: newFields,
             loading: false,
-            lastResolvedData: componentData
+            lastResolvedData: componentData,
+            id
           }
         });
       } else {
         appStore.setState((s) => ({
-          fields: __spreadProps(__spreadValues({}, s.fields), { fields: defaultFields })
+          fields: __spreadProps(__spreadValues({}, s.fields), { fields: defaultFields, id })
         }));
       }
     }),
@@ -2006,55 +2100,6 @@ var useRegisterFieldsSlice = (appStore, id) => {
 
 // lib/resolve-component-data.ts
 init_react_import();
-
-// lib/data/map-slots.ts
-init_react_import();
-function mapSlotsAsync(_0, _1) {
-  return __async(this, arguments, function* (item, map, recursive = true, isSlot2 = isSlot) {
-    const props = __spreadValues({}, item.props);
-    const propKeys = Object.keys(props);
-    for (let i = 0; i < propKeys.length; i++) {
-      const propKey = propKeys[i];
-      const itemType = "type" in item ? item.type : "root";
-      if (isSlot2(itemType, propKey, props[propKey])) {
-        const content = props[propKey];
-        const mappedContent = recursive ? yield Promise.all(
-          content.map((item2) => __async(this, null, function* () {
-            return yield mapSlotsAsync(item2, map, recursive, isSlot2);
-          }))
-        ) : content;
-        props[propKey] = yield map(mappedContent, propKey);
-      }
-    }
-    return __spreadProps(__spreadValues({}, item), { props });
-  });
-}
-function mapSlotsSync(item, map, isSlot2 = isSlot) {
-  const props = __spreadValues({}, item.props);
-  const propKeys = Object.keys(props);
-  for (let i = 0; i < propKeys.length; i++) {
-    const propKey = propKeys[i];
-    const itemType = "type" in item ? item.type : "root";
-    if (isSlot2(itemType, propKey, props[propKey])) {
-      const content = props[propKey];
-      const mappedContent = content.map((item2) => {
-        return mapSlotsSync(item2, map, isSlot2);
-      });
-      props[propKey] = map(mappedContent, props.id, propKey);
-    }
-  }
-  return __spreadProps(__spreadValues({}, item), { props });
-}
-function mapSlotsPublic(item, config, map) {
-  const isSlot2 = createIsSlotConfig(config);
-  return mapSlotsSync(
-    item,
-    (content, parentId, propName) => map(content, { parentId, propName }),
-    isSlot2
-  );
-}
-
-// lib/resolve-component-data.ts
 var import_fast_deep_equal = __toESM(require("fast-deep-equal"));
 var cache = { lastChange: {} };
 var resolveComponentData = (_0, _1, ..._2) => __async(void 0, [_0, _1, ..._2], function* (item, config, metadata = {}, onResolveStart, onResolveEnd, trigger = "replace", recursive = true) {
@@ -2299,7 +2344,7 @@ var createAppStore = (initialAppStore) => (0, import_zustand2.create)()(
       }),
       resolveAndCommitData: () => __async(void 0, null, function* () {
         const { config, state, dispatch, resolveComponentData: resolveComponentData2 } = get();
-        walkTree(
+        walkAppState(
           state,
           config,
           (content) => content,
@@ -2348,314 +2393,11 @@ function useAppStoreApi() {
 init_react_import();
 var import_react12 = require("@dnd-kit/react");
 
-// lib/dnd/dnd-kit/safe.ts
-init_react_import();
-var import_react10 = require("@dnd-kit/react");
-var import_sortable = require("@dnd-kit/react/sortable");
-function useDroppableSafe(input) {
-  if (typeof window === "undefined") {
-    return { ref: () => {
-    } };
-  }
-  return (0, import_react10.useDroppable)(input);
-}
-function useDraggableSafe(input) {
-  if (typeof window === "undefined") {
-    return { ref: () => {
-    } };
-  }
-  return (0, import_react10.useDraggable)(input);
-}
-function useSortableSafe(input) {
-  if (typeof window === "undefined") {
-    return { ref: () => {
-    }, status: "idle", handleRef: () => {
-    } };
-  }
-  return (0, import_sortable.useSortable)(input);
-}
-
 // lib/dnd/use-sensors.ts
 init_react_import();
-var import_react11 = require("react");
-
-// lib/dnd/PointerSensor.ts
-init_react_import();
-var import_state = require("@dnd-kit/state");
-var import_abstract = require("@dnd-kit/abstract");
-var import_geometry = require("@dnd-kit/geometry");
+var import_react10 = require("react");
+var import_react11 = require("@dnd-kit/react");
 var import_utilities = require("@dnd-kit/dom/utilities");
-var _clearTimeout;
-var _PointerSensor = class _PointerSensor extends import_abstract.Sensor {
-  constructor(manager, options) {
-    super(manager);
-    this.manager = manager;
-    this.options = options;
-    this.listeners = new import_utilities.Listeners();
-    this.cleanup = /* @__PURE__ */ new Set();
-    this.source = void 0;
-    this.started = false;
-    __privateAdd(this, _clearTimeout);
-    this.handleCancel = this.handleCancel.bind(this);
-    this.handlePointerUp = this.handlePointerUp.bind(this);
-    this.handleKeyDown = this.handleKeyDown.bind(this);
-    (0, import_state.effect)(() => {
-      const unbindGlobal = this.bindGlobal(options != null ? options : {});
-      return () => {
-        unbindGlobal();
-      };
-    });
-  }
-  bind(source, options = this.options) {
-    const unbind = (0, import_state.effect)(() => {
-      var _a;
-      const target = (_a = source.handle) != null ? _a : source.element;
-      const listener = (event) => {
-        if ((0, import_utilities.isPointerEvent)(event)) {
-          this.handlePointerDown(event, source, options);
-        }
-      };
-      if (target) {
-        patchWindow(target.ownerDocument.defaultView);
-        target.addEventListener("pointerdown", listener);
-        return () => {
-          target.removeEventListener("pointerdown", listener);
-        };
-      }
-    });
-    return unbind;
-  }
-  bindGlobal(options) {
-    const documents = /* @__PURE__ */ new Set();
-    for (const draggable of this.manager.registry.draggables.value) {
-      if (draggable.element) {
-        documents.add((0, import_utilities.getDocument)(draggable.element));
-      }
-    }
-    for (const droppable of this.manager.registry.droppables.value) {
-      if (droppable.element) {
-        documents.add((0, import_utilities.getDocument)(droppable.element));
-      }
-    }
-    const unbindFns = Array.from(documents).map(
-      (doc) => this.listeners.bind(doc, [
-        {
-          type: "pointermove",
-          listener: (event) => this.handlePointerMove(event, doc, options)
-        },
-        {
-          type: "pointerup",
-          listener: this.handlePointerUp,
-          options: {
-            capture: true
-          }
-        },
-        {
-          // Cancel activation if there is a competing Drag and Drop interaction
-          type: "dragstart",
-          listener: this.handleDragStart
-        }
-      ])
-    );
-    return () => {
-      unbindFns.forEach((unbind) => unbind());
-    };
-  }
-  handlePointerDown(event, source, options = {}) {
-    if (this.disabled || !event.isPrimary || event.button !== 0 || !(0, import_utilities.isElement)(event.target) || source.disabled) {
-      return;
-    }
-    const offset = (0, import_utilities.getFrameTransform)(source.element);
-    this.initialCoordinates = {
-      x: event.clientX * offset.scaleX + offset.x,
-      y: event.clientY * offset.scaleY + offset.y
-    };
-    this.source = source;
-    const { activationConstraints } = options;
-    const constraints = typeof activationConstraints === "function" ? activationConstraints(event, source) : activationConstraints;
-    event.stopImmediatePropagation();
-    if (!(constraints == null ? void 0 : constraints.delay) && !(constraints == null ? void 0 : constraints.distance)) {
-      this.handleStart(source, event);
-    } else {
-      const { delay } = constraints;
-      if (delay) {
-        const timeout3 = setTimeout(
-          () => this.handleStart(source, event),
-          delay.value
-        );
-        __privateSet(this, _clearTimeout, () => {
-          clearTimeout(timeout3);
-          __privateSet(this, _clearTimeout, void 0);
-        });
-      }
-    }
-    const cleanup = () => {
-      var _a;
-      (_a = __privateGet(this, _clearTimeout)) == null ? void 0 : _a.call(this);
-      this.initialCoordinates = void 0;
-      this.source = void 0;
-    };
-    this.cleanup.add(cleanup);
-  }
-  handlePointerMove(event, doc, options) {
-    if (!this.source) {
-      return;
-    }
-    const ownerDocument = this.source.element && (0, import_utilities.getDocument)(this.source.element);
-    if (doc !== ownerDocument) {
-      return;
-    }
-    const coordinates = {
-      x: event.clientX,
-      y: event.clientY
-    };
-    const offset = (0, import_utilities.getFrameTransform)(this.source.element);
-    coordinates.x = coordinates.x * offset.scaleX + offset.x;
-    coordinates.y = coordinates.y * offset.scaleY + offset.y;
-    if (this.manager.dragOperation.status.dragging) {
-      event.preventDefault();
-      event.stopPropagation();
-      this.manager.actions.move({ to: coordinates });
-      return;
-    }
-    if (!this.initialCoordinates) {
-      return;
-    }
-    const delta = {
-      x: coordinates.x - this.initialCoordinates.x,
-      y: coordinates.y - this.initialCoordinates.y
-    };
-    const { activationConstraints } = options;
-    const constraints = typeof activationConstraints === "function" ? activationConstraints(event, this.source) : activationConstraints;
-    const { distance, delay } = constraints != null ? constraints : {};
-    if (distance) {
-      if (distance.tolerance != null && (0, import_geometry.exceedsDistance)(delta, distance.tolerance)) {
-        return this.handleCancel();
-      }
-      if ((0, import_geometry.exceedsDistance)(delta, distance.value)) {
-        return this.handleStart(this.source, event);
-      }
-    }
-    if (delay) {
-      if ((0, import_geometry.exceedsDistance)(delta, delay.tolerance)) {
-        return this.handleCancel();
-      }
-    }
-  }
-  handlePointerUp(event) {
-    if (!this.source) {
-      return;
-    }
-    event.preventDefault();
-    event.stopPropagation();
-    const { status } = this.manager.dragOperation;
-    if (!status.idle) {
-      const canceled = !status.initialized;
-      this.manager.actions.stop({ canceled });
-    } else if (this.started) {
-      setTimeout(() => {
-        if (!this.manager.dragOperation.status.idle) {
-          this.manager.actions.stop({ canceled: false });
-        }
-      }, 10);
-    }
-    this.cleanup.forEach((cleanup) => cleanup());
-    this.cleanup.clear();
-  }
-  handleKeyDown(event) {
-    if (event.key === "Escape") {
-      event.preventDefault();
-      this.handleCancel();
-    }
-  }
-  handleStart(source, event) {
-    var _a;
-    const { manager, initialCoordinates } = this;
-    (_a = __privateGet(this, _clearTimeout)) == null ? void 0 : _a.call(this);
-    if (!initialCoordinates || manager.dragOperation.status.initialized || this.started) {
-      return;
-    }
-    if (event.defaultPrevented) {
-      return;
-    }
-    this.started = true;
-    event.preventDefault();
-    (0, import_state.batch)(() => {
-      manager.actions.setDragSource(source.id);
-      manager.actions.start({ coordinates: initialCoordinates, event });
-    });
-    const ownerDocument = (0, import_utilities.getDocument)(event.target);
-    const unbind = this.listeners.bind(ownerDocument, [
-      {
-        // Prevent scrolling on touch devices
-        type: "touchmove",
-        listener: preventDefault,
-        options: {
-          passive: false
-        }
-      },
-      {
-        // Prevent click events
-        type: "click",
-        listener: preventDefault
-      },
-      {
-        type: "keydown",
-        listener: this.handleKeyDown
-      }
-    ]);
-    ownerDocument.body.setPointerCapture(event.pointerId);
-    this.cleanup.add(unbind);
-    this.cleanup.add(() => {
-      this.started = false;
-    });
-  }
-  handleDragStart(event) {
-    const { target } = event;
-    if (!(0, import_utilities.isElement)(target)) {
-      return;
-    }
-    const isNativeDraggable = (0, import_utilities.isHTMLElement)(target) && target.draggable && target.getAttribute("draggable") === "true";
-    if (isNativeDraggable) {
-      this.handleCancel();
-    } else {
-      preventDefault(event);
-    }
-  }
-  handleCancel() {
-    const { dragOperation } = this.manager;
-    if (dragOperation.status.initialized) {
-      this.manager.actions.stop({ canceled: true });
-    }
-    this.cleanup.forEach((cleanup) => cleanup());
-    this.cleanup.clear();
-  }
-  destroy() {
-    this.listeners.clear();
-  }
-};
-_clearTimeout = new WeakMap();
-_PointerSensor.configure = (0, import_abstract.configurator)(_PointerSensor);
-var PointerSensor = _PointerSensor;
-function preventDefault(event) {
-  event.preventDefault();
-}
-function noop() {
-}
-var windows = /* @__PURE__ */ new WeakSet();
-function patchWindow(window2) {
-  if (!window2 || windows.has(window2)) {
-    return;
-  }
-  window2.addEventListener("touchmove", noop, {
-    capture: false,
-    passive: false
-  });
-  windows.add(window2);
-}
-
-// lib/dnd/use-sensors.ts
-var import_utilities2 = require("@dnd-kit/dom/utilities");
 var useSensors = ({
   other,
   mouse,
@@ -2664,12 +2406,12 @@ var useSensors = ({
   touch: { delay: { value: 200, tolerance: 10 } },
   other: { delay: { value: 200, tolerance: 10 }, distance: { value: 5 } }
 }) => {
-  const [sensors] = (0, import_react11.useState)(() => [
-    PointerSensor.configure({
+  const [sensors] = (0, import_react10.useState)(() => [
+    import_react11.PointerSensor.configure({
       activationConstraints(event, source) {
         var _a;
         const { pointerType, target } = event;
-        if (pointerType === "mouse" && (0, import_utilities2.isElement)(target) && (source.handle === target || ((_a = source.handle) == null ? void 0 : _a.contains(target)))) {
+        if (pointerType === "mouse" && (0, import_utilities.isElement)(target) && (source.handle === target || ((_a = source.handle) == null ? void 0 : _a.contains(target)))) {
           return mouse;
         }
         if (pointerType === "touch") {
@@ -2684,11 +2426,11 @@ var useSensors = ({
 
 // lib/dnd/collision/dynamic/index.ts
 init_react_import();
-var import_abstract9 = require("@dnd-kit/abstract");
+var import_abstract8 = require("@dnd-kit/abstract");
 
 // lib/dnd/collision/directional/index.ts
 init_react_import();
-var import_abstract2 = require("@dnd-kit/abstract");
+var import_abstract = require("@dnd-kit/abstract");
 
 // lib/dnd/collision/collision-debug.ts
 init_react_import();
@@ -2766,7 +2508,7 @@ var directionalCollision = (input, previous) => {
     return {
       id: droppable.id,
       value: 1,
-      type: import_abstract2.CollisionType.Collision
+      type: import_abstract.CollisionType.Collision
     };
   }
   return null;
@@ -2808,7 +2550,7 @@ var getMidpointImpact = (dragShape, dropShape, direction, offsetMultiplier = 0)
 
 // lib/dnd/collision/dynamic/track-movement-interval.ts
 init_react_import();
-var import_geometry2 = require("@dnd-kit/geometry");
+var import_geometry = require("@dnd-kit/geometry");
 var INTERVAL_SENSITIVITY = 10;
 var intervalCache = {
   current: { x: 0, y: 0 },
@@ -2824,13 +2566,15 @@ var trackMovementInterval = (point, dragAxis = "dynamic") => {
   };
   intervalCache.direction = getDirection(dragAxis, intervalCache.delta) || intervalCache.direction;
   if (Math.abs(intervalCache.delta.x) > INTERVAL_SENSITIVITY || Math.abs(intervalCache.delta.y) > INTERVAL_SENSITIVITY) {
-    intervalCache.previous = import_geometry2.Point.from(point);
+    intervalCache.previous = import_geometry.Point.from(point);
   }
   return intervalCache;
 };
 
 // ../../node_modules/@dnd-kit/collision/dist/index.js
 init_react_import();
+var import_abstract2 = require("@dnd-kit/abstract");
+var import_geometry2 = require("@dnd-kit/geometry");
 var import_abstract3 = require("@dnd-kit/abstract");
 var import_geometry3 = require("@dnd-kit/geometry");
 var import_abstract4 = require("@dnd-kit/abstract");
@@ -2841,8 +2585,6 @@ var import_abstract6 = require("@dnd-kit/abstract");
 var import_geometry6 = require("@dnd-kit/geometry");
 var import_abstract7 = require("@dnd-kit/abstract");
 var import_geometry7 = require("@dnd-kit/geometry");
-var import_abstract8 = require("@dnd-kit/abstract");
-var import_geometry8 = require("@dnd-kit/geometry");
 var pointerIntersection = ({
   dragOperation,
   droppable
@@ -2856,12 +2598,12 @@ var pointerIntersection = ({
     return null;
   }
   if (droppable.shape.containsPoint(pointerCoordinates)) {
-    const distance = import_geometry3.Point.distance(droppable.shape.center, pointerCoordinates);
+    const distance = import_geometry2.Point.distance(droppable.shape.center, pointerCoordinates);
     return {
       id,
       value: 1 / distance,
-      type: import_abstract3.CollisionType.PointerIntersection,
-      priority: import_abstract3.CollisionPriority.High
+      type: import_abstract2.CollisionType.PointerIntersection,
+      priority: import_abstract2.CollisionPriority.High
     };
   }
   return null;
@@ -2872,31 +2614,15 @@ var closestCorners = (input) => {
   if (!droppable.shape) {
     return null;
   }
-  const { left, top, right, bottom } = droppable.shape.boundingRectangle;
-  const corners = [
-    {
-      x: left,
-      y: top
-    },
-    {
-      x: right,
-      y: top
-    },
-    {
-      x: left,
-      y: bottom
-    },
-    {
-      x: right,
-      y: bottom
-    }
-  ];
-  const distance = corners.reduce(
-    (acc, corner) => {
+  const shapeCorners = shape ? import_geometry4.Rectangle.from(shape.current.boundingRectangle).corners : void 0;
+  const distance = import_geometry4.Rectangle.from(
+    droppable.shape.boundingRectangle
+  ).corners.reduce(
+    (acc, corner, index) => {
       var _a;
-      return acc + import_geometry5.Point.distance(
-        import_geometry5.Point.from(corner),
-        (_a = shape == null ? void 0 : shape.current.center) != null ? _a : position.current
+      return acc + import_geometry4.Point.distance(
+        import_geometry4.Point.from(corner),
+        (_a = shapeCorners == null ? void 0 : shapeCorners[index]) != null ? _a : position.current
       );
     },
     0
@@ -2905,8 +2631,8 @@ var closestCorners = (input) => {
   return {
     id: droppable.id,
     value: 1 / value,
-    type: import_abstract5.CollisionType.Collision,
-    priority: import_abstract5.CollisionPriority.Normal
+    type: import_abstract4.CollisionType.Collision,
+    priority: import_abstract4.CollisionPriority.Normal
   };
 };
 
@@ -2931,12 +2657,7 @@ var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input
   const { center: dragCenter } = dragShape;
   const { fallbackEnabled } = collisionStore.getState();
   const interval = trackMovementInterval(position.current, dragAxis);
-  dragOperation.data = __spreadProps(__spreadValues({}, dragOperation.data), {
-    direction: interval.direction
-  });
-  const collisionMap = dragOperation.data.collisionMap || {};
-  dragOperation.data.collisionMap = collisionMap;
-  collisionMap[droppable.id] = {
+  const data = {
     direction: interval.direction
   };
   const { center: dropCenter } = dropShape;
@@ -2951,7 +2672,8 @@ var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input
     collisionDebug(dragCenter, dropCenter, droppable.id.toString(), "yellow");
     if (collision) {
       return __spreadProps(__spreadValues({}, collision), {
-        priority: import_abstract9.CollisionPriority.Highest
+        priority: import_abstract8.CollisionPriority.Highest,
+        data
       });
     }
   }
@@ -2968,12 +2690,12 @@ var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input
     const collision = {
       id: droppable.id,
       value: intersectionRatio,
-      priority: import_abstract9.CollisionPriority.High,
-      type: import_abstract9.CollisionType.Collision
+      priority: import_abstract8.CollisionPriority.High,
+      type: import_abstract8.CollisionType.Collision
     };
     const shouldFlushId = flushNext === droppable.id;
     flushNext = "";
-    return __spreadProps(__spreadValues({}, collision), { id: shouldFlushId ? "flush" : collision.id });
+    return __spreadProps(__spreadValues({}, collision), { id: shouldFlushId ? "flush" : collision.id, data });
   }
   if (fallbackEnabled && ((_c = dragOperation.source) == null ? void 0 : _c.id) !== droppable.id) {
     const xAxisIntersection = dropShape.boundingRectangle.right > dragShape.boundingRectangle.left && dropShape.boundingRectangle.left < dragShape.boundingRectangle.right;
@@ -2985,9 +2707,7 @@ var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input
           x: dragShape.center.x - (((_d = droppable.shape) == null ? void 0 : _d.center.x) || 0),
           y: dragShape.center.y - (((_e = droppable.shape) == null ? void 0 : _e.center.y) || 0)
         });
-        collisionMap[droppable.id] = {
-          direction
-        };
+        data.direction = direction;
         if (intersectionArea) {
           collisionDebug(
             dragCenter,
@@ -2998,7 +2718,8 @@ var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input
           );
           flushNext = droppable.id;
           return __spreadProps(__spreadValues({}, fallbackCollision), {
-            priority: import_abstract9.CollisionPriority.Low
+            priority: import_abstract8.CollisionPriority.Low,
+            data
           });
         }
         collisionDebug(
@@ -3008,16 +2729,19 @@ var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input
           "orange",
           direction || ""
         );
-        return __spreadProps(__spreadValues({}, fallbackCollision), { priority: import_abstract9.CollisionPriority.Lowest });
+        return __spreadProps(__spreadValues({}, fallbackCollision), {
+          priority: import_abstract8.CollisionPriority.Lowest,
+          data
+        });
       }
     }
   }
   collisionDebug(dragCenter, dropCenter, droppable.id.toString(), "hotpink");
-  delete collisionMap[droppable.id];
   return null;
 };
 
 // components/Sortable/index.tsx
+var import_sortable = require("@dnd-kit/react/sortable");
 var import_jsx_runtime5 = require("react/jsx-runtime");
 var SortableProvider = ({
   children,
@@ -3037,16 +2761,16 @@ var SortableProvider = ({
         return onDragStart((_b = (_a = event.operation.source) == null ? void 0 : _a.id.toString()) != null ? _b : "");
       },
       onDragOver: (event, manager) => {
-        var _a, _b;
+        var _a;
         event.preventDefault();
         const { operation } = event;
         const { source, target } = operation;
         if (!source || !target) return;
         let sourceIndex = source.data.index;
         let targetIndex = target.data.index;
-        const collisionData = (_b = (_a = manager.dragOperation.data) == null ? void 0 : _a.collisionMap) == null ? void 0 : _b[target.id];
+        const collisionData = (_a = manager.collisionObserver.collisions[0]) == null ? void 0 : _a.data;
         if (sourceIndex !== targetIndex && source.id !== target.id) {
-          const collisionPosition = collisionData.direction === "up" ? "before" : "after";
+          const collisionPosition = (collisionData == null ? void 0 : collisionData.direction) === "up" ? "before" : "after";
           if (targetIndex >= sourceIndex) {
             targetIndex = targetIndex - 1;
           }
@@ -3077,9 +2801,10 @@ var Sortable = ({
 }) => {
   const {
     ref: sortableRef,
-    status,
+    isDragging,
+    isDropping,
     handleRef
-  } = useSortableSafe({
+  } = (0, import_sortable.useSortable)({
     id,
     type,
     index,
@@ -3087,7 +2812,7 @@ var Sortable = ({
     data: { index },
     collisionDetector: createDynamicCollisionDetector("y")
   });
-  return children({ status, ref: sortableRef, handleRef });
+  return children({ isDragging, isDropping, ref: sortableRef, handleRef });
 };
 
 // components/AutoField/context.tsx
@@ -3212,7 +2937,7 @@ var ArrayField = ({
     }
   }, []);
   const [draggedItem, setDraggedItem] = (0, import_react14.useState)("");
-  const isDragging = !!draggedItem;
+  const isDraggingAny = !!draggedItem;
   const canEdit = useAppStore(
     (s) => s.permissions.getPermissions({ item: s.selectedItem }).edit
   );
@@ -3277,13 +3002,13 @@ var ArrayField = ({
                       id: _arrayId,
                       index: i,
                       disabled: readOnly,
-                      children: ({ status, ref, handleRef }) => /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(
+                      children: ({ isDragging, ref, handleRef }) => /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(
                         "div",
                         {
                           ref,
                           className: getClassNameItem({
                             isExpanded: arrayState.openId === _arrayId,
-                            isDragging: status === "dragging",
+                            isDragging,
                             readOnly
                           }),
                           children: [
@@ -3424,7 +3149,7 @@ var ArrayField = ({
                     type: "button",
                     className: getClassName5("addButton"),
                     onClick: () => {
-                      if (isDragging) return;
+                      if (isDraggingAny) return;
                       const existingValue = value || [];
                       const newValue = [
                         ...existingValue,
@@ -4407,15 +4132,15 @@ init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Drawer/styles.module.css#css-module
 init_react_import();
-var styles_module_default10 = { "Drawer": "_Drawer_fkqfo_1", "Drawer-draggable": "_Drawer-draggable_fkqfo_8", "Drawer-draggableBg": "_Drawer-draggableBg_fkqfo_12", "Drawer-draggableFg": "_Drawer-draggableFg_fkqfo_21", "DrawerItem-draggable": "_DrawerItem-draggable_fkqfo_25", "DrawerItem--disabled": "_DrawerItem--disabled_fkqfo_38", "DrawerItem": "_DrawerItem_fkqfo_25", "Drawer--isDraggingFrom": "_Drawer--isDraggingFrom_fkqfo_48", "DrawerItem-name": "_DrawerItem-name_fkqfo_66" };
+var styles_module_default10 = { "Drawer": "_Drawer_pl7z0_1", "Drawer-draggable": "_Drawer-draggable_pl7z0_8", "Drawer-draggableBg": "_Drawer-draggableBg_pl7z0_12", "DrawerItem-draggable": "_DrawerItem-draggable_pl7z0_22", "DrawerItem--disabled": "_DrawerItem--disabled_pl7z0_35", "DrawerItem": "_DrawerItem_pl7z0_22", "Drawer--isDraggingFrom": "_Drawer--isDraggingFrom_pl7z0_45", "DrawerItem-name": "_DrawerItem-name_pl7z0_63" };
 
 // components/Drawer/index.tsx
-var import_react37 = require("react");
+var import_react38 = require("react");
 
 // components/DragDropContext/index.tsx
 init_react_import();
-var import_react35 = require("@dnd-kit/react");
-var import_react36 = require("react");
+var import_react36 = require("@dnd-kit/react");
+var import_react37 = require("react");
 var import_dom = require("@dnd-kit/dom");
 
 // components/DropZone/index.tsx
@@ -4525,6 +4250,7 @@ function useContextStore(context, selector) {
 
 // components/DraggableComponent/index.tsx
 var import_shallow2 = require("zustand/react/shallow");
+var import_sortable2 = require("@dnd-kit/react/sortable");
 var import_jsx_runtime20 = require("react/jsx-runtime");
 var getClassName16 = get_class_name_factory_default("DraggableComponent", styles_module_default11);
 var DEBUG2 = false;
@@ -4610,7 +4336,7 @@ var DraggableComponent = ({
   const canCollide = permissions.drag || userIsDragging;
   const disabled = !isEnabled || !canCollide;
   const [dragAxis, setDragAxis] = (0, import_react25.useState)(userDragAxis || autoDragAxis);
-  const { ref: sortableRef, status } = useSortableSafe({
+  const { ref: sortableRef, isDragging: thisIsDragging } = (0, import_sortable2.useSortable)({
     id,
     index,
     group: zoneCompound,
@@ -4632,9 +4358,9 @@ var DraggableComponent = ({
     transition: {
       duration: 200,
       easing: "cubic-bezier(0.2, 0, 0, 1)"
-    }
+    },
+    feedback: "clone"
   });
-  const thisIsDragging = status === "dragging";
   const ref = (0, import_react25.useRef)(null);
   const refSetter = (0, import_react25.useCallback)(
     (el) => {
@@ -4774,18 +4500,12 @@ var DraggableComponent = ({
     el.addEventListener("click", onClick);
     el.addEventListener("mouseover", _onMouseOver);
     el.addEventListener("mouseout", _onMouseOut);
-    if (thisIsDragging) {
-      el.setAttribute("data-puck-dragging", "");
-    } else {
-      el.removeAttribute("data-puck-dragging");
-    }
     return () => {
       el.removeAttribute("data-puck-component");
       el.removeAttribute("data-puck-dnd");
       el.removeEventListener("click", onClick);
       el.removeEventListener("mouseover", _onMouseOver);
       el.removeEventListener("mouseout", _onMouseOut);
-      el.removeAttribute("data-puck-dragging");
     };
   }, [
     ref,
@@ -4937,6 +4657,9 @@ var DraggableComponent = ({
 init_react_import();
 var styles_module_default12 = { "DropZone": "_DropZone_3dmev_1", "DropZone--hasChildren": "_DropZone--hasChildren_3dmev_11", "DropZone--userIsDragging": "_DropZone--userIsDragging_3dmev_19", "DropZone--isAreaSelected": "_DropZone--isAreaSelected_3dmev_23", "DropZone--hoveringOverArea": "_DropZone--hoveringOverArea_3dmev_24", "DropZone--isRootZone": "_DropZone--isRootZone_3dmev_24", "DropZone--isDestination": "_DropZone--isDestination_3dmev_34", "DropZone-item": "_DropZone-item_3dmev_46", "DropZone-hitbox": "_DropZone-hitbox_3dmev_50", "DropZone--isEnabled": "_DropZone--isEnabled_3dmev_58", "DropZone--isAnimating": "_DropZone--isAnimating_3dmev_67" };
 
+// components/DropZone/index.tsx
+var import_react35 = require("@dnd-kit/react");
+
 // components/DropZone/lib/use-min-empty-height.ts
 init_react_import();
 var import_react26 = require("react");
@@ -5150,43 +4873,70 @@ var import_react33 = __toESM(require("react"));
 
 // components/SlotRender/index.tsx
 init_react_import();
+
+// components/SlotRender/server.tsx
+init_react_import();
 var import_react32 = require("react");
+
+// components/ServerRender/index.tsx
+init_react_import();
 var import_jsx_runtime21 = require("react/jsx-runtime");
-var SlotRenderPure = (props) => /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(SlotRender, __spreadValues({}, props));
-var ContextSlotRender = ({
-  componentId,
-  zone
-}) => {
-  const config = useAppStore((s) => s.config);
-  const metadata = useAppStore((s) => s.metadata);
-  const slotContent = useAppStore(
-    (s) => {
-      var _a, _b;
-      return (_b = (_a = s.state.indexes.nodes[componentId]) == null ? void 0 : _a.data.props[zone]) != null ? _b : null;
-    }
-  );
-  return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
-    SlotRenderPure,
-    {
-      content: slotContent,
-      zone,
-      config,
-      metadata
+function DropZoneRender({
+  zone,
+  data,
+  areaId = "root",
+  config,
+  metadata = {}
+}) {
+  let zoneCompound = rootDroppableId;
+  let content = (data == null ? void 0 : data.content) || [];
+  if (!data || !config) {
+    return null;
+  }
+  if (areaId !== rootAreaId && zone !== rootZone) {
+    zoneCompound = `${areaId}:${zone}`;
+    content = setupZone(data, zoneCompound).zones[zoneCompound];
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(import_jsx_runtime21.Fragment, { children: content.map((item) => {
+    const Component = config.components[item.type];
+    const props = __spreadProps(__spreadValues({}, item.props), {
+      puck: {
+        renderDropZone: ({ zone: zone2 }) => /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+          DropZoneRender,
+          {
+            zone: zone2,
+            data,
+            areaId: item.props.id,
+            config,
+            metadata
+          }
+        ),
+        metadata
+      }
+    });
+    const propsWithSlots = useSlots(Component, props, (props2) => /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, props2), { config, metadata })));
+    if (Component) {
+      return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Component.render, __spreadValues({}, propsWithSlots), item.props.id);
     }
-  );
-};
+    return null;
+  }) });
+}
+
+// components/SlotRender/server.tsx
+var import_jsx_runtime22 = require("react/jsx-runtime");
+var SlotRenderPure = (props) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(SlotRender, __spreadValues({}, props));
 var Item = ({
   config,
   item,
   metadata
 }) => {
   const Component = config.components[item.type];
-  const props = useSlots(Component, item.props, (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, slotProps), { config, metadata })));
-  return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+  const props = useSlots(Component, item.props, (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, slotProps), { config, metadata })));
+  return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
     Component.render,
     __spreadProps(__spreadValues({}, props), {
       puck: __spreadProps(__spreadValues({}, props.puck), {
-        renderDropZone: DropZoneRenderPure,
+        renderDropZone: DropZoneRender,
         metadata: metadata || {}
       })
     })
@@ -5194,11 +4944,11 @@ var Item = ({
 };
 var SlotRender = (0, import_react32.forwardRef)(
   function SlotRenderInternal({ className, style, content, config, metadata }, ref) {
-    return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className, style, ref, children: content.map((item) => {
+    return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { className, style, ref, children: content.map((item) => {
       if (!config.components[item.type]) {
         return null;
       }
-      return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+      return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
         Item,
         {
           config,
@@ -5211,8 +4961,33 @@ var SlotRender = (0, import_react32.forwardRef)(
   }
 );
 
+// components/SlotRender/index.tsx
+var import_jsx_runtime23 = require("react/jsx-runtime");
+var ContextSlotRender = ({
+  componentId,
+  zone
+}) => {
+  const config = useAppStore((s) => s.config);
+  const metadata = useAppStore((s) => s.metadata);
+  const slotContent = useAppStore(
+    (s) => {
+      var _a, _b;
+      return (_b = (_a = s.state.indexes.nodes[componentId]) == null ? void 0 : _a.data.props[zone]) != null ? _b : null;
+    }
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+    SlotRenderPure,
+    {
+      content: slotContent,
+      zone,
+      config,
+      metadata
+    }
+  );
+};
+
 // components/Render/index.tsx
-var import_jsx_runtime22 = require("react/jsx-runtime");
+var import_jsx_runtime24 = require("react/jsx-runtime");
 var renderContext = import_react33.default.createContext({
   config: { components: {} },
   data: { root: {}, content: [] },
@@ -5241,7 +5016,7 @@ function Render({
     editMode: false,
     id: "puck-root"
   });
-  const propsWithSlots = useSlots(config.root, pageProps, (props) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(SlotRender, __spreadProps(__spreadValues({}, props), { config, metadata })));
+  const propsWithSlots = useSlots(config.root, pageProps, (props) => /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(SlotRender, __spreadProps(__spreadValues({}, props), { config, metadata })));
   const nextContextValue = (0, import_react33.useMemo)(
     () => ({
       mode: "render",
@@ -5250,17 +5025,17 @@ function Render({
     []
   );
   if ((_a = config.root) == null ? void 0 : _a.render) {
-    return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(renderContext.Provider, { value: { config, data: defaultedData, metadata }, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(DropZoneProvider, { value: nextContextValue, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(config.root.render, __spreadProps(__spreadValues({}, propsWithSlots), { children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(DropZoneRenderPure, { zone: rootZone }) })) }) });
+    return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(renderContext.Provider, { value: { config, data: defaultedData, metadata }, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DropZoneProvider, { value: nextContextValue, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(config.root.render, __spreadProps(__spreadValues({}, propsWithSlots), { children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DropZoneRenderPure, { zone: rootZone }) })) }) });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(renderContext.Provider, { value: { config, data: defaultedData, metadata }, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(DropZoneProvider, { value: nextContextValue, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(DropZoneRenderPure, { zone: rootZone }) }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(renderContext.Provider, { value: { config, data: defaultedData, metadata }, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DropZoneProvider, { value: nextContextValue, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DropZoneRenderPure, { zone: rootZone }) }) });
 }
 
 // components/DropZone/index.tsx
-var import_jsx_runtime23 = require("react/jsx-runtime");
+var import_jsx_runtime25 = require("react/jsx-runtime");
 var getClassName17 = get_class_name_factory_default("DropZone", styles_module_default12);
 var getRandomColor = () => `#${Math.floor(Math.random() * 16777215).toString(16)}`;
 var RENDER_DEBUG = false;
-var DropZoneEditPure = (props) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DropZoneEdit, __spreadValues({}, props));
+var DropZoneEditPure = (props) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DropZoneEdit, __spreadValues({}, props));
 var DropZoneChild = ({
   zoneCompound,
   componentId,
@@ -5320,7 +5095,7 @@ var DropZoneChild = ({
   let label = (_b = (_a = componentConfig == null ? void 0 : componentConfig.label) != null ? _a : item == null ? void 0 : item.type.toString()) != null ? _b : "Component";
   const renderPreview = (0, import_react34.useMemo)(
     () => function Preview4() {
-      return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DrawerItemInner, { name: label, children: overrides.componentItem });
+      return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DrawerItemInner, { name: label, children: overrides.componentItem });
     },
     [componentId, label, overrides]
   );
@@ -5336,12 +5111,12 @@ var DropZoneChild = ({
     componentConfig,
     defaultsProps,
     DropZoneEditPure,
-    (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(ContextSlotRender, { componentId, zone: slotProps.zone }),
+    (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(ContextSlotRender, { componentId, zone: slotProps.zone }),
     nodeReadOnly,
     isLoading
   );
   if (!item) return;
-  let Render2 = componentConfig ? componentConfig.render : () => /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { style: { padding: 48, textAlign: "center" }, children: [
+  let Render2 = componentConfig ? componentConfig.render : () => /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { style: { padding: 48, textAlign: "center" }, children: [
     "No configuration for ",
     item.type
   ] });
@@ -5350,7 +5125,7 @@ var DropZoneChild = ({
   if (isPreview) {
     Render2 = renderPreview;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
     DraggableComponent,
     {
       id: componentId,
@@ -5365,14 +5140,14 @@ var DropZoneChild = ({
       autoDragAxis: dragAxis,
       userDragAxis: collisionAxis,
       inDroppableZone,
-      children: (dragRef) => (componentConfig == null ? void 0 : componentConfig.inline) && !isPreview ? /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_jsx_runtime23.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+      children: (dragRef) => (componentConfig == null ? void 0 : componentConfig.inline) && !isPreview ? /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(import_jsx_runtime25.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
         Render2,
         __spreadProps(__spreadValues({}, defaultedPropsWithSlots), {
           puck: __spreadProps(__spreadValues({}, defaultedPropsWithSlots.puck), {
             dragRef
           })
         })
-      ) }) : /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { ref: dragRef, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Render2, __spreadValues({}, defaultedPropsWithSlots)) })
+      ) }) : /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { ref: dragRef, children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Render2, __spreadValues({}, defaultedPropsWithSlots)) })
     }
   );
 };
@@ -5436,11 +5211,6 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
     );
     (0, import_react34.useEffect)(() => {
       if (!zoneType || zoneType === "dropzone") {
-        if (zoneCompound !== rootDroppableId) {
-          console.warn(
-            "DropZones have been deprecated in favor of slot fields and will be removed in a future version of Puck. Please see the migration guide: https://www.puckeditor.com/docs/guides/migrations/dropzones-to-slots"
-          );
-        }
         if (ctx == null ? void 0 : ctx.registerZone) {
           ctx == null ? void 0 : ctx.registerZone(zoneCompound);
         }
@@ -5451,6 +5221,15 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
         };
       }
     }, [zoneType]);
+    (0, import_react34.useEffect)(() => {
+      if (zoneType === "dropzone") {
+        if (zoneCompound !== rootDroppableId) {
+          console.warn(
+            "DropZones have been deprecated in favor of slot fields and will be removed in a future version of Puck. Please see the migration guide: https://www.puckeditor.com/docs/guides/migrations/dropzones-to-slots"
+          );
+        }
+      }
+    }, [zoneType]);
     const contentIds = (0, import_react34.useMemo)(() => {
       return zoneContentIds || [];
     }, [zoneContentIds]);
@@ -5513,7 +5292,7 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
         path: path || []
       }
     };
-    const { ref: dropRef } = useDroppableSafe(droppableConfig);
+    const { ref: dropRef } = (0, import_react35.useDroppable)(droppableConfig);
     const isAreaSelected = useAppStore(
       (s) => (s == null ? void 0 : s.selectedItem) && areaId === (s == null ? void 0 : s.selectedItem.props.id)
     );
@@ -5523,7 +5302,7 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
       userMinEmptyHeight,
       ref
     });
-    return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
       "div",
       {
         className: `${getClassName17({
@@ -5545,7 +5324,7 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
           backgroundColor: RENDER_DEBUG ? getRandomColor() : style == null ? void 0 : style.backgroundColor
         }),
         children: contentIdsWithPreview.map((componentId, i) => {
-          return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+          return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
             DropZoneChildMemo,
             {
               zoneCompound,
@@ -5570,7 +5349,7 @@ var DropZoneRenderItem = ({
   metadata
 }) => {
   const Component = config.components[item.type];
-  const props = useSlots(Component, item.props, (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, slotProps), { config, metadata })));
+  const props = useSlots(Component, item.props, (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, slotProps), { config, metadata })));
   const nextContextValue = (0, import_react34.useMemo)(
     () => ({
       areaId: props.id,
@@ -5578,7 +5357,7 @@ var DropZoneRenderItem = ({
     }),
     [props]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DropZoneProvider, { value: nextContextValue, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DropZoneProvider, { value: nextContextValue, children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
     Component.render,
     __spreadProps(__spreadValues({}, props), {
       puck: __spreadProps(__spreadValues({}, props.puck), {
@@ -5588,8 +5367,8 @@ var DropZoneRenderItem = ({
     })
   ) }, props.id);
 };
-var DropZoneRenderPure = (props) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DropZoneRender, __spreadValues({}, props));
-var DropZoneRender = (0, import_react34.forwardRef)(
+var DropZoneRenderPure = (props) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DropZoneRender2, __spreadValues({}, props));
+var DropZoneRender2 = (0, import_react34.forwardRef)(
   function DropZoneRenderInternal({ className, style, zone }, ref) {
     const ctx = (0, import_react34.useContext)(dropZoneContext);
     const { areaId = "root" } = ctx || {};
@@ -5615,10 +5394,10 @@ var DropZoneRender = (0, import_react34.forwardRef)(
       zoneCompound = `${areaId}:${zone}`;
       content = setupZone(data, zoneCompound).zones[zoneCompound];
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { className, style, ref, children: content.map((item) => {
+    return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className, style, ref, children: content.map((item) => {
       const Component = config.components[item.type];
       if (Component) {
-        return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+        return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
           DropZoneRenderItem,
           {
             config,
@@ -5632,21 +5411,20 @@ var DropZoneRender = (0, import_react34.forwardRef)(
     }) });
   }
 );
-var DropZonePure = (props) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DropZone, __spreadValues({}, props));
+var DropZonePure = (props) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DropZone, __spreadValues({}, props));
 var DropZone = (0, import_react34.forwardRef)(
   function DropZone2(props, ref) {
     const ctx = (0, import_react34.useContext)(dropZoneContext);
     if ((ctx == null ? void 0 : ctx.mode) === "edit") {
-      return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_jsx_runtime23.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DropZoneEdit, __spreadProps(__spreadValues({}, props), { ref })) });
+      return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(import_jsx_runtime25.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DropZoneEdit, __spreadProps(__spreadValues({}, props), { ref })) });
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_jsx_runtime23.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DropZoneRender, __spreadProps(__spreadValues({}, props), { ref })) });
+    return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(import_jsx_runtime25.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DropZoneRender2, __spreadProps(__spreadValues({}, props), { ref })) });
   }
 );
 
 // lib/dnd/NestedDroppablePlugin.ts
 init_react_import();
-var import_abstract10 = require("@dnd-kit/abstract");
-var import_state2 = require("@dnd-kit/state");
+var import_abstract9 = require("@dnd-kit/abstract");
 
 // lib/throttle.ts
 init_react_import();
@@ -5695,7 +5473,7 @@ var GlobalPosition = class {
     var _a;
     this.target = target;
     this.original = original;
-    this.frameEl = document.querySelector("iframe");
+    this.frameEl = document.querySelector("iframe#preview-frame");
     if (this.frameEl) {
       this.frameRect = this.frameEl.getBoundingClientRect();
       this.scaleFactor = this.frameRect.width / (((_a = this.frameEl.contentWindow) == null ? void 0 : _a.innerWidth) || 1);
@@ -5775,6 +5553,7 @@ var getZoneId2 = (candidate) => {
   }
   return id;
 };
+var BUFFER = 6;
 var getPointerCollisions = (position, manager) => {
   const candidates = [];
   let elements = position.target.ownerDocument.elementsFromPoint(
@@ -5798,13 +5577,26 @@ var getPointerCollisions = (position, manager) => {
     for (let i = 0; i < elements.length; i++) {
       const element = elements[i];
       const dropzoneId = element.getAttribute("data-puck-dropzone");
+      const id = element.getAttribute("data-puck-dnd");
+      const isVoid = element.hasAttribute("data-puck-dnd-void");
+      if (BUFFER && (dropzoneId || id) && !isVoid) {
+        const box = element.getBoundingClientRect();
+        const contractedBox = {
+          left: box.left + BUFFER,
+          right: box.right - BUFFER,
+          top: box.top + BUFFER,
+          bottom: box.bottom - BUFFER
+        };
+        if (position.frame.x < contractedBox.left || position.frame.x > contractedBox.right || position.frame.y > contractedBox.bottom || position.frame.y < contractedBox.top) {
+          continue;
+        }
+      }
       if (dropzoneId) {
         const droppable = manager.registry.droppables.get(dropzoneId);
         if (droppable) {
           candidates.push(droppable);
         }
       }
-      const id = element.getAttribute("data-puck-dnd");
       if (id) {
         const droppable = manager.registry.droppables.get(id);
         if (droppable) {
@@ -5858,17 +5650,17 @@ var findDeepestCandidate = (position, manager) => {
     return { zone, area };
   }
   return {
-    zone: "default-zone",
-    area: null
+    zone: rootDroppableId,
+    area: rootAreaId
   };
 };
-var createNestedDroppablePlugin = ({ onChange }, id) => class NestedDroppablePlugin extends import_abstract10.Plugin {
+var createNestedDroppablePlugin = ({ onChange }, id) => class NestedDroppablePlugin extends import_abstract9.Plugin {
   constructor(manager, options) {
     super(manager);
     if (typeof window === "undefined") {
       return;
     }
-    const cleanupEffect = (0, import_state2.effects)(() => {
+    this.registerEffect(() => {
       const handleMove = (event) => {
         const target = event instanceof BubbledPointerEvent ? event.originalTarget || event.target : event.target;
         const position = new GlobalPosition(target, {
@@ -5892,12 +5684,12 @@ var createNestedDroppablePlugin = ({ onChange }, id) => class NestedDroppablePlu
         capture: true
         // dndkit's PointerSensor prevents propagation during drag
       });
-      this.destroy = () => {
+      const cleanup = () => {
         document.body.removeEventListener("pointermove", handlePointerMove, {
           capture: true
         });
-        cleanupEffect();
       };
+      return cleanup;
     });
   }
 };
@@ -5957,14 +5749,14 @@ function getDeepDir(el) {
 }
 
 // components/DragDropContext/index.tsx
-var import_jsx_runtime24 = require("react/jsx-runtime");
+var import_jsx_runtime26 = require("react/jsx-runtime");
 var DEBUG3 = false;
-var dragListenerContext = (0, import_react36.createContext)({
+var dragListenerContext = (0, import_react37.createContext)({
   dragListeners: {}
 });
 function useDragListener(type, fn, deps = []) {
-  const { setDragListeners } = (0, import_react36.useContext)(dragListenerContext);
-  (0, import_react36.useEffect)(() => {
+  const { setDragListeners } = (0, import_react37.useContext)(dragListenerContext);
+  (0, import_react37.useEffect)(() => {
     if (setDragListeners) {
       setDragListeners((old) => __spreadProps(__spreadValues({}, old), {
         [type]: [...old[type] || [], fn]
@@ -5974,8 +5766,8 @@ function useDragListener(type, fn, deps = []) {
 }
 var AREA_CHANGE_DEBOUNCE_MS = 100;
 var useTempDisableFallback = (timeout3) => {
-  const lastFallbackDisable = (0, import_react36.useRef)(null);
-  return (0, import_react36.useCallback)((manager) => {
+  const lastFallbackDisable = (0, import_react37.useRef)(null);
+  return (0, import_react37.useCallback)((manager) => {
     collisionStore.setState({ fallbackEnabled: false });
     const fallbackId = generateId();
     lastFallbackDisable.current = fallbackId;
@@ -5994,9 +5786,9 @@ var DragDropContextClient = ({
   const dispatch = useAppStore((s) => s.dispatch);
   const appStore = useAppStoreApi();
   const id = useSafeId();
-  const debouncedParamsRef = (0, import_react36.useRef)(null);
+  const debouncedParamsRef = (0, import_react37.useRef)(null);
   const tempDisableFallback = useTempDisableFallback(100);
-  const [zoneStore] = (0, import_react36.useState)(
+  const [zoneStore] = (0, import_react37.useState)(
     () => (0, import_zustand5.createStore)(() => ({
       zoneDepthIndex: {},
       nextZoneDepthIndex: {},
@@ -6006,7 +5798,7 @@ var DragDropContextClient = ({
       previewIndex: {}
     }))
   );
-  const getChanged2 = (0, import_react36.useCallback)(
+  const getChanged2 = (0, import_react37.useCallback)(
     (params, id2) => {
       const { zoneDepthIndex = {}, areaDepthIndex = {} } = zoneStore.getState() || {};
       const stateHasZone = Object.keys(zoneDepthIndex).length > 0;
@@ -6027,7 +5819,7 @@ var DragDropContextClient = ({
     },
     [zoneStore]
   );
-  const setDeepestAndCollide = (0, import_react36.useCallback)(
+  const setDeepestAndCollide = (0, import_react37.useCallback)(
     (params, manager) => {
       const { zoneChanged, areaChanged } = getChanged2(params, id);
       if (!zoneChanged && !areaChanged) return;
@@ -6051,7 +5843,7 @@ var DragDropContextClient = ({
     setDeepestDb.cancel();
     debouncedParamsRef.current = null;
   };
-  (0, import_react36.useEffect)(() => {
+  (0, import_react37.useEffect)(() => {
     if (DEBUG3) {
       zoneStore.subscribe(
         (s) => {
@@ -6065,7 +5857,7 @@ var DragDropContextClient = ({
       );
     }
   }, []);
-  const [plugins] = (0, import_react36.useState)(() => [
+  const [plugins] = (0, import_react37.useState)(() => [
     ...disableAutoScroll ? import_dom.defaultPreset.plugins.filter((plugin) => plugin !== import_dom.AutoScroller) : import_dom.defaultPreset.plugins,
     createNestedDroppablePlugin(
       {
@@ -6113,10 +5905,10 @@ var DragDropContextClient = ({
     )
   ]);
   const sensors = useSensors();
-  const [dragListeners, setDragListeners] = (0, import_react36.useState)({});
-  const dragMode = (0, import_react36.useRef)(null);
-  const initialSelector = (0, import_react36.useRef)(void 0);
-  const nextContextValue = (0, import_react36.useMemo)(
+  const [dragListeners, setDragListeners] = (0, import_react37.useState)({});
+  const dragMode = (0, import_react37.useRef)(null);
+  const initialSelector = (0, import_react37.useRef)(void 0);
+  const nextContextValue = (0, import_react37.useMemo)(
     () => ({
       mode: "edit",
       areaId: "root",
@@ -6124,15 +5916,15 @@ var DragDropContextClient = ({
     }),
     []
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { id, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("div", { id, children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
     dragListenerContext.Provider,
     {
       value: {
         dragListeners,
         setDragListeners
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
-        import_react35.DragDropProvider,
+      children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
+        import_react36.DragDropProvider,
         {
           plugins,
           sensors,
@@ -6199,7 +5991,7 @@ var DragDropContextClient = ({
             }, 250);
           },
           onDragOver: (event, manager) => {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d;
             event.preventDefault();
             const draggedItem = (_a = zoneStore.getState()) == null ? void 0 : _a.draggedItem;
             if (!draggedItem) return;
@@ -6217,7 +6009,7 @@ var DragDropContextClient = ({
               const targetData = target.data;
               targetZone = targetData.zone;
               targetIndex = targetData.index;
-              const collisionData = (_c = (_b = manager.dragOperation.data) == null ? void 0 : _b.collisionMap) == null ? void 0 : _c[targetId];
+              const collisionData = (_b = manager.collisionObserver.collisions[0]) == null ? void 0 : _b.data;
               const dir = getDeepDir(target.element);
               const collisionPosition = (collisionData == null ? void 0 : collisionData.direction) === "up" || dir === "ltr" && (collisionData == null ? void 0 : collisionData.direction) === "left" || dir === "rtl" && (collisionData == null ? void 0 : collisionData.direction) === "right" ? "before" : "after";
               if (targetIndex >= sourceIndex && sourceZone === targetZone) {
@@ -6230,7 +6022,7 @@ var DragDropContextClient = ({
               targetZone = target.id.toString();
               targetIndex = 0;
             }
-            const path = ((_d = appStore.getState().state.indexes.nodes[target.id]) == null ? void 0 : _d.path) || [];
+            const path = ((_c = appStore.getState().state.indexes.nodes[target.id]) == null ? void 0 : _c.path) || [];
             if (targetId === sourceId || path.find((path2) => {
               const [pathId] = path2.split(":");
               return pathId === sourceId;
@@ -6276,16 +6068,12 @@ var DragDropContextClient = ({
                 });
               }
             }
-            (_e = dragListeners.dragover) == null ? void 0 : _e.forEach((fn) => {
+            (_d = dragListeners.dragover) == null ? void 0 : _d.forEach((fn) => {
               fn(event, manager);
             });
           },
           onDragStart: (event, manager) => {
             var _a;
-            dispatch({
-              type: "setUi",
-              ui: { itemSelector: null, isDragging: true }
-            });
             const { source } = event.operation;
             if (source && source.type !== "void") {
               const sourceData = source.data;
@@ -6316,12 +6104,12 @@ var DragDropContextClient = ({
           },
           onBeforeDragStart: (event) => {
             var _a;
-            const isNewComponent = ((_a = event.operation.source) == null ? void 0 : _a.data.type) === "drawer";
+            const isNewComponent = ((_a = event.operation.source) == null ? void 0 : _a.type) === "drawer";
             dragMode.current = isNewComponent ? "new" : "existing";
             initialSelector.current = void 0;
             zoneStore.setState({ draggedItem: event.operation.source });
           },
-          children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(ZoneStoreProvider, { store: zoneStore, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DropZoneProvider, { value: nextContextValue, children }) })
+          children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(ZoneStoreProvider, { store: zoneStore, children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(DropZoneProvider, { value: nextContextValue, children }) })
         }
       )
     }
@@ -6335,11 +6123,12 @@ var DragDropContext = ({
   if (status === "LOADING") {
     return children;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DragDropContextClient, { disableAutoScroll, children });
+  return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(DragDropContextClient, { disableAutoScroll, children });
 };
 
 // components/Drawer/index.tsx
-var import_jsx_runtime25 = require("react/jsx-runtime");
+var import_react39 = require("@dnd-kit/react");
+var import_jsx_runtime27 = require("react/jsx-runtime");
 var getClassName18 = get_class_name_factory_default("Drawer", styles_module_default10);
 var getClassNameItem2 = get_class_name_factory_default("DrawerItem", styles_module_default10);
 var DrawerItemInner = ({
@@ -6349,11 +6138,11 @@ var DrawerItemInner = ({
   dragRef,
   isDragDisabled
 }) => {
-  const CustomInner = (0, import_react37.useMemo)(
-    () => children || (({ children: children2 }) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: getClassNameItem2("default"), children: children2 })),
+  const CustomInner = (0, import_react38.useMemo)(
+    () => children || (({ children: children2 }) => /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassNameItem2("default"), children: children2 })),
     [children]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
     "div",
     {
       className: getClassNameItem2({ disabled: isDragDisabled }),
@@ -6361,9 +6150,9 @@ var DrawerItemInner = ({
       onMouseDown: (e) => e.preventDefault(),
       "data-testid": dragRef ? `drawer-item:${name}` : "",
       "data-puck-drawer-item": true,
-      children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(CustomInner, { name, children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: getClassNameItem2("draggableWrapper"), children: /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: getClassNameItem2("draggable"), children: [
-        /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: getClassNameItem2("name"), children: label != null ? label : name }),
-        /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: getClassNameItem2("icon"), children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DragIcon, {}) })
+      children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(CustomInner, { name, children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassNameItem2("draggableWrapper"), children: /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)("div", { className: getClassNameItem2("draggable"), children: [
+        /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassNameItem2("name"), children: label != null ? label : name }),
+        /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassNameItem2("icon"), children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(DragIcon, {}) })
       ] }) }) })
     }
   );
@@ -6375,14 +6164,15 @@ var DrawerItemDraggable = ({
   id,
   isDragDisabled
 }) => {
-  const { ref } = useDraggableSafe({
+  const { ref } = (0, import_react39.useDraggable)({
     id,
-    data: { type: "drawer", componentType: name },
-    disabled: isDragDisabled
+    data: { componentType: name },
+    disabled: isDragDisabled,
+    type: "drawer"
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: getClassName18("draggable"), children: [
-    /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: getClassName18("draggableBg"), children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DrawerItemInner, { name, label, children }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: getClassName18("draggableFg"), children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)("div", { className: getClassName18("draggable"), children: [
+    /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassName18("draggableBg"), children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(DrawerItemInner, { name, label, children }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassName18("draggableFg"), children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
       DrawerItemInner,
       {
         name,
@@ -6403,7 +6193,7 @@ var DrawerItem = ({
   isDragDisabled
 }) => {
   const resolvedId = id || name;
-  const [dynamicId, setDynamicId] = (0, import_react37.useState)(generateId(resolvedId));
+  const [dynamicId, setDynamicId] = (0, import_react38.useState)(generateId(resolvedId));
   if (typeof index !== "undefined") {
     console.error(
       "Warning: The `index` prop on Drawer.Item is deprecated and no longer required."
@@ -6416,7 +6206,7 @@ var DrawerItem = ({
     },
     [resolvedId]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
     DrawerItemDraggable,
     {
       name,
@@ -6443,19 +6233,20 @@ var Drawer = ({
     );
   }
   const id = useSafeId();
-  const { ref } = useDroppableSafe({
+  const { ref } = (0, import_react39.useDroppable)({
     id,
     type: "void",
     collisionPriority: 0
     // Never collide with this, but we use it so NestedDroppablePlugin respects the Drawer
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
     "div",
     {
       className: getClassName18(),
       ref,
       "data-puck-dnd": id,
       "data-puck-drawer": true,
+      "data-puck-dnd-void": true,
       children
     }
   );
@@ -6464,7 +6255,7 @@ Drawer.Item = DrawerItem;
 
 // components/Puck/index.tsx
 init_react_import();
-var import_react52 = require("react");
+var import_react54 = require("react");
 
 // components/SidebarSection/index.tsx
 init_react_import();
@@ -6475,7 +6266,7 @@ var styles_module_default13 = { "SidebarSection": "_SidebarSection_8boj8_1", "Si
 
 // lib/use-breadcrumbs.ts
 init_react_import();
-var import_react38 = require("react");
+var import_react40 = require("react");
 var useBreadcrumbs = (renderCount) => {
   const selectedId = useAppStore((s) => {
     var _a;
@@ -6487,7 +6278,7 @@ var useBreadcrumbs = (renderCount) => {
     return (_a = s.state.indexes.nodes[selectedId]) == null ? void 0 : _a.path;
   });
   const appStore = useAppStoreApi();
-  return (0, import_react38.useMemo)(() => {
+  return (0, import_react40.useMemo)(() => {
     const breadcrumbs = (path == null ? void 0 : path.map((zoneCompound) => {
       var _a, _b, _c;
       const [componentId] = zoneCompound.split(":");
@@ -6518,7 +6309,7 @@ var useBreadcrumbs = (renderCount) => {
 };
 
 // components/SidebarSection/index.tsx
-var import_jsx_runtime26 = require("react/jsx-runtime");
+var import_jsx_runtime28 = require("react/jsx-runtime");
 var getClassName19 = get_class_name_factory_default("SidebarSection", styles_module_default13);
 var SidebarSection = ({
   children,
@@ -6531,15 +6322,15 @@ var SidebarSection = ({
 }) => {
   const setUi = useAppStore((s) => s.setUi);
   const breadcrumbs = useBreadcrumbs(1);
-  return /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)(
     "div",
     {
       className: getClassName19({ noBorderTop, noPadding }),
       style: { background },
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("div", { className: getClassName19("title"), children: /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)("div", { className: getClassName19("breadcrumbs"), children: [
-          showBreadcrumbs ? breadcrumbs.map((breadcrumb, i) => /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)("div", { className: getClassName19("breadcrumb"), children: [
-            /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassName19("title"), children: /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)("div", { className: getClassName19("breadcrumbs"), children: [
+          showBreadcrumbs ? breadcrumbs.map((breadcrumb, i) => /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)("div", { className: getClassName19("breadcrumb"), children: [
+            /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
               "button",
               {
                 type: "button",
@@ -6548,12 +6339,12 @@ var SidebarSection = ({
                 children: breadcrumb.label
               }
             ),
-            /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(ChevronRight, { size: 16 })
+            /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(ChevronRight, { size: 16 })
           ] }, i)) : null,
-          /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("div", { className: getClassName19("heading"), children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Heading, { rank: "2", size: "xs", children: title }) })
+          /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassName19("heading"), children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(Heading, { rank: "2", size: "xs", children: title }) })
         ] }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("div", { className: getClassName19("content"), children }),
-        isLoading && /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("div", { className: getClassName19("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Loader, { size: 32 }) })
+        /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassName19("content"), children }),
+        isLoading && /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassName19("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(Loader, { size: 32 }) })
       ]
     }
   );
@@ -6567,7 +6358,7 @@ init_react_import();
 var styles_module_default14 = { "MenuBar": "_MenuBar_8pf8c_1", "MenuBar--menuOpen": "_MenuBar--menuOpen_8pf8c_14", "MenuBar-inner": "_MenuBar-inner_8pf8c_29", "MenuBar-history": "_MenuBar-history_8pf8c_45" };
 
 // components/MenuBar/index.tsx
-var import_jsx_runtime27 = require("react/jsx-runtime");
+var import_jsx_runtime29 = require("react/jsx-runtime");
 var getClassName20 = get_class_name_factory_default("MenuBar", styles_module_default14);
 function MenuBar({
   menuOpen = false,
@@ -6578,7 +6369,7 @@ function MenuBar({
   const forward = useAppStore((s) => s.history.forward);
   const hasFuture = useAppStore((s) => s.history.hasFuture());
   const hasPast = useAppStore((s) => s.history.hasPast());
-  return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
     "div",
     {
       className: getClassName20({ menuOpen }),
@@ -6592,12 +6383,12 @@ function MenuBar({
           setMenuOpen(false);
         }
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)("div", { className: getClassName20("inner"), children: [
-        /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)("div", { className: getClassName20("history"), children: [
-          /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(IconButton, { title: "undo", disabled: !hasPast, onClick: back, children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Undo2, { size: 21 }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(IconButton, { title: "redo", disabled: !hasFuture, onClick: forward, children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Redo2, { size: 21 }) })
+      children: /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)("div", { className: getClassName20("inner"), children: [
+        /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)("div", { className: getClassName20("history"), children: [
+          /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(IconButton, { title: "undo", disabled: !hasPast, onClick: back, children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Undo2, { size: 21 }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(IconButton, { title: "redo", disabled: !hasFuture, onClick: forward, children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Redo2, { size: 21 }) })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(import_jsx_runtime27.Fragment, { children: renderHeaderActions && renderHeaderActions() })
+        /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(import_jsx_runtime29.Fragment, { children: renderHeaderActions && renderHeaderActions() })
       ] })
     }
   );
@@ -6615,14 +6406,14 @@ init_react_import();
 var styles_module_default16 = { "PuckFields": "_PuckFields_10bh7_1", "PuckFields--isLoading": "_PuckFields--isLoading_10bh7_6", "PuckFields-loadingOverlay": "_PuckFields-loadingOverlay_10bh7_10", "PuckFields-loadingOverlayInner": "_PuckFields-loadingOverlayInner_10bh7_25", "PuckFields-field": "_PuckFields-field_10bh7_32", "PuckFields--wrapFields": "_PuckFields--wrapFields_10bh7_36" };
 
 // components/Puck/components/Fields/index.tsx
-var import_react39 = require("react");
+var import_react41 = require("react");
 var import_shallow4 = require("zustand/react/shallow");
-var import_jsx_runtime28 = require("react/jsx-runtime");
+var import_jsx_runtime30 = require("react/jsx-runtime");
 var getClassName21 = get_class_name_factory_default("PuckFields", styles_module_default16);
 var DefaultFields = ({
   children
 }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(import_jsx_runtime28.Fragment, { children });
+  return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(import_jsx_runtime30.Fragment, { children });
 };
 var createOnChange = (fieldName, appStore) => (value, updatedUi) => __async(void 0, null, function* () {
   let currentProps;
@@ -6688,12 +6479,12 @@ var FieldsChild = ({ fieldName }) => {
     })
   );
   const appStore = useAppStoreApi();
-  const onChange = (0, import_react39.useCallback)(createOnChange(fieldName, appStore), [
+  const onChange = (0, import_react41.useCallback)(createOnChange(fieldName, appStore), [
     fieldName
   ]);
   if (!field || !id) return null;
   if (field.type === "slot") return null;
-  return /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassName21("field"), children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("div", { className: getClassName21("field"), children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
     AutoFieldPrivate,
     {
       field,
@@ -6721,11 +6512,16 @@ var Fields = ({ wrapFields = true }) => {
   useRegisterFieldsSlice(appStore, id);
   const fieldsLoading = useAppStore((s) => s.fields.loading);
   const fieldNames = useAppStore(
-    (0, import_shallow4.useShallow)((s) => Object.keys(s.fields.fields))
+    (0, import_shallow4.useShallow)((s) => {
+      if (s.fields.id === id) {
+        return Object.keys(s.fields.fields);
+      }
+      return [];
+    })
   );
   const isLoading = fieldsLoading || componentResolving;
-  const Wrapper = (0, import_react39.useMemo)(() => overrides.fields || DefaultFields, [overrides]);
-  return /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)(
+  const Wrapper = (0, import_react41.useMemo)(() => overrides.fields || DefaultFields, [overrides]);
+  return /* @__PURE__ */ (0, import_jsx_runtime30.jsxs)(
     "form",
     {
       className: getClassName21({ wrapFields }),
@@ -6733,8 +6529,8 @@ var Fields = ({ wrapFields = true }) => {
         e.preventDefault();
       },
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(Wrapper, { isLoading, itemSelector, children: fieldNames.map((fieldName) => /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(FieldsChild, { fieldName }, fieldName)) }),
-        isLoading && /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassName21("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassName21("loadingOverlayInner"), children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(Loader, { size: 16 }) }) })
+        /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(Wrapper, { isLoading, itemSelector, children: fieldNames.map((fieldName) => /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(FieldsChild, { fieldName }, fieldName)) }),
+        isLoading && /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("div", { className: getClassName21("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("div", { className: getClassName21("loadingOverlayInner"), children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(Loader, { size: 16 }) }) })
       ]
     }
   );
@@ -6745,7 +6541,7 @@ init_react_import();
 
 // lib/use-component-list.tsx
 init_react_import();
-var import_react40 = require("react");
+var import_react42 = require("react");
 
 // components/ComponentList/index.tsx
 init_react_import();
@@ -6755,7 +6551,7 @@ init_react_import();
 var styles_module_default17 = { "ComponentList": "_ComponentList_1rrlt_1", "ComponentList--isExpanded": "_ComponentList--isExpanded_1rrlt_5", "ComponentList-content": "_ComponentList-content_1rrlt_9", "ComponentList-title": "_ComponentList-title_1rrlt_17", "ComponentList-titleIcon": "_ComponentList-titleIcon_1rrlt_53" };
 
 // components/ComponentList/index.tsx
-var import_jsx_runtime29 = require("react/jsx-runtime");
+var import_jsx_runtime31 = require("react/jsx-runtime");
 var getClassName22 = get_class_name_factory_default("ComponentList", styles_module_default17);
 var ComponentListItem = ({
   name,
@@ -6767,7 +6563,7 @@ var ComponentListItem = ({
       type: name
     }).insert
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Drawer.Item, { label, name, isDragDisabled: !canInsert, children: overrides.componentItem });
+  return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Drawer.Item, { label, name, isDragDisabled: !canInsert, children: overrides.componentItem });
 };
 var ComponentList = ({
   children,
@@ -6778,8 +6574,8 @@ var ComponentList = ({
   const setUi = useAppStore((s) => s.setUi);
   const componentList = useAppStore((s) => s.state.ui.componentList);
   const { expanded = true } = componentList[id] || {};
-  return /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)("div", { className: getClassName22({ isExpanded: expanded }), children: [
-    title && /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)("div", { className: getClassName22({ isExpanded: expanded }), children: [
+    title && /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)(
       "button",
       {
         type: "button",
@@ -6793,14 +6589,14 @@ var ComponentList = ({
         }),
         title: expanded ? `Collapse${title ? ` ${title}` : ""}` : `Expand${title ? ` ${title}` : ""}`,
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { children: title }),
-          /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: getClassName22("titleIcon"), children: expanded ? /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(ChevronUp, { size: 12 }) : /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(ChevronDown, { size: 12 }) })
+          /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { children: title }),
+          /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { className: getClassName22("titleIcon"), children: expanded ? /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(ChevronUp, { size: 12 }) : /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(ChevronDown, { size: 12 }) })
         ]
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: getClassName22("content"), children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Drawer, { children: children || Object.keys(config.components).map((componentKey) => {
+    /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { className: getClassName22("content"), children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Drawer, { children: children || Object.keys(config.components).map((componentKey) => {
       var _a;
-      return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
+      return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
         ComponentListItem,
         {
           label: (_a = config.components[componentKey]["label"]) != null ? _a : componentKey,
@@ -6814,12 +6610,12 @@ var ComponentList = ({
 ComponentList.Item = ComponentListItem;
 
 // lib/use-component-list.tsx
-var import_jsx_runtime30 = require("react/jsx-runtime");
+var import_jsx_runtime32 = require("react/jsx-runtime");
 var useComponentList = () => {
-  const [componentList, setComponentList] = (0, import_react40.useState)();
+  const [componentList, setComponentList] = (0, import_react42.useState)();
   const config = useAppStore((s) => s.config);
   const uiComponentList = useAppStore((s) => s.state.ui.componentList);
-  (0, import_react40.useEffect)(() => {
+  (0, import_react42.useEffect)(() => {
     var _a, _b, _c;
     if (Object.keys(uiComponentList).length > 0) {
       const matchedComponents = [];
@@ -6829,7 +6625,7 @@ var useComponentList = () => {
           if (category.visible === false || !category.components) {
             return null;
           }
-          return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+          return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
             ComponentList,
             {
               id: categoryKey,
@@ -6838,7 +6634,7 @@ var useComponentList = () => {
                 var _a2;
                 matchedComponents.push(componentName);
                 const componentConf = config.components[componentName] || {};
-                return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+                return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
                   ComponentList.Item,
                   {
                     label: (_a2 = componentConf["label"]) != null ? _a2 : componentName,
@@ -6858,7 +6654,7 @@ var useComponentList = () => {
       );
       if (remainingComponents.length > 0 && !((_a = uiComponentList.other) == null ? void 0 : _a.components) && ((_b = uiComponentList.other) == null ? void 0 : _b.visible) !== false) {
         _componentList.push(
-          /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
             ComponentList,
             {
               id: "other",
@@ -6866,7 +6662,7 @@ var useComponentList = () => {
               children: remainingComponents.map((componentName, i) => {
                 var _a2;
                 const componentConf = config.components[componentName] || {};
-                return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+                return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
                   ComponentList.Item,
                   {
                     name: componentName,
@@ -6888,25 +6684,25 @@ var useComponentList = () => {
 };
 
 // components/Puck/components/Components/index.tsx
-var import_react41 = require("react");
-var import_jsx_runtime31 = require("react/jsx-runtime");
+var import_react43 = require("react");
+var import_jsx_runtime33 = require("react/jsx-runtime");
 var Components = () => {
   const overrides = useAppStore((s) => s.overrides);
   const componentList = useComponentList();
-  const Wrapper = (0, import_react41.useMemo)(() => overrides.components || "div", [overrides]);
-  return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Wrapper, { children: componentList ? componentList : /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(ComponentList, { id: "all" }) });
+  const Wrapper = (0, import_react43.useMemo)(() => overrides.components || "div", [overrides]);
+  return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Wrapper, { children: componentList ? componentList : /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(ComponentList, { id: "all" }) });
 };
 
 // components/Puck/components/Preview/index.tsx
 init_react_import();
-var import_react43 = require("react");
+var import_react45 = require("react");
 
 // components/AutoFrame/index.tsx
 init_react_import();
-var import_react42 = require("react");
+var import_react44 = require("react");
 var import_object_hash = __toESM(require("object-hash"));
 var import_react_dom3 = require("react-dom");
-var import_jsx_runtime32 = require("react/jsx-runtime");
+var import_jsx_runtime34 = require("react/jsx-runtime");
 var styleSelector = 'style, link[rel="stylesheet"]';
 var collectStyles = (doc) => {
   const collected = [];
@@ -6949,7 +6745,7 @@ var CopyHostStyles = ({
   onStylesLoaded = () => null
 }) => {
   const { document: doc, window: win } = useFrame();
-  (0, import_react42.useEffect)(() => {
+  (0, import_react44.useEffect)(() => {
     if (!win || !doc) {
       return () => {
       };
@@ -7106,10 +6902,10 @@ var CopyHostStyles = ({
       observer.disconnect();
     };
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(import_jsx_runtime32.Fragment, { children });
+  return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(import_jsx_runtime34.Fragment, { children });
 };
-var autoFrameContext = (0, import_react42.createContext)({});
-var useFrame = () => (0, import_react42.useContext)(autoFrameContext);
+var autoFrameContext = (0, import_react44.createContext)({});
+var useFrame = () => (0, import_react44.useContext)(autoFrameContext);
 function AutoFrame(_a) {
   var _b = _a, {
     children,
@@ -7130,11 +6926,11 @@ function AutoFrame(_a) {
     "onNotReady",
     "frameRef"
   ]);
-  const [loaded, setLoaded] = (0, import_react42.useState)(false);
-  const [ctx, setCtx] = (0, import_react42.useState)({});
-  const [mountTarget, setMountTarget] = (0, import_react42.useState)();
-  const [stylesLoaded, setStylesLoaded] = (0, import_react42.useState)(false);
-  (0, import_react42.useEffect)(() => {
+  const [loaded, setLoaded] = (0, import_react44.useState)(false);
+  const [ctx, setCtx] = (0, import_react44.useState)({});
+  const [mountTarget, setMountTarget] = (0, import_react44.useState)();
+  const [stylesLoaded, setStylesLoaded] = (0, import_react44.useState)(false);
+  (0, import_react44.useEffect)(() => {
     var _a2;
     if (frameRef.current) {
       const doc = frameRef.current.contentDocument;
@@ -7153,7 +6949,7 @@ function AutoFrame(_a) {
       }
     }
   }, [frameRef, loaded, stylesLoaded]);
-  return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
     "iframe",
     __spreadProps(__spreadValues({}, props), {
       className,
@@ -7163,7 +6959,7 @@ function AutoFrame(_a) {
       onLoad: () => {
         setLoaded(true);
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(autoFrameContext.Provider, { value: ctx, children: loaded && mountTarget && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(autoFrameContext.Provider, { value: ctx, children: loaded && mountTarget && /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
         CopyHostStyles,
         {
           debug,
@@ -7182,11 +6978,11 @@ init_react_import();
 var styles_module_default18 = { "PuckPreview": "_PuckPreview_z2rgu_1", "PuckPreview-frame": "_PuckPreview-frame_z2rgu_6" };
 
 // components/Puck/components/Preview/index.tsx
-var import_jsx_runtime33 = require("react/jsx-runtime");
+var import_jsx_runtime35 = require("react/jsx-runtime");
 var getClassName23 = get_class_name_factory_default("PuckPreview", styles_module_default18);
 var useBubbleIframeEvents = (ref) => {
   const status = useAppStore((s) => s.status);
-  (0, import_react43.useEffect)(() => {
+  (0, import_react45.useEffect)(() => {
     if (ref.current && status === "READY") {
       const iframe = ref.current;
       const handlePointerMove = (event) => {
@@ -7235,22 +7031,22 @@ var Preview3 = ({ id = "puck-preview" }) => {
   const renderData = useAppStore(
     (s) => s.state.ui.previewMode === "edit" ? null : s.state.data
   );
-  const Page = (0, import_react43.useCallback)(
+  const Page = (0, import_react45.useCallback)(
     (pageProps) => {
       var _a, _b;
       const rootConfig = config.root;
       const propsWithSlots = useSlots(rootConfig, pageProps, DropZoneEditPure);
       return ((_a = config.root) == null ? void 0 : _a.render) ? (_b = config.root) == null ? void 0 : _b.render(__spreadValues({
         id: "puck-root"
-      }, propsWithSlots)) : /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(import_jsx_runtime33.Fragment, { children: propsWithSlots.children });
+      }, propsWithSlots)) : /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(import_jsx_runtime35.Fragment, { children: propsWithSlots.children });
     },
     [config.root]
   );
-  const Frame = (0, import_react43.useMemo)(() => overrides.iframe, [overrides]);
+  const Frame = (0, import_react45.useMemo)(() => overrides.iframe, [overrides]);
   const rootProps = root.props || root;
-  const ref = (0, import_react43.useRef)(null);
+  const ref = (0, import_react45.useRef)(null);
   useBubbleIframeEvents(ref);
-  const inner = !renderData ? /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
+  const inner = !renderData ? /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
     Page,
     __spreadProps(__spreadValues({}, rootProps), {
       puck: {
@@ -7260,15 +7056,15 @@ var Preview3 = ({ id = "puck-preview" }) => {
         metadata
       },
       editMode: true,
-      children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(DropZonePure, { zone: rootDroppableId })
+      children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(DropZonePure, { zone: rootDroppableId })
     })
-  ) : /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Render, { data: renderData, config });
-  (0, import_react43.useEffect)(() => {
+  ) : /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Render, { data: renderData, config });
+  (0, import_react45.useEffect)(() => {
     if (!iframe.enabled) {
       setStatus("READY");
     }
   }, [iframe.enabled]);
-  return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
     "div",
     {
       className: getClassName23(),
@@ -7277,7 +7073,7 @@ var Preview3 = ({ id = "puck-preview" }) => {
       onClick: () => {
         dispatch({ type: "setUi", ui: { itemSelector: null } });
       },
-      children: iframe.enabled ? /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
+      children: iframe.enabled ? /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
         AutoFrame_default,
         {
           id: "preview-frame",
@@ -7290,14 +7086,14 @@ var Preview3 = ({ id = "puck-preview" }) => {
             setStatus("MOUNTED");
           },
           frameRef: ref,
-          children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(autoFrameContext.Consumer, { children: ({ document: document2 }) => {
+          children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(autoFrameContext.Consumer, { children: ({ document: document2 }) => {
             if (Frame) {
-              return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Frame, { document: document2, children: inner });
+              return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Frame, { document: document2, children: inner });
             }
             return inner;
           } })
         }
-      ) : /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
+      ) : /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
         "div",
         {
           id: "preview-frame",
@@ -7333,7 +7129,7 @@ var scrollIntoView = (el) => {
 };
 
 // components/LayerTree/index.tsx
-var import_react44 = require("react");
+var import_react46 = require("react");
 
 // lib/on-scroll-end.ts
 init_react_import();
@@ -7356,7 +7152,7 @@ var onScrollEnd = (frame, cb) => {
 
 // components/LayerTree/index.tsx
 var import_shallow5 = require("zustand/react/shallow");
-var import_jsx_runtime34 = require("react/jsx-runtime");
+var import_jsx_runtime36 = require("react/jsx-runtime");
 var getClassName24 = get_class_name_factory_default("LayerTree", styles_module_default19);
 var getClassNameLayer = get_class_name_factory_default("Layer", styles_module_default19);
 var Layer = ({
@@ -7365,11 +7161,11 @@ var Layer = ({
   zoneCompound
 }) => {
   var _a;
-  const ctx = (0, import_react44.useContext)(dropZoneContext);
+  const ctx = (0, import_react46.useContext)(dropZoneContext);
   const config = useAppStore((s) => s.config);
   const itemSelector = useAppStore((s) => s.state.ui.itemSelector);
   const dispatch = useAppStore((s) => s.dispatch);
-  const setItemSelector = (0, import_react44.useCallback)(
+  const setItemSelector = (0, import_react46.useCallback)(
     (itemSelector2) => {
       dispatch({ type: "setUi", ui: { itemSelector: itemSelector2 } });
     },
@@ -7402,7 +7198,7 @@ var Layer = ({
   });
   const componentConfig = config.components[nodeData.data.type];
   const label = (_a = componentConfig == null ? void 0 : componentConfig["label"]) != null ? _a : nodeData.data.type.toString();
-  return /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(
     "li",
     {
       className: getClassNameLayer({
@@ -7412,7 +7208,7 @@ var Layer = ({
         childIsSelected
       }),
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: getClassNameLayer("inner"), children: /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)(
+        /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassNameLayer("inner"), children: /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(
           "button",
           {
             type: "button",
@@ -7447,22 +7243,22 @@ var Layer = ({
               setHoveringComponent(null);
             },
             children: [
-              containsZone && /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
+              containsZone && /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
                 "div",
                 {
                   className: getClassNameLayer("chevron"),
                   title: isSelected ? "Collapse" : "Expand",
-                  children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(ChevronDown, { size: "12" })
+                  children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(ChevronDown, { size: "12" })
                 }
               ),
-              /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)("div", { className: getClassNameLayer("title"), children: [
-                /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: getClassNameLayer("icon"), children: nodeData.data.type === "Text" || nodeData.data.type === "Heading" ? /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Type, { size: "16" }) : /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(LayoutGrid, { size: "16" }) }),
-                /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: getClassNameLayer("name"), children: label })
+              /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { className: getClassNameLayer("title"), children: [
+                /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassNameLayer("icon"), children: nodeData.data.type === "Text" || nodeData.data.type === "Heading" ? /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Type, { size: "16" }) : /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(LayoutGrid, { size: "16" }) }),
+                /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassNameLayer("name"), children: label })
               ] })
             ]
           }
         ) }),
-        containsZone && zonesForItem.map((subzone) => /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: getClassNameLayer("zones"), children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(LayerTree, { zoneCompound: subzone }) }, subzone))
+        containsZone && zonesForItem.map((subzone) => /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassNameLayer("zones"), children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(LayerTree, { zoneCompound: subzone }) }, subzone))
       ]
     }
   );
@@ -7480,15 +7276,15 @@ var LayerTree = ({
       }
     )
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)(import_jsx_runtime34.Fragment, { children: [
-    label && /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)("div", { className: getClassName24("zoneTitle"), children: [
-      /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: getClassName24("zoneIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Layers, { size: "16" }) }),
+  return /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(import_jsx_runtime36.Fragment, { children: [
+    label && /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { className: getClassName24("zoneTitle"), children: [
+      /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassName24("zoneIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Layers, { size: "16" }) }),
       label
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)("ul", { className: getClassName24(), children: [
-      contentIds.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: getClassName24("helper"), children: "No items" }),
+    /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("ul", { className: getClassName24(), children: [
+      contentIds.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassName24("helper"), children: "No items" }),
       contentIds.map((itemId, i) => {
-        return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
+        return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
           Layer,
           {
             index: i,
@@ -7503,7 +7299,7 @@ var LayerTree = ({
 };
 
 // components/Puck/components/Outline/index.tsx
-var import_react45 = require("react");
+var import_react47 = require("react");
 
 // lib/data/find-zones-for-area.ts
 init_react_import();
@@ -7515,14 +7311,14 @@ var findZonesForArea = (state, area) => {
 
 // components/Puck/components/Outline/index.tsx
 var import_shallow6 = require("zustand/react/shallow");
-var import_jsx_runtime35 = require("react/jsx-runtime");
+var import_jsx_runtime37 = require("react/jsx-runtime");
 var Outline = () => {
   const outlineOverride = useAppStore((s) => s.overrides.outline);
   const rootZones = useAppStore(
     (0, import_shallow6.useShallow)((s) => findZonesForArea(s.state, "root"))
   );
-  const Wrapper = (0, import_react45.useMemo)(() => outlineOverride || "div", [outlineOverride]);
-  return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Wrapper, { children: rootZones.map((zoneCompound) => /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+  const Wrapper = (0, import_react47.useMemo)(() => outlineOverride || "div", [outlineOverride]);
+  return /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Wrapper, { children: rootZones.map((zoneCompound) => /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
     LayerTree,
     {
       label: rootZones.length === 1 ? "" : zoneCompound.split(":")[1],
@@ -7655,22 +7451,22 @@ var getBox = function getBox2(el) {
 };
 
 // components/Puck/components/Canvas/index.tsx
-var import_react47 = require("react");
+var import_react49 = require("react");
 
 // components/ViewportControls/index.tsx
 init_react_import();
-var import_react46 = require("react");
+var import_react48 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/ViewportControls/styles.module.css#css-module
 init_react_import();
 var styles_module_default20 = { "ViewportControls": "_ViewportControls_gejzr_1", "ViewportControls-divider": "_ViewportControls-divider_gejzr_15", "ViewportControls-zoomSelect": "_ViewportControls-zoomSelect_gejzr_21", "ViewportButton--isActive": "_ViewportButton--isActive_gejzr_38", "ViewportButton-inner": "_ViewportButton-inner_gejzr_38" };
 
 // components/ViewportControls/index.tsx
-var import_jsx_runtime36 = require("react/jsx-runtime");
+var import_jsx_runtime38 = require("react/jsx-runtime");
 var icons = {
-  Smartphone: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Smartphone, { size: 16 }),
-  Tablet: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Tablet, { size: 16 }),
-  Monitor: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Monitor, { size: 16 })
+  Smartphone: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Smartphone, { size: 16 }),
+  Tablet: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Tablet, { size: 16 }),
+  Monitor: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Monitor, { size: 16 })
 };
 var getClassName25 = get_class_name_factory_default("ViewportControls", styles_module_default20);
 var getClassNameButton = get_class_name_factory_default("ViewportButton", styles_module_default20);
@@ -7682,11 +7478,11 @@ var ViewportButton = ({
   onClick
 }) => {
   const viewports = useAppStore((s) => s.state.ui.viewports);
-  const [isActive, setIsActive] = (0, import_react46.useState)(false);
-  (0, import_react46.useEffect)(() => {
+  const [isActive, setIsActive] = (0, import_react48.useState)(false);
+  (0, import_react48.useEffect)(() => {
     setIsActive(width === viewports.current.width);
   }, [width, viewports.current.width]);
-  return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("span", { className: getClassNameButton({ isActive }), children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("span", { className: getClassNameButton({ isActive }), children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
     IconButton,
     {
       title,
@@ -7695,7 +7491,7 @@ var ViewportButton = ({
         e.stopPropagation();
         onClick({ width, height });
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("span", { className: getClassNameButton("inner"), children })
+      children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("span", { className: getClassNameButton("inner"), children })
     }
   ) });
 };
@@ -7719,7 +7515,7 @@ var ViewportControls = ({
   const defaultsContainAutoZoom = defaultZoomOptions.find(
     (option) => option.value === autoZoom
   );
-  const zoomOptions = (0, import_react46.useMemo)(
+  const zoomOptions = (0, import_react48.useMemo)(
     () => [
       ...defaultZoomOptions,
       ...defaultsContainAutoZoom ? [] : [
@@ -7731,8 +7527,8 @@ var ViewportControls = ({
     ].filter((a) => a.value <= autoZoom).sort((a, b) => a.value > b.value ? 1 : -1),
     [autoZoom]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { className: getClassName25(), children: [
-    viewports.map((viewport, i) => /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)("div", { className: getClassName25(), children: [
+    viewports.map((viewport, i) => /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
       ViewportButton,
       {
         height: viewport.height,
@@ -7743,8 +7539,8 @@ var ViewportControls = ({
       },
       i
     )),
-    /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassName25("divider") }),
-    /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: getClassName25("divider") }),
+    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
       IconButton,
       {
         title: "Zoom viewport out",
@@ -7758,10 +7554,10 @@ var ViewportControls = ({
             )].value
           );
         },
-        children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(ZoomOut, { size: 16 })
+        children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(ZoomOut, { size: 16 })
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
       IconButton,
       {
         title: "Zoom viewport in",
@@ -7775,11 +7571,11 @@ var ViewportControls = ({
             )].value
           );
         },
-        children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(ZoomIn, { size: 16 })
+        children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(ZoomIn, { size: 16 })
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassName25("divider") }),
-    /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: getClassName25("divider") }),
+    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
       "select",
       {
         className: getClassName25("zoomSelect"),
@@ -7787,7 +7583,7 @@ var ViewportControls = ({
         onChange: (e) => {
           onZoom(parseFloat(e.currentTarget.value));
         },
-        children: zoomOptions.map((option) => /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
+        children: zoomOptions.map((option) => /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
           "option",
           {
             value: option.value,
@@ -7836,7 +7632,7 @@ var getZoomConfig = (uiViewport, frame, zoom) => {
 
 // components/Puck/components/Canvas/index.tsx
 var import_shallow7 = require("zustand/react/shallow");
-var import_jsx_runtime37 = require("react/jsx-runtime");
+var import_jsx_runtime39 = require("react/jsx-runtime");
 var getClassName26 = get_class_name_factory_default("PuckCanvas", styles_module_default21);
 var ZOOM_ON_CHANGE = true;
 var Canvas = () => {
@@ -7866,17 +7662,17 @@ var Canvas = () => {
       viewports: s.state.ui.viewports
     }))
   );
-  const frameRef = (0, import_react47.useRef)(null);
-  const [showTransition, setShowTransition] = (0, import_react47.useState)(false);
-  const defaultRender = (0, import_react47.useMemo)(() => {
-    const PuckDefault = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(import_jsx_runtime37.Fragment, { children });
+  const frameRef = (0, import_react49.useRef)(null);
+  const [showTransition, setShowTransition] = (0, import_react49.useState)(false);
+  const defaultRender = (0, import_react49.useMemo)(() => {
+    const PuckDefault = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(import_jsx_runtime39.Fragment, { children });
     return PuckDefault;
   }, []);
-  const CustomPreview = (0, import_react47.useMemo)(
+  const CustomPreview = (0, import_react49.useMemo)(
     () => overrides.preview || defaultRender,
     [overrides]
   );
-  const getFrameDimensions = (0, import_react47.useCallback)(() => {
+  const getFrameDimensions = (0, import_react49.useCallback)(() => {
     if (frameRef.current) {
       const frame = frameRef.current;
       const box = getBox(frame);
@@ -7884,7 +7680,7 @@ var Canvas = () => {
     }
     return { width: 0, height: 0 };
   }, [frameRef]);
-  const resetAutoZoom = (0, import_react47.useCallback)(
+  const resetAutoZoom = (0, import_react49.useCallback)(
     (newViewports = viewports) => {
       if (frameRef.current) {
         setZoomConfig(
@@ -7898,11 +7694,11 @@ var Canvas = () => {
     },
     [frameRef, zoomConfig, viewports]
   );
-  (0, import_react47.useEffect)(() => {
+  (0, import_react49.useEffect)(() => {
     setShowTransition(false);
     resetAutoZoom(viewports);
   }, [frameRef, leftSideBarVisible, rightSideBarVisible]);
-  (0, import_react47.useEffect)(() => {
+  (0, import_react49.useEffect)(() => {
     const { height: frameHeight } = getFrameDimensions();
     if (viewports.current.height === "auto") {
       setZoomConfig(__spreadProps(__spreadValues({}, zoomConfig), {
@@ -7910,13 +7706,13 @@ var Canvas = () => {
       }));
     }
   }, [zoomConfig.zoom]);
-  (0, import_react47.useEffect)(() => {
+  (0, import_react49.useEffect)(() => {
     if (ZOOM_ON_CHANGE) {
       setShowTransition(true);
       resetAutoZoom(viewports);
     }
   }, [viewports.current.width]);
-  (0, import_react47.useEffect)(() => {
+  (0, import_react49.useEffect)(() => {
     const cb = () => {
       setShowTransition(false);
       resetAutoZoom();
@@ -7926,13 +7722,13 @@ var Canvas = () => {
       window.removeEventListener("resize", cb);
     };
   }, []);
-  const [showLoader, setShowLoader] = (0, import_react47.useState)(false);
-  (0, import_react47.useEffect)(() => {
+  const [showLoader, setShowLoader] = (0, import_react49.useState)(false);
+  (0, import_react49.useEffect)(() => {
     setTimeout(() => {
       setShowLoader(true);
     }, 500);
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(
     "div",
     {
       className: getClassName26({
@@ -7945,7 +7741,7 @@ var Canvas = () => {
         recordHistory: true
       }),
       children: [
-        viewports.controlsVisible && iframe.enabled && /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("div", { className: getClassName26("controls"), children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+        viewports.controlsVisible && iframe.enabled && /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: getClassName26("controls"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
           ViewportControls,
           {
             autoZoom: zoomConfig.autoZoom,
@@ -7971,8 +7767,8 @@ var Canvas = () => {
             }
           }
         ) }),
-        /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)("div", { className: getClassName26("inner"), ref: frameRef, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: getClassName26("inner"), ref: frameRef, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
             "div",
             {
               className: getClassName26("root"),
@@ -7993,10 +7789,10 @@ var Canvas = () => {
                   })
                 );
               },
-              children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(CustomPreview, { children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Preview3, {}) })
+              children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(CustomPreview, { children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Preview3, {}) })
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("div", { className: getClassName26("loader"), children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Loader, { size: 24 }) })
+          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: getClassName26("loader"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Loader, { size: 24 }) })
         ] })
       ]
     }
@@ -8005,7 +7801,7 @@ var Canvas = () => {
 
 // lib/use-loaded-overrides.ts
 init_react_import();
-var import_react48 = require("react");
+var import_react50 = require("react");
 
 // lib/load-overrides.ts
 init_react_import();
@@ -8044,26 +7840,26 @@ var useLoadedOverrides = ({
   overrides,
   plugins
 }) => {
-  return (0, import_react48.useMemo)(() => {
+  return (0, import_react50.useMemo)(() => {
     return loadOverrides({ overrides, plugins });
   }, [plugins, overrides]);
 };
 
 // components/DefaultOverride/index.tsx
 init_react_import();
-var import_jsx_runtime38 = require("react/jsx-runtime");
-var DefaultOverride = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(import_jsx_runtime38.Fragment, { children });
+var import_jsx_runtime40 = require("react/jsx-runtime");
+var DefaultOverride = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(import_jsx_runtime40.Fragment, { children });
 
 // lib/use-inject-css.ts
 init_react_import();
-var import_react49 = require("react");
+var import_react51 = require("react");
 var styles = ``;
 var useInjectStyleSheet = (initialStyles, iframeEnabled) => {
-  const [el, setEl] = (0, import_react49.useState)();
-  (0, import_react49.useEffect)(() => {
+  const [el, setEl] = (0, import_react51.useState)();
+  (0, import_react51.useEffect)(() => {
     setEl(document.createElement("style"));
   }, []);
-  (0, import_react49.useEffect)(() => {
+  (0, import_react51.useEffect)(() => {
     var _a;
     if (!el || typeof window === "undefined") {
       return;
@@ -8083,10 +7879,10 @@ var useInjectGlobalCss = (iframeEnabled) => {
 
 // lib/use-preview-mode-hotkeys.ts
 init_react_import();
-var import_react50 = require("react");
+var import_react52 = require("react");
 var usePreviewModeHotkeys = () => {
   const appStore = useAppStoreApi();
-  const toggleInteractive = (0, import_react50.useCallback)(() => {
+  const toggleInteractive = (0, import_react52.useCallback)(() => {
     const dispatch = appStore.getState().dispatch;
     dispatch({
       type: "setUi",
@@ -8101,7 +7897,7 @@ var usePreviewModeHotkeys = () => {
 
 // lib/use-puck.ts
 init_react_import();
-var import_react51 = require("react");
+var import_react53 = require("react");
 var import_zustand6 = require("zustand");
 var generateUsePuck = (store) => {
   const history = {
@@ -8135,7 +7931,7 @@ var generateUsePuck = (store) => {
   const get = () => storeData;
   return __spreadProps(__spreadValues({}, storeData), { get });
 };
-var UsePuckStoreContext = (0, import_react51.createContext)(
+var UsePuckStoreContext = (0, import_react53.createContext)(
   null
 );
 var convertToPickedStore = (store) => {
@@ -8149,12 +7945,12 @@ var convertToPickedStore = (store) => {
   };
 };
 var useRegisterUsePuckStore = (appStore) => {
-  const [usePuckStore] = (0, import_react51.useState)(
+  const [usePuckStore] = (0, import_react53.useState)(
     () => (0, import_zustand6.createStore)(
       () => generateUsePuck(convertToPickedStore(appStore.getState()))
     )
   );
-  (0, import_react51.useEffect)(() => {
+  (0, import_react53.useEffect)(() => {
     return appStore.subscribe(
       (store) => convertToPickedStore(store),
       (pickedStore) => {
@@ -8166,7 +7962,7 @@ var useRegisterUsePuckStore = (appStore) => {
 };
 function createUsePuck() {
   return function usePuck2(selector) {
-    const usePuckApi = (0, import_react51.useContext)(UsePuckStoreContext);
+    const usePuckApi = (0, import_react53.useContext)(UsePuckStoreContext);
     if (!usePuckApi) {
       throw new Error("usePuck must be used inside <Puck>.");
     }
@@ -8178,7 +7974,7 @@ function createUsePuck() {
   };
 }
 function usePuck() {
-  (0, import_react51.useEffect)(() => {
+  (0, import_react53.useEffect)(() => {
     console.warn(
       "You're using the `usePuck` method without a selector, which may cause unnecessary re-renders. Replace with `createUsePuck` and provide a selector for improved performance."
     );
@@ -8187,7 +7983,8 @@ function usePuck() {
 }
 
 // components/Puck/index.tsx
-var import_jsx_runtime39 = require("react/jsx-runtime");
+var import_fast_deep_equal2 = __toESM(require("fast-deep-equal"));
+var import_jsx_runtime41 = require("react/jsx-runtime");
 var getClassName27 = get_class_name_factory_default("Puck", styles_module_default15);
 var getLayoutClassName = get_class_name_factory_default("PuckLayout", styles_module_default15);
 var FieldSideBar = () => {
@@ -8197,13 +7994,13 @@ var FieldSideBar = () => {
       return s.selectedItem ? (_b = (_a = s.config.components[s.selectedItem.type]) == null ? void 0 : _a["label"]) != null ? _b : s.selectedItem.type.toString() : "Page";
     }
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(SidebarSection, { noPadding: true, noBorderTop: true, showBreadcrumbs: true, title, children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Fields, {}) });
+  return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(SidebarSection, { noPadding: true, noBorderTop: true, showBreadcrumbs: true, title, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Fields, {}) });
 };
-var propsContext = (0, import_react52.createContext)({});
+var propsContext = (0, import_react54.createContext)({});
 function PropsProvider(props) {
-  return /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(propsContext.Provider, { value: props, children: props.children });
+  return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(propsContext.Provider, { value: props, children: props.children });
 }
-var usePropsContext = () => (0, import_react52.useContext)(propsContext);
+var usePropsContext = () => (0, import_react54.useContext)(propsContext);
 function PuckProvider({ children }) {
   const {
     config,
@@ -8223,7 +8020,7 @@ function PuckProvider({ children }) {
     enabled: true,
     waitForStyles: true
   }, _iframe);
-  const [generatedAppState] = (0, import_react52.useState)(() => {
+  const [generatedAppState] = (0, import_react54.useState)(() => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const initial = __spreadValues(__spreadValues({}, defaultAppState.ui), initialUi);
     let clientUiState = {};
@@ -8280,17 +8077,17 @@ function PuckProvider({ children }) {
         ) : {}
       })
     });
-    return walkTree(newAppState, config);
+    return walkAppState(newAppState, config);
   });
   const { appendData = true } = _initialHistory || {};
-  const [blendedHistories] = (0, import_react52.useState)(
+  const [blendedHistories] = (0, import_react54.useState)(
     [
       ...(_initialHistory == null ? void 0 : _initialHistory.histories) || [],
       ...appendData ? [{ state: generatedAppState }] : []
     ].map((history) => {
       let newState = __spreadValues(__spreadValues({}, generatedAppState), history.state);
       if (!history.state.indexes) {
-        newState = walkTree(newState, config);
+        newState = walkAppState(newState, config);
       }
       return __spreadProps(__spreadValues({}, history), {
         state: newState
@@ -8303,7 +8100,7 @@ function PuckProvider({ children }) {
     overrides,
     plugins
   });
-  const generateAppStore = (0, import_react52.useCallback)(
+  const generateAppStore = (0, import_react54.useCallback)(
     (state) => {
       return {
         state,
@@ -8327,10 +8124,10 @@ function PuckProvider({ children }) {
       metadata
     ]
   );
-  const [appStore] = (0, import_react52.useState)(
+  const [appStore] = (0, import_react54.useState)(
     () => createAppStore(generateAppStore(initialAppState))
   );
-  (0, import_react52.useEffect)(() => {
+  (0, import_react54.useEffect)(() => {
     const state = appStore.getState().state;
     appStore.setState(__spreadValues({}, generateAppStore(state)));
   }, [config, plugins, loadedOverrides, viewports, iframe, onAction, metadata]);
@@ -8339,22 +8136,29 @@ function PuckProvider({ children }) {
     index: initialHistoryIndex,
     initialAppState
   });
-  (0, import_react52.useEffect)(() => {
-    appStore.subscribe((s) => {
-      if (onChange) onChange(s.state.data);
-    });
+  const previousData = (0, import_react54.useRef)(null);
+  (0, import_react54.useEffect)(() => {
+    appStore.subscribe(
+      (s) => s.state.data,
+      (data) => {
+        if (onChange) {
+          if ((0, import_fast_deep_equal2.default)(data, previousData.current)) return;
+          onChange(data);
+          previousData.current = data;
+        }
+      }
+    );
   }, []);
   useRegisterPermissionsSlice(appStore, permissions);
   const uPuckStore = useRegisterUsePuckStore(appStore);
-  (0, import_react52.useEffect)(() => {
+  (0, import_react54.useEffect)(() => {
     const { resolveAndCommitData } = appStore.getState();
     resolveAndCommitData();
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(appStoreContext.Provider, { value: appStore, children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(UsePuckStoreContext.Provider, { value: uPuckStore, children }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(appStoreContext.Provider, { value: appStore, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(UsePuckStoreContext.Provider, { value: uPuckStore, children }) });
 }
 function PuckLayout({ children }) {
   const {
-    onChange,
     onPublish,
     renderHeader,
     renderHeaderActions,
@@ -8373,18 +8177,13 @@ function PuckLayout({ children }) {
   const rightSideBarVisible = useAppStore(
     (s) => s.state.ui.rightSideBarVisible
   );
-  const [menuOpen, setMenuOpen] = (0, import_react52.useState)(false);
+  const [menuOpen, setMenuOpen] = (0, import_react54.useState)(false);
   const appStore = useAppStoreApi();
-  (0, import_react52.useEffect)(() => {
-    return appStore.subscribe((s) => {
-      if (onChange) onChange(s.state.data);
-    });
-  }, [appStore]);
   const rootProps = useAppStore(
     (s) => s.state.data.root.props || s.state.data.root.props
   );
   const dispatch = useAppStore((s) => s.dispatch);
-  const toggleSidebars = (0, import_react52.useCallback)(
+  const toggleSidebars = (0, import_react54.useCallback)(
     (sidebar) => {
       const widerViewport = window.matchMedia("(min-width: 638px)").matches;
       const sideBarVisible = sidebar === "left" ? leftSideBarVisible : rightSideBarVisible;
@@ -8398,7 +8197,7 @@ function PuckLayout({ children }) {
     },
     [dispatch, leftSideBarVisible, rightSideBarVisible]
   );
-  (0, import_react52.useEffect)(() => {
+  (0, import_react54.useEffect)(() => {
     if (!window.matchMedia("(min-width: 638px)").matches) {
       dispatch({
         type: "setUi",
@@ -8421,7 +8220,7 @@ function PuckLayout({ children }) {
       window.removeEventListener("resize", handleResize);
     };
   }, []);
-  const defaultHeaderRender = (0, import_react52.useMemo)(() => {
+  const defaultHeaderRender = (0, import_react54.useMemo)(() => {
     if (renderHeader) {
       console.warn(
         "`renderHeader` is deprecated. Please use `overrides.header` and the `usePuck` hook instead"
@@ -8430,13 +8229,13 @@ function PuckLayout({ children }) {
         var _b = _a, { actions } = _b, props = __objRest(_b, ["actions"]);
         const Comp = renderHeader;
         const appState = useAppStore((s) => s.state);
-        return /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState, children: actions }));
+        return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState, children: actions }));
       };
       return RenderHeader;
     }
     return DefaultOverride;
   }, [renderHeader]);
-  const defaultHeaderActionsRender = (0, import_react52.useMemo)(() => {
+  const defaultHeaderActionsRender = (0, import_react54.useMemo)(() => {
     if (renderHeaderActions) {
       console.warn(
         "`renderHeaderActions` is deprecated. Please use `overrides.headerActions` and the `usePuck` hook instead."
@@ -8444,32 +8243,32 @@ function PuckLayout({ children }) {
       const RenderHeader = (props) => {
         const Comp = renderHeaderActions;
         const appState = useAppStore((s) => s.state);
-        return /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState }));
+        return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState }));
       };
       return RenderHeader;
     }
     return DefaultOverride;
   }, [renderHeader]);
   const overrides = useAppStore((s) => s.overrides);
-  const CustomPuck = (0, import_react52.useMemo)(
+  const CustomPuck = (0, import_react54.useMemo)(
     () => overrides.puck || DefaultOverride,
     [overrides]
   );
-  const CustomHeader = (0, import_react52.useMemo)(
+  const CustomHeader = (0, import_react54.useMemo)(
     () => overrides.header || defaultHeaderRender,
     [overrides]
   );
-  const CustomHeaderActions = (0, import_react52.useMemo)(
+  const CustomHeaderActions = (0, import_react54.useMemo)(
     () => overrides.headerActions || defaultHeaderActionsRender,
     [overrides]
   );
-  const [mounted, setMounted] = (0, import_react52.useState)(false);
-  (0, import_react52.useEffect)(() => {
+  const [mounted, setMounted] = (0, import_react54.useState)(false);
+  (0, import_react54.useEffect)(() => {
     setMounted(true);
   }, []);
   const ready = useAppStore((s) => s.status === "READY");
   useMonitorHotkeys();
-  (0, import_react52.useEffect)(() => {
+  (0, import_react54.useEffect)(() => {
     if (ready && iframe.enabled) {
       const frameDoc = getFrame();
       if (frameDoc) {
@@ -8478,8 +8277,8 @@ function PuckLayout({ children }) {
     }
   }, [ready, iframe.enabled]);
   usePreviewModeHotkeys();
-  return /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: `Puck ${getClassName27()}`, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(DragDropContext, { disableAutoScroll: dnd == null ? void 0 : dnd.disableAutoScroll, children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(CustomPuck, { children: children || /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: `Puck ${getClassName27()}`, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(DragDropContext, { disableAutoScroll: dnd == null ? void 0 : dnd.disableAutoScroll, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(CustomPuck, { children: children || /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
       "div",
       {
         className: getLayoutClassName({
@@ -8488,61 +8287,61 @@ function PuckLayout({ children }) {
           mounted,
           rightSideBarVisible
         }),
-        children: /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: getLayoutClassName("inner"), children: [
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+        children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getLayoutClassName("inner"), children: [
+          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
             CustomHeader,
             {
-              actions: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(import_jsx_runtime39.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(CustomHeaderActions, { children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+              actions: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(import_jsx_runtime41.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(CustomHeaderActions, { children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
                 Button,
                 {
                   onClick: () => {
                     const data = appStore.getState().state.data;
                     onPublish && onPublish(data);
                   },
-                  icon: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Globe, { size: "14px" }),
+                  icon: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Globe, { size: "14px" }),
                   children: "Publish"
                 }
               ) }) }),
-              children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("header", { className: getLayoutClassName("header"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: getLayoutClassName("headerInner"), children: [
-                /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: getLayoutClassName("headerToggle"), children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+              children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("header", { className: getLayoutClassName("header"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getLayoutClassName("headerInner"), children: [
+                /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getLayoutClassName("headerToggle"), children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
                     "div",
                     {
                       className: getLayoutClassName("leftSideBarToggle"),
-                      children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+                      children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
                         IconButton,
                         {
                           onClick: () => {
                             toggleSidebars("left");
                           },
                           title: "Toggle left sidebar",
-                          children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(PanelLeft, { focusable: "false" })
+                          children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PanelLeft, { focusable: "false" })
                         }
                       )
                     }
                   ),
-                  /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+                  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
                     "div",
                     {
                       className: getLayoutClassName("rightSideBarToggle"),
-                      children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+                      children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
                         IconButton,
                         {
                           onClick: () => {
                             toggleSidebars("right");
                           },
                           title: "Toggle right sidebar",
-                          children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(PanelRight, { focusable: "false" })
+                          children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PanelRight, { focusable: "false" })
                         }
                       )
                     }
                   )
                 ] }),
-                /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: getLayoutClassName("headerTitle"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(Heading, { rank: "2", size: "xs", children: [
+                /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: getLayoutClassName("headerTitle"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Heading, { rank: "2", size: "xs", children: [
                   headerTitle || (rootProps == null ? void 0 : rootProps.title) || "Page",
-                  headerPath && /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(import_jsx_runtime39.Fragment, { children: [
+                  headerPath && /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(import_jsx_runtime41.Fragment, { children: [
                     " ",
-                    /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+                    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
                       "code",
                       {
                         className: getLayoutClassName("headerPath"),
@@ -8551,31 +8350,31 @@ function PuckLayout({ children }) {
                     )
                   ] })
                 ] }) }),
-                /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: getLayoutClassName("headerTools"), children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: getLayoutClassName("menuButton"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+                /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getLayoutClassName("headerTools"), children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: getLayoutClassName("menuButton"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
                     IconButton,
                     {
                       onClick: () => {
                         return setMenuOpen(!menuOpen);
                       },
                       title: "Toggle menu bar",
-                      children: menuOpen ? /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(ChevronUp, { focusable: "false" }) : /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(ChevronDown, { focusable: "false" })
+                      children: menuOpen ? /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(ChevronUp, { focusable: "false" }) : /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(ChevronDown, { focusable: "false" })
                     }
                   ) }),
-                  /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+                  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
                     MenuBar,
                     {
                       dispatch,
                       onPublish,
                       menuOpen,
-                      renderHeaderActions: () => /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(CustomHeaderActions, { children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+                      renderHeaderActions: () => /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(CustomHeaderActions, { children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
                         Button,
                         {
                           onClick: () => {
                             const data = appStore.getState().state.data;
                             onPublish && onPublish(data);
                           },
-                          icon: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Globe, { size: "14px" }),
+                          icon: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Globe, { size: "14px" }),
                           children: "Publish"
                         }
                       ) }),
@@ -8586,20 +8385,20 @@ function PuckLayout({ children }) {
               ] }) })
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: getLayoutClassName("leftSideBar"), children: [
-            /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(SidebarSection, { title: "Components", noBorderTop: true, children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Components, {}) }),
-            /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(SidebarSection, { title: "Outline", children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Outline, {}) })
+          /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getLayoutClassName("leftSideBar"), children: [
+            /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(SidebarSection, { title: "Components", noBorderTop: true, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Components, {}) }),
+            /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(SidebarSection, { title: "Outline", children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Outline, {}) })
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Canvas, {}),
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: getLayoutClassName("rightSideBar"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(FieldSideBar, {}) })
+          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Canvas, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: getLayoutClassName("rightSideBar"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(FieldSideBar, {}) })
         ] })
       }
     ) }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { id: "puck-portal-root", className: getClassName27("portal") })
+    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { id: "puck-portal-root", className: getClassName27("portal") })
   ] });
 }
 function Puck(props) {
-  return /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(PropsProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(PuckProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(PuckLayout, __spreadValues({}, props)) })) }));
+  return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PropsProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PuckProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PuckLayout, __spreadValues({}, props)) })) }));
 }
 Puck.Components = Components;
 Puck.Fields = Fields;
@@ -8631,9 +8430,9 @@ var migrations = [
     console.log("Migrating DropZones to slots...");
     const updatedItems = {};
     const appState = __spreadProps(__spreadValues({}, defaultAppState), { data });
-    const { indexes } = walkTree(appState, config);
+    const { indexes } = walkAppState(appState, config);
     const deletedCompounds = [];
-    walkTree(appState, config, (content, zoneCompound, zoneType) => {
+    walkAppState(appState, config, (content, zoneCompound, zoneType) => {
       var _a2, _b;
       if (zoneType === "dropzone") {
         const [id, slotName] = zoneCompound.split(":");
@@ -8652,7 +8451,7 @@ var migrations = [
       }
       return content;
     });
-    const updated = walkTree(
+    const updated = walkAppState(
       appState,
       config,
       (content) => content,
@@ -8806,13 +8605,13 @@ function resolveAllData(_0, _1) {
   Puck,
   Render,
   createUsePuck,
-  mapSlots,
   migrate,
   overrideKeys,
   renderContext,
   resolveAllData,
   transformProps,
-  usePuck
+  usePuck,
+  walkTree
 });
 /*! Bundled license information: