@measured/puck 0.19.0-canary.a967ca42 → 0.19.0-canary.af1dc891

package/dist/index.js

@@ -792,43 +792,6 @@ init_react_import();
 // lib/data/walk-app-state.ts
 init_react_import();
 
-// lib/data/for-each-slot.ts
-init_react_import();
-
-// lib/data/is-slot.ts
-init_react_import();
-var isSlot = (prop) => {
-  var _a, _b;
-  return Array.isArray(prop) && typeof ((_a = prop[0]) == null ? void 0 : _a.type) === "string" && typeof ((_b = prop[0]) == null ? void 0 : _b.props) === "object";
-};
-var createIsSlotConfig = (config) => (itemType, propName, propValue) => {
-  var _a, _b;
-  const configForComponent = itemType === "root" ? config == null ? void 0 : config.root : config == null ? void 0 : config.components[itemType];
-  if (!configForComponent) return isSlot(propValue);
-  return ((_b = (_a = configForComponent.fields) == null ? void 0 : _a[propName]) == null ? void 0 : _b.type) === "slot";
-};
-
-// lib/data/for-each-slot.ts
-var forEachSlot = (item, cb, recursive = false, isSlot2 = isSlot) => {
-  const props = item.props || {};
-  const propKeys = Object.keys(props);
-  for (let i = 0; i < propKeys.length; i++) {
-    const propKey = propKeys[i];
-    const itemType = "type" in item ? item.type : "root";
-    if (isSlot2(itemType, propKey, props[propKey])) {
-      const content = props[propKey];
-      cb(props.id, propKey, content);
-      if (recursive) {
-        content.forEach(
-          (childItem) => __async(void 0, null, function* () {
-            return forEachSlot(childItem, cb, true, isSlot2);
-          })
-        );
-      }
-    }
-  }
-};
-
 // lib/data/for-related-zones.ts
 init_react_import();
 
@@ -862,19 +825,160 @@ function forRelatedZones(item, data, cb, path = []) {
   });
 }
 
+// lib/data/map-slots.ts
+init_react_import();
+var isPromise = (v) => !!v && typeof v.then === "function";
+var flatten = (values) => values.reduce((acc, item) => __spreadValues(__spreadValues({}, acc), item), {});
+var containsPromise = (arr) => arr.some(isPromise);
+var walkField = ({
+  value,
+  fields,
+  map,
+  propKey = "",
+  propPath = "",
+  id = "",
+  config,
+  recurseSlots = false
+}) => {
+  var _a, _b, _c;
+  if (((_a = fields[propKey]) == null ? void 0 : _a.type) === "slot") {
+    const content = value || [];
+    const mappedContent = recurseSlots ? content.map((el) => {
+      var _a2;
+      const componentConfig = config.components[el.type];
+      if (!componentConfig) {
+        throw new Error(`Could not find component config for ${el.type}`);
+      }
+      const fields2 = (_a2 = componentConfig.fields) != null ? _a2 : {};
+      return walkField({
+        value: el,
+        fields: fields2,
+        map,
+        id: el.props.id,
+        config,
+        recurseSlots
+      });
+    }) : content;
+    if (containsPromise(mappedContent)) {
+      return Promise.all(mappedContent);
+    }
+    return map(mappedContent, id, propPath, fields[propKey], propPath);
+  }
+  if (value && typeof value === "object") {
+    if (Array.isArray(value)) {
+      const arrayFields = ((_b = fields[propKey]) == null ? void 0 : _b.type) === "array" ? fields[propKey].arrayFields : null;
+      if (!arrayFields) return value;
+      const newValue = value.map(
+        (el, idx) => walkField({
+          value: el,
+          fields: arrayFields,
+          map,
+          propKey,
+          propPath: `${propPath}[${idx}]`,
+          id,
+          config,
+          recurseSlots
+        })
+      );
+      if (containsPromise(newValue)) {
+        return Promise.all(newValue);
+      }
+      return newValue;
+    } else if ("$$typeof" in value) {
+      return value;
+    } else {
+      const objectFields = ((_c = fields[propKey]) == null ? void 0 : _c.type) === "object" ? fields[propKey].objectFields : fields;
+      return walkObject({
+        value,
+        fields: objectFields,
+        map,
+        id,
+        getPropPath: (k) => `${propPath}.${k}`,
+        config,
+        recurseSlots
+      });
+    }
+  }
+  return value;
+};
+var walkObject = ({
+  value,
+  fields,
+  map,
+  id,
+  getPropPath,
+  config,
+  recurseSlots
+}) => {
+  const newProps = Object.entries(value).map(([k, v]) => {
+    const opts = {
+      value: v,
+      fields,
+      map,
+      propKey: k,
+      propPath: getPropPath(k),
+      id,
+      config,
+      recurseSlots
+    };
+    const newValue = walkField(opts);
+    if (isPromise(newValue)) {
+      return newValue.then((resolvedValue) => ({
+        [k]: resolvedValue
+      }));
+    }
+    return {
+      [k]: newValue
+    };
+  }, {});
+  if (containsPromise(newProps)) {
+    return Promise.all(newProps).then(flatten);
+  }
+  return flatten(newProps);
+};
+function mapSlots(item, map, config, recurseSlots = false) {
+  var _a, _b, _c, _d;
+  const itemType = "type" in item ? item.type : "root";
+  const componentConfig = itemType === "root" ? config.root : (_a = config.components) == null ? void 0 : _a[itemType];
+  const newProps = walkObject({
+    value: (_b = item.props) != null ? _b : {},
+    fields: (_c = componentConfig == null ? void 0 : componentConfig.fields) != null ? _c : {},
+    map,
+    id: item.props ? (_d = item.props.id) != null ? _d : "root" : "root",
+    getPropPath: (k) => k,
+    config,
+    recurseSlots
+  });
+  if (isPromise(newProps)) {
+    return newProps.then((resolvedProps) => __spreadProps(__spreadValues({}, item), {
+      props: resolvedProps
+    }));
+  }
+  return __spreadProps(__spreadValues({}, item), {
+    props: newProps
+  });
+}
+
+// lib/data/flatten-node.ts
+init_react_import();
+var import_flat = require("flat");
+
 // lib/data/strip-slots.ts
 init_react_import();
