@measured/puck 0.19.0-canary.8d459e4e → 0.19.0-canary.8e1d7223

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) => {
@@ -181,6 +174,7 @@ __export(core_exports, {
   renderContext: () => renderContext,
   resolveAllData: () => resolveAllData,
   transformProps: () => transformProps,
+  useGetPuck: () => useGetPuck,
   usePuck: () => usePuck,
   walkTree: () => walkTree
 });
@@ -798,43 +792,6 @@ init_react_import();
 // lib/data/walk-app-state.ts
 init_react_import();
 
-// lib/data/for-each-slot.ts
-init_react_import();
-
-// lib/data/is-slot.ts
-init_react_import();
-var isSlot = (prop) => {
-  var _a, _b;
-  return Array.isArray(prop) && typeof ((_a = prop[0]) == null ? void 0 : _a.type) === "string" && typeof ((_b = prop[0]) == null ? void 0 : _b.props) === "object";
-};
-var createIsSlotConfig = (config) => (itemType, propName, propValue) => {
-  var _a, _b;
-  const configForComponent = itemType === "root" ? config == null ? void 0 : config.root : config == null ? void 0 : config.components[itemType];
-  if (!configForComponent) return isSlot(propValue);
-  return ((_b = (_a = configForComponent.fields) == null ? void 0 : _a[propName]) == null ? void 0 : _b.type) === "slot";
-};
-
-// lib/data/for-each-slot.ts
-var forEachSlot = (item, cb, recursive = false, isSlot2 = isSlot) => {
-  const props = 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];
-      cb(props.id, propKey, content);
-      if (recursive) {
-        content.forEach(
-          (childItem) => __async(void 0, null, function* () {
-            return forEachSlot(childItem, cb, true, isSlot2);
-          })
-        );
-      }
-    }
-  }
-};
-
 // lib/data/for-related-zones.ts
 init_react_import();
 
@@ -868,19 +825,160 @@ function forRelatedZones(item, data, cb, path = []) {
   });
 }
 
+// lib/data/map-slots.ts
+init_react_import();
+var isPromise = (v) => !!v && typeof v.then === "function";
+var flatten = (values) => values.reduce((acc, item) => __spreadValues(__spreadValues({}, acc), item), {});
+var containsPromise = (arr) => arr.some(isPromise);
+var walkField = ({
+  value,
+  fields,
+  map,
+  propKey = "",
+  propPath = "",
+  id = "",
+  config,
+  recurseSlots = false
+}) => {
+  var _a, _b, _c;
+  if (((_a = fields[propKey]) == null ? void 0 : _a.type) === "slot") {
+    const content = value || [];
+    const mappedContent = recurseSlots ? content.map((el) => {
+      var _a2;
+      const componentConfig = config.components[el.type];
+      if (!componentConfig) {
+        throw new Error(`Could not find component config for ${el.type}`);
+      }
+      const fields2 = (_a2 = componentConfig.fields) != null ? _a2 : {};
+      return walkField({
+        value: el,
+        fields: fields2,
+        map,
+        id: el.props.id,
+        config,
+        recurseSlots
+      });
+    }) : content;
+    if (containsPromise(mappedContent)) {
+      return Promise.all(mappedContent);
+    }
+    return map(mappedContent, id, propPath, fields[propKey], propPath);
+  }
+  if (value && typeof value === "object") {
+    if (Array.isArray(value)) {
+      const arrayFields = ((_b = fields[propKey]) == null ? void 0 : _b.type) === "array" ? fields[propKey].arrayFields : null;
+      if (!arrayFields) return value;
+      const newValue = value.map(
+        (el, idx) => walkField({
+          value: el,
+          fields: arrayFields,
+          map,
+          propKey,
+          propPath: `${propPath}[${idx}]`,
+          id,
+          config,
+          recurseSlots
+        })
+      );
+      if (containsPromise(newValue)) {
+        return Promise.all(newValue);
+      }
+      return newValue;
+    } else if ("$$typeof" in value) {
+      return value;
+    } else {
+      const objectFields = ((_c = fields[propKey]) == null ? void 0 : _c.type) === "object" ? fields[propKey].objectFields : fields;
+      return walkObject({
+        value,
+        fields: objectFields,
+        map,
+        id,
+        getPropPath: (k) => `${propPath}.${k}`,
+        config,
+        recurseSlots
+      });
+    }
+  }
+  return value;
+};
+var walkObject = ({
+  value,
+  fields,
+  map,
+  id,
+  getPropPath,
+  config,
+  recurseSlots
+}) => {
+  const newProps = Object.entries(value).map(([k, v]) => {
+    const opts = {
+      value: v,
+      fields,
+      map,
+      propKey: k,
+      propPath: getPropPath(k),
+      id,
+      config,
+      recurseSlots
+    };
+    const newValue = walkField(opts);
+    if (isPromise(newValue)) {
+      return newValue.then((resolvedValue) => ({
+        [k]: resolvedValue
+      }));
+    }
+    return {
+      [k]: newValue
+    };
+  }, {});
+  if (containsPromise(newProps)) {
+    return Promise.all(newProps).then(flatten);
+  }
+  return flatten(newProps);
+};
+function mapSlots(item, map, config, recurseSlots = false) {
+  var _a, _b, _c, _d;
+  const itemType = "type" in item ? item.type : "root";
+  const componentConfig = itemType === "root" ? config.root : (_a = config.components) == null ? void 0 : _a[itemType];
+  const newProps = walkObject({
+    value: (_b = item.props) != null ? _b : {},
+    fields: (_c = componentConfig == null ? void 0 : componentConfig.fields) != null ? _c : {},
+    map,
+    id: item.props ? (_d = item.props.id) != null ? _d : "root" : "root",
+    getPropPath: (k) => k,
+    config,
+    recurseSlots
+  });
+  if (isPromise(newProps)) {
+    return newProps.then((resolvedProps) => __spreadProps(__spreadValues({}, item), {
+      props: resolvedProps
+    }));
+  }
+  return __spreadProps(__spreadValues({}, item), {
+    props: newProps
+  });
+}
+
+// lib/data/flatten-node.ts
+init_react_import();
+var import_flat = require("flat");
+
 // lib/data/strip-slots.ts
 init_react_import();
