@measured/puck 0.19.0-canary.036267f6 → 0.19.0-canary.046cb9ed

package/dist/index.js

@@ -181,7 +181,8 @@ __export(core_exports, {
   renderContext: () => renderContext,
   resolveAllData: () => resolveAllData,
   transformProps: () => transformProps,
-  usePuck: () => usePuck
+  usePuck: () => usePuck,
+  walkTree: () => walkTree
 });
 module.exports = __toCommonJS(core_exports);
 init_react_import();
@@ -308,7 +309,7 @@ init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/AutoField/styles.module.css#css-module
 init_react_import();
-var styles_module_default2 = { "InputWrapper": "_InputWrapper_g5w3n_1", "Input-label": "_Input-label_g5w3n_5", "Input-labelIcon": "_Input-labelIcon_g5w3n_14", "Input-disabledIcon": "_Input-disabledIcon_g5w3n_21", "Input-input": "_Input-input_g5w3n_26", "Input": "_Input_g5w3n_1", "Input--readOnly": "_Input--readOnly_g5w3n_74", "Input-radioGroupItems": "_Input-radioGroupItems_g5w3n_85", "Input-radio": "_Input-radio_g5w3n_85", "Input-radioInner": "_Input-radioInner_g5w3n_102", "Input-radioInput": "_Input-radioInput_g5w3n_147" };
+var styles_module_default2 = { "InputWrapper": "_InputWrapper_4xor1_1", "Input-label": "_Input-label_4xor1_5", "Input-labelIcon": "_Input-labelIcon_4xor1_14", "Input-disabledIcon": "_Input-disabledIcon_4xor1_21", "Input-input": "_Input-input_4xor1_26", "Input": "_Input_4xor1_1", "Input--readOnly": "_Input--readOnly_4xor1_75", "Input-radioGroupItems": "_Input-radioGroupItems_4xor1_86", "Input-radio": "_Input-radio_4xor1_86", "Input-radioInner": "_Input-radioInner_4xor1_103", "Input-radioInput": "_Input-radioInput_4xor1_148" };
 
 // components/AutoField/index.tsx
 var import_react22 = require("react");
@@ -670,7 +671,7 @@ init_react_import();
 // lib/filter.ts
 init_react_import();
 