-var stripSlots = (data) => {
-  return __spreadProps(__spreadValues({}, data), {
-    props: Object.entries(data.props).reduce(
-      (acc, [propKey, propVal]) => {
-        if (isSlot(propVal)) {
-          return acc;
-        }
-        return __spreadProps(__spreadValues({}, acc), { [propKey]: propVal });
-      },
-      { id: data.props.id }
-    )
+var stripSlots = (data, config) => {
+  return mapSlots(data, () => null, config);
+};
+
+// lib/data/flatten-node.ts
+var flattenNode = (node, config) => {
+  return __spreadProps(__spreadValues({}, node), {
+    props: (0, import_flat.flatten)(stripSlots(node, config).props)
+  });
+};
+var expandNode = (node) => {
+  const props = (0, import_flat.unflatten)(node.props);
+  return __spreadProps(__spreadValues({}, node), {
+    props
   });
 };
 
@@ -920,10 +1024,9 @@ function walkAppState(state, config, mapContent = (content) => content, mapNodeO
     const mappedItem = mapNodeOrSkip(item, path, index);
     if (!mappedItem) return item;
     const id = mappedItem.props.id;
-    const newProps = __spreadValues({}, mappedItem.props);
-    forEachSlot(
+    const newProps = __spreadProps(__spreadValues({}, mapSlots(
       mappedItem,
-      (parentId2, slotId, content) => {
+      (content, parentId2, slotId) => {
         const zoneCompound = `${parentId2}:${slotId}`;
         const [_2, newContent2] = processContent(
           path,
@@ -932,18 +1035,19 @@ function walkAppState(state, config, mapContent = (content) => content, mapNodeO
           "slot",
           parentId2
         );
-        newProps[slotId] = newContent2;
+        return newContent2;
       },
-      false,
-      createIsSlotConfig(config)
-    );
+      config
+    ).props), {
+      id
+    });
     processRelatedZones(item, id, path);
     const newItem = __spreadProps(__spreadValues({}, item), { props: newProps });
     const thisZoneCompound = path[path.length - 1];
     const [parentId, zone] = thisZoneCompound ? thisZoneCompound.split(":") : [null, ""];
     newNodeIndex[id] = {
       data: newItem,
-      flatData: stripSlots(newItem),
+      flatData: flattenNode(newItem, config),
       path,
       parentId,
       zone
@@ -1046,56 +1150,17 @@ 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(
+    return mapSlots(
       item,
-      (content, parentId, propName) => callbackFn(content, { parentId, propName }),
-      isSlot2
+      (content, parentId, propName) => {
+        var _a2;
+        return (_a2 = callbackFn(content, { parentId, propName })) != null ? _a2 : content;
+      },
+      config,
+      true
     );
   };
   if ("props" in data) {
@@ -1124,7 +1189,7 @@ 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)
+      props: override ? __spreadProps(__spreadValues({}, data.props), { id }) : __spreadValues({}, data.props)
     }),
     config,
     (contents) => contents.map((item) => {
@@ -1826,7 +1891,11 @@ var createNodesSlice = (set, get) => ({
     const s = get().nodes;
     const emptyNode = {
       id,
-      methods: { sync: () => null },
+      methods: {
+        sync: () => null,
+        hideOverlay: () => null,
+        showOverlay: () => null
+      },
       element: null
     };
     const existingNode = s.nodes[id];
@@ -1877,12 +1946,13 @@ var flattenData = (state, config) => {
 
 // lib/get-changed.ts
 init_react_import();
+var import_fast_deep_equal = __toESM(require("fast-deep-equal"));
 var getChanged = (newItem, oldItem) => {
   return newItem ? Object.keys(newItem.props || {}).reduce((acc, item) => {
     const newItemProps = (newItem == null ? void 0 : newItem.props) || {};
     const oldItemProps = (oldItem == null ? void 0 : oldItem.props) || {};
     return __spreadProps(__spreadValues({}, acc), {
-      [item]: oldItemProps[item] !== newItemProps[item]
+      [item]: !(0, import_fast_deep_equal.default)(oldItemProps[item], newItemProps[item])
     });
   }, {}) : {};
 };
@@ -2101,14 +2171,16 @@ var useRegisterFieldsSlice = (appStore, id) => {
 
 // lib/resolve-component-data.ts
 init_react_import();
-var import_fast_deep_equal = __toESM(require("fast-deep-equal"));
+var import_fast_deep_equal2 = __toESM(require("fast-deep-equal"));
 var cache = { lastChange: {} };
-var resolveComponentData = (_0, _1, ..._2) => __async(void 0, [_0, _1, ..._2], function* (item, config, metadata = {}, onResolveStart, onResolveEnd, trigger = "replace", recursive = true) {
+var resolveComponentData = (_0, _1, ..._2) => __async(void 0, [_0, _1, ..._2], function* (item, config, metadata = {}, onResolveStart, onResolveEnd, trigger = "replace") {
   const configForItem = "type" in item && item.type !== "root" ? config.components[item.type] : config.root;
-  if ((configForItem == null ? void 0 : configForItem.resolveData) && item.props) {
-    const id = "id" in item.props ? item.props.id : "root";
+  const resolvedItem = __spreadValues({}, item);
+  const shouldRunResolver = (configForItem == null ? void 0 : configForItem.resolveData) && item.props;
+  const id = "id" in item.props ? item.props.id : "root";
+  if (shouldRunResolver) {
     const { item: oldItem = null, resolved = {} } = cache.lastChange[id] || {};
-    if (item && (0, import_fast_deep_equal.default)(item, oldItem)) {
+    if (item && (0, import_fast_deep_equal2.default)(item, oldItem)) {
       return { node: resolved, didChange: false };
     }
     const changed = getChanged(item, oldItem);
@@ -2121,46 +2193,42 @@ var resolveComponentData = (_0, _1, ..._2) => __async(void 0, [_0, _1, ..._2], f
       metadata: __spreadValues(__spreadValues({}, metadata), configForItem.metadata),
       trigger
     });
-    let resolvedItem = __spreadProps(__spreadValues({}, item), {
-      props: __spreadValues(__spreadValues({}, item.props), resolvedProps)
-    });
-    if (recursive) {
-      resolvedItem = yield mapSlotsAsync(
-        resolvedItem,
-        (content) => __async(void 0, null, function* () {
-          return Promise.all(
-            content.map(
-              (childItem) => __async(void 0, null, function* () {
-                return (yield resolveComponentData(
-                  childItem,
-                  config,
-                  metadata,
-                  onResolveStart,
-                  onResolveEnd,
-                  trigger,
-                  false
-                )).node;
-              })
-            )
-          );
-        }),
-        false,
-        createIsSlotConfig(config)
-      );
-    }
+    resolvedItem.props = __spreadValues(__spreadValues({}, item.props), resolvedProps);
     if (Object.keys(readOnly).length) {
       resolvedItem.readOnly = readOnly;
     }
-    cache.lastChange[id] = {
-      item,
-      resolved: resolvedItem
-    };
-    if (onResolveEnd) {
-      onResolveEnd(resolvedItem);
-    }
-    return { node: resolvedItem, didChange: !(0, import_fast_deep_equal.default)(item, resolvedItem) };
   }
-  return { node: item, didChange: false };
+  let itemWithResolvedChildren = yield mapSlots(
+    resolvedItem,
+    (content) => __async(void 0, null, function* () {
+      return yield Promise.all(
+        content.map(
+          (childItem) => __async(void 0, null, function* () {
+            return (yield resolveComponentData(
+              childItem,
+              config,
+              metadata,
+              onResolveStart,
+              onResolveEnd,
+              trigger
+            )).node;
+          })
+        )
+      );
+    }),
+    config
+  );
+  if (shouldRunResolver && onResolveEnd) {
+    onResolveEnd(resolvedItem);
+  }
+  cache.lastChange[id] = {
+    item,
+    resolved: itemWithResolvedChildren
+  };
+  return {
+    node: itemWithResolvedChildren,
+    didChange: !(0, import_fast_deep_equal2.default)(item, itemWithResolvedChildren)
+  };
 });
 
 // lib/data/to-root.ts
@@ -2947,6 +3015,19 @@ var ArrayField = ({
   );
   const forceReadOnly = !canEdit;
   const valueRef = (0, import_react14.useRef)(value);
+  const uniqifyItem = (0, import_react14.useCallback)(
+    (val) => {
+      if (field.type !== "array" || !field.arrayFields) return;
+      const config = appStore.getState().config;
+      return walkField({
+        value: val,
+        fields: field.arrayFields,
+        map: (content) => content.map((item) => populateIds(item, config, true)),
+        config
+      });
+    },
+    [appStore, field]
+  );
   if (field.type !== "array" || !field.arrayFields) {
     return null;
   }
@@ -3051,11 +3132,10 @@ var ArrayField = ({
                                           onClick: (e) => {
                                             e.stopPropagation();
                                             const existingValue = [...value || []];
-                                            existingValue.splice(
-                                              i,
-                                              0,
+                                            const newItem = uniqifyItem(
                                               existingValue[i]
                                             );
+                                            existingValue.splice(i, 0, newItem);
                                             const newUi = mapArrayStateToUi(
                                               regenerateArrayState(existingValue)
                                             );
@@ -3153,12 +3233,11 @@ var ArrayField = ({
                     type: "button",
                     className: getClassName5("addButton"),
                     onClick: () => {
+                      var _a;
                       if (isDraggingAny) return;
                       const existingValue = value || [];
-                      const newValue = [
-                        ...existingValue,
-                        field.defaultItemProps || {}
-                      ];
+                      const newItem = uniqifyItem((_a = field.defaultItemProps) != null ? _a : {});
+                      const newValue = [...existingValue, newItem];
                       const newArrayState = regenerateArrayState(newValue);
                       setUi(mapArrayStateToUi(newArrayState), false);
                       onChange(newValue);
@@ -4052,6 +4131,10 @@ function AutoFieldInternal(props) {
       });
     }
   }, []);
+  const { visible = true } = props.field;
+  if (!visible) {
+    return null;
+  }
   if (field.type === "slot") {
     return null;
   }
@@ -4242,6 +4325,21 @@ var DropZoneProvider = ({
 var import_shallow2 = require("zustand/react/shallow");
 var import_sortable2 = require("@dnd-kit/react/sortable");
 
+// lib/accumulate-transform.ts
+init_react_import();
+function accumulateTransform(el) {
+  let matrix = new DOMMatrixReadOnly();
+  let n = el.parentElement;
+  while (n && n !== document.documentElement) {
+    const t = getComputedStyle(n).transform;
+    if (t && t !== "none") {
+      matrix = new DOMMatrixReadOnly(t).multiply(matrix);
+    }
+    n = n.parentElement;
+  }
+  return { scaleX: matrix.a, scaleY: matrix.d };
+}
+
 // lib/use-context-store.ts
 init_react_import();
 var import_react24 = require("react");
@@ -4267,7 +4365,9 @@ var useOnDragFinished = (cb, deps = []) => {
       if (isDragging2) {
         cb(false);
       } else {
-        cb(true);
+        setTimeout(() => {
+          cb(true);
+        }, 0);
         if (dispose) dispose();
       }
     };
@@ -4443,11 +4543,16 @@ var DraggableComponent = ({
       x: deepScrollPosition.x - portalScroll.x - ((_b = portalContainerRect == null ? void 0 : portalContainerRect.left) != null ? _b : 0),
       y: deepScrollPosition.y - portalScroll.y - ((_c = portalContainerRect == null ? void 0 : portalContainerRect.top) != null ? _c : 0)
     };
+    const untransformed = {
+      height: ref.current.offsetHeight,
+      width: ref.current.offsetWidth
+    };
+    const transform = accumulateTransform(ref.current);
     const style2 = {
-      left: `${rect.left + scroll.x}px`,
-      top: `${rect.top + scroll.y}px`,
-      height: `${rect.height}px`,
-      width: `${rect.width}px`
+      left: `${(rect.left + scroll.x) / transform.scaleX}px`,
+      top: `${(rect.top + scroll.y) / transform.scaleY}px`,
+      height: `${untransformed.height}px`,
+      width: `${untransformed.width}px`
     };
     return style2;
   }, [ref.current]);
@@ -4456,8 +4561,7 @@ var DraggableComponent = ({
     setStyle(getStyle());
   }, [ref.current, iframe]);
   (0, import_react26.useEffect)(() => {
-    const userIsDragging = !!zoneStore.getState().draggedItem;
-    if (ref.current && !userIsDragging) {
+    if (ref.current) {
       const observer = new ResizeObserver(sync);
       observer.observe(ref.current);
       return () => {
@@ -4466,11 +4570,27 @@ var DraggableComponent = ({
     }
   }, [ref.current]);
   const registerNode = useAppStore((s) => s.nodes.registerNode);
+  const hideOverlay = (0, import_react26.useCallback)(() => {
+    setIsVisible(false);
+  }, []);
+  const showOverlay = (0, import_react26.useCallback)(() => {
+    setIsVisible(true);
+  }, []);
   (0, import_react26.useEffect)(() => {
     var _a;
-    registerNode(id, { methods: { sync }, element: (_a = ref.current) != null ? _a : null });
+    registerNode(id, {
+      methods: { sync, showOverlay, hideOverlay },
+      element: (_a = ref.current) != null ? _a : null
+    });
     return () => {
-      registerNode(id, { methods: { sync: () => null }, element: null });
+      registerNode(id, {
+        methods: {
+          sync: () => null,
+          hideOverlay: () => null,
+          showOverlay: () => null
+        },
+        element: null
+      });
     };
   }, [id, zoneCompound, index, componentType, sync]);
   const CustomActionBar = (0, import_react26.useMemo)(
@@ -4738,6 +4858,7 @@ var import_react36 = require("@dnd-kit/react");
 // components/DropZone/lib/use-min-empty-height.ts
 init_react_import();
 var import_react27 = require("react");
+var getNumItems = (appStore, zoneCompound) => appStore.getState().state.indexes.zones[zoneCompound].contentIds.length;
 var useMinEmptyHeight = ({
   zoneCompound,
   userMinEmptyHeight,
@@ -4753,35 +4874,52 @@ var useMinEmptyHeight = ({
       isZone: ((_b = s.draggedItem) == null ? void 0 : _b.data.zone) === zoneCompound
     };
   });
+  const numItems = (0, import_react27.useRef)(0);
+  const onDragFinished = useOnDragFinished(
+    (finished) => {
+      var _a;
+      if (finished) {
+        const newNumItems = getNumItems(appStore, zoneCompound);
+        setPrevHeight(0);
+        if (newNumItems || numItems.current === 0) {
+          setIsAnimating(false);
+          return;
+        }
+        const selectedItem = appStore.getState().selectedItem;
+        const zones = appStore.getState().state.indexes.zones;
+        const nodes = appStore.getState().nodes;
+        (_a = nodes.nodes[selectedItem == null ? void 0 : selectedItem.props.id]) == null ? void 0 : _a.methods.hideOverlay();
+        setTimeout(() => {
+          var _a2;
+          const contentIds = ((_a2 = zones[zoneCompound]) == null ? void 0 : _a2.contentIds) || [];
+          contentIds.forEach((contentId) => {
+            const node = nodes.nodes[contentId];
+            node == null ? void 0 : node.methods.sync();
+          });
+          if (selectedItem) {
+            setTimeout(() => {
+              var _a3, _b;
+              (_a3 = nodes.nodes[selectedItem.props.id]) == null ? void 0 : _a3.methods.sync();
+              (_b = nodes.nodes[selectedItem.props.id]) == null ? void 0 : _b.methods.showOverlay();
+            }, 200);
+          }
+          setIsAnimating(false);
+        }, 100);
+      }
+    },
+    [appStore, prevHeight, zoneCompound]
+  );
   (0, import_react27.useEffect)(() => {
     if (draggedItem && ref.current) {
       if (isZone) {
         const rect = ref.current.getBoundingClientRect();
+        numItems.current = getNumItems(appStore, zoneCompound);
         setPrevHeight(rect.height);
         setIsAnimating(true);
-        return;
+        return onDragFinished();
       }
     }
-    const _prevHeight = prevHeight;
-    setPrevHeight(0);
-    setTimeout(() => {
-      var _a, _b, _c;
-      const newHeight = (_a = ref.current) == null ? void 0 : _a.getBoundingClientRect().height;
-      if (newHeight === _prevHeight) return;
-      const zones = appStore.getState().state.indexes.zones;
-      const nodes = appStore.getState().nodes;
-      const selectedItem = appStore.getState().selectedItem;
-      const contentIds = ((_b = zones[zoneCompound]) == null ? void 0 : _b.contentIds) || [];
-      contentIds.forEach((contentId) => {
-        const node = nodes.nodes[contentId];
-        node == null ? void 0 : node.methods.sync();
-      });
-      if (selectedItem) {
-        (_c = nodes.nodes[selectedItem.props.id]) == null ? void 0 : _c.methods.sync();
-      }
-      setIsAnimating(false);
-    }, 400);
-  }, [ref.current, draggedItem, zoneCompound]);
+  }, [ref.current, draggedItem, onDragFinished]);
   return [prevHeight || userMinEmptyHeight, isAnimating];
 };
 
@@ -4906,7 +5044,7 @@ var useDragAxis = (ref, collisionAxis) => {
 };
 
 // components/DropZone/index.tsx
-var import_shallow3 = require("zustand/react/shallow");
+var import_shallow4 = require("zustand/react/shallow");
 
 // components/Render/index.tsx
 init_react_import();
@@ -4914,32 +5052,30 @@ init_react_import();
 // lib/use-slots.tsx
 init_react_import();
 var import_react32 = require("react");
-function useSlots(config, props, renderSlotEdit, renderSlotRender = renderSlotEdit, readOnly, forceReadOnly) {
+function useSlots(config, item, renderSlotEdit, renderSlotRender = renderSlotEdit, readOnly, forceReadOnly) {
   const slotProps = (0, import_react32.useMemo)(() => {
-    if (!(config == null ? void 0 : config.fields)) return props;
-    const slotProps2 = {};
-    const fieldKeys = Object.keys(config.fields);
-    for (let i = 0; i < fieldKeys.length; i++) {
-      const fieldKey = fieldKeys[i];
-      const field = config.fields[fieldKey];
-      if ((field == null ? void 0 : field.type) === "slot") {
-        const content = props[fieldKey] || [];
-        const render = (readOnly == null ? void 0 : readOnly[fieldKey]) || forceReadOnly ? renderSlotRender : renderSlotEdit;
+    const mapped = mapSlots(
+      item,
+      (content, _parentId, propName, field, propPath) => {
+        const wildcardPath = propPath.replace(/\[\d+\]/g, "[*]");
+        const isReadOnly = (readOnly == null ? void 0 : readOnly[propPath]) || (readOnly == null ? void 0 : readOnly[wildcardPath]) || forceReadOnly;
+        const render = isReadOnly ? renderSlotRender : renderSlotEdit;
         const Slot = (dzProps) => render(__spreadProps(__spreadValues({
-          allow: field.allow,
-          disallow: field.disallow
+          allow: (field == null ? void 0 : field.type) === "slot" ? field.allow : [],
+          disallow: (field == null ? void 0 : field.type) === "slot" ? field.disallow : []
         }, dzProps), {
-          zone: fieldKey,
+          zone: propName,
           content
         }));
-        slotProps2[fieldKey] = Slot;
-      }
-    }
-    return slotProps2;
-  }, [config, readOnly, forceReadOnly]);
+        return Slot;
+      },
+      config
+    ).props;
+    return mapped;
+  }, [config, item, readOnly, forceReadOnly]);
   const mergedProps = (0, import_react32.useMemo)(
-    () => __spreadValues(__spreadValues({}, props), slotProps),
-    [props, slotProps]
+    () => __spreadValues(__spreadValues({}, item.props), slotProps),
+    [item.props, slotProps]
   );
   return mergedProps;
 }
@@ -4949,6 +5085,7 @@ var import_react34 = __toESM(require("react"));
 
 // components/SlotRender/index.tsx
 init_react_import();
+var import_shallow3 = require("zustand/react/shallow");
 
 // components/SlotRender/server.tsx
 init_react_import();
@@ -4987,12 +5124,15 @@ function DropZoneRender({
             metadata
           }
         ),
-        metadata
+        metadata,
+        dragRef: null,
+        isEditing: false
       }
     });
-    const propsWithSlots = useSlots(Component, props, (props2) => /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, props2), { config, metadata })));
+    const renderItem = __spreadProps(__spreadValues({}, item), { props });
+    const propsWithSlots = useSlots(config, renderItem, (props2) => /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, props2), { config, metadata })));
     if (Component) {
-      return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Component.render, __spreadValues({}, propsWithSlots), item.props.id);
+      return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Component.render, __spreadValues({}, propsWithSlots), renderItem.props.id);
     }
     return null;
   }) });
@@ -5007,7 +5147,7 @@ var Item = ({
   metadata
 }) => {
   const Component = config.components[item.type];
-  const props = useSlots(Component, item.props, (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, slotProps), { config, metadata })));
+  const props = useSlots(config, item, (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, slotProps), { config, metadata })));
   return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
     Component.render,
     __spreadProps(__spreadValues({}, props), {
@@ -5046,10 +5186,12 @@ var ContextSlotRender = ({
   const config = useAppStore((s) => s.config);
   const metadata = useAppStore((s) => s.metadata);
   const slotContent = useAppStore(
-    (s) => {
+    (0, import_shallow3.useShallow)((s) => {
       var _a, _b;
-      return (_b = (_a = s.state.indexes.nodes[componentId]) == null ? void 0 : _a.data.props[zone]) != null ? _b : null;
-    }
+      const indexes = s.state.indexes;
+      const contentIds = (_b = (_a = indexes.zones[`${componentId}:${zone}`]) == null ? void 0 : _a.contentIds) != null ? _b : [];
+      return contentIds.map((contentId) => indexes.nodes[contentId].flatData);
+    })
   );
   return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
     SlotRenderPure,
@@ -5079,7 +5221,7 @@ function Render({
     root: data.root || {},
     content: data.content || []
   });
-  const rootProps = defaultedData.root.props || defaultedData.root;
+  const rootProps = "props" in defaultedData.root ? defaultedData.root.props : defaultedData.root;
   const title = (rootProps == null ? void 0 : rootProps.title) || "";
   const pageProps = __spreadProps(__spreadValues({}, rootProps), {
     puck: {
@@ -5092,7 +5234,11 @@ function Render({
     editMode: false,
     id: "puck-root"
   });
-  const propsWithSlots = useSlots(config.root, pageProps, (props) => /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(SlotRender, __spreadProps(__spreadValues({}, props), { config, metadata })));
+  const propsWithSlots = useSlots(
+    config,
+    { type: "root", props: pageProps },
+    (props) => /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(SlotRender, __spreadProps(__spreadValues({}, props), { config, metadata }))
+  );
   const nextContextValue = (0, import_react34.useMemo)(
     () => ({
       mode: "render",
@@ -5126,7 +5272,7 @@ var DropZoneChild = ({
   const { depth = 1 } = ctx != null ? ctx : {};
   const zoneStore = (0, import_react35.useContext)(ZoneStoreContext);
   const nodeProps = useAppStore(
-    (0, import_shallow3.useShallow)((s) => {
+    (0, import_shallow4.useShallow)((s) => {
       var _a2;
       return (_a2 = s.state.indexes.nodes[componentId]) == null ? void 0 : _a2.flatData.props;
     })
@@ -5138,14 +5284,19 @@ var DropZoneChild = ({
     }
   );
   const nodeReadOnly = useAppStore(
-    (0, import_shallow3.useShallow)((s) => {
+    (0, import_shallow4.useShallow)((s) => {
       var _a2;
       return (_a2 = s.state.indexes.nodes[componentId]) == null ? void 0 : _a2.data.readOnly;
     })
   );
+  const appStore = useAppStoreApi();
   const item = (0, import_react35.useMemo)(() => {
     if (nodeProps) {
-      return { type: nodeType, props: nodeProps };
+      const expanded = expandNode({
+        type: nodeType,
+        props: nodeProps
+      });
+      return expanded;
     }
     const preview = zoneStore.getState().previewIndex[zoneCompound];
     if (componentId === (preview == null ? void 0 : preview.props.id)) {
@@ -5156,7 +5307,7 @@ var DropZoneChild = ({
       };
     }
     return null;
-  }, [componentId, zoneCompound, nodeType, nodeProps]);
+  }, [appStore, componentId, zoneCompound, nodeType, nodeProps]);
   const componentConfig = useAppStore(
     (s) => (item == null ? void 0 : item.type) ? s.config.components[item.type] : null
   );
@@ -5197,9 +5348,17 @@ var DropZoneChild = ({
     }),
     [componentConfig == null ? void 0 : componentConfig.defaultProps, item == null ? void 0 : item.props, puckProps]
   );
+  const defaultedNode = (0, import_react35.useMemo)(
+    () => {
+      var _a2;
+      return { type: (_a2 = item == null ? void 0 : item.type) != null ? _a2 : nodeType, props: defaultsProps };
+    },
+    [item == null ? void 0 : item.type, nodeType, defaultsProps]
+  );
+  const config = useAppStore((s) => s.config);
   const defaultedPropsWithSlots = useSlots(
-    componentConfig,
-    defaultsProps,
+    config,
+    defaultedNode,
     DropZoneEditPure,
     (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(ContextSlotRender, { componentId, zone: slotProps.zone }),
     nodeReadOnly,
@@ -5211,7 +5370,7 @@ var DropZoneChild = ({
     item.type
   ] });
   let componentType = item.type;
-  const isInserting = item.previewType === "insert";
+  const isInserting = "previewType" in item ? item.previewType === "insert" : false;
   if (isInserting) {
     Render2 = renderPreview;
   }
@@ -5260,7 +5419,7 @@ var DropZoneEdit = (0, import_react35.forwardRef)(
       unregisterLocalZone
     } = ctx != null ? ctx : {};
     const path = useAppStore(
-      (0, import_shallow3.useShallow)((s) => {
+      (0, import_shallow4.useShallow)((s) => {
         var _a;
         return areaId ? (_a = s.state.indexes.nodes[areaId]) == null ? void 0 : _a.path : null;
       })
@@ -5277,13 +5436,13 @@ var DropZoneEdit = (0, import_react35.forwardRef)(
       (s) => s.nextAreaDepthIndex[areaId || ""]
     );
     const zoneContentIds = useAppStore(
-      (0, import_shallow3.useShallow)((s) => {
+      (0, import_shallow4.useShallow)((s) => {
         var _a;
         return (_a = s.state.indexes.zones[zoneCompound]) == null ? void 0 : _a.contentIds;
       })
     );
     const zoneType = useAppStore(
-      (0, import_shallow3.useShallow)((s) => {
+      (0, import_shallow4.useShallow)((s) => {
         var _a;
         return (_a = s.state.indexes.zones[zoneCompound]) == null ? void 0 : _a.type;
       })
@@ -5440,7 +5599,7 @@ var DropZoneRenderItem = ({
   metadata
 }) => {
   const Component = config.components[item.type];
-  const props = useSlots(Component, item.props, (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, slotProps), { config, metadata })));
+  const props = useSlots(config, item, (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, slotProps), { config, metadata })));
   const nextContextValue = (0, import_react35.useMemo)(
     () => ({
       areaId: props.id,
@@ -6376,7 +6535,7 @@ Drawer.Item = DrawerItem;
 
 // components/Puck/index.tsx
 init_react_import();
-var import_react55 = require("react");
+var import_react56 = require("react");
 
 // components/SidebarSection/index.tsx
 init_react_import();
@@ -6471,70 +6630,26 @@ var SidebarSection = ({
   );
 };
 
-// components/MenuBar/index.tsx
-init_react_import();
-
-// css-module:/home/runner/work/puck/puck/packages/core/components/MenuBar/styles.module.css#css-module
-init_react_import();
-var styles_module_default14 = { "MenuBar": "_MenuBar_8pf8c_1", "MenuBar--menuOpen": "_MenuBar--menuOpen_8pf8c_14", "MenuBar-inner": "_MenuBar-inner_8pf8c_29", "MenuBar-history": "_MenuBar-history_8pf8c_45" };
-
-// components/MenuBar/index.tsx
-var import_jsx_runtime29 = require("react/jsx-runtime");
-var getClassName20 = get_class_name_factory_default("MenuBar", styles_module_default14);
-function MenuBar({
-  menuOpen = false,
-  renderHeaderActions,
-  setMenuOpen
-}) {
-  const back = useAppStore((s) => s.history.back);
-  const forward = useAppStore((s) => s.history.forward);
-  const hasFuture = useAppStore((s) => s.history.hasFuture());
-  const hasPast = useAppStore((s) => s.history.hasPast());
-  return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
-    "div",
-    {
-      className: getClassName20({ menuOpen }),
-      onClick: (event) => {
-        var _a;
-        const element = event.target;
-        if (window.matchMedia("(min-width: 638px)").matches) {
-          return;
-        }
-        if (element.tagName === "A" && ((_a = element.getAttribute("href")) == null ? void 0 : _a.startsWith("#"))) {
-          setMenuOpen(false);
-        }
-      },
-      children: /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)("div", { className: getClassName20("inner"), children: [
-        /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)("div", { className: getClassName20("history"), children: [
-          /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(IconButton, { title: "undo", disabled: !hasPast, onClick: back, children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Undo2, { size: 21 }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(IconButton, { title: "redo", disabled: !hasFuture, onClick: forward, children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Redo2, { size: 21 }) })
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(import_jsx_runtime29.Fragment, { children: renderHeaderActions && renderHeaderActions() })
-      ] })
-    }
-  );
-}
-
 // css-module:/home/runner/work/puck/puck/packages/core/components/Puck/styles.module.css#css-module
 init_react_import();
-var styles_module_default15 = { "Puck": "_Puck_11o75_19", "Puck-portal": "_Puck-portal_11o75_24", "PuckLayout-inner": "_PuckLayout-inner_11o75_31", "PuckLayout--mounted": "_PuckLayout--mounted_11o75_43", "PuckLayout--leftSideBarVisible": "_PuckLayout--leftSideBarVisible_11o75_47", "PuckLayout--rightSideBarVisible": "_PuckLayout--rightSideBarVisible_11o75_53", "PuckLayout-mounted": "_PuckLayout-mounted_11o75_67", "PuckLayout": "_PuckLayout_11o75_31", "PuckLayout-header": "_PuckLayout-header_11o75_108", "PuckLayout-headerInner": "_PuckLayout-headerInner_11o75_117", "PuckLayout-headerToggle": "_PuckLayout-headerToggle_11o75_127", "PuckLayout-rightSideBarToggle": "_PuckLayout-rightSideBarToggle_11o75_134", "PuckLayout-leftSideBarToggle": "_PuckLayout-leftSideBarToggle_11o75_135", "PuckLayout-headerTitle": "_PuckLayout-headerTitle_11o75_139", "PuckLayout-headerPath": "_PuckLayout-headerPath_11o75_143", "PuckLayout-headerTools": "_PuckLayout-headerTools_11o75_150", "PuckLayout-menuButton": "_PuckLayout-menuButton_11o75_156", "PuckLayout--menuOpen": "_PuckLayout--menuOpen_11o75_161", "PuckLayout-leftSideBar": "_PuckLayout-leftSideBar_11o75_135", "PuckLayout-rightSideBar": "_PuckLayout-rightSideBar_11o75_134" };
+var styles_module_default14 = { "Puck": "_Puck_mc1k2_19", "Puck-portal": "_Puck-portal_mc1k2_24", "PuckLayout-inner": "_PuckLayout-inner_mc1k2_31", "PuckLayout--mounted": "_PuckLayout--mounted_mc1k2_43", "PuckLayout--leftSideBarVisible": "_PuckLayout--leftSideBarVisible_mc1k2_47", "PuckLayout--rightSideBarVisible": "_PuckLayout--rightSideBarVisible_mc1k2_53", "PuckLayout-mounted": "_PuckLayout-mounted_mc1k2_67", "PuckLayout": "_PuckLayout_mc1k2_31", "PuckLayout-leftSideBar": "_PuckLayout-leftSideBar_mc1k2_108", "PuckLayout-rightSideBar": "_PuckLayout-rightSideBar_mc1k2_117" };
 
 // components/Puck/components/Fields/index.tsx
 init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Puck/components/Fields/styles.module.css#css-module
 init_react_import();
-var styles_module_default16 = { "PuckFields": "_PuckFields_10bh7_1", "PuckFields--isLoading": "_PuckFields--isLoading_10bh7_6", "PuckFields-loadingOverlay": "_PuckFields-loadingOverlay_10bh7_10", "PuckFields-loadingOverlayInner": "_PuckFields-loadingOverlayInner_10bh7_25", "PuckFields-field": "_PuckFields-field_10bh7_32", "PuckFields--wrapFields": "_PuckFields--wrapFields_10bh7_36" };
+var styles_module_default15 = { "PuckFields": "_PuckFields_10bh7_1", "PuckFields--isLoading": "_PuckFields--isLoading_10bh7_6", "PuckFields-loadingOverlay": "_PuckFields-loadingOverlay_10bh7_10", "PuckFields-loadingOverlayInner": "_PuckFields-loadingOverlayInner_10bh7_25", "PuckFields-field": "_PuckFields-field_10bh7_32", "PuckFields--wrapFields": "_PuckFields--wrapFields_10bh7_36" };
 
 // components/Puck/components/Fields/index.tsx
 var import_react42 = require("react");
-var import_shallow4 = require("zustand/react/shallow");
-var import_jsx_runtime30 = require("react/jsx-runtime");
-var getClassName21 = get_class_name_factory_default("PuckFields", styles_module_default16);
+var import_shallow5 = require("zustand/react/shallow");
+var import_jsx_runtime29 = require("react/jsx-runtime");
+var getClassName20 = get_class_name_factory_default("PuckFields", styles_module_default15);
 var DefaultFields = ({
   children
 }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(import_jsx_runtime30.Fragment, { children });
+  return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(import_jsx_runtime29.Fragment, { children });
 };
 var createOnChange = (fieldName, appStore) => (value, updatedUi) => __async(void 0, null, function* () {
   let currentProps;
@@ -6594,7 +6709,7 @@ var FieldsChild = ({ fieldName }) => {
     return s.selectedItem ? `${s.selectedItem.props.id}_${field.type}_${fieldName}` : `root_${field.type}_${fieldName}`;
   });
   const permissions = useAppStore(
-    (0, import_shallow4.useShallow)((s) => {
+    (0, import_shallow5.useShallow)((s) => {
       const { selectedItem, permissions: permissions2 } = s;
       return selectedItem ? permissions2.getPermissions({ item: selectedItem }) : permissions2.getPermissions({ root: true });
     })
@@ -6603,9 +6718,10 @@ var FieldsChild = ({ fieldName }) => {
   const onChange = (0, import_react42.useCallback)(createOnChange(fieldName, appStore), [
     fieldName
   ]);
-  if (!field || !id) return null;
+  const { visible = true } = field != null ? field : {};
+  if (!field || !id || !visible) return null;
   if (field.type === "slot") return null;
-  return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("div", { className: getClassName21("field"), children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: getClassName20("field"), children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
     AutoFieldPrivate,
     {
       field,
@@ -6617,14 +6733,15 @@ var FieldsChild = ({ fieldName }) => {
     }
   ) }, id);
 };
-var Fields = ({ wrapFields = true }) => {
+var FieldsChildMemo = (0, import_react42.memo)(FieldsChild);
+var FieldsInternal = ({ wrapFields = true }) => {
   const overrides = useAppStore((s) => s.overrides);
   const componentResolving = useAppStore((s) => {
     var _a, _b;
     const loadingCount = s.selectedItem ? (_a = s.componentState[s.selectedItem.props.id]) == null ? void 0 : _a.loadingCount : (_b = s.componentState["root"]) == null ? void 0 : _b.loadingCount;
     return (loadingCount != null ? loadingCount : 0) > 0;
   });
-  const itemSelector = useAppStore((0, import_shallow4.useShallow)((s) => s.state.ui.itemSelector));
+  const itemSelector = useAppStore((0, import_shallow5.useShallow)((s) => s.state.ui.itemSelector));
   const id = useAppStore((s) => {
     var _a;
     return (_a = s.selectedItem) == null ? void 0 : _a.props.id;
@@ -6633,7 +6750,7 @@ var Fields = ({ wrapFields = true }) => {
   useRegisterFieldsSlice(appStore, id);
   const fieldsLoading = useAppStore((s) => s.fields.loading);
   const fieldNames = useAppStore(
-    (0, import_shallow4.useShallow)((s) => {
+    (0, import_shallow5.useShallow)((s) => {
       if (s.fields.id === id) {
         return Object.keys(s.fields.fields);
       }
@@ -6642,20 +6759,21 @@ var Fields = ({ wrapFields = true }) => {
   );
   const isLoading = fieldsLoading || componentResolving;
   const Wrapper = (0, import_react42.useMemo)(() => overrides.fields || DefaultFields, [overrides]);
-  return /* @__PURE__ */ (0, import_jsx_runtime30.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)(
     "form",
     {
-      className: getClassName21({ wrapFields }),
+      className: getClassName20({ wrapFields }),
       onSubmit: (e) => {
         e.preventDefault();
       },
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(Wrapper, { isLoading, itemSelector, children: fieldNames.map((fieldName) => /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(FieldsChild, { fieldName }, fieldName)) }),
-        isLoading && /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("div", { className: getClassName21("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("div", { className: getClassName21("loadingOverlayInner"), children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(Loader, { size: 16 }) }) })
+        /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Wrapper, { isLoading, itemSelector, children: fieldNames.map((fieldName) => /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(FieldsChildMemo, { fieldName }, fieldName)) }),
+        isLoading && /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: getClassName20("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: getClassName20("loadingOverlayInner"), children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Loader, { size: 16 }) }) })
       ]
     }
   );
 };
+var Fields = (0, import_react42.memo)(FieldsInternal);
 
 // components/Puck/components/Components/index.tsx
 init_react_import();
@@ -6669,11 +6787,11 @@ init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/ComponentList/styles.module.css#css-module
 init_react_import();
-var styles_module_default17 = { "ComponentList": "_ComponentList_1rrlt_1", "ComponentList--isExpanded": "_ComponentList--isExpanded_1rrlt_5", "ComponentList-content": "_ComponentList-content_1rrlt_9", "ComponentList-title": "_ComponentList-title_1rrlt_17", "ComponentList-titleIcon": "_ComponentList-titleIcon_1rrlt_53" };
+var styles_module_default16 = { "ComponentList": "_ComponentList_1rrlt_1", "ComponentList--isExpanded": "_ComponentList--isExpanded_1rrlt_5", "ComponentList-content": "_ComponentList-content_1rrlt_9", "ComponentList-title": "_ComponentList-title_1rrlt_17", "ComponentList-titleIcon": "_ComponentList-titleIcon_1rrlt_53" };
 
 // components/ComponentList/index.tsx
-var import_jsx_runtime31 = require("react/jsx-runtime");
-var getClassName22 = get_class_name_factory_default("ComponentList", styles_module_default17);
+var import_jsx_runtime30 = require("react/jsx-runtime");
+var getClassName21 = get_class_name_factory_default("ComponentList", styles_module_default16);
 var ComponentListItem = ({
   name,
   label
@@ -6684,7 +6802,7 @@ var ComponentListItem = ({
       type: name
     }).insert
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Drawer.Item, { label, name, isDragDisabled: !canInsert, children: overrides.componentItem });
+  return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(Drawer.Item, { label, name, isDragDisabled: !canInsert, children: overrides.componentItem });
 };
 var ComponentList = ({
   children,
@@ -6695,12 +6813,12 @@ var ComponentList = ({
   const setUi = useAppStore((s) => s.setUi);
   const componentList = useAppStore((s) => s.state.ui.componentList);
   const { expanded = true } = componentList[id] || {};
-  return /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)("div", { className: getClassName22({ isExpanded: expanded }), children: [
-    title && /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime30.jsxs)("div", { className: getClassName21({ isExpanded: expanded }), children: [
+    title && /* @__PURE__ */ (0, import_jsx_runtime30.jsxs)(
       "button",
       {
         type: "button",
-        className: getClassName22("title"),
+        className: getClassName21("title"),
         onClick: () => setUi({
           componentList: __spreadProps(__spreadValues({}, componentList), {
             [id]: __spreadProps(__spreadValues({}, componentList[id]), {
@@ -6710,14 +6828,14 @@ var ComponentList = ({
         }),
         title: expanded ? `Collapse${title ? ` ${title}` : ""}` : `Expand${title ? ` ${title}` : ""}`,
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { children: title }),
-          /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { className: getClassName22("titleIcon"), children: expanded ? /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(ChevronUp, { size: 12 }) : /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(ChevronDown, { size: 12 }) })
+          /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("div", { children: title }),
+          /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("div", { className: getClassName21("titleIcon"), children: expanded ? /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(ChevronUp, { size: 12 }) : /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(ChevronDown, { size: 12 }) })
         ]
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime31.jsx)("div", { className: getClassName22("content"), children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Drawer, { children: children || Object.keys(config.components).map((componentKey) => {
+    /* @__PURE__ */ (0, import_jsx_runtime30.jsx)("div", { className: getClassName21("content"), children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(Drawer, { children: children || Object.keys(config.components).map((componentKey) => {
       var _a;
-      return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+      return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
         ComponentListItem,
         {
           label: (_a = config.components[componentKey]["label"]) != null ? _a : componentKey,
@@ -6731,7 +6849,7 @@ var ComponentList = ({
 ComponentList.Item = ComponentListItem;
 
 // lib/use-component-list.tsx
-var import_jsx_runtime32 = require("react/jsx-runtime");
+var import_jsx_runtime31 = require("react/jsx-runtime");
 var useComponentList = () => {
   const [componentList, setComponentList] = (0, import_react43.useState)();
   const config = useAppStore((s) => s.config);
@@ -6746,7 +6864,7 @@ var useComponentList = () => {
           if (category.visible === false || !category.components) {
             return null;
           }
-          return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+          return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
             ComponentList,
             {
               id: categoryKey,
@@ -6755,7 +6873,7 @@ var useComponentList = () => {
                 var _a2;
                 matchedComponents.push(componentName);
                 const componentConf = config.components[componentName] || {};
-                return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+                return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
                   ComponentList.Item,
                   {
                     label: (_a2 = componentConf["label"]) != null ? _a2 : componentName,
@@ -6775,7 +6893,7 @@ var useComponentList = () => {
       );
       if (remainingComponents.length > 0 && !((_a = uiComponentList.other) == null ? void 0 : _a.components) && ((_b = uiComponentList.other) == null ? void 0 : _b.visible) !== false) {
         _componentList.push(
-          /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
             ComponentList,
             {
               id: "other",
@@ -6783,7 +6901,7 @@ var useComponentList = () => {
               children: remainingComponents.map((componentName, i) => {
                 var _a2;
                 const componentConf = config.components[componentName] || {};
-                return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+                return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
                   ComponentList.Item,
                   {
                     name: componentName,
@@ -6806,12 +6924,12 @@ var useComponentList = () => {
 
 // components/Puck/components/Components/index.tsx
 var import_react44 = require("react");
-var import_jsx_runtime33 = require("react/jsx-runtime");
+var import_jsx_runtime32 = require("react/jsx-runtime");
 var Components = () => {
   const overrides = useAppStore((s) => s.overrides);
   const componentList = useComponentList();
   const Wrapper = (0, import_react44.useMemo)(() => overrides.components || "div", [overrides]);
-  return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Wrapper, { children: componentList ? componentList : /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(ComponentList, { id: "all" }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Wrapper, { children: componentList ? componentList : /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(ComponentList, { id: "all" }) });
 };
 
 // components/Puck/components/Preview/index.tsx
@@ -6823,7 +6941,7 @@ init_react_import();
 var import_react45 = require("react");
 var import_object_hash = __toESM(require("object-hash"));
 var import_react_dom3 = require("react-dom");
-var import_jsx_runtime34 = require("react/jsx-runtime");
+var import_jsx_runtime33 = require("react/jsx-runtime");
 var styleSelector = 'style, link[rel="stylesheet"]';
 var collectStyles = (doc) => {
   const collected = [];
@@ -7023,7 +7141,7 @@ var CopyHostStyles = ({
       observer.disconnect();
     };
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(import_jsx_runtime34.Fragment, { children });
+  return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(import_jsx_runtime33.Fragment, { children });
 };
 var autoFrameContext = (0, import_react45.createContext)({});
 var useFrame = () => (0, import_react45.useContext)(autoFrameContext);
@@ -7070,7 +7188,7 @@ function AutoFrame(_a) {
       }
     }
   }, [frameRef, loaded, stylesLoaded]);
-  return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
     "iframe",
     __spreadProps(__spreadValues({}, props), {
       className,
@@ -7080,7 +7198,7 @@ function AutoFrame(_a) {
       onLoad: () => {
         setLoaded(true);
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(autoFrameContext.Provider, { value: ctx, children: loaded && mountTarget && /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(autoFrameContext.Provider, { value: ctx, children: loaded && mountTarget && /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
         CopyHostStyles,
         {
           debug,
@@ -7096,11 +7214,11 @@ var AutoFrame_default = AutoFrame;
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Puck/components/Preview/styles.module.css#css-module
 init_react_import();
-var styles_module_default18 = { "PuckPreview": "_PuckPreview_z2rgu_1", "PuckPreview-frame": "_PuckPreview-frame_z2rgu_6" };
+var styles_module_default17 = { "PuckPreview": "_PuckPreview_z2rgu_1", "PuckPreview-frame": "_PuckPreview-frame_z2rgu_6" };
 
 // components/Puck/components/Preview/index.tsx
-var import_jsx_runtime35 = require("react/jsx-runtime");
-var getClassName23 = get_class_name_factory_default("PuckPreview", styles_module_default18);
+var import_jsx_runtime34 = require("react/jsx-runtime");
+var getClassName22 = get_class_name_factory_default("PuckPreview", styles_module_default17);
 var useBubbleIframeEvents = (ref) => {
   const status = useAppStore((s) => s.status);
   (0, import_react46.useEffect)(() => {
@@ -7155,19 +7273,22 @@ var Preview2 = ({ id = "puck-preview" }) => {
   const Page = (0, import_react46.useCallback)(
     (pageProps) => {
       var _a, _b;
-      const rootConfig = config.root;
-      const propsWithSlots = useSlots(rootConfig, pageProps, DropZoneEditPure);
+      const propsWithSlots = useSlots(
+        config,
+        { type: "root", props: pageProps },
+        DropZoneEditPure
+      );
       return ((_a = config.root) == null ? void 0 : _a.render) ? (_b = config.root) == null ? void 0 : _b.render(__spreadValues({
         id: "puck-root"
-      }, propsWithSlots)) : /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(import_jsx_runtime35.Fragment, { children: propsWithSlots.children });
+      }, propsWithSlots)) : /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(import_jsx_runtime34.Fragment, { children: propsWithSlots.children });
     },
-    [config.root]
+    [config]
   );
   const Frame = (0, import_react46.useMemo)(() => overrides.iframe, [overrides]);
   const rootProps = root.props || root;
   const ref = (0, import_react46.useRef)(null);
   useBubbleIframeEvents(ref);
-  const inner = !renderData ? /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+  const inner = !renderData ? /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
     Page,
     __spreadProps(__spreadValues({}, rootProps), {
       puck: {
@@ -7177,28 +7298,28 @@ var Preview2 = ({ id = "puck-preview" }) => {
         metadata
       },
       editMode: true,
-      children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(DropZonePure, { zone: rootDroppableId })
+      children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(DropZonePure, { zone: rootDroppableId })
     })
-  ) : /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Render, { data: renderData, config });
+  ) : /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Render, { data: renderData, config });
   (0, import_react46.useEffect)(() => {
     if (!iframe.enabled) {
       setStatus("READY");
     }
   }, [iframe.enabled]);
-  return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
     "div",
     {
-      className: getClassName23(),
+      className: getClassName22(),
       id,
       "data-puck-preview": true,
       onClick: () => {
         dispatch({ type: "setUi", ui: { itemSelector: null } });
       },
-      children: iframe.enabled ? /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+      children: iframe.enabled ? /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
         AutoFrame_default,
         {
           id: "preview-frame",
-          className: getClassName23("frame"),
+          className: getClassName22("frame"),
           "data-rfd-iframe": true,
           onReady: () => {
             setStatus("READY");
@@ -7207,18 +7328,18 @@ var Preview2 = ({ id = "puck-preview" }) => {
             setStatus("MOUNTED");
           },
           frameRef: ref,
-          children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(autoFrameContext.Consumer, { children: ({ document: document2 }) => {
+          children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(autoFrameContext.Consumer, { children: ({ document: document2 }) => {
             if (Frame) {
-              return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Frame, { document: document2, children: inner });
+              return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Frame, { document: document2, children: inner });
             }
             return inner;
           } })
         }
-      ) : /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+      ) : /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
         "div",
         {
           id: "preview-frame",
-          className: getClassName23("frame"),
+          className: getClassName22("frame"),
           ref,
           "data-puck-entry": true,
           children: inner
@@ -7236,7 +7357,7 @@ init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/LayerTree/styles.module.css#css-module
 init_react_import();
-var styles_module_default19 = { "LayerTree": "_LayerTree_7rx04_1", "LayerTree-zoneTitle": "_LayerTree-zoneTitle_7rx04_11", "LayerTree-helper": "_LayerTree-helper_7rx04_17", "Layer": "_Layer_7rx04_1", "Layer-inner": "_Layer-inner_7rx04_29", "Layer--containsZone": "_Layer--containsZone_7rx04_35", "Layer-clickable": "_Layer-clickable_7rx04_39", "Layer--isSelected": "_Layer--isSelected_7rx04_61", "Layer-chevron": "_Layer-chevron_7rx04_77", "Layer--childIsSelected": "_Layer--childIsSelected_7rx04_78", "Layer-zones": "_Layer-zones_7rx04_82", "Layer-title": "_Layer-title_7rx04_96", "Layer-name": "_Layer-name_7rx04_105", "Layer-icon": "_Layer-icon_7rx04_111", "Layer-zoneIcon": "_Layer-zoneIcon_7rx04_116" };
+var styles_module_default18 = { "LayerTree": "_LayerTree_7rx04_1", "LayerTree-zoneTitle": "_LayerTree-zoneTitle_7rx04_11", "LayerTree-helper": "_LayerTree-helper_7rx04_17", "Layer": "_Layer_7rx04_1", "Layer-inner": "_Layer-inner_7rx04_29", "Layer--containsZone": "_Layer--containsZone_7rx04_35", "Layer-clickable": "_Layer-clickable_7rx04_39", "Layer--isSelected": "_Layer--isSelected_7rx04_61", "Layer-chevron": "_Layer-chevron_7rx04_77", "Layer--childIsSelected": "_Layer--childIsSelected_7rx04_78", "Layer-zones": "_Layer-zones_7rx04_82", "Layer-title": "_Layer-title_7rx04_96", "Layer-name": "_Layer-name_7rx04_105", "Layer-icon": "_Layer-icon_7rx04_111", "Layer-zoneIcon": "_Layer-zoneIcon_7rx04_116" };
 
 // lib/scroll-into-view.ts
 init_react_import();
@@ -7272,10 +7393,10 @@ var onScrollEnd = (frame, cb) => {
 };
 
 // components/LayerTree/index.tsx
-var import_shallow5 = require("zustand/react/shallow");
-var import_jsx_runtime36 = require("react/jsx-runtime");
-var getClassName24 = get_class_name_factory_default("LayerTree", styles_module_default19);
-var getClassNameLayer = get_class_name_factory_default("Layer", styles_module_default19);
+var import_shallow6 = require("zustand/react/shallow");
+var import_jsx_runtime35 = require("react/jsx-runtime");
+var getClassName23 = get_class_name_factory_default("LayerTree", styles_module_default18);
+var getClassNameLayer = get_class_name_factory_default("Layer", styles_module_default18);
 var Layer = ({
   index,
   itemId,
@@ -7299,7 +7420,7 @@ var Layer = ({
   const isSelected = selecedItemId === itemId || itemSelector && itemSelector.zone === rootDroppableId && !zoneCompound;
   const nodeData = useAppStore((s) => s.state.indexes.nodes[itemId]);
   const zonesForItem = useAppStore(
-    (0, import_shallow5.useShallow)(
+    (0, import_shallow6.useShallow)(
       (s) => Object.keys(s.state.indexes.zones).filter(
         (z) => z.split(":")[0] === itemId
       )
@@ -7321,7 +7442,7 @@ var Layer = ({
   });
   const componentConfig = config.components[nodeData.data.type];
   const label = (_a = componentConfig == null ? void 0 : componentConfig["label"]) != null ? _a : nodeData.data.type.toString();
-  return /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(
     "li",
     {
       className: getClassNameLayer({
@@ -7331,7 +7452,7 @@ var Layer = ({
         childIsSelected
       }),
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassNameLayer("inner"), children: /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(
+        /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: getClassNameLayer("inner"), children: /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(
           "button",
           {
             type: "button",
@@ -7346,7 +7467,10 @@ var Layer = ({
                 `[data-puck-component="${itemId}"]`
               );
               if (!el) {
-                console.error("Scroll failed. No element was found for", itemId);
+                setItemSelector({
+                  index,
+                  zone: zoneCompound
+                });
                 return;
               }
               scrollIntoView(el);
@@ -7366,22 +7490,22 @@ var Layer = ({
               zoneStore.setState({ hoveringComponent: null });
             },
             children: [
-              containsZone && /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
+              containsZone && /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
                 "div",
                 {
                   className: getClassNameLayer("chevron"),
                   title: isSelected ? "Collapse" : "Expand",
-                  children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(ChevronDown, { size: "12" })
+                  children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(ChevronDown, { size: "12" })
                 }
               ),
-              /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { className: getClassNameLayer("title"), children: [
-                /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassNameLayer("icon"), children: nodeData.data.type === "Text" || nodeData.data.type === "Heading" ? /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Type, { size: "16" }) : /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(LayoutGrid, { size: "16" }) }),
-                /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassNameLayer("name"), children: label })
+              /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { className: getClassNameLayer("title"), children: [
+                /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: getClassNameLayer("icon"), children: nodeData.data.type === "Text" || nodeData.data.type === "Heading" ? /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Type, { size: "16" }) : /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(LayoutGrid, { size: "16" }) }),
+                /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: getClassNameLayer("name"), children: label })
               ] })
             ]
           }
         ) }),
-        containsZone && zonesForItem.map((subzone) => /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassNameLayer("zones"), children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(LayerTree, { zoneCompound: subzone }) }, subzone))
+        containsZone && zonesForItem.map((subzone) => /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: getClassNameLayer("zones"), children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(LayerTree, { zoneCompound: subzone }) }, subzone))
       ]
     }
   );
@@ -7392,22 +7516,22 @@ var LayerTree = ({
 }) => {
   const label = _label != null ? _label : zoneCompound.split(":")[1];
   const contentIds = useAppStore(
-    (0, import_shallow5.useShallow)(
+    (0, import_shallow6.useShallow)(
       (s) => {
         var _a, _b;
         return zoneCompound ? (_b = (_a = s.state.indexes.zones[zoneCompound]) == null ? void 0 : _a.contentIds) != null ? _b : [] : [];
       }
     )
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(import_jsx_runtime36.Fragment, { children: [
-    label && /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { className: getClassName24("zoneTitle"), children: [
-      /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassName24("zoneIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Layers, { size: "16" }) }),
+  return /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(import_jsx_runtime35.Fragment, { children: [
+    label && /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { className: getClassName23("zoneTitle"), children: [
+      /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: getClassName23("zoneIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Layers, { size: "16" }) }),
       label
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("ul", { className: getClassName24(), children: [
-      contentIds.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassName24("helper"), children: "No items" }),
+    /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("ul", { className: getClassName23(), children: [
+      contentIds.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: getClassName23("helper"), children: "No items" }),
       contentIds.map((itemId, i) => {
-        return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
+        return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
           Layer,
           {
             index: i,
@@ -7433,15 +7557,15 @@ var findZonesForArea = (state, area) => {
 };
 
 // components/Puck/components/Outline/index.tsx
-var import_shallow6 = require("zustand/react/shallow");
-var import_jsx_runtime37 = require("react/jsx-runtime");
+var import_shallow7 = require("zustand/react/shallow");
+var import_jsx_runtime36 = require("react/jsx-runtime");
 var Outline = () => {
   const outlineOverride = useAppStore((s) => s.overrides.outline);
   const rootZones = useAppStore(
-    (0, import_shallow6.useShallow)((s) => findZonesForArea(s.state, "root"))
+    (0, import_shallow7.useShallow)((s) => findZonesForArea(s.state, "root"))
   );
   const Wrapper = (0, import_react48.useMemo)(() => outlineOverride || "div", [outlineOverride]);
-  return /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Wrapper, { children: rootZones.map((zoneCompound) => /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Wrapper, { children: rootZones.map((zoneCompound) => /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
     LayerTree,
     {
       label: rootZones.length === 1 ? "" : zoneCompound.split(":")[1],
@@ -7582,17 +7706,17 @@ var import_react49 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/ViewportControls/styles.module.css#css-module
 init_react_import();
-var styles_module_default20 = { "ViewportControls": "_ViewportControls_gejzr_1", "ViewportControls-divider": "_ViewportControls-divider_gejzr_15", "ViewportControls-zoomSelect": "_ViewportControls-zoomSelect_gejzr_21", "ViewportButton--isActive": "_ViewportButton--isActive_gejzr_38", "ViewportButton-inner": "_ViewportButton-inner_gejzr_38" };
+var styles_module_default19 = { "ViewportControls": "_ViewportControls_gejzr_1", "ViewportControls-divider": "_ViewportControls-divider_gejzr_15", "ViewportControls-zoomSelect": "_ViewportControls-zoomSelect_gejzr_21", "ViewportButton--isActive": "_ViewportButton--isActive_gejzr_38", "ViewportButton-inner": "_ViewportButton-inner_gejzr_38" };
 
 // components/ViewportControls/index.tsx
-var import_jsx_runtime38 = require("react/jsx-runtime");
+var import_jsx_runtime37 = require("react/jsx-runtime");
 var icons = {
-  Smartphone: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Smartphone, { size: 16 }),
-  Tablet: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Tablet, { size: 16 }),
-  Monitor: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Monitor, { size: 16 })
+  Smartphone: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Smartphone, { size: 16 }),
+  Tablet: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Tablet, { size: 16 }),
+  Monitor: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Monitor, { size: 16 })
 };
-var getClassName25 = get_class_name_factory_default("ViewportControls", styles_module_default20);
-var getClassNameButton = get_class_name_factory_default("ViewportButton", styles_module_default20);
+var getClassName24 = get_class_name_factory_default("ViewportControls", styles_module_default19);
+var getClassNameButton = get_class_name_factory_default("ViewportButton", styles_module_default19);
 var ViewportButton = ({
   children,
   height = "auto",
@@ -7605,7 +7729,7 @@ var ViewportButton = ({
   (0, import_react49.useEffect)(() => {
     setIsActive(width === viewports.current.width);
   }, [width, viewports.current.width]);
-  return /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("span", { className: getClassNameButton({ isActive }), children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("span", { className: getClassNameButton({ isActive }), children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
     IconButton,
     {
       title,
@@ -7614,7 +7738,7 @@ var ViewportButton = ({
         e.stopPropagation();
         onClick({ width, height });
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("span", { className: getClassNameButton("inner"), children })
+      children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("span", { className: getClassNameButton("inner"), children })
     }
   ) });
 };
@@ -7650,8 +7774,8 @@ var ViewportControls = ({
     ].filter((a) => a.value <= autoZoom).sort((a, b) => a.value > b.value ? 1 : -1),
     [autoZoom]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)("div", { className: getClassName25(), children: [
-    viewports.map((viewport, i) => /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)("div", { className: getClassName24(), children: [
+    viewports.map((viewport, i) => /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
       ViewportButton,
       {
         height: viewport.height,
@@ -7662,8 +7786,8 @@ var ViewportControls = ({
       },
       i
     )),
-    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: getClassName25("divider") }),
-    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("div", { className: getClassName24("divider") }),
+    /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
       IconButton,
       {
         title: "Zoom viewport out",
@@ -7677,10 +7801,10 @@ var ViewportControls = ({
             )].value
           );
         },
-        children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(ZoomOut, { size: 16 })
+        children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(ZoomOut, { size: 16 })
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
       IconButton,
       {
         title: "Zoom viewport in",
@@ -7694,19 +7818,19 @@ var ViewportControls = ({
             )].value
           );
         },
-        children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(ZoomIn, { size: 16 })
+        children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(ZoomIn, { size: 16 })
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: getClassName25("divider") }),
-    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("div", { className: getClassName24("divider") }),
+    /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
       "select",
       {
-        className: getClassName25("zoomSelect"),
+        className: getClassName24("zoomSelect"),
         value: zoom.toString(),
         onChange: (e) => {
           onZoom(parseFloat(e.currentTarget.value));
         },
-        children: zoomOptions.map((option) => /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
+        children: zoomOptions.map((option) => /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
           "option",
           {
             value: option.value,
@@ -7721,7 +7845,7 @@ var ViewportControls = ({
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Puck/components/Canvas/styles.module.css#css-module
 init_react_import();
-var styles_module_default21 = { "PuckCanvas": "_PuckCanvas_18jay_1", "PuckCanvas-controls": "_PuckCanvas-controls_18jay_16", "PuckCanvas-inner": "_PuckCanvas-inner_18jay_21", "PuckCanvas-root": "_PuckCanvas-root_18jay_30", "PuckCanvas--ready": "_PuckCanvas--ready_18jay_55", "PuckCanvas-loader": "_PuckCanvas-loader_18jay_60", "PuckCanvas--showLoader": "_PuckCanvas--showLoader_18jay_70" };
+var styles_module_default20 = { "PuckCanvas": "_PuckCanvas_18jay_1", "PuckCanvas-controls": "_PuckCanvas-controls_18jay_16", "PuckCanvas-inner": "_PuckCanvas-inner_18jay_21", "PuckCanvas-root": "_PuckCanvas-root_18jay_30", "PuckCanvas--ready": "_PuckCanvas--ready_18jay_55", "PuckCanvas-loader": "_PuckCanvas-loader_18jay_60", "PuckCanvas--showLoader": "_PuckCanvas--showLoader_18jay_70" };
 
 // lib/get-zoom-config.ts
 init_react_import();
@@ -7754,9 +7878,9 @@ var getZoomConfig = (uiViewport, frame, zoom) => {
 };
 
 // components/Puck/components/Canvas/index.tsx
-var import_shallow7 = require("zustand/react/shallow");
-var import_jsx_runtime39 = require("react/jsx-runtime");
-var getClassName26 = get_class_name_factory_default("PuckCanvas", styles_module_default21);
+var import_shallow8 = require("zustand/react/shallow");
+var import_jsx_runtime38 = require("react/jsx-runtime");
+var getClassName25 = get_class_name_factory_default("PuckCanvas", styles_module_default20);
 var ZOOM_ON_CHANGE = true;
 var Canvas = () => {
   const {
@@ -7768,7 +7892,7 @@ var Canvas = () => {
     status,
     iframe
   } = useAppStore(
-    (0, import_shallow7.useShallow)((s) => ({
+    (0, import_shallow8.useShallow)((s) => ({
       dispatch: s.dispatch,
       overrides: s.overrides,
       setUi: s.setUi,
@@ -7779,7 +7903,7 @@ var Canvas = () => {
     }))
   );
   const { leftSideBarVisible, rightSideBarVisible, viewports } = useAppStore(
-    (0, import_shallow7.useShallow)((s) => ({
+    (0, import_shallow8.useShallow)((s) => ({
       leftSideBarVisible: s.state.ui.leftSideBarVisible,
       rightSideBarVisible: s.state.ui.rightSideBarVisible,
       viewports: s.state.ui.viewports
@@ -7788,7 +7912,7 @@ var Canvas = () => {
   const frameRef = (0, import_react50.useRef)(null);
   const [showTransition, setShowTransition] = (0, import_react50.useState)(false);
   const defaultRender = (0, import_react50.useMemo)(() => {
-    const PuckDefault = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(import_jsx_runtime39.Fragment, { children });
+    const PuckDefault = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(import_jsx_runtime38.Fragment, { children });
     return PuckDefault;
   }, []);
   const CustomPreview = (0, import_react50.useMemo)(
@@ -7851,10 +7975,10 @@ var Canvas = () => {
       setShowLoader(true);
     }, 500);
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)(
     "div",
     {
-      className: getClassName26({
+      className: getClassName25({
         ready: status === "READY" || !iframe.enabled || !iframe.waitForStyles,
         showLoader
       }),
@@ -7864,7 +7988,7 @@ var Canvas = () => {
         recordHistory: true
       }),
       children: [
-        viewports.controlsVisible && iframe.enabled && /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: getClassName26("controls"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+        viewports.controlsVisible && iframe.enabled && /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: getClassName25("controls"), children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
           ViewportControls,
           {
             autoZoom: zoomConfig.autoZoom,
@@ -7890,11 +8014,11 @@ var Canvas = () => {
             }
           }
         ) }),
-        /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: getClassName26("inner"), ref: frameRef, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)("div", { className: getClassName25("inner"), ref: frameRef, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
             "div",
             {
-              className: getClassName26("root"),
+              className: getClassName25("root"),
               style: {
                 width: iframe.enabled ? viewports.current.width : "100%",
                 height: zoomConfig.rootHeight,
@@ -7912,10 +8036,10 @@ var Canvas = () => {
                   })
                 );
               },
-              children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(CustomPreview, { children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Preview2, {}) })
+              children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(CustomPreview, { children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Preview2, {}) })
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: getClassName26("loader"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Loader, { size: 24 }) })
+          /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: getClassName25("loader"), children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Loader, { size: 24 }) })
         ] })
       ]
     }
@@ -7970,8 +8094,8 @@ var useLoadedOverrides = ({
 
 // components/DefaultOverride/index.tsx
 init_react_import();
-var import_jsx_runtime40 = require("react/jsx-runtime");
-var DefaultOverride = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(import_jsx_runtime40.Fragment, { children });
+var import_jsx_runtime39 = require("react/jsx-runtime");
+var DefaultOverride = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(import_jsx_runtime39.Fragment, { children });
 
 // lib/use-inject-css.ts
 init_react_import();
@@ -8113,10 +8237,225 @@ function useGetPuck() {
 }
 
 // components/Puck/index.tsx
-var import_fast_deep_equal2 = __toESM(require("fast-deep-equal"));
+var import_fast_deep_equal3 = __toESM(require("fast-deep-equal"));
+
+// components/Puck/components/Header/index.tsx
+init_react_import();
+var import_react55 = require("react");
+
+// components/MenuBar/index.tsx
+init_react_import();
+
+// css-module:/home/runner/work/puck/puck/packages/core/components/MenuBar/styles.module.css#css-module
+init_react_import();
+var styles_module_default21 = { "MenuBar": "_MenuBar_8pf8c_1", "MenuBar--menuOpen": "_MenuBar--menuOpen_8pf8c_14", "MenuBar-inner": "_MenuBar-inner_8pf8c_29", "MenuBar-history": "_MenuBar-history_8pf8c_45" };
+
+// components/MenuBar/index.tsx
+var import_jsx_runtime40 = require("react/jsx-runtime");
+var getClassName26 = get_class_name_factory_default("MenuBar", styles_module_default21);
+function MenuBar({
+  menuOpen = false,
+  renderHeaderActions,
+  setMenuOpen
+}) {
+  const back = useAppStore((s) => s.history.back);
+  const forward = useAppStore((s) => s.history.forward);
+  const hasFuture = useAppStore((s) => s.history.hasFuture());
+  const hasPast = useAppStore((s) => s.history.hasPast());
+  return /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(
+    "div",
+    {
+      className: getClassName26({ menuOpen }),
+      onClick: (event) => {
+        var _a;
+        const element = event.target;
+        if (window.matchMedia("(min-width: 638px)").matches) {
+          return;
+        }
+        if (element.tagName === "A" && ((_a = element.getAttribute("href")) == null ? void 0 : _a.startsWith("#"))) {
+          setMenuOpen(false);
+        }
+      },
+      children: /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)("div", { className: getClassName26("inner"), children: [
+        /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)("div", { className: getClassName26("history"), children: [
+          /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(IconButton, { title: "undo", disabled: !hasPast, onClick: back, children: /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Undo2, { size: 21 }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(IconButton, { title: "redo", disabled: !hasFuture, onClick: forward, children: /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Redo2, { size: 21 }) })
+        ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(import_jsx_runtime40.Fragment, { children: renderHeaderActions && renderHeaderActions() })
+      ] })
+    }
+  );
+}
+
+// css-module:/home/runner/work/puck/puck/packages/core/components/Puck/components/Header/styles.module.css#css-module
+init_react_import();
+var styles_module_default22 = { "PuckHeader": "_PuckHeader_15xnq_1", "PuckHeader-inner": "_PuckHeader-inner_15xnq_10", "PuckHeader-toggle": "_PuckHeader-toggle_15xnq_20", "PuckHeader--rightSideBarVisible": "_PuckHeader--rightSideBarVisible_15xnq_27", "PuckHeader-rightSideBarToggle": "_PuckHeader-rightSideBarToggle_15xnq_27", "PuckHeader--leftSideBarVisible": "_PuckHeader--leftSideBarVisible_15xnq_28", "PuckHeader-leftSideBarToggle": "_PuckHeader-leftSideBarToggle_15xnq_28", "PuckHeader-title": "_PuckHeader-title_15xnq_32", "PuckHeader-path": "_PuckHeader-path_15xnq_36", "PuckHeader-tools": "_PuckHeader-tools_15xnq_43", "PuckHeader-menuButton": "_PuckHeader-menuButton_15xnq_49", "PuckHeader--menuOpen": "_PuckHeader--menuOpen_15xnq_54" };
+
+// components/Puck/components/Header/index.tsx
 var import_jsx_runtime41 = require("react/jsx-runtime");
-var getClassName27 = get_class_name_factory_default("Puck", styles_module_default15);
-var getLayoutClassName = get_class_name_factory_default("PuckLayout", styles_module_default15);
+var getClassName27 = get_class_name_factory_default("PuckHeader", styles_module_default22);
+var HeaderInner = () => {
+  const {
+    onPublish,
+    renderHeader,
+    renderHeaderActions,
+    headerTitle,
+    headerPath,
+    iframe: _iframe
+  } = usePropsContext();
+  const dispatch = useAppStore((s) => s.dispatch);
+  const appStore = useAppStoreApi();
+  const defaultHeaderRender = (0, import_react55.useMemo)(() => {
+    if (renderHeader) {
+      console.warn(
+        "`renderHeader` is deprecated. Please use `overrides.header` and the `usePuck` hook instead"
+      );
+      const RenderHeader = (_a) => {
+        var _b = _a, { actions } = _b, props = __objRest(_b, ["actions"]);
+        const Comp = renderHeader;
+        const appState = useAppStore((s) => s.state);
+        return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState, children: actions }));
+      };
+      return RenderHeader;
+    }
+    return DefaultOverride;
+  }, [renderHeader]);
+  const defaultHeaderActionsRender = (0, import_react55.useMemo)(() => {
+    if (renderHeaderActions) {
+      console.warn(
+        "`renderHeaderActions` is deprecated. Please use `overrides.headerActions` and the `usePuck` hook instead."
+      );
+      const RenderHeader = (props) => {
+        const Comp = renderHeaderActions;
+        const appState = useAppStore((s) => s.state);
+        return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState }));
+      };
+      return RenderHeader;
+    }
+    return DefaultOverride;
+  }, [renderHeader]);
+  const CustomHeader = useAppStore(
+    (s) => s.overrides.header || defaultHeaderRender
+  );
+  const CustomHeaderActions = useAppStore(
+    (s) => s.overrides.headerActions || defaultHeaderActionsRender
+  );
+  const [menuOpen, setMenuOpen] = (0, import_react55.useState)(false);
+  const rootTitle = useAppStore((s) => {
+    var _a, _b;
+    const rootData = (_a = s.state.indexes.nodes["root"]) == null ? void 0 : _a.data;
+    return (_b = rootData.props.title) != null ? _b : "";
+  });
+  const leftSideBarVisible = useAppStore((s) => s.state.ui.leftSideBarVisible);
+  const rightSideBarVisible = useAppStore(
+    (s) => s.state.ui.rightSideBarVisible
+  );
+  const toggleSidebars = (0, import_react55.useCallback)(
+    (sidebar) => {
+      const widerViewport = window.matchMedia("(min-width: 638px)").matches;
+      const sideBarVisible = sidebar === "left" ? leftSideBarVisible : rightSideBarVisible;
+      const oppositeSideBar = sidebar === "left" ? "rightSideBarVisible" : "leftSideBarVisible";
+      dispatch({
+        type: "setUi",
+        ui: __spreadValues({
+          [`${sidebar}SideBarVisible`]: !sideBarVisible
+        }, !widerViewport ? { [oppositeSideBar]: false } : {})
+      });
+    },
+    [dispatch, leftSideBarVisible, rightSideBarVisible]
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+    CustomHeader,
+    {
+      actions: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(import_jsx_runtime41.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(CustomHeaderActions, { children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+        Button,
+        {
+          onClick: () => {
+            const data = appStore.getState().state.data;
+            onPublish && onPublish(data);
+          },
+          icon: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Globe, { size: "14px" }),
+          children: "Publish"
+        }
+      ) }) }),
+      children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+        "header",
+        {
+          className: getClassName27({ leftSideBarVisible, rightSideBarVisible }),
+          children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getClassName27("inner"), children: [
+            /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getClassName27("toggle"), children: [
+              /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: getClassName27("leftSideBarToggle"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                IconButton,
+                {
+                  onClick: () => {
+                    toggleSidebars("left");
+                  },
+                  title: "Toggle left sidebar",
+                  children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PanelLeft, { focusable: "false" })
+                }
+              ) }),
+              /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: getClassName27("rightSideBarToggle"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                IconButton,
+                {
+                  onClick: () => {
+                    toggleSidebars("right");
+                  },
+                  title: "Toggle right sidebar",
+                  children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PanelRight, { focusable: "false" })
+                }
+              ) })
+            ] }),
+            /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: getClassName27("title"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Heading, { rank: "2", size: "xs", children: [
+              headerTitle || rootTitle || "Page",
+              headerPath && /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(import_jsx_runtime41.Fragment, { children: [
+                " ",
+                /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("code", { className: getClassName27("path"), children: headerPath })
+              ] })
+            ] }) }),
+            /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getClassName27("tools"), children: [
+              /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: getClassName27("menuButton"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                IconButton,
+                {
+                  onClick: () => {
+                    return setMenuOpen(!menuOpen);
+                  },
+                  title: "Toggle menu bar",
+                  children: menuOpen ? /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(ChevronUp, { focusable: "false" }) : /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(ChevronDown, { focusable: "false" })
+                }
+              ) }),
+              /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                MenuBar,
+                {
+                  dispatch,
+                  onPublish,
+                  menuOpen,
+                  renderHeaderActions: () => /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(CustomHeaderActions, { children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                    Button,
+                    {
+                      onClick: () => {
+                        const data = appStore.getState().state.data;
+                        onPublish && onPublish(data);
+                      },
+                      icon: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Globe, { size: "14px" }),
+                      children: "Publish"
+                    }
+                  ) }),
+                  setMenuOpen
+                }
+              )
+            ] })
+          ] })
+        }
+      )
+    }
+  );
+};
+var Header = (0, import_react55.memo)(HeaderInner);
+
+// components/Puck/index.tsx
+var import_jsx_runtime42 = require("react/jsx-runtime");
+var getClassName28 = get_class_name_factory_default("Puck", styles_module_default14);
+var getLayoutClassName = get_class_name_factory_default("PuckLayout", styles_module_default14);
 var FieldSideBar = () => {
   const title = useAppStore(
     (s) => {
@@ -8124,13 +8463,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_runtime41.jsx)(SidebarSection, { noPadding: true, noBorderTop: true, showBreadcrumbs: true, title, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Fields, {}) });
+  return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(SidebarSection, { noPadding: true, noBorderTop: true, showBreadcrumbs: true, title, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Fields, {}) });
 };
-var propsContext = (0, import_react55.createContext)({});
+var propsContext = (0, import_react56.createContext)({});
 function PropsProvider(props) {
-  return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(propsContext.Provider, { value: props, children: props.children });
+  return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(propsContext.Provider, { value: props, children: props.children });
 }
-var usePropsContext = () => (0, import_react55.useContext)(propsContext);
+var usePropsContext = () => (0, import_react56.useContext)(propsContext);
 function PuckProvider({ children }) {
   const {
     config,
@@ -8146,11 +8485,14 @@ function PuckProvider({ children }) {
     metadata,
     onAction
   } = usePropsContext();
-  const iframe = __spreadValues({
-    enabled: true,
-    waitForStyles: true
-  }, _iframe);
-  const [generatedAppState] = (0, import_react55.useState)(() => {
+  const iframe = (0, import_react56.useMemo)(
+    () => __spreadValues({
+      enabled: true,
+      waitForStyles: true
+    }, _iframe),
+    [_iframe]
+  );
+  const [generatedAppState] = (0, import_react56.useState)(() => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const initial = __spreadValues(__spreadValues({}, defaultAppState.ui), initialUi);
     let clientUiState = {};
@@ -8210,7 +8552,7 @@ function PuckProvider({ children }) {
     return walkAppState(newAppState, config);
   });
   const { appendData = true } = _initialHistory || {};
-  const [blendedHistories] = (0, import_react55.useState)(
+  const [blendedHistories] = (0, import_react56.useState)(
     [
       ...(_initialHistory == null ? void 0 : _initialHistory.histories) || [],
       ...appendData ? [{ state: generatedAppState }] : []
@@ -8230,7 +8572,7 @@ function PuckProvider({ children }) {
     overrides,
     plugins
   });
-  const generateAppStore = (0, import_react55.useCallback)(
+  const generateAppStore = (0, import_react56.useCallback)(
     (state) => {
       return {
         state,
@@ -8254,10 +8596,15 @@ function PuckProvider({ children }) {
       metadata
     ]
   );
-  const [appStore] = (0, import_react55.useState)(
+  const [appStore] = (0, import_react56.useState)(
     () => createAppStore(generateAppStore(initialAppState))
   );
-  (0, import_react55.useEffect)(() => {
+  (0, import_react56.useEffect)(() => {
+    if (process.env.NODE_ENV !== "production") {
+      window.__PUCK_INTERNAL_DO_NOT_USE = { appStore };
+    }
+  }, [appStore]);
+  (0, import_react56.useEffect)(() => {
     const state = appStore.getState().state;
     appStore.setState(__spreadValues({}, generateAppStore(state)));
   }, [config, plugins, loadedOverrides, viewports, iframe, onAction, metadata]);
@@ -8266,13 +8613,13 @@ function PuckProvider({ children }) {
     index: initialHistoryIndex,
     initialAppState
   });
-  const previousData = (0, import_react55.useRef)(null);
-  (0, import_react55.useEffect)(() => {
+  const previousData = (0, import_react56.useRef)(null);
+  (0, import_react56.useEffect)(() => {
     appStore.subscribe(
       (s) => s.state.data,
       (data) => {
         if (onChange) {
-          if ((0, import_fast_deep_equal2.default)(data, previousData.current)) return;
+          if ((0, import_fast_deep_equal3.default)(data, previousData.current)) return;
           onChange(data);
           previousData.current = data;
         }
@@ -8281,53 +8628,32 @@ function PuckProvider({ children }) {
   }, []);
   useRegisterPermissionsSlice(appStore, permissions);
   const uPuckStore = useRegisterUsePuckStore(appStore);
-  (0, import_react55.useEffect)(() => {
+  (0, import_react56.useEffect)(() => {
     const { resolveAndCommitData } = appStore.getState();
     resolveAndCommitData();
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(appStoreContext.Provider, { value: appStore, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(UsePuckStoreContext.Provider, { value: uPuckStore, children }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(appStoreContext.Provider, { value: appStore, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(UsePuckStoreContext.Provider, { value: uPuckStore, children }) });
 }
 function PuckLayout({ children }) {
   const {
-    onPublish,
-    renderHeader,
-    renderHeaderActions,
-    headerTitle,
-    headerPath,
     iframe: _iframe,
     dnd,
     initialHistory: _initialHistory
   } = usePropsContext();
-  const iframe = __spreadValues({
-    enabled: true,
-    waitForStyles: true
-  }, _iframe);
+  const iframe = (0, import_react56.useMemo)(
+    () => __spreadValues({
+      enabled: true,
+      waitForStyles: true
+    }, _iframe),
+    [_iframe]
+  );
   useInjectGlobalCss(iframe.enabled);
   const leftSideBarVisible = useAppStore((s) => s.state.ui.leftSideBarVisible);
   const rightSideBarVisible = useAppStore(
     (s) => s.state.ui.rightSideBarVisible
   );
-  const [menuOpen, setMenuOpen] = (0, import_react55.useState)(false);
-  const appStore = useAppStoreApi();
-  const rootProps = useAppStore(
-    (s) => s.state.data.root.props || s.state.data.root.props
-  );
   const dispatch = useAppStore((s) => s.dispatch);
-  const toggleSidebars = (0, import_react55.useCallback)(
-    (sidebar) => {
-      const widerViewport = window.matchMedia("(min-width: 638px)").matches;
-      const sideBarVisible = sidebar === "left" ? leftSideBarVisible : rightSideBarVisible;
-      const oppositeSideBar = sidebar === "left" ? "rightSideBarVisible" : "leftSideBarVisible";
-      dispatch({
-        type: "setUi",
-        ui: __spreadValues({
-          [`${sidebar}SideBarVisible`]: !sideBarVisible
-        }, !widerViewport ? { [oppositeSideBar]: false } : {})
-      });
-    },
-    [dispatch, leftSideBarVisible, rightSideBarVisible]
-  );
-  (0, import_react55.useEffect)(() => {
+  (0, import_react56.useEffect)(() => {
     if (!window.matchMedia("(min-width: 638px)").matches) {
       dispatch({
         type: "setUi",
@@ -8350,55 +8676,18 @@ function PuckLayout({ children }) {
       window.removeEventListener("resize", handleResize);
     };
   }, []);
-  const defaultHeaderRender = (0, import_react55.useMemo)(() => {
-    if (renderHeader) {
-      console.warn(
-        "`renderHeader` is deprecated. Please use `overrides.header` and the `usePuck` hook instead"
-      );
-      const RenderHeader = (_a) => {
-        var _b = _a, { actions } = _b, props = __objRest(_b, ["actions"]);
-        const Comp = renderHeader;
-        const appState = useAppStore((s) => s.state);
-        return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState, children: actions }));
-      };
-      return RenderHeader;
-    }
-    return DefaultOverride;
-  }, [renderHeader]);
-  const defaultHeaderActionsRender = (0, import_react55.useMemo)(() => {
-    if (renderHeaderActions) {
-      console.warn(
-        "`renderHeaderActions` is deprecated. Please use `overrides.headerActions` and the `usePuck` hook instead."
-      );
-      const RenderHeader = (props) => {
-        const Comp = renderHeaderActions;
-        const appState = useAppStore((s) => s.state);
-        return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState }));
-      };
-      return RenderHeader;
-    }
-    return DefaultOverride;
-  }, [renderHeader]);
   const overrides = useAppStore((s) => s.overrides);
-  const CustomPuck = (0, import_react55.useMemo)(
+  const CustomPuck = (0, import_react56.useMemo)(
     () => overrides.puck || DefaultOverride,
     [overrides]
   );
-  const CustomHeader = (0, import_react55.useMemo)(
-    () => overrides.header || defaultHeaderRender,
-    [overrides]
-  );
-  const CustomHeaderActions = (0, import_react55.useMemo)(
-    () => overrides.headerActions || defaultHeaderActionsRender,
-    [overrides]
-  );
-  const [mounted, setMounted] = (0, import_react55.useState)(false);
-  (0, import_react55.useEffect)(() => {
+  const [mounted, setMounted] = (0, import_react56.useState)(false);
+  (0, import_react56.useEffect)(() => {
     setMounted(true);
   }, []);
   const ready = useAppStore((s) => s.status === "READY");
   useMonitorHotkeys();
-  (0, import_react55.useEffect)(() => {
+  (0, import_react56.useEffect)(() => {
     if (ready && iframe.enabled) {
       const frameDoc = getFrame();
       if (frameDoc) {
@@ -8407,128 +8696,31 @@ function PuckLayout({ children }) {
     }
   }, [ready, iframe.enabled]);
   usePreviewModeHotkeys();
-  return /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: `Puck ${getClassName27()}`, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(DragDropContext, { disableAutoScroll: dnd == null ? void 0 : dnd.disableAutoScroll, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(CustomPuck, { children: children || /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: `Puck ${getClassName28()}`, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(DragDropContext, { disableAutoScroll: dnd == null ? void 0 : dnd.disableAutoScroll, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(CustomPuck, { children: children || /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
       "div",
       {
         className: getLayoutClassName({
           leftSideBarVisible,
-          menuOpen,
           mounted,
           rightSideBarVisible
         }),
-        children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getLayoutClassName("inner"), children: [
-          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
-            CustomHeader,
-            {
-              actions: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(import_jsx_runtime41.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(CustomHeaderActions, { children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
-                Button,
-                {
-                  onClick: () => {
-                    const data = appStore.getState().state.data;
-                    onPublish && onPublish(data);
-                  },
-                  icon: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Globe, { size: "14px" }),
-                  children: "Publish"
-                }
-              ) }) }),
-              children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("header", { className: getLayoutClassName("header"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getLayoutClassName("headerInner"), children: [
-                /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getLayoutClassName("headerToggle"), children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
-                    "div",
-                    {
-                      className: getLayoutClassName("leftSideBarToggle"),
-                      children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
-                        IconButton,
-                        {
-                          onClick: () => {
-                            toggleSidebars("left");
-                          },
-                          title: "Toggle left sidebar",
-                          children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PanelLeft, { focusable: "false" })
-                        }
-                      )
-                    }
-                  ),
-                  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
-                    "div",
-                    {
-                      className: getLayoutClassName("rightSideBarToggle"),
-                      children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
-                        IconButton,
-                        {
-                          onClick: () => {
-                            toggleSidebars("right");
-                          },
-                          title: "Toggle right sidebar",
-                          children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PanelRight, { focusable: "false" })
-                        }
-                      )
-                    }
-                  )
-                ] }),
-                /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: getLayoutClassName("headerTitle"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Heading, { rank: "2", size: "xs", children: [
-                  headerTitle || (rootProps == null ? void 0 : rootProps.title) || "Page",
-                  headerPath && /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(import_jsx_runtime41.Fragment, { children: [
-                    " ",
-                    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
-                      "code",
-                      {
-                        className: getLayoutClassName("headerPath"),
-                        children: headerPath
-                      }
-                    )
-                  ] })
-                ] }) }),
-                /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getLayoutClassName("headerTools"), children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: getLayoutClassName("menuButton"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
-                    IconButton,
-                    {
-                      onClick: () => {
-                        return setMenuOpen(!menuOpen);
-                      },
-                      title: "Toggle menu bar",
-                      children: menuOpen ? /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(ChevronUp, { focusable: "false" }) : /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(ChevronDown, { focusable: "false" })
-                    }
-                  ) }),
-                  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
-                    MenuBar,
-                    {
-                      dispatch,
-                      onPublish,
-                      menuOpen,
-                      renderHeaderActions: () => /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(CustomHeaderActions, { children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
-                        Button,
-                        {
-                          onClick: () => {
-                            const data = appStore.getState().state.data;
-                            onPublish && onPublish(data);
-                          },
-                          icon: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Globe, { size: "14px" }),
-                          children: "Publish"
-                        }
-                      ) }),
-                      setMenuOpen
-                    }
-                  )
-                ] })
-              ] }) })
-            }
-          ),
-          /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getLayoutClassName("leftSideBar"), children: [
-            /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(SidebarSection, { title: "Components", noBorderTop: true, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Components, {}) }),
-            /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(SidebarSection, { title: "Outline", children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Outline, {}) })
+        children: /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: getLayoutClassName("inner"), children: [
+          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Header, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: getLayoutClassName("leftSideBar"), children: [
+            /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(SidebarSection, { title: "Components", noBorderTop: true, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Components, {}) }),
+            /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(SidebarSection, { title: "Outline", children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Outline, {}) })
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Canvas, {}),
-          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: getLayoutClassName("rightSideBar"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(FieldSideBar, {}) })
+          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Canvas, {}),
+          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("div", { className: getLayoutClassName("rightSideBar"), children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(FieldSideBar, {}) })
         ] })
       }
     ) }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { id: "puck-portal-root", className: getClassName27("portal") })
+    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("div", { id: "puck-portal-root", className: getClassName28("portal") })
   ] });
 }
 function Puck(props) {
-  return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PropsProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PuckProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PuckLayout, __spreadValues({}, props)) })) }));
+  return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(PropsProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(PuckProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(PuckLayout, __spreadValues({}, props)) })) }));
 }
 Puck.Components = Components;
 Puck.Fields = Fields;
@@ -8683,13 +8875,12 @@ function resolveAllData(_0, _1) {
         },
         () => {
         },
-        "force",
-        false
+        "force"
       )).node;
-      const resolvedDeep = yield mapSlotsAsync(
+      const resolvedDeep = yield mapSlots(
         resolved,
         processContent,
-        false
+        config
       );
       onResolveEnd == null ? void 0 : onResolveEnd(toComponent(resolvedDeep));
       return resolvedDeep;