-var stripSlots = (data) => {
-  return __spreadProps(__spreadValues({}, data), {
-    props: Object.entries(data.props).reduce(
-      (acc, [propKey, propVal]) => {
-        if (isSlot(propVal)) {
-          return acc;
-        }
-        return __spreadProps(__spreadValues({}, acc), { [propKey]: propVal });
-      },
-      { id: data.props.id }
-    )
+var stripSlots = (data, config) => {
+  return mapSlots(data, () => null, config);
+};
+
+// lib/data/flatten-node.ts
+var flattenNode = (node, config) => {
+  return __spreadProps(__spreadValues({}, node), {
+    props: (0, import_flat.flatten)(stripSlots(node, config).props)
+  });
+};
+var expandNode = (node) => {
+  const props = (0, import_flat.unflatten)(node.props);
+  return __spreadProps(__spreadValues({}, node), {
+    props
   });
 };
 
@@ -926,10 +1024,9 @@ function walkAppState(state, config, mapContent = (content) => content, mapNodeO
     const mappedItem = mapNodeOrSkip(item, path, index);
     if (!mappedItem) return item;
     const id = mappedItem.props.id;
-    const newProps = __spreadValues({}, mappedItem.props);
-    forEachSlot(
+    const newProps = __spreadProps(__spreadValues({}, mapSlots(
       mappedItem,
-      (parentId2, slotId, content) => {
+      (content, parentId2, slotId) => {
         const zoneCompound = `${parentId2}:${slotId}`;
         const [_2, newContent2] = processContent(
           path,
@@ -938,18 +1035,19 @@ function walkAppState(state, config, mapContent = (content) => content, mapNodeO
           "slot",
           parentId2
         );
-        newProps[slotId] = newContent2;
+        return newContent2;
       },
-      false,
-      createIsSlotConfig(config)
-    );
+      config
+    ).props), {
+      id
+    });
     processRelatedZones(item, id, path);
     const newItem = __spreadProps(__spreadValues({}, item), { props: newProps });
     const thisZoneCompound = path[path.length - 1];
     const [parentId, zone] = thisZoneCompound ? thisZoneCompound.split(":") : [null, ""];
     newNodeIndex[id] = {
       data: newItem,
-      flatData: stripSlots(newItem),
+      flatData: flattenNode(newItem, config),
       path,
       parentId,
       zone
@@ -1047,15 +1145,74 @@ 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();
+function walkTree(data, config, callbackFn) {
+  var _a, _b;
+  const walkItem = (item) => {
+    return mapSlots(
+      item,
+      (content, parentId, propName) => {
+        var _a2;
+        return (_a2 = callbackFn(content, { parentId, propName })) != null ? _a2 : content;
+      },
+      config,
+      true
+    );
+  };
+  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({}, 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 walkAppState(
@@ -1096,25 +1253,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.`
     );
   }
+  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;
@@ -1733,7 +1891,11 @@ var createNodesSlice = (set, get) => ({
     const s = get().nodes;
     const emptyNode = {
       id,
-      methods: { sync: () => null },
+      methods: {
+        sync: () => null,
+        hideOverlay: () => null,
+        showOverlay: () => null
+      },
       element: null
     };
     const existingNode = s.nodes[id];
@@ -1784,12 +1946,13 @@ var flattenData = (state, config) => {
 
 // lib/get-changed.ts
 init_react_import();
+var import_fast_deep_equal = __toESM(require("fast-deep-equal"));
 var getChanged = (newItem, oldItem) => {
   return newItem ? Object.keys(newItem.props || {}).reduce((acc, item) => {
     const newItemProps = (newItem == null ? void 0 : newItem.props) || {};
     const oldItemProps = (oldItem == null ? void 0 : oldItem.props) || {};
     return __spreadProps(__spreadValues({}, acc), {
-      [item]: oldItemProps[item] !== newItemProps[item]
+      [item]: !(0, import_fast_deep_equal.default)(oldItemProps[item], newItemProps[item])
     });
   }, {}) : {};
 };
@@ -1935,7 +2098,8 @@ var createFieldsSlice = (_set, _get) => {
   return {
     fields: {},
     loading: false,
-    lastResolvedData: {}
+    lastResolvedData: {},
+    id: void 0
   };
 };
 var useRegisterFieldsSlice = (appStore, id) => {
@@ -1956,7 +2120,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 +2148,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,56 +2171,16 @@ 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) {
-  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/resolve-component-data.ts
-var import_fast_deep_equal = __toESM(require("fast-deep-equal"));
+var import_fast_deep_equal2 = __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) {
+var resolveComponentData = (_0, _1, ..._2) => __async(void 0, [_0, _1, ..._2], function* (item, config, metadata = {}, onResolveStart, onResolveEnd, trigger = "replace") {
   const configForItem = "type" in item && item.type !== "root" ? config.components[item.type] : config.root;
-  if ((configForItem == null ? void 0 : configForItem.resolveData) && item.props) {
-    const id = "id" in item.props ? item.props.id : "root";
+  const resolvedItem = __spreadValues({}, item);
+  const shouldRunResolver = (configForItem == null ? void 0 : configForItem.resolveData) && item.props;
+  const id = "id" in item.props ? item.props.id : "root";
+  if (shouldRunResolver) {
     const { item: oldItem = null, resolved = {} } = cache.lastChange[id] || {};
-    if (item && (0, import_fast_deep_equal.default)(item, oldItem)) {
+    if (item && (0, import_fast_deep_equal2.default)(item, oldItem)) {
       return { node: resolved, didChange: false };
     }
     const changed = getChanged(item, oldItem);
@@ -2068,46 +2193,42 @@ var resolveComponentData = (_0, _1, ..._2) => __async(void 0, [_0, _1, ..._2], f
       metadata: __spreadValues(__spreadValues({}, metadata), configForItem.metadata),
       trigger
     });
-    let resolvedItem = __spreadProps(__spreadValues({}, item), {
-      props: __spreadValues(__spreadValues({}, item.props), resolvedProps)
-    });
-    if (recursive) {
-      resolvedItem = yield mapSlotsAsync(
-        resolvedItem,
-        (content) => __async(void 0, null, function* () {
-          return Promise.all(
-            content.map(
-              (childItem) => __async(void 0, null, function* () {
-                return (yield resolveComponentData(
-                  childItem,
-                  config,
-                  metadata,
-                  onResolveStart,
-                  onResolveEnd,
-                  trigger,
-                  false
-                )).node;
-              })
-            )
-          );
-        }),
-        false,
-        createIsSlotConfig(config)
-      );
-    }
+    resolvedItem.props = __spreadValues(__spreadValues({}, item.props), resolvedProps);
     if (Object.keys(readOnly).length) {
       resolvedItem.readOnly = readOnly;
     }
-    cache.lastChange[id] = {
-      item,
-      resolved: resolvedItem
-    };
-    if (onResolveEnd) {
-      onResolveEnd(resolvedItem);
-    }
-    return { node: resolvedItem, didChange: !(0, import_fast_deep_equal.default)(item, resolvedItem) };
   }
-  return { node: item, didChange: false };
+  let itemWithResolvedChildren = yield mapSlots(
+    resolvedItem,
+    (content) => __async(void 0, null, function* () {
+      return yield Promise.all(
+        content.map(
+          (childItem) => __async(void 0, null, function* () {
+            return (yield resolveComponentData(
+              childItem,
+              config,
+              metadata,
+              onResolveStart,
+              onResolveEnd,
+              trigger
+            )).node;
+          })
+        )
+      );
+    }),
+    config
+  );
+  if (shouldRunResolver && onResolveEnd) {
+    onResolveEnd(resolvedItem);
+  }
+  cache.lastChange[id] = {
+    item,
+    resolved: itemWithResolvedChildren
+  };
+  return {
+    node: itemWithResolvedChildren,
+    didChange: !(0, import_fast_deep_equal2.default)(item, itemWithResolvedChildren)
+  };
 });
 
 // lib/data/to-root.ts
@@ -2127,7 +2248,8 @@ var toRoot = (item) => {
   return { props: {}, readOnly };
 };
 
-// store/index.ts
+// store/default-app-state.ts
+init_react_import();
 var defaultAppState = {
   data: { content: [], root: {}, zones: {} },
   ui: {
@@ -2153,6 +2275,8 @@ var defaultAppState = {
     zones: {}
   }
 };
+
+// store/index.ts
 var defaultPageFields = {
   title: { type: "text" }
 };
@@ -2341,383 +2465,80 @@ function useAppStoreApi() {
 init_react_import();
 var import_react12 = require("@dnd-kit/react");
 
-// lib/dnd/dnd-kit/safe.ts
+// lib/dnd/use-sensors.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);
-}
+var import_react10 = require("react");
+var import_react11 = require("@dnd-kit/react");
+var import_utilities = require("@dnd-kit/dom/utilities");
+var useSensors = ({
+  other,
+  mouse,
+  touch
+} = {
+  touch: { delay: { value: 200, tolerance: 10 } },
+  other: { delay: { value: 200, tolerance: 10 }, distance: { value: 5 } }
+}) => {
+  const [sensors] = (0, import_react10.useState)(() => [
+    import_react11.PointerSensor.configure({
+      activationConstraints(event, source) {
+        var _a;
+        const { pointerType, target } = event;
+        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") {
+          return touch;
+        }
+        return other;
+      }
+    })
+  ]);
+  return sensors;
+};
 
-// lib/dnd/use-sensors.ts
+// lib/dnd/collision/dynamic/index.ts
 init_react_import();
-var import_react11 = require("react");
+var import_abstract8 = require("@dnd-kit/abstract");
 
-// lib/dnd/PointerSensor.ts
+// lib/dnd/collision/directional/index.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_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);
-        };
-      }
+
+// lib/dnd/collision/collision-debug.ts
+init_react_import();
+var DEBUG = false;
+var debugElements = {};
+var timeout;
+var collisionDebug = (a, b, id, color, label) => {
+  if (!DEBUG) return;
+  const debugId = `${id}-debug`;
+  clearTimeout(timeout);
+  timeout = setTimeout(() => {
+    Object.entries(debugElements).forEach(([id2, { svg }]) => {
+      svg.remove();
+      delete debugElements[id2];
     });
-    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,
-  touch
-} = {
-  touch: { delay: { value: 200, tolerance: 10 } },
-  other: { delay: { value: 200, tolerance: 10 }, distance: { value: 5 } }
-}) => {
-  const [sensors] = (0, import_react11.useState)(() => [
-    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)))) {
-          return mouse;
-        }
-        if (pointerType === "touch") {
-          return touch;
-        }
-        return other;
-      }
-    })
-  ]);
-  return sensors;
-};
-
-// lib/dnd/collision/dynamic/index.ts
-init_react_import();
-var import_abstract9 = require("@dnd-kit/abstract");
-
-// lib/dnd/collision/directional/index.ts
-init_react_import();
-var import_abstract2 = require("@dnd-kit/abstract");
-
-// lib/dnd/collision/collision-debug.ts
-init_react_import();
-var DEBUG = false;
-var debugElements = {};
-var timeout;
-var collisionDebug = (a, b, id, color, label) => {
-  if (!DEBUG) return;
-  const debugId = `${id}-debug`;
-  clearTimeout(timeout);
-  timeout = setTimeout(() => {
-    Object.entries(debugElements).forEach(([id2, { svg }]) => {
-      svg.remove();
-      delete debugElements[id2];
-    });
-  }, 1e3);
-  requestAnimationFrame(() => {
-    var _a, _b;
-    const existingEl = debugElements[debugId];
-    let line = (_a = debugElements[debugId]) == null ? void 0 : _a.line;
-    let text = (_b = debugElements[debugId]) == null ? void 0 : _b.text;
-    if (!existingEl) {
-      const svgNs = "http://www.w3.org/2000/svg";
-      const svg = document.createElementNS(svgNs, "svg");
-      line = document.createElementNS(svgNs, "line");
-      text = document.createElementNS(svgNs, "text");
-      svg.setAttribute("id", debugId);
-      svg.setAttribute(
-        "style",
-        "position: fixed; height: 100%; width: 100%; pointer-events: none; top: 0px; left: 0px;"
-      );
-      svg.appendChild(line);
-      svg.appendChild(text);
-      text.setAttribute("fill", `black`);
-      document.body.appendChild(svg);
-      debugElements[debugId] = { svg, line, text };
+  }, 1e3);
+  requestAnimationFrame(() => {
+    var _a, _b;
+    const existingEl = debugElements[debugId];
+    let line = (_a = debugElements[debugId]) == null ? void 0 : _a.line;
+    let text = (_b = debugElements[debugId]) == null ? void 0 : _b.text;
+    if (!existingEl) {
+      const svgNs = "http://www.w3.org/2000/svg";
+      const svg = document.createElementNS(svgNs, "svg");
+      line = document.createElementNS(svgNs, "line");
+      text = document.createElementNS(svgNs, "text");
+      svg.setAttribute("id", debugId);
+      svg.setAttribute(
+        "style",
+        "position: fixed; height: 100%; width: 100%; pointer-events: none; top: 0px; left: 0px;"
+      );
+      svg.appendChild(line);
+      svg.appendChild(text);
+      text.setAttribute("fill", `black`);
+      document.body.appendChild(svg);
+      debugElements[debugId] = { svg, line, text };
     }
     line.setAttribute("x1", a.x.toString());
     line.setAttribute("x2", b.x.toString());
@@ -2759,7 +2580,7 @@ var directionalCollision = (input, previous) => {
     return {
       id: droppable.id,
       value: 1,
-      type: import_abstract2.CollisionType.Collision
+      type: import_abstract.CollisionType.Collision
     };
   }
   return null;
@@ -2801,7 +2622,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 },
@@ -2817,13 +2638,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");
@@ -2834,8 +2657,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
@@ -2849,12 +2670,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;
@@ -2865,31 +2686,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
@@ -2898,8 +2703,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
   };
 };
 
@@ -2924,12 +2729,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;
@@ -2944,7 +2744,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
       });
     }
   }
@@ -2961,12 +2762,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;
@@ -2978,9 +2779,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,
@@ -2991,7 +2790,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(
@@ -3001,16 +2801,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,
@@ -3030,16 +2833,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;
           }
@@ -3070,9 +2873,10 @@ var Sortable = ({
 }) => {
   const {
     ref: sortableRef,
-    status,
+    isDragging,
+    isDropping,
     handleRef
-  } = useSortableSafe({
+  } = (0, import_sortable.useSortable)({
     id,
     type,
     index,
@@ -3080,7 +2884,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
@@ -3205,12 +3009,25 @@ 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
   );
   const forceReadOnly = !canEdit;
   const valueRef = (0, import_react14.useRef)(value);
+  const uniqifyItem = (0, import_react14.useCallback)(
+    (val) => {
+      if (field.type !== "array" || !field.arrayFields) return;
+      const config = appStore.getState().config;
+      return walkField({
+        value: val,
+        fields: field.arrayFields,
+        map: (content) => content.map((item) => populateIds(item, config, true)),
+        config
+      });
+    },
+    [appStore, field]
+  );
   if (field.type !== "array" || !field.arrayFields) {
     return null;
   }
@@ -3270,13 +3087,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: [
@@ -3315,11 +3132,10 @@ var ArrayField = ({
                                           onClick: (e) => {
                                             e.stopPropagation();
                                             const existingValue = [...value || []];
-                                            existingValue.splice(
-                                              i,
-                                              0,
+                                            const newItem = uniqifyItem(
                                               existingValue[i]
                                             );
+                                            existingValue.splice(i, 0, newItem);
                                             const newUi = mapArrayStateToUi(
                                               regenerateArrayState(existingValue)
                                             );
@@ -3417,12 +3233,11 @@ var ArrayField = ({
                     type: "button",
                     className: getClassName5("addButton"),
                     onClick: () => {
-                      if (isDragging) return;
+                      var _a;
+                      if (isDraggingAny) return;
                       const existingValue = value || [];
-                      const newValue = [
-                        ...existingValue,
-                        field.defaultItemProps || {}
-                      ];
+                      const newItem = uniqifyItem((_a = field.defaultItemProps) != null ? _a : {});
+                      const newValue = [...existingValue, newItem];
                       const newArrayState = regenerateArrayState(newValue);
                       setUi(mapArrayStateToUi(newArrayState), false);
                       onChange(newValue);
@@ -4316,6 +4131,10 @@ function AutoFieldInternal(props) {
       });
     }
   }, []);
+  const { visible = true } = props.field;
+  if (!visible) {
+    return null;
+  }
   if (field.type === "slot") {
     return null;
   }
@@ -4400,24 +4219,24 @@ 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_react39 = require("react");
 
 // components/DragDropContext/index.tsx
 init_react_import();
-var import_react35 = require("@dnd-kit/react");
-var import_react36 = require("react");
+var import_react37 = require("@dnd-kit/react");
+var import_react38 = require("react");
 var import_dom = require("@dnd-kit/dom");
 
 // components/DropZone/index.tsx
 init_react_import();
-var import_react34 = require("react");
+var import_react35 = require("react");
 
 // components/DraggableComponent/index.tsx
 init_react_import();
-var import_react25 = require("react");
+var import_react26 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/DraggableComponent/styles.module.css#css-module
 init_react_import();
@@ -4458,7 +4277,9 @@ var ZoneStoreContext = (0, import_react23.createContext)(
     areaDepthIndex: {},
     nextAreaDepthIndex: {},
     draggedItem: null,
-    previewIndex: {}
+    previewIndex: {},
+    enabledIndex: {},
+    hoveringComponent: null
   }))
 );
 var ZoneStoreProvider = ({
@@ -4471,7 +4292,6 @@ var DropZoneProvider = ({
   children,
   value
 }) => {
-  const [hoveringComponent, setHoveringComponent] = (0, import_react23.useState)();
   const dispatch = useAppStore((s) => s.dispatch);
   const registerZone = (0, import_react23.useCallback)(
     (zoneCompound) => {
@@ -4493,16 +4313,33 @@ var DropZoneProvider = ({
   );
   const memoValue = (0, import_react23.useMemo)(
     () => __spreadValues({
-      hoveringComponent,
-      setHoveringComponent,
       registerZone,
       unregisterZone
     }, value),
-    [value, hoveringComponent]
+    [value]
   );
   return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(import_jsx_runtime19.Fragment, { children: memoValue && /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(dropZoneContext.Provider, { value: memoValue, children }) });
 };
 
+// components/DraggableComponent/index.tsx
+var import_shallow2 = require("zustand/react/shallow");
+var import_sortable2 = require("@dnd-kit/react/sortable");
+
+// lib/accumulate-transform.ts
+init_react_import();
+function accumulateTransform(el) {
+  let matrix = new DOMMatrixReadOnly();
+  let n = el.parentElement;
+  while (n && n !== document.documentElement) {
+    const t = getComputedStyle(n).transform;
+    if (t && t !== "none") {
+      matrix = new DOMMatrixReadOnly(t).multiply(matrix);
+    }
+    n = n.parentElement;
+  }
+  return { scaleX: matrix.a, scaleY: matrix.d };
+}
+
 // lib/use-context-store.ts
 init_react_import();
 var import_react24 = require("react");
@@ -4516,8 +4353,39 @@ function useContextStore(context, selector) {
   return (0, import_zustand4.useStore)(store, (0, import_shallow.useShallow)(selector));
 }
 
+// lib/dnd/use-on-drag-finished.ts
+init_react_import();
+var import_react25 = require("react");
+var useOnDragFinished = (cb, deps = []) => {
+  const appStore = useAppStoreApi();
+  return (0, import_react25.useCallback)(() => {
+    let dispose = () => {
+    };
+    const processDragging = (isDragging2) => {
+      if (isDragging2) {
+        cb(false);
+      } else {
+        setTimeout(() => {
+          cb(true);
+        }, 0);
+        if (dispose) dispose();
+      }
+    };
+    const isDragging = appStore.getState().state.ui.isDragging;
+    processDragging(isDragging);
+    if (isDragging) {
+      dispose = appStore.subscribe(
+        (s) => s.state.ui.isDragging,
+        (isDragging2) => {
+          processDragging(isDragging2);
+        }
+      );
+    }
+    return dispose;
+  }, [appStore, ...deps]);
+};
+
 // components/DraggableComponent/index.tsx
-var import_shallow2 = require("zustand/react/shallow");
 var import_jsx_runtime20 = require("react/jsx-runtime");
 var getClassName16 = get_class_name_factory_default("DraggableComponent", styles_module_default11);
 var DEBUG2 = false;
@@ -4547,7 +4415,6 @@ var DraggableComponent = ({
   isSelected = false,
   debug,
   label,
-  isEnabled,
   autoDragAxis,
   userDragAxis,
   inDroppableZone = true
@@ -4561,9 +4428,9 @@ var DraggableComponent = ({
   const overrides = useAppStore((s) => s.overrides);
   const dispatch = useAppStore((s) => s.dispatch);
   const iframe = useAppStore((s) => s.iframe);
-  const ctx = (0, import_react25.useContext)(dropZoneContext);
-  const [localZones, setLocalZones] = (0, import_react25.useState)({});
-  const registerLocalZone = (0, import_react25.useCallback)(
+  const ctx = (0, import_react26.useContext)(dropZoneContext);
+  const [localZones, setLocalZones] = (0, import_react26.useState)({});
+  const registerLocalZone = (0, import_react26.useCallback)(
     (zoneCompound2, active) => {
       var _a;
       (_a = ctx == null ? void 0 : ctx.registerLocalZone) == null ? void 0 : _a.call(ctx, zoneCompound2, active);
@@ -4573,7 +4440,7 @@ var DraggableComponent = ({
     },
     [setLocalZones]
   );
-  const unregisterLocalZone = (0, import_react25.useCallback)(
+  const unregisterLocalZone = (0, import_react26.useCallback)(
     (zoneCompound2) => {
       var _a;
       (_a = ctx == null ? void 0 : ctx.unregisterLocalZone) == null ? void 0 : _a.call(ctx, zoneCompound2);
@@ -4596,14 +4463,17 @@ var DraggableComponent = ({
       return s.permissions.getPermissions({ item });
     })
   );
-  const userIsDragging = useContextStore(
-    ZoneStoreContext,
-    (s) => !!s.draggedItem
+  const zoneStore = (0, import_react26.useContext)(ZoneStoreContext);
+  const [dragAxis, setDragAxis] = (0, import_react26.useState)(userDragAxis || autoDragAxis);
+  const dynamicCollisionDetector = (0, import_react26.useMemo)(
+    () => createDynamicCollisionDetector(dragAxis),
+    [dragAxis]
   );
-  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,
+    sortable
+  } = (0, import_sortable2.useSortable)({
     id,
     index,
     group: zoneCompound,
@@ -4618,18 +4488,34 @@ var DraggableComponent = ({
       path: path || [],
       inDroppableZone
     },
-    collisionPriority: isEnabled ? depth : 0,
-    collisionDetector: createDynamicCollisionDetector(dragAxis),
-    disabled,
+    collisionPriority: depth,
+    collisionDetector: dynamicCollisionDetector,
     // "Out of the way" transition from react-beautiful-dnd
     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)(
+  (0, import_react26.useEffect)(() => {
+    const isEnabled = zoneStore.getState().enabledIndex[zoneCompound];
+    sortable.droppable.disabled = !isEnabled;
+    sortable.draggable.disabled = !permissions.drag;
+    const cleanup = zoneStore.subscribe((s) => {
+      sortable.droppable.disabled = !s.enabledIndex[zoneCompound];
+    });
+    if (ref.current && !permissions.drag) {
+      ref.current.setAttribute("data-puck-disabled", "");
+      return () => {
+        var _a;
+        (_a = ref.current) == null ? void 0 : _a.removeAttribute("data-puck-disabled");
+        cleanup();
+      };
+    }
+    return cleanup;
+  }, [permissions.drag, zoneCompound]);
+  const ref = (0, import_react26.useRef)(null);
+  const refSetter = (0, import_react26.useCallback)(
     (el) => {
       sortableRef(el);
       if (el) {
@@ -4638,14 +4524,14 @@ var DraggableComponent = ({
     },
     [sortableRef]
   );
-  const [portalEl, setPortalEl] = (0, import_react25.useState)();
-  (0, import_react25.useEffect)(() => {
+  const [portalEl, setPortalEl] = (0, import_react26.useState)();
+  (0, import_react26.useEffect)(() => {
     var _a, _b, _c;
     setPortalEl(
       iframe.enabled ? (_a = ref.current) == null ? void 0 : _a.ownerDocument.body : (_c = (_b = ref.current) == null ? void 0 : _b.closest("[data-puck-preview]")) != null ? _c : document.body
     );
   }, [iframe.enabled, ref.current]);
-  const getStyle = (0, import_react25.useCallback)(() => {
+  const getStyle = (0, import_react26.useCallback)(() => {
     var _a, _b, _c;
     if (!ref.current) return;
     const rect = ref.current.getBoundingClientRect();
@@ -4657,40 +4543,61 @@ var DraggableComponent = ({
       x: deepScrollPosition.x - portalScroll.x - ((_b = portalContainerRect == null ? void 0 : portalContainerRect.left) != null ? _b : 0),
       y: deepScrollPosition.y - portalScroll.y - ((_c = portalContainerRect == null ? void 0 : portalContainerRect.top) != null ? _c : 0)
     };
+    const untransformed = {
+      height: ref.current.offsetHeight,
+      width: ref.current.offsetWidth
+    };
+    const transform = accumulateTransform(ref.current);
     const style2 = {
-      left: `${rect.left + scroll.x}px`,
-      top: `${rect.top + scroll.y}px`,
-      height: `${rect.height}px`,
-      width: `${rect.width}px`
+      left: `${(rect.left + scroll.x) / transform.scaleX}px`,
+      top: `${(rect.top + scroll.y) / transform.scaleY}px`,
+      height: `${untransformed.height}px`,
+      width: `${untransformed.width}px`
     };
     return style2;
   }, [ref.current]);
-  const [style, setStyle] = (0, import_react25.useState)();
-  const sync = (0, import_react25.useCallback)(() => {
+  const [style, setStyle] = (0, import_react26.useState)();
+  const sync = (0, import_react26.useCallback)(() => {
     setStyle(getStyle());
   }, [ref.current, iframe]);
-  (0, import_react25.useEffect)(() => {
-    if (ref.current && !userIsDragging) {
+  (0, import_react26.useEffect)(() => {
+    if (ref.current) {
       const observer = new ResizeObserver(sync);
       observer.observe(ref.current);
       return () => {
         observer.disconnect();
       };
     }
-  }, [ref.current, userIsDragging]);
+  }, [ref.current]);
   const registerNode = useAppStore((s) => s.nodes.registerNode);
-  (0, import_react25.useEffect)(() => {
+  const hideOverlay = (0, import_react26.useCallback)(() => {
+    setIsVisible(false);
+  }, []);
+  const showOverlay = (0, import_react26.useCallback)(() => {
+    setIsVisible(true);
+  }, []);
+  (0, import_react26.useEffect)(() => {
     var _a;
-    registerNode(id, { methods: { sync }, element: (_a = ref.current) != null ? _a : null });
+    registerNode(id, {
+      methods: { sync, showOverlay, hideOverlay },
+      element: (_a = ref.current) != null ? _a : null
+    });
     return () => {
-      registerNode(id, { methods: { sync: () => null }, element: null });
+      registerNode(id, {
+        methods: {
+          sync: () => null,
+          hideOverlay: () => null,
+          showOverlay: () => null
+        },
+        element: null
+      });
     };
   }, [id, zoneCompound, index, componentType, sync]);
-  const CustomActionBar = (0, import_react25.useMemo)(
+  const CustomActionBar = (0, import_react26.useMemo)(
     () => overrides.actionBar || DefaultActionBar,
     [overrides.actionBar]
   );
-  const onClick = (0, import_react25.useCallback)(
+  const onClick = (0, import_react26.useCallback)(
     (e) => {
       e.stopPropagation();
       dispatch({
@@ -4703,7 +4610,7 @@ var DraggableComponent = ({
     [index, zoneCompound, id]
   );
   const appStore = useAppStoreApi();
-  const onSelectParent = (0, import_react25.useCallback)(() => {
+  const onSelectParent = (0, import_react26.useCallback)(() => {
     const { nodes, zones } = appStore.getState().state.indexes;
     const node = nodes[id];
     const parentNode = (node == null ? void 0 : node.parentId) ? nodes[node == null ? void 0 : node.parentId] : null;
@@ -4724,28 +4631,32 @@ var DraggableComponent = ({
       }
     });
   }, [ctx, path]);
-  const onDuplicate = (0, import_react25.useCallback)(() => {
+  const onDuplicate = (0, import_react26.useCallback)(() => {
     dispatch({
       type: "duplicate",
       sourceIndex: index,
       sourceZone: zoneCompound
     });
   }, [index, zoneCompound]);
-  const onDelete = (0, import_react25.useCallback)(() => {
+  const onDelete = (0, import_react26.useCallback)(() => {
     dispatch({
       type: "remove",
       index,
       zone: zoneCompound
     });
   }, [index, zoneCompound]);
-  const [hover, setHover] = (0, import_react25.useState)(false);
-  const indicativeHover = (ctx == null ? void 0 : ctx.hoveringComponent) === id;
-  (0, import_react25.useEffect)(() => {
+  const [hover, setHover] = (0, import_react26.useState)(false);
+  const indicativeHover = useContextStore(
+    ZoneStoreContext,
+    (s) => s.hoveringComponent === id
+  );
+  (0, import_react26.useEffect)(() => {
     if (!ref.current) {
       return;
     }
     const el = ref.current;
     const _onMouseOver = (e) => {
+      const userIsDragging = !!zoneStore.getState().draggedItem;
       if (userIsDragging) {
         if (thisIsDragging) {
           setHover(true);
@@ -4767,18 +4678,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,
@@ -4786,29 +4691,43 @@ var DraggableComponent = ({
     containsActiveZone,
     zoneCompound,
     id,
-    userIsDragging,
     thisIsDragging,
     inDroppableZone
   ]);
-  (0, import_react25.useEffect)(() => {
-    if (ref.current && disabled) {
-      ref.current.setAttribute("data-puck-disabled", "");
-      return () => {
-        var _a;
-        (_a = ref.current) == null ? void 0 : _a.removeAttribute("data-puck-disabled");
-      };
-    }
-  }, [disabled, ref]);
-  const [isVisible, setIsVisible] = (0, import_react25.useState)(false);
-  (0, import_react25.useEffect)(() => {
-    sync();
-    if ((isSelected || hover || indicativeHover) && !userIsDragging) {
-      setIsVisible(true);
+  const [isVisible, setIsVisible] = (0, import_react26.useState)(false);
+  const [dragFinished, setDragFinished] = (0, import_react26.useState)(true);
+  const [_, startTransition] = (0, import_react26.useTransition)();
+  (0, import_react26.useEffect)(() => {
+    startTransition(() => {
+      if (hover || indicativeHover || isSelected) {
+        sync();
+        setIsVisible(true);
+        setThisWasDragging(false);
+      } else {
+        setIsVisible(false);
+      }
+    });
+  }, [hover, indicativeHover, isSelected, iframe]);
+  const [thisWasDragging, setThisWasDragging] = (0, import_react26.useState)(false);
+  const onDragFinished = useOnDragFinished((finished) => {
+    if (finished) {
+      startTransition(() => {
+        sync();
+        setDragFinished(true);
+      });
     } else {
-      setIsVisible(false);
+      setDragFinished(false);
+    }
+  });
+  (0, import_react26.useEffect)(() => {
+    if (thisIsDragging) {
+      setThisWasDragging(true);
     }
-  }, [isSelected, hover, indicativeHover, iframe, userIsDragging]);
-  const syncActionsPosition = (0, import_react25.useCallback)(
+  }, [thisIsDragging]);
+  (0, import_react26.useEffect)(() => {
+    if (thisWasDragging) return onDragFinished();
+  }, [thisWasDragging, onDragFinished]);
+  const syncActionsPosition = (0, import_react26.useCallback)(
     (el) => {
       if (el) {
         const view = el.ownerDocument.defaultView;
@@ -4833,7 +4752,7 @@ var DraggableComponent = ({
     },
     [zoom]
   );
-  (0, import_react25.useEffect)(() => {
+  (0, import_react26.useEffect)(() => {
     if (userDragAxis) {
       setDragAxis(userDragAxis);
       return;
@@ -4847,8 +4766,11 @@ var DraggableComponent = ({
     }
     setDragAxis(autoDragAxis);
   }, [ref, userDragAxis, autoDragAxis]);
-  const parentAction = (ctx == null ? void 0 : ctx.areaId) && (ctx == null ? void 0 : ctx.areaId) !== "root" && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(ActionBar.Action, { onClick: onSelectParent, label: "Select parent", children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(CornerLeftUp, { size: 16 }) });
-  const nextContextValue = (0, import_react25.useMemo)(
+  const parentAction = (0, import_react26.useMemo)(
+    () => (ctx == null ? void 0 : ctx.areaId) && (ctx == null ? void 0 : ctx.areaId) !== "root" && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(ActionBar.Action, { onClick: onSelectParent, label: "Select parent", children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(CornerLeftUp, { size: 16 }) }),
+    [ctx == null ? void 0 : ctx.areaId]
+  );
+  const nextContextValue = (0, import_react26.useMemo)(
     () => __spreadProps(__spreadValues({}, ctx), {
       areaId: id,
       zoneCompound,
@@ -4868,7 +4790,7 @@ var DraggableComponent = ({
     ]
   );
   return /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(DropZoneProvider, { value: nextContextValue, children: [
-    isVisible && (0, import_react_dom2.createPortal)(
+    dragFinished && isVisible && (0, import_react_dom2.createPortal)(
       /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(
         "div",
         {
@@ -4928,19 +4850,23 @@ var DraggableComponent = ({
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/DropZone/styles.module.css#css-module
 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" };
+var styles_module_default12 = { "DropZone": "_DropZone_1i2sv_1", "DropZone--hasChildren": "_DropZone--hasChildren_1i2sv_11", "DropZone--isAreaSelected": "_DropZone--isAreaSelected_1i2sv_24", "DropZone--hoveringOverArea": "_DropZone--hoveringOverArea_1i2sv_25", "DropZone--isRootZone": "_DropZone--isRootZone_1i2sv_25", "DropZone--isDestination": "_DropZone--isDestination_1i2sv_35", "DropZone-item": "_DropZone-item_1i2sv_47", "DropZone-hitbox": "_DropZone-hitbox_1i2sv_51", "DropZone--isEnabled": "_DropZone--isEnabled_1i2sv_59", "DropZone--isAnimating": "_DropZone--isAnimating_1i2sv_68" };
+
+// components/DropZone/index.tsx
+var import_react36 = require("@dnd-kit/react");
 
 // components/DropZone/lib/use-min-empty-height.ts
 init_react_import();
-var import_react26 = require("react");
+var import_react27 = require("react");
+var getNumItems = (appStore, zoneCompound) => appStore.getState().state.indexes.zones[zoneCompound].contentIds.length;
 var useMinEmptyHeight = ({
   zoneCompound,
   userMinEmptyHeight,
   ref
 }) => {
   const appStore = useAppStoreApi();
-  const [prevHeight, setPrevHeight] = (0, import_react26.useState)(0);
-  const [isAnimating, setIsAnimating] = (0, import_react26.useState)(false);
+  const [prevHeight, setPrevHeight] = (0, import_react27.useState)(0);
+  const [isAnimating, setIsAnimating] = (0, import_react27.useState)(false);
   const { draggedItem, isZone } = useContextStore(ZoneStoreContext, (s) => {
     var _a, _b;
     return {
@@ -4948,32 +4874,52 @@ var useMinEmptyHeight = ({
       isZone: ((_b = s.draggedItem) == null ? void 0 : _b.data.zone) === zoneCompound
     };
   });
-  (0, import_react26.useEffect)(() => {
-    if (draggedItem && ref.current) {
-      if (isZone) {
-        const rect = ref.current.getBoundingClientRect();
-        setPrevHeight(rect.height);
-        setIsAnimating(true);
-        return;
-      }
-    }
-    setPrevHeight(0);
-    setTimeout(() => {
-      var _a, _b;
-      const zones = appStore.getState().state.indexes.zones;
-      const nodes = appStore.getState().nodes;
-      const selectedItem = appStore.getState().selectedItem;
-      const contentIds = ((_a = zones[zoneCompound]) == null ? void 0 : _a.contentIds) || [];
-      contentIds.forEach((contentId) => {
-        const node = nodes.nodes[contentId];
-        node == null ? void 0 : node.methods.sync();
-      });
-      if (selectedItem) {
-        (_b = nodes.nodes[selectedItem.props.id]) == null ? void 0 : _b.methods.sync();
+  const numItems = (0, import_react27.useRef)(0);
+  const onDragFinished = useOnDragFinished(
+    (finished) => {
+      var _a;
+      if (finished) {
+        const newNumItems = getNumItems(appStore, zoneCompound);
+        setPrevHeight(0);
+        if (newNumItems || numItems.current === 0) {
+          setIsAnimating(false);
+          return;
+        }
+        const selectedItem = appStore.getState().selectedItem;
+        const zones = appStore.getState().state.indexes.zones;
+        const nodes = appStore.getState().nodes;
+        (_a = nodes.nodes[selectedItem == null ? void 0 : selectedItem.props.id]) == null ? void 0 : _a.methods.hideOverlay();
+        setTimeout(() => {
+          var _a2;
+          const contentIds = ((_a2 = zones[zoneCompound]) == null ? void 0 : _a2.contentIds) || [];
+          contentIds.forEach((contentId) => {
+            const node = nodes.nodes[contentId];
+            node == null ? void 0 : node.methods.sync();
+          });
+          if (selectedItem) {
+            setTimeout(() => {
+              var _a3, _b;
+              (_a3 = nodes.nodes[selectedItem.props.id]) == null ? void 0 : _a3.methods.sync();
+              (_b = nodes.nodes[selectedItem.props.id]) == null ? void 0 : _b.methods.showOverlay();
+            }, 200);
+          }
+          setIsAnimating(false);
+        }, 100);
+      }
+    },
+    [appStore, prevHeight, zoneCompound]
+  );
+  (0, import_react27.useEffect)(() => {
+    if (draggedItem && ref.current) {
+      if (isZone) {
+        const rect = ref.current.getBoundingClientRect();
+        numItems.current = getNumItems(appStore, zoneCompound);
+        setPrevHeight(rect.height);
+        setIsAnimating(true);
+        return onDragFinished();
       }
-      setIsAnimating(false);
-    }, 400);
-  }, [ref.current, draggedItem, zoneCompound]);
+    }
+  }, [ref.current, draggedItem, onDragFinished]);
   return [prevHeight || userMinEmptyHeight, isAnimating];
 };
 
@@ -4994,15 +4940,15 @@ function assignRefs(refs, node) {
 
 // components/DropZone/lib/use-content-with-preview.ts
 init_react_import();
-var import_react29 = require("react");
+var import_react30 = require("react");
 
 // lib/dnd/use-rendered-callback.ts
 init_react_import();
-var import_react27 = require("@dnd-kit/react");
-var import_react28 = require("react");
+var import_react28 = require("@dnd-kit/react");
+var import_react29 = require("react");
 function useRenderedCallback(callback, deps) {
-  const manager = (0, import_react27.useDragDropManager)();
-  return (0, import_react28.useCallback)(
+  const manager = (0, import_react28.useDragDropManager)();
+  return (0, import_react29.useCallback)(
     (...args) => __async(this, null, function* () {
       yield manager == null ? void 0 : manager.renderer.rendering;
       return callback(...args);
@@ -5013,27 +4959,21 @@ function useRenderedCallback(callback, deps) {
 
 // components/DropZone/lib/use-content-with-preview.ts
 var useContentIdsWithPreview = (contentIds, zoneCompound) => {
-  const { draggedItemId, preview, previewExists } = useContextStore(
+  const zoneStore = (0, import_react30.useContext)(ZoneStoreContext);
+  const preview = useContextStore(
     ZoneStoreContext,
-    (s) => {
-      var _a;
-      return {
-        draggedItemId: (_a = s.draggedItem) == null ? void 0 : _a.id,
-        preview: s.previewIndex[zoneCompound],
-        previewExists: Object.keys(s.previewIndex || {}).length > 0
-      };
-    }
+    (s) => s.previewIndex[zoneCompound]
   );
   const isDragging = useAppStore((s) => s.state.ui.isDragging);
-  const [contentIdsWithPreview, setContentIdsWithPreview] = (0, import_react29.useState)(contentIds);
-  const [localPreview, setLocalPreview] = (0, import_react29.useState)(
+  const [contentIdsWithPreview, setContentIdsWithPreview] = (0, import_react30.useState)(contentIds);
+  const [localPreview, setLocalPreview] = (0, import_react30.useState)(
     preview
   );
   const updateContent = useRenderedCallback(
-    (contentIds2, preview2, isDragging2) => {
-      if (isDragging2 && !previewExists) {
-        return;
-      }
+    (contentIds2, preview2) => {
+      var _a;
+      const s = zoneStore.getState();
+      const draggedItemId = (_a = s.draggedItem) == null ? void 0 : _a.id;
       if (preview2) {
         if (preview2.type === "insert") {
           setContentIdsWithPreview(
@@ -5054,14 +4994,14 @@ var useContentIdsWithPreview = (contentIds, zoneCompound) => {
         }
       } else {
         setContentIdsWithPreview(
-          previewExists ? contentIds2.filter((id) => id !== draggedItemId) : contentIds2
+          contentIds2.filter((id) => id !== draggedItemId)
         );
       }
       setLocalPreview(preview2);
     },
-    [draggedItemId, previewExists]
+    []
   );
-  (0, import_react29.useEffect)(() => {
+  (0, import_react30.useEffect)(() => {
     updateContent(contentIds, preview, isDragging);
   }, [contentIds, preview, isDragging]);
   return [contentIdsWithPreview, localPreview];
@@ -5069,16 +5009,16 @@ var useContentIdsWithPreview = (contentIds, zoneCompound) => {
 
 // components/DropZone/lib/use-drag-axis.ts
 init_react_import();
-var import_react30 = require("react");
+var import_react31 = require("react");
 var GRID_DRAG_AXIS = "dynamic";
 var FLEX_ROW_DRAG_AXIS = "x";
 var DEFAULT_DRAG_AXIS = "y";
 var useDragAxis = (ref, collisionAxis) => {
   const status = useAppStore((s) => s.status);
-  const [dragAxis, setDragAxis] = (0, import_react30.useState)(
+  const [dragAxis, setDragAxis] = (0, import_react31.useState)(
     collisionAxis || DEFAULT_DRAG_AXIS
   );
-  const calculateDragAxis = (0, import_react30.useCallback)(() => {
+  const calculateDragAxis = (0, import_react31.useCallback)(() => {
     if (ref.current) {
       const computedStyle = window.getComputedStyle(ref.current);
       if (computedStyle.display === "grid") {
@@ -5090,7 +5030,7 @@ var useDragAxis = (ref, collisionAxis) => {
       }
     }
   }, [ref.current]);
-  (0, import_react30.useEffect)(() => {
+  (0, import_react31.useEffect)(() => {
     const onViewportChange = () => {
       calculateDragAxis();
     };
@@ -5099,54 +5039,57 @@ var useDragAxis = (ref, collisionAxis) => {
       window.removeEventListener("viewportchange", onViewportChange);
     };
   }, []);
-  (0, import_react30.useEffect)(calculateDragAxis, [status, collisionAxis]);
+  (0, import_react31.useEffect)(calculateDragAxis, [status, collisionAxis]);
   return [dragAxis, calculateDragAxis];
 };
 
 // components/DropZone/index.tsx
-var import_shallow3 = require("zustand/react/shallow");
+var import_shallow4 = require("zustand/react/shallow");
 
 // components/Render/index.tsx
 init_react_import();
 
 // lib/use-slots.tsx
 init_react_import();
-var import_react31 = require("react");
-function useSlots(config, props, renderSlotEdit, renderSlotRender = renderSlotEdit, readOnly, forceReadOnly) {
-  const slotProps = (0, import_react31.useMemo)(() => {
-    if (!(config == null ? void 0 : config.fields)) return props;
-    const slotProps2 = {};
-    const fieldKeys = Object.keys(config.fields);
-    for (let i = 0; i < fieldKeys.length; i++) {
-      const fieldKey = fieldKeys[i];
-      const field = config.fields[fieldKey];
-      if ((field == null ? void 0 : field.type) === "slot") {
-        const content = props[fieldKey] || [];
-        const render = (readOnly == null ? void 0 : readOnly[fieldKey]) || forceReadOnly ? renderSlotRender : renderSlotEdit;
+var import_react32 = require("react");
+function useSlots(config, item, renderSlotEdit, renderSlotRender = renderSlotEdit, readOnly, forceReadOnly) {
+  const slotProps = (0, import_react32.useMemo)(() => {
+    const mapped = mapSlots(
+      item,
+      (content, _parentId, propName, field, propPath) => {
+        const wildcardPath = propPath.replace(/\[\d+\]/g, "[*]");
+        const isReadOnly = (readOnly == null ? void 0 : readOnly[propPath]) || (readOnly == null ? void 0 : readOnly[wildcardPath]) || forceReadOnly;
+        const render = isReadOnly ? renderSlotRender : renderSlotEdit;
         const Slot = (dzProps) => render(__spreadProps(__spreadValues({
-          allow: field.allow,
-          disallow: field.disallow
+          allow: (field == null ? void 0 : field.type) === "slot" ? field.allow : [],
+          disallow: (field == null ? void 0 : field.type) === "slot" ? field.disallow : []
         }, dzProps), {
-          zone: fieldKey,
+          zone: propName,
           content
         }));
-        slotProps2[fieldKey] = Slot;
-      }
-    }
-    return slotProps2;
-  }, [config, readOnly, forceReadOnly]);
-  return __spreadValues(__spreadValues({}, props), slotProps);
+        return Slot;
+      },
+      config
+    ).props;
+    return mapped;
+  }, [config, item, readOnly, forceReadOnly]);
+  const mergedProps = (0, import_react32.useMemo)(
+    () => __spreadValues(__spreadValues({}, item.props), slotProps),
+    [item.props, slotProps]
+  );
+  return mergedProps;
 }
 
 // components/Render/index.tsx
-var import_react33 = __toESM(require("react"));
+var import_react34 = __toESM(require("react"));
 
 // components/SlotRender/index.tsx
 init_react_import();
+var import_shallow3 = require("zustand/react/shallow");
 
 // components/SlotRender/server.tsx
 init_react_import();
-var import_react32 = require("react");
+var import_react33 = require("react");
 
 // components/ServerRender/index.tsx
 init_react_import();
@@ -5181,12 +5124,15 @@ function DropZoneRender({
             metadata
           }
         ),
-        metadata
+        metadata,
+        dragRef: null,
+        isEditing: false
       }
     });
-    const propsWithSlots = useSlots(Component, props, (props2) => /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, props2), { config, metadata })));
+    const renderItem = __spreadProps(__spreadValues({}, item), { props });
+    const propsWithSlots = useSlots(config, renderItem, (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 /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Component.render, __spreadValues({}, propsWithSlots), renderItem.props.id);
     }
     return null;
   }) });
@@ -5201,7 +5147,7 @@ var Item = ({
   metadata
 }) => {
   const Component = config.components[item.type];
-  const props = useSlots(Component, item.props, (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, slotProps), { config, metadata })));
+  const props = useSlots(config, item, (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), {
@@ -5212,7 +5158,7 @@ var Item = ({
     })
   );
 };
-var SlotRender = (0, import_react32.forwardRef)(
+var SlotRender = (0, import_react33.forwardRef)(
   function SlotRenderInternal({ className, style, content, config, metadata }, ref) {
     return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { className, style, ref, children: content.map((item) => {
       if (!config.components[item.type]) {
@@ -5240,10 +5186,12 @@ var ContextSlotRender = ({
   const config = useAppStore((s) => s.config);
   const metadata = useAppStore((s) => s.metadata);
   const slotContent = useAppStore(
-    (s) => {
+    (0, import_shallow3.useShallow)((s) => {
       var _a, _b;
-      return (_b = (_a = s.state.indexes.nodes[componentId]) == null ? void 0 : _a.data.props[zone]) != null ? _b : null;
-    }
+      const indexes = s.state.indexes;
+      const contentIds = (_b = (_a = indexes.zones[`${componentId}:${zone}`]) == null ? void 0 : _a.contentIds) != null ? _b : [];
+      return contentIds.map((contentId) => indexes.nodes[contentId].flatData);
+    })
   );
   return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
     SlotRenderPure,
@@ -5258,7 +5206,7 @@ var ContextSlotRender = ({
 
 // components/Render/index.tsx
 var import_jsx_runtime24 = require("react/jsx-runtime");
-var renderContext = import_react33.default.createContext({
+var renderContext = import_react34.default.createContext({
   config: { components: {} },
   data: { root: {}, content: [] },
   metadata: {}
@@ -5273,7 +5221,7 @@ function Render({
     root: data.root || {},
     content: data.content || []
   });
-  const rootProps = defaultedData.root.props || defaultedData.root;
+  const rootProps = "props" in defaultedData.root ? defaultedData.root.props : defaultedData.root;
   const title = (rootProps == null ? void 0 : rootProps.title) || "";
   const pageProps = __spreadProps(__spreadValues({}, rootProps), {
     puck: {
@@ -5286,8 +5234,12 @@ function Render({
     editMode: false,
     id: "puck-root"
   });
-  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)(
+  const propsWithSlots = useSlots(
+    config,
+    { type: "root", props: pageProps },
+    (props) => /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(SlotRender, __spreadProps(__spreadValues({}, props), { config, metadata }))
+  );
+  const nextContextValue = (0, import_react34.useMemo)(
     () => ({
       mode: "render",
       depth: 0
@@ -5309,19 +5261,18 @@ var DropZoneEditPure = (props) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
 var DropZoneChild = ({
   zoneCompound,
   componentId,
-  preview,
   index,
-  isEnabled,
   dragAxis,
   collisionAxis,
   inDroppableZone
 }) => {
   var _a, _b;
   const metadata = useAppStore((s) => s.metadata);
-  const ctx = (0, import_react34.useContext)(dropZoneContext);
+  const ctx = (0, import_react35.useContext)(dropZoneContext);
   const { depth = 1 } = ctx != null ? ctx : {};
+  const zoneStore = (0, import_react35.useContext)(ZoneStoreContext);
   const nodeProps = useAppStore(
-    (0, import_shallow3.useShallow)((s) => {
+    (0, import_shallow4.useShallow)((s) => {
       var _a2;
       return (_a2 = s.state.indexes.nodes[componentId]) == null ? void 0 : _a2.flatData.props;
     })
@@ -5333,22 +5284,42 @@ var DropZoneChild = ({
     }
   );
   const nodeReadOnly = useAppStore(
-    (0, import_shallow3.useShallow)((s) => {
+    (0, import_shallow4.useShallow)((s) => {
       var _a2;
       return (_a2 = s.state.indexes.nodes[componentId]) == null ? void 0 : _a2.data.readOnly;
     })
   );
-  const node = { type: nodeType, props: nodeProps };
-  const item = nodeProps ? node : (preview == null ? void 0 : preview.componentType) ? { type: preview.componentType, props: preview.props } : null;
+  const appStore = useAppStoreApi();
+  const item = (0, import_react35.useMemo)(() => {
+    if (nodeProps) {
+      const expanded = expandNode({
+        type: nodeType,
+        props: nodeProps
+      });
+      return expanded;
+    }
+    const preview = zoneStore.getState().previewIndex[zoneCompound];
+    if (componentId === (preview == null ? void 0 : preview.props.id)) {
+      return {
+        type: preview.componentType,
+        props: preview.props,
+        previewType: preview.type
+      };
+    }
+    return null;
+  }, [appStore, componentId, zoneCompound, nodeType, nodeProps]);
   const componentConfig = useAppStore(
     (s) => (item == null ? void 0 : item.type) ? s.config.components[item.type] : null
   );
-  const puckProps = {
-    renderDropZone: DropZoneEditPure,
-    isEditing: true,
-    dragRef: null,
-    metadata: __spreadValues(__spreadValues({}, metadata), componentConfig == null ? void 0 : componentConfig.metadata)
-  };
+  const puckProps = (0, import_react35.useMemo)(
+    () => ({
+      renderDropZone: DropZoneEditPure,
+      isEditing: true,
+      dragRef: null,
+      metadata: __spreadValues(__spreadValues({}, metadata), componentConfig == null ? void 0 : componentConfig.metadata)
+    }),
+    [metadata, componentConfig == null ? void 0 : componentConfig.metadata]
+  );
   const overrides = useAppStore((s) => s.overrides);
   const isLoading = useAppStore(
     (s) => {
@@ -5363,13 +5334,13 @@ 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() {
+  const renderPreview = (0, import_react35.useMemo)(
+    () => function Preview3() {
       return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DrawerItemInner, { name: label, children: overrides.componentItem });
     },
     [componentId, label, overrides]
   );
-  const defaultsProps = (0, import_react34.useMemo)(
+  const defaultsProps = (0, import_react35.useMemo)(
     () => __spreadProps(__spreadValues(__spreadValues({}, componentConfig == null ? void 0 : componentConfig.defaultProps), item == null ? void 0 : item.props), {
       puck: puckProps,
       editMode: true
@@ -5377,9 +5348,17 @@ var DropZoneChild = ({
     }),
     [componentConfig == null ? void 0 : componentConfig.defaultProps, item == null ? void 0 : item.props, puckProps]
   );
+  const defaultedNode = (0, import_react35.useMemo)(
+    () => {
+      var _a2;
+      return { type: (_a2 = item == null ? void 0 : item.type) != null ? _a2 : nodeType, props: defaultsProps };
+    },
+    [item == null ? void 0 : item.type, nodeType, defaultsProps]
+  );
+  const config = useAppStore((s) => s.config);
   const defaultedPropsWithSlots = useSlots(
-    componentConfig,
-    defaultsProps,
+    config,
+    defaultedNode,
     DropZoneEditPure,
     (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(ContextSlotRender, { componentId, zone: slotProps.zone }),
     nodeReadOnly,
@@ -5391,8 +5370,8 @@ var DropZoneChild = ({
     item.type
   ] });
   let componentType = item.type;
-  const isPreview = componentId === (preview == null ? void 0 : preview.props.id) && preview.type === "insert";
-  if (isPreview) {
+  const isInserting = "previewType" in item ? item.previewType === "insert" : false;
+  if (isInserting) {
     Render2 = renderPreview;
   }
   return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
@@ -5406,11 +5385,10 @@ var DropZoneChild = ({
       isLoading,
       isSelected,
       label,
-      isEnabled,
       autoDragAxis: dragAxis,
       userDragAxis: collisionAxis,
       inDroppableZone,
-      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)(
+      children: (dragRef) => (componentConfig == null ? void 0 : componentConfig.inline) && !isInserting ? /* @__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), {
@@ -5421,8 +5399,8 @@ var DropZoneChild = ({
     }
   );
 };
-var DropZoneChildMemo = (0, import_react34.memo)(DropZoneChild);
-var DropZoneEdit = (0, import_react34.forwardRef)(
+var DropZoneChildMemo = (0, import_react35.memo)(DropZoneChild);
+var DropZoneEdit = (0, import_react35.forwardRef)(
   function DropZoneEditInternal({
     zone,
     allow,
@@ -5432,7 +5410,7 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
     minEmptyHeight: userMinEmptyHeight = 128,
     collisionAxis
   }, userRef) {
-    const ctx = (0, import_react34.useContext)(dropZoneContext);
+    const ctx = (0, import_react35.useContext)(dropZoneContext);
     const {
       // These all need setting via context
       areaId,
@@ -5441,7 +5419,7 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
       unregisterLocalZone
     } = ctx != null ? ctx : {};
     const path = useAppStore(
-      (0, import_shallow3.useShallow)((s) => {
+      (0, import_shallow4.useShallow)((s) => {
         var _a;
         return areaId ? (_a = s.state.indexes.nodes[areaId]) == null ? void 0 : _a.path : null;
       })
@@ -5453,39 +5431,24 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
       }
     }
     const isRootZone = zoneCompound === rootDroppableId || zone === rootDroppableId || areaId === "root";
-    const {
-      isDeepestZone,
-      inNextDeepestArea,
-      draggedComponentType,
-      userIsDragging
-    } = useContextStore(ZoneStoreContext, (s) => {
-      var _a, _b;
-      return {
-        isDeepestZone: (_a = s.zoneDepthIndex[zoneCompound]) != null ? _a : false,
-        inNextDeepestArea: s.nextAreaDepthIndex[areaId || ""],
-        draggedComponentType: (_b = s.draggedItem) == null ? void 0 : _b.data.componentType,
-        userIsDragging: !!s.draggedItem
-      };
-    });
+    const inNextDeepestArea = useContextStore(
+      ZoneStoreContext,
+      (s) => s.nextAreaDepthIndex[areaId || ""]
+    );
     const zoneContentIds = useAppStore(
-      (0, import_shallow3.useShallow)((s) => {
+      (0, import_shallow4.useShallow)((s) => {
         var _a;
         return (_a = s.state.indexes.zones[zoneCompound]) == null ? void 0 : _a.contentIds;
       })
     );
     const zoneType = useAppStore(
-      (0, import_shallow3.useShallow)((s) => {
+      (0, import_shallow4.useShallow)((s) => {
         var _a;
         return (_a = s.state.indexes.zones[zoneCompound]) == null ? void 0 : _a.type;
       })
     );
-    (0, import_react34.useEffect)(() => {
+    (0, import_react35.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);
         }
@@ -5496,11 +5459,20 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
         };
       }
     }, [zoneType]);
-    const contentIds = (0, import_react34.useMemo)(() => {
+    (0, import_react35.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_react35.useMemo)(() => {
       return zoneContentIds || [];
     }, [zoneContentIds]);
-    const ref = (0, import_react34.useRef)(null);
-    const acceptsTarget = (0, import_react34.useCallback)(
+    const ref = (0, import_react35.useRef)(null);
+    const acceptsTarget = (0, import_react35.useCallback)(
       (componentType) => {
         if (!componentType) {
           return true;
@@ -5522,29 +5494,44 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
       },
       [allow, disallow]
     );
-    (0, import_react34.useEffect)(() => {
+    const targetAccepted = useContextStore(ZoneStoreContext, (s) => {
+      var _a;
+      const draggedComponentType = (_a = s.draggedItem) == null ? void 0 : _a.data.componentType;
+      return acceptsTarget(draggedComponentType);
+    });
+    const hoveringOverArea = inNextDeepestArea || isRootZone;
+    const isEnabled = useContextStore(ZoneStoreContext, (s) => {
+      var _a;
+      let _isEnabled = true;
+      const isDeepestZone = (_a = s.zoneDepthIndex[zoneCompound]) != null ? _a : false;
+      _isEnabled = isDeepestZone;
+      if (_isEnabled) {
+        _isEnabled = targetAccepted;
+      }
+      return _isEnabled;
+    });
+    (0, import_react35.useEffect)(() => {
       if (registerLocalZone) {
-        registerLocalZone(zoneCompound, acceptsTarget(draggedComponentType));
+        registerLocalZone(zoneCompound, isEnabled);
       }
       return () => {
         if (unregisterLocalZone) {
           unregisterLocalZone(zoneCompound);
         }
       };
-    }, [draggedComponentType, zoneCompound]);
-    const hoveringOverArea = inNextDeepestArea || isRootZone;
-    let isEnabled = true;
-    if (userIsDragging) {
-      isEnabled = isDeepestZone;
-    }
-    if (isEnabled) {
-      isEnabled = acceptsTarget(draggedComponentType);
-    }
+    }, [isEnabled, zoneCompound]);
     const [contentIdsWithPreview, preview] = useContentIdsWithPreview(
       contentIds,
       zoneCompound
     );
     const isDropEnabled = isEnabled && (preview ? contentIdsWithPreview.length === 1 : contentIdsWithPreview.length === 0);
+    const zoneStore = (0, import_react35.useContext)(ZoneStoreContext);
+    (0, import_react35.useEffect)(() => {
+      const { enabledIndex } = zoneStore.getState();
+      zoneStore.setState({
+        enabledIndex: __spreadProps(__spreadValues({}, enabledIndex), { [zoneCompound]: isEnabled })
+      });
+    }, [isEnabled, zoneStore, zoneCompound]);
     const droppableConfig = {
       id: zoneCompound,
       collisionPriority: isEnabled ? depth : 0,
@@ -5554,11 +5541,11 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
       data: {
         areaId,
         depth,
-        isDroppableTarget: acceptsTarget(draggedComponentType),
+        isDroppableTarget: targetAccepted,
         path: path || []
       }
     };
-    const { ref: dropRef } = useDroppableSafe(droppableConfig);
+    const { ref: dropRef } = (0, import_react36.useDroppable)(droppableConfig);
     const isAreaSelected = useAppStore(
       (s) => (s == null ? void 0 : s.selectedItem) && areaId === (s == null ? void 0 : s.selectedItem.props.id)
     );
@@ -5573,7 +5560,6 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
       {
         className: `${getClassName17({
           isRootZone,
-          userIsDragging,
           hoveringOverArea,
           isEnabled,
           isAreaSelected,
@@ -5595,12 +5581,10 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
             {
               zoneCompound,
               componentId,
-              preview,
               dragAxis,
-              isEnabled,
               index: i,
               collisionAxis,
-              inDroppableZone: acceptsTarget(draggedComponentType)
+              inDroppableZone: targetAccepted
             },
             componentId
           );
@@ -5615,8 +5599,8 @@ var DropZoneRenderItem = ({
   metadata
 }) => {
   const Component = config.components[item.type];
-  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)(
+  const props = useSlots(config, item, (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, slotProps), { config, metadata })));
+  const nextContextValue = (0, import_react35.useMemo)(
     () => ({
       areaId: props.id,
       depth: 1
@@ -5634,14 +5618,14 @@ var DropZoneRenderItem = ({
   ) }, props.id);
 };
 var DropZoneRenderPure = (props) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DropZoneRender2, __spreadValues({}, props));
-var DropZoneRender2 = (0, import_react34.forwardRef)(
+var DropZoneRender2 = (0, import_react35.forwardRef)(
   function DropZoneRenderInternal({ className, style, zone }, ref) {
-    const ctx = (0, import_react34.useContext)(dropZoneContext);
+    const ctx = (0, import_react35.useContext)(dropZoneContext);
     const { areaId = "root" } = ctx || {};
-    const { config, data, metadata } = (0, import_react34.useContext)(renderContext);
+    const { config, data, metadata } = (0, import_react35.useContext)(renderContext);
     let zoneCompound = rootDroppableId;
     let content = (data == null ? void 0 : data.content) || [];
-    (0, import_react34.useEffect)(() => {
+    (0, import_react35.useEffect)(() => {
       if (!content) {
         if (ctx == null ? void 0 : ctx.registerZone) {
           ctx == null ? void 0 : ctx.registerZone(zoneCompound);
@@ -5678,9 +5662,9 @@ var DropZoneRender2 = (0, import_react34.forwardRef)(
   }
 );
 var DropZonePure = (props) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DropZone, __spreadValues({}, props));
-var DropZone = (0, import_react34.forwardRef)(
+var DropZone = (0, import_react35.forwardRef)(
   function DropZone2(props, ref) {
-    const ctx = (0, import_react34.useContext)(dropZoneContext);
+    const ctx = (0, import_react35.useContext)(dropZoneContext);
     if ((ctx == null ? void 0 : ctx.mode) === "edit") {
       return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(import_jsx_runtime25.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DropZoneEdit, __spreadProps(__spreadValues({}, props), { ref })) });
     }
@@ -5690,8 +5674,7 @@ var DropZone = (0, import_react34.forwardRef)(
 
 // 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();
@@ -5740,7 +5723,7 @@ var GlobalPosition = class {
     var _a;
     this.target = target;
     this.original = original;
-    this.frameEl = document.querySelector("#preview-frame");
+    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);
@@ -5820,6 +5803,7 @@ var getZoneId2 = (candidate) => {
   }
   return id;
 };
+var BUFFER = 6;
 var getPointerCollisions = (position, manager) => {
   const candidates = [];
   let elements = position.target.ownerDocument.elementsFromPoint(
@@ -5843,13 +5827,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) {
@@ -5903,17 +5900,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, {
@@ -5937,12 +5934,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;
     });
   }
 };
@@ -6002,14 +5999,15 @@ function getDeepDir(el) {
 }
 
 // components/DragDropContext/index.tsx
+var import_state = require("@dnd-kit/state");
 var import_jsx_runtime26 = require("react/jsx-runtime");
 var DEBUG3 = false;
-var dragListenerContext = (0, import_react36.createContext)({
+var dragListenerContext = (0, import_react38.createContext)({
   dragListeners: {}
 });
 function useDragListener(type, fn, deps = []) {
-  const { setDragListeners } = (0, import_react36.useContext)(dragListenerContext);
-  (0, import_react36.useEffect)(() => {
+  const { setDragListeners } = (0, import_react38.useContext)(dragListenerContext);
+  (0, import_react38.useEffect)(() => {
     if (setDragListeners) {
       setDragListeners((old) => __spreadProps(__spreadValues({}, old), {
         [type]: [...old[type] || [], fn]
@@ -6019,8 +6017,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_react38.useRef)(null);
+  return (0, import_react38.useCallback)((manager) => {
     collisionStore.setState({ fallbackEnabled: false });
     const fallbackId = generateId();
     lastFallbackDisable.current = fallbackId;
@@ -6039,19 +6037,21 @@ 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_react38.useRef)(null);
   const tempDisableFallback = useTempDisableFallback(100);
-  const [zoneStore] = (0, import_react36.useState)(
+  const [zoneStore] = (0, import_react38.useState)(
     () => (0, import_zustand5.createStore)(() => ({
       zoneDepthIndex: {},
       nextZoneDepthIndex: {},
       areaDepthIndex: {},
       nextAreaDepthIndex: {},
       draggedItem: null,
-      previewIndex: {}
+      previewIndex: {},
+      enabledIndex: {},
+      hoveringComponent: null
     }))
   );
-  const getChanged2 = (0, import_react36.useCallback)(
+  const getChanged2 = (0, import_react38.useCallback)(
     (params, id2) => {
       const { zoneDepthIndex = {}, areaDepthIndex = {} } = zoneStore.getState() || {};
       const stateHasZone = Object.keys(zoneDepthIndex).length > 0;
@@ -6072,7 +6072,7 @@ var DragDropContextClient = ({
     },
     [zoneStore]
   );
-  const setDeepestAndCollide = (0, import_react36.useCallback)(
+  const setDeepestAndCollide = (0, import_react38.useCallback)(
     (params, manager) => {
       const { zoneChanged, areaChanged } = getChanged2(params, id);
       if (!zoneChanged && !areaChanged) return;
@@ -6096,7 +6096,7 @@ var DragDropContextClient = ({
     setDeepestDb.cancel();
     debouncedParamsRef.current = null;
   };
-  (0, import_react36.useEffect)(() => {
+  (0, import_react38.useEffect)(() => {
     if (DEBUG3) {
       zoneStore.subscribe(
         (s) => {
@@ -6110,7 +6110,7 @@ var DragDropContextClient = ({
       );
     }
   }, []);
-  const [plugins] = (0, import_react36.useState)(() => [
+  const [plugins] = (0, import_react38.useState)(() => [
     ...disableAutoScroll ? import_dom.defaultPreset.plugins.filter((plugin) => plugin !== import_dom.AutoScroller) : import_dom.defaultPreset.plugins,
     createNestedDroppablePlugin(
       {
@@ -6158,10 +6158,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_react38.useState)({});
+  const dragMode = (0, import_react38.useRef)(null);
+  const initialSelector = (0, import_react38.useRef)(void 0);
+  const nextContextValue = (0, import_react38.useMemo)(
     () => ({
       mode: "edit",
       areaId: "root",
@@ -6177,12 +6177,14 @@ var DragDropContextClient = ({
         setDragListeners
       },
       children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
-        import_react35.DragDropProvider,
+        import_react37.DragDropProvider,
         {
           plugins,
           sensors,
           onDragEnd: (event, manager) => {
-            var _a;
+            var _a, _b;
+            const entryEl = (_a = getFrame()) == null ? void 0 : _a.querySelector("[data-puck-entry]");
+            entryEl == null ? void 0 : entryEl.removeAttribute("data-puck-dragging");
             const { source, target } = event.operation;
             if (!source) {
               zoneStore.setState({ draggedItem: null });
@@ -6190,9 +6192,9 @@ var DragDropContextClient = ({
             }
             const { zone, index } = source.data;
             const { previewIndex = {} } = zoneStore.getState() || {};
-            const thisPreview = ((_a = previewIndex[zone]) == null ? void 0 : _a.props.id) === source.id ? previewIndex[zone] : null;
-            setTimeout(() => {
-              var _a2, _b;
+            const thisPreview = ((_b = previewIndex[zone]) == null ? void 0 : _b.props.id) === source.id ? previewIndex[zone] : null;
+            const onAnimationEnd = () => {
+              var _a2, _b2;
               zoneStore.setState({ draggedItem: null });
               if (event.canceled || (target == null ? void 0 : target.type) === "void") {
                 zoneStore.setState({ previewIndex: {} });
@@ -6228,23 +6230,28 @@ var DragDropContextClient = ({
                   });
                 }
               }
-              setTimeout(() => {
-                dispatch({
-                  type: "setUi",
-                  ui: {
-                    itemSelector: { index, zone },
-                    isDragging: false
-                  },
-                  recordHistory: true
-                });
-              }, 50);
-              (_b = dragListeners.dragend) == null ? void 0 : _b.forEach((fn) => {
+              dispatch({
+                type: "setUi",
+                ui: {
+                  itemSelector: { index, zone },
+                  isDragging: false
+                },
+                recordHistory: true
+              });
+              (_b2 = dragListeners.dragend) == null ? void 0 : _b2.forEach((fn) => {
                 fn(event, manager);
               });
-            }, 250);
+            };
+            let dispose;
+            dispose = (0, import_state.effect)(() => {
+              if (source.status === "idle") {
+                onAnimationEnd();
+                dispose == null ? void 0 : dispose();
+              }
+            });
           },
           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;
@@ -6262,7 +6269,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) {
@@ -6275,7 +6282,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;
@@ -6321,16 +6328,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;
@@ -6360,11 +6363,31 @@ var DragDropContextClient = ({
             });
           },
           onBeforeDragStart: (event) => {
-            var _a;
-            const isNewComponent = ((_a = event.operation.source) == null ? void 0 : _a.data.type) === "drawer";
+            var _a, _b, _c, _d;
+            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 });
+            if (((_b = appStore.getState().selectedItem) == null ? void 0 : _b.props.id) !== ((_c = event.operation.source) == null ? void 0 : _c.id)) {
+              dispatch({
+                type: "setUi",
+                ui: {
+                  itemSelector: null,
+                  isDragging: true
+                },
+                recordHistory: false
+              });
+            } else {
+              dispatch({
+                type: "setUi",
+                ui: {
+                  isDragging: true
+                },
+                recordHistory: false
+              });
+            }
+            const entryEl = (_d = getFrame()) == null ? void 0 : _d.querySelector("[data-puck-entry]");
+            entryEl == null ? void 0 : entryEl.setAttribute("data-puck-dragging", "true");
           },
           children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(ZoneStoreProvider, { store: zoneStore, children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(DropZoneProvider, { value: nextContextValue, children }) })
         }
@@ -6384,6 +6407,7 @@ var DragDropContext = ({
 };
 
 // components/Drawer/index.tsx
+var import_react40 = 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);
@@ -6394,7 +6418,7 @@ var DrawerItemInner = ({
   dragRef,
   isDragDisabled
 }) => {
-  const CustomInner = (0, import_react37.useMemo)(
+  const CustomInner = (0, import_react39.useMemo)(
     () => children || (({ children: children2 }) => /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassNameItem2("default"), children: children2 })),
     [children]
   );
@@ -6420,10 +6444,11 @@ var DrawerItemDraggable = ({
   id,
   isDragDisabled
 }) => {
-  const { ref } = useDraggableSafe({
+  const { ref } = (0, import_react40.useDraggable)({
     id,
-    data: { type: "drawer", componentType: name },
-    disabled: isDragDisabled
+    data: { componentType: name },
+    disabled: isDragDisabled,
+    type: "drawer"
   });
   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 }) }),
@@ -6448,7 +6473,7 @@ var DrawerItem = ({
   isDragDisabled
 }) => {
   const resolvedId = id || name;
-  const [dynamicId, setDynamicId] = (0, import_react37.useState)(generateId(resolvedId));
+  const [dynamicId, setDynamicId] = (0, import_react39.useState)(generateId(resolvedId));
   if (typeof index !== "undefined") {
     console.error(
       "Warning: The `index` prop on Drawer.Item is deprecated and no longer required."
@@ -6488,7 +6513,7 @@ var Drawer = ({
     );
   }
   const id = useSafeId();
-  const { ref } = useDroppableSafe({
+  const { ref } = (0, import_react40.useDroppable)({
     id,
     type: "void",
     collisionPriority: 0
@@ -6501,6 +6526,7 @@ var Drawer = ({
       ref,
       "data-puck-dnd": id,
       "data-puck-drawer": true,
+      "data-puck-dnd-void": true,
       children
     }
   );
@@ -6509,7 +6535,7 @@ Drawer.Item = DrawerItem;
 
 // components/Puck/index.tsx
 init_react_import();
-var import_react52 = require("react");
+var import_react56 = require("react");
 
 // components/SidebarSection/index.tsx
 init_react_import();
@@ -6520,7 +6546,7 @@ var styles_module_default13 = { "SidebarSection": "_SidebarSection_8boj8_1", "Si
 
 // lib/use-breadcrumbs.ts
 init_react_import();
-var import_react38 = require("react");
+var import_react41 = require("react");
 var useBreadcrumbs = (renderCount) => {
   const selectedId = useAppStore((s) => {
     var _a;
@@ -6532,7 +6558,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_react41.useMemo)(() => {
     const breadcrumbs = (path == null ? void 0 : path.map((zoneCompound) => {
       var _a, _b, _c;
       const [componentId] = zoneCompound.split(":");
@@ -6604,70 +6630,26 @@ var SidebarSection = ({
   );
 };
 
-// components/MenuBar/index.tsx
-init_react_import();
-
-// css-module:/home/runner/work/puck/puck/packages/core/components/MenuBar/styles.module.css#css-module
-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_runtime29 = require("react/jsx-runtime");
-var getClassName20 = get_class_name_factory_default("MenuBar", styles_module_default14);
-function MenuBar({
-  menuOpen = false,
-  renderHeaderActions,
-  setMenuOpen
-}) {
-  const back = useAppStore((s) => s.history.back);
-  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_runtime29.jsx)(
-    "div",
-    {
-      className: getClassName20({ menuOpen }),
-      onClick: (event) => {
-        var _a;
-        const element = event.target;
-        if (window.matchMedia("(min-width: 638px)").matches) {
-          return;
-        }
-        if (element.tagName === "A" && ((_a = element.getAttribute("href")) == null ? void 0 : _a.startsWith("#"))) {
-          setMenuOpen(false);
-        }
-      },
-      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_runtime29.jsx)(import_jsx_runtime29.Fragment, { children: renderHeaderActions && renderHeaderActions() })
-      ] })
-    }
-  );
-}
-
 // css-module:/home/runner/work/puck/puck/packages/core/components/Puck/styles.module.css#css-module
 init_react_import();
-var styles_module_default15 = { "Puck": "_Puck_11o75_19", "Puck-portal": "_Puck-portal_11o75_24", "PuckLayout-inner": "_PuckLayout-inner_11o75_31", "PuckLayout--mounted": "_PuckLayout--mounted_11o75_43", "PuckLayout--leftSideBarVisible": "_PuckLayout--leftSideBarVisible_11o75_47", "PuckLayout--rightSideBarVisible": "_PuckLayout--rightSideBarVisible_11o75_53", "PuckLayout-mounted": "_PuckLayout-mounted_11o75_67", "PuckLayout": "_PuckLayout_11o75_31", "PuckLayout-header": "_PuckLayout-header_11o75_108", "PuckLayout-headerInner": "_PuckLayout-headerInner_11o75_117", "PuckLayout-headerToggle": "_PuckLayout-headerToggle_11o75_127", "PuckLayout-rightSideBarToggle": "_PuckLayout-rightSideBarToggle_11o75_134", "PuckLayout-leftSideBarToggle": "_PuckLayout-leftSideBarToggle_11o75_135", "PuckLayout-headerTitle": "_PuckLayout-headerTitle_11o75_139", "PuckLayout-headerPath": "_PuckLayout-headerPath_11o75_143", "PuckLayout-headerTools": "_PuckLayout-headerTools_11o75_150", "PuckLayout-menuButton": "_PuckLayout-menuButton_11o75_156", "PuckLayout--menuOpen": "_PuckLayout--menuOpen_11o75_161", "PuckLayout-leftSideBar": "_PuckLayout-leftSideBar_11o75_135", "PuckLayout-rightSideBar": "_PuckLayout-rightSideBar_11o75_134" };
+var styles_module_default14 = { "Puck": "_Puck_mc1k2_19", "Puck-portal": "_Puck-portal_mc1k2_24", "PuckLayout-inner": "_PuckLayout-inner_mc1k2_31", "PuckLayout--mounted": "_PuckLayout--mounted_mc1k2_43", "PuckLayout--leftSideBarVisible": "_PuckLayout--leftSideBarVisible_mc1k2_47", "PuckLayout--rightSideBarVisible": "_PuckLayout--rightSideBarVisible_mc1k2_53", "PuckLayout-mounted": "_PuckLayout-mounted_mc1k2_67", "PuckLayout": "_PuckLayout_mc1k2_31", "PuckLayout-leftSideBar": "_PuckLayout-leftSideBar_mc1k2_108", "PuckLayout-rightSideBar": "_PuckLayout-rightSideBar_mc1k2_117" };
 
 // components/Puck/components/Fields/index.tsx
 init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Puck/components/Fields/styles.module.css#css-module
 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" };
+var styles_module_default15 = { "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_shallow4 = require("zustand/react/shallow");
-var import_jsx_runtime30 = require("react/jsx-runtime");
-var getClassName21 = get_class_name_factory_default("PuckFields", styles_module_default16);
+var import_react42 = require("react");
+var import_shallow5 = require("zustand/react/shallow");
+var import_jsx_runtime29 = require("react/jsx-runtime");
+var getClassName20 = get_class_name_factory_default("PuckFields", styles_module_default15);
 var DefaultFields = ({
   children
 }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(import_jsx_runtime30.Fragment, { children });
+  return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(import_jsx_runtime29.Fragment, { children });
 };
 var createOnChange = (fieldName, appStore) => (value, updatedUi) => __async(void 0, null, function* () {
   let currentProps;
@@ -6727,18 +6709,19 @@ var FieldsChild = ({ fieldName }) => {
     return s.selectedItem ? `${s.selectedItem.props.id}_${field.type}_${fieldName}` : `root_${field.type}_${fieldName}`;
   });
   const permissions = useAppStore(
-    (0, import_shallow4.useShallow)((s) => {
+    (0, import_shallow5.useShallow)((s) => {
       const { selectedItem, permissions: permissions2 } = s;
       return selectedItem ? permissions2.getPermissions({ item: selectedItem }) : permissions2.getPermissions({ root: true });
     })
   );
   const appStore = useAppStoreApi();
-  const onChange = (0, import_react39.useCallback)(createOnChange(fieldName, appStore), [
+  const onChange = (0, import_react42.useCallback)(createOnChange(fieldName, appStore), [
     fieldName
   ]);
-  if (!field || !id) return null;
+  const { visible = true } = field != null ? field : {};
+  if (!field || !id || !visible) return null;
   if (field.type === "slot") return null;
-  return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("div", { className: getClassName21("field"), children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: getClassName20("field"), children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
     AutoFieldPrivate,
     {
       field,
@@ -6750,14 +6733,15 @@ var FieldsChild = ({ fieldName }) => {
     }
   ) }, id);
 };
-var Fields = ({ wrapFields = true }) => {
+var FieldsChildMemo = (0, import_react42.memo)(FieldsChild);
+var FieldsInternal = ({ wrapFields = true }) => {
   const overrides = useAppStore((s) => s.overrides);
   const componentResolving = useAppStore((s) => {
     var _a, _b;
     const loadingCount = s.selectedItem ? (_a = s.componentState[s.selectedItem.props.id]) == null ? void 0 : _a.loadingCount : (_b = s.componentState["root"]) == null ? void 0 : _b.loadingCount;
     return (loadingCount != null ? loadingCount : 0) > 0;
   });
-  const itemSelector = useAppStore((0, import_shallow4.useShallow)((s) => s.state.ui.itemSelector));
+  const itemSelector = useAppStore((0, import_shallow5.useShallow)((s) => s.state.ui.itemSelector));
   const id = useAppStore((s) => {
     var _a;
     return (_a = s.selectedItem) == null ? void 0 : _a.props.id;
@@ -6766,42 +6750,48 @@ 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_shallow5.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_runtime30.jsxs)(
+  const Wrapper = (0, import_react42.useMemo)(() => overrides.fields || DefaultFields, [overrides]);
+  return /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)(
     "form",
     {
-      className: getClassName21({ wrapFields }),
+      className: getClassName20({ wrapFields }),
       onSubmit: (e) => {
         e.preventDefault();
       },
       children: [
-        /* @__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 }) }) })
+        /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Wrapper, { isLoading, itemSelector, children: fieldNames.map((fieldName) => /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(FieldsChildMemo, { fieldName }, fieldName)) }),
+        isLoading && /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: getClassName20("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: getClassName20("loadingOverlayInner"), children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Loader, { size: 16 }) }) })
       ]
     }
   );
 };
+var Fields = (0, import_react42.memo)(FieldsInternal);
 
 // components/Puck/components/Components/index.tsx
 init_react_import();
 
 // lib/use-component-list.tsx
 init_react_import();
-var import_react40 = require("react");
+var import_react43 = require("react");
 
 // components/ComponentList/index.tsx
 init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/ComponentList/styles.module.css#css-module
 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" };
+var styles_module_default16 = { "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_runtime31 = require("react/jsx-runtime");
-var getClassName22 = get_class_name_factory_default("ComponentList", styles_module_default17);
+var import_jsx_runtime30 = require("react/jsx-runtime");
+var getClassName21 = get_class_name_factory_default("ComponentList", styles_module_default16);
 var ComponentListItem = ({
   name,
   label
@@ -6812,7 +6802,7 @@ var ComponentListItem = ({
       type: name
     }).insert
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Drawer.Item, { label, name, isDragDisabled: !canInsert, children: overrides.componentItem });
+  return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(Drawer.Item, { label, name, isDragDisabled: !canInsert, children: overrides.componentItem });
 };
 var ComponentList = ({
   children,
@@ -6823,12 +6813,12 @@ 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_runtime31.jsxs)("div", { className: getClassName22({ isExpanded: expanded }), children: [
-    title && /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime30.jsxs)("div", { className: getClassName21({ isExpanded: expanded }), children: [
+    title && /* @__PURE__ */ (0, import_jsx_runtime30.jsxs)(
       "button",
       {
         type: "button",
-        className: getClassName22("title"),
+        className: getClassName21("title"),
         onClick: () => setUi({
           componentList: __spreadProps(__spreadValues({}, componentList), {
             [id]: __spreadProps(__spreadValues({}, componentList[id]), {
@@ -6838,14 +6828,14 @@ var ComponentList = ({
         }),
         title: expanded ? `Collapse${title ? ` ${title}` : ""}` : `Expand${title ? ` ${title}` : ""}`,
         children: [
-          /* @__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_runtime30.jsx)("div", { children: title }),
+          /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("div", { className: getClassName21("titleIcon"), children: expanded ? /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(ChevronUp, { size: 12 }) : /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(ChevronDown, { size: 12 }) })
         ]
       }
     ),
-    /* @__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) => {
+    /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("div", { className: getClassName21("content"), children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(Drawer, { children: children || Object.keys(config.components).map((componentKey) => {
       var _a;
-      return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+      return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
         ComponentListItem,
         {
           label: (_a = config.components[componentKey]["label"]) != null ? _a : componentKey,
@@ -6859,12 +6849,12 @@ var ComponentList = ({
 ComponentList.Item = ComponentListItem;
 
 // lib/use-component-list.tsx
-var import_jsx_runtime32 = require("react/jsx-runtime");
+var import_jsx_runtime31 = require("react/jsx-runtime");
 var useComponentList = () => {
-  const [componentList, setComponentList] = (0, import_react40.useState)();
+  const [componentList, setComponentList] = (0, import_react43.useState)();
   const config = useAppStore((s) => s.config);
   const uiComponentList = useAppStore((s) => s.state.ui.componentList);
-  (0, import_react40.useEffect)(() => {
+  (0, import_react43.useEffect)(() => {
     var _a, _b, _c;
     if (Object.keys(uiComponentList).length > 0) {
       const matchedComponents = [];
@@ -6874,7 +6864,7 @@ var useComponentList = () => {
           if (category.visible === false || !category.components) {
             return null;
           }
-          return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+          return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
             ComponentList,
             {
               id: categoryKey,
@@ -6883,7 +6873,7 @@ var useComponentList = () => {
                 var _a2;
                 matchedComponents.push(componentName);
                 const componentConf = config.components[componentName] || {};
-                return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+                return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
                   ComponentList.Item,
                   {
                     label: (_a2 = componentConf["label"]) != null ? _a2 : componentName,
@@ -6903,7 +6893,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_runtime32.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
             ComponentList,
             {
               id: "other",
@@ -6911,7 +6901,7 @@ var useComponentList = () => {
               children: remainingComponents.map((componentName, i) => {
                 var _a2;
                 const componentConf = config.components[componentName] || {};
-                return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+                return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
                   ComponentList.Item,
                   {
                     name: componentName,
@@ -6933,25 +6923,25 @@ var useComponentList = () => {
 };
 
 // components/Puck/components/Components/index.tsx
-var import_react41 = require("react");
-var import_jsx_runtime33 = require("react/jsx-runtime");
+var import_react44 = require("react");
+var import_jsx_runtime32 = 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_runtime33.jsx)(Wrapper, { children: componentList ? componentList : /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(ComponentList, { id: "all" }) });
+  const Wrapper = (0, import_react44.useMemo)(() => overrides.components || "div", [overrides]);
+  return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Wrapper, { children: componentList ? componentList : /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(ComponentList, { id: "all" }) });
 };
 
 // components/Puck/components/Preview/index.tsx
 init_react_import();
-var import_react43 = require("react");
+var import_react46 = require("react");
 
 // components/AutoFrame/index.tsx
 init_react_import();
-var import_react42 = require("react");
+var import_react45 = require("react");
 var import_object_hash = __toESM(require("object-hash"));
 var import_react_dom3 = require("react-dom");
-var import_jsx_runtime34 = require("react/jsx-runtime");
+var import_jsx_runtime33 = require("react/jsx-runtime");
 var styleSelector = 'style, link[rel="stylesheet"]';
 var collectStyles = (doc) => {
   const collected = [];
@@ -6994,7 +6984,7 @@ var CopyHostStyles = ({
   onStylesLoaded = () => null
 }) => {
   const { document: doc, window: win } = useFrame();
-  (0, import_react42.useEffect)(() => {
+  (0, import_react45.useEffect)(() => {
     if (!win || !doc) {
       return () => {
       };
@@ -7151,10 +7141,10 @@ var CopyHostStyles = ({
       observer.disconnect();
     };
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(import_jsx_runtime34.Fragment, { children });
+  return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(import_jsx_runtime33.Fragment, { children });
 };
-var autoFrameContext = (0, import_react42.createContext)({});
-var useFrame = () => (0, import_react42.useContext)(autoFrameContext);
+var autoFrameContext = (0, import_react45.createContext)({});
+var useFrame = () => (0, import_react45.useContext)(autoFrameContext);
 function AutoFrame(_a) {
   var _b = _a, {
     children,
@@ -7175,11 +7165,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_react45.useState)(false);
+  const [ctx, setCtx] = (0, import_react45.useState)({});
+  const [mountTarget, setMountTarget] = (0, import_react45.useState)();
+  const [stylesLoaded, setStylesLoaded] = (0, import_react45.useState)(false);
+  (0, import_react45.useEffect)(() => {
     var _a2;
     if (frameRef.current) {
       const doc = frameRef.current.contentDocument;
@@ -7198,7 +7188,7 @@ function AutoFrame(_a) {
       }
     }
   }, [frameRef, loaded, stylesLoaded]);
-  return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
     "iframe",
     __spreadProps(__spreadValues({}, props), {
       className,
@@ -7208,7 +7198,7 @@ function AutoFrame(_a) {
       onLoad: () => {
         setLoaded(true);
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(autoFrameContext.Provider, { value: ctx, children: loaded && mountTarget && /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(autoFrameContext.Provider, { value: ctx, children: loaded && mountTarget && /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
         CopyHostStyles,
         {
           debug,
@@ -7224,14 +7214,14 @@ var AutoFrame_default = AutoFrame;
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Puck/components/Preview/styles.module.css#css-module
 init_react_import();
-var styles_module_default18 = { "PuckPreview": "_PuckPreview_z2rgu_1", "PuckPreview-frame": "_PuckPreview-frame_z2rgu_6" };
+var styles_module_default17 = { "PuckPreview": "_PuckPreview_z2rgu_1", "PuckPreview-frame": "_PuckPreview-frame_z2rgu_6" };
 
 // components/Puck/components/Preview/index.tsx
-var import_jsx_runtime35 = require("react/jsx-runtime");
-var getClassName23 = get_class_name_factory_default("PuckPreview", styles_module_default18);
+var import_jsx_runtime34 = require("react/jsx-runtime");
+var getClassName22 = get_class_name_factory_default("PuckPreview", styles_module_default17);
 var useBubbleIframeEvents = (ref) => {
   const status = useAppStore((s) => s.status);
-  (0, import_react43.useEffect)(() => {
+  (0, import_react46.useEffect)(() => {
     if (ref.current && status === "READY") {
       const iframe = ref.current;
       const handlePointerMove = (event) => {
@@ -7269,7 +7259,7 @@ var useBubbleIframeEvents = (ref) => {
     }
   }, [status]);
 };
-var Preview3 = ({ id = "puck-preview" }) => {
+var Preview2 = ({ id = "puck-preview" }) => {
   const dispatch = useAppStore((s) => s.dispatch);
   const root = useAppStore((s) => s.state.data.root);
   const config = useAppStore((s) => s.config);
@@ -7280,22 +7270,25 @@ 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_react46.useCallback)(
     (pageProps) => {
       var _a, _b;
-      const rootConfig = config.root;
-      const propsWithSlots = useSlots(rootConfig, pageProps, DropZoneEditPure);
+      const propsWithSlots = useSlots(
+        config,
+        { type: "root", props: 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_runtime35.jsx)(import_jsx_runtime35.Fragment, { children: propsWithSlots.children });
+      }, propsWithSlots)) : /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(import_jsx_runtime34.Fragment, { children: propsWithSlots.children });
     },
-    [config.root]
+    [config]
   );
-  const Frame = (0, import_react43.useMemo)(() => overrides.iframe, [overrides]);
+  const Frame = (0, import_react46.useMemo)(() => overrides.iframe, [overrides]);
   const rootProps = root.props || root;
-  const ref = (0, import_react43.useRef)(null);
+  const ref = (0, import_react46.useRef)(null);
   useBubbleIframeEvents(ref);
-  const inner = !renderData ? /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+  const inner = !renderData ? /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
     Page,
     __spreadProps(__spreadValues({}, rootProps), {
       puck: {
@@ -7305,28 +7298,28 @@ var Preview3 = ({ id = "puck-preview" }) => {
         metadata
       },
       editMode: true,
-      children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(DropZonePure, { zone: rootDroppableId })
+      children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(DropZonePure, { zone: rootDroppableId })
     })
-  ) : /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Render, { data: renderData, config });
-  (0, import_react43.useEffect)(() => {
+  ) : /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Render, { data: renderData, config });
+  (0, import_react46.useEffect)(() => {
     if (!iframe.enabled) {
       setStatus("READY");
     }
   }, [iframe.enabled]);
-  return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
     "div",
     {
-      className: getClassName23(),
+      className: getClassName22(),
       id,
       "data-puck-preview": true,
       onClick: () => {
         dispatch({ type: "setUi", ui: { itemSelector: null } });
       },
-      children: iframe.enabled ? /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+      children: iframe.enabled ? /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
         AutoFrame_default,
         {
           id: "preview-frame",
-          className: getClassName23("frame"),
+          className: getClassName22("frame"),
           "data-rfd-iframe": true,
           onReady: () => {
             setStatus("READY");
@@ -7335,18 +7328,18 @@ var Preview3 = ({ id = "puck-preview" }) => {
             setStatus("MOUNTED");
           },
           frameRef: ref,
-          children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(autoFrameContext.Consumer, { children: ({ document: document2 }) => {
+          children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(autoFrameContext.Consumer, { children: ({ document: document2 }) => {
             if (Frame) {
-              return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Frame, { document: document2, children: inner });
+              return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Frame, { document: document2, children: inner });
             }
             return inner;
           } })
         }
-      ) : /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+      ) : /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
         "div",
         {
           id: "preview-frame",
-          className: getClassName23("frame"),
+          className: getClassName22("frame"),
           ref,
           "data-puck-entry": true,
           children: inner
@@ -7364,7 +7357,7 @@ init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/LayerTree/styles.module.css#css-module
 init_react_import();
-var styles_module_default19 = { "LayerTree": "_LayerTree_7rx04_1", "LayerTree-zoneTitle": "_LayerTree-zoneTitle_7rx04_11", "LayerTree-helper": "_LayerTree-helper_7rx04_17", "Layer": "_Layer_7rx04_1", "Layer-inner": "_Layer-inner_7rx04_29", "Layer--containsZone": "_Layer--containsZone_7rx04_35", "Layer-clickable": "_Layer-clickable_7rx04_39", "Layer--isSelected": "_Layer--isSelected_7rx04_61", "Layer-chevron": "_Layer-chevron_7rx04_77", "Layer--childIsSelected": "_Layer--childIsSelected_7rx04_78", "Layer-zones": "_Layer-zones_7rx04_82", "Layer-title": "_Layer-title_7rx04_96", "Layer-name": "_Layer-name_7rx04_105", "Layer-icon": "_Layer-icon_7rx04_111", "Layer-zoneIcon": "_Layer-zoneIcon_7rx04_116" };
+var styles_module_default18 = { "LayerTree": "_LayerTree_7rx04_1", "LayerTree-zoneTitle": "_LayerTree-zoneTitle_7rx04_11", "LayerTree-helper": "_LayerTree-helper_7rx04_17", "Layer": "_Layer_7rx04_1", "Layer-inner": "_Layer-inner_7rx04_29", "Layer--containsZone": "_Layer--containsZone_7rx04_35", "Layer-clickable": "_Layer-clickable_7rx04_39", "Layer--isSelected": "_Layer--isSelected_7rx04_61", "Layer-chevron": "_Layer-chevron_7rx04_77", "Layer--childIsSelected": "_Layer--childIsSelected_7rx04_78", "Layer-zones": "_Layer-zones_7rx04_82", "Layer-title": "_Layer-title_7rx04_96", "Layer-name": "_Layer-name_7rx04_105", "Layer-icon": "_Layer-icon_7rx04_111", "Layer-zoneIcon": "_Layer-zoneIcon_7rx04_116" };
 
 // lib/scroll-into-view.ts
 init_react_import();
@@ -7378,7 +7371,7 @@ var scrollIntoView = (el) => {
 };
 
 // components/LayerTree/index.tsx
-var import_react44 = require("react");
+var import_react47 = require("react");
 
 // lib/on-scroll-end.ts
 init_react_import();
@@ -7400,21 +7393,21 @@ var onScrollEnd = (frame, cb) => {
 };
 
 // components/LayerTree/index.tsx
-var import_shallow5 = require("zustand/react/shallow");
-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 import_shallow6 = require("zustand/react/shallow");
+var import_jsx_runtime35 = require("react/jsx-runtime");
+var getClassName23 = get_class_name_factory_default("LayerTree", styles_module_default18);
+var getClassNameLayer = get_class_name_factory_default("Layer", styles_module_default18);
 var Layer = ({
   index,
   itemId,
   zoneCompound
 }) => {
   var _a;
-  const ctx = (0, import_react44.useContext)(dropZoneContext);
+  const ctx = (0, import_react47.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_react47.useCallback)(
     (itemSelector2) => {
       dispatch({ type: "setUi", ui: { itemSelector: itemSelector2 } });
     },
@@ -7427,16 +7420,18 @@ var Layer = ({
   const isSelected = selecedItemId === itemId || itemSelector && itemSelector.zone === rootDroppableId && !zoneCompound;
   const nodeData = useAppStore((s) => s.state.indexes.nodes[itemId]);
   const zonesForItem = useAppStore(
-    (0, import_shallow5.useShallow)(
+    (0, import_shallow6.useShallow)(
       (s) => Object.keys(s.state.indexes.zones).filter(
         (z) => z.split(":")[0] === itemId
       )
     )
   );
   const containsZone = zonesForItem.length > 0;
-  const { setHoveringComponent = () => {
-  }, hoveringComponent } = ctx || {};
-  const isHovering = hoveringComponent === itemId;
+  const zoneStore = (0, import_react47.useContext)(ZoneStoreContext);
+  const isHovering = useContextStore(
+    ZoneStoreContext,
+    (s) => s.hoveringComponent === itemId
+  );
   const childIsSelected = useAppStore((s) => {
     var _a2, _b;
     const selectedData = s.state.indexes.nodes[(_a2 = s.selectedItem) == null ? void 0 : _a2.props.id];
@@ -7447,7 +7442,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_runtime36.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(
     "li",
     {
       className: getClassNameLayer({
@@ -7457,7 +7452,7 @@ var Layer = ({
         childIsSelected
       }),
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassNameLayer("inner"), children: /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(
+        /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: getClassNameLayer("inner"), children: /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(
           "button",
           {
             type: "button",
@@ -7472,7 +7467,10 @@ var Layer = ({
                 `[data-puck-component="${itemId}"]`
               );
               if (!el) {
-                console.error("Scroll failed. No element was found for", itemId);
+                setItemSelector({
+                  index,
+                  zone: zoneCompound
+                });
                 return;
               }
               scrollIntoView(el);
@@ -7483,31 +7481,31 @@ var Layer = ({
                 });
               });
             },
-            onMouseOver: (e) => {
+            onMouseEnter: (e) => {
               e.stopPropagation();
-              setHoveringComponent(itemId);
+              zoneStore.setState({ hoveringComponent: itemId });
             },
-            onMouseOut: (e) => {
+            onMouseLeave: (e) => {
               e.stopPropagation();
-              setHoveringComponent(null);
+              zoneStore.setState({ hoveringComponent: null });
             },
             children: [
-              containsZone && /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
+              containsZone && /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
                 "div",
                 {
                   className: getClassNameLayer("chevron"),
                   title: isSelected ? "Collapse" : "Expand",
-                  children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(ChevronDown, { size: "12" })
+                  children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(ChevronDown, { size: "12" })
                 }
               ),
-              /* @__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 })
+              /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { className: getClassNameLayer("title"), children: [
+                /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: getClassNameLayer("icon"), children: nodeData.data.type === "Text" || nodeData.data.type === "Heading" ? /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Type, { size: "16" }) : /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(LayoutGrid, { size: "16" }) }),
+                /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: getClassNameLayer("name"), children: label })
               ] })
             ]
           }
         ) }),
-        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))
+        containsZone && zonesForItem.map((subzone) => /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: getClassNameLayer("zones"), children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(LayerTree, { zoneCompound: subzone }) }, subzone))
       ]
     }
   );
@@ -7518,22 +7516,22 @@ var LayerTree = ({
 }) => {
   const label = _label != null ? _label : zoneCompound.split(":")[1];
   const contentIds = useAppStore(
-    (0, import_shallow5.useShallow)(
+    (0, import_shallow6.useShallow)(
       (s) => {
         var _a, _b;
         return zoneCompound ? (_b = (_a = s.state.indexes.zones[zoneCompound]) == null ? void 0 : _a.contentIds) != null ? _b : [] : [];
       }
     )
   );
-  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" }) }),
+  return /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(import_jsx_runtime35.Fragment, { children: [
+    label && /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { className: getClassName23("zoneTitle"), children: [
+      /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: getClassName23("zoneIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Layers, { size: "16" }) }),
       label
     ] }),
-    /* @__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" }),
+    /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("ul", { className: getClassName23(), children: [
+      contentIds.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: getClassName23("helper"), children: "No items" }),
       contentIds.map((itemId, i) => {
-        return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
+        return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
           Layer,
           {
             index: i,
@@ -7548,7 +7546,7 @@ var LayerTree = ({
 };
 
 // components/Puck/components/Outline/index.tsx
-var import_react45 = require("react");
+var import_react48 = require("react");
 
 // lib/data/find-zones-for-area.ts
 init_react_import();
@@ -7559,15 +7557,15 @@ var findZonesForArea = (state, area) => {
 };
 
 // components/Puck/components/Outline/index.tsx
-var import_shallow6 = require("zustand/react/shallow");
-var import_jsx_runtime37 = require("react/jsx-runtime");
+var import_shallow7 = require("zustand/react/shallow");
+var import_jsx_runtime36 = 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"))
+    (0, import_shallow7.useShallow)((s) => findZonesForArea(s.state, "root"))
   );
-  const Wrapper = (0, import_react45.useMemo)(() => outlineOverride || "div", [outlineOverride]);
-  return /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Wrapper, { children: rootZones.map((zoneCompound) => /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+  const Wrapper = (0, import_react48.useMemo)(() => outlineOverride || "div", [outlineOverride]);
+  return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Wrapper, { children: rootZones.map((zoneCompound) => /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
     LayerTree,
     {
       label: rootZones.length === 1 ? "" : zoneCompound.split(":")[1],
@@ -7700,25 +7698,25 @@ var getBox = function getBox2(el) {
 };
 
 // components/Puck/components/Canvas/index.tsx
-var import_react47 = require("react");
+var import_react50 = require("react");
 
 // components/ViewportControls/index.tsx
 init_react_import();
-var import_react46 = require("react");
+var import_react49 = 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" };
+var styles_module_default19 = { "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_runtime38 = require("react/jsx-runtime");
+var import_jsx_runtime37 = require("react/jsx-runtime");
 var icons = {
-  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 })
+  Smartphone: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Smartphone, { size: 16 }),
+  Tablet: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Tablet, { size: 16 }),
+  Monitor: /* @__PURE__ */ (0, import_jsx_runtime37.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);
+var getClassName24 = get_class_name_factory_default("ViewportControls", styles_module_default19);
+var getClassNameButton = get_class_name_factory_default("ViewportButton", styles_module_default19);
 var ViewportButton = ({
   children,
   height = "auto",
@@ -7727,11 +7725,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_react49.useState)(false);
+  (0, import_react49.useEffect)(() => {
     setIsActive(width === viewports.current.width);
   }, [width, viewports.current.width]);
-  return /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("span", { className: getClassNameButton({ isActive }), children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("span", { className: getClassNameButton({ isActive }), children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
     IconButton,
     {
       title,
@@ -7740,7 +7738,7 @@ var ViewportButton = ({
         e.stopPropagation();
         onClick({ width, height });
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("span", { className: getClassNameButton("inner"), children })
+      children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("span", { className: getClassNameButton("inner"), children })
     }
   ) });
 };
@@ -7764,7 +7762,7 @@ var ViewportControls = ({
   const defaultsContainAutoZoom = defaultZoomOptions.find(
     (option) => option.value === autoZoom
   );
-  const zoomOptions = (0, import_react46.useMemo)(
+  const zoomOptions = (0, import_react49.useMemo)(
     () => [
       ...defaultZoomOptions,
       ...defaultsContainAutoZoom ? [] : [
@@ -7776,8 +7774,8 @@ var ViewportControls = ({
     ].filter((a) => a.value <= autoZoom).sort((a, b) => a.value > b.value ? 1 : -1),
     [autoZoom]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)("div", { className: getClassName25(), children: [
-    viewports.map((viewport, i) => /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)("div", { className: getClassName24(), children: [
+    viewports.map((viewport, i) => /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
       ViewportButton,
       {
         height: viewport.height,
@@ -7788,8 +7786,8 @@ var ViewportControls = ({
       },
       i
     )),
-    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: getClassName25("divider") }),
-    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("div", { className: getClassName24("divider") }),
+    /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
       IconButton,
       {
         title: "Zoom viewport out",
@@ -7803,10 +7801,10 @@ var ViewportControls = ({
             )].value
           );
         },
-        children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(ZoomOut, { size: 16 })
+        children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(ZoomOut, { size: 16 })
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
       IconButton,
       {
         title: "Zoom viewport in",
@@ -7820,19 +7818,19 @@ var ViewportControls = ({
             )].value
           );
         },
-        children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(ZoomIn, { size: 16 })
+        children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(ZoomIn, { size: 16 })
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: getClassName25("divider") }),
-    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("div", { className: getClassName24("divider") }),
+    /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
       "select",
       {
-        className: getClassName25("zoomSelect"),
+        className: getClassName24("zoomSelect"),
         value: zoom.toString(),
         onChange: (e) => {
           onZoom(parseFloat(e.currentTarget.value));
         },
-        children: zoomOptions.map((option) => /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
+        children: zoomOptions.map((option) => /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
           "option",
           {
             value: option.value,
@@ -7847,7 +7845,7 @@ var ViewportControls = ({
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Puck/components/Canvas/styles.module.css#css-module
 init_react_import();
-var styles_module_default21 = { "PuckCanvas": "_PuckCanvas_18jay_1", "PuckCanvas-controls": "_PuckCanvas-controls_18jay_16", "PuckCanvas-inner": "_PuckCanvas-inner_18jay_21", "PuckCanvas-root": "_PuckCanvas-root_18jay_30", "PuckCanvas--ready": "_PuckCanvas--ready_18jay_55", "PuckCanvas-loader": "_PuckCanvas-loader_18jay_60", "PuckCanvas--showLoader": "_PuckCanvas--showLoader_18jay_70" };
+var styles_module_default20 = { "PuckCanvas": "_PuckCanvas_18jay_1", "PuckCanvas-controls": "_PuckCanvas-controls_18jay_16", "PuckCanvas-inner": "_PuckCanvas-inner_18jay_21", "PuckCanvas-root": "_PuckCanvas-root_18jay_30", "PuckCanvas--ready": "_PuckCanvas--ready_18jay_55", "PuckCanvas-loader": "_PuckCanvas-loader_18jay_60", "PuckCanvas--showLoader": "_PuckCanvas--showLoader_18jay_70" };
 
 // lib/get-zoom-config.ts
 init_react_import();
@@ -7880,9 +7878,9 @@ var getZoomConfig = (uiViewport, frame, zoom) => {
 };
 
 // components/Puck/components/Canvas/index.tsx
-var import_shallow7 = require("zustand/react/shallow");
-var import_jsx_runtime39 = require("react/jsx-runtime");
-var getClassName26 = get_class_name_factory_default("PuckCanvas", styles_module_default21);
+var import_shallow8 = require("zustand/react/shallow");
+var import_jsx_runtime38 = require("react/jsx-runtime");
+var getClassName25 = get_class_name_factory_default("PuckCanvas", styles_module_default20);
 var ZOOM_ON_CHANGE = true;
 var Canvas = () => {
   const {
@@ -7894,7 +7892,7 @@ var Canvas = () => {
     status,
     iframe
   } = useAppStore(
-    (0, import_shallow7.useShallow)((s) => ({
+    (0, import_shallow8.useShallow)((s) => ({
       dispatch: s.dispatch,
       overrides: s.overrides,
       setUi: s.setUi,
@@ -7905,23 +7903,23 @@ var Canvas = () => {
     }))
   );
   const { leftSideBarVisible, rightSideBarVisible, viewports } = useAppStore(
-    (0, import_shallow7.useShallow)((s) => ({
+    (0, import_shallow8.useShallow)((s) => ({
       leftSideBarVisible: s.state.ui.leftSideBarVisible,
       rightSideBarVisible: s.state.ui.rightSideBarVisible,
       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_runtime39.jsx)(import_jsx_runtime39.Fragment, { children });
+  const frameRef = (0, import_react50.useRef)(null);
+  const [showTransition, setShowTransition] = (0, import_react50.useState)(false);
+  const defaultRender = (0, import_react50.useMemo)(() => {
+    const PuckDefault = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(import_jsx_runtime38.Fragment, { children });
     return PuckDefault;
   }, []);
-  const CustomPreview = (0, import_react47.useMemo)(
+  const CustomPreview = (0, import_react50.useMemo)(
     () => overrides.preview || defaultRender,
     [overrides]
   );
-  const getFrameDimensions = (0, import_react47.useCallback)(() => {
+  const getFrameDimensions = (0, import_react50.useCallback)(() => {
     if (frameRef.current) {
       const frame = frameRef.current;
       const box = getBox(frame);
@@ -7929,7 +7927,7 @@ var Canvas = () => {
     }
     return { width: 0, height: 0 };
   }, [frameRef]);
-  const resetAutoZoom = (0, import_react47.useCallback)(
+  const resetAutoZoom = (0, import_react50.useCallback)(
     (newViewports = viewports) => {
       if (frameRef.current) {
         setZoomConfig(
@@ -7943,11 +7941,11 @@ var Canvas = () => {
     },
     [frameRef, zoomConfig, viewports]
   );
-  (0, import_react47.useEffect)(() => {
+  (0, import_react50.useEffect)(() => {
     setShowTransition(false);
     resetAutoZoom(viewports);
   }, [frameRef, leftSideBarVisible, rightSideBarVisible]);
-  (0, import_react47.useEffect)(() => {
+  (0, import_react50.useEffect)(() => {
     const { height: frameHeight } = getFrameDimensions();
     if (viewports.current.height === "auto") {
       setZoomConfig(__spreadProps(__spreadValues({}, zoomConfig), {
@@ -7955,13 +7953,13 @@ var Canvas = () => {
       }));
     }
   }, [zoomConfig.zoom]);
-  (0, import_react47.useEffect)(() => {
+  (0, import_react50.useEffect)(() => {
     if (ZOOM_ON_CHANGE) {
       setShowTransition(true);
       resetAutoZoom(viewports);
     }
   }, [viewports.current.width]);
-  (0, import_react47.useEffect)(() => {
+  (0, import_react50.useEffect)(() => {
     const cb = () => {
       setShowTransition(false);
       resetAutoZoom();
@@ -7971,16 +7969,16 @@ var Canvas = () => {
       window.removeEventListener("resize", cb);
     };
   }, []);
-  const [showLoader, setShowLoader] = (0, import_react47.useState)(false);
-  (0, import_react47.useEffect)(() => {
+  const [showLoader, setShowLoader] = (0, import_react50.useState)(false);
+  (0, import_react50.useEffect)(() => {
     setTimeout(() => {
       setShowLoader(true);
     }, 500);
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)(
     "div",
     {
-      className: getClassName26({
+      className: getClassName25({
         ready: status === "READY" || !iframe.enabled || !iframe.waitForStyles,
         showLoader
       }),
@@ -7990,7 +7988,7 @@ var Canvas = () => {
         recordHistory: true
       }),
       children: [
-        viewports.controlsVisible && iframe.enabled && /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: getClassName26("controls"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+        viewports.controlsVisible && iframe.enabled && /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: getClassName25("controls"), children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
           ViewportControls,
           {
             autoZoom: zoomConfig.autoZoom,
@@ -8016,11 +8014,11 @@ var Canvas = () => {
             }
           }
         ) }),
-        /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: getClassName26("inner"), ref: frameRef, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)("div", { className: getClassName25("inner"), ref: frameRef, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
             "div",
             {
-              className: getClassName26("root"),
+              className: getClassName25("root"),
               style: {
                 width: iframe.enabled ? viewports.current.width : "100%",
                 height: zoomConfig.rootHeight,
@@ -8038,10 +8036,10 @@ var Canvas = () => {
                   })
                 );
               },
-              children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(CustomPreview, { children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Preview3, {}) })
+              children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(CustomPreview, { children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Preview2, {}) })
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: getClassName26("loader"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Loader, { size: 24 }) })
+          /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: getClassName25("loader"), children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Loader, { size: 24 }) })
         ] })
       ]
     }
@@ -8050,7 +8048,7 @@ var Canvas = () => {
 
 // lib/use-loaded-overrides.ts
 init_react_import();
-var import_react48 = require("react");
+var import_react51 = require("react");
 
 // lib/load-overrides.ts
 init_react_import();
@@ -8089,26 +8087,26 @@ var useLoadedOverrides = ({
   overrides,
   plugins
 }) => {
-  return (0, import_react48.useMemo)(() => {
+  return (0, import_react51.useMemo)(() => {
     return loadOverrides({ overrides, plugins });
   }, [plugins, overrides]);
 };
 
 // components/DefaultOverride/index.tsx
 init_react_import();
-var import_jsx_runtime40 = require("react/jsx-runtime");
-var DefaultOverride = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(import_jsx_runtime40.Fragment, { children });
+var import_jsx_runtime39 = require("react/jsx-runtime");
+var DefaultOverride = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(import_jsx_runtime39.Fragment, { children });
 
 // lib/use-inject-css.ts
 init_react_import();
-var import_react49 = require("react");
+var import_react52 = require("react");
 var styles = ``;
 var useInjectStyleSheet = (initialStyles, iframeEnabled) => {
-  const [el, setEl] = (0, import_react49.useState)();
-  (0, import_react49.useEffect)(() => {
+  const [el, setEl] = (0, import_react52.useState)();
+  (0, import_react52.useEffect)(() => {
     setEl(document.createElement("style"));
   }, []);
-  (0, import_react49.useEffect)(() => {
+  (0, import_react52.useEffect)(() => {
     var _a;
     if (!el || typeof window === "undefined") {
       return;
@@ -8128,10 +8126,10 @@ var useInjectGlobalCss = (iframeEnabled) => {
 
 // lib/use-preview-mode-hotkeys.ts
 init_react_import();
-var import_react50 = require("react");
+var import_react53 = require("react");
 var usePreviewModeHotkeys = () => {
   const appStore = useAppStoreApi();
-  const toggleInteractive = (0, import_react50.useCallback)(() => {
+  const toggleInteractive = (0, import_react53.useCallback)(() => {
     const dispatch = appStore.getState().dispatch;
     dispatch({
       type: "setUi",
@@ -8146,7 +8144,7 @@ var usePreviewModeHotkeys = () => {
 
 // lib/use-puck.ts
 init_react_import();
-var import_react51 = require("react");
+var import_react54 = require("react");
 var import_zustand6 = require("zustand");
 var generateUsePuck = (store) => {
   const history = {
@@ -8180,7 +8178,7 @@ var generateUsePuck = (store) => {
   const get = () => storeData;
   return __spreadProps(__spreadValues({}, storeData), { get });
 };
-var UsePuckStoreContext = (0, import_react51.createContext)(
+var UsePuckStoreContext = (0, import_react54.createContext)(
   null
 );
 var convertToPickedStore = (store) => {
@@ -8194,12 +8192,12 @@ var convertToPickedStore = (store) => {
   };
 };
 var useRegisterUsePuckStore = (appStore) => {
-  const [usePuckStore] = (0, import_react51.useState)(
+  const [usePuckStore] = (0, import_react54.useState)(
     () => (0, import_zustand6.createStore)(
       () => generateUsePuck(convertToPickedStore(appStore.getState()))
     )
   );
-  (0, import_react51.useEffect)(() => {
+  (0, import_react54.useEffect)(() => {
     return appStore.subscribe(
       (store) => convertToPickedStore(store),
       (pickedStore) => {
@@ -8211,7 +8209,7 @@ var useRegisterUsePuckStore = (appStore) => {
 };
 function createUsePuck() {
   return function usePuck2(selector) {
-    const usePuckApi = (0, import_react51.useContext)(UsePuckStoreContext);
+    const usePuckApi = (0, import_react54.useContext)(UsePuckStoreContext);
     if (!usePuckApi) {
       throw new Error("usePuck must be used inside <Puck>.");
     }
@@ -8223,32 +8221,255 @@ function createUsePuck() {
   };
 }
 function usePuck() {
-  (0, import_react51.useEffect)(() => {
+  (0, import_react54.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."
     );
   }, []);
   return createUsePuck()((s) => s);
 }
+function useGetPuck() {
+  const usePuckApi = (0, import_react54.useContext)(UsePuckStoreContext);
+  if (!usePuckApi) {
+    throw new Error("usePuckGet must be used inside <Puck>.");
+  }
+  return usePuckApi.getState;
+}
 
 // components/Puck/index.tsx
-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 = () => {
-  const title = useAppStore(
-    (s) => {
+var import_fast_deep_equal3 = __toESM(require("fast-deep-equal"));
+
+// components/Puck/components/Header/index.tsx
+init_react_import();
+var import_react55 = require("react");
+
+// components/MenuBar/index.tsx
+init_react_import();
+
+// css-module:/home/runner/work/puck/puck/packages/core/components/MenuBar/styles.module.css#css-module
+init_react_import();
+var styles_module_default21 = { "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_runtime40 = require("react/jsx-runtime");
+var getClassName26 = get_class_name_factory_default("MenuBar", styles_module_default21);
+function MenuBar({
+  menuOpen = false,
+  renderHeaderActions,
+  setMenuOpen
+}) {
+  const back = useAppStore((s) => s.history.back);
+  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_runtime40.jsx)(
+    "div",
+    {
+      className: getClassName26({ menuOpen }),
+      onClick: (event) => {
+        var _a;
+        const element = event.target;
+        if (window.matchMedia("(min-width: 638px)").matches) {
+          return;
+        }
+        if (element.tagName === "A" && ((_a = element.getAttribute("href")) == null ? void 0 : _a.startsWith("#"))) {
+          setMenuOpen(false);
+        }
+      },
+      children: /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)("div", { className: getClassName26("inner"), children: [
+        /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)("div", { className: getClassName26("history"), children: [
+          /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(IconButton, { title: "undo", disabled: !hasPast, onClick: back, children: /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Undo2, { size: 21 }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(IconButton, { title: "redo", disabled: !hasFuture, onClick: forward, children: /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Redo2, { size: 21 }) })
+        ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(import_jsx_runtime40.Fragment, { children: renderHeaderActions && renderHeaderActions() })
+      ] })
+    }
+  );
+}
+
+// css-module:/home/runner/work/puck/puck/packages/core/components/Puck/components/Header/styles.module.css#css-module
+init_react_import();
+var styles_module_default22 = { "PuckHeader": "_PuckHeader_15xnq_1", "PuckHeader-inner": "_PuckHeader-inner_15xnq_10", "PuckHeader-toggle": "_PuckHeader-toggle_15xnq_20", "PuckHeader--rightSideBarVisible": "_PuckHeader--rightSideBarVisible_15xnq_27", "PuckHeader-rightSideBarToggle": "_PuckHeader-rightSideBarToggle_15xnq_27", "PuckHeader--leftSideBarVisible": "_PuckHeader--leftSideBarVisible_15xnq_28", "PuckHeader-leftSideBarToggle": "_PuckHeader-leftSideBarToggle_15xnq_28", "PuckHeader-title": "_PuckHeader-title_15xnq_32", "PuckHeader-path": "_PuckHeader-path_15xnq_36", "PuckHeader-tools": "_PuckHeader-tools_15xnq_43", "PuckHeader-menuButton": "_PuckHeader-menuButton_15xnq_49", "PuckHeader--menuOpen": "_PuckHeader--menuOpen_15xnq_54" };
+
+// components/Puck/components/Header/index.tsx
+var import_jsx_runtime41 = require("react/jsx-runtime");
+var getClassName27 = get_class_name_factory_default("PuckHeader", styles_module_default22);
+var HeaderInner = () => {
+  const {
+    onPublish,
+    renderHeader,
+    renderHeaderActions,
+    headerTitle,
+    headerPath,
+    iframe: _iframe
+  } = usePropsContext();
+  const dispatch = useAppStore((s) => s.dispatch);
+  const appStore = useAppStoreApi();
+  const defaultHeaderRender = (0, import_react55.useMemo)(() => {
+    if (renderHeader) {
+      console.warn(
+        "`renderHeader` is deprecated. Please use `overrides.header` and the `usePuck` hook instead"
+      );
+      const RenderHeader = (_a) => {
+        var _b = _a, { actions } = _b, props = __objRest(_b, ["actions"]);
+        const Comp = renderHeader;
+        const appState = useAppStore((s) => s.state);
+        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_react55.useMemo)(() => {
+    if (renderHeaderActions) {
+      console.warn(
+        "`renderHeaderActions` is deprecated. Please use `overrides.headerActions` and the `usePuck` hook instead."
+      );
+      const RenderHeader = (props) => {
+        const Comp = renderHeaderActions;
+        const appState = useAppStore((s) => s.state);
+        return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState }));
+      };
+      return RenderHeader;
+    }
+    return DefaultOverride;
+  }, [renderHeader]);
+  const CustomHeader = useAppStore(
+    (s) => s.overrides.header || defaultHeaderRender
+  );
+  const CustomHeaderActions = useAppStore(
+    (s) => s.overrides.headerActions || defaultHeaderActionsRender
+  );
+  const [menuOpen, setMenuOpen] = (0, import_react55.useState)(false);
+  const rootTitle = useAppStore((s) => {
+    var _a, _b;
+    const rootData = (_a = s.state.indexes.nodes["root"]) == null ? void 0 : _a.data;
+    return (_b = rootData.props.title) != null ? _b : "";
+  });
+  const leftSideBarVisible = useAppStore((s) => s.state.ui.leftSideBarVisible);
+  const rightSideBarVisible = useAppStore(
+    (s) => s.state.ui.rightSideBarVisible
+  );
+  const toggleSidebars = (0, import_react55.useCallback)(
+    (sidebar) => {
+      const widerViewport = window.matchMedia("(min-width: 638px)").matches;
+      const sideBarVisible = sidebar === "left" ? leftSideBarVisible : rightSideBarVisible;
+      const oppositeSideBar = sidebar === "left" ? "rightSideBarVisible" : "leftSideBarVisible";
+      dispatch({
+        type: "setUi",
+        ui: __spreadValues({
+          [`${sidebar}SideBarVisible`]: !sideBarVisible
+        }, !widerViewport ? { [oppositeSideBar]: false } : {})
+      });
+    },
+    [dispatch, leftSideBarVisible, rightSideBarVisible]
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+    CustomHeader,
+    {
+      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_runtime41.jsx)(Globe, { size: "14px" }),
+          children: "Publish"
+        }
+      ) }) }),
+      children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+        "header",
+        {
+          className: getClassName27({ leftSideBarVisible, rightSideBarVisible }),
+          children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getClassName27("inner"), children: [
+            /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getClassName27("toggle"), children: [
+              /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: getClassName27("leftSideBarToggle"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                IconButton,
+                {
+                  onClick: () => {
+                    toggleSidebars("left");
+                  },
+                  title: "Toggle left sidebar",
+                  children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PanelLeft, { focusable: "false" })
+                }
+              ) }),
+              /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: getClassName27("rightSideBarToggle"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                IconButton,
+                {
+                  onClick: () => {
+                    toggleSidebars("right");
+                  },
+                  title: "Toggle right sidebar",
+                  children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PanelRight, { focusable: "false" })
+                }
+              ) })
+            ] }),
+            /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: getClassName27("title"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Heading, { rank: "2", size: "xs", children: [
+              headerTitle || rootTitle || "Page",
+              headerPath && /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(import_jsx_runtime41.Fragment, { children: [
+                " ",
+                /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("code", { className: getClassName27("path"), children: headerPath })
+              ] })
+            ] }) }),
+            /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getClassName27("tools"), children: [
+              /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: getClassName27("menuButton"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                IconButton,
+                {
+                  onClick: () => {
+                    return setMenuOpen(!menuOpen);
+                  },
+                  title: "Toggle menu bar",
+                  children: menuOpen ? /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(ChevronUp, { focusable: "false" }) : /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(ChevronDown, { focusable: "false" })
+                }
+              ) }),
+              /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                MenuBar,
+                {
+                  dispatch,
+                  onPublish,
+                  menuOpen,
+                  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_runtime41.jsx)(Globe, { size: "14px" }),
+                      children: "Publish"
+                    }
+                  ) }),
+                  setMenuOpen
+                }
+              )
+            ] })
+          ] })
+        }
+      )
+    }
+  );
+};
+var Header = (0, import_react55.memo)(HeaderInner);
+
+// components/Puck/index.tsx
+var import_jsx_runtime42 = require("react/jsx-runtime");
+var getClassName28 = get_class_name_factory_default("Puck", styles_module_default14);
+var getLayoutClassName = get_class_name_factory_default("PuckLayout", styles_module_default14);
+var FieldSideBar = () => {
+  const title = useAppStore(
+    (s) => {
       var _a, _b;
       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_runtime41.jsx)(SidebarSection, { noPadding: true, noBorderTop: true, showBreadcrumbs: true, title, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Fields, {}) });
+  return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(SidebarSection, { noPadding: true, noBorderTop: true, showBreadcrumbs: true, title, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Fields, {}) });
 };
-var propsContext = (0, import_react52.createContext)({});
+var propsContext = (0, import_react56.createContext)({});
 function PropsProvider(props) {
-  return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(propsContext.Provider, { value: props, children: props.children });
+  return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(propsContext.Provider, { value: props, children: props.children });
 }
-var usePropsContext = () => (0, import_react52.useContext)(propsContext);
+var usePropsContext = () => (0, import_react56.useContext)(propsContext);
 function PuckProvider({ children }) {
   const {
     config,
@@ -8264,11 +8485,14 @@ function PuckProvider({ children }) {
     metadata,
     onAction
   } = usePropsContext();
-  const iframe = __spreadValues({
-    enabled: true,
-    waitForStyles: true
-  }, _iframe);
-  const [generatedAppState] = (0, import_react52.useState)(() => {
+  const iframe = (0, import_react56.useMemo)(
+    () => __spreadValues({
+      enabled: true,
+      waitForStyles: true
+    }, _iframe),
+    [_iframe]
+  );
+  const [generatedAppState] = (0, import_react56.useState)(() => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const initial = __spreadValues(__spreadValues({}, defaultAppState.ui), initialUi);
     let clientUiState = {};
@@ -8328,7 +8552,7 @@ function PuckProvider({ children }) {
     return walkAppState(newAppState, config);
   });
   const { appendData = true } = _initialHistory || {};
-  const [blendedHistories] = (0, import_react52.useState)(
+  const [blendedHistories] = (0, import_react56.useState)(
     [
       ...(_initialHistory == null ? void 0 : _initialHistory.histories) || [],
       ...appendData ? [{ state: generatedAppState }] : []
@@ -8348,7 +8572,7 @@ function PuckProvider({ children }) {
     overrides,
     plugins
   });
-  const generateAppStore = (0, import_react52.useCallback)(
+  const generateAppStore = (0, import_react56.useCallback)(
     (state) => {
       return {
         state,
@@ -8372,10 +8596,10 @@ function PuckProvider({ children }) {
       metadata
     ]
   );
-  const [appStore] = (0, import_react52.useState)(
+  const [appStore] = (0, import_react56.useState)(
     () => createAppStore(generateAppStore(initialAppState))
   );
-  (0, import_react52.useEffect)(() => {
+  (0, import_react56.useEffect)(() => {
     const state = appStore.getState().state;
     appStore.setState(__spreadValues({}, generateAppStore(state)));
   }, [config, plugins, loadedOverrides, viewports, iframe, onAction, metadata]);
@@ -8384,66 +8608,47 @@ function PuckProvider({ children }) {
     index: initialHistoryIndex,
     initialAppState
   });
-  (0, import_react52.useEffect)(() => {
-    appStore.subscribe((s) => {
-      if (onChange) onChange(s.state.data);
-    });
+  const previousData = (0, import_react56.useRef)(null);
+  (0, import_react56.useEffect)(() => {
+    appStore.subscribe(
+      (s) => s.state.data,
+      (data) => {
+        if (onChange) {
+          if ((0, import_fast_deep_equal3.default)(data, previousData.current)) return;
+          onChange(data);
+          previousData.current = data;
+        }
+      }
+    );
   }, []);
   useRegisterPermissionsSlice(appStore, permissions);
   const uPuckStore = useRegisterUsePuckStore(appStore);
-  (0, import_react52.useEffect)(() => {
+  (0, import_react56.useEffect)(() => {
     const { resolveAndCommitData } = appStore.getState();
     resolveAndCommitData();
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(appStoreContext.Provider, { value: appStore, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(UsePuckStoreContext.Provider, { value: uPuckStore, children }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(appStoreContext.Provider, { value: appStore, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(UsePuckStoreContext.Provider, { value: uPuckStore, children }) });
 }
 function PuckLayout({ children }) {
   const {
-    onChange,
-    onPublish,
-    renderHeader,
-    renderHeaderActions,
-    headerTitle,
-    headerPath,
     iframe: _iframe,
     dnd,
     initialHistory: _initialHistory
   } = usePropsContext();
-  const iframe = __spreadValues({
-    enabled: true,
-    waitForStyles: true
-  }, _iframe);
+  const iframe = (0, import_react56.useMemo)(
+    () => __spreadValues({
+      enabled: true,
+      waitForStyles: true
+    }, _iframe),
+    [_iframe]
+  );
   useInjectGlobalCss(iframe.enabled);
   const leftSideBarVisible = useAppStore((s) => s.state.ui.leftSideBarVisible);
   const rightSideBarVisible = useAppStore(
     (s) => s.state.ui.rightSideBarVisible
   );
-  const [menuOpen, setMenuOpen] = (0, import_react52.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)(
-    (sidebar) => {
-      const widerViewport = window.matchMedia("(min-width: 638px)").matches;
-      const sideBarVisible = sidebar === "left" ? leftSideBarVisible : rightSideBarVisible;
-      const oppositeSideBar = sidebar === "left" ? "rightSideBarVisible" : "leftSideBarVisible";
-      dispatch({
-        type: "setUi",
-        ui: __spreadValues({
-          [`${sidebar}SideBarVisible`]: !sideBarVisible
-        }, !widerViewport ? { [oppositeSideBar]: false } : {})
-      });
-    },
-    [dispatch, leftSideBarVisible, rightSideBarVisible]
-  );
-  (0, import_react52.useEffect)(() => {
+  (0, import_react56.useEffect)(() => {
     if (!window.matchMedia("(min-width: 638px)").matches) {
       dispatch({
         type: "setUi",
@@ -8466,55 +8671,18 @@ function PuckLayout({ children }) {
       window.removeEventListener("resize", handleResize);
     };
   }, []);
-  const defaultHeaderRender = (0, import_react52.useMemo)(() => {
-    if (renderHeader) {
-      console.warn(
-        "`renderHeader` is deprecated. Please use `overrides.header` and the `usePuck` hook instead"
-      );
-      const RenderHeader = (_a) => {
-        var _b = _a, { actions } = _b, props = __objRest(_b, ["actions"]);
-        const Comp = renderHeader;
-        const appState = useAppStore((s) => s.state);
-        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)(() => {
-    if (renderHeaderActions) {
-      console.warn(
-        "`renderHeaderActions` is deprecated. Please use `overrides.headerActions` and the `usePuck` hook instead."
-      );
-      const RenderHeader = (props) => {
-        const Comp = renderHeaderActions;
-        const appState = useAppStore((s) => s.state);
-        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_react56.useMemo)(
     () => overrides.puck || DefaultOverride,
     [overrides]
   );
-  const CustomHeader = (0, import_react52.useMemo)(
-    () => overrides.header || defaultHeaderRender,
-    [overrides]
-  );
-  const CustomHeaderActions = (0, import_react52.useMemo)(
-    () => overrides.headerActions || defaultHeaderActionsRender,
-    [overrides]
-  );
-  const [mounted, setMounted] = (0, import_react52.useState)(false);
-  (0, import_react52.useEffect)(() => {
+  const [mounted, setMounted] = (0, import_react56.useState)(false);
+  (0, import_react56.useEffect)(() => {
     setMounted(true);
   }, []);
   const ready = useAppStore((s) => s.status === "READY");
   useMonitorHotkeys();
-  (0, import_react52.useEffect)(() => {
+  (0, import_react56.useEffect)(() => {
     if (ready && iframe.enabled) {
       const frameDoc = getFrame();
       if (frameDoc) {
@@ -8523,133 +8691,36 @@ function PuckLayout({ children }) {
     }
   }, [ready, iframe.enabled]);
   usePreviewModeHotkeys();
-  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)(
+  return /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: `Puck ${getClassName28()}`, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(DragDropContext, { disableAutoScroll: dnd == null ? void 0 : dnd.disableAutoScroll, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(CustomPuck, { children: children || /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
       "div",
       {
         className: getLayoutClassName({
           leftSideBarVisible,
-          menuOpen,
           mounted,
           rightSideBarVisible
         }),
-        children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getLayoutClassName("inner"), children: [
-          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
-            CustomHeader,
-            {
-              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_runtime41.jsx)(Globe, { size: "14px" }),
-                  children: "Publish"
-                }
-              ) }) }),
-              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_runtime41.jsx)(
-                        IconButton,
-                        {
-                          onClick: () => {
-                            toggleSidebars("left");
-                          },
-                          title: "Toggle left sidebar",
-                          children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PanelLeft, { focusable: "false" })
-                        }
-                      )
-                    }
-                  ),
-                  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
-                    "div",
-                    {
-                      className: getLayoutClassName("rightSideBarToggle"),
-                      children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
-                        IconButton,
-                        {
-                          onClick: () => {
-                            toggleSidebars("right");
-                          },
-                          title: "Toggle right sidebar",
-                          children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PanelRight, { focusable: "false" })
-                        }
-                      )
-                    }
-                  )
-                ] }),
-                /* @__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_runtime41.jsxs)(import_jsx_runtime41.Fragment, { children: [
-                    " ",
-                    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
-                      "code",
-                      {
-                        className: getLayoutClassName("headerPath"),
-                        children: headerPath
-                      }
-                    )
-                  ] })
-                ] }) }),
-                /* @__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_runtime41.jsx)(ChevronUp, { focusable: "false" }) : /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(ChevronDown, { focusable: "false" })
-                    }
-                  ) }),
-                  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
-                    MenuBar,
-                    {
-                      dispatch,
-                      onPublish,
-                      menuOpen,
-                      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_runtime41.jsx)(Globe, { size: "14px" }),
-                          children: "Publish"
-                        }
-                      ) }),
-                      setMenuOpen
-                    }
-                  )
-                ] })
-              ] }) })
-            }
-          ),
-          /* @__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, {}) })
+        children: /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: getLayoutClassName("inner"), children: [
+          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Header, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: getLayoutClassName("leftSideBar"), children: [
+            /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(SidebarSection, { title: "Components", noBorderTop: true, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Components, {}) }),
+            /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(SidebarSection, { title: "Outline", children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Outline, {}) })
           ] }),
-          /* @__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_runtime42.jsx)(Canvas, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("div", { className: getLayoutClassName("rightSideBar"), children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(FieldSideBar, {}) })
         ] })
       }
     ) }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { id: "puck-portal-root", className: getClassName27("portal") })
+    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("div", { id: "puck-portal-root", className: getClassName28("portal") })
   ] });
 }
 function Puck(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)) })) }));
+  return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(PropsProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(PuckProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(PuckLayout, __spreadValues({}, props)) })) }));
 }
 Puck.Components = Components;
 Puck.Fields = Fields;
 Puck.Outline = Outline;
-Puck.Preview = Preview3;
+Puck.Preview = Preview2;
 
 // lib/migrate.ts
 init_react_import();
@@ -8684,7 +8755,7 @@ var migrations = [
         const [id, slotName] = zoneCompound.split(":");
         const nodeData = indexes.nodes[id].data;
         const componentType = nodeData.type;
-        const configForComponent = config.components[componentType];
+        const configForComponent = id === "root" ? config.root : config.components[componentType];
         if (((_b = (_a2 = configForComponent == null ? void 0 : configForComponent.fields) == null ? void 0 : _a2[slotName]) == null ? void 0 : _b.type) === "slot") {
           updatedItems[id] = __spreadProps(__spreadValues({}, nodeData), {
             props: __spreadProps(__spreadValues({}, nodeData.props), {
@@ -8742,11 +8813,13 @@ var defaultData = (data) => __spreadProps(__spreadValues({}, data), {
 });
 
 // lib/transform-props.ts
-function transformProps(data, propTransforms) {
+function transformProps(data, propTransforms, config = { components: {} }) {
   const mapItem = (item) => {
     if (propTransforms[item.type]) {
       return __spreadProps(__spreadValues({}, item), {
-        props: propTransforms[item.type](item.props)
+        props: __spreadValues({
+          id: item.props.id
+        }, propTransforms[item.type](item.props))
       });
     }
     return item;
@@ -8755,23 +8828,18 @@ function transformProps(data, propTransforms) {
   const rootProps = defaultedData.root.props || defaultedData.root;
   let newRoot = __spreadValues({}, defaultedData.root);
   if (propTransforms["root"]) {
-    if (defaultedData.root.props) {
-      newRoot.props = propTransforms["root"](rootProps);
-    } else {
-      newRoot = propTransforms["root"](rootProps);
-    }
+    newRoot.props = propTransforms["root"](rootProps);
   }
-  const afterPropTransforms = __spreadProps(__spreadValues({}, defaultedData), {
-    root: newRoot,
-    content: defaultedData.content.map(mapItem),
-    zones: Object.keys(data.zones || {}).reduce(
-      (acc, zoneKey) => __spreadProps(__spreadValues({}, acc), {
-        [zoneKey]: data.zones[zoneKey].map(mapItem)
-      }),
-      {}
-    )
-  });
-  return afterPropTransforms;
+  const dataWithUpdatedRoot = __spreadProps(__spreadValues({}, defaultedData), { root: newRoot });
+  const updatedData = walkTree(
+    dataWithUpdatedRoot,
+    config,
+    (content) => content.map(mapItem)
+  );
+  if (!defaultedData.root.props) {
+    updatedData.root = updatedData.root.props;
+  }
+  return updatedData;
 }
 
 // lib/resolve-all-data.ts
@@ -8802,13 +8870,12 @@ function resolveAllData(_0, _1) {
         },
         () => {
         },
-        "force",
-        false
+        "force"
       )).node;
-      const resolvedDeep = yield mapSlotsAsync(
+      const resolvedDeep = yield mapSlots(
         resolved,
         processContent,
-        false
+        config
       );
       onResolveEnd == null ? void 0 : onResolveEnd(toComponent(resolvedDeep));
       return resolvedDeep;
@@ -8836,39 +8903,6 @@ function resolveAllData(_0, _1) {
     return dynamic;
   });
 }
-
-// lib/data/walk-tree.ts
-init_react_import();
-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)
-      }),
-      {}
-    )
-  };
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Action,
@@ -8889,6 +8923,7 @@ function walkTree(data, config, callbackFn) {
   renderContext,
   resolveAllData,
   transformProps,
+  useGetPuck,
   usePuck,
   walkTree
 });