-// lib/reorder.ts
+// lib/data/reorder.ts
 init_react_import();
 var reorder = (list, startIndex, endIndex) => {
   const result = Array.from(list);
@@ -679,7 +680,7 @@ var reorder = (list, startIndex, endIndex) => {
   return result;
 };
 
-// lib/replace.ts
+// lib/data/replace.ts
 init_react_import();
 var replace = (list, index, newItem) => {
   const result = Array.from(list);
@@ -791,74 +792,30 @@ init_react_import();
 // reducer/index.ts
 init_react_import();
 
-// reducer/reduce.ts
+// reducer/actions/set.ts
 init_react_import();
 
-// lib/insert.ts
+// lib/data/walk-app-state.ts
 init_react_import();
-var insert = (list, index, item) => {
-  const result = Array.from(list || []);
-  result.splice(index, 0, item);
-  return result;
-};
-
-// lib/remove.ts
-init_react_import();
-var remove = (list, index) => {
-  const result = Array.from(list);
-  result.splice(index, 1);
-  return result;
-};
-
-// lib/setup-zone.ts
-init_react_import();
-
-// lib/root-droppable-id.ts
-init_react_import();
-var rootAreaId = "root";
-var rootZone = "default-zone";
-var rootDroppableId = `${rootAreaId}:${rootZone}`;
 
-// lib/setup-zone.ts
-var setupZone = (data, zoneKey) => {
-  if (zoneKey === rootDroppableId) {
-    return data;
-  }
-  const newData = __spreadProps(__spreadValues({}, data), {
-    zones: data.zones ? __spreadValues({}, data.zones) : {}
-  });
-  newData.zones[zoneKey] = newData.zones[zoneKey] || [];
-  return newData;
-};
-
-// lib/get-item.ts
+// lib/data/for-each-slot.ts
 init_react_import();
-function getItem(selector, state) {
-  var _a, _b;
-  const zone = (_a = state.indexes.zones) == null ? void 0 : _a[selector.zone || rootDroppableId];
-  return zone ? (_b = state.indexes.nodes[zone.contentIds[selector.index]]) == null ? void 0 : _b.data : void 0;
-}
 
-// lib/generate-id.ts
-init_react_import();
-var import_uuid = require("uuid");
-var generateId = (type) => type ? `${type}-${(0, import_uuid.v4)()}` : (0, import_uuid.v4)();
-
-// lib/walk-tree.ts
-init_react_import();
-
-// lib/for-each-slot.ts
-init_react_import();
-
-// lib/is-slot.ts
+// 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/for-each-slot.ts
-var forEachSlot = (_0, _1, ..._2) => __async(void 0, [_0, _1, ..._2], function* (item, cb, recursive = false, isSlot2 = isSlot) {
+// 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++) {
@@ -866,23 +823,31 @@ var forEachSlot = (_0, _1, ..._2) => __async(void 0, [_0, _1, ..._2], function*
     const itemType = "type" in item ? item.type : "root";
     if (isSlot2(itemType, propKey, props[propKey])) {
       const content = props[propKey];
-      yield cb(props.id, propKey, content);
+      cb(props.id, propKey, content);
       if (recursive) {
         content.forEach(
           (childItem) => __async(void 0, null, function* () {
-            return yield forEachSlot(childItem, cb, true, isSlot2);
+            return forEachSlot(childItem, cb, true, isSlot2);
           })
         );
       }
     }
   }
-});
+};
 
-// lib/for-related-zones.ts
+// lib/data/for-related-zones.ts
 init_react_import();
 
 // lib/get-zone-id.ts
 init_react_import();
+
+// lib/root-droppable-id.ts
+init_react_import();
+var rootAreaId = "root";
+var rootZone = "default-zone";
+var rootDroppableId = `${rootAreaId}:${rootZone}`;
+
+// lib/get-zone-id.ts
 var getZoneId = (zoneCompound) => {
   if (!zoneCompound) {
     return [];
@@ -893,19 +858,17 @@ var getZoneId = (zoneCompound) => {
   return [rootDroppableId, zoneCompound];
 };
 
-// lib/for-related-zones.ts
+// lib/data/for-related-zones.ts
 function forRelatedZones(item, data, cb, path = []) {
   Object.entries(data.zones || {}).forEach(([zoneCompound, content]) => {
     const [parentId] = getZoneId(zoneCompound);
     if (parentId === item.props.id) {
-      const newPath = [...path, zoneCompound];
-      content.forEach((item2) => forRelatedZones(item2, data, cb, newPath));
       cb(path, zoneCompound, content);
     }
   });
 }
 
-// lib/strip-slots.ts
+// lib/data/strip-slots.ts
 init_react_import();
 var stripSlots = (data) => {
   return __spreadProps(__spreadValues({}, data), {
@@ -921,8 +884,8 @@ var stripSlots = (data) => {
   });
 };
 
-// lib/walk-tree.ts
-function walkTree(state, config, mapContent = (content) => content, mapNodeOrSkip = (item) => item) {
+// lib/data/walk-app-state.ts
+function walkAppState(state, config, mapContent = (content) => content, mapNodeOrSkip = (item) => item) {
   var _a;
   let newZones = {};
   const newZoneIndex = {};
@@ -963,7 +926,6 @@ function walkTree(state, config, mapContent = (content) => content, mapNodeOrSki
     const mappedItem = mapNodeOrSkip(item, path, index);
     if (!mappedItem) return item;
     const id = mappedItem.props.id;
-    processRelatedZones(item, id, path);
     const newProps = __spreadValues({}, mappedItem.props);
     forEachSlot(
       mappedItem,
@@ -979,13 +941,9 @@ function walkTree(state, config, mapContent = (content) => content, mapNodeOrSki
         newProps[slotId] = newContent2;
       },
       false,
-      (itemType, propName, propValue) => {
-        var _a2, _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 = (_a2 = configForComponent.fields) == null ? void 0 : _a2[propName]) == null ? void 0 : _b.type) === "slot";
-      }
+      createIsSlotConfig(config)
     );
+    processRelatedZones(item, id, path);
     const newItem = __spreadProps(__spreadValues({}, item), { props: newProps });
     const thisZoneCompound = path[path.length - 1];
     const [parentId, zone] = thisZoneCompound ? thisZoneCompound.split(":") : [null, ""];
@@ -996,7 +954,7 @@ function walkTree(state, config, mapContent = (content) => content, mapNodeOrSki
       parentId,
       zone
     };
-    const finalData = newItem;
+    const finalData = __spreadProps(__spreadValues({}, newItem), { props: __spreadValues({}, newItem.props) });
     if (newProps.id === "root") {
       delete finalData["type"];
       delete finalData.props["id"];
@@ -1011,8 +969,12 @@ function walkTree(state, config, mapContent = (content) => content, mapNodeOrSki
     "root"
   );
   const processedContent = newContent;
+  const zonesAlreadyProcessed = Object.keys(newZones);
   Object.keys(zones || {}).forEach((zoneCompound) => {
     const [parentId] = zoneCompound.split(":");
+    if (zonesAlreadyProcessed.includes(zoneCompound)) {
+      return;
+    }
     const [_2, newContent2] = processContent(
       [rootDroppableId],
       zoneCompound,
@@ -1036,7 +998,6 @@ function walkTree(state, config, mapContent = (content) => content, mapNodeOrSki
   return __spreadProps(__spreadValues({}, state), {
     data: {
       root,
-      // root: state.data.root, // TODO changing root causes it's entire subtree to re-render. Let's keep this disabled until the performance issues are resolved in #644.
       content: processedContent,
       zones: __spreadValues(__spreadValues({}, state.data.zones), newZones)
     },
@@ -1047,60 +1008,157 @@ function walkTree(state, config, mapContent = (content) => content, mapNodeOrSki
   });
 }
 
-// lib/deindex.ts
-init_react_import();
-var deindex = (state, componentData) => {
-  let zones = __spreadValues({}, state.indexes.zones);
-  let nodes = __spreadValues({}, state.indexes.nodes);
-  const dindexRelatedZones = (item) => {
-    forRelatedZones(item, state.data, (_path, zoneCompound, content) => {
-      content.forEach((subItem) => {
-        dindexChildren(subItem);
-        delete nodes[subItem.props.id];
-      });
-      delete zones[zoneCompound];
-    });
-  };
-  const dindexChildren = (item) => {
-    forEachSlot(
-      item,
-      (parentId, slotId, content) => {
-        const zoneCompound = `${parentId}:${slotId}`;
-        delete zones[zoneCompound];
-        content.forEach((item2) => {
-          dindexRelatedZones(item2);
-          delete nodes[item2.props.id];
-        });
-      },
-      true
+// reducer/actions/set.ts
+var setAction = (state, action, appStore) => {
+  if (typeof action.state === "object") {
+    const newState = __spreadValues(__spreadValues({}, state), action.state);
+    if (action.state.indexes) {
+      return newState;
+    }
+    console.warn(
+      "`set` is expensive and may cause unnecessary re-renders. Consider using a more atomic action instead."
     );
-  };
-  dindexRelatedZones(componentData);
-  dindexChildren(componentData);
-  delete nodes[componentData.props.id];
-  return { nodes, zones };
+    return walkAppState(newState, appStore.config);
+  }
+  return __spreadValues(__spreadValues({}, state), action.state(state));
 };
 
-// reducer/reduce.ts
-var zoneCache = {};
+// reducer/actions/insert.ts
+init_react_import();
+
+// lib/data/insert.ts
+init_react_import();
+var insert = (list, index, item) => {
+  const result = Array.from(list || []);
+  result.splice(index, 0, item);
+  return result;
+};
+
+// lib/generate-id.ts
+init_react_import();
+var import_uuid = require("uuid");
+var generateId = (type) => type ? `${type}-${(0, import_uuid.v4)()}` : (0, import_uuid.v4)();
+
+// lib/data/get-ids-for-parent.ts
+init_react_import();
 var getIdsForParent = (zoneCompound, state) => {
   const [parentId] = zoneCompound.split(":");
   const node = state.indexes.nodes[parentId];
   return ((node == null ? void 0 : node.path) || []).map((p) => p.split(":")[0]);
 };
-function insertAction(state, action, config) {
-  const id = action.id || generateId(action.componentType);
-  const emptyComponentData = {
-    type: action.componentType,
-    props: __spreadProps(__spreadValues({}, config.components[action.componentType].defaultProps || {}), {
-      id
-    })
+
+// lib/data/populate-ids.ts
+init_react_import();
+
+// lib/data/walk-tree.ts
+init_react_import();
+
+// lib/data/map-slots.ts
+init_react_import();
+function mapSlotsAsync(_0, _1) {
+  return __async(this, arguments, function* (item, map, recursive = true, isSlot2 = isSlot) {
+    const props = __spreadValues({}, item.props);
+    const propKeys = Object.keys(props);
+    for (let i = 0; i < propKeys.length; i++) {
+      const propKey = propKeys[i];
+      const itemType = "type" in item ? item.type : "root";
+      if (isSlot2(itemType, propKey, props[propKey])) {
+        const content = props[propKey];
+        const mappedContent = recursive ? yield Promise.all(
+          content.map((item2) => __async(this, null, function* () {
+            return yield mapSlotsAsync(item2, map, recursive, isSlot2);
+          }))
+        ) : content;
+        props[propKey] = yield map(mappedContent, propKey);
+      }
+    }
+    return __spreadProps(__spreadValues({}, item), { props });
+  });
+}
+function mapSlotsSync(item, map, isSlot2 = isSlot) {
+  var _a, _b;
+  const props = __spreadValues({}, item.props);
+  const propKeys = Object.keys(props);
+  for (let i = 0; i < propKeys.length; i++) {
+    const propKey = propKeys[i];
+    const itemType = "type" in item ? item.type : "root";
+    if (isSlot2(itemType, propKey, props[propKey])) {
+      const content = props[propKey];
+      const mappedContent = content.map((item2) => {
+        return mapSlotsSync(item2, map, isSlot2);
+      });
+      props[propKey] = (_b = map(mappedContent, (_a = props.id) != null ? _a : "root", propKey)) != null ? _b : mappedContent;
+    }
+  }
+  return __spreadProps(__spreadValues({}, item), { props });
+}
+
+// lib/data/walk-tree.ts
+function walkTree(data, config, callbackFn) {
+  var _a, _b;
+  const isSlot2 = createIsSlotConfig(config);
+  const walkItem = (item) => {
+    return mapSlotsSync(
+      item,
+      (content, parentId, propName) => callbackFn(content, { parentId, propName }),
+      isSlot2
+    );
   };
+  if ("props" in data) {
+    return walkItem(data);
+  }
+  const _data = data;
+  const zones = (_a = _data.zones) != null ? _a : {};
+  const mappedContent = _data.content.map(walkItem);
+  return {
+    root: walkItem(_data.root),
+    content: (_b = callbackFn(mappedContent, {
+      parentId: "root",
+      propName: "default-zone"
+    })) != null ? _b : mappedContent,
+    zones: Object.keys(zones).reduce(
+      (acc, zoneCompound) => __spreadProps(__spreadValues({}, acc), {
+        [zoneCompound]: zones[zoneCompound].map(walkItem)
+      }),
+      {}
+    )
+  };
+}
+
+// lib/data/populate-ids.ts
+var populateIds = (data, config, override = false) => {
+  const id = generateId(data.type);
+  return walkTree(
+    __spreadProps(__spreadValues({}, data), {
+      props: override ? __spreadProps(__spreadValues({}, data.props), { id }) : __spreadValues({ id }, data.props)
+    }),
+    config,
+    (contents) => contents.map((item) => {
+      const id2 = generateId(item.type);
+      return __spreadProps(__spreadValues({}, item), {
+        props: override ? __spreadProps(__spreadValues({}, item.props), { id: id2 }) : __spreadValues({ id: id2 }, item.props)
+      });
+    })
+  );
+};
+
+// reducer/actions/insert.ts
+function insertAction(state, action, appStore) {
+  const id = action.id || generateId(action.componentType);
+  const emptyComponentData = populateIds(
+    {
+      type: action.componentType,
+      props: __spreadProps(__spreadValues({}, appStore.config.components[action.componentType].defaultProps || {}), {
+        id
+      })
+    },
+    appStore.config
+  );
   const [parentId] = action.destinationZone.split(":");
   const idsInPath = getIdsForParent(action.destinationZone, state);
-  return walkTree(
+  return walkAppState(
     state,
-    config,
+    appStore.config,
     (content, zoneCompound) => {
       if (zoneCompound === action.destinationZone) {
         return insert(
@@ -1123,6 +1181,142 @@ function insertAction(state, action, config) {
     }
   );
 }
+
+// reducer/actions/replace.ts
+init_react_import();
+var replaceAction = (state, action, appStore) => {
+  const [parentId] = action.destinationZone.split(":");
+  const idsInPath = getIdsForParent(action.destinationZone, state);
+  const originalId = state.indexes.zones[action.destinationZone].contentIds[action.destinationIndex];
+  const idChanged = originalId !== action.data.props.id;
+  if (idChanged) {
+    throw new Error(
+      `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] = data;
+      }
+      return newContent;
+    },
+    (childItem, path) => {
+      const pathIds = path.map((p) => p.split(":")[0]);
+      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(data.props.id) > -1) {
+        return childItem;
+      }
+      return null;
+    }
+  );
+};
+
+// reducer/actions/replace-root.ts
+init_react_import();
+var replaceRootAction = (state, action, appStore) => {
+  return walkAppState(
+    state,
+    appStore.config,
+    (content) => content,
+    (childItem) => {
+      if (childItem.props.id === "root") {
+        return __spreadProps(__spreadValues({}, childItem), {
+          props: __spreadValues(__spreadValues({}, childItem.props), action.root.props),
+          readOnly: action.root.readOnly
+        });
+      }
+      return childItem;
+    }
+  );
+};
+
+// reducer/actions/duplicate.ts
+init_react_import();
+
+// lib/data/get-item.ts
+init_react_import();
+function getItem(selector, state) {
+  var _a, _b;
+  const zone = (_a = state.indexes.zones) == null ? void 0 : _a[selector.zone || rootDroppableId];
+  return zone ? (_b = state.indexes.nodes[zone.contentIds[selector.index]]) == null ? void 0 : _b.data : void 0;
+}
+
+// reducer/actions/duplicate.ts
+function duplicateAction(state, action, appStore) {
+  const item = getItem(
+    { index: action.sourceIndex, zone: action.sourceZone },
+    state
+  );
+  const idsInPath = getIdsForParent(action.sourceZone, state);
+  const newItem = __spreadProps(__spreadValues({}, item), {
+    props: __spreadProps(__spreadValues({}, item.props), {
+      id: generateId(item.type)
+    })
+  });
+  const modified = walkAppState(
+    state,
+    appStore.config,
+    (content, zoneCompound) => {
+      if (zoneCompound === action.sourceZone) {
+        return insert(content, action.sourceIndex + 1, item);
+      }
+      return content;
+    },
+    (childItem, path, index) => {
+      const zoneCompound = path[path.length - 1];
+      const parents = path.map((p) => p.split(":")[0]);
+      if (parents.indexOf(newItem.props.id) > -1) {
+        return __spreadProps(__spreadValues({}, childItem), {
+          props: __spreadProps(__spreadValues({}, childItem.props), {
+            id: generateId(childItem.type)
+          })
+        });
+      }
+      if (zoneCompound === action.sourceZone && index === action.sourceIndex + 1) {
+        return newItem;
+      }
+      const [sourceZoneParent] = action.sourceZone.split(":");
+      if (sourceZoneParent === childItem.props.id || idsInPath.indexOf(childItem.props.id) > -1) {
+        return childItem;
+      }
+      return null;
+    }
+  );
+  return __spreadProps(__spreadValues({}, modified), {
+    ui: __spreadProps(__spreadValues({}, modified.ui), {
+      itemSelector: {
+        index: action.sourceIndex + 1,
+        zone: action.sourceZone
+      }
+    })
+  });
+}
+
+// reducer/actions/reorder.ts
+init_react_import();
+
+// reducer/actions/move.ts
+init_react_import();
+
+// lib/data/remove.ts
+init_react_import();
+var remove = (list, index) => {
+  const result = Array.from(list);
+  result.splice(index, 1);
+  return result;
+};
+
+// reducer/actions/move.ts
 var moveAction = (state, action, appStore) => {
   if (action.sourceZone === action.destinationZone && action.sourceIndex === action.destinationIndex) {
     return state;
@@ -1134,7 +1328,7 @@ var moveAction = (state, action, appStore) => {
   if (!item) return state;
   const idsInSourcePath = getIdsForParent(action.sourceZone, state);
   const idsInDestinationPath = getIdsForParent(action.destinationZone, state);
-  return walkTree(
+  return walkAppState(
     state,
     appStore.config,
     (content, zoneCompound) => {
@@ -1159,225 +1353,164 @@ var moveAction = (state, action, appStore) => {
         return childItem;
       }
       return null;
-    }
-  );
-};
-var replaceAction = (state, action, appStore) => {
-  const [parentId] = action.destinationZone.split(":");
-  const idsInPath = getIdsForParent(action.destinationZone, state);
-  return walkTree(
-    state,
-    appStore.config,
-    (content) => content,
-    (childItem, path) => {
-      const pathIds = path.map((p) => p.split(":")[0]);
-      if (childItem.props.id === action.data.props.id) {
-        return action.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) {
-        return childItem;
-      }
-      return null;
-    }
-  );
-};
-var setAction = (state, action, appStore) => {
-  if (typeof action.state === "object") {
-    const newState = __spreadValues(__spreadValues({}, state), action.state);
-    if (action.state.indexes) {
-      console.warn(
-        "`set` is expensive and may cause unnecessary re-renders. Consider using a more atomic action instead."
-      );
-      return newState;
-    }
-    return walkTree(newState, appStore.config);
-  }
-  return __spreadValues(__spreadValues({}, state), action.state(state));
-};
-function reduce(state, action, appStore) {
-  if (action.type === "set") {
-    return setAction(state, action, appStore);
-  }
-  if (action.type === "insert") {
-    return insertAction(state, action, appStore.config);
-  }
-  if (action.type === "replace") {
-    return replaceAction(state, action, appStore);
-  }
-  if (action.type === "replaceRoot") {
-    return walkTree(
-      state,
-      appStore.config,
-      (content) => content,
-      (childItem) => {
-        if (childItem.props.id === "root") {
-          return __spreadProps(__spreadValues({}, childItem), {
-            props: __spreadValues(__spreadValues({}, childItem.props), action.root.props),
-            readOnly: action.root.readOnly
-          });
-        }
-        return childItem;
-      }
-    );
-  }
-  if (action.type === "duplicate") {
-    const item = getItem(
-      { index: action.sourceIndex, zone: action.sourceZone },
-      state
-    );
-    const idsInPath = getIdsForParent(action.sourceZone, state);
-    const newItem = __spreadProps(__spreadValues({}, item), {
-      props: __spreadProps(__spreadValues({}, item.props), {
-        id: generateId(item.type)
-      })
-    });
-    const modified = walkTree(
-      state,
-      appStore.config,
-      (content, zoneCompound) => {
-        if (zoneCompound === action.sourceZone) {
-          return insert(content, action.sourceIndex + 1, item);
-        }
-        return content;
-      },
-      (childItem, path, index) => {
-        const zoneCompound = path[path.length - 1];
-        const parents = path.map((p) => p.split(":")[0]);
-        if (parents.indexOf(newItem.props.id) > -1) {
-          return __spreadProps(__spreadValues({}, childItem), {
-            props: __spreadProps(__spreadValues({}, childItem.props), {
-              id: generateId(childItem.type)
-            })
-          });
-        }
-        if (zoneCompound === action.sourceZone && index === action.sourceIndex + 1) {
-          return newItem;
-        }
-        const [sourceZoneParent] = action.sourceZone.split(":");
-        if (sourceZoneParent === childItem.props.id || idsInPath.indexOf(childItem.props.id) > -1) {
-          return childItem;
-        }
-        return null;
+    }
+  );
+};
+
+// reducer/actions/reorder.ts
+var reorderAction = (state, action, appStore) => {
+  return moveAction(
+    state,
+    {
+      type: "move",
+      sourceIndex: action.sourceIndex,
+      sourceZone: action.destinationZone,
+      destinationIndex: action.destinationIndex,
+      destinationZone: action.destinationZone
+    },
+    appStore
+  );
+};
+
+// reducer/actions/remove.ts
+init_react_import();
+var removeAction = (state, action, appStore) => {
+  const item = getItem({ index: action.index, zone: action.zone }, state);
+  const nodesToDelete = Object.entries(state.indexes.nodes).reduce(
+    (acc, [nodeId, nodeData]) => {
+      const pathIds = nodeData.path.map((p) => p.split(":")[0]);
+      if (pathIds.includes(item.props.id)) {
+        return [...acc, nodeId];
       }
-    );
-    return __spreadProps(__spreadValues({}, modified), {
-      ui: __spreadProps(__spreadValues({}, modified.ui), {
-        itemSelector: {
-          index: action.sourceIndex + 1,
-          zone: action.sourceZone
-        }
-      })
-    });
-  }
-  if (action.type === "reorder") {
-    return moveAction(
-      state,
-      {
-        type: "move",
-        sourceIndex: action.sourceIndex,
-        sourceZone: action.destinationZone,
-        destinationIndex: action.destinationIndex,
-        destinationZone: action.destinationZone
-      },
-      appStore
-    );
-  }
-  if (action.type === "move") {
-    return moveAction(state, action, appStore);
-  }
-  if (action.type === "remove") {
-    const item = getItem({ index: action.index, zone: action.zone }, state);
-    let deindexed = deindex(state, item);
-    const [parentId] = action.zone.split(":");
-    return walkTree(
-      __spreadProps(__spreadValues({}, state), { indexes: deindexed }),
-      appStore.config,
-      (content, zoneCompound) => {
-        if (zoneCompound === action.zone) {
-          return remove(content, action.index);
-        }
-        return content;
-      },
-      (childItem, path) => {
-        const parentIds = path.map((p) => p.split(":")[0]);
-        if (childItem.props.id === parentId || childItem.props.id === item.props.id || parentIds.indexOf(item.props.id) > -1) {
-          return childItem;
-        }
-        return null;
+      return acc;
+    },
+    [item.props.id]
+  );
+  const newState = walkAppState(
+    state,
+    appStore.config,
+    (content, zoneCompound) => {
+      if (zoneCompound === action.zone) {
+        return remove(content, action.index);
       }
-    );
-  }
-  if (action.type === "registerZone") {
-    if (zoneCache[action.zone]) {
-      return __spreadProps(__spreadValues({}, state), {
-        data: __spreadProps(__spreadValues({}, state.data), {
-          zones: __spreadProps(__spreadValues({}, state.data.zones), {
-            [action.zone]: zoneCache[action.zone]
-          })
-        }),
-        indexes: __spreadProps(__spreadValues({}, state.indexes), {
-          zones: __spreadProps(__spreadValues({}, state.indexes.zones), {
-            [action.zone]: __spreadProps(__spreadValues({}, state.indexes.zones[action.zone]), {
-              contentIds: zoneCache[action.zone].map((item) => item.props.id),
-              type: "dropzone"
-            })
-          })
-        })
-      });
+      return content;
+    }
+  );
+  Object.keys(newState.data.zones || {}).forEach((zoneCompound) => {
+    const parentId = zoneCompound.split(":")[0];
+    if (nodesToDelete.includes(parentId) && newState.data.zones) {
+      delete newState.data.zones[zoneCompound];
+    }
+  });
+  Object.keys(newState.indexes.zones).forEach((zoneCompound) => {
+    const parentId = zoneCompound.split(":")[0];
+    if (nodesToDelete.includes(parentId)) {
+      delete newState.indexes.zones[zoneCompound];
     }
-    return __spreadProps(__spreadValues({}, state), { data: setupZone(state.data, action.zone) });
+  });
+  nodesToDelete.forEach((id) => {
+    delete newState.indexes.nodes[id];
+  });
+  return newState;
+};
+
+// reducer/actions/register-zone.ts
+init_react_import();
+
+// lib/data/setup-zone.ts
+init_react_import();
+var setupZone = (data, zoneKey) => {
+  if (zoneKey === rootDroppableId) {
+    return data;
   }
-  if (action.type === "unregisterZone") {
-    const _zones = __spreadValues({}, state.data.zones || {});
-    const zoneIndex = __spreadValues({}, state.indexes.zones || {});
-    if (_zones[action.zone]) {
-      zoneCache[action.zone] = _zones[action.zone];
-      delete _zones[action.zone];
-    }
-    delete zoneIndex[action.zone];
+  const newData = __spreadProps(__spreadValues({}, data), {
+    zones: data.zones ? __spreadValues({}, data.zones) : {}
+  });
+  newData.zones[zoneKey] = newData.zones[zoneKey] || [];
+  return newData;
+};
+
+// reducer/actions/register-zone.ts
+var zoneCache = {};
+function registerZoneAction(state, action) {
+  if (zoneCache[action.zone]) {
     return __spreadProps(__spreadValues({}, state), {
       data: __spreadProps(__spreadValues({}, state.data), {
-        zones: _zones
+        zones: __spreadProps(__spreadValues({}, state.data.zones), {
+          [action.zone]: zoneCache[action.zone]
+        })
       }),
       indexes: __spreadProps(__spreadValues({}, state.indexes), {
-        zones: zoneIndex
+        zones: __spreadProps(__spreadValues({}, state.indexes.zones), {
+          [action.zone]: __spreadProps(__spreadValues({}, state.indexes.zones[action.zone]), {
+            contentIds: zoneCache[action.zone].map((item) => item.props.id),
+            type: "dropzone"
+          })
+        })
       })
     });
   }
-  if (action.type === "setData") {
-    if (typeof action.data === "object") {
-      console.warn(
-        "`setData` is expensive and may cause unnecessary re-renders. Consider using a more atomic action instead."
-      );
-      return walkTree(
-        __spreadProps(__spreadValues({}, state), {
-          data: __spreadValues(__spreadValues({}, state.data), action.data)
-        }),
-        appStore.config
-      );
-    }
-    return walkTree(
+  return __spreadProps(__spreadValues({}, state), { data: setupZone(state.data, action.zone) });
+}
+function unregisterZoneAction(state, action) {
+  const _zones = __spreadValues({}, state.data.zones || {});
+  const zoneIndex = __spreadValues({}, state.indexes.zones || {});
+  if (_zones[action.zone]) {
+    zoneCache[action.zone] = _zones[action.zone];
+    delete _zones[action.zone];
+  }
+  delete zoneIndex[action.zone];
+  return __spreadProps(__spreadValues({}, state), {
+    data: __spreadProps(__spreadValues({}, state.data), {
+      zones: _zones
+    }),
+    indexes: __spreadProps(__spreadValues({}, state.indexes), {
+      zones: zoneIndex
+    })
+  });
+}
+
+// reducer/actions/set-data.ts
+init_react_import();
+var setDataAction = (state, action, appStore) => {
+  if (typeof action.data === "object") {
+    console.warn(
+      "`setData` is expensive and may cause unnecessary re-renders. Consider using a more atomic action instead."
+    );
+    return walkAppState(
       __spreadProps(__spreadValues({}, state), {
-        data: __spreadValues(__spreadValues({}, state.data), action.data(state.data))
+        data: __spreadValues(__spreadValues({}, state.data), action.data)
       }),
       appStore.config
     );
   }
-  if (action.type === "setUi") {
-    if (typeof action.ui === "object") {
-      return __spreadProps(__spreadValues({}, state), {
-        ui: __spreadValues(__spreadValues({}, state.ui), action.ui)
-      });
-    }
+  return walkAppState(
+    __spreadProps(__spreadValues({}, state), {
+      data: __spreadValues(__spreadValues({}, state.data), action.data(state.data))
+    }),
+    appStore.config
+  );
+};
+
+// reducer/actions/set-ui.ts
+init_react_import();
+var setUiAction = (state, action) => {
+  if (typeof action.ui === "object") {
     return __spreadProps(__spreadValues({}, state), {
-      ui: __spreadValues(__spreadValues({}, state.ui), action.ui(state.ui))
+      ui: __spreadValues(__spreadValues({}, state.ui), action.ui)
     });
   }
-  return state;
-}
+  return __spreadProps(__spreadValues({}, state), {
+    ui: __spreadValues(__spreadValues({}, state.ui), action.ui(state.ui))
+  });
+};
+
+// lib/data/make-state-public.ts
+init_react_import();
+var makeStatePublic = (state) => {
+  const { data, ui } = state;
+  return { data, ui };
+};
 
 // reducer/actions.tsx
 init_react_import();
@@ -1396,7 +1529,7 @@ function storeInterceptor(reducer, record, onAction) {
     if (typeof action.recordHistory !== "undefined" ? action.recordHistory : isValidType) {
       if (record) record(newAppState);
     }
-    onAction == null ? void 0 : onAction(action, newAppState, state);
+    onAction == null ? void 0 : onAction(action, makeStatePublic(newAppState), makeStatePublic(state));
     return newAppState;
   };
 }
@@ -1407,8 +1540,43 @@ function createReducer({
 }) {
   return storeInterceptor(
     (state, action) => {
-      const result = reduce(state, action, appStore);
-      return result;
+      if (action.type === "set") {
+        return setAction(state, action, appStore);
+      }
+      if (action.type === "insert") {
+        return insertAction(state, action, appStore);
+      }
+      if (action.type === "replace") {
+        return replaceAction(state, action, appStore);
+      }
+      if (action.type === "replaceRoot") {
+        return replaceRootAction(state, action, appStore);
+      }
+      if (action.type === "duplicate") {
+        return duplicateAction(state, action, appStore);
+      }
+      if (action.type === "reorder") {
+        return reorderAction(state, action, appStore);
+      }
+      if (action.type === "move") {
+        return moveAction(state, action, appStore);
+      }
+      if (action.type === "remove") {
+        return removeAction(state, action, appStore);
+      }
+      if (action.type === "registerZone") {
+        return registerZoneAction(state, action);
+      }
+      if (action.type === "unregisterZone") {
+        return unregisterZoneAction(state, action);
+      }
+      if (action.type === "setData") {
+        return setDataAction(state, action, appStore);
+      }
+      if (action.type === "setUi") {
+        return setUiAction(state, action);
+      }
+      return state;
     },
     record,
     onAction
@@ -1620,7 +1788,7 @@ var createHistorySlice = (set, get) => {
       const { dispatch, history } = get();
       dispatch({
         type: "set",
-        state: ((_a = history.histories[history.index]) == null ? void 0 : _a.state) || history.initialAppState
+        state: ((_a = history.histories[index]) == null ? void 0 : _a.state) || history.initialAppState
       });
       set({ history: __spreadProps(__spreadValues({}, history), { index }) });
     },
@@ -1697,11 +1865,11 @@ var createNodesSlice = (set, get) => ({
 init_react_import();
 var import_react7 = require("react");
 
-// lib/flatten-data.ts
+// lib/data/flatten-data.ts
 init_react_import();
 var flattenData = (state, config) => {
   const data = [];
-  walkTree(
+  walkAppState(
     state,
     config,
     (content) => content,
@@ -1732,12 +1900,7 @@ var createPermissionsSlice = (set, get) => {
     const { cache: cache2, globalPermissions } = permissions;
     const resolveDataForItem = (item2, force2 = false) => __async(void 0, null, function* () {
       var _a, _b, _c;
-      const {
-        config: config2,
-        state: appState,
-        setComponentLoading,
-        unsetComponentLoading
-      } = get();
+      const { config: config2, state: appState, setComponentLoading } = get();
       const componentConfig = item2.type === "root" ? config2.root : config2.components[item2.type];
       if (!componentConfig) {
         return;
@@ -1746,14 +1909,14 @@ var createPermissionsSlice = (set, get) => {
       if (componentConfig.resolvePermissions) {
         const changed = getChanged(item2, (_a = cache2[item2.props.id]) == null ? void 0 : _a.lastData);
         if (Object.values(changed).some((el) => el === true) || force2) {
-          setComponentLoading(item2.props.id);
+          const clearTimeout2 = setComponentLoading(item2.props.id, true, 50);
           const resolvedPermissions = yield componentConfig.resolvePermissions(
             item2,
             {
               changed,
               lastPermissions: ((_b = cache2[item2.props.id]) == null ? void 0 : _b.lastPermissions) || null,
               permissions: initialPermissions,
-              appState,
+              appState: makeStatePublic(appState),
               lastData: ((_c = cache2[item2.props.id]) == null ? void 0 : _c.lastData) || null
             }
           );
@@ -1771,7 +1934,7 @@ var createPermissionsSlice = (set, get) => {
               })
             })
           });
-          unsetComponentLoading(item2.props.id);
+          clearTimeout2();
         }
       }
     });
@@ -1781,7 +1944,7 @@ var createPermissionsSlice = (set, get) => {
         // Shim the root data in by conforming to component data shape
         {
           type: "root",
-          props: __spreadProps(__spreadValues({}, appState.data.root.props), { id: "puck-root" })
+          props: __spreadProps(__spreadValues({}, appState.data.root.props), { id: "root" })
         },
         force2
       );
@@ -1796,7 +1959,6 @@ var createPermissionsSlice = (set, get) => {
     } else if (root) {
       resolveDataForRoot(force);
     } else {
-      resolveDataForRoot(force);
       flattenData(state, config).map((item2) => __async(void 0, null, function* () {
         yield resolveDataForItem(item2, force);
       }));
@@ -1827,7 +1989,7 @@ var createPermissionsSlice = (set, get) => {
       } else if (root) {
         const rootConfig = config.root;
         const initialPermissions = __spreadValues(__spreadValues({}, globalPermissions), rootConfig == null ? void 0 : rootConfig.permissions);
-        const resolvedForItem = resolvedPermissions["puck-root"];
+        const resolvedForItem = resolvedPermissions["root"];
         return resolvedForItem ? __spreadValues(__spreadValues({}, globalPermissions), resolvedForItem) : initialPermissions;
       }
       return globalPermissions;
@@ -1872,7 +2034,8 @@ var createFieldsSlice = (_set, _get) => {
   return {
     fields: {},
     loading: false,
-    lastResolvedData: {}
+    lastResolvedData: {},
+    id: void 0
   };
 };
 var useRegisterFieldsSlice = (appStore, id) => {
@@ -1893,7 +2056,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;
       }
@@ -1910,7 +2073,7 @@ var useRegisterFieldsSlice = (appStore, id) => {
           fields: defaultFields,
           lastFields,
           lastData,
-          appState: state,
+          appState: makeStatePublic(state),
           parent
         });
         clearTimeout(timeout3);
@@ -1921,12 +2084,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 })
         }));
       }
     }),
@@ -1943,39 +2107,15 @@ var useRegisterFieldsSlice = (appStore, id) => {
 
 // lib/resolve-component-data.ts
 init_react_import();
-
-// lib/map-slots.ts
-init_react_import();
-function mapSlots(item, map, recursive = true, isSlot2) {
-  return __async(this, null, function* () {
-    const props = __spreadValues({}, item.props);
-    yield forEachSlot(
-      item,
-      (_parentId, propName, content) => __async(this, null, function* () {
-        const mappedContent = recursive ? yield Promise.all(
-          content.map((item2) => __async(this, null, function* () {
-            return yield mapSlots(item2, map, recursive, isSlot2);
-          }))
-        ) : content;
-        props[propName] = yield map(mappedContent, propName);
-      }),
-      false,
-      isSlot2
-    );
-    return __spreadProps(__spreadValues({}, item), { props });
-  });
-}
-
-// lib/resolve-component-data.ts
 var import_fast_deep_equal = __toESM(require("fast-deep-equal"));
 var cache = { lastChange: {} };
 var resolveComponentData = (_0, _1, ..._2) => __async(void 0, [_0, _1, ..._2], function* (item, config, metadata = {}, onResolveStart, onResolveEnd, trigger = "replace", recursive = true) {
-  const configForItem = "type" in item ? config.components[item.type] : config.root;
+  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 { item: oldItem = null, resolved = {} } = cache.lastChange[id] || {};
-    if (item && item === oldItem) {
-      return resolved;
+    if (item && (0, import_fast_deep_equal.default)(item, oldItem)) {
+      return { node: resolved, didChange: false };
     }
     const changed = getChanged(item, oldItem);
     if (onResolveStart) {
@@ -1984,30 +2124,35 @@ var resolveComponentData = (_0, _1, ..._2) => __async(void 0, [_0, _1, ..._2], f
     const { props: resolvedProps, readOnly = {} } = yield configForItem.resolveData(item, {
       changed,
       lastData: oldItem,
-      metadata,
+      metadata: __spreadValues(__spreadValues({}, metadata), configForItem.metadata),
       trigger
     });
     let resolvedItem = __spreadProps(__spreadValues({}, item), {
       props: __spreadValues(__spreadValues({}, item.props), resolvedProps)
     });
     if (recursive) {
-      resolvedItem = yield mapSlots(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;
-            })
-          )
-        );
-      }));
+      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)
+      );
     }
     if (Object.keys(readOnly).length) {
       resolvedItem.readOnly = readOnly;
@@ -2024,7 +2169,7 @@ var resolveComponentData = (_0, _1, ..._2) => __async(void 0, [_0, _1, ..._2], f
   return { node: item, didChange: false };
 });
 
-// lib/to-root.ts
+// lib/data/to-root.ts
 init_react_import();
 var toRoot = (item) => {
   if ("type" in item && item.type !== "root") {
@@ -2071,172 +2216,176 @@ var defaultPageFields = {
   title: { type: "text" }
 };
 var createAppStore = (initialAppStore) => (0, import_zustand2.create)()(
-  (0, import_middleware2.subscribeWithSelector)((set, get) => __spreadProps(__spreadValues({
-    state: defaultAppState,
-    config: { components: {} },
-    componentState: {},
-    plugins: [],
-    overrides: {},
-    viewports: defaultViewports,
-    zoomConfig: {
-      autoZoom: 1,
-      rootHeight: 0,
-      zoom: 1
-    },
-    status: "LOADING",
-    iframe: {},
-    metadata: {}
-  }, initialAppStore), {
-    fields: createFieldsSlice(set, get),
-    history: createHistorySlice(set, get),
-    nodes: createNodesSlice(set, get),
-    permissions: createPermissionsSlice(set, get),
-    getComponentConfig: (type) => {
-      var _a;
-      const { config, selectedItem } = get();
-      const rootFields = ((_a = config.root) == null ? void 0 : _a.fields) || defaultPageFields;
-      return type && type !== "root" ? config.components[type] : selectedItem ? config.components[selectedItem.type] : __spreadProps(__spreadValues({}, config.root), { fields: rootFields });
-    },
-    dispatch: (action) => set((s) => {
-      var _a, _b;
-      const { record } = get().history;
-      const dispatch = createReducer({
-        record,
-        appStore: s
-      });
-      const state = dispatch(s.state, action);
-      const selectedItem = state.ui.itemSelector ? getItem(state.ui.itemSelector, state) : null;
-      (_b = (_a = get()).onAction) == null ? void 0 : _b.call(_a, action, state, get().state);
-      return __spreadProps(__spreadValues({}, s), { state, selectedItem });
-    }),
-    setZoomConfig: (zoomConfig) => set({ zoomConfig }),
-    setStatus: (status) => set({ status }),
-    setComponentState: (componentState) => set({ componentState }),
-    pendingComponentLoads: {},
-    setComponentLoading: (id, loading = true, defer2 = 0) => {
-      const { setComponentState, pendingComponentLoads } = get();
-      const thisPendingComponentLoads = __spreadValues({}, pendingComponentLoads);
-      const setLoading = () => {
-        var _a;
-        const { componentState } = get();
-        setComponentState(__spreadProps(__spreadValues({}, componentState), {
-          [id]: __spreadProps(__spreadValues({}, componentState[id]), {
-            loadingCount: (((_a = componentState[id]) == null ? void 0 : _a.loadingCount) || 0) + 1
-          })
-        }));
-      };
-      const unsetLoading = () => {
-        var _a;
-        const { componentState } = get();
-        setComponentState(__spreadProps(__spreadValues({}, componentState), {
-          [id]: __spreadProps(__spreadValues({}, componentState[id]), {
-            loadingCount: Math.max(
-              (((_a = componentState[id]) == null ? void 0 : _a.loadingCount) || 0) - 1,
-              0
-            )
+  (0, import_middleware2.subscribeWithSelector)((set, get) => {
+    var _a, _b;
+    return __spreadProps(__spreadValues({
+      state: defaultAppState,
+      config: { components: {} },
+      componentState: {},
+      plugins: [],
+      overrides: {},
+      viewports: defaultViewports,
+      zoomConfig: {
+        autoZoom: 1,
+        rootHeight: 0,
+        zoom: 1
+      },
+      status: "LOADING",
+      iframe: {},
+      metadata: {}
+    }, initialAppStore), {
+      fields: createFieldsSlice(set, get),
+      history: createHistorySlice(set, get),
+      nodes: createNodesSlice(set, get),
+      permissions: createPermissionsSlice(set, get),
+      getComponentConfig: (type) => {
+        var _a2;
+        const { config, selectedItem } = get();
+        const rootFields = ((_a2 = config.root) == null ? void 0 : _a2.fields) || defaultPageFields;
+        return type && type !== "root" ? config.components[type] : selectedItem ? config.components[selectedItem.type] : __spreadProps(__spreadValues({}, config.root), { fields: rootFields });
+      },
+      selectedItem: ((_a = initialAppStore == null ? void 0 : initialAppStore.state) == null ? void 0 : _a.ui.itemSelector) ? getItem(
+        (_b = initialAppStore == null ? void 0 : initialAppStore.state) == null ? void 0 : _b.ui.itemSelector,
+        initialAppStore.state
+      ) : null,
+      dispatch: (action) => set((s) => {
+        var _a2, _b2;
+        const { record } = get().history;
+        const dispatch = createReducer({
+          record,
+          appStore: s
+        });
+        const state = dispatch(s.state, action);
+        const selectedItem = state.ui.itemSelector ? getItem(state.ui.itemSelector, state) : null;
+        (_b2 = (_a2 = get()).onAction) == null ? void 0 : _b2.call(_a2, action, state, get().state);
+        return __spreadProps(__spreadValues({}, s), { state, selectedItem });
+      }),
+      setZoomConfig: (zoomConfig) => set({ zoomConfig }),
+      setStatus: (status) => set({ status }),
+      setComponentState: (componentState) => set({ componentState }),
+      pendingLoadTimeouts: {},
+      setComponentLoading: (id, loading = true, defer2 = 0) => {
+        const { setComponentState, pendingLoadTimeouts } = get();
+        const loadId = generateId();
+        const setLoading = () => {
+          var _a2;
+          const { componentState } = get();
+          setComponentState(__spreadProps(__spreadValues({}, componentState), {
+            [id]: __spreadProps(__spreadValues({}, componentState[id]), {
+              loadingCount: (((_a2 = componentState[id]) == null ? void 0 : _a2.loadingCount) || 0) + 1
+            })
+          }));
+        };
+        const unsetLoading = () => {
+          var _a2;
+          const { componentState } = get();
+          clearTimeout(timeout3);
+          delete pendingLoadTimeouts[loadId];
+          set({ pendingLoadTimeouts });
+          setComponentState(__spreadProps(__spreadValues({}, componentState), {
+            [id]: __spreadProps(__spreadValues({}, componentState[id]), {
+              loadingCount: Math.max(
+                (((_a2 = componentState[id]) == null ? void 0 : _a2.loadingCount) || 0) - 1,
+                0
+              )
+            })
+          }));
+        };
+        const timeout3 = setTimeout(() => {
+          if (loading) {
+            setLoading();
+          } else {
+            unsetLoading();
+          }
+          delete pendingLoadTimeouts[loadId];
+          set({ pendingLoadTimeouts });
+        }, defer2);
+        set({
+          pendingLoadTimeouts: __spreadProps(__spreadValues({}, pendingLoadTimeouts), {
+            [id]: timeout3
           })
-        }));
-      };
-      if (thisPendingComponentLoads[id]) {
-        clearTimeout(thisPendingComponentLoads[id]);
-        delete thisPendingComponentLoads[id];
-        set({ pendingComponentLoads: thisPendingComponentLoads });
-      }
-      const timeout3 = setTimeout(() => {
-        if (loading) {
-          setLoading();
-        } else {
-          unsetLoading();
-        }
-        delete thisPendingComponentLoads[id];
-        set({ pendingComponentLoads: thisPendingComponentLoads });
-      }, defer2);
-      set({
-        pendingComponentLoads: __spreadProps(__spreadValues({}, thisPendingComponentLoads), {
-          [id]: timeout3
-        })
-      });
-    },
-    unsetComponentLoading: (id) => {
-      const { setComponentLoading } = get();
-      setComponentLoading(id, false);
-    },
-    // Helper
-    setUi: (ui, recordHistory) => set((s) => {
-      const dispatch = createReducer({
-        record: () => {
-        },
-        appStore: s
-      });
-      const state = dispatch(s.state, {
-        type: "setUi",
-        ui,
-        recordHistory
-      });
-      const selectedItem = state.ui.itemSelector ? getItem(state.ui.itemSelector, state) : null;
-      return __spreadProps(__spreadValues({}, s), { state, selectedItem });
-    }),
-    // resolveDataRuns: 0,
-    // resolveData: (newAppState) =>
-    //   set((s) => {
-    //     resolveData(newAppState, get);
-    //     return { ...s, resolveDataRuns: s.resolveDataRuns + 1 };
-    //   }),
-    resolveComponentData: (componentData, trigger) => __async(void 0, null, function* () {
-      const { config, metadata, setComponentLoading } = get();
-      return yield resolveComponentData(
-        componentData,
-        config,
-        metadata,
-        (item) => setComponentLoading(
-          "id" in item.props ? item.props.id : "root",
-          true,
-          50
-        ),
-        (item) => setComponentLoading(
-          "id" in item.props ? item.props.id : "root",
-          false,
-          0
-        ),
-        trigger
-      );
-    }),
-    resolveAndCommitData: () => __async(void 0, null, function* () {
-      const { config, state, dispatch, resolveComponentData: resolveComponentData2 } = get();
-      walkTree(
-        state,
-        config,
-        (content) => content,
-        (childItem) => {
-          resolveComponentData2(childItem, "load").then((resolved) => {
-            const { state: state2 } = get();
-            const node = state2.indexes.nodes[resolved.node.props.id];
-            if (node && resolved.didChange) {
-              if (resolved.node.props.id === "root") {
-                dispatch({
-                  type: "replaceRoot",
-                  root: toRoot(resolved.node)
-                });
-              } else {
-                const zoneCompound = `${node.parentId}:${node.zone}`;
-                const parentZone = state2.indexes.zones[zoneCompound];
-                const index = parentZone.contentIds.indexOf(
-                  resolved.node.props.id
-                );
-                dispatch({
-                  type: "replace",
-                  data: resolved.node,
-                  destinationIndex: index,
-                  destinationZone: zoneCompound
-                });
-              }
+        });
+        return unsetLoading;
+      },
+      unsetComponentLoading: (id) => {
+        const { setComponentLoading } = get();
+        setComponentLoading(id, false);
+      },
+      // Helper
+      setUi: (ui, recordHistory) => set((s) => {
+        const dispatch = createReducer({
+          record: () => {
+          },
+          appStore: s
+        });
+        const state = dispatch(s.state, {
+          type: "setUi",
+          ui,
+          recordHistory
+        });
+        const selectedItem = state.ui.itemSelector ? getItem(state.ui.itemSelector, state) : null;
+        return __spreadProps(__spreadValues({}, s), { state, selectedItem });
+      }),
+      resolveComponentData: (componentData, trigger) => __async(void 0, null, function* () {
+        const { config, metadata, setComponentLoading, permissions } = get();
+        const timeouts = {};
+        return yield resolveComponentData(
+          componentData,
+          config,
+          metadata,
+          (item) => {
+            const id = "id" in item.props ? item.props.id : "root";
+            timeouts[id] = setComponentLoading(id, true, 50);
+          },
+          (item) => __async(void 0, null, function* () {
+            const id = "id" in item.props ? item.props.id : "root";
+            if ("type" in item) {
+              yield permissions.refreshPermissions({ item });
+            } else {
+              yield permissions.refreshPermissions({ root: true });
             }
-          });
-          return childItem;
-        }
-      );
-    })
-  }))
+            timeouts[id]();
+          }),
+          trigger
+        );
+      }),
+      resolveAndCommitData: () => __async(void 0, null, function* () {
+        const { config, state, dispatch, resolveComponentData: resolveComponentData2 } = get();
+        walkAppState(
+          state,
+          config,
+          (content) => content,
+          (childItem) => {
+            resolveComponentData2(childItem, "load").then((resolved) => {
+              const { state: state2 } = get();
+              const node = state2.indexes.nodes[resolved.node.props.id];
+              if (node && resolved.didChange) {
+                if (resolved.node.props.id === "root") {
+                  dispatch({
+                    type: "replaceRoot",
+                    root: toRoot(resolved.node)
+                  });
+                } else {
+                  const zoneCompound = `${node.parentId}:${node.zone}`;
+                  const parentZone = state2.indexes.zones[zoneCompound];
+                  const index = parentZone.contentIds.indexOf(
+                    resolved.node.props.id
+                  );
+                  dispatch({
+                    type: "replace",
+                    data: resolved.node,
+                    destinationIndex: index,
+                    destinationZone: zoneCompound
+                  });
+                }
+              }
+            });
+            return childItem;
+          }
+        );
+      })
+    });
+  })
 );
 var appStoreContext = (0, import_react9.createContext)(createAppStore());
 function useAppStore(selector) {
@@ -4310,7 +4459,7 @@ 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");
@@ -4331,7 +4480,7 @@ var import_react25 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/DraggableComponent/styles.module.css#css-module
 init_react_import();
-var styles_module_default11 = { "DraggableComponent": "_DraggableComponent_1ukn8_1", "DraggableComponent-overlay": "_DraggableComponent-overlay_1ukn8_12", "DraggableComponent-loadingOverlay": "_DraggableComponent-loadingOverlay_1ukn8_29", "DraggableComponent--hover": "_DraggableComponent--hover_1ukn8_45", "DraggableComponent--isLocked": "_DraggableComponent--isLocked_1ukn8_45", "DraggableComponent--isSelected": "_DraggableComponent--isSelected_1ukn8_54", "DraggableComponent-actionsOverlay": "_DraggableComponent-actionsOverlay_1ukn8_66", "DraggableComponent-actions": "_DraggableComponent-actions_1ukn8_66" };
+var styles_module_default11 = { "DraggableComponent": "_DraggableComponent_qzbgx_1", "DraggableComponent-overlay": "_DraggableComponent-overlay_qzbgx_12", "DraggableComponent-loadingOverlay": "_DraggableComponent-loadingOverlay_qzbgx_29", "DraggableComponent--hover": "_DraggableComponent--hover_qzbgx_45", "DraggableComponent--isLocked": "_DraggableComponent--isLocked_qzbgx_45", "DraggableComponent--isSelected": "_DraggableComponent--isSelected_qzbgx_54", "DraggableComponent-actionsOverlay": "_DraggableComponent-actionsOverlay_qzbgx_66", "DraggableComponent-actions": "_DraggableComponent-actions_qzbgx_66" };
 
 // components/DraggableComponent/index.tsx
 var import_react_dom2 = require("react-dom");
@@ -4382,7 +4531,6 @@ var DropZoneProvider = ({
   value
 }) => {
   const [hoveringComponent, setHoveringComponent] = (0, import_react23.useState)();
-  const [activeZones, setActiveZones] = (0, import_react23.useState)({});
   const dispatch = useAppStore((s) => s.dispatch);
   const registerZone = (0, import_react23.useCallback)(
     (zoneCompound) => {
@@ -4391,7 +4539,7 @@ var DropZoneProvider = ({
         zone: zoneCompound
       });
     },
-    [setActiveZones, dispatch]
+    [dispatch]
   );
   const unregisterZone = (0, import_react23.useCallback)(
     (zoneCompound) => {
@@ -4400,17 +4548,16 @@ var DropZoneProvider = ({
         zone: zoneCompound
       });
     },
-    [setActiveZones, dispatch]
+    [dispatch]
   );
   const memoValue = (0, import_react23.useMemo)(
     () => __spreadValues({
       hoveringComponent,
       setHoveringComponent,
       registerZone,
-      unregisterZone,
-      activeZones
+      unregisterZone
     }, value),
-    [value, hoveringComponent, activeZones]
+    [value, hoveringComponent]
   );
   return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(import_jsx_runtime19.Fragment, { children: memoValue && /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(dropZoneContext.Provider, { value: memoValue, children }) });
 };
@@ -4503,8 +4650,10 @@ var DraggableComponent = ({
     return (_a = s.state.indexes.nodes[id]) == null ? void 0 : _a.path;
   }));
   const permissions = useAppStore(
-    (0, import_shallow2.useShallow)((s) => s.permissions.getPermissions())
-    // TODO call using id
+    (0, import_shallow2.useShallow)((s) => {
+      const item = getItem({ index, zone: zoneCompound }, s.state);
+      return s.permissions.getPermissions({ item });
+    })
   );
   const userIsDragging = useContextStore(
     ZoneStoreContext,
@@ -4758,76 +4907,82 @@ 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 }) });
-  return /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(
-    DropZoneProvider,
-    {
-      value: __spreadProps(__spreadValues({}, ctx), {
-        areaId: id,
-        zoneCompound,
-        index,
-        depth: depth + 1,
-        registerLocalZone,
-        unregisterLocalZone
-      }),
-      children: [
-        isVisible && (0, import_react_dom2.createPortal)(
-          /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(
-            "div",
-            {
-              className: getClassName16({
-                isSelected,
-                isDragging: thisIsDragging,
-                hover: hover || indicativeHover
-              }),
-              style: __spreadValues({}, style),
-              "data-puck-overlay": true,
-              children: [
-                debug,
-                isLoading && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassName16("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Loader, {}) }),
-                /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+  const nextContextValue = (0, import_react25.useMemo)(
+    () => __spreadProps(__spreadValues({}, ctx), {
+      areaId: id,
+      zoneCompound,
+      index,
+      depth: depth + 1,
+      registerLocalZone,
+      unregisterLocalZone
+    }),
+    [
+      ctx,
+      id,
+      zoneCompound,
+      index,
+      depth,
+      registerLocalZone,
+      unregisterLocalZone
+    ]
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(DropZoneProvider, { value: nextContextValue, children: [
+    isVisible && (0, import_react_dom2.createPortal)(
+      /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(
+        "div",
+        {
+          className: getClassName16({
+            isSelected,
+            isDragging: thisIsDragging,
+            hover: hover || indicativeHover
+          }),
+          style: __spreadValues({}, style),
+          "data-puck-overlay": true,
+          children: [
+            debug,
+            isLoading && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassName16("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Loader, {}) }),
+            /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+              "div",
+              {
+                className: getClassName16("actionsOverlay"),
+                style: {
+                  top: actionsOverlayTop / zoom
+                },
+                children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
                   "div",
                   {
-                    className: getClassName16("actionsOverlay"),
+                    className: getClassName16("actions"),
                     style: {
-                      top: actionsOverlayTop / zoom
+                      transform: `scale(${1 / zoom}`,
+                      top: actionsTop / zoom,
+                      right: 0,
+                      paddingLeft: actionsSide,
+                      paddingRight: actionsSide
                     },
-                    children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
-                      "div",
+                    ref: syncActionsPosition,
+                    children: /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(
+                      CustomActionBar,
                       {
-                        className: getClassName16("actions"),
-                        style: {
-                          transform: `scale(${1 / zoom}`,
-                          top: actionsTop / zoom,
-                          right: 0,
-                          paddingLeft: actionsSide,
-                          paddingRight: actionsSide
-                        },
-                        ref: syncActionsPosition,
-                        children: /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(
-                          CustomActionBar,
-                          {
-                            parentAction,
-                            label: DEBUG2 ? id : label,
-                            children: [
-                              permissions.duplicate && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(ActionBar.Action, { onClick: onDuplicate, label: "Duplicate", children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Copy, { size: 16 }) }),
-                              permissions.delete && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(ActionBar.Action, { onClick: onDelete, label: "Delete", children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Trash, { size: 16 }) })
-                            ]
-                          }
-                        )
+                        parentAction,
+                        label: DEBUG2 ? id : label,
+                        children: [
+                          permissions.duplicate && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(ActionBar.Action, { onClick: onDuplicate, label: "Duplicate", children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Copy, { size: 16 }) }),
+                          permissions.delete && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(ActionBar.Action, { onClick: onDelete, label: "Delete", children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Trash, { size: 16 }) })
+                        ]
                       }
                     )
                   }
-                ),
-                /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassName16("overlay") })
-              ]
-            }
-          ),
-          portalEl || document.body
-        ),
-        children(refSetter)
-      ]
-    }
-  );
+                )
+              }
+            ),
+            /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassName16("overlay") })
+          ]
+        }
+      ),
+      portalEl || document.body
+    ),
+    children(refSetter)
+  ] });
 };
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/DropZone/styles.module.css#css-module
@@ -5013,26 +5168,33 @@ var import_shallow3 = require("zustand/react/shallow");
 // components/Render/index.tsx
 init_react_import();
 
-// lib/use-slots.ts
+// lib/use-slots.tsx
 init_react_import();
 var import_react31 = require("react");
-function useSlots(config, props, renderSlot) {
-  return (0, import_react31.useMemo)(() => {
+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 newProps = __spreadValues({}, 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") {
-        newProps[fieldKey] = (dzProps) => renderSlot(__spreadProps(__spreadValues({}, dzProps), {
+        const content = props[fieldKey] || [];
+        const render = (readOnly == null ? void 0 : readOnly[fieldKey]) || forceReadOnly ? renderSlotRender : renderSlotEdit;
+        const Slot = (dzProps) => render(__spreadProps(__spreadValues({
+          allow: field.allow,
+          disallow: field.disallow
+        }, dzProps), {
           zone: fieldKey,
-          content: props[fieldKey] || []
+          content
         }));
+        slotProps2[fieldKey] = Slot;
       }
     }
-    return newProps;
-  }, [config, props]);
+    return slotProps2;
+  }, [config, readOnly, forceReadOnly]);
+  return __spreadValues(__spreadValues({}, props), slotProps);
 }
 
 // components/Render/index.tsx
@@ -5040,39 +5202,121 @@ var import_react33 = __toESM(require("react"));
 
 // components/SlotRender/index.tsx
 init_react_import();
+
+// components/SlotRender/server.tsx
+init_react_import();
 var import_react32 = require("react");
+
+// components/ServerRender/index.tsx
+init_react_import();
 var import_jsx_runtime21 = require("react/jsx-runtime");
-var SlotRenderPure = (props) => /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(SlotRender, __spreadValues({}, props));
-var SlotRender = (0, import_react32.forwardRef)(
-  function SlotRenderInternal({ className, style, content, config, metadata }, ref) {
-    return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className, style, ref, children: content.map((item) => {
-      const Component = config.components[item.type];
-      if (Component) {
-        const props = useSlots(Component, item.props, (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
-          SlotRenderPure,
-          __spreadProps(__spreadValues({}, slotProps), {
+function DropZoneRender({
+  zone,
+  data,
+  areaId = "root",
+  config,
+  metadata = {}
+}) {
+  let zoneCompound = rootDroppableId;
+  let content = (data == null ? void 0 : data.content) || [];
+  if (!data || !config) {
+    return null;
+  }
+  if (areaId !== rootAreaId && zone !== rootZone) {
+    zoneCompound = `${areaId}:${zone}`;
+    content = setupZone(data, zoneCompound).zones[zoneCompound];
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(import_jsx_runtime21.Fragment, { children: content.map((item) => {
+    const Component = config.components[item.type];
+    const props = __spreadProps(__spreadValues({}, item.props), {
+      puck: {
+        renderDropZone: ({ zone: zone2 }) => /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+          DropZoneRender,
+          {
+            zone: zone2,
+            data,
+            areaId: item.props.id,
             config,
             metadata
-          })
-        ));
-        return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
-          Component.render,
-          __spreadProps(__spreadValues({}, props), {
-            puck: {
-              renderDropZone: DropZoneRenderPure,
-              metadata: metadata || {}
-            }
-          }),
-          props.id
-        );
+          }
+        ),
+        metadata
       }
-      return null;
+    });
+    const propsWithSlots = useSlots(Component, props, (props2) => /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, props2), { config, metadata })));
+    if (Component) {
+      return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Component.render, __spreadValues({}, propsWithSlots), item.props.id);
+    }
+    return null;
+  }) });
+}
+
+// components/SlotRender/server.tsx
+var import_jsx_runtime22 = require("react/jsx-runtime");
+var SlotRenderPure = (props) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(SlotRender, __spreadValues({}, props));
+var Item = ({
+  config,
+  item,
+  metadata
+}) => {
+  const Component = config.components[item.type];
+  const props = useSlots(Component, item.props, (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, slotProps), { config, metadata })));
+  return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+    Component.render,
+    __spreadProps(__spreadValues({}, props), {
+      puck: __spreadProps(__spreadValues({}, props.puck), {
+        renderDropZone: DropZoneRender,
+        metadata: metadata || {}
+      })
+    })
+  );
+};
+var SlotRender = (0, import_react32.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]) {
+        return null;
+      }
+      return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+        Item,
+        {
+          config,
+          item,
+          metadata
+        },
+        item.props.id
+      );
     }) });
   }
 );
 
+// components/SlotRender/index.tsx
+var import_jsx_runtime23 = require("react/jsx-runtime");
+var ContextSlotRender = ({
+  componentId,
+  zone
+}) => {
+  const config = useAppStore((s) => s.config);
+  const metadata = useAppStore((s) => s.metadata);
+  const slotContent = useAppStore(
+    (s) => {
+      var _a, _b;
+      return (_b = (_a = s.state.indexes.nodes[componentId]) == null ? void 0 : _a.data.props[zone]) != null ? _b : null;
+    }
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+    SlotRenderPure,
+    {
+      content: slotContent,
+      zone,
+      config,
+      metadata
+    }
+  );
+};
+
 // components/Render/index.tsx
-var import_jsx_runtime22 = require("react/jsx-runtime");
+var import_jsx_runtime24 = require("react/jsx-runtime");
 var renderContext = import_react33.default.createContext({
   config: { components: {} },
   data: { root: {}, content: [] },
@@ -5101,37 +5345,26 @@ function Render({
     editMode: false,
     id: "puck-root"
   });
-  const propsWithSlots = useSlots(config.root, pageProps, (props) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(SlotRender, __spreadProps(__spreadValues({}, props), { config, metadata })));
+  const propsWithSlots = useSlots(config.root, pageProps, (props) => /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(SlotRender, __spreadProps(__spreadValues({}, props), { config, metadata })));
+  const nextContextValue = (0, import_react33.useMemo)(
+    () => ({
+      mode: "render",
+      depth: 0
+    }),
+    []
+  );
   if ((_a = config.root) == null ? void 0 : _a.render) {
-    return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(renderContext.Provider, { value: { config, data: defaultedData, metadata }, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-      DropZoneProvider,
-      {
-        value: {
-          mode: "render",
-          depth: 0
-        },
-        children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(config.root.render, __spreadProps(__spreadValues({}, propsWithSlots), { children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(DropZoneRenderPure, { zone: rootZone }) }))
-      }
-    ) });
+    return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(renderContext.Provider, { value: { config, data: defaultedData, metadata }, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DropZoneProvider, { value: nextContextValue, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(config.root.render, __spreadProps(__spreadValues({}, propsWithSlots), { children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DropZoneRenderPure, { zone: rootZone }) })) }) });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(renderContext.Provider, { value: { config, data: defaultedData, metadata }, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-    DropZoneProvider,
-    {
-      value: {
-        mode: "render",
-        depth: 0
-      },
-      children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(DropZoneRenderPure, { zone: rootZone })
-    }
-  ) });
+  return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(renderContext.Provider, { value: { config, data: defaultedData, metadata }, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DropZoneProvider, { value: nextContextValue, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DropZoneRenderPure, { zone: rootZone }) }) });
 }
 
 // components/DropZone/index.tsx
-var import_jsx_runtime23 = require("react/jsx-runtime");
+var import_jsx_runtime25 = require("react/jsx-runtime");
 var getClassName17 = get_class_name_factory_default("DropZone", styles_module_default12);
 var getRandomColor = () => `#${Math.floor(Math.random() * 16777215).toString(16)}`;
 var RENDER_DEBUG = false;
-var DropZoneEditPure = (props) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DropZoneEdit, __spreadValues({}, props));
+var DropZoneEditPure = (props) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DropZoneEdit, __spreadValues({}, props));
 var DropZoneChild = ({
   zoneCompound,
   componentId,
@@ -5144,14 +5377,8 @@ var DropZoneChild = ({
 }) => {
   var _a, _b;
   const metadata = useAppStore((s) => s.metadata);
-  const puckProps = {
-    renderDropZone: DropZoneEditPure,
-    isEditing: true,
-    dragRef: null,
-    metadata
-  };
   const ctx = (0, import_react34.useContext)(dropZoneContext);
-  const { depth } = ctx;
+  const { depth = 1 } = ctx != null ? ctx : {};
   const nodeProps = useAppStore(
     (0, import_shallow3.useShallow)((s) => {
       var _a2;
@@ -5164,11 +5391,23 @@ var DropZoneChild = ({
       return (_a2 = s.state.indexes.nodes[componentId]) == null ? void 0 : _a2.data.type;
     }
   );
+  const nodeReadOnly = useAppStore(
+    (0, import_shallow3.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 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 overrides = useAppStore((s) => s.overrides);
   const isLoading = useAppStore(
     (s) => {
@@ -5185,7 +5424,7 @@ var DropZoneChild = ({
   let label = (_b = (_a = componentConfig == null ? void 0 : componentConfig.label) != null ? _a : item == null ? void 0 : item.type.toString()) != null ? _b : "Component";
   const renderPreview = (0, import_react34.useMemo)(
     () => function Preview4() {
-      return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DrawerItemInner, { name: label, children: overrides.componentItem });
+      return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DrawerItemInner, { name: label, children: overrides.componentItem });
     },
     [componentId, label, overrides]
   );
@@ -5200,10 +5439,13 @@ var DropZoneChild = ({
   const defaultedPropsWithSlots = useSlots(
     componentConfig,
     defaultsProps,
-    DropZoneEditPure
+    DropZoneEditPure,
+    (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(ContextSlotRender, { componentId, zone: slotProps.zone }),
+    nodeReadOnly,
+    isLoading
   );
   if (!item) return;
-  let Render2 = componentConfig ? componentConfig.render : () => /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { style: { padding: 48, textAlign: "center" }, children: [
+  let Render2 = componentConfig ? componentConfig.render : () => /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { style: { padding: 48, textAlign: "center" }, children: [
     "No configuration for ",
     item.type
   ] });
@@ -5212,7 +5454,7 @@ var DropZoneChild = ({
   if (isPreview) {
     Render2 = renderPreview;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
     DraggableComponent,
     {
       id: componentId,
@@ -5227,17 +5469,18 @@ var DropZoneChild = ({
       autoDragAxis: dragAxis,
       userDragAxis: collisionAxis,
       inDroppableZone,
-      children: (dragRef) => (componentConfig == null ? void 0 : componentConfig.inline) && !isPreview ? /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_jsx_runtime23.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+      children: (dragRef) => (componentConfig == null ? void 0 : componentConfig.inline) && !isPreview ? /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(import_jsx_runtime25.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
         Render2,
         __spreadProps(__spreadValues({}, defaultedPropsWithSlots), {
           puck: __spreadProps(__spreadValues({}, defaultedPropsWithSlots.puck), {
             dragRef
           })
         })
-      ) }) : /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { ref: dragRef, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Render2, __spreadValues({}, defaultedPropsWithSlots)) })
+      ) }) : /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { ref: dragRef, children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Render2, __spreadValues({}, defaultedPropsWithSlots)) })
     }
   );
 };
+var DropZoneChildMemo = (0, import_react34.memo)(DropZoneChild);
 var DropZoneEdit = (0, import_react34.forwardRef)(
   function DropZoneEditInternal({
     zone,
@@ -5252,10 +5495,10 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
     const {
       // These all need setting via context
       areaId,
-      depth,
+      depth = 0,
       registerLocalZone,
       unregisterLocalZone
-    } = ctx;
+    } = ctx != null ? ctx : {};
     const path = useAppStore(
       (0, import_shallow3.useShallow)((s) => {
         var _a;
@@ -5307,6 +5550,15 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
         };
       }
     }, [zoneType]);
+    (0, import_react34.useEffect)(() => {
+      if (zoneType === "dropzone") {
+        if (zoneCompound !== rootDroppableId) {
+          console.warn(
+            "DropZones have been deprecated in favor of slot fields and will be removed in a future version of Puck. Please see the migration guide: https://www.puckeditor.com/docs/guides/migrations/dropzones-to-slots"
+          );
+        }
+      }
+    }, [zoneType]);
     const contentIds = (0, import_react34.useMemo)(() => {
       return zoneContentIds || [];
     }, [zoneContentIds]);
@@ -5379,7 +5631,7 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
       userMinEmptyHeight,
       ref
     });
-    return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
       "div",
       {
         className: `${getClassName17({
@@ -5401,8 +5653,8 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
           backgroundColor: RENDER_DEBUG ? getRandomColor() : style == null ? void 0 : style.backgroundColor
         }),
         children: contentIdsWithPreview.map((componentId, i) => {
-          return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-            DropZoneChild,
+          return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+            DropZoneChildMemo,
             {
               zoneCompound,
               componentId,
@@ -5420,8 +5672,32 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
     );
   }
 );
-var DropZoneRenderPure = (props) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DropZoneRender, __spreadValues({}, props));
-var DropZoneRender = (0, import_react34.forwardRef)(
+var DropZoneRenderItem = ({
+  config,
+  item,
+  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)(
+    () => ({
+      areaId: props.id,
+      depth: 1
+    }),
+    [props]
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DropZoneProvider, { value: nextContextValue, children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+    Component.render,
+    __spreadProps(__spreadValues({}, props), {
+      puck: __spreadProps(__spreadValues({}, props.puck), {
+        renderDropZone: DropZoneRenderPure,
+        metadata: __spreadValues(__spreadValues({}, metadata), Component.metadata)
+      })
+    })
+  ) }, props.id);
+};
+var DropZoneRenderPure = (props) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DropZoneRender2, __spreadValues({}, props));
+var DropZoneRender2 = (0, import_react34.forwardRef)(
   function DropZoneRenderInternal({ className, style, zone }, ref) {
     const ctx = (0, import_react34.useContext)(dropZoneContext);
     const { areaId = "root" } = ctx || {};
@@ -5447,48 +5723,31 @@ var DropZoneRender = (0, import_react34.forwardRef)(
       zoneCompound = `${areaId}:${zone}`;
       content = setupZone(data, zoneCompound).zones[zoneCompound];
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { className, style, ref, children: content.map((item) => {
+    return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className, style, ref, children: content.map((item) => {
       const Component = config.components[item.type];
       if (Component) {
-        const props = useSlots(Component, item.props, (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-          SlotRenderPure,
-          __spreadProps(__spreadValues({}, slotProps), {
+        return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+          DropZoneRenderItem,
+          {
             config,
+            item,
             metadata
-          })
-        ));
-        return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-          DropZoneProvider,
-          {
-            value: {
-              areaId: props.id,
-              depth: 1
-            },
-            children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-              Component.render,
-              __spreadProps(__spreadValues({}, props), {
-                puck: {
-                  renderDropZone: DropZoneRenderPure,
-                  metadata: metadata || {}
-                }
-              })
-            )
           },
-          props.id
+          item.props.id
         );
       }
       return null;
     }) });
   }
 );
-var DropZonePure = (props) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DropZone, __spreadValues({}, props));
+var DropZonePure = (props) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DropZone, __spreadValues({}, props));
 var DropZone = (0, import_react34.forwardRef)(
   function DropZone2(props, ref) {
     const ctx = (0, import_react34.useContext)(dropZoneContext);
     if ((ctx == null ? void 0 : ctx.mode) === "edit") {
-      return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_jsx_runtime23.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DropZoneEdit, __spreadProps(__spreadValues({}, props), { ref })) });
+      return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(import_jsx_runtime25.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DropZoneEdit, __spreadProps(__spreadValues({}, props), { ref })) });
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(import_jsx_runtime23.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DropZoneRender, __spreadProps(__spreadValues({}, props), { ref })) });
+    return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(import_jsx_runtime25.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DropZoneRender2, __spreadProps(__spreadValues({}, props), { ref })) });
   }
 );
 
@@ -5544,7 +5803,7 @@ var GlobalPosition = class {
     var _a;
     this.target = target;
     this.original = original;
-    this.frameEl = document.querySelector("iframe");
+    this.frameEl = document.querySelector("iframe#preview-frame");
     if (this.frameEl) {
       this.frameRect = this.frameEl.getBoundingClientRect();
       this.scaleFactor = this.frameRect.width / (((_a = this.frameEl.contentWindow) == null ? void 0 : _a.innerWidth) || 1);
@@ -5624,6 +5883,7 @@ var getZoneId2 = (candidate) => {
   }
   return id;
 };
+var BUFFER = 6;
 var getPointerCollisions = (position, manager) => {
   const candidates = [];
   let elements = position.target.ownerDocument.elementsFromPoint(
@@ -5647,13 +5907,25 @@ 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");
+      if (BUFFER && (dropzoneId || id)) {
+        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) {
@@ -5707,8 +5979,8 @@ 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 {
@@ -5762,8 +6034,8 @@ var insertComponent = (componentType, zone, index, appStore) => __async(void 0,
     destinationZone: zone,
     id
   };
-  const { state, config, dispatch, resolveComponentData: resolveComponentData2 } = appStore;
-  const insertedState = insertAction(state, insertActionData, config);
+  const { state, dispatch, resolveComponentData: resolveComponentData2 } = appStore;
+  const insertedState = insertAction(state, insertActionData, appStore);
   dispatch(__spreadProps(__spreadValues({}, insertActionData), {
     // Dispatch insert rather set, as user's may rely on this via onAction
     // We must always record history here so the insert is added to user history
@@ -5806,7 +6078,7 @@ function getDeepDir(el) {
 }
 
 // components/DragDropContext/index.tsx
-var import_jsx_runtime24 = require("react/jsx-runtime");
+var import_jsx_runtime26 = require("react/jsx-runtime");
 var DEBUG3 = false;
 var dragListenerContext = (0, import_react36.createContext)({
   dragListeners: {}
@@ -5965,14 +6237,22 @@ var DragDropContextClient = ({
   const [dragListeners, setDragListeners] = (0, import_react36.useState)({});
   const dragMode = (0, import_react36.useRef)(null);
   const initialSelector = (0, import_react36.useRef)(void 0);
-  return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { id, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+  const nextContextValue = (0, import_react36.useMemo)(
+    () => ({
+      mode: "edit",
+      areaId: "root",
+      depth: 0
+    }),
+    []
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("div", { id, children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
     dragListenerContext.Provider,
     {
       value: {
         dragListeners,
         setDragListeners
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
         import_react35.DragDropProvider,
         {
           plugins,
@@ -6006,7 +6286,6 @@ var DragDropContextClient = ({
               }
               if (thisPreview) {
                 zoneStore.setState({ previewIndex: {} });
-                const state = appStore.getState().state;
                 if (thisPreview.type === "insert") {
                   insertComponent(
                     thisPreview.componentType,
@@ -6163,17 +6442,7 @@ var DragDropContextClient = ({
             initialSelector.current = void 0;
             zoneStore.setState({ draggedItem: event.operation.source });
           },
-          children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(ZoneStoreProvider, { store: zoneStore, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
-            DropZoneProvider,
-            {
-              value: {
-                mode: "edit",
-                areaId: "root",
-                depth: 0
-              },
-              children
-            }
-          ) })
+          children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(ZoneStoreProvider, { store: zoneStore, children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(DropZoneProvider, { value: nextContextValue, children }) })
         }
       )
     }
@@ -6187,11 +6456,11 @@ var DragDropContext = ({
   if (status === "LOADING") {
     return children;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DragDropContextClient, { disableAutoScroll, children });
+  return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(DragDropContextClient, { disableAutoScroll, children });
 };
 
 // components/Drawer/index.tsx
-var import_jsx_runtime25 = require("react/jsx-runtime");
+var import_jsx_runtime27 = require("react/jsx-runtime");
 var getClassName18 = get_class_name_factory_default("Drawer", styles_module_default10);
 var getClassNameItem2 = get_class_name_factory_default("DrawerItem", styles_module_default10);
 var DrawerItemInner = ({
@@ -6202,10 +6471,10 @@ var DrawerItemInner = ({
   isDragDisabled
 }) => {
   const CustomInner = (0, import_react37.useMemo)(
-    () => children || (({ children: children2 }) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: getClassNameItem2("default"), children: children2 })),
+    () => children || (({ children: children2 }) => /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassNameItem2("default"), children: children2 })),
     [children]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
     "div",
     {
       className: getClassNameItem2({ disabled: isDragDisabled }),
@@ -6213,9 +6482,9 @@ var DrawerItemInner = ({
       onMouseDown: (e) => e.preventDefault(),
       "data-testid": dragRef ? `drawer-item:${name}` : "",
       "data-puck-drawer-item": true,
-      children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(CustomInner, { name, children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: getClassNameItem2("draggableWrapper"), children: /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: getClassNameItem2("draggable"), children: [
-        /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: getClassNameItem2("name"), children: label != null ? label : name }),
-        /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: getClassNameItem2("icon"), children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DragIcon, {}) })
+      children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(CustomInner, { name, children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassNameItem2("draggableWrapper"), children: /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)("div", { className: getClassNameItem2("draggable"), children: [
+        /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassNameItem2("name"), children: label != null ? label : name }),
+        /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassNameItem2("icon"), children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(DragIcon, {}) })
       ] }) }) })
     }
   );
@@ -6232,9 +6501,9 @@ var DrawerItemDraggable = ({
     data: { type: "drawer", componentType: name },
     disabled: isDragDisabled
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: getClassName18("draggable"), children: [
-    /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: getClassName18("draggableBg"), children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DrawerItemInner, { name, label, children }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: getClassName18("draggableFg"), children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)("div", { className: getClassName18("draggable"), children: [
+    /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassName18("draggableBg"), children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(DrawerItemInner, { name, label, children }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassName18("draggableFg"), children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
       DrawerItemInner,
       {
         name,
@@ -6268,7 +6537,7 @@ var DrawerItem = ({
     },
     [resolvedId]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
     DrawerItemDraggable,
     {
       name,
@@ -6301,7 +6570,7 @@ var Drawer = ({
     collisionPriority: 0
     // Never collide with this, but we use it so NestedDroppablePlugin respects the Drawer
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
     "div",
     {
       className: getClassName18(),
@@ -6370,7 +6639,7 @@ var useBreadcrumbs = (renderCount) => {
 };
 
 // components/SidebarSection/index.tsx
-var import_jsx_runtime26 = require("react/jsx-runtime");
+var import_jsx_runtime28 = require("react/jsx-runtime");
 var getClassName19 = get_class_name_factory_default("SidebarSection", styles_module_default13);
 var SidebarSection = ({
   children,
@@ -6383,15 +6652,15 @@ var SidebarSection = ({
 }) => {
   const setUi = useAppStore((s) => s.setUi);
   const breadcrumbs = useBreadcrumbs(1);
-  return /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)(
     "div",
     {
       className: getClassName19({ noBorderTop, noPadding }),
       style: { background },
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("div", { className: getClassName19("title"), children: /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)("div", { className: getClassName19("breadcrumbs"), children: [
-          showBreadcrumbs ? breadcrumbs.map((breadcrumb, i) => /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)("div", { className: getClassName19("breadcrumb"), children: [
-            /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassName19("title"), children: /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)("div", { className: getClassName19("breadcrumbs"), children: [
+          showBreadcrumbs ? breadcrumbs.map((breadcrumb, i) => /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)("div", { className: getClassName19("breadcrumb"), children: [
+            /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
               "button",
               {
                 type: "button",
@@ -6400,12 +6669,12 @@ var SidebarSection = ({
                 children: breadcrumb.label
               }
             ),
-            /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(ChevronRight, { size: 16 })
+            /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(ChevronRight, { size: 16 })
           ] }, i)) : null,
-          /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("div", { className: getClassName19("heading"), children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Heading, { rank: "2", size: "xs", children: title }) })
+          /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassName19("heading"), children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(Heading, { rank: "2", size: "xs", children: title }) })
         ] }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("div", { className: getClassName19("content"), children }),
-        isLoading && /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("div", { className: getClassName19("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Loader, { size: 32 }) })
+        /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassName19("content"), children }),
+        isLoading && /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassName19("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(Loader, { size: 32 }) })
       ]
     }
   );
@@ -6419,7 +6688,7 @@ init_react_import();
 var styles_module_default14 = { "MenuBar": "_MenuBar_8pf8c_1", "MenuBar--menuOpen": "_MenuBar--menuOpen_8pf8c_14", "MenuBar-inner": "_MenuBar-inner_8pf8c_29", "MenuBar-history": "_MenuBar-history_8pf8c_45" };
 
 // components/MenuBar/index.tsx
-var import_jsx_runtime27 = require("react/jsx-runtime");
+var import_jsx_runtime29 = require("react/jsx-runtime");
 var getClassName20 = get_class_name_factory_default("MenuBar", styles_module_default14);
 function MenuBar({
   menuOpen = false,
@@ -6430,7 +6699,7 @@ function MenuBar({
   const forward = useAppStore((s) => s.history.forward);
   const hasFuture = useAppStore((s) => s.history.hasFuture());
   const hasPast = useAppStore((s) => s.history.hasPast());
-  return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
     "div",
     {
       className: getClassName20({ menuOpen }),
@@ -6444,12 +6713,12 @@ function MenuBar({
           setMenuOpen(false);
         }
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)("div", { className: getClassName20("inner"), children: [
-        /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)("div", { className: getClassName20("history"), children: [
-          /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(IconButton, { title: "undo", disabled: !hasPast, onClick: back, children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Undo2, { size: 21 }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(IconButton, { title: "redo", disabled: !hasFuture, onClick: forward, children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Redo2, { size: 21 }) })
+      children: /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)("div", { className: getClassName20("inner"), children: [
+        /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)("div", { className: getClassName20("history"), children: [
+          /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(IconButton, { title: "undo", disabled: !hasPast, onClick: back, children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Undo2, { size: 21 }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(IconButton, { title: "redo", disabled: !hasFuture, onClick: forward, children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Redo2, { size: 21 }) })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(import_jsx_runtime27.Fragment, { children: renderHeaderActions && renderHeaderActions() })
+        /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(import_jsx_runtime29.Fragment, { children: renderHeaderActions && renderHeaderActions() })
       ] })
     }
   );
@@ -6469,12 +6738,12 @@ var styles_module_default16 = { "PuckFields": "_PuckFields_10bh7_1", "PuckFields
 // components/Puck/components/Fields/index.tsx
 var import_react39 = require("react");
 var import_shallow4 = require("zustand/react/shallow");
-var import_jsx_runtime28 = require("react/jsx-runtime");
+var import_jsx_runtime30 = require("react/jsx-runtime");
 var getClassName21 = get_class_name_factory_default("PuckFields", styles_module_default16);
 var DefaultFields = ({
   children
 }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(import_jsx_runtime28.Fragment, { children });
+  return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(import_jsx_runtime30.Fragment, { children });
 };
 var createOnChange = (fieldName, appStore) => (value, updatedUi) => __async(void 0, null, function* () {
   let currentProps;
@@ -6545,7 +6814,7 @@ var FieldsChild = ({ fieldName }) => {
   ]);
   if (!field || !id) return null;
   if (field.type === "slot") return null;
-  return /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassName21("field"), children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("div", { className: getClassName21("field"), children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
     AutoFieldPrivate,
     {
       field,
@@ -6573,11 +6842,16 @@ var Fields = ({ wrapFields = true }) => {
   useRegisterFieldsSlice(appStore, id);
   const fieldsLoading = useAppStore((s) => s.fields.loading);
   const fieldNames = useAppStore(
-    (0, import_shallow4.useShallow)((s) => Object.keys(s.fields.fields))
+    (0, import_shallow4.useShallow)((s) => {
+      if (s.fields.id === id) {
+        return Object.keys(s.fields.fields);
+      }
+      return [];
+    })
   );
   const isLoading = fieldsLoading || componentResolving;
   const Wrapper = (0, import_react39.useMemo)(() => overrides.fields || DefaultFields, [overrides]);
-  return /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime30.jsxs)(
     "form",
     {
       className: getClassName21({ wrapFields }),
@@ -6585,8 +6859,8 @@ var Fields = ({ wrapFields = true }) => {
         e.preventDefault();
       },
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(Wrapper, { isLoading, itemSelector, children: fieldNames.map((fieldName) => /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(FieldsChild, { fieldName }, fieldName)) }),
-        isLoading && /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassName21("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassName21("loadingOverlayInner"), children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(Loader, { size: 16 }) }) })
+        /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(Wrapper, { isLoading, itemSelector, children: fieldNames.map((fieldName) => /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(FieldsChild, { fieldName }, fieldName)) }),
+        isLoading && /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("div", { className: getClassName21("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("div", { className: getClassName21("loadingOverlayInner"), children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(Loader, { size: 16 }) }) })
       ]
     }
   );
@@ -6607,7 +6881,7 @@ init_react_import();
 var styles_module_default17 = { "ComponentList": "_ComponentList_1rrlt_1", "ComponentList--isExpanded": "_ComponentList--isExpanded_1rrlt_5", "ComponentList-content": "_ComponentList-content_1rrlt_9", "ComponentList-title": "_ComponentList-title_1rrlt_17", "ComponentList-titleIcon": "_ComponentList-titleIcon_1rrlt_53" };
 
 // components/ComponentList/index.tsx
-var import_jsx_runtime29 = require("react/jsx-runtime");
+var import_jsx_runtime31 = require("react/jsx-runtime");
 var getClassName22 = get_class_name_factory_default("ComponentList", styles_module_default17);
 var ComponentListItem = ({
   name,
@@ -6619,7 +6893,7 @@ var ComponentListItem = ({
       type: name
     }).insert
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Drawer.Item, { label, name, isDragDisabled: !canInsert, children: overrides.componentItem });
+  return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Drawer.Item, { label, name, isDragDisabled: !canInsert, children: overrides.componentItem });
 };
 var ComponentList = ({
   children,
@@ -6630,8 +6904,8 @@ var ComponentList = ({
   const setUi = useAppStore((s) => s.setUi);
   const componentList = useAppStore((s) => s.state.ui.componentList);
   const { expanded = true } = componentList[id] || {};
-  return /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)("div", { className: getClassName22({ isExpanded: expanded }), children: [
-    title && /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)("div", { className: getClassName22({ isExpanded: expanded }), children: [
+    title && /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)(
       "button",
       {
         type: "button",
@@ -6645,14 +6919,14 @@ var ComponentList = ({
         }),
         title: expanded ? `Collapse${title ? ` ${title}` : ""}` : `Expand${title ? ` ${title}` : ""}`,
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { children: title }),
-          /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: getClassName22("titleIcon"), children: expanded ? /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(ChevronUp, { size: 12 }) : /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(ChevronDown, { size: 12 }) })
+          /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { children: title }),
+          /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { className: getClassName22("titleIcon"), children: expanded ? /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(ChevronUp, { size: 12 }) : /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(ChevronDown, { size: 12 }) })
         ]
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: getClassName22("content"), children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Drawer, { children: children || Object.keys(config.components).map((componentKey) => {
+    /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { className: getClassName22("content"), children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Drawer, { children: children || Object.keys(config.components).map((componentKey) => {
       var _a;
-      return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
+      return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
         ComponentListItem,
         {
           label: (_a = config.components[componentKey]["label"]) != null ? _a : componentKey,
@@ -6666,7 +6940,7 @@ var ComponentList = ({
 ComponentList.Item = ComponentListItem;
 
 // lib/use-component-list.tsx
-var import_jsx_runtime30 = require("react/jsx-runtime");
+var import_jsx_runtime32 = require("react/jsx-runtime");
 var useComponentList = () => {
   const [componentList, setComponentList] = (0, import_react40.useState)();
   const config = useAppStore((s) => s.config);
@@ -6681,7 +6955,7 @@ var useComponentList = () => {
           if (category.visible === false || !category.components) {
             return null;
           }
-          return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+          return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
             ComponentList,
             {
               id: categoryKey,
@@ -6690,7 +6964,7 @@ var useComponentList = () => {
                 var _a2;
                 matchedComponents.push(componentName);
                 const componentConf = config.components[componentName] || {};
-                return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+                return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
                   ComponentList.Item,
                   {
                     label: (_a2 = componentConf["label"]) != null ? _a2 : componentName,
@@ -6710,7 +6984,7 @@ var useComponentList = () => {
       );
       if (remainingComponents.length > 0 && !((_a = uiComponentList.other) == null ? void 0 : _a.components) && ((_b = uiComponentList.other) == null ? void 0 : _b.visible) !== false) {
         _componentList.push(
-          /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
             ComponentList,
             {
               id: "other",
@@ -6718,7 +6992,7 @@ var useComponentList = () => {
               children: remainingComponents.map((componentName, i) => {
                 var _a2;
                 const componentConf = config.components[componentName] || {};
-                return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+                return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
                   ComponentList.Item,
                   {
                     name: componentName,
@@ -6741,12 +7015,12 @@ var useComponentList = () => {
 
 // components/Puck/components/Components/index.tsx
 var import_react41 = require("react");
-var import_jsx_runtime31 = require("react/jsx-runtime");
+var import_jsx_runtime33 = require("react/jsx-runtime");
 var Components = () => {
   const overrides = useAppStore((s) => s.overrides);
   const componentList = useComponentList();
   const Wrapper = (0, import_react41.useMemo)(() => overrides.components || "div", [overrides]);
-  return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Wrapper, { children: componentList ? componentList : /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(ComponentList, { id: "all" }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Wrapper, { children: componentList ? componentList : /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(ComponentList, { id: "all" }) });
 };
 
 // components/Puck/components/Preview/index.tsx
@@ -6758,7 +7032,7 @@ init_react_import();
 var import_react42 = require("react");
 var import_object_hash = __toESM(require("object-hash"));
 var import_react_dom3 = require("react-dom");
-var import_jsx_runtime32 = require("react/jsx-runtime");
+var import_jsx_runtime34 = require("react/jsx-runtime");
 var styleSelector = 'style, link[rel="stylesheet"]';
 var collectStyles = (doc) => {
   const collected = [];
@@ -6958,7 +7232,7 @@ var CopyHostStyles = ({
       observer.disconnect();
     };
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(import_jsx_runtime32.Fragment, { children });
+  return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(import_jsx_runtime34.Fragment, { children });
 };
 var autoFrameContext = (0, import_react42.createContext)({});
 var useFrame = () => (0, import_react42.useContext)(autoFrameContext);
@@ -7005,7 +7279,7 @@ function AutoFrame(_a) {
       }
     }
   }, [frameRef, loaded, stylesLoaded]);
-  return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
     "iframe",
     __spreadProps(__spreadValues({}, props), {
       className,
@@ -7015,7 +7289,7 @@ function AutoFrame(_a) {
       onLoad: () => {
         setLoaded(true);
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(autoFrameContext.Provider, { value: ctx, children: loaded && mountTarget && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(autoFrameContext.Provider, { value: ctx, children: loaded && mountTarget && /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
         CopyHostStyles,
         {
           debug,
@@ -7034,7 +7308,7 @@ init_react_import();
 var styles_module_default18 = { "PuckPreview": "_PuckPreview_z2rgu_1", "PuckPreview-frame": "_PuckPreview-frame_z2rgu_6" };
 
 // components/Puck/components/Preview/index.tsx
-var import_jsx_runtime33 = require("react/jsx-runtime");
+var import_jsx_runtime35 = require("react/jsx-runtime");
 var getClassName23 = get_class_name_factory_default("PuckPreview", styles_module_default18);
 var useBubbleIframeEvents = (ref) => {
   const status = useAppStore((s) => s.status);
@@ -7094,7 +7368,7 @@ var Preview3 = ({ id = "puck-preview" }) => {
       const propsWithSlots = useSlots(rootConfig, pageProps, DropZoneEditPure);
       return ((_a = config.root) == null ? void 0 : _a.render) ? (_b = config.root) == null ? void 0 : _b.render(__spreadValues({
         id: "puck-root"
-      }, propsWithSlots)) : /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(import_jsx_runtime33.Fragment, { children: propsWithSlots.children });
+      }, propsWithSlots)) : /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(import_jsx_runtime35.Fragment, { children: propsWithSlots.children });
     },
     [config.root]
   );
@@ -7102,7 +7376,7 @@ var Preview3 = ({ id = "puck-preview" }) => {
   const rootProps = root.props || root;
   const ref = (0, import_react43.useRef)(null);
   useBubbleIframeEvents(ref);
-  const inner = !renderData ? /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
+  const inner = !renderData ? /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
     Page,
     __spreadProps(__spreadValues({}, rootProps), {
       puck: {
@@ -7112,15 +7386,15 @@ var Preview3 = ({ id = "puck-preview" }) => {
         metadata
       },
       editMode: true,
-      children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(DropZonePure, { zone: rootDroppableId })
+      children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(DropZonePure, { zone: rootDroppableId })
     })
-  ) : /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Render, { data: renderData, config });
+  ) : /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Render, { data: renderData, config });
   (0, import_react43.useEffect)(() => {
     if (!iframe.enabled) {
       setStatus("READY");
     }
   }, [iframe.enabled]);
-  return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
     "div",
     {
       className: getClassName23(),
@@ -7129,7 +7403,7 @@ var Preview3 = ({ id = "puck-preview" }) => {
       onClick: () => {
         dispatch({ type: "setUi", ui: { itemSelector: null } });
       },
-      children: iframe.enabled ? /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
+      children: iframe.enabled ? /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
         AutoFrame_default,
         {
           id: "preview-frame",
@@ -7142,14 +7416,14 @@ var Preview3 = ({ id = "puck-preview" }) => {
             setStatus("MOUNTED");
           },
           frameRef: ref,
-          children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(autoFrameContext.Consumer, { children: ({ document: document2 }) => {
+          children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(autoFrameContext.Consumer, { children: ({ document: document2 }) => {
             if (Frame) {
-              return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Frame, { document: document2, children: inner });
+              return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Frame, { document: document2, children: inner });
             }
             return inner;
           } })
         }
-      ) : /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
+      ) : /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
         "div",
         {
           id: "preview-frame",
@@ -7208,7 +7482,7 @@ var onScrollEnd = (frame, cb) => {
 
 // components/LayerTree/index.tsx
 var import_shallow5 = require("zustand/react/shallow");
-var import_jsx_runtime34 = require("react/jsx-runtime");
+var import_jsx_runtime36 = require("react/jsx-runtime");
 var getClassName24 = get_class_name_factory_default("LayerTree", styles_module_default19);
 var getClassNameLayer = get_class_name_factory_default("Layer", styles_module_default19);
 var Layer = ({
@@ -7254,7 +7528,7 @@ var Layer = ({
   });
   const componentConfig = config.components[nodeData.data.type];
   const label = (_a = componentConfig == null ? void 0 : componentConfig["label"]) != null ? _a : nodeData.data.type.toString();
-  return /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(
     "li",
     {
       className: getClassNameLayer({
@@ -7264,7 +7538,7 @@ var Layer = ({
         childIsSelected
       }),
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: getClassNameLayer("inner"), children: /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)(
+        /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassNameLayer("inner"), children: /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(
           "button",
           {
             type: "button",
@@ -7299,22 +7573,22 @@ var Layer = ({
               setHoveringComponent(null);
             },
             children: [
-              containsZone && /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
+              containsZone && /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
                 "div",
                 {
                   className: getClassNameLayer("chevron"),
                   title: isSelected ? "Collapse" : "Expand",
-                  children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(ChevronDown, { size: "12" })
+                  children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(ChevronDown, { size: "12" })
                 }
               ),
-              /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)("div", { className: getClassNameLayer("title"), children: [
-                /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: getClassNameLayer("icon"), children: nodeData.data.type === "Text" || nodeData.data.type === "Heading" ? /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Type, { size: "16" }) : /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(LayoutGrid, { size: "16" }) }),
-                /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: getClassNameLayer("name"), children: label })
+              /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { className: getClassNameLayer("title"), children: [
+                /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassNameLayer("icon"), children: nodeData.data.type === "Text" || nodeData.data.type === "Heading" ? /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Type, { size: "16" }) : /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(LayoutGrid, { size: "16" }) }),
+                /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassNameLayer("name"), children: label })
               ] })
             ]
           }
         ) }),
-        containsZone && zonesForItem.map((subzone) => /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: getClassNameLayer("zones"), children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(LayerTree, { zoneCompound: subzone }) }, subzone))
+        containsZone && zonesForItem.map((subzone) => /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassNameLayer("zones"), children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(LayerTree, { zoneCompound: subzone }) }, subzone))
       ]
     }
   );
@@ -7332,15 +7606,15 @@ var LayerTree = ({
       }
     )
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)(import_jsx_runtime34.Fragment, { children: [
-    label && /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)("div", { className: getClassName24("zoneTitle"), children: [
-      /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: getClassName24("zoneIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Layers, { size: "16" }) }),
+  return /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(import_jsx_runtime36.Fragment, { children: [
+    label && /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { className: getClassName24("zoneTitle"), children: [
+      /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassName24("zoneIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Layers, { size: "16" }) }),
       label
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)("ul", { className: getClassName24(), children: [
-      contentIds.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: getClassName24("helper"), children: "No items" }),
+    /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("ul", { className: getClassName24(), children: [
+      contentIds.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassName24("helper"), children: "No items" }),
       contentIds.map((itemId, i) => {
-        return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
+        return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
           Layer,
           {
             index: i,
@@ -7357,7 +7631,7 @@ var LayerTree = ({
 // components/Puck/components/Outline/index.tsx
 var import_react45 = require("react");
 
-// lib/find-zones-for-area.ts
+// lib/data/find-zones-for-area.ts
 init_react_import();
 var findZonesForArea = (state, area) => {
   return Object.keys(state.indexes.zones).filter(
@@ -7367,14 +7641,14 @@ var findZonesForArea = (state, area) => {
 
 // components/Puck/components/Outline/index.tsx
 var import_shallow6 = require("zustand/react/shallow");
-var import_jsx_runtime35 = require("react/jsx-runtime");
+var import_jsx_runtime37 = require("react/jsx-runtime");
 var Outline = () => {
   const outlineOverride = useAppStore((s) => s.overrides.outline);
   const rootZones = useAppStore(
     (0, import_shallow6.useShallow)((s) => findZonesForArea(s.state, "root"))
   );
   const Wrapper = (0, import_react45.useMemo)(() => outlineOverride || "div", [outlineOverride]);
-  return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Wrapper, { children: rootZones.map((zoneCompound) => /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Wrapper, { children: rootZones.map((zoneCompound) => /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
     LayerTree,
     {
       label: rootZones.length === 1 ? "" : zoneCompound.split(":")[1],
@@ -7518,11 +7792,11 @@ init_react_import();
 var styles_module_default20 = { "ViewportControls": "_ViewportControls_gejzr_1", "ViewportControls-divider": "_ViewportControls-divider_gejzr_15", "ViewportControls-zoomSelect": "_ViewportControls-zoomSelect_gejzr_21", "ViewportButton--isActive": "_ViewportButton--isActive_gejzr_38", "ViewportButton-inner": "_ViewportButton-inner_gejzr_38" };
 
 // components/ViewportControls/index.tsx
-var import_jsx_runtime36 = require("react/jsx-runtime");
+var import_jsx_runtime38 = require("react/jsx-runtime");
 var icons = {
-  Smartphone: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Smartphone, { size: 16 }),
-  Tablet: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Tablet, { size: 16 }),
-  Monitor: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Monitor, { size: 16 })
+  Smartphone: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Smartphone, { size: 16 }),
+  Tablet: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Tablet, { size: 16 }),
+  Monitor: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Monitor, { size: 16 })
 };
 var getClassName25 = get_class_name_factory_default("ViewportControls", styles_module_default20);
 var getClassNameButton = get_class_name_factory_default("ViewportButton", styles_module_default20);
@@ -7538,7 +7812,7 @@ var ViewportButton = ({
   (0, import_react46.useEffect)(() => {
     setIsActive(width === viewports.current.width);
   }, [width, viewports.current.width]);
-  return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("span", { className: getClassNameButton({ isActive }), children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("span", { className: getClassNameButton({ isActive }), children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
     IconButton,
     {
       title,
@@ -7547,7 +7821,7 @@ var ViewportButton = ({
         e.stopPropagation();
         onClick({ width, height });
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("span", { className: getClassNameButton("inner"), children })
+      children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("span", { className: getClassNameButton("inner"), children })
     }
   ) });
 };
@@ -7583,8 +7857,8 @@ var ViewportControls = ({
     ].filter((a) => a.value <= autoZoom).sort((a, b) => a.value > b.value ? 1 : -1),
     [autoZoom]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { className: getClassName25(), children: [
-    viewports.map((viewport, i) => /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)("div", { className: getClassName25(), children: [
+    viewports.map((viewport, i) => /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
       ViewportButton,
       {
         height: viewport.height,
@@ -7595,8 +7869,8 @@ var ViewportControls = ({
       },
       i
     )),
-    /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassName25("divider") }),
-    /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: getClassName25("divider") }),
+    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
       IconButton,
       {
         title: "Zoom viewport out",
@@ -7610,10 +7884,10 @@ var ViewportControls = ({
             )].value
           );
         },
-        children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(ZoomOut, { size: 16 })
+        children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(ZoomOut, { size: 16 })
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
       IconButton,
       {
         title: "Zoom viewport in",
@@ -7627,11 +7901,11 @@ var ViewportControls = ({
             )].value
           );
         },
-        children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(ZoomIn, { size: 16 })
+        children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(ZoomIn, { size: 16 })
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassName25("divider") }),
-    /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: getClassName25("divider") }),
+    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
       "select",
       {
         className: getClassName25("zoomSelect"),
@@ -7639,7 +7913,7 @@ var ViewportControls = ({
         onChange: (e) => {
           onZoom(parseFloat(e.currentTarget.value));
         },
-        children: zoomOptions.map((option) => /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
+        children: zoomOptions.map((option) => /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
           "option",
           {
             value: option.value,
@@ -7688,7 +7962,7 @@ var getZoomConfig = (uiViewport, frame, zoom) => {
 
 // components/Puck/components/Canvas/index.tsx
 var import_shallow7 = require("zustand/react/shallow");
-var import_jsx_runtime37 = require("react/jsx-runtime");
+var import_jsx_runtime39 = require("react/jsx-runtime");
 var getClassName26 = get_class_name_factory_default("PuckCanvas", styles_module_default21);
 var ZOOM_ON_CHANGE = true;
 var Canvas = () => {
@@ -7721,7 +7995,7 @@ var Canvas = () => {
   const frameRef = (0, import_react47.useRef)(null);
   const [showTransition, setShowTransition] = (0, import_react47.useState)(false);
   const defaultRender = (0, import_react47.useMemo)(() => {
-    const PuckDefault = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(import_jsx_runtime37.Fragment, { children });
+    const PuckDefault = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(import_jsx_runtime39.Fragment, { children });
     return PuckDefault;
   }, []);
   const CustomPreview = (0, import_react47.useMemo)(
@@ -7784,7 +8058,7 @@ var Canvas = () => {
       setShowLoader(true);
     }, 500);
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(
     "div",
     {
       className: getClassName26({
@@ -7797,7 +8071,7 @@ var Canvas = () => {
         recordHistory: true
       }),
       children: [
-        viewports.controlsVisible && iframe.enabled && /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("div", { className: getClassName26("controls"), children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+        viewports.controlsVisible && iframe.enabled && /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: getClassName26("controls"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
           ViewportControls,
           {
             autoZoom: zoomConfig.autoZoom,
@@ -7823,8 +8097,8 @@ var Canvas = () => {
             }
           }
         ) }),
-        /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)("div", { className: getClassName26("inner"), ref: frameRef, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: getClassName26("inner"), ref: frameRef, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
             "div",
             {
               className: getClassName26("root"),
@@ -7845,10 +8119,10 @@ var Canvas = () => {
                   })
                 );
               },
-              children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(CustomPreview, { children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Preview3, {}) })
+              children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(CustomPreview, { children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Preview3, {}) })
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("div", { className: getClassName26("loader"), children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Loader, { size: 24 }) })
+          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: getClassName26("loader"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Loader, { size: 24 }) })
         ] })
       ]
     }
@@ -7903,8 +8177,8 @@ var useLoadedOverrides = ({
 
 // components/DefaultOverride/index.tsx
 init_react_import();
-var import_jsx_runtime38 = require("react/jsx-runtime");
-var DefaultOverride = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(import_jsx_runtime38.Fragment, { children });
+var import_jsx_runtime40 = require("react/jsx-runtime");
+var DefaultOverride = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(import_jsx_runtime40.Fragment, { children });
 
 // lib/use-inject-css.ts
 init_react_import();
@@ -7967,13 +8241,22 @@ var generateUsePuck = (store) => {
     index: store.history.index
   };
   const storeData = {
-    appState: store.state,
+    appState: makeStatePublic(store.state),
     config: store.config,
     dispatch: store.dispatch,
     getPermissions: store.permissions.getPermissions,
     refreshPermissions: store.permissions.refreshPermissions,
     history,
-    selectedItem: store.selectedItem || null
+    selectedItem: store.selectedItem || null,
+    getItemBySelector: (selector) => getItem(selector, store.state),
+    getItemById: (id) => store.state.indexes.nodes[id].data,
+    getSelectorForId: (id) => {
+      const node = store.state.indexes.nodes[id];
+      if (!node) return;
+      const zoneCompound = `${node.parentId}:${node.zone}`;
+      const index = store.state.indexes.zones[zoneCompound].contentIds.indexOf(id);
+      return { zone: zoneCompound, index };
+    }
   };
   const get = () => storeData;
   return __spreadProps(__spreadValues({}, storeData), { get });
@@ -7981,23 +8264,25 @@ var generateUsePuck = (store) => {
 var UsePuckStoreContext = (0, import_react51.createContext)(
   null
 );
+var convertToPickedStore = (store) => {
+  return {
+    state: store.state,
+    config: store.config,
+    dispatch: store.dispatch,
+    permissions: store.permissions,
+    history: store.history,
+    selectedItem: store.selectedItem
+  };
+};
 var useRegisterUsePuckStore = (appStore) => {
   const [usePuckStore] = (0, import_react51.useState)(
-    () => (0, import_zustand6.createStore)(() => generateUsePuck(appStore.getState()))
+    () => (0, import_zustand6.createStore)(
+      () => generateUsePuck(convertToPickedStore(appStore.getState()))
+    )
   );
   (0, import_react51.useEffect)(() => {
     return appStore.subscribe(
-      (store) => {
-        const pickedStore = {
-          state: store.state,
-          config: store.config,
-          dispatch: store.dispatch,
-          permissions: store.permissions,
-          history: store.history,
-          selectedItem: store.selectedItem
-        };
-        return pickedStore;
-      },
+      (store) => convertToPickedStore(store),
       (pickedStore) => {
         usePuckStore.setState(generateUsePuck(pickedStore));
       }
@@ -8028,7 +8313,8 @@ function usePuck() {
 }
 
 // components/Puck/index.tsx
-var import_jsx_runtime39 = require("react/jsx-runtime");
+var import_fast_deep_equal2 = __toESM(require("fast-deep-equal"));
+var import_jsx_runtime41 = require("react/jsx-runtime");
 var getClassName27 = get_class_name_factory_default("Puck", styles_module_default15);
 var getLayoutClassName = get_class_name_factory_default("PuckLayout", styles_module_default15);
 var FieldSideBar = () => {
@@ -8038,31 +8324,13 @@ var FieldSideBar = () => {
       return s.selectedItem ? (_b = (_a = s.config.components[s.selectedItem.type]) == null ? void 0 : _a["label"]) != null ? _b : s.selectedItem.type.toString() : "Page";
     }
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(SidebarSection, { noPadding: true, noBorderTop: true, showBreadcrumbs: true, title, children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Fields, {}) });
+  return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(SidebarSection, { noPadding: true, noBorderTop: true, showBreadcrumbs: true, title, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Fields, {}) });
 };
-var DEBUG4 = false;
 var propsContext = (0, import_react52.createContext)({});
 function PropsProvider(props) {
-  return /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(propsContext.Provider, { value: props, children: props.children });
+  return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(propsContext.Provider, { value: props, children: props.children });
 }
 var usePropsContext = () => (0, import_react52.useContext)(propsContext);
-var debugPlugin = {
-  overrides: {
-    fields: ({ children }) => {
-      const state = useAppStore((s) => s.state);
-      const selectedItem = useAppStore((s) => s.selectedItem);
-      return /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(import_jsx_runtime39.Fragment, { children: [
-        children,
-        /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(SidebarSection, { title: "Debug: Data", children: JSON.stringify(state.data) }),
-        /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(SidebarSection, { title: "Debug: UI", children: JSON.stringify(state.ui) }),
-        /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(SidebarSection, { title: "Debug: Other", children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("ul", { children: /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("li", { children: [
-          "Selected Item: ",
-          JSON.stringify(selectedItem)
-        ] }) }) })
-      ] });
-    }
-  }
-};
 function PuckProvider({ children }) {
   const {
     config,
@@ -8070,7 +8338,7 @@ function PuckProvider({ children }) {
     ui: initialUi,
     onChange,
     permissions = {},
-    plugins: _plugins,
+    plugins,
     overrides,
     viewports = defaultViewports,
     iframe: _iframe,
@@ -8139,69 +8407,77 @@ function PuckProvider({ children }) {
         ) : {}
       })
     });
-    return walkTree(newAppState, config);
+    return walkAppState(newAppState, config);
   });
   const { appendData = true } = _initialHistory || {};
-  const blendedHistories = [
-    ...(_initialHistory == null ? void 0 : _initialHistory.histories) || [],
-    ...appendData ? [{ state: generatedAppState }] : []
-  ].map((history) => __spreadProps(__spreadValues({}, history), {
-    // Inject default data to enable partial history injections
-    state: __spreadValues(__spreadValues({}, generatedAppState), history.state)
-  }));
+  const [blendedHistories] = (0, import_react52.useState)(
+    [
+      ...(_initialHistory == null ? void 0 : _initialHistory.histories) || [],
+      ...appendData ? [{ state: generatedAppState }] : []
+    ].map((history) => {
+      let newState = __spreadValues(__spreadValues({}, generatedAppState), history.state);
+      if (!history.state.indexes) {
+        newState = walkAppState(newState, config);
+      }
+      return __spreadProps(__spreadValues({}, history), {
+        state: newState
+      });
+    })
+  );
   const initialHistoryIndex = (_initialHistory == null ? void 0 : _initialHistory.index) || blendedHistories.length - 1;
   const initialAppState = blendedHistories[initialHistoryIndex].state;
-  const plugins = (0, import_react52.useMemo)(
-    () => DEBUG4 ? [..._plugins || [], debugPlugin] : _plugins,
-    [_plugins]
-  );
   const loadedOverrides = useLoadedOverrides({
     overrides,
     plugins
   });
-  const generateAppStore = (0, import_react52.useCallback)(() => {
-    return {
-      state: initialAppState,
+  const generateAppStore = (0, import_react52.useCallback)(
+    (state) => {
+      return {
+        state,
+        config,
+        plugins: plugins || [],
+        overrides: loadedOverrides,
+        viewports,
+        iframe,
+        onAction,
+        metadata
+      };
+    },
+    [
+      initialAppState,
       config,
-      plugins: plugins || [],
-      overrides: loadedOverrides,
+      plugins,
+      loadedOverrides,
       viewports,
       iframe,
       onAction,
       metadata
-    };
-  }, [
-    initialAppState,
-    config,
-    plugins,
-    loadedOverrides,
-    viewports,
-    iframe,
-    onAction,
-    metadata
-  ]);
-  const [appStore] = (0, import_react52.useState)(() => createAppStore(generateAppStore()));
+    ]
+  );
+  const [appStore] = (0, import_react52.useState)(
+    () => createAppStore(generateAppStore(initialAppState))
+  );
   (0, import_react52.useEffect)(() => {
-    appStore.setState(__spreadValues({}, generateAppStore()));
-  }, [
-    initialAppState,
-    config,
-    plugins,
-    loadedOverrides,
-    viewports,
-    iframe,
-    onAction,
-    metadata
-  ]);
+    const state = appStore.getState().state;
+    appStore.setState(__spreadValues({}, generateAppStore(state)));
+  }, [config, plugins, loadedOverrides, viewports, iframe, onAction, metadata]);
   useRegisterHistorySlice(appStore, {
     histories: blendedHistories,
     index: initialHistoryIndex,
     initialAppState
   });
+  const previousData = (0, import_react52.useRef)(null);
   (0, import_react52.useEffect)(() => {
-    appStore.subscribe((s) => {
-      if (onChange) onChange(s.state.data);
-    });
+    appStore.subscribe(
+      (s) => s.state.data,
+      (data) => {
+        if (onChange) {
+          if ((0, import_fast_deep_equal2.default)(data, previousData.current)) return;
+          onChange(data);
+          previousData.current = data;
+        }
+      }
+    );
   }, []);
   useRegisterPermissionsSlice(appStore, permissions);
   const uPuckStore = useRegisterUsePuckStore(appStore);
@@ -8209,11 +8485,10 @@ function PuckProvider({ children }) {
     const { resolveAndCommitData } = appStore.getState();
     resolveAndCommitData();
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(appStoreContext.Provider, { value: appStore, children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(UsePuckStoreContext.Provider, { value: uPuckStore, children }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(appStoreContext.Provider, { value: appStore, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(UsePuckStoreContext.Provider, { value: uPuckStore, children }) });
 }
 function PuckLayout({ children }) {
   const {
-    onChange,
     onPublish,
     renderHeader,
     renderHeaderActions,
@@ -8234,11 +8509,6 @@ function PuckLayout({ children }) {
   );
   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
   );
@@ -8289,7 +8559,7 @@ function PuckLayout({ children }) {
         var _b = _a, { actions } = _b, props = __objRest(_b, ["actions"]);
         const Comp = renderHeader;
         const appState = useAppStore((s) => s.state);
-        return /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState, children: actions }));
+        return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState, children: actions }));
       };
       return RenderHeader;
     }
@@ -8303,7 +8573,7 @@ function PuckLayout({ children }) {
       const RenderHeader = (props) => {
         const Comp = renderHeaderActions;
         const appState = useAppStore((s) => s.state);
-        return /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState }));
+        return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState }));
       };
       return RenderHeader;
     }
@@ -8337,8 +8607,8 @@ function PuckLayout({ children }) {
     }
   }, [ready, iframe.enabled]);
   usePreviewModeHotkeys();
-  return /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: `Puck ${getClassName27()}`, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(DragDropContext, { disableAutoScroll: dnd == null ? void 0 : dnd.disableAutoScroll, children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(CustomPuck, { children: children || /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: `Puck ${getClassName27()}`, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(DragDropContext, { disableAutoScroll: dnd == null ? void 0 : dnd.disableAutoScroll, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(CustomPuck, { children: children || /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
       "div",
       {
         className: getLayoutClassName({
@@ -8347,61 +8617,61 @@ function PuckLayout({ children }) {
           mounted,
           rightSideBarVisible
         }),
-        children: /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: getLayoutClassName("inner"), children: [
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+        children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getLayoutClassName("inner"), children: [
+          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
             CustomHeader,
             {
-              actions: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(import_jsx_runtime39.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(CustomHeaderActions, { children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+              actions: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(import_jsx_runtime41.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(CustomHeaderActions, { children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
                 Button,
                 {
                   onClick: () => {
                     const data = appStore.getState().state.data;
                     onPublish && onPublish(data);
                   },
-                  icon: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Globe, { size: "14px" }),
+                  icon: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Globe, { size: "14px" }),
                   children: "Publish"
                 }
               ) }) }),
-              children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("header", { className: getLayoutClassName("header"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: getLayoutClassName("headerInner"), children: [
-                /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: getLayoutClassName("headerToggle"), children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+              children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("header", { className: getLayoutClassName("header"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getLayoutClassName("headerInner"), children: [
+                /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getLayoutClassName("headerToggle"), children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
                     "div",
                     {
                       className: getLayoutClassName("leftSideBarToggle"),
-                      children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+                      children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
                         IconButton,
                         {
                           onClick: () => {
                             toggleSidebars("left");
                           },
                           title: "Toggle left sidebar",
-                          children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(PanelLeft, { focusable: "false" })
+                          children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PanelLeft, { focusable: "false" })
                         }
                       )
                     }
                   ),
-                  /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+                  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
                     "div",
                     {
                       className: getLayoutClassName("rightSideBarToggle"),
-                      children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+                      children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
                         IconButton,
                         {
                           onClick: () => {
                             toggleSidebars("right");
                           },
                           title: "Toggle right sidebar",
-                          children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(PanelRight, { focusable: "false" })
+                          children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PanelRight, { focusable: "false" })
                         }
                       )
                     }
                   )
                 ] }),
-                /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: getLayoutClassName("headerTitle"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(Heading, { rank: "2", size: "xs", children: [
+                /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: getLayoutClassName("headerTitle"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Heading, { rank: "2", size: "xs", children: [
                   headerTitle || (rootProps == null ? void 0 : rootProps.title) || "Page",
-                  headerPath && /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(import_jsx_runtime39.Fragment, { children: [
+                  headerPath && /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(import_jsx_runtime41.Fragment, { children: [
                     " ",
-                    /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+                    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
                       "code",
                       {
                         className: getLayoutClassName("headerPath"),
@@ -8410,31 +8680,31 @@ function PuckLayout({ children }) {
                     )
                   ] })
                 ] }) }),
-                /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: getLayoutClassName("headerTools"), children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: getLayoutClassName("menuButton"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+                /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getLayoutClassName("headerTools"), children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: getLayoutClassName("menuButton"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
                     IconButton,
                     {
                       onClick: () => {
                         return setMenuOpen(!menuOpen);
                       },
                       title: "Toggle menu bar",
-                      children: menuOpen ? /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(ChevronUp, { focusable: "false" }) : /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(ChevronDown, { focusable: "false" })
+                      children: menuOpen ? /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(ChevronUp, { focusable: "false" }) : /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(ChevronDown, { focusable: "false" })
                     }
                   ) }),
-                  /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+                  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
                     MenuBar,
                     {
                       dispatch,
                       onPublish,
                       menuOpen,
-                      renderHeaderActions: () => /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(CustomHeaderActions, { children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+                      renderHeaderActions: () => /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(CustomHeaderActions, { children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
                         Button,
                         {
                           onClick: () => {
                             const data = appStore.getState().state.data;
                             onPublish && onPublish(data);
                           },
-                          icon: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Globe, { size: "14px" }),
+                          icon: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Globe, { size: "14px" }),
                           children: "Publish"
                         }
                       ) }),
@@ -8445,20 +8715,20 @@ function PuckLayout({ children }) {
               ] }) })
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: getLayoutClassName("leftSideBar"), children: [
-            /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(SidebarSection, { title: "Components", noBorderTop: true, children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Components, {}) }),
-            /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(SidebarSection, { title: "Outline", children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Outline, {}) })
+          /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getLayoutClassName("leftSideBar"), children: [
+            /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(SidebarSection, { title: "Components", noBorderTop: true, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Components, {}) }),
+            /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(SidebarSection, { title: "Outline", children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Outline, {}) })
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Canvas, {}),
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: getLayoutClassName("rightSideBar"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(FieldSideBar, {}) })
+          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Canvas, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: getLayoutClassName("rightSideBar"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(FieldSideBar, {}) })
         ] })
       }
     ) }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { id: "puck-portal-root", className: getClassName27("portal") })
+    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { id: "puck-portal-root", className: getClassName27("portal") })
   ] });
 }
 function Puck(props) {
-  return /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(PropsProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(PuckProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(PuckLayout, __spreadValues({}, props)) })) }));
+  return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PropsProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PuckProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PuckLayout, __spreadValues({}, props)) })) }));
 }
 Puck.Components = Components;
 Puck.Fields = Fields;
@@ -8482,16 +8752,73 @@ var migrations = [
       });
     }
     return data;
+  },
+  // Migrate zones to slots
+  (data, config) => {
+    var _a;
+    if (!config) return data;
+    console.log("Migrating DropZones to slots...");
+    const updatedItems = {};
+    const appState = __spreadProps(__spreadValues({}, defaultAppState), { data });
+    const { indexes } = walkAppState(appState, config);
+    const deletedCompounds = [];
+    walkAppState(appState, config, (content, zoneCompound, zoneType) => {
+      var _a2, _b;
+      if (zoneType === "dropzone") {
+        const [id, slotName] = zoneCompound.split(":");
+        const nodeData = indexes.nodes[id].data;
+        const componentType = nodeData.type;
+        const configForComponent = 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), {
+              [slotName]: content
+            })
+          });
+          deletedCompounds.push(zoneCompound);
+        }
+        return content;
+      }
+      return content;
+    });
+    const updated = walkAppState(
+      appState,
+      config,
+      (content) => content,
+      (item) => {
+        var _a2;
+        return (_a2 = updatedItems[item.props.id]) != null ? _a2 : item;
+      }
+    );
+    deletedCompounds.forEach((zoneCompound) => {
+      var _a2;
+      const [_, propName] = zoneCompound.split(":");
+      console.log(
+        `\u2713 Success: Migrated "${zoneCompound}" from DropZone to slot field "${propName}"`
+      );
+      (_a2 = updated.data.zones) == null ? true : delete _a2[zoneCompound];
+    });
+    Object.keys((_a = updated.data.zones) != null ? _a : {}).forEach((zoneCompound) => {
+      const [_, propName] = zoneCompound.split(":");
+      throw new Error(
+        `Could not migrate DropZone "${zoneCompound}" to slot field. No slot exists with the name "${propName}".`
+      );
+    });
+    delete updated.data.zones;
+    return updated.data;
   }
 ];
-function migrate(data) {
-  return migrations == null ? void 0 : migrations.reduce((acc, migration) => migration(acc), data);
+function migrate(data, config) {
+  return migrations == null ? void 0 : migrations.reduce(
+    (acc, migration) => migration(acc, config),
+    data
+  );
 }
 
 // lib/transform-props.ts
 init_react_import();
 
-// lib/default-data.ts
+// lib/data/default-data.ts
 init_react_import();
 var defaultData = (data) => __spreadProps(__spreadValues({}, data), {
   root: data.root || {},
@@ -8534,7 +8861,7 @@ function transformProps(data, propTransforms) {
 // lib/resolve-all-data.ts
 init_react_import();
 
-// lib/to-component.ts
+// lib/data/to-component.ts
 init_react_import();
 var toComponent = (item) => {
   return "type" in item ? item : __spreadProps(__spreadValues({}, item), {
@@ -8562,17 +8889,29 @@ function resolveAllData(_0, _1) {
         "force",
         false
       )).node;
-      const resolvedDeep = yield mapSlots(resolved, processContent, false);
+      const resolvedDeep = yield mapSlotsAsync(
+        resolved,
+        processContent,
+        false
+      );
       onResolveEnd == null ? void 0 : onResolveEnd(toComponent(resolvedDeep));
       return resolvedDeep;
     });
     const processContent = (content) => __async(this, null, function* () {
       return Promise.all(content.map(resolveNode));
     });
+    const processZones = () => __async(this, null, function* () {
+      var _a2;
+      const zones = (_a2 = data.zones) != null ? _a2 : {};
+      Object.entries(zones).forEach((_02) => __async(this, [_02], function* ([zoneKey, content]) {
+        zones[zoneKey] = yield Promise.all(content.map(resolveNode));
+      }));
+      return zones;
+    });
     const dynamic = {
       root: yield resolveNode(defaultedData.root),
       content: yield processContent(defaultedData.content),
-      zones: {}
+      zones: yield processZones()
     };
     Object.keys((_a = defaultedData.zones) != null ? _a : {}).forEach((zoneKey) => __async(this, null, function* () {
       const content = defaultedData.zones[zoneKey];
@@ -8601,7 +8940,8 @@ function resolveAllData(_0, _1) {
   renderContext,
   resolveAllData,
   transformProps,
-  usePuck
+  usePuck,
+  walkTree
 });
 /*! Bundled license information: