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

package/dist/index.mjs

@@ -9,6 +9,7 @@ import {
   __toESM,
   defaultAppState,
   defaultViewports,
+  expandNode,
   getChanged,
   init_react_import,
   migrate,
@@ -21,8 +22,9 @@ import {
   transformProps,
   useSlots,
   walkAppState,
+  walkField,
   walkTree
-} from "./chunk-GL73J54P.mjs";
+} from "./chunk-HGAPIQP5.mjs";
 
 // ../../node_modules/classnames/index.js
 var require_classnames = __commonJS({
@@ -746,7 +748,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) => {
@@ -1425,7 +1427,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];
@@ -2445,6 +2451,19 @@ var ArrayField = ({
   );
   const forceReadOnly = !canEdit;
   const valueRef = useRef(value);
+  const uniqifyItem = useCallback2(
+    (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;
   }
@@ -2549,11 +2568,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)
                                             );
@@ -2651,12 +2669,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);
@@ -3556,6 +3573,10 @@ function AutoFieldInternal(props) {
       });
     }
   }, []);
+  const { visible = true } = props.field;
+  if (!visible) {
+    return null;
+  }
   if (field.type === "slot") {
     return null;
   }
@@ -3654,7 +3675,7 @@ import {
   useContext as useContext8,
   useEffect as useEffect17,
   useMemo as useMemo10,
-  useRef as useRef4,
+  useRef as useRef5,
   useState as useState14
 } from "react";
 import { AutoScroller, defaultPreset } from "@dnd-kit/dom";
@@ -3668,7 +3689,7 @@ import {
   useContext as useContext7,
   useEffect as useEffect16,
   useMemo as useMemo9,
-  useRef as useRef3
+  useRef as useRef4
 } from "react";
 
 // components/DraggableComponent/index.tsx
@@ -3774,6 +3795,21 @@ var DropZoneProvider = ({
 import { useShallow as useShallow2 } from "zustand/react/shallow";
 import { useSortable as useSortable2 } from "@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();
 import { useContext as useContext4 } from "react";
@@ -3799,7 +3835,9 @@ var useOnDragFinished = (cb, deps = []) => {
       if (isDragging2) {
         cb(false);
       } else {
-        cb(true);
+        setTimeout(() => {
+          cb(true);
+        }, 0);
         if (dispose) dispose();
       }
     };
@@ -3975,11 +4013,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]);
@@ -3988,8 +4031,7 @@ var DraggableComponent = ({
     setStyle(getStyle());
   }, [ref.current, iframe]);
   useEffect12(() => {
-    const userIsDragging = !!zoneStore.getState().draggedItem;
-    if (ref.current && !userIsDragging) {
+    if (ref.current) {
       const observer = new ResizeObserver(sync);
       observer.observe(ref.current);
       return () => {
@@ -3998,11 +4040,27 @@ var DraggableComponent = ({
     }
   }, [ref.current]);
   const registerNode = useAppStore((s) => s.nodes.registerNode);
+  const hideOverlay = useCallback7(() => {
+    setIsVisible(false);
+  }, []);
+  const showOverlay = useCallback7(() => {
+    setIsVisible(true);
+  }, []);
   useEffect12(() => {
     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 = useMemo7(
@@ -4269,7 +4327,8 @@ import { useDroppable } from "@dnd-kit/react";
 
 // components/DropZone/lib/use-min-empty-height.ts
 init_react_import();
-import { useEffect as useEffect13, useState as useState11 } from "react";
+import { useEffect as useEffect13, useRef as useRef3, useState as useState11 } from "react";
+var getNumItems = (appStore, zoneCompound) => appStore.getState().state.indexes.zones[zoneCompound].contentIds.length;
 var useMinEmptyHeight = ({
   zoneCompound,
   userMinEmptyHeight,
@@ -4285,35 +4344,52 @@ var useMinEmptyHeight = ({
       isZone: ((_b = s.draggedItem) == null ? void 0 : _b.data.zone) === zoneCompound
     };
   });
+  const numItems = useRef3(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]
+  );
   useEffect13(() => {
     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];
 };
 
@@ -4438,7 +4514,7 @@ var useDragAxis = (ref, collisionAxis) => {
 };
 
 // components/DropZone/index.tsx
-import { useShallow as useShallow3 } from "zustand/react/shallow";
+import { useShallow as useShallow4 } from "zustand/react/shallow";
 
 // components/Render/index.tsx
 init_react_import();
@@ -4446,6 +4522,7 @@ import React3, { useMemo as useMemo8 } from "react";
 
 // components/SlotRender/index.tsx
 init_react_import();
+import { useShallow as useShallow3 } from "zustand/react/shallow";
 import { jsx as jsx21 } from "react/jsx-runtime";
 var ContextSlotRender = ({
   componentId,
@@ -4454,10 +4531,12 @@ var ContextSlotRender = ({
   const config = useAppStore((s) => s.config);
   const metadata = useAppStore((s) => s.metadata);
   const slotContent = useAppStore(
-    (s) => {
+    useShallow3((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__ */ jsx21(
     SlotRenderPure,
@@ -4487,7 +4566,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: {
@@ -4500,7 +4579,11 @@ function Render({
     editMode: false,
     id: "puck-root"
   });
-  const propsWithSlots = useSlots(config.root, pageProps, (props) => /* @__PURE__ */ jsx22(SlotRender, __spreadProps(__spreadValues({}, props), { config, metadata })));
+  const propsWithSlots = useSlots(
+    config,
+    { type: "root", props: pageProps },
+    (props) => /* @__PURE__ */ jsx22(SlotRender, __spreadProps(__spreadValues({}, props), { config, metadata }))
+  );
   const nextContextValue = useMemo8(
     () => ({
       mode: "render",
@@ -4534,7 +4617,7 @@ var DropZoneChild = ({
   const { depth = 1 } = ctx != null ? ctx : {};
   const zoneStore = useContext7(ZoneStoreContext);
   const nodeProps = useAppStore(
-    useShallow3((s) => {
+    useShallow4((s) => {
       var _a2;
       return (_a2 = s.state.indexes.nodes[componentId]) == null ? void 0 : _a2.flatData.props;
     })
@@ -4546,14 +4629,19 @@ var DropZoneChild = ({
     }
   );
   const nodeReadOnly = useAppStore(
-    useShallow3((s) => {
+    useShallow4((s) => {
       var _a2;
       return (_a2 = s.state.indexes.nodes[componentId]) == null ? void 0 : _a2.data.readOnly;
     })
   );
+  const appStore = useAppStoreApi();
   const item = useMemo9(() => {
     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)) {
@@ -4564,7 +4652,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
   );
@@ -4605,9 +4693,17 @@ var DropZoneChild = ({
     }),
     [componentConfig == null ? void 0 : componentConfig.defaultProps, item == null ? void 0 : item.props, puckProps]
   );
+  const defaultedNode = useMemo9(
+    () => {
+      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__ */ jsx23(ContextSlotRender, { componentId, zone: slotProps.zone }),
     nodeReadOnly,
@@ -4619,7 +4715,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;
   }
@@ -4668,7 +4764,7 @@ var DropZoneEdit = forwardRef3(
       unregisterLocalZone
     } = ctx != null ? ctx : {};
     const path = useAppStore(
-      useShallow3((s) => {
+      useShallow4((s) => {
         var _a;
         return areaId ? (_a = s.state.indexes.nodes[areaId]) == null ? void 0 : _a.path : null;
       })
@@ -4685,13 +4781,13 @@ var DropZoneEdit = forwardRef3(
       (s) => s.nextAreaDepthIndex[areaId || ""]
     );
     const zoneContentIds = useAppStore(
-      useShallow3((s) => {
+      useShallow4((s) => {
         var _a;
         return (_a = s.state.indexes.zones[zoneCompound]) == null ? void 0 : _a.contentIds;
       })
     );
     const zoneType = useAppStore(
-      useShallow3((s) => {
+      useShallow4((s) => {
         var _a;
         return (_a = s.state.indexes.zones[zoneCompound]) == null ? void 0 : _a.type;
       })
@@ -4720,7 +4816,7 @@ var DropZoneEdit = forwardRef3(
     const contentIds = useMemo9(() => {
       return zoneContentIds || [];
     }, [zoneContentIds]);
-    const ref = useRef3(null);
+    const ref = useRef4(null);
     const acceptsTarget = useCallback10(
       (componentType) => {
         if (!componentType) {
@@ -4848,7 +4944,7 @@ var DropZoneRenderItem = ({
   metadata
 }) => {
   const Component = config.components[item.type];
-  const props = useSlots(Component, item.props, (slotProps) => /* @__PURE__ */ jsx23(SlotRenderPure, __spreadProps(__spreadValues({}, slotProps), { config, metadata })));
+  const props = useSlots(config, item, (slotProps) => /* @__PURE__ */ jsx23(SlotRenderPure, __spreadProps(__spreadValues({}, slotProps), { config, metadata })));
   const nextContextValue = useMemo9(
     () => ({
       areaId: props.id,
@@ -5266,7 +5362,7 @@ function useDragListener(type, fn, deps = []) {
 }
 var AREA_CHANGE_DEBOUNCE_MS = 100;
 var useTempDisableFallback = (timeout3) => {
-  const lastFallbackDisable = useRef4(null);
+  const lastFallbackDisable = useRef5(null);
   return useCallback11((manager) => {
     collisionStore.setState({ fallbackEnabled: false });
     const fallbackId = generateId();
@@ -5286,7 +5382,7 @@ var DragDropContextClient = ({
   const dispatch = useAppStore((s) => s.dispatch);
   const appStore = useAppStoreApi();
   const id = useSafeId();
-  const debouncedParamsRef = useRef4(null);
+  const debouncedParamsRef = useRef5(null);
   const tempDisableFallback = useTempDisableFallback(100);
   const [zoneStore] = useState14(
     () => createStore3(() => ({
@@ -5408,8 +5504,8 @@ var DragDropContextClient = ({
   ]);
   const sensors = useSensors();
   const [dragListeners, setDragListeners] = useState14({});
-  const dragMode = useRef4(null);
-  const initialSelector = useRef4(void 0);
+  const dragMode = useRef5(null);
+  const initialSelector = useRef5(void 0);
   const nextContextValue = useMemo10(
     () => ({
       mode: "edit",
@@ -5786,12 +5882,12 @@ Drawer.Item = DrawerItem;
 init_react_import();
 import {
   createContext as createContext7,
-  useCallback as useCallback17,
+  useCallback as useCallback18,
   useContext as useContext12,
   useEffect as useEffect25,
-  useMemo as useMemo20,
-  useRef as useRef7,
-  useState as useState22
+  useMemo as useMemo21,
+  useRef as useRef8,
+  useState as useState23
 } from "react";
 
 // components/SidebarSection/index.tsx
@@ -5887,70 +5983,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
-import { Fragment as Fragment7, jsx as jsx27, jsxs as jsxs13 } from "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__ */ jsx27(
-    "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__ */ jsxs13("div", { className: getClassName20("inner"), children: [
-        /* @__PURE__ */ jsxs13("div", { className: getClassName20("history"), children: [
-          /* @__PURE__ */ jsx27(IconButton, { title: "undo", disabled: !hasPast, onClick: back, children: /* @__PURE__ */ jsx27(Undo2, { size: 21 }) }),
-          /* @__PURE__ */ jsx27(IconButton, { title: "redo", disabled: !hasFuture, onClick: forward, children: /* @__PURE__ */ jsx27(Redo2, { size: 21 }) })
-        ] }),
-        /* @__PURE__ */ jsx27(Fragment7, { 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
-import { useCallback as useCallback12, useMemo as useMemo13 } from "react";
-import { useShallow as useShallow4 } from "zustand/react/shallow";
-import { Fragment as Fragment8, jsx as jsx28, jsxs as jsxs14 } from "react/jsx-runtime";
-var getClassName21 = get_class_name_factory_default("PuckFields", styles_module_default16);
+import { memo as memo2, useCallback as useCallback12, useMemo as useMemo13 } from "react";
+import { useShallow as useShallow5 } from "zustand/react/shallow";
+import { Fragment as Fragment7, jsx as jsx27, jsxs as jsxs13 } from "react/jsx-runtime";
+var getClassName20 = get_class_name_factory_default("PuckFields", styles_module_default15);
 var DefaultFields = ({
   children
 }) => {
-  return /* @__PURE__ */ jsx28(Fragment8, { children });
+  return /* @__PURE__ */ jsx27(Fragment7, { children });
 };
 var createOnChange = (fieldName, appStore) => (value, updatedUi) => __async(void 0, null, function* () {
   let currentProps;
@@ -6010,7 +6062,7 @@ var FieldsChild = ({ fieldName }) => {
     return s.selectedItem ? `${s.selectedItem.props.id}_${field.type}_${fieldName}` : `root_${field.type}_${fieldName}`;
   });
   const permissions = useAppStore(
-    useShallow4((s) => {
+    useShallow5((s) => {
       const { selectedItem, permissions: permissions2 } = s;
       return selectedItem ? permissions2.getPermissions({ item: selectedItem }) : permissions2.getPermissions({ root: true });
     })
@@ -6019,9 +6071,10 @@ var FieldsChild = ({ fieldName }) => {
   const onChange = useCallback12(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__ */ jsx28("div", { className: getClassName21("field"), children: /* @__PURE__ */ jsx28(
+  return /* @__PURE__ */ jsx27("div", { className: getClassName20("field"), children: /* @__PURE__ */ jsx27(
     AutoFieldPrivate,
     {
       field,
@@ -6033,14 +6086,15 @@ var FieldsChild = ({ fieldName }) => {
     }
   ) }, id);
 };
-var Fields = ({ wrapFields = true }) => {
+var FieldsChildMemo = memo2(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(useShallow4((s) => s.state.ui.itemSelector));
+  const itemSelector = useAppStore(useShallow5((s) => s.state.ui.itemSelector));
   const id = useAppStore((s) => {
     var _a;
     return (_a = s.selectedItem) == null ? void 0 : _a.props.id;
@@ -6049,7 +6103,7 @@ var Fields = ({ wrapFields = true }) => {
   useRegisterFieldsSlice(appStore, id);
   const fieldsLoading = useAppStore((s) => s.fields.loading);
   const fieldNames = useAppStore(
-    useShallow4((s) => {
+    useShallow5((s) => {
       if (s.fields.id === id) {
         return Object.keys(s.fields.fields);
       }
@@ -6058,20 +6112,21 @@ var Fields = ({ wrapFields = true }) => {
   );
   const isLoading = fieldsLoading || componentResolving;
   const Wrapper = useMemo13(() => overrides.fields || DefaultFields, [overrides]);
-  return /* @__PURE__ */ jsxs14(
+  return /* @__PURE__ */ jsxs13(
     "form",
     {
-      className: getClassName21({ wrapFields }),
+      className: getClassName20({ wrapFields }),
       onSubmit: (e) => {
         e.preventDefault();
       },
       children: [
-        /* @__PURE__ */ jsx28(Wrapper, { isLoading, itemSelector, children: fieldNames.map((fieldName) => /* @__PURE__ */ jsx28(FieldsChild, { fieldName }, fieldName)) }),
-        isLoading && /* @__PURE__ */ jsx28("div", { className: getClassName21("loadingOverlay"), children: /* @__PURE__ */ jsx28("div", { className: getClassName21("loadingOverlayInner"), children: /* @__PURE__ */ jsx28(Loader, { size: 16 }) }) })
+        /* @__PURE__ */ jsx27(Wrapper, { isLoading, itemSelector, children: fieldNames.map((fieldName) => /* @__PURE__ */ jsx27(FieldsChildMemo, { fieldName }, fieldName)) }),
+        isLoading && /* @__PURE__ */ jsx27("div", { className: getClassName20("loadingOverlay"), children: /* @__PURE__ */ jsx27("div", { className: getClassName20("loadingOverlayInner"), children: /* @__PURE__ */ jsx27(Loader, { size: 16 }) }) })
       ]
     }
   );
 };
+var Fields = memo2(FieldsInternal);
 
 // components/Puck/components/Components/index.tsx
 init_react_import();
@@ -6085,11 +6140,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
-import { jsx as jsx29, jsxs as jsxs15 } from "react/jsx-runtime";
-var getClassName22 = get_class_name_factory_default("ComponentList", styles_module_default17);
+import { jsx as jsx28, jsxs as jsxs14 } from "react/jsx-runtime";
+var getClassName21 = get_class_name_factory_default("ComponentList", styles_module_default16);
 var ComponentListItem = ({
   name,
   label
@@ -6100,7 +6155,7 @@ var ComponentListItem = ({
       type: name
     }).insert
   );
-  return /* @__PURE__ */ jsx29(Drawer.Item, { label, name, isDragDisabled: !canInsert, children: overrides.componentItem });
+  return /* @__PURE__ */ jsx28(Drawer.Item, { label, name, isDragDisabled: !canInsert, children: overrides.componentItem });
 };
 var ComponentList = ({
   children,
@@ -6111,12 +6166,12 @@ var ComponentList = ({
   const setUi = useAppStore((s) => s.setUi);
   const componentList = useAppStore((s) => s.state.ui.componentList);
   const { expanded = true } = componentList[id] || {};
-  return /* @__PURE__ */ jsxs15("div", { className: getClassName22({ isExpanded: expanded }), children: [
-    title && /* @__PURE__ */ jsxs15(
+  return /* @__PURE__ */ jsxs14("div", { className: getClassName21({ isExpanded: expanded }), children: [
+    title && /* @__PURE__ */ jsxs14(
       "button",
       {
         type: "button",
-        className: getClassName22("title"),
+        className: getClassName21("title"),
         onClick: () => setUi({
           componentList: __spreadProps(__spreadValues({}, componentList), {
             [id]: __spreadProps(__spreadValues({}, componentList[id]), {
@@ -6126,14 +6181,14 @@ var ComponentList = ({
         }),
         title: expanded ? `Collapse${title ? ` ${title}` : ""}` : `Expand${title ? ` ${title}` : ""}`,
         children: [
-          /* @__PURE__ */ jsx29("div", { children: title }),
-          /* @__PURE__ */ jsx29("div", { className: getClassName22("titleIcon"), children: expanded ? /* @__PURE__ */ jsx29(ChevronUp, { size: 12 }) : /* @__PURE__ */ jsx29(ChevronDown, { size: 12 }) })
+          /* @__PURE__ */ jsx28("div", { children: title }),
+          /* @__PURE__ */ jsx28("div", { className: getClassName21("titleIcon"), children: expanded ? /* @__PURE__ */ jsx28(ChevronUp, { size: 12 }) : /* @__PURE__ */ jsx28(ChevronDown, { size: 12 }) })
         ]
       }
     ),
-    /* @__PURE__ */ jsx29("div", { className: getClassName22("content"), children: /* @__PURE__ */ jsx29(Drawer, { children: children || Object.keys(config.components).map((componentKey) => {
+    /* @__PURE__ */ jsx28("div", { className: getClassName21("content"), children: /* @__PURE__ */ jsx28(Drawer, { children: children || Object.keys(config.components).map((componentKey) => {
       var _a;
-      return /* @__PURE__ */ jsx29(
+      return /* @__PURE__ */ jsx28(
         ComponentListItem,
         {
           label: (_a = config.components[componentKey]["label"]) != null ? _a : componentKey,
@@ -6147,7 +6202,7 @@ var ComponentList = ({
 ComponentList.Item = ComponentListItem;
 
 // lib/use-component-list.tsx
-import { jsx as jsx30 } from "react/jsx-runtime";
+import { jsx as jsx29 } from "react/jsx-runtime";
 var useComponentList = () => {
   const [componentList, setComponentList] = useState16();
   const config = useAppStore((s) => s.config);
@@ -6162,7 +6217,7 @@ var useComponentList = () => {
           if (category.visible === false || !category.components) {
             return null;
           }
-          return /* @__PURE__ */ jsx30(
+          return /* @__PURE__ */ jsx29(
             ComponentList,
             {
               id: categoryKey,
@@ -6171,7 +6226,7 @@ var useComponentList = () => {
                 var _a2;
                 matchedComponents.push(componentName);
                 const componentConf = config.components[componentName] || {};
-                return /* @__PURE__ */ jsx30(
+                return /* @__PURE__ */ jsx29(
                   ComponentList.Item,
                   {
                     label: (_a2 = componentConf["label"]) != null ? _a2 : componentName,
@@ -6191,7 +6246,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__ */ jsx30(
+          /* @__PURE__ */ jsx29(
             ComponentList,
             {
               id: "other",
@@ -6199,7 +6254,7 @@ var useComponentList = () => {
               children: remainingComponents.map((componentName, i) => {
                 var _a2;
                 const componentConf = config.components[componentName] || {};
-                return /* @__PURE__ */ jsx30(
+                return /* @__PURE__ */ jsx29(
                   ComponentList.Item,
                   {
                     name: componentName,
@@ -6222,17 +6277,17 @@ var useComponentList = () => {
 
 // components/Puck/components/Components/index.tsx
 import { useMemo as useMemo14 } from "react";
-import { jsx as jsx31 } from "react/jsx-runtime";
+import { jsx as jsx30 } from "react/jsx-runtime";
 var Components = () => {
   const overrides = useAppStore((s) => s.overrides);
   const componentList = useComponentList();
   const Wrapper = useMemo14(() => overrides.components || "div", [overrides]);
-  return /* @__PURE__ */ jsx31(Wrapper, { children: componentList ? componentList : /* @__PURE__ */ jsx31(ComponentList, { id: "all" }) });
+  return /* @__PURE__ */ jsx30(Wrapper, { children: componentList ? componentList : /* @__PURE__ */ jsx30(ComponentList, { id: "all" }) });
 };
 
 // components/Puck/components/Preview/index.tsx
 init_react_import();
-import { useCallback as useCallback13, useEffect as useEffect20, useRef as useRef5, useMemo as useMemo15 } from "react";
+import { useCallback as useCallback13, useEffect as useEffect20, useRef as useRef6, useMemo as useMemo15 } from "react";
 
 // components/AutoFrame/index.tsx
 init_react_import();
@@ -6244,7 +6299,7 @@ import {
 } from "react";
 import hash from "object-hash";
 import { createPortal as createPortal3 } from "react-dom";
-import { Fragment as Fragment9, jsx as jsx32 } from "react/jsx-runtime";
+import { Fragment as Fragment8, jsx as jsx31 } from "react/jsx-runtime";
 var styleSelector = 'style, link[rel="stylesheet"]';
 var collectStyles = (doc) => {
   const collected = [];
@@ -6444,7 +6499,7 @@ var CopyHostStyles = ({
       observer.disconnect();
     };
   }, []);
-  return /* @__PURE__ */ jsx32(Fragment9, { children });
+  return /* @__PURE__ */ jsx31(Fragment8, { children });
 };
 var autoFrameContext = createContext5({});
 var useFrame = () => useContext9(autoFrameContext);
@@ -6491,7 +6546,7 @@ function AutoFrame(_a) {
       }
     }
   }, [frameRef, loaded, stylesLoaded]);
-  return /* @__PURE__ */ jsx32(
+  return /* @__PURE__ */ jsx31(
     "iframe",
     __spreadProps(__spreadValues({}, props), {
       className,
@@ -6501,7 +6556,7 @@ function AutoFrame(_a) {
       onLoad: () => {
         setLoaded(true);
       },
-      children: /* @__PURE__ */ jsx32(autoFrameContext.Provider, { value: ctx, children: loaded && mountTarget && /* @__PURE__ */ jsx32(
+      children: /* @__PURE__ */ jsx31(autoFrameContext.Provider, { value: ctx, children: loaded && mountTarget && /* @__PURE__ */ jsx31(
         CopyHostStyles,
         {
           debug,
@@ -6517,11 +6572,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
-import { Fragment as Fragment10, jsx as jsx33 } from "react/jsx-runtime";
-var getClassName23 = get_class_name_factory_default("PuckPreview", styles_module_default18);
+import { Fragment as Fragment9, jsx as jsx32 } from "react/jsx-runtime";
+var getClassName22 = get_class_name_factory_default("PuckPreview", styles_module_default17);
 var useBubbleIframeEvents = (ref) => {
   const status = useAppStore((s) => s.status);
   useEffect20(() => {
@@ -6576,19 +6631,22 @@ var Preview2 = ({ id = "puck-preview" }) => {
   const Page = useCallback13(
     (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__ */ jsx33(Fragment10, { children: propsWithSlots.children });
+      }, propsWithSlots)) : /* @__PURE__ */ jsx32(Fragment9, { children: propsWithSlots.children });
     },
-    [config.root]
+    [config]
   );
   const Frame = useMemo15(() => overrides.iframe, [overrides]);
   const rootProps = root.props || root;
-  const ref = useRef5(null);
+  const ref = useRef6(null);
   useBubbleIframeEvents(ref);
-  const inner = !renderData ? /* @__PURE__ */ jsx33(
+  const inner = !renderData ? /* @__PURE__ */ jsx32(
     Page,
     __spreadProps(__spreadValues({}, rootProps), {
       puck: {
@@ -6598,28 +6656,28 @@ var Preview2 = ({ id = "puck-preview" }) => {
         metadata
       },
       editMode: true,
-      children: /* @__PURE__ */ jsx33(DropZonePure, { zone: rootDroppableId })
+      children: /* @__PURE__ */ jsx32(DropZonePure, { zone: rootDroppableId })
     })
-  ) : /* @__PURE__ */ jsx33(Render, { data: renderData, config });
+  ) : /* @__PURE__ */ jsx32(Render, { data: renderData, config });
   useEffect20(() => {
     if (!iframe.enabled) {
       setStatus("READY");
     }
   }, [iframe.enabled]);
-  return /* @__PURE__ */ jsx33(
+  return /* @__PURE__ */ jsx32(
     "div",
     {
-      className: getClassName23(),
+      className: getClassName22(),
       id,
       "data-puck-preview": true,
       onClick: () => {
         dispatch({ type: "setUi", ui: { itemSelector: null } });
       },
-      children: iframe.enabled ? /* @__PURE__ */ jsx33(
+      children: iframe.enabled ? /* @__PURE__ */ jsx32(
         AutoFrame_default,
         {
           id: "preview-frame",
-          className: getClassName23("frame"),
+          className: getClassName22("frame"),
           "data-rfd-iframe": true,
           onReady: () => {
             setStatus("READY");
@@ -6628,18 +6686,18 @@ var Preview2 = ({ id = "puck-preview" }) => {
             setStatus("MOUNTED");
           },
           frameRef: ref,
-          children: /* @__PURE__ */ jsx33(autoFrameContext.Consumer, { children: ({ document: document2 }) => {
+          children: /* @__PURE__ */ jsx32(autoFrameContext.Consumer, { children: ({ document: document2 }) => {
             if (Frame) {
-              return /* @__PURE__ */ jsx33(Frame, { document: document2, children: inner });
+              return /* @__PURE__ */ jsx32(Frame, { document: document2, children: inner });
             }
             return inner;
           } })
         }
-      ) : /* @__PURE__ */ jsx33(
+      ) : /* @__PURE__ */ jsx32(
         "div",
         {
           id: "preview-frame",
-          className: getClassName23("frame"),
+          className: getClassName22("frame"),
           ref,
           "data-puck-entry": true,
           children: inner
@@ -6657,7 +6715,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();
@@ -6693,10 +6751,10 @@ var onScrollEnd = (frame, cb) => {
 };
 
 // components/LayerTree/index.tsx
-import { useShallow as useShallow5 } from "zustand/react/shallow";
-import { Fragment as Fragment11, jsx as jsx34, jsxs as jsxs16 } from "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);
+import { useShallow as useShallow6 } from "zustand/react/shallow";
+import { Fragment as Fragment10, jsx as jsx33, jsxs as jsxs15 } from "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,
@@ -6720,7 +6778,7 @@ var Layer = ({
   const isSelected = selecedItemId === itemId || itemSelector && itemSelector.zone === rootDroppableId && !zoneCompound;
   const nodeData = useAppStore((s) => s.state.indexes.nodes[itemId]);
   const zonesForItem = useAppStore(
-    useShallow5(
+    useShallow6(
       (s) => Object.keys(s.state.indexes.zones).filter(
         (z) => z.split(":")[0] === itemId
       )
@@ -6742,7 +6800,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__ */ jsxs16(
+  return /* @__PURE__ */ jsxs15(
     "li",
     {
       className: getClassNameLayer({
@@ -6752,7 +6810,7 @@ var Layer = ({
         childIsSelected
       }),
       children: [
-        /* @__PURE__ */ jsx34("div", { className: getClassNameLayer("inner"), children: /* @__PURE__ */ jsxs16(
+        /* @__PURE__ */ jsx33("div", { className: getClassNameLayer("inner"), children: /* @__PURE__ */ jsxs15(
           "button",
           {
             type: "button",
@@ -6767,7 +6825,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);
@@ -6787,22 +6848,22 @@ var Layer = ({
               zoneStore.setState({ hoveringComponent: null });
             },
             children: [
-              containsZone && /* @__PURE__ */ jsx34(
+              containsZone && /* @__PURE__ */ jsx33(
                 "div",
                 {
                   className: getClassNameLayer("chevron"),
                   title: isSelected ? "Collapse" : "Expand",
-                  children: /* @__PURE__ */ jsx34(ChevronDown, { size: "12" })
+                  children: /* @__PURE__ */ jsx33(ChevronDown, { size: "12" })
                 }
               ),
-              /* @__PURE__ */ jsxs16("div", { className: getClassNameLayer("title"), children: [
-                /* @__PURE__ */ jsx34("div", { className: getClassNameLayer("icon"), children: nodeData.data.type === "Text" || nodeData.data.type === "Heading" ? /* @__PURE__ */ jsx34(Type, { size: "16" }) : /* @__PURE__ */ jsx34(LayoutGrid, { size: "16" }) }),
-                /* @__PURE__ */ jsx34("div", { className: getClassNameLayer("name"), children: label })
+              /* @__PURE__ */ jsxs15("div", { className: getClassNameLayer("title"), children: [
+                /* @__PURE__ */ jsx33("div", { className: getClassNameLayer("icon"), children: nodeData.data.type === "Text" || nodeData.data.type === "Heading" ? /* @__PURE__ */ jsx33(Type, { size: "16" }) : /* @__PURE__ */ jsx33(LayoutGrid, { size: "16" }) }),
+                /* @__PURE__ */ jsx33("div", { className: getClassNameLayer("name"), children: label })
               ] })
             ]
           }
         ) }),
-        containsZone && zonesForItem.map((subzone) => /* @__PURE__ */ jsx34("div", { className: getClassNameLayer("zones"), children: /* @__PURE__ */ jsx34(LayerTree, { zoneCompound: subzone }) }, subzone))
+        containsZone && zonesForItem.map((subzone) => /* @__PURE__ */ jsx33("div", { className: getClassNameLayer("zones"), children: /* @__PURE__ */ jsx33(LayerTree, { zoneCompound: subzone }) }, subzone))
       ]
     }
   );
@@ -6813,22 +6874,22 @@ var LayerTree = ({
 }) => {
   const label = _label != null ? _label : zoneCompound.split(":")[1];
   const contentIds = useAppStore(
-    useShallow5(
+    useShallow6(
       (s) => {
         var _a, _b;
         return zoneCompound ? (_b = (_a = s.state.indexes.zones[zoneCompound]) == null ? void 0 : _a.contentIds) != null ? _b : [] : [];
       }
     )
   );
-  return /* @__PURE__ */ jsxs16(Fragment11, { children: [
-    label && /* @__PURE__ */ jsxs16("div", { className: getClassName24("zoneTitle"), children: [
-      /* @__PURE__ */ jsx34("div", { className: getClassName24("zoneIcon"), children: /* @__PURE__ */ jsx34(Layers, { size: "16" }) }),
+  return /* @__PURE__ */ jsxs15(Fragment10, { children: [
+    label && /* @__PURE__ */ jsxs15("div", { className: getClassName23("zoneTitle"), children: [
+      /* @__PURE__ */ jsx33("div", { className: getClassName23("zoneIcon"), children: /* @__PURE__ */ jsx33(Layers, { size: "16" }) }),
       label
     ] }),
-    /* @__PURE__ */ jsxs16("ul", { className: getClassName24(), children: [
-      contentIds.length === 0 && /* @__PURE__ */ jsx34("div", { className: getClassName24("helper"), children: "No items" }),
+    /* @__PURE__ */ jsxs15("ul", { className: getClassName23(), children: [
+      contentIds.length === 0 && /* @__PURE__ */ jsx33("div", { className: getClassName23("helper"), children: "No items" }),
       contentIds.map((itemId, i) => {
-        return /* @__PURE__ */ jsx34(
+        return /* @__PURE__ */ jsx33(
           Layer,
           {
             index: i,
@@ -6854,15 +6915,15 @@ var findZonesForArea = (state, area) => {
 };
 
 // components/Puck/components/Outline/index.tsx
-import { useShallow as useShallow6 } from "zustand/react/shallow";
-import { jsx as jsx35 } from "react/jsx-runtime";
+import { useShallow as useShallow7 } from "zustand/react/shallow";
+import { jsx as jsx34 } from "react/jsx-runtime";
 var Outline = () => {
   const outlineOverride = useAppStore((s) => s.overrides.outline);
   const rootZones = useAppStore(
-    useShallow6((s) => findZonesForArea(s.state, "root"))
+    useShallow7((s) => findZonesForArea(s.state, "root"))
   );
   const Wrapper = useMemo16(() => outlineOverride || "div", [outlineOverride]);
-  return /* @__PURE__ */ jsx35(Wrapper, { children: rootZones.map((zoneCompound) => /* @__PURE__ */ jsx35(
+  return /* @__PURE__ */ jsx34(Wrapper, { children: rootZones.map((zoneCompound) => /* @__PURE__ */ jsx34(
     LayerTree,
     {
       label: rootZones.length === 1 ? "" : zoneCompound.split(":")[1],
@@ -6999,7 +7060,7 @@ import {
   useCallback as useCallback15,
   useEffect as useEffect22,
   useMemo as useMemo18,
-  useRef as useRef6,
+  useRef as useRef7,
   useState as useState19
 } from "react";
 
@@ -7009,17 +7070,17 @@ import { useEffect as useEffect21, useMemo as useMemo17, useState as useState18
 
 // 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
-import { jsx as jsx36, jsxs as jsxs17 } from "react/jsx-runtime";
+import { jsx as jsx35, jsxs as jsxs16 } from "react/jsx-runtime";
 var icons = {
-  Smartphone: /* @__PURE__ */ jsx36(Smartphone, { size: 16 }),
-  Tablet: /* @__PURE__ */ jsx36(Tablet, { size: 16 }),
-  Monitor: /* @__PURE__ */ jsx36(Monitor, { size: 16 })
+  Smartphone: /* @__PURE__ */ jsx35(Smartphone, { size: 16 }),
+  Tablet: /* @__PURE__ */ jsx35(Tablet, { size: 16 }),
+  Monitor: /* @__PURE__ */ jsx35(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",
@@ -7032,7 +7093,7 @@ var ViewportButton = ({
   useEffect21(() => {
     setIsActive(width === viewports.current.width);
   }, [width, viewports.current.width]);
-  return /* @__PURE__ */ jsx36("span", { className: getClassNameButton({ isActive }), children: /* @__PURE__ */ jsx36(
+  return /* @__PURE__ */ jsx35("span", { className: getClassNameButton({ isActive }), children: /* @__PURE__ */ jsx35(
     IconButton,
     {
       title,
@@ -7041,7 +7102,7 @@ var ViewportButton = ({
         e.stopPropagation();
         onClick({ width, height });
       },
-      children: /* @__PURE__ */ jsx36("span", { className: getClassNameButton("inner"), children })
+      children: /* @__PURE__ */ jsx35("span", { className: getClassNameButton("inner"), children })
     }
   ) });
 };
@@ -7077,8 +7138,8 @@ var ViewportControls = ({
     ].filter((a) => a.value <= autoZoom).sort((a, b) => a.value > b.value ? 1 : -1),
     [autoZoom]
   );
-  return /* @__PURE__ */ jsxs17("div", { className: getClassName25(), children: [
-    viewports.map((viewport, i) => /* @__PURE__ */ jsx36(
+  return /* @__PURE__ */ jsxs16("div", { className: getClassName24(), children: [
+    viewports.map((viewport, i) => /* @__PURE__ */ jsx35(
       ViewportButton,
       {
         height: viewport.height,
@@ -7089,8 +7150,8 @@ var ViewportControls = ({
       },
       i
     )),
-    /* @__PURE__ */ jsx36("div", { className: getClassName25("divider") }),
-    /* @__PURE__ */ jsx36(
+    /* @__PURE__ */ jsx35("div", { className: getClassName24("divider") }),
+    /* @__PURE__ */ jsx35(
       IconButton,
       {
         title: "Zoom viewport out",
@@ -7104,10 +7165,10 @@ var ViewportControls = ({
             )].value
           );
         },
-        children: /* @__PURE__ */ jsx36(ZoomOut, { size: 16 })
+        children: /* @__PURE__ */ jsx35(ZoomOut, { size: 16 })
       }
     ),
-    /* @__PURE__ */ jsx36(
+    /* @__PURE__ */ jsx35(
       IconButton,
       {
         title: "Zoom viewport in",
@@ -7121,19 +7182,19 @@ var ViewportControls = ({
             )].value
           );
         },
-        children: /* @__PURE__ */ jsx36(ZoomIn, { size: 16 })
+        children: /* @__PURE__ */ jsx35(ZoomIn, { size: 16 })
       }
     ),
-    /* @__PURE__ */ jsx36("div", { className: getClassName25("divider") }),
-    /* @__PURE__ */ jsx36(
+    /* @__PURE__ */ jsx35("div", { className: getClassName24("divider") }),
+    /* @__PURE__ */ jsx35(
       "select",
       {
-        className: getClassName25("zoomSelect"),
+        className: getClassName24("zoomSelect"),
         value: zoom.toString(),
         onChange: (e) => {
           onZoom(parseFloat(e.currentTarget.value));
         },
-        children: zoomOptions.map((option) => /* @__PURE__ */ jsx36(
+        children: zoomOptions.map((option) => /* @__PURE__ */ jsx35(
           "option",
           {
             value: option.value,
@@ -7148,7 +7209,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();
@@ -7181,9 +7242,9 @@ var getZoomConfig = (uiViewport, frame, zoom) => {
 };
 
 // components/Puck/components/Canvas/index.tsx
-import { useShallow as useShallow7 } from "zustand/react/shallow";
-import { Fragment as Fragment12, jsx as jsx37, jsxs as jsxs18 } from "react/jsx-runtime";
-var getClassName26 = get_class_name_factory_default("PuckCanvas", styles_module_default21);
+import { useShallow as useShallow8 } from "zustand/react/shallow";
+import { Fragment as Fragment11, jsx as jsx36, jsxs as jsxs17 } from "react/jsx-runtime";
+var getClassName25 = get_class_name_factory_default("PuckCanvas", styles_module_default20);
 var ZOOM_ON_CHANGE = true;
 var Canvas = () => {
   const {
@@ -7195,7 +7256,7 @@ var Canvas = () => {
     status,
     iframe
   } = useAppStore(
-    useShallow7((s) => ({
+    useShallow8((s) => ({
       dispatch: s.dispatch,
       overrides: s.overrides,
       setUi: s.setUi,
@@ -7206,16 +7267,16 @@ var Canvas = () => {
     }))
   );
   const { leftSideBarVisible, rightSideBarVisible, viewports } = useAppStore(
-    useShallow7((s) => ({
+    useShallow8((s) => ({
       leftSideBarVisible: s.state.ui.leftSideBarVisible,
       rightSideBarVisible: s.state.ui.rightSideBarVisible,
       viewports: s.state.ui.viewports
     }))
   );
-  const frameRef = useRef6(null);
+  const frameRef = useRef7(null);
   const [showTransition, setShowTransition] = useState19(false);
   const defaultRender = useMemo18(() => {
-    const PuckDefault = ({ children }) => /* @__PURE__ */ jsx37(Fragment12, { children });
+    const PuckDefault = ({ children }) => /* @__PURE__ */ jsx36(Fragment11, { children });
     return PuckDefault;
   }, []);
   const CustomPreview = useMemo18(
@@ -7278,10 +7339,10 @@ var Canvas = () => {
       setShowLoader(true);
     }, 500);
   }, []);
-  return /* @__PURE__ */ jsxs18(
+  return /* @__PURE__ */ jsxs17(
     "div",
     {
-      className: getClassName26({
+      className: getClassName25({
         ready: status === "READY" || !iframe.enabled || !iframe.waitForStyles,
         showLoader
       }),
@@ -7291,7 +7352,7 @@ var Canvas = () => {
         recordHistory: true
       }),
       children: [
-        viewports.controlsVisible && iframe.enabled && /* @__PURE__ */ jsx37("div", { className: getClassName26("controls"), children: /* @__PURE__ */ jsx37(
+        viewports.controlsVisible && iframe.enabled && /* @__PURE__ */ jsx36("div", { className: getClassName25("controls"), children: /* @__PURE__ */ jsx36(
           ViewportControls,
           {
             autoZoom: zoomConfig.autoZoom,
@@ -7317,11 +7378,11 @@ var Canvas = () => {
             }
           }
         ) }),
-        /* @__PURE__ */ jsxs18("div", { className: getClassName26("inner"), ref: frameRef, children: [
-          /* @__PURE__ */ jsx37(
+        /* @__PURE__ */ jsxs17("div", { className: getClassName25("inner"), ref: frameRef, children: [
+          /* @__PURE__ */ jsx36(
             "div",
             {
-              className: getClassName26("root"),
+              className: getClassName25("root"),
               style: {
                 width: iframe.enabled ? viewports.current.width : "100%",
                 height: zoomConfig.rootHeight,
@@ -7339,10 +7400,10 @@ var Canvas = () => {
                   })
                 );
               },
-              children: /* @__PURE__ */ jsx37(CustomPreview, { children: /* @__PURE__ */ jsx37(Preview2, {}) })
+              children: /* @__PURE__ */ jsx36(CustomPreview, { children: /* @__PURE__ */ jsx36(Preview2, {}) })
             }
           ),
-          /* @__PURE__ */ jsx37("div", { className: getClassName26("loader"), children: /* @__PURE__ */ jsx37(Loader, { size: 24 }) })
+          /* @__PURE__ */ jsx36("div", { className: getClassName25("loader"), children: /* @__PURE__ */ jsx36(Loader, { size: 24 }) })
         ] })
       ]
     }
@@ -7397,8 +7458,8 @@ var useLoadedOverrides = ({
 
 // components/DefaultOverride/index.tsx
 init_react_import();
-import { Fragment as Fragment13, jsx as jsx38 } from "react/jsx-runtime";
-var DefaultOverride = ({ children }) => /* @__PURE__ */ jsx38(Fragment13, { children });
+import { Fragment as Fragment12, jsx as jsx37 } from "react/jsx-runtime";
+var DefaultOverride = ({ children }) => /* @__PURE__ */ jsx37(Fragment12, { children });
 
 // lib/use-inject-css.ts
 init_react_import();
@@ -7541,9 +7602,224 @@ function useGetPuck() {
 
 // components/Puck/index.tsx
 import fdeq from "fast-deep-equal";
+
+// components/Puck/components/Header/index.tsx
+init_react_import();
+import { memo as memo3, useCallback as useCallback17, useMemo as useMemo20, useState as useState22 } from "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
+import { Fragment as Fragment13, jsx as jsx38, jsxs as jsxs18 } from "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__ */ jsx38(
+    "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__ */ jsxs18("div", { className: getClassName26("inner"), children: [
+        /* @__PURE__ */ jsxs18("div", { className: getClassName26("history"), children: [
+          /* @__PURE__ */ jsx38(IconButton, { title: "undo", disabled: !hasPast, onClick: back, children: /* @__PURE__ */ jsx38(Undo2, { size: 21 }) }),
+          /* @__PURE__ */ jsx38(IconButton, { title: "redo", disabled: !hasFuture, onClick: forward, children: /* @__PURE__ */ jsx38(Redo2, { size: 21 }) })
+        ] }),
+        /* @__PURE__ */ jsx38(Fragment13, { 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
 import { Fragment as Fragment14, jsx as jsx39, jsxs as jsxs19 } from "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 = useMemo20(() => {
+    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__ */ jsx39(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState, children: actions }));
+      };
+      return RenderHeader;
+    }
+    return DefaultOverride;
+  }, [renderHeader]);
+  const defaultHeaderActionsRender = useMemo20(() => {
+    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__ */ jsx39(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] = useState22(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 = useCallback17(
+    (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__ */ jsx39(
+    CustomHeader,
+    {
+      actions: /* @__PURE__ */ jsx39(Fragment14, { children: /* @__PURE__ */ jsx39(CustomHeaderActions, { children: /* @__PURE__ */ jsx39(
+        Button,
+        {
+          onClick: () => {
+            const data = appStore.getState().state.data;
+            onPublish && onPublish(data);
+          },
+          icon: /* @__PURE__ */ jsx39(Globe, { size: "14px" }),
+          children: "Publish"
+        }
+      ) }) }),
+      children: /* @__PURE__ */ jsx39(
+        "header",
+        {
+          className: getClassName27({ leftSideBarVisible, rightSideBarVisible }),
+          children: /* @__PURE__ */ jsxs19("div", { className: getClassName27("inner"), children: [
+            /* @__PURE__ */ jsxs19("div", { className: getClassName27("toggle"), children: [
+              /* @__PURE__ */ jsx39("div", { className: getClassName27("leftSideBarToggle"), children: /* @__PURE__ */ jsx39(
+                IconButton,
+                {
+                  onClick: () => {
+                    toggleSidebars("left");
+                  },
+                  title: "Toggle left sidebar",
+                  children: /* @__PURE__ */ jsx39(PanelLeft, { focusable: "false" })
+                }
+              ) }),
+              /* @__PURE__ */ jsx39("div", { className: getClassName27("rightSideBarToggle"), children: /* @__PURE__ */ jsx39(
+                IconButton,
+                {
+                  onClick: () => {
+                    toggleSidebars("right");
+                  },
+                  title: "Toggle right sidebar",
+                  children: /* @__PURE__ */ jsx39(PanelRight, { focusable: "false" })
+                }
+              ) })
+            ] }),
+            /* @__PURE__ */ jsx39("div", { className: getClassName27("title"), children: /* @__PURE__ */ jsxs19(Heading, { rank: "2", size: "xs", children: [
+              headerTitle || rootTitle || "Page",
+              headerPath && /* @__PURE__ */ jsxs19(Fragment14, { children: [
+                " ",
+                /* @__PURE__ */ jsx39("code", { className: getClassName27("path"), children: headerPath })
+              ] })
+            ] }) }),
+            /* @__PURE__ */ jsxs19("div", { className: getClassName27("tools"), children: [
+              /* @__PURE__ */ jsx39("div", { className: getClassName27("menuButton"), children: /* @__PURE__ */ jsx39(
+                IconButton,
+                {
+                  onClick: () => {
+                    return setMenuOpen(!menuOpen);
+                  },
+                  title: "Toggle menu bar",
+                  children: menuOpen ? /* @__PURE__ */ jsx39(ChevronUp, { focusable: "false" }) : /* @__PURE__ */ jsx39(ChevronDown, { focusable: "false" })
+                }
+              ) }),
+              /* @__PURE__ */ jsx39(
+                MenuBar,
+                {
+                  dispatch,
+                  onPublish,
+                  menuOpen,
+                  renderHeaderActions: () => /* @__PURE__ */ jsx39(CustomHeaderActions, { children: /* @__PURE__ */ jsx39(
+                    Button,
+                    {
+                      onClick: () => {
+                        const data = appStore.getState().state.data;
+                        onPublish && onPublish(data);
+                      },
+                      icon: /* @__PURE__ */ jsx39(Globe, { size: "14px" }),
+                      children: "Publish"
+                    }
+                  ) }),
+                  setMenuOpen
+                }
+              )
+            ] })
+          ] })
+        }
+      )
+    }
+  );
+};
+var Header = memo3(HeaderInner);
+
+// components/Puck/index.tsx
+import { jsx as jsx40, jsxs as jsxs20 } from "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) => {
@@ -7551,11 +7827,11 @@ 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__ */ jsx39(SidebarSection, { noPadding: true, noBorderTop: true, showBreadcrumbs: true, title, children: /* @__PURE__ */ jsx39(Fields, {}) });
+  return /* @__PURE__ */ jsx40(SidebarSection, { noPadding: true, noBorderTop: true, showBreadcrumbs: true, title, children: /* @__PURE__ */ jsx40(Fields, {}) });
 };
 var propsContext = createContext7({});
 function PropsProvider(props) {
-  return /* @__PURE__ */ jsx39(propsContext.Provider, { value: props, children: props.children });
+  return /* @__PURE__ */ jsx40(propsContext.Provider, { value: props, children: props.children });
 }
 var usePropsContext = () => useContext12(propsContext);
 function PuckProvider({ children }) {
@@ -7573,11 +7849,14 @@ function PuckProvider({ children }) {
     metadata,
     onAction
   } = usePropsContext();
-  const iframe = __spreadValues({
-    enabled: true,
-    waitForStyles: true
-  }, _iframe);
-  const [generatedAppState] = useState22(() => {
+  const iframe = useMemo21(
+    () => __spreadValues({
+      enabled: true,
+      waitForStyles: true
+    }, _iframe),
+    [_iframe]
+  );
+  const [generatedAppState] = useState23(() => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const initial = __spreadValues(__spreadValues({}, defaultAppState.ui), initialUi);
     let clientUiState = {};
@@ -7637,7 +7916,7 @@ function PuckProvider({ children }) {
     return walkAppState(newAppState, config);
   });
   const { appendData = true } = _initialHistory || {};
-  const [blendedHistories] = useState22(
+  const [blendedHistories] = useState23(
     [
       ...(_initialHistory == null ? void 0 : _initialHistory.histories) || [],
       ...appendData ? [{ state: generatedAppState }] : []
@@ -7657,7 +7936,7 @@ function PuckProvider({ children }) {
     overrides,
     plugins
   });
-  const generateAppStore = useCallback17(
+  const generateAppStore = useCallback18(
     (state) => {
       return {
         state,
@@ -7681,9 +7960,14 @@ function PuckProvider({ children }) {
       metadata
     ]
   );
-  const [appStore] = useState22(
+  const [appStore] = useState23(
     () => createAppStore(generateAppStore(initialAppState))
   );
+  useEffect25(() => {
+    if (process.env.NODE_ENV !== "production") {
+      window.__PUCK_INTERNAL_DO_NOT_USE = { appStore };
+    }
+  }, [appStore]);
   useEffect25(() => {
     const state = appStore.getState().state;
     appStore.setState(__spreadValues({}, generateAppStore(state)));
@@ -7693,7 +7977,7 @@ function PuckProvider({ children }) {
     index: initialHistoryIndex,
     initialAppState
   });
-  const previousData = useRef7(null);
+  const previousData = useRef8(null);
   useEffect25(() => {
     appStore.subscribe(
       (s) => s.state.data,
@@ -7712,48 +7996,27 @@ function PuckProvider({ children }) {
     const { resolveAndCommitData } = appStore.getState();
     resolveAndCommitData();
   }, []);
-  return /* @__PURE__ */ jsx39(appStoreContext.Provider, { value: appStore, children: /* @__PURE__ */ jsx39(UsePuckStoreContext.Provider, { value: uPuckStore, children }) });
+  return /* @__PURE__ */ jsx40(appStoreContext.Provider, { value: appStore, children: /* @__PURE__ */ jsx40(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 = useMemo21(
+    () => __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] = useState22(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 = useCallback17(
-    (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]
-  );
   useEffect25(() => {
     if (!window.matchMedia("(min-width: 638px)").matches) {
       dispatch({
@@ -7777,49 +8040,12 @@ function PuckLayout({ children }) {
       window.removeEventListener("resize", handleResize);
     };
   }, []);
-  const defaultHeaderRender = useMemo20(() => {
-    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__ */ jsx39(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState, children: actions }));
-      };
-      return RenderHeader;
-    }
-    return DefaultOverride;
-  }, [renderHeader]);
-  const defaultHeaderActionsRender = useMemo20(() => {
-    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__ */ jsx39(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState }));
-      };
-      return RenderHeader;
-    }
-    return DefaultOverride;
-  }, [renderHeader]);
   const overrides = useAppStore((s) => s.overrides);
-  const CustomPuck = useMemo20(
+  const CustomPuck = useMemo21(
     () => overrides.puck || DefaultOverride,
     [overrides]
   );
-  const CustomHeader = useMemo20(
-    () => overrides.header || defaultHeaderRender,
-    [overrides]
-  );
-  const CustomHeaderActions = useMemo20(
-    () => overrides.headerActions || defaultHeaderActionsRender,
-    [overrides]
-  );
-  const [mounted, setMounted] = useState22(false);
+  const [mounted, setMounted] = useState23(false);
   useEffect25(() => {
     setMounted(true);
   }, []);
@@ -7834,128 +8060,31 @@ function PuckLayout({ children }) {
     }
   }, [ready, iframe.enabled]);
   usePreviewModeHotkeys();
-  return /* @__PURE__ */ jsxs19("div", { className: `Puck ${getClassName27()}`, children: [
-    /* @__PURE__ */ jsx39(DragDropContext, { disableAutoScroll: dnd == null ? void 0 : dnd.disableAutoScroll, children: /* @__PURE__ */ jsx39(CustomPuck, { children: children || /* @__PURE__ */ jsx39(
+  return /* @__PURE__ */ jsxs20("div", { className: `Puck ${getClassName28()}`, children: [
+    /* @__PURE__ */ jsx40(DragDropContext, { disableAutoScroll: dnd == null ? void 0 : dnd.disableAutoScroll, children: /* @__PURE__ */ jsx40(CustomPuck, { children: children || /* @__PURE__ */ jsx40(
       "div",
       {
         className: getLayoutClassName({
           leftSideBarVisible,
-          menuOpen,
           mounted,
           rightSideBarVisible
         }),
-        children: /* @__PURE__ */ jsxs19("div", { className: getLayoutClassName("inner"), children: [
-          /* @__PURE__ */ jsx39(
-            CustomHeader,
-            {
-              actions: /* @__PURE__ */ jsx39(Fragment14, { children: /* @__PURE__ */ jsx39(CustomHeaderActions, { children: /* @__PURE__ */ jsx39(
-                Button,
-                {
-                  onClick: () => {
-                    const data = appStore.getState().state.data;
-                    onPublish && onPublish(data);
-                  },
-                  icon: /* @__PURE__ */ jsx39(Globe, { size: "14px" }),
-                  children: "Publish"
-                }
-              ) }) }),
-              children: /* @__PURE__ */ jsx39("header", { className: getLayoutClassName("header"), children: /* @__PURE__ */ jsxs19("div", { className: getLayoutClassName("headerInner"), children: [
-                /* @__PURE__ */ jsxs19("div", { className: getLayoutClassName("headerToggle"), children: [
-                  /* @__PURE__ */ jsx39(
-                    "div",
-                    {
-                      className: getLayoutClassName("leftSideBarToggle"),
-                      children: /* @__PURE__ */ jsx39(
-                        IconButton,
-                        {
-                          onClick: () => {
-                            toggleSidebars("left");
-                          },
-                          title: "Toggle left sidebar",
-                          children: /* @__PURE__ */ jsx39(PanelLeft, { focusable: "false" })
-                        }
-                      )
-                    }
-                  ),
-                  /* @__PURE__ */ jsx39(
-                    "div",
-                    {
-                      className: getLayoutClassName("rightSideBarToggle"),
-                      children: /* @__PURE__ */ jsx39(
-                        IconButton,
-                        {
-                          onClick: () => {
-                            toggleSidebars("right");
-                          },
-                          title: "Toggle right sidebar",
-                          children: /* @__PURE__ */ jsx39(PanelRight, { focusable: "false" })
-                        }
-                      )
-                    }
-                  )
-                ] }),
-                /* @__PURE__ */ jsx39("div", { className: getLayoutClassName("headerTitle"), children: /* @__PURE__ */ jsxs19(Heading, { rank: "2", size: "xs", children: [
-                  headerTitle || (rootProps == null ? void 0 : rootProps.title) || "Page",
-                  headerPath && /* @__PURE__ */ jsxs19(Fragment14, { children: [
-                    " ",
-                    /* @__PURE__ */ jsx39(
-                      "code",
-                      {
-                        className: getLayoutClassName("headerPath"),
-                        children: headerPath
-                      }
-                    )
-                  ] })
-                ] }) }),
-                /* @__PURE__ */ jsxs19("div", { className: getLayoutClassName("headerTools"), children: [
-                  /* @__PURE__ */ jsx39("div", { className: getLayoutClassName("menuButton"), children: /* @__PURE__ */ jsx39(
-                    IconButton,
-                    {
-                      onClick: () => {
-                        return setMenuOpen(!menuOpen);
-                      },
-                      title: "Toggle menu bar",
-                      children: menuOpen ? /* @__PURE__ */ jsx39(ChevronUp, { focusable: "false" }) : /* @__PURE__ */ jsx39(ChevronDown, { focusable: "false" })
-                    }
-                  ) }),
-                  /* @__PURE__ */ jsx39(
-                    MenuBar,
-                    {
-                      dispatch,
-                      onPublish,
-                      menuOpen,
-                      renderHeaderActions: () => /* @__PURE__ */ jsx39(CustomHeaderActions, { children: /* @__PURE__ */ jsx39(
-                        Button,
-                        {
-                          onClick: () => {
-                            const data = appStore.getState().state.data;
-                            onPublish && onPublish(data);
-                          },
-                          icon: /* @__PURE__ */ jsx39(Globe, { size: "14px" }),
-                          children: "Publish"
-                        }
-                      ) }),
-                      setMenuOpen
-                    }
-                  )
-                ] })
-              ] }) })
-            }
-          ),
-          /* @__PURE__ */ jsxs19("div", { className: getLayoutClassName("leftSideBar"), children: [
-            /* @__PURE__ */ jsx39(SidebarSection, { title: "Components", noBorderTop: true, children: /* @__PURE__ */ jsx39(Components, {}) }),
-            /* @__PURE__ */ jsx39(SidebarSection, { title: "Outline", children: /* @__PURE__ */ jsx39(Outline, {}) })
+        children: /* @__PURE__ */ jsxs20("div", { className: getLayoutClassName("inner"), children: [
+          /* @__PURE__ */ jsx40(Header, {}),
+          /* @__PURE__ */ jsxs20("div", { className: getLayoutClassName("leftSideBar"), children: [
+            /* @__PURE__ */ jsx40(SidebarSection, { title: "Components", noBorderTop: true, children: /* @__PURE__ */ jsx40(Components, {}) }),
+            /* @__PURE__ */ jsx40(SidebarSection, { title: "Outline", children: /* @__PURE__ */ jsx40(Outline, {}) })
           ] }),
-          /* @__PURE__ */ jsx39(Canvas, {}),
-          /* @__PURE__ */ jsx39("div", { className: getLayoutClassName("rightSideBar"), children: /* @__PURE__ */ jsx39(FieldSideBar, {}) })
+          /* @__PURE__ */ jsx40(Canvas, {}),
+          /* @__PURE__ */ jsx40("div", { className: getLayoutClassName("rightSideBar"), children: /* @__PURE__ */ jsx40(FieldSideBar, {}) })
         ] })
       }
     ) }) }),
-    /* @__PURE__ */ jsx39("div", { id: "puck-portal-root", className: getClassName27("portal") })
+    /* @__PURE__ */ jsx40("div", { id: "puck-portal-root", className: getClassName28("portal") })
   ] });
 }
 function Puck(props) {
-  return /* @__PURE__ */ jsx39(PropsProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ jsx39(PuckProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ jsx39(PuckLayout, __spreadValues({}, props)) })) }));
+  return /* @__PURE__ */ jsx40(PropsProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ jsx40(PuckProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ jsx40(PuckLayout, __spreadValues({}, props)) })) }));
 }
 Puck.Components = Components;
 Puck.Fields = Fields;