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

package/dist/index.mjs

@@ -4,17 +4,15 @@ import {
   __async,
   __commonJS,
   __objRest,
-  __privateAdd,
-  __privateGet,
-  __privateSet,
   __spreadProps,
   __spreadValues,
   __toESM,
-  createIsSlotConfig,
+  defaultAppState,
+  defaultViewports,
+  expandNode,
   getChanged,
   init_react_import,
-  isSlot,
-  mapSlotsSync,
+  migrate,
   resolveAllData,
   resolveComponentData,
   rootAreaId,
@@ -22,8 +20,11 @@ import {
   rootZone,
   setupZone,
   transformProps,
-  useSlots
-} from "./chunk-D6ENWNOG.mjs";
+  useSlots,
+  walkAppState,
+  walkField,
+  walkTree
+} from "./chunk-HGAPIQP5.mjs";
 
 // ../../node_modules/classnames/index.js
 var require_classnames = __commonJS({
@@ -703,198 +704,6 @@ init_react_import();
 
 // reducer/actions/set.ts
 init_react_import();
-
-// lib/data/walk-app-state.ts
-init_react_import();
-
-// lib/data/for-each-slot.ts
-init_react_import();
-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();
-
-// lib/get-zone-id.ts
-init_react_import();
-var getZoneId = (zoneCompound) => {
-  if (!zoneCompound) {
-    return [];
-  }
-  if (zoneCompound && zoneCompound.indexOf(":") > -1) {
-    return zoneCompound.split(":");
-  }
-  return [rootDroppableId, zoneCompound];
-};
-
-// lib/data/for-related-zones.ts
-function forRelatedZones(item, data, cb, path = []) {
-  Object.entries(data.zones || {}).forEach(([zoneCompound, content]) => {
-    const [parentId] = getZoneId(zoneCompound);
-    if (parentId === item.props.id) {
-      cb(path, zoneCompound, content);
-    }
-  });
-}
-
-// 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 }
-    )
-  });
-};
-
-// lib/data/walk-app-state.ts
-function walkAppState(state, config, mapContent = (content) => content, mapNodeOrSkip = (item) => item) {
-  var _a;
-  let newZones = {};
-  const newZoneIndex = {};
-  const newNodeIndex = {};
-  const processContent = (path, zoneCompound, content, zoneType, newId) => {
-    var _a2;
-    const [parentId] = zoneCompound.split(":");
-    const mappedContent = ((_a2 = mapContent(content, zoneCompound, zoneType)) != null ? _a2 : content) || [];
-    const [_2, zone] = zoneCompound.split(":");
-    const newZoneCompound = `${newId || parentId}:${zone}`;
-    const newContent2 = mappedContent.map(
-      (zoneChild, index) => processItem(zoneChild, [...path, newZoneCompound], index)
-    );
-    newZoneIndex[newZoneCompound] = {
-      contentIds: newContent2.map((item) => item.props.id),
-      type: zoneType
-    };
-    return [newZoneCompound, newContent2];
-  };
-  const processRelatedZones = (item, newId, initialPath) => {
-    forRelatedZones(
-      item,
-      state.data,
-      (relatedPath, relatedZoneCompound, relatedContent) => {
-        const [zoneCompound, newContent2] = processContent(
-          relatedPath,
-          relatedZoneCompound,
-          relatedContent,
-          "dropzone",
-          newId
-        );
-        newZones[zoneCompound] = newContent2;
-      },
-      initialPath
-    );
-  };
-  const processItem = (item, path, index) => {
-    const mappedItem = mapNodeOrSkip(item, path, index);
-    if (!mappedItem) return item;
-    const id = mappedItem.props.id;
-    const newProps = __spreadValues({}, mappedItem.props);
-    forEachSlot(
-      mappedItem,
-      (parentId2, slotId, content) => {
-        const zoneCompound = `${parentId2}:${slotId}`;
-        const [_2, newContent2] = processContent(
-          path,
-          zoneCompound,
-          content,
-          "slot",
-          parentId2
-        );
-        newProps[slotId] = newContent2;
-      },
-      false,
-      createIsSlotConfig(config)
-    );
-    processRelatedZones(item, id, path);
-    const newItem = __spreadProps(__spreadValues({}, item), { props: newProps });
-    const thisZoneCompound = path[path.length - 1];
-    const [parentId, zone] = thisZoneCompound ? thisZoneCompound.split(":") : [null, ""];
-    newNodeIndex[id] = {
-      data: newItem,
-      flatData: stripSlots(newItem),
-      path,
-      parentId,
-      zone
-    };
-    const finalData = __spreadProps(__spreadValues({}, newItem), { props: __spreadValues({}, newItem.props) });
-    if (newProps.id === "root") {
-      delete finalData["type"];
-      delete finalData.props["id"];
-    }
-    return finalData;
-  };
-  const zones = state.data.zones || {};
-  const [_, newContent] = processContent(
-    [],
-    rootDroppableId,
-    state.data.content,
-    "root"
-  );
-  const processedContent = newContent;
-  const zonesAlreadyProcessed = Object.keys(newZones);
-  Object.keys(zones || {}).forEach((zoneCompound) => {
-    const [parentId] = zoneCompound.split(":");
-    if (zonesAlreadyProcessed.includes(zoneCompound)) {
-      return;
-    }
-    const [_2, newContent2] = processContent(
-      [rootDroppableId],
-      zoneCompound,
-      zones[zoneCompound],
-      "dropzone",
-      parentId
-    );
-    newZones[zoneCompound] = newContent2;
-  }, newZones);
-  const processedRoot = processItem(
-    {
-      type: "root",
-      props: __spreadProps(__spreadValues({}, (_a = state.data.root.props) != null ? _a : state.data.root), { id: "root" })
-    },
-    [],
-    -1
-  );
-  const root = __spreadProps(__spreadValues({}, state.data.root), {
-    props: processedRoot.props
-  });
-  return __spreadProps(__spreadValues({}, state), {
-    data: {
-      root,
-      content: processedContent,
-      zones: __spreadValues(__spreadValues({}, state.data.zones), newZones)
-    },
-    indexes: {
-      nodes: __spreadValues(__spreadValues({}, state.indexes.nodes), newNodeIndex),
-      zones: __spreadValues(__spreadValues({}, state.indexes.zones), newZoneIndex)
-    }
-  });
-}
-
-// reducer/actions/set.ts
 var setAction = (state, action, appStore) => {
   if (typeof action.state === "object") {
     const newState = __spreadValues(__spreadValues({}, state), action.state);
@@ -933,15 +742,36 @@ var getIdsForParent = (zoneCompound, state) => {
   return ((node == null ? void 0 : node.path) || []).map((p) => p.split(":")[0]);
 };
 
+// lib/data/populate-ids.ts
+init_react_import();
+var populateIds = (data, config, override = false) => {
+  const id = generateId(data.type);
+  return walkTree(
+    __spreadProps(__spreadValues({}, data), {
+      props: override ? __spreadProps(__spreadValues({}, data.props), { id }) : __spreadValues({}, data.props)
+    }),
+    config,
+    (contents) => contents.map((item) => {
+      const id2 = generateId(item.type);
+      return __spreadProps(__spreadValues({}, item), {
+        props: override ? __spreadProps(__spreadValues({}, item.props), { id: id2 }) : __spreadValues({ id: id2 }, item.props)
+      });
+    })
+  );
+};
+
 // reducer/actions/insert.ts
 function insertAction(state, action, appStore) {
   const id = action.id || generateId(action.componentType);
-  const emptyComponentData = {
-    type: action.componentType,
-    props: __spreadProps(__spreadValues({}, appStore.config.components[action.componentType].defaultProps || {}), {
-      id
-    })
-  };
+  const emptyComponentData = populateIds(
+    {
+      type: action.componentType,
+      props: __spreadProps(__spreadValues({}, appStore.config.components[action.componentType].defaultProps || {}), {
+        id
+      })
+    },
+    appStore.config
+  );
   const [parentId] = action.destinationZone.split(":");
   const idsInPath = getIdsForParent(action.destinationZone, state);
   return walkAppState(
@@ -982,25 +812,26 @@ var replaceAction = (state, action, appStore) => {
       `Can't change the id during a replace action. Please us "remove" and "insert" to define a new node.`
     );
   }
+  const data = populateIds(action.data, appStore.config);
   return walkAppState(
     state,
     appStore.config,
     (content, zoneCompound) => {
       const newContent = [...content];
       if (zoneCompound === action.destinationZone) {
-        newContent[action.destinationIndex] = action.data;
+        newContent[action.destinationIndex] = data;
       }
       return newContent;
     },
     (childItem, path) => {
       const pathIds = path.map((p) => p.split(":")[0]);
-      if (childItem.props.id === action.data.props.id) {
-        return action.data;
+      if (childItem.props.id === data.props.id) {
+        return data;
       } else if (childItem.props.id === parentId) {
         return childItem;
       } else if (idsInPath.indexOf(childItem.props.id) > -1) {
         return childItem;
-      } else if (pathIds.indexOf(action.data.props.id) > -1) {
+      } else if (pathIds.indexOf(data.props.id) > -1) {
         return childItem;
       }
       return null;
@@ -1355,14 +1186,6 @@ function createReducer({
   );
 }
 
-// components/ViewportControls/default-viewports.ts
-init_react_import();
-var defaultViewports = [
-  { width: 360, height: "auto", icon: "Smartphone", label: "Small" },
-  { width: 768, height: "auto", icon: "Tablet", label: "Medium" },
-  { width: 1280, height: "auto", icon: "Monitor", label: "Large" }
-];
-
 // store/index.ts
 import { create as create2, useStore } from "zustand";
 import { subscribeWithSelector as subscribeWithSelector2 } from "zustand/middleware";
@@ -1604,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];
@@ -1794,7 +1621,8 @@ var createFieldsSlice = (_set, _get) => {
   return {
     fields: {},
     loading: false,
-    lastResolvedData: {}
+    lastResolvedData: {},
+    id: void 0
   };
 };
 var useRegisterFieldsSlice = (appStore, id) => {
@@ -1815,7 +1643,7 @@ var useRegisterFieldsSlice = (appStore, id) => {
       let lastFields = fields;
       if (reset) {
         appStore.setState((s) => ({
-          fields: __spreadProps(__spreadValues({}, s.fields), { fields: defaultFields })
+          fields: __spreadProps(__spreadValues({}, s.fields), { fields: defaultFields, id })
         }));
         lastFields = defaultFields;
       }
@@ -1843,12 +1671,13 @@ var useRegisterFieldsSlice = (appStore, id) => {
           fields: {
             fields: newFields,
             loading: false,
-            lastResolvedData: componentData
+            lastResolvedData: componentData,
+            id
           }
         });
       } else {
         appStore.setState((s) => ({
-          fields: __spreadProps(__spreadValues({}, s.fields), { fields: defaultFields })
+          fields: __spreadProps(__spreadValues({}, s.fields), { fields: defaultFields, id })
         }));
       }
     }),
@@ -1881,31 +1710,6 @@ var toRoot = (item) => {
 };
 
 // store/index.ts
-var defaultAppState = {
-  data: { content: [], root: {}, zones: {} },
-  ui: {
-    leftSideBarVisible: true,
-    rightSideBarVisible: true,
-    arrayState: {},
-    itemSelector: null,
-    componentList: {},
-    isDragging: false,
-    previewMode: "edit",
-    viewports: {
-      current: {
-        width: defaultViewports[0].width,
-        height: defaultViewports[0].height || "auto"
-      },
-      options: [],
-      controlsVisible: true
-    },
-    field: { focus: null }
-  },
-  indexes: {
-    nodes: {},
-    zones: {}
-  }
-};
 var defaultPageFields = {
   title: { type: "text" }
 };
@@ -2094,326 +1898,11 @@ function useAppStoreApi() {
 init_react_import();
 import { DragDropProvider } from "@dnd-kit/react";
 
-// lib/dnd/dnd-kit/safe.ts
-init_react_import();
-import {
-  useDraggable,
-  useDroppable
-} from "@dnd-kit/react";
-import { useSortable } from "@dnd-kit/react/sortable";
-function useDroppableSafe(input) {
-  if (typeof window === "undefined") {
-    return { ref: () => {
-    } };
-  }
-  return useDroppable(input);
-}
-function useDraggableSafe(input) {
-  if (typeof window === "undefined") {
-    return { ref: () => {
-    } };
-  }
-  return useDraggable(input);
-}
-function useSortableSafe(input) {
-  if (typeof window === "undefined") {
-    return { ref: () => {
-    }, status: "idle", handleRef: () => {
-    } };
-  }
-  return useSortable(input);
-}
-
 // lib/dnd/use-sensors.ts
 init_react_import();
 import { useState as useState2 } from "react";
-
-// lib/dnd/PointerSensor.ts
-init_react_import();
-import { batch, effect } from "@dnd-kit/state";
-import { Sensor, configurator } from "@dnd-kit/abstract";
-import {
-  exceedsDistance
-} from "@dnd-kit/geometry";
-import {
-  getDocument,
-  isElement,
-  isHTMLElement,
-  isPointerEvent,
-  Listeners,
-  getFrameTransform
-} from "@dnd-kit/dom/utilities";
-var _clearTimeout;
-var _PointerSensor = class _PointerSensor extends Sensor {
-  constructor(manager, options) {
-    super(manager);
-    this.manager = manager;
-    this.options = options;
-    this.listeners = new Listeners();
-    this.cleanup = /* @__PURE__ */ new Set();
-    this.source = void 0;
-    this.started = false;
-    __privateAdd(this, _clearTimeout);
-    this.handleCancel = this.handleCancel.bind(this);
-    this.handlePointerUp = this.handlePointerUp.bind(this);
-    this.handleKeyDown = this.handleKeyDown.bind(this);
-    effect(() => {
-      const unbindGlobal = this.bindGlobal(options != null ? options : {});
-      return () => {
-        unbindGlobal();
-      };
-    });
-  }
-  bind(source, options = this.options) {
-    const unbind = effect(() => {
-      var _a;
-      const target = (_a = source.handle) != null ? _a : source.element;
-      const listener = (event) => {
-        if (isPointerEvent(event)) {
-          this.handlePointerDown(event, source, options);
-        }
-      };
-      if (target) {
-        patchWindow(target.ownerDocument.defaultView);
-        target.addEventListener("pointerdown", listener);
-        return () => {
-          target.removeEventListener("pointerdown", listener);
-        };
-      }
-    });
-    return unbind;
-  }
-  bindGlobal(options) {
-    const documents = /* @__PURE__ */ new Set();
-    for (const draggable of this.manager.registry.draggables.value) {
-      if (draggable.element) {
-        documents.add(getDocument(draggable.element));
-      }
-    }
-    for (const droppable of this.manager.registry.droppables.value) {
-      if (droppable.element) {
-        documents.add(getDocument(droppable.element));
-      }
-    }
-    const unbindFns = Array.from(documents).map(
-      (doc) => this.listeners.bind(doc, [
-        {
-          type: "pointermove",
-          listener: (event) => this.handlePointerMove(event, doc, options)
-        },
-        {
-          type: "pointerup",
-          listener: this.handlePointerUp,
-          options: {
-            capture: true
-          }
-        },
-        {
-          // Cancel activation if there is a competing Drag and Drop interaction
-          type: "dragstart",
-          listener: this.handleDragStart
-        }
-      ])
-    );
-    return () => {
-      unbindFns.forEach((unbind) => unbind());
-    };
-  }
-  handlePointerDown(event, source, options = {}) {
-    if (this.disabled || !event.isPrimary || event.button !== 0 || !isElement(event.target) || source.disabled) {
-      return;
-    }
-    const offset = getFrameTransform(source.element);
-    this.initialCoordinates = {
-      x: event.clientX * offset.scaleX + offset.x,
-      y: event.clientY * offset.scaleY + offset.y
-    };
-    this.source = source;
-    const { activationConstraints } = options;
-    const constraints = typeof activationConstraints === "function" ? activationConstraints(event, source) : activationConstraints;
-    event.stopImmediatePropagation();
-    if (!(constraints == null ? void 0 : constraints.delay) && !(constraints == null ? void 0 : constraints.distance)) {
-      this.handleStart(source, event);
-    } else {
-      const { delay } = constraints;
-      if (delay) {
-        const timeout3 = setTimeout(
-          () => this.handleStart(source, event),
-          delay.value
-        );
-        __privateSet(this, _clearTimeout, () => {
-          clearTimeout(timeout3);
-          __privateSet(this, _clearTimeout, void 0);
-        });
-      }
-    }
-    const cleanup = () => {
-      var _a;
-      (_a = __privateGet(this, _clearTimeout)) == null ? void 0 : _a.call(this);
-      this.initialCoordinates = void 0;
-      this.source = void 0;
-    };
-    this.cleanup.add(cleanup);
-  }
-  handlePointerMove(event, doc, options) {
-    if (!this.source) {
-      return;
-    }
-    const ownerDocument = this.source.element && getDocument(this.source.element);
-    if (doc !== ownerDocument) {
-      return;
-    }
-    const coordinates = {
-      x: event.clientX,
-      y: event.clientY
-    };
-    const offset = getFrameTransform(this.source.element);
-    coordinates.x = coordinates.x * offset.scaleX + offset.x;
-    coordinates.y = coordinates.y * offset.scaleY + offset.y;
-    if (this.manager.dragOperation.status.dragging) {
-      event.preventDefault();
-      event.stopPropagation();
-      this.manager.actions.move({ to: coordinates });
-      return;
-    }
-    if (!this.initialCoordinates) {
-      return;
-    }
-    const delta = {
-      x: coordinates.x - this.initialCoordinates.x,
-      y: coordinates.y - this.initialCoordinates.y
-    };
-    const { activationConstraints } = options;
-    const constraints = typeof activationConstraints === "function" ? activationConstraints(event, this.source) : activationConstraints;
-    const { distance, delay } = constraints != null ? constraints : {};
-    if (distance) {
-      if (distance.tolerance != null && exceedsDistance(delta, distance.tolerance)) {
-        return this.handleCancel();
-      }
-      if (exceedsDistance(delta, distance.value)) {
-        return this.handleStart(this.source, event);
-      }
-    }
-    if (delay) {
-      if (exceedsDistance(delta, delay.tolerance)) {
-        return this.handleCancel();
-      }
-    }
-  }
-  handlePointerUp(event) {
-    if (!this.source) {
-      return;
-    }
-    event.preventDefault();
-    event.stopPropagation();
-    const { status } = this.manager.dragOperation;
-    if (!status.idle) {
-      const canceled = !status.initialized;
-      this.manager.actions.stop({ canceled });
-    } else if (this.started) {
-      setTimeout(() => {
-        if (!this.manager.dragOperation.status.idle) {
-          this.manager.actions.stop({ canceled: false });
-        }
-      }, 10);
-    }
-    this.cleanup.forEach((cleanup) => cleanup());
-    this.cleanup.clear();
-  }
-  handleKeyDown(event) {
-    if (event.key === "Escape") {
-      event.preventDefault();
-      this.handleCancel();
-    }
-  }
-  handleStart(source, event) {
-    var _a;
-    const { manager, initialCoordinates } = this;
-    (_a = __privateGet(this, _clearTimeout)) == null ? void 0 : _a.call(this);
-    if (!initialCoordinates || manager.dragOperation.status.initialized || this.started) {
-      return;
-    }
-    if (event.defaultPrevented) {
-      return;
-    }
-    this.started = true;
-    event.preventDefault();
-    batch(() => {
-      manager.actions.setDragSource(source.id);
-      manager.actions.start({ coordinates: initialCoordinates, event });
-    });
-    const ownerDocument = getDocument(event.target);
-    const unbind = this.listeners.bind(ownerDocument, [
-      {
-        // Prevent scrolling on touch devices
-        type: "touchmove",
-        listener: preventDefault,
-        options: {
-          passive: false
-        }
-      },
-      {
-        // Prevent click events
-        type: "click",
-        listener: preventDefault
-      },
-      {
-        type: "keydown",
-        listener: this.handleKeyDown
-      }
-    ]);
-    ownerDocument.body.setPointerCapture(event.pointerId);
-    this.cleanup.add(unbind);
-    this.cleanup.add(() => {
-      this.started = false;
-    });
-  }
-  handleDragStart(event) {
-    const { target } = event;
-    if (!isElement(target)) {
-      return;
-    }
-    const isNativeDraggable = isHTMLElement(target) && target.draggable && target.getAttribute("draggable") === "true";
-    if (isNativeDraggable) {
-      this.handleCancel();
-    } else {
-      preventDefault(event);
-    }
-  }
-  handleCancel() {
-    const { dragOperation } = this.manager;
-    if (dragOperation.status.initialized) {
-      this.manager.actions.stop({ canceled: true });
-    }
-    this.cleanup.forEach((cleanup) => cleanup());
-    this.cleanup.clear();
-  }
-  destroy() {
-    this.listeners.clear();
-  }
-};
-_clearTimeout = new WeakMap();
-_PointerSensor.configure = configurator(_PointerSensor);
-var PointerSensor = _PointerSensor;
-function preventDefault(event) {
-  event.preventDefault();
-}
-function noop() {
-}
-var windows = /* @__PURE__ */ new WeakSet();
-function patchWindow(window2) {
-  if (!window2 || windows.has(window2)) {
-    return;
-  }
-  window2.addEventListener("touchmove", noop, {
-    capture: false,
-    passive: false
-  });
-  windows.add(window2);
-}
-
-// lib/dnd/use-sensors.ts
-import { isElement as isElement2 } from "@dnd-kit/dom/utilities";
+import { PointerSensor } from "@dnd-kit/react";
+import { isElement } from "@dnd-kit/dom/utilities";
 var useSensors = ({
   other,
   mouse,
@@ -2427,7 +1916,7 @@ var useSensors = ({
       activationConstraints(event, source) {
         var _a;
         const { pointerType, target } = event;
-        if (pointerType === "mouse" && isElement2(target) && (source.handle === target || ((_a = source.handle) == null ? void 0 : _a.contains(target)))) {
+        if (pointerType === "mouse" && isElement(target) && (source.handle === target || ((_a = source.handle) == null ? void 0 : _a.contains(target)))) {
           return mouse;
         }
         if (pointerType === "touch") {
@@ -2597,7 +2086,7 @@ import { Point as Point2 } from "@dnd-kit/geometry";
 import { CollisionPriority as CollisionPriority2, CollisionType as CollisionType22 } from "@dnd-kit/abstract";
 import { Point as Point22 } from "@dnd-kit/geometry";
 import { CollisionPriority as CollisionPriority3, CollisionType as CollisionType3 } from "@dnd-kit/abstract";
-import { Point as Point3 } from "@dnd-kit/geometry";
+import { Point as Point3, Rectangle } from "@dnd-kit/geometry";
 import { CollisionPriority as CollisionPriority4, CollisionType as CollisionType4 } from "@dnd-kit/abstract";
 import { Point as Point4 } from "@dnd-kit/geometry";
 import { CollisionPriority as CollisionPriority5, CollisionType as CollisionType5 } from "@dnd-kit/abstract";
@@ -2633,31 +2122,15 @@ var closestCorners = (input) => {
   if (!droppable.shape) {
     return null;
   }
-  const { left, top, right, bottom } = droppable.shape.boundingRectangle;
-  const corners = [
-    {
-      x: left,
-      y: top
-    },
-    {
-      x: right,
-      y: top
-    },
-    {
-      x: left,
-      y: bottom
-    },
-    {
-      x: right,
-      y: bottom
-    }
-  ];
-  const distance = corners.reduce(
-    (acc, corner) => {
+  const shapeCorners = shape ? Rectangle.from(shape.current.boundingRectangle).corners : void 0;
+  const distance = Rectangle.from(
+    droppable.shape.boundingRectangle
+  ).corners.reduce(
+    (acc, corner, index) => {
       var _a;
       return acc + Point3.distance(
         Point3.from(corner),
-        (_a = shape == null ? void 0 : shape.current.center) != null ? _a : position.current
+        (_a = shapeCorners == null ? void 0 : shapeCorners[index]) != null ? _a : position.current
       );
     },
     0
@@ -2692,12 +2165,7 @@ var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input
   const { center: dragCenter } = dragShape;
   const { fallbackEnabled } = collisionStore.getState();
   const interval = trackMovementInterval(position.current, dragAxis);
-  dragOperation.data = __spreadProps(__spreadValues({}, dragOperation.data), {
-    direction: interval.direction
-  });
-  const collisionMap = dragOperation.data.collisionMap || {};
-  dragOperation.data.collisionMap = collisionMap;
-  collisionMap[droppable.id] = {
+  const data = {
     direction: interval.direction
   };
   const { center: dropCenter } = dropShape;
@@ -2712,7 +2180,8 @@ var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input
     collisionDebug(dragCenter, dropCenter, droppable.id.toString(), "yellow");
     if (collision) {
       return __spreadProps(__spreadValues({}, collision), {
-        priority: CollisionPriority7.Highest
+        priority: CollisionPriority7.Highest,
+        data
       });
     }
   }
@@ -2734,7 +2203,7 @@ var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input
     };
     const shouldFlushId = flushNext === droppable.id;
     flushNext = "";
-    return __spreadProps(__spreadValues({}, collision), { id: shouldFlushId ? "flush" : collision.id });
+    return __spreadProps(__spreadValues({}, collision), { id: shouldFlushId ? "flush" : collision.id, data });
   }
   if (fallbackEnabled && ((_c = dragOperation.source) == null ? void 0 : _c.id) !== droppable.id) {
     const xAxisIntersection = dropShape.boundingRectangle.right > dragShape.boundingRectangle.left && dropShape.boundingRectangle.left < dragShape.boundingRectangle.right;
@@ -2746,9 +2215,7 @@ var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input
           x: dragShape.center.x - (((_d = droppable.shape) == null ? void 0 : _d.center.x) || 0),
           y: dragShape.center.y - (((_e = droppable.shape) == null ? void 0 : _e.center.y) || 0)
         });
-        collisionMap[droppable.id] = {
-          direction
-        };
+        data.direction = direction;
         if (intersectionArea) {
           collisionDebug(
             dragCenter,
@@ -2759,7 +2226,8 @@ var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input
           );
           flushNext = droppable.id;
           return __spreadProps(__spreadValues({}, fallbackCollision), {
-            priority: CollisionPriority7.Low
+            priority: CollisionPriority7.Low,
+            data
           });
         }
         collisionDebug(
@@ -2769,16 +2237,19 @@ var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input
           "orange",
           direction || ""
         );
-        return __spreadProps(__spreadValues({}, fallbackCollision), { priority: CollisionPriority7.Lowest });
+        return __spreadProps(__spreadValues({}, fallbackCollision), {
+          priority: CollisionPriority7.Lowest,
+          data
+        });
       }
     }
   }
   collisionDebug(dragCenter, dropCenter, droppable.id.toString(), "hotpink");
-  delete collisionMap[droppable.id];
   return null;
 };
 
 // components/Sortable/index.tsx
+import { useSortable } from "@dnd-kit/react/sortable";
 import { jsx as jsx5 } from "react/jsx-runtime";
 var SortableProvider = ({
   children,
@@ -2798,16 +2269,16 @@ var SortableProvider = ({
         return onDragStart((_b = (_a = event.operation.source) == null ? void 0 : _a.id.toString()) != null ? _b : "");
       },
       onDragOver: (event, manager) => {
-        var _a, _b;
+        var _a;
         event.preventDefault();
         const { operation } = event;
         const { source, target } = operation;
         if (!source || !target) return;
         let sourceIndex = source.data.index;
         let targetIndex = target.data.index;
-        const collisionData = (_b = (_a = manager.dragOperation.data) == null ? void 0 : _a.collisionMap) == null ? void 0 : _b[target.id];
+        const collisionData = (_a = manager.collisionObserver.collisions[0]) == null ? void 0 : _a.data;
         if (sourceIndex !== targetIndex && source.id !== target.id) {
-          const collisionPosition = collisionData.direction === "up" ? "before" : "after";
+          const collisionPosition = (collisionData == null ? void 0 : collisionData.direction) === "up" ? "before" : "after";
           if (targetIndex >= sourceIndex) {
             targetIndex = targetIndex - 1;
           }
@@ -2838,9 +2309,10 @@ var Sortable = ({
 }) => {
   const {
     ref: sortableRef,
-    status,
+    isDragging,
+    isDropping,
     handleRef
-  } = useSortableSafe({
+  } = useSortable({
     id,
     type,
     index,
@@ -2848,7 +2320,7 @@ var Sortable = ({
     data: { index },
     collisionDetector: createDynamicCollisionDetector("y")
   });
-  return children({ status, ref: sortableRef, handleRef });
+  return children({ isDragging, isDropping, ref: sortableRef, handleRef });
 };
 
 // components/AutoField/context.tsx
@@ -2973,12 +2445,25 @@ var ArrayField = ({
     }
   }, []);
   const [draggedItem, setDraggedItem] = useState3("");
-  const isDragging = !!draggedItem;
+  const isDraggingAny = !!draggedItem;
   const canEdit = useAppStore(
     (s) => s.permissions.getPermissions({ item: s.selectedItem }).edit
   );
   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;
   }
@@ -3038,13 +2523,13 @@ var ArrayField = ({
                       id: _arrayId,
                       index: i,
                       disabled: readOnly,
-                      children: ({ status, ref, handleRef }) => /* @__PURE__ */ jsxs3(
+                      children: ({ isDragging, ref, handleRef }) => /* @__PURE__ */ jsxs3(
                         "div",
                         {
                           ref,
                           className: getClassNameItem({
                             isExpanded: arrayState.openId === _arrayId,
-                            isDragging: status === "dragging",
+                            isDragging,
                             readOnly
                           }),
                           children: [
@@ -3083,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)
                                             );
@@ -3185,12 +2669,11 @@ var ArrayField = ({
                     type: "button",
                     className: getClassName5("addButton"),
                     onClick: () => {
-                      if (isDragging) return;
+                      var _a;
+                      if (isDraggingAny) return;
                       const existingValue = value || [];
-                      const newValue = [
-                        ...existingValue,
-                        field.defaultItemProps || {}
-                      ];
+                      const newItem = uniqifyItem((_a = field.defaultItemProps) != null ? _a : {});
+                      const newValue = [...existingValue, newItem];
                       const newArrayState = regenerateArrayState(newValue);
                       setUi(mapArrayStateToUi(newArrayState), false);
                       onChange(newValue);
@@ -4090,6 +3573,10 @@ function AutoFieldInternal(props) {
       });
     }
   }, []);
+  const { visible = true } = props.field;
+  if (!visible) {
+    return null;
+  }
   if (field.type === "slot") {
     return null;
   }
@@ -4174,7 +3661,7 @@ init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Drawer/styles.module.css#css-module
 init_react_import();
-var styles_module_default10 = { "Drawer": "_Drawer_fkqfo_1", "Drawer-draggable": "_Drawer-draggable_fkqfo_8", "Drawer-draggableBg": "_Drawer-draggableBg_fkqfo_12", "Drawer-draggableFg": "_Drawer-draggableFg_fkqfo_21", "DrawerItem-draggable": "_DrawerItem-draggable_fkqfo_25", "DrawerItem--disabled": "_DrawerItem--disabled_fkqfo_38", "DrawerItem": "_DrawerItem_fkqfo_25", "Drawer--isDraggingFrom": "_Drawer--isDraggingFrom_fkqfo_48", "DrawerItem-name": "_DrawerItem-name_fkqfo_66" };
+var styles_module_default10 = { "Drawer": "_Drawer_pl7z0_1", "Drawer-draggable": "_Drawer-draggable_pl7z0_8", "Drawer-draggableBg": "_Drawer-draggableBg_pl7z0_12", "DrawerItem-draggable": "_DrawerItem-draggable_pl7z0_22", "DrawerItem--disabled": "_DrawerItem--disabled_pl7z0_35", "DrawerItem": "_DrawerItem_pl7z0_22", "Drawer--isDraggingFrom": "_Drawer--isDraggingFrom_pl7z0_45", "DrawerItem-name": "_DrawerItem-name_pl7z0_63" };
 
 // components/Drawer/index.tsx
 import { useMemo as useMemo11, useState as useState15 } from "react";
@@ -4184,11 +3671,11 @@ init_react_import();
 import { DragDropProvider as DragDropProvider2 } from "@dnd-kit/react";
 import {
   createContext as createContext4,
-  useCallback as useCallback10,
-  useContext as useContext7,
-  useEffect as useEffect16,
+  useCallback as useCallback11,
+  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";
@@ -4198,22 +3685,23 @@ init_react_import();
 import {
   forwardRef as forwardRef3,
   memo,
-  useCallback as useCallback9,
-  useContext as useContext6,
-  useEffect as useEffect15,
+  useCallback as useCallback10,
+  useContext as useContext7,
+  useEffect as useEffect16,
   useMemo as useMemo9,
-  useRef as useRef3
+  useRef as useRef4
 } from "react";
 
 // components/DraggableComponent/index.tsx
 init_react_import();
 import {
-  useCallback as useCallback6,
+  useCallback as useCallback7,
   useContext as useContext5,
-  useEffect as useEffect11,
+  useEffect as useEffect12,
   useMemo as useMemo7,
   useRef as useRef2,
-  useState as useState10
+  useState as useState10,
+  useTransition
 } from "react";
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/DraggableComponent/styles.module.css#css-module
@@ -4247,8 +3735,7 @@ init_react_import();
 import {
   createContext as createContext3,
   useCallback as useCallback5,
-  useMemo as useMemo6,
-  useState as useState9
+  useMemo as useMemo6
 } from "react";
 import { createStore as createStore2 } from "zustand";
 import { Fragment as Fragment5, jsx as jsx19 } from "react/jsx-runtime";
@@ -4260,7 +3747,9 @@ var ZoneStoreContext = createContext3(
     areaDepthIndex: {},
     nextAreaDepthIndex: {},
     draggedItem: null,
-    previewIndex: {}
+    previewIndex: {},
+    enabledIndex: {},
+    hoveringComponent: null
   }))
 );
 var ZoneStoreProvider = ({
@@ -4273,7 +3762,6 @@ var DropZoneProvider = ({
   children,
   value
 }) => {
-  const [hoveringComponent, setHoveringComponent] = useState9();
   const dispatch = useAppStore((s) => s.dispatch);
   const registerZone = useCallback5(
     (zoneCompound) => {
@@ -4295,16 +3783,33 @@ var DropZoneProvider = ({
   );
   const memoValue = useMemo6(
     () => __spreadValues({
-      hoveringComponent,
-      setHoveringComponent,
       registerZone,
       unregisterZone
     }, value),
-    [value, hoveringComponent]
+    [value]
   );
   return /* @__PURE__ */ jsx19(Fragment5, { children: memoValue && /* @__PURE__ */ jsx19(dropZoneContext.Provider, { value: memoValue, children }) });
 };
 
+// components/DraggableComponent/index.tsx
+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";
@@ -4318,8 +3823,39 @@ function useContextStore(context, selector) {
   return useStore2(store, useShallow(selector));
 }
 
+// lib/dnd/use-on-drag-finished.ts
+init_react_import();
+import { useCallback as useCallback6 } from "react";
+var useOnDragFinished = (cb, deps = []) => {
+  const appStore = useAppStoreApi();
+  return useCallback6(() => {
+    let dispose = () => {
+    };
+    const processDragging = (isDragging2) => {
+      if (isDragging2) {
+        cb(false);
+      } else {
+        setTimeout(() => {
+          cb(true);
+        }, 0);
+        if (dispose) dispose();
+      }
+    };
+    const isDragging = appStore.getState().state.ui.isDragging;
+    processDragging(isDragging);
+    if (isDragging) {
+      dispose = appStore.subscribe(
+        (s) => s.state.ui.isDragging,
+        (isDragging2) => {
+          processDragging(isDragging2);
+        }
+      );
+    }
+    return dispose;
+  }, [appStore, ...deps]);
+};
+
 // components/DraggableComponent/index.tsx
-import { useShallow as useShallow2 } from "zustand/react/shallow";
 import { jsx as jsx20, jsxs as jsxs9 } from "react/jsx-runtime";
 var getClassName16 = get_class_name_factory_default("DraggableComponent", styles_module_default11);
 var DEBUG2 = false;
@@ -4349,7 +3885,6 @@ var DraggableComponent = ({
   isSelected = false,
   debug,
   label,
-  isEnabled,
   autoDragAxis,
   userDragAxis,
   inDroppableZone = true
@@ -4365,7 +3900,7 @@ var DraggableComponent = ({
   const iframe = useAppStore((s) => s.iframe);
   const ctx = useContext5(dropZoneContext);
   const [localZones, setLocalZones] = useState10({});
-  const registerLocalZone = useCallback6(
+  const registerLocalZone = useCallback7(
     (zoneCompound2, active) => {
       var _a;
       (_a = ctx == null ? void 0 : ctx.registerLocalZone) == null ? void 0 : _a.call(ctx, zoneCompound2, active);
@@ -4375,7 +3910,7 @@ var DraggableComponent = ({
     },
     [setLocalZones]
   );
-  const unregisterLocalZone = useCallback6(
+  const unregisterLocalZone = useCallback7(
     (zoneCompound2) => {
       var _a;
       (_a = ctx == null ? void 0 : ctx.unregisterLocalZone) == null ? void 0 : _a.call(ctx, zoneCompound2);
@@ -4398,14 +3933,17 @@ var DraggableComponent = ({
       return s.permissions.getPermissions({ item });
     })
   );
-  const userIsDragging = useContextStore(
-    ZoneStoreContext,
-    (s) => !!s.draggedItem
-  );
-  const canCollide = permissions.drag || userIsDragging;
-  const disabled = !isEnabled || !canCollide;
+  const zoneStore = useContext5(ZoneStoreContext);
   const [dragAxis, setDragAxis] = useState10(userDragAxis || autoDragAxis);
-  const { ref: sortableRef, status } = useSortableSafe({
+  const dynamicCollisionDetector = useMemo7(
+    () => createDynamicCollisionDetector(dragAxis),
+    [dragAxis]
+  );
+  const {
+    ref: sortableRef,
+    isDragging: thisIsDragging,
+    sortable
+  } = useSortable2({
     id,
     index,
     group: zoneCompound,
@@ -4420,18 +3958,34 @@ var DraggableComponent = ({
       path: path || [],
       inDroppableZone
     },
-    collisionPriority: isEnabled ? depth : 0,
-    collisionDetector: createDynamicCollisionDetector(dragAxis),
-    disabled,
+    collisionPriority: depth,
+    collisionDetector: dynamicCollisionDetector,
     // "Out of the way" transition from react-beautiful-dnd
     transition: {
       duration: 200,
       easing: "cubic-bezier(0.2, 0, 0, 1)"
-    }
+    },
+    feedback: "clone"
   });
-  const thisIsDragging = status === "dragging";
+  useEffect12(() => {
+    const isEnabled = zoneStore.getState().enabledIndex[zoneCompound];
+    sortable.droppable.disabled = !isEnabled;
+    sortable.draggable.disabled = !permissions.drag;
+    const cleanup = zoneStore.subscribe((s) => {
+      sortable.droppable.disabled = !s.enabledIndex[zoneCompound];
+    });
+    if (ref.current && !permissions.drag) {
+      ref.current.setAttribute("data-puck-disabled", "");
+      return () => {
+        var _a;
+        (_a = ref.current) == null ? void 0 : _a.removeAttribute("data-puck-disabled");
+        cleanup();
+      };
+    }
+    return cleanup;
+  }, [permissions.drag, zoneCompound]);
   const ref = useRef2(null);
-  const refSetter = useCallback6(
+  const refSetter = useCallback7(
     (el) => {
       sortableRef(el);
       if (el) {
@@ -4441,13 +3995,13 @@ var DraggableComponent = ({
     [sortableRef]
   );
   const [portalEl, setPortalEl] = useState10();
-  useEffect11(() => {
+  useEffect12(() => {
     var _a, _b, _c;
     setPortalEl(
       iframe.enabled ? (_a = ref.current) == null ? void 0 : _a.ownerDocument.body : (_c = (_b = ref.current) == null ? void 0 : _b.closest("[data-puck-preview]")) != null ? _c : document.body
     );
   }, [iframe.enabled, ref.current]);
-  const getStyle = useCallback6(() => {
+  const getStyle = useCallback7(() => {
     var _a, _b, _c;
     if (!ref.current) return;
     const rect = ref.current.getBoundingClientRect();
@@ -4459,40 +4013,61 @@ var DraggableComponent = ({
       x: deepScrollPosition.x - portalScroll.x - ((_b = portalContainerRect == null ? void 0 : portalContainerRect.left) != null ? _b : 0),
       y: deepScrollPosition.y - portalScroll.y - ((_c = portalContainerRect == null ? void 0 : portalContainerRect.top) != null ? _c : 0)
     };
+    const untransformed = {
+      height: ref.current.offsetHeight,
+      width: ref.current.offsetWidth
+    };
+    const transform = accumulateTransform(ref.current);
     const style2 = {
-      left: `${rect.left + scroll.x}px`,
-      top: `${rect.top + scroll.y}px`,
-      height: `${rect.height}px`,
-      width: `${rect.width}px`
+      left: `${(rect.left + scroll.x) / transform.scaleX}px`,
+      top: `${(rect.top + scroll.y) / transform.scaleY}px`,
+      height: `${untransformed.height}px`,
+      width: `${untransformed.width}px`
     };
     return style2;
   }, [ref.current]);
   const [style, setStyle] = useState10();
-  const sync = useCallback6(() => {
+  const sync = useCallback7(() => {
     setStyle(getStyle());
   }, [ref.current, iframe]);
-  useEffect11(() => {
-    if (ref.current && !userIsDragging) {
+  useEffect12(() => {
+    if (ref.current) {
       const observer = new ResizeObserver(sync);
       observer.observe(ref.current);
       return () => {
         observer.disconnect();
       };
     }
-  }, [ref.current, userIsDragging]);
+  }, [ref.current]);
   const registerNode = useAppStore((s) => s.nodes.registerNode);
-  useEffect11(() => {
+  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(
     () => overrides.actionBar || DefaultActionBar,
     [overrides.actionBar]
   );
-  const onClick = useCallback6(
+  const onClick = useCallback7(
     (e) => {
       e.stopPropagation();
       dispatch({
@@ -4505,7 +4080,7 @@ var DraggableComponent = ({
     [index, zoneCompound, id]
   );
   const appStore = useAppStoreApi();
-  const onSelectParent = useCallback6(() => {
+  const onSelectParent = useCallback7(() => {
     const { nodes, zones } = appStore.getState().state.indexes;
     const node = nodes[id];
     const parentNode = (node == null ? void 0 : node.parentId) ? nodes[node == null ? void 0 : node.parentId] : null;
@@ -4526,14 +4101,14 @@ var DraggableComponent = ({
       }
     });
   }, [ctx, path]);
-  const onDuplicate = useCallback6(() => {
+  const onDuplicate = useCallback7(() => {
     dispatch({
       type: "duplicate",
       sourceIndex: index,
       sourceZone: zoneCompound
     });
   }, [index, zoneCompound]);
-  const onDelete = useCallback6(() => {
+  const onDelete = useCallback7(() => {
     dispatch({
       type: "remove",
       index,
@@ -4541,13 +4116,17 @@ var DraggableComponent = ({
     });
   }, [index, zoneCompound]);
   const [hover, setHover] = useState10(false);
-  const indicativeHover = (ctx == null ? void 0 : ctx.hoveringComponent) === id;
-  useEffect11(() => {
+  const indicativeHover = useContextStore(
+    ZoneStoreContext,
+    (s) => s.hoveringComponent === id
+  );
+  useEffect12(() => {
     if (!ref.current) {
       return;
     }
     const el = ref.current;
     const _onMouseOver = (e) => {
+      const userIsDragging = !!zoneStore.getState().draggedItem;
       if (userIsDragging) {
         if (thisIsDragging) {
           setHover(true);
@@ -4569,18 +4148,12 @@ var DraggableComponent = ({
     el.addEventListener("click", onClick);
     el.addEventListener("mouseover", _onMouseOver);
     el.addEventListener("mouseout", _onMouseOut);
-    if (thisIsDragging) {
-      el.setAttribute("data-puck-dragging", "");
-    } else {
-      el.removeAttribute("data-puck-dragging");
-    }
     return () => {
       el.removeAttribute("data-puck-component");
       el.removeAttribute("data-puck-dnd");
       el.removeEventListener("click", onClick);
       el.removeEventListener("mouseover", _onMouseOver);
       el.removeEventListener("mouseout", _onMouseOut);
-      el.removeAttribute("data-puck-dragging");
     };
   }, [
     ref,
@@ -4588,29 +4161,43 @@ var DraggableComponent = ({
     containsActiveZone,
     zoneCompound,
     id,
-    userIsDragging,
     thisIsDragging,
     inDroppableZone
   ]);
-  useEffect11(() => {
-    if (ref.current && disabled) {
-      ref.current.setAttribute("data-puck-disabled", "");
-      return () => {
-        var _a;
-        (_a = ref.current) == null ? void 0 : _a.removeAttribute("data-puck-disabled");
-      };
-    }
-  }, [disabled, ref]);
   const [isVisible, setIsVisible] = useState10(false);
-  useEffect11(() => {
-    sync();
-    if ((isSelected || hover || indicativeHover) && !userIsDragging) {
-      setIsVisible(true);
+  const [dragFinished, setDragFinished] = useState10(true);
+  const [_, startTransition] = useTransition();
+  useEffect12(() => {
+    startTransition(() => {
+      if (hover || indicativeHover || isSelected) {
+        sync();
+        setIsVisible(true);
+        setThisWasDragging(false);
+      } else {
+        setIsVisible(false);
+      }
+    });
+  }, [hover, indicativeHover, isSelected, iframe]);
+  const [thisWasDragging, setThisWasDragging] = useState10(false);
+  const onDragFinished = useOnDragFinished((finished) => {
+    if (finished) {
+      startTransition(() => {
+        sync();
+        setDragFinished(true);
+      });
     } else {
-      setIsVisible(false);
+      setDragFinished(false);
+    }
+  });
+  useEffect12(() => {
+    if (thisIsDragging) {
+      setThisWasDragging(true);
     }
-  }, [isSelected, hover, indicativeHover, iframe, userIsDragging]);
-  const syncActionsPosition = useCallback6(
+  }, [thisIsDragging]);
+  useEffect12(() => {
+    if (thisWasDragging) return onDragFinished();
+  }, [thisWasDragging, onDragFinished]);
+  const syncActionsPosition = useCallback7(
     (el) => {
       if (el) {
         const view = el.ownerDocument.defaultView;
@@ -4635,7 +4222,7 @@ var DraggableComponent = ({
     },
     [zoom]
   );
-  useEffect11(() => {
+  useEffect12(() => {
     if (userDragAxis) {
       setDragAxis(userDragAxis);
       return;
@@ -4649,7 +4236,10 @@ var DraggableComponent = ({
     }
     setDragAxis(autoDragAxis);
   }, [ref, userDragAxis, autoDragAxis]);
-  const parentAction = (ctx == null ? void 0 : ctx.areaId) && (ctx == null ? void 0 : ctx.areaId) !== "root" && /* @__PURE__ */ jsx20(ActionBar.Action, { onClick: onSelectParent, label: "Select parent", children: /* @__PURE__ */ jsx20(CornerLeftUp, { size: 16 }) });
+  const parentAction = useMemo7(
+    () => (ctx == null ? void 0 : ctx.areaId) && (ctx == null ? void 0 : ctx.areaId) !== "root" && /* @__PURE__ */ jsx20(ActionBar.Action, { onClick: onSelectParent, label: "Select parent", children: /* @__PURE__ */ jsx20(CornerLeftUp, { size: 16 }) }),
+    [ctx == null ? void 0 : ctx.areaId]
+  );
   const nextContextValue = useMemo7(
     () => __spreadProps(__spreadValues({}, ctx), {
       areaId: id,
@@ -4670,7 +4260,7 @@ var DraggableComponent = ({
     ]
   );
   return /* @__PURE__ */ jsxs9(DropZoneProvider, { value: nextContextValue, children: [
-    isVisible && createPortal2(
+    dragFinished && isVisible && createPortal2(
       /* @__PURE__ */ jsxs9(
         "div",
         {
@@ -4730,11 +4320,15 @@ var DraggableComponent = ({
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/DropZone/styles.module.css#css-module
 init_react_import();
-var styles_module_default12 = { "DropZone": "_DropZone_3dmev_1", "DropZone--hasChildren": "_DropZone--hasChildren_3dmev_11", "DropZone--userIsDragging": "_DropZone--userIsDragging_3dmev_19", "DropZone--isAreaSelected": "_DropZone--isAreaSelected_3dmev_23", "DropZone--hoveringOverArea": "_DropZone--hoveringOverArea_3dmev_24", "DropZone--isRootZone": "_DropZone--isRootZone_3dmev_24", "DropZone--isDestination": "_DropZone--isDestination_3dmev_34", "DropZone-item": "_DropZone-item_3dmev_46", "DropZone-hitbox": "_DropZone-hitbox_3dmev_50", "DropZone--isEnabled": "_DropZone--isEnabled_3dmev_58", "DropZone--isAnimating": "_DropZone--isAnimating_3dmev_67" };
+var styles_module_default12 = { "DropZone": "_DropZone_1i2sv_1", "DropZone--hasChildren": "_DropZone--hasChildren_1i2sv_11", "DropZone--isAreaSelected": "_DropZone--isAreaSelected_1i2sv_24", "DropZone--hoveringOverArea": "_DropZone--hoveringOverArea_1i2sv_25", "DropZone--isRootZone": "_DropZone--isRootZone_1i2sv_25", "DropZone--isDestination": "_DropZone--isDestination_1i2sv_35", "DropZone-item": "_DropZone-item_1i2sv_47", "DropZone-hitbox": "_DropZone-hitbox_1i2sv_51", "DropZone--isEnabled": "_DropZone--isEnabled_1i2sv_59", "DropZone--isAnimating": "_DropZone--isAnimating_1i2sv_68" };
+
+// components/DropZone/index.tsx
+import { useDroppable } from "@dnd-kit/react";
 
 // components/DropZone/lib/use-min-empty-height.ts
 init_react_import();
-import { useEffect as useEffect12, 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,
@@ -4750,32 +4344,52 @@ var useMinEmptyHeight = ({
       isZone: ((_b = s.draggedItem) == null ? void 0 : _b.data.zone) === zoneCompound
     };
   });
-  useEffect12(() => {
+  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();
       }
     }
-    setPrevHeight(0);
-    setTimeout(() => {
-      var _a, _b;
-      const zones = appStore.getState().state.indexes.zones;
-      const nodes = appStore.getState().nodes;
-      const selectedItem = appStore.getState().selectedItem;
-      const contentIds = ((_a = zones[zoneCompound]) == null ? void 0 : _a.contentIds) || [];
-      contentIds.forEach((contentId) => {
-        const node = nodes.nodes[contentId];
-        node == null ? void 0 : node.methods.sync();
-      });
-      if (selectedItem) {
-        (_b = nodes.nodes[selectedItem.props.id]) == null ? void 0 : _b.methods.sync();
-      }
-      setIsAnimating(false);
-    }, 400);
-  }, [ref.current, draggedItem, zoneCompound]);
+  }, [ref.current, draggedItem, onDragFinished]);
   return [prevHeight || userMinEmptyHeight, isAnimating];
 };
 
@@ -4796,15 +4410,15 @@ function assignRefs(refs, node) {
 
 // components/DropZone/lib/use-content-with-preview.ts
 init_react_import();
-import { useEffect as useEffect13, useState as useState12 } from "react";
+import { useContext as useContext6, useEffect as useEffect14, useState as useState12 } from "react";
 
 // lib/dnd/use-rendered-callback.ts
 init_react_import();
 import { useDragDropManager } from "@dnd-kit/react";
-import { useCallback as useCallback7 } from "react";
+import { useCallback as useCallback8 } from "react";
 function useRenderedCallback(callback, deps) {
   const manager = useDragDropManager();
-  return useCallback7(
+  return useCallback8(
     (...args) => __async(this, null, function* () {
       yield manager == null ? void 0 : manager.renderer.rendering;
       return callback(...args);
@@ -4815,16 +4429,10 @@ function useRenderedCallback(callback, deps) {
 
 // components/DropZone/lib/use-content-with-preview.ts
 var useContentIdsWithPreview = (contentIds, zoneCompound) => {
-  const { draggedItemId, preview, previewExists } = useContextStore(
+  const zoneStore = useContext6(ZoneStoreContext);
+  const preview = useContextStore(
     ZoneStoreContext,
-    (s) => {
-      var _a;
-      return {
-        draggedItemId: (_a = s.draggedItem) == null ? void 0 : _a.id,
-        preview: s.previewIndex[zoneCompound],
-        previewExists: Object.keys(s.previewIndex || {}).length > 0
-      };
-    }
+    (s) => s.previewIndex[zoneCompound]
   );
   const isDragging = useAppStore((s) => s.state.ui.isDragging);
   const [contentIdsWithPreview, setContentIdsWithPreview] = useState12(contentIds);
@@ -4832,10 +4440,10 @@ var useContentIdsWithPreview = (contentIds, zoneCompound) => {
     preview
   );
   const updateContent = useRenderedCallback(
-    (contentIds2, preview2, isDragging2) => {
-      if (isDragging2 && !previewExists) {
-        return;
-      }
+    (contentIds2, preview2) => {
+      var _a;
+      const s = zoneStore.getState();
+      const draggedItemId = (_a = s.draggedItem) == null ? void 0 : _a.id;
       if (preview2) {
         if (preview2.type === "insert") {
           setContentIdsWithPreview(
@@ -4856,14 +4464,14 @@ var useContentIdsWithPreview = (contentIds, zoneCompound) => {
         }
       } else {
         setContentIdsWithPreview(
-          previewExists ? contentIds2.filter((id) => id !== draggedItemId) : contentIds2
+          contentIds2.filter((id) => id !== draggedItemId)
         );
       }
       setLocalPreview(preview2);
     },
-    [draggedItemId, previewExists]
+    []
   );
-  useEffect13(() => {
+  useEffect14(() => {
     updateContent(contentIds, preview, isDragging);
   }, [contentIds, preview, isDragging]);
   return [contentIdsWithPreview, localPreview];
@@ -4871,7 +4479,7 @@ var useContentIdsWithPreview = (contentIds, zoneCompound) => {
 
 // components/DropZone/lib/use-drag-axis.ts
 init_react_import();
-import { useCallback as useCallback8, useEffect as useEffect14, useState as useState13 } from "react";
+import { useCallback as useCallback9, useEffect as useEffect15, useState as useState13 } from "react";
 var GRID_DRAG_AXIS = "dynamic";
 var FLEX_ROW_DRAG_AXIS = "x";
 var DEFAULT_DRAG_AXIS = "y";
@@ -4880,7 +4488,7 @@ var useDragAxis = (ref, collisionAxis) => {
   const [dragAxis, setDragAxis] = useState13(
     collisionAxis || DEFAULT_DRAG_AXIS
   );
-  const calculateDragAxis = useCallback8(() => {
+  const calculateDragAxis = useCallback9(() => {
     if (ref.current) {
       const computedStyle = window.getComputedStyle(ref.current);
       if (computedStyle.display === "grid") {
@@ -4892,7 +4500,7 @@ var useDragAxis = (ref, collisionAxis) => {
       }
     }
   }, [ref.current]);
-  useEffect14(() => {
+  useEffect15(() => {
     const onViewportChange = () => {
       calculateDragAxis();
     };
@@ -4901,12 +4509,12 @@ var useDragAxis = (ref, collisionAxis) => {
       window.removeEventListener("viewportchange", onViewportChange);
     };
   }, []);
-  useEffect14(calculateDragAxis, [status, collisionAxis]);
+  useEffect15(calculateDragAxis, [status, collisionAxis]);
   return [dragAxis, calculateDragAxis];
 };
 
 // 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();
@@ -4914,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,
@@ -4922,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,
@@ -4955,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: {
@@ -4968,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",
@@ -4991,19 +4606,18 @@ var DropZoneEditPure = (props) => /* @__PURE__ */ jsx23(DropZoneEdit, __spreadVa
 var DropZoneChild = ({
   zoneCompound,
   componentId,
-  preview,
   index,
-  isEnabled,
   dragAxis,
   collisionAxis,
   inDroppableZone
 }) => {
   var _a, _b;
   const metadata = useAppStore((s) => s.metadata);
-  const ctx = useContext6(dropZoneContext);
+  const ctx = useContext7(dropZoneContext);
   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;
     })
@@ -5015,22 +4629,42 @@ 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 node = { type: nodeType, props: nodeProps };
-  const item = nodeProps ? node : (preview == null ? void 0 : preview.componentType) ? { type: preview.componentType, props: preview.props } : null;
+  const appStore = useAppStoreApi();
+  const item = useMemo9(() => {
+    if (nodeProps) {
+      const expanded = expandNode({
+        type: nodeType,
+        props: nodeProps
+      });
+      return expanded;
+    }
+    const preview = zoneStore.getState().previewIndex[zoneCompound];
+    if (componentId === (preview == null ? void 0 : preview.props.id)) {
+      return {
+        type: preview.componentType,
+        props: preview.props,
+        previewType: preview.type
+      };
+    }
+    return null;
+  }, [appStore, componentId, zoneCompound, nodeType, nodeProps]);
   const componentConfig = useAppStore(
     (s) => (item == null ? void 0 : item.type) ? s.config.components[item.type] : null
   );
-  const puckProps = {
-    renderDropZone: DropZoneEditPure,
-    isEditing: true,
-    dragRef: null,
-    metadata: __spreadValues(__spreadValues({}, metadata), componentConfig == null ? void 0 : componentConfig.metadata)
-  };
+  const puckProps = useMemo9(
+    () => ({
+      renderDropZone: DropZoneEditPure,
+      isEditing: true,
+      dragRef: null,
+      metadata: __spreadValues(__spreadValues({}, metadata), componentConfig == null ? void 0 : componentConfig.metadata)
+    }),
+    [metadata, componentConfig == null ? void 0 : componentConfig.metadata]
+  );
   const overrides = useAppStore((s) => s.overrides);
   const isLoading = useAppStore(
     (s) => {
@@ -5046,7 +4680,7 @@ var DropZoneChild = ({
   );
   let label = (_b = (_a = componentConfig == null ? void 0 : componentConfig.label) != null ? _a : item == null ? void 0 : item.type.toString()) != null ? _b : "Component";
   const renderPreview = useMemo9(
-    () => function Preview4() {
+    () => function Preview3() {
       return /* @__PURE__ */ jsx23(DrawerItemInner, { name: label, children: overrides.componentItem });
     },
     [componentId, label, overrides]
@@ -5059,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,
@@ -5073,8 +4715,8 @@ var DropZoneChild = ({
     item.type
   ] });
   let componentType = item.type;
-  const isPreview = componentId === (preview == null ? void 0 : preview.props.id) && preview.type === "insert";
-  if (isPreview) {
+  const isInserting = "previewType" in item ? item.previewType === "insert" : false;
+  if (isInserting) {
     Render2 = renderPreview;
   }
   return /* @__PURE__ */ jsx23(
@@ -5088,11 +4730,10 @@ var DropZoneChild = ({
       isLoading,
       isSelected,
       label,
-      isEnabled,
       autoDragAxis: dragAxis,
       userDragAxis: collisionAxis,
       inDroppableZone,
-      children: (dragRef) => (componentConfig == null ? void 0 : componentConfig.inline) && !isPreview ? /* @__PURE__ */ jsx23(Fragment6, { children: /* @__PURE__ */ jsx23(
+      children: (dragRef) => (componentConfig == null ? void 0 : componentConfig.inline) && !isInserting ? /* @__PURE__ */ jsx23(Fragment6, { children: /* @__PURE__ */ jsx23(
         Render2,
         __spreadProps(__spreadValues({}, defaultedPropsWithSlots), {
           puck: __spreadProps(__spreadValues({}, defaultedPropsWithSlots.puck), {
@@ -5114,7 +4755,7 @@ var DropZoneEdit = forwardRef3(
     minEmptyHeight: userMinEmptyHeight = 128,
     collisionAxis
   }, userRef) {
-    const ctx = useContext6(dropZoneContext);
+    const ctx = useContext7(dropZoneContext);
     const {
       // These all need setting via context
       areaId,
@@ -5123,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;
       })
@@ -5135,39 +4776,24 @@ var DropZoneEdit = forwardRef3(
       }
     }
     const isRootZone = zoneCompound === rootDroppableId || zone === rootDroppableId || areaId === "root";
-    const {
-      isDeepestZone,
-      inNextDeepestArea,
-      draggedComponentType,
-      userIsDragging
-    } = useContextStore(ZoneStoreContext, (s) => {
-      var _a, _b;
-      return {
-        isDeepestZone: (_a = s.zoneDepthIndex[zoneCompound]) != null ? _a : false,
-        inNextDeepestArea: s.nextAreaDepthIndex[areaId || ""],
-        draggedComponentType: (_b = s.draggedItem) == null ? void 0 : _b.data.componentType,
-        userIsDragging: !!s.draggedItem
-      };
-    });
+    const inNextDeepestArea = useContextStore(
+      ZoneStoreContext,
+      (s) => s.nextAreaDepthIndex[areaId || ""]
+    );
     const zoneContentIds = useAppStore(
-      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;
       })
     );
-    useEffect15(() => {
+    useEffect16(() => {
       if (!zoneType || zoneType === "dropzone") {
-        if (zoneCompound !== rootDroppableId) {
-          console.warn(
-            "DropZones have been deprecated in favor of slot fields and will be removed in a future version of Puck. Please see the migration guide: https://www.puckeditor.com/docs/guides/migrations/dropzones-to-slots"
-          );
-        }
         if (ctx == null ? void 0 : ctx.registerZone) {
           ctx == null ? void 0 : ctx.registerZone(zoneCompound);
         }
@@ -5178,11 +4804,20 @@ var DropZoneEdit = forwardRef3(
         };
       }
     }, [zoneType]);
+    useEffect16(() => {
+      if (zoneType === "dropzone") {
+        if (zoneCompound !== rootDroppableId) {
+          console.warn(
+            "DropZones have been deprecated in favor of slot fields and will be removed in a future version of Puck. Please see the migration guide: https://www.puckeditor.com/docs/guides/migrations/dropzones-to-slots"
+          );
+        }
+      }
+    }, [zoneType]);
     const contentIds = useMemo9(() => {
       return zoneContentIds || [];
     }, [zoneContentIds]);
-    const ref = useRef3(null);
-    const acceptsTarget = useCallback9(
+    const ref = useRef4(null);
+    const acceptsTarget = useCallback10(
       (componentType) => {
         if (!componentType) {
           return true;
@@ -5204,29 +4839,44 @@ var DropZoneEdit = forwardRef3(
       },
       [allow, disallow]
     );
-    useEffect15(() => {
+    const targetAccepted = useContextStore(ZoneStoreContext, (s) => {
+      var _a;
+      const draggedComponentType = (_a = s.draggedItem) == null ? void 0 : _a.data.componentType;
+      return acceptsTarget(draggedComponentType);
+    });
+    const hoveringOverArea = inNextDeepestArea || isRootZone;
+    const isEnabled = useContextStore(ZoneStoreContext, (s) => {
+      var _a;
+      let _isEnabled = true;
+      const isDeepestZone = (_a = s.zoneDepthIndex[zoneCompound]) != null ? _a : false;
+      _isEnabled = isDeepestZone;
+      if (_isEnabled) {
+        _isEnabled = targetAccepted;
+      }
+      return _isEnabled;
+    });
+    useEffect16(() => {
       if (registerLocalZone) {
-        registerLocalZone(zoneCompound, acceptsTarget(draggedComponentType));
+        registerLocalZone(zoneCompound, isEnabled);
       }
       return () => {
         if (unregisterLocalZone) {
           unregisterLocalZone(zoneCompound);
         }
       };
-    }, [draggedComponentType, zoneCompound]);
-    const hoveringOverArea = inNextDeepestArea || isRootZone;
-    let isEnabled = true;
-    if (userIsDragging) {
-      isEnabled = isDeepestZone;
-    }
-    if (isEnabled) {
-      isEnabled = acceptsTarget(draggedComponentType);
-    }
+    }, [isEnabled, zoneCompound]);
     const [contentIdsWithPreview, preview] = useContentIdsWithPreview(
       contentIds,
       zoneCompound
     );
     const isDropEnabled = isEnabled && (preview ? contentIdsWithPreview.length === 1 : contentIdsWithPreview.length === 0);
+    const zoneStore = useContext7(ZoneStoreContext);
+    useEffect16(() => {
+      const { enabledIndex } = zoneStore.getState();
+      zoneStore.setState({
+        enabledIndex: __spreadProps(__spreadValues({}, enabledIndex), { [zoneCompound]: isEnabled })
+      });
+    }, [isEnabled, zoneStore, zoneCompound]);
     const droppableConfig = {
       id: zoneCompound,
       collisionPriority: isEnabled ? depth : 0,
@@ -5236,11 +4886,11 @@ var DropZoneEdit = forwardRef3(
       data: {
         areaId,
         depth,
-        isDroppableTarget: acceptsTarget(draggedComponentType),
+        isDroppableTarget: targetAccepted,
         path: path || []
       }
     };
-    const { ref: dropRef } = useDroppableSafe(droppableConfig);
+    const { ref: dropRef } = useDroppable(droppableConfig);
     const isAreaSelected = useAppStore(
       (s) => (s == null ? void 0 : s.selectedItem) && areaId === (s == null ? void 0 : s.selectedItem.props.id)
     );
@@ -5255,7 +4905,6 @@ var DropZoneEdit = forwardRef3(
       {
         className: `${getClassName17({
           isRootZone,
-          userIsDragging,
           hoveringOverArea,
           isEnabled,
           isAreaSelected,
@@ -5277,12 +4926,10 @@ var DropZoneEdit = forwardRef3(
             {
               zoneCompound,
               componentId,
-              preview,
               dragAxis,
-              isEnabled,
               index: i,
               collisionAxis,
-              inDroppableZone: acceptsTarget(draggedComponentType)
+              inDroppableZone: targetAccepted
             },
             componentId
           );
@@ -5297,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,
@@ -5318,12 +4965,12 @@ var DropZoneRenderItem = ({
 var DropZoneRenderPure = (props) => /* @__PURE__ */ jsx23(DropZoneRender, __spreadValues({}, props));
 var DropZoneRender = forwardRef3(
   function DropZoneRenderInternal({ className, style, zone }, ref) {
-    const ctx = useContext6(dropZoneContext);
+    const ctx = useContext7(dropZoneContext);
     const { areaId = "root" } = ctx || {};
-    const { config, data, metadata } = useContext6(renderContext);
+    const { config, data, metadata } = useContext7(renderContext);
     let zoneCompound = rootDroppableId;
     let content = (data == null ? void 0 : data.content) || [];
-    useEffect15(() => {
+    useEffect16(() => {
       if (!content) {
         if (ctx == null ? void 0 : ctx.registerZone) {
           ctx == null ? void 0 : ctx.registerZone(zoneCompound);
@@ -5362,7 +5009,7 @@ var DropZoneRender = forwardRef3(
 var DropZonePure = (props) => /* @__PURE__ */ jsx23(DropZone, __spreadValues({}, props));
 var DropZone = forwardRef3(
   function DropZone2(props, ref) {
-    const ctx = useContext6(dropZoneContext);
+    const ctx = useContext7(dropZoneContext);
     if ((ctx == null ? void 0 : ctx.mode) === "edit") {
       return /* @__PURE__ */ jsx23(Fragment6, { children: /* @__PURE__ */ jsx23(DropZoneEdit, __spreadProps(__spreadValues({}, props), { ref })) });
     }
@@ -5373,7 +5020,6 @@ var DropZone = forwardRef3(
 // lib/dnd/NestedDroppablePlugin.ts
 init_react_import();
 import { Plugin } from "@dnd-kit/abstract";
-import { effects } from "@dnd-kit/state";
 
 // lib/throttle.ts
 init_react_import();
@@ -5422,7 +5068,7 @@ var GlobalPosition = class {
     var _a;
     this.target = target;
     this.original = original;
-    this.frameEl = document.querySelector("#preview-frame");
+    this.frameEl = document.querySelector("iframe#preview-frame");
     if (this.frameEl) {
       this.frameRect = this.frameEl.getBoundingClientRect();
       this.scaleFactor = this.frameRect.width / (((_a = this.frameEl.contentWindow) == null ? void 0 : _a.innerWidth) || 1);
@@ -5487,7 +5133,7 @@ var depthSort = (candidates) => {
     return 0;
   });
 };
-var getZoneId2 = (candidate) => {
+var getZoneId = (candidate) => {
   let id = candidate == null ? void 0 : candidate.id;
   if (!candidate) return null;
   if (candidate.type === "component") {
@@ -5502,6 +5148,7 @@ var getZoneId2 = (candidate) => {
   }
   return id;
 };
+var BUFFER = 6;
 var getPointerCollisions = (position, manager) => {
   const candidates = [];
   let elements = position.target.ownerDocument.elementsFromPoint(
@@ -5525,13 +5172,26 @@ var getPointerCollisions = (position, manager) => {
     for (let i = 0; i < elements.length; i++) {
       const element = elements[i];
       const dropzoneId = element.getAttribute("data-puck-dropzone");
+      const id = element.getAttribute("data-puck-dnd");
+      const isVoid = element.hasAttribute("data-puck-dnd-void");
+      if (BUFFER && (dropzoneId || id) && !isVoid) {
+        const box = element.getBoundingClientRect();
+        const contractedBox = {
+          left: box.left + BUFFER,
+          right: box.right - BUFFER,
+          top: box.top + BUFFER,
+          bottom: box.bottom - BUFFER
+        };
+        if (position.frame.x < contractedBox.left || position.frame.x > contractedBox.right || position.frame.y > contractedBox.bottom || position.frame.y < contractedBox.top) {
+          continue;
+        }
+      }
       if (dropzoneId) {
         const droppable = manager.registry.droppables.get(dropzoneId);
         if (droppable) {
           candidates.push(droppable);
         }
       }
-      const id = element.getAttribute("data-puck-dnd");
       if (id) {
         const droppable = manager.registry.droppables.get(id);
         if (droppable) {
@@ -5580,13 +5240,13 @@ var findDeepestCandidate = (position, manager) => {
       return true;
     });
     filteredCandidates.reverse();
-    const zone = getZoneId2(filteredCandidates[0]);
+    const zone = getZoneId(filteredCandidates[0]);
     const area = (_a = filteredCandidates[0]) == null ? void 0 : _a.data.areaId;
     return { zone, area };
   }
   return {
-    zone: "default-zone",
-    area: null
+    zone: rootDroppableId,
+    area: rootAreaId
   };
 };
 var createNestedDroppablePlugin = ({ onChange }, id) => class NestedDroppablePlugin extends Plugin {
@@ -5595,7 +5255,7 @@ var createNestedDroppablePlugin = ({ onChange }, id) => class NestedDroppablePlu
     if (typeof window === "undefined") {
       return;
     }
-    const cleanupEffect = effects(() => {
+    this.registerEffect(() => {
       const handleMove = (event) => {
         const target = event instanceof BubbledPointerEvent ? event.originalTarget || event.target : event.target;
         const position = new GlobalPosition(target, {
@@ -5619,12 +5279,12 @@ var createNestedDroppablePlugin = ({ onChange }, id) => class NestedDroppablePlu
         capture: true
         // dndkit's PointerSensor prevents propagation during drag
       });
-      this.destroy = () => {
+      const cleanup = () => {
         document.body.removeEventListener("pointermove", handlePointerMove, {
           capture: true
         });
-        cleanupEffect();
       };
+      return cleanup;
     });
   }
 };
@@ -5684,14 +5344,15 @@ function getDeepDir(el) {
 }
 
 // components/DragDropContext/index.tsx
+import { effect } from "@dnd-kit/state";
 import { jsx as jsx24 } from "react/jsx-runtime";
 var DEBUG3 = false;
 var dragListenerContext = createContext4({
   dragListeners: {}
 });
 function useDragListener(type, fn, deps = []) {
-  const { setDragListeners } = useContext7(dragListenerContext);
-  useEffect16(() => {
+  const { setDragListeners } = useContext8(dragListenerContext);
+  useEffect17(() => {
     if (setDragListeners) {
       setDragListeners((old) => __spreadProps(__spreadValues({}, old), {
         [type]: [...old[type] || [], fn]
@@ -5701,8 +5362,8 @@ function useDragListener(type, fn, deps = []) {
 }
 var AREA_CHANGE_DEBOUNCE_MS = 100;
 var useTempDisableFallback = (timeout3) => {
-  const lastFallbackDisable = useRef4(null);
-  return useCallback10((manager) => {
+  const lastFallbackDisable = useRef5(null);
+  return useCallback11((manager) => {
     collisionStore.setState({ fallbackEnabled: false });
     const fallbackId = generateId();
     lastFallbackDisable.current = fallbackId;
@@ -5721,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(() => ({
@@ -5730,10 +5391,12 @@ var DragDropContextClient = ({
       areaDepthIndex: {},
       nextAreaDepthIndex: {},
       draggedItem: null,
-      previewIndex: {}
+      previewIndex: {},
+      enabledIndex: {},
+      hoveringComponent: null
     }))
   );
-  const getChanged2 = useCallback10(
+  const getChanged2 = useCallback11(
     (params, id2) => {
       const { zoneDepthIndex = {}, areaDepthIndex = {} } = zoneStore.getState() || {};
       const stateHasZone = Object.keys(zoneDepthIndex).length > 0;
@@ -5754,7 +5417,7 @@ var DragDropContextClient = ({
     },
     [zoneStore]
   );
-  const setDeepestAndCollide = useCallback10(
+  const setDeepestAndCollide = useCallback11(
     (params, manager) => {
       const { zoneChanged, areaChanged } = getChanged2(params, id);
       if (!zoneChanged && !areaChanged) return;
@@ -5778,7 +5441,7 @@ var DragDropContextClient = ({
     setDeepestDb.cancel();
     debouncedParamsRef.current = null;
   };
-  useEffect16(() => {
+  useEffect17(() => {
     if (DEBUG3) {
       zoneStore.subscribe(
         (s) => {
@@ -5841,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",
@@ -5864,7 +5527,9 @@ var DragDropContextClient = ({
           plugins,
           sensors,
           onDragEnd: (event, manager) => {
-            var _a;
+            var _a, _b;
+            const entryEl = (_a = getFrame()) == null ? void 0 : _a.querySelector("[data-puck-entry]");
+            entryEl == null ? void 0 : entryEl.removeAttribute("data-puck-dragging");
             const { source, target } = event.operation;
             if (!source) {
               zoneStore.setState({ draggedItem: null });
@@ -5872,9 +5537,9 @@ var DragDropContextClient = ({
             }
             const { zone, index } = source.data;
             const { previewIndex = {} } = zoneStore.getState() || {};
-            const thisPreview = ((_a = previewIndex[zone]) == null ? void 0 : _a.props.id) === source.id ? previewIndex[zone] : null;
-            setTimeout(() => {
-              var _a2, _b;
+            const thisPreview = ((_b = previewIndex[zone]) == null ? void 0 : _b.props.id) === source.id ? previewIndex[zone] : null;
+            const onAnimationEnd = () => {
+              var _a2, _b2;
               zoneStore.setState({ draggedItem: null });
               if (event.canceled || (target == null ? void 0 : target.type) === "void") {
                 zoneStore.setState({ previewIndex: {} });
@@ -5910,23 +5575,28 @@ var DragDropContextClient = ({
                   });
                 }
               }
-              setTimeout(() => {
-                dispatch({
-                  type: "setUi",
-                  ui: {
-                    itemSelector: { index, zone },
-                    isDragging: false
-                  },
-                  recordHistory: true
-                });
-              }, 50);
-              (_b = dragListeners.dragend) == null ? void 0 : _b.forEach((fn) => {
+              dispatch({
+                type: "setUi",
+                ui: {
+                  itemSelector: { index, zone },
+                  isDragging: false
+                },
+                recordHistory: true
+              });
+              (_b2 = dragListeners.dragend) == null ? void 0 : _b2.forEach((fn) => {
                 fn(event, manager);
               });
-            }, 250);
+            };
+            let dispose;
+            dispose = effect(() => {
+              if (source.status === "idle") {
+                onAnimationEnd();
+                dispose == null ? void 0 : dispose();
+              }
+            });
           },
           onDragOver: (event, manager) => {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d;
             event.preventDefault();
             const draggedItem = (_a = zoneStore.getState()) == null ? void 0 : _a.draggedItem;
             if (!draggedItem) return;
@@ -5944,7 +5614,7 @@ var DragDropContextClient = ({
               const targetData = target.data;
               targetZone = targetData.zone;
               targetIndex = targetData.index;
-              const collisionData = (_c = (_b = manager.dragOperation.data) == null ? void 0 : _b.collisionMap) == null ? void 0 : _c[targetId];
+              const collisionData = (_b = manager.collisionObserver.collisions[0]) == null ? void 0 : _b.data;
               const dir = getDeepDir(target.element);
               const collisionPosition = (collisionData == null ? void 0 : collisionData.direction) === "up" || dir === "ltr" && (collisionData == null ? void 0 : collisionData.direction) === "left" || dir === "rtl" && (collisionData == null ? void 0 : collisionData.direction) === "right" ? "before" : "after";
               if (targetIndex >= sourceIndex && sourceZone === targetZone) {
@@ -5957,7 +5627,7 @@ var DragDropContextClient = ({
               targetZone = target.id.toString();
               targetIndex = 0;
             }
-            const path = ((_d = appStore.getState().state.indexes.nodes[target.id]) == null ? void 0 : _d.path) || [];
+            const path = ((_c = appStore.getState().state.indexes.nodes[target.id]) == null ? void 0 : _c.path) || [];
             if (targetId === sourceId || path.find((path2) => {
               const [pathId] = path2.split(":");
               return pathId === sourceId;
@@ -6003,16 +5673,12 @@ var DragDropContextClient = ({
                 });
               }
             }
-            (_e = dragListeners.dragover) == null ? void 0 : _e.forEach((fn) => {
+            (_d = dragListeners.dragover) == null ? void 0 : _d.forEach((fn) => {
               fn(event, manager);
             });
           },
           onDragStart: (event, manager) => {
             var _a;
-            dispatch({
-              type: "setUi",
-              ui: { itemSelector: null, isDragging: true }
-            });
             const { source } = event.operation;
             if (source && source.type !== "void") {
               const sourceData = source.data;
@@ -6042,11 +5708,31 @@ var DragDropContextClient = ({
             });
           },
           onBeforeDragStart: (event) => {
-            var _a;
-            const isNewComponent = ((_a = event.operation.source) == null ? void 0 : _a.data.type) === "drawer";
+            var _a, _b, _c, _d;
+            const isNewComponent = ((_a = event.operation.source) == null ? void 0 : _a.type) === "drawer";
             dragMode.current = isNewComponent ? "new" : "existing";
             initialSelector.current = void 0;
             zoneStore.setState({ draggedItem: event.operation.source });
+            if (((_b = appStore.getState().selectedItem) == null ? void 0 : _b.props.id) !== ((_c = event.operation.source) == null ? void 0 : _c.id)) {
+              dispatch({
+                type: "setUi",
+                ui: {
+                  itemSelector: null,
+                  isDragging: true
+                },
+                recordHistory: false
+              });
+            } else {
+              dispatch({
+                type: "setUi",
+                ui: {
+                  isDragging: true
+                },
+                recordHistory: false
+              });
+            }
+            const entryEl = (_d = getFrame()) == null ? void 0 : _d.querySelector("[data-puck-entry]");
+            entryEl == null ? void 0 : entryEl.setAttribute("data-puck-dragging", "true");
           },
           children: /* @__PURE__ */ jsx24(ZoneStoreProvider, { store: zoneStore, children: /* @__PURE__ */ jsx24(DropZoneProvider, { value: nextContextValue, children }) })
         }
@@ -6066,6 +5752,7 @@ var DragDropContext = ({
 };
 
 // components/Drawer/index.tsx
+import { useDraggable, useDroppable as useDroppable2 } from "@dnd-kit/react";
 import { jsx as jsx25, jsxs as jsxs11 } from "react/jsx-runtime";
 var getClassName18 = get_class_name_factory_default("Drawer", styles_module_default10);
 var getClassNameItem2 = get_class_name_factory_default("DrawerItem", styles_module_default10);
@@ -6102,10 +5789,11 @@ var DrawerItemDraggable = ({
   id,
   isDragDisabled
 }) => {
-  const { ref } = useDraggableSafe({
+  const { ref } = useDraggable({
     id,
-    data: { type: "drawer", componentType: name },
-    disabled: isDragDisabled
+    data: { componentType: name },
+    disabled: isDragDisabled,
+    type: "drawer"
   });
   return /* @__PURE__ */ jsxs11("div", { className: getClassName18("draggable"), children: [
     /* @__PURE__ */ jsx25("div", { className: getClassName18("draggableBg"), children: /* @__PURE__ */ jsx25(DrawerItemInner, { name, label, children }) }),
@@ -6170,7 +5858,7 @@ var Drawer = ({
     );
   }
   const id = useSafeId();
-  const { ref } = useDroppableSafe({
+  const { ref } = useDroppable2({
     id,
     type: "void",
     collisionPriority: 0
@@ -6183,6 +5871,7 @@ var Drawer = ({
       ref,
       "data-puck-dnd": id,
       "data-puck-drawer": true,
+      "data-puck-dnd-void": true,
       children
     }
   );
@@ -6193,11 +5882,12 @@ Drawer.Item = DrawerItem;
 init_react_import();
 import {
   createContext as createContext7,
-  useCallback as useCallback16,
-  useContext as useContext11,
-  useEffect as useEffect24,
-  useMemo as useMemo20,
-  useState as useState22
+  useCallback as useCallback18,
+  useContext as useContext12,
+  useEffect as useEffect25,
+  useMemo as useMemo21,
+  useRef as useRef8,
+  useState as useState23
 } from "react";
 
 // components/SidebarSection/index.tsx
@@ -6293,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 useCallback11, 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;
@@ -6416,18 +6062,19 @@ 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 });
     })
   );
   const appStore = useAppStoreApi();
-  const onChange = useCallback11(createOnChange(fieldName, appStore), [
+  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,
@@ -6439,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;
@@ -6455,42 +6103,48 @@ var Fields = ({ wrapFields = true }) => {
   useRegisterFieldsSlice(appStore, id);
   const fieldsLoading = useAppStore((s) => s.fields.loading);
   const fieldNames = useAppStore(
-    useShallow4((s) => Object.keys(s.fields.fields))
+    useShallow5((s) => {
+      if (s.fields.id === id) {
+        return Object.keys(s.fields.fields);
+      }
+      return [];
+    })
   );
   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();
 
 // lib/use-component-list.tsx
 init_react_import();
-import { useEffect as useEffect17, useState as useState16 } from "react";
+import { useEffect as useEffect18, useState as useState16 } from "react";
 
 // components/ComponentList/index.tsx
 init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/ComponentList/styles.module.css#css-module
 init_react_import();
-var styles_module_default17 = { "ComponentList": "_ComponentList_1rrlt_1", "ComponentList--isExpanded": "_ComponentList--isExpanded_1rrlt_5", "ComponentList-content": "_ComponentList-content_1rrlt_9", "ComponentList-title": "_ComponentList-title_1rrlt_17", "ComponentList-titleIcon": "_ComponentList-titleIcon_1rrlt_53" };
+var styles_module_default16 = { "ComponentList": "_ComponentList_1rrlt_1", "ComponentList--isExpanded": "_ComponentList--isExpanded_1rrlt_5", "ComponentList-content": "_ComponentList-content_1rrlt_9", "ComponentList-title": "_ComponentList-title_1rrlt_17", "ComponentList-titleIcon": "_ComponentList-titleIcon_1rrlt_53" };
 
 // components/ComponentList/index.tsx
-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
@@ -6501,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,
@@ -6512,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]), {
@@ -6527,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,
@@ -6548,12 +6202,12 @@ 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);
   const uiComponentList = useAppStore((s) => s.state.ui.componentList);
-  useEffect17(() => {
+  useEffect18(() => {
     var _a, _b, _c;
     if (Object.keys(uiComponentList).length > 0) {
       const matchedComponents = [];
@@ -6563,7 +6217,7 @@ var useComponentList = () => {
           if (category.visible === false || !category.components) {
             return null;
           }
-          return /* @__PURE__ */ jsx30(
+          return /* @__PURE__ */ jsx29(
             ComponentList,
             {
               id: categoryKey,
@@ -6572,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,
@@ -6592,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",
@@ -6600,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,
@@ -6623,29 +6277,29 @@ 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 useCallback12, useEffect as useEffect19, 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();
 import {
   createContext as createContext5,
-  useContext as useContext8,
-  useEffect as useEffect18,
+  useContext as useContext9,
+  useEffect as useEffect19,
   useState as useState17
 } 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 = [];
@@ -6688,7 +6342,7 @@ var CopyHostStyles = ({
   onStylesLoaded = () => null
 }) => {
   const { document: doc, window: win } = useFrame();
-  useEffect18(() => {
+  useEffect19(() => {
     if (!win || !doc) {
       return () => {
       };
@@ -6845,10 +6499,10 @@ var CopyHostStyles = ({
       observer.disconnect();
     };
   }, []);
-  return /* @__PURE__ */ jsx32(Fragment9, { children });
+  return /* @__PURE__ */ jsx31(Fragment8, { children });
 };
 var autoFrameContext = createContext5({});
-var useFrame = () => useContext8(autoFrameContext);
+var useFrame = () => useContext9(autoFrameContext);
 function AutoFrame(_a) {
   var _b = _a, {
     children,
@@ -6873,7 +6527,7 @@ function AutoFrame(_a) {
   const [ctx, setCtx] = useState17({});
   const [mountTarget, setMountTarget] = useState17();
   const [stylesLoaded, setStylesLoaded] = useState17(false);
-  useEffect18(() => {
+  useEffect19(() => {
     var _a2;
     if (frameRef.current) {
       const doc = frameRef.current.contentDocument;
@@ -6892,7 +6546,7 @@ function AutoFrame(_a) {
       }
     }
   }, [frameRef, loaded, stylesLoaded]);
-  return /* @__PURE__ */ jsx32(
+  return /* @__PURE__ */ jsx31(
     "iframe",
     __spreadProps(__spreadValues({}, props), {
       className,
@@ -6902,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,
@@ -6918,14 +6572,14 @@ var AutoFrame_default = AutoFrame;
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Puck/components/Preview/styles.module.css#css-module
 init_react_import();
-var styles_module_default18 = { "PuckPreview": "_PuckPreview_z2rgu_1", "PuckPreview-frame": "_PuckPreview-frame_z2rgu_6" };
+var styles_module_default17 = { "PuckPreview": "_PuckPreview_z2rgu_1", "PuckPreview-frame": "_PuckPreview-frame_z2rgu_6" };
 
 // components/Puck/components/Preview/index.tsx
-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);
-  useEffect19(() => {
+  useEffect20(() => {
     if (ref.current && status === "READY") {
       const iframe = ref.current;
       const handlePointerMove = (event) => {
@@ -6963,7 +6617,7 @@ var useBubbleIframeEvents = (ref) => {
     }
   }, [status]);
 };
-var Preview3 = ({ id = "puck-preview" }) => {
+var Preview2 = ({ id = "puck-preview" }) => {
   const dispatch = useAppStore((s) => s.dispatch);
   const root = useAppStore((s) => s.state.data.root);
   const config = useAppStore((s) => s.config);
@@ -6974,22 +6628,25 @@ var Preview3 = ({ id = "puck-preview" }) => {
   const renderData = useAppStore(
     (s) => s.state.ui.previewMode === "edit" ? null : s.state.data
   );
-  const Page = useCallback12(
+  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: {
@@ -6999,28 +6656,28 @@ var Preview3 = ({ id = "puck-preview" }) => {
         metadata
       },
       editMode: true,
-      children: /* @__PURE__ */ jsx33(DropZonePure, { zone: rootDroppableId })
+      children: /* @__PURE__ */ jsx32(DropZonePure, { zone: rootDroppableId })
     })
-  ) : /* @__PURE__ */ jsx33(Render, { data: renderData, config });
-  useEffect19(() => {
+  ) : /* @__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");
@@ -7029,18 +6686,18 @@ var Preview3 = ({ 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
@@ -7058,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();
@@ -7072,7 +6729,7 @@ var scrollIntoView = (el) => {
 };
 
 // components/LayerTree/index.tsx
-import { useCallback as useCallback13, useContext as useContext9 } from "react";
+import { useCallback as useCallback14, useContext as useContext10 } from "react";
 
 // lib/on-scroll-end.ts
 init_react_import();
@@ -7094,21 +6751,21 @@ 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,
   zoneCompound
 }) => {
   var _a;
-  const ctx = useContext9(dropZoneContext);
+  const ctx = useContext10(dropZoneContext);
   const config = useAppStore((s) => s.config);
   const itemSelector = useAppStore((s) => s.state.ui.itemSelector);
   const dispatch = useAppStore((s) => s.dispatch);
-  const setItemSelector = useCallback13(
+  const setItemSelector = useCallback14(
     (itemSelector2) => {
       dispatch({ type: "setUi", ui: { itemSelector: itemSelector2 } });
     },
@@ -7121,16 +6778,18 @@ 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
       )
     )
   );
   const containsZone = zonesForItem.length > 0;
-  const { setHoveringComponent = () => {
-  }, hoveringComponent } = ctx || {};
-  const isHovering = hoveringComponent === itemId;
+  const zoneStore = useContext10(ZoneStoreContext);
+  const isHovering = useContextStore(
+    ZoneStoreContext,
+    (s) => s.hoveringComponent === itemId
+  );
   const childIsSelected = useAppStore((s) => {
     var _a2, _b;
     const selectedData = s.state.indexes.nodes[(_a2 = s.selectedItem) == null ? void 0 : _a2.props.id];
@@ -7141,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({
@@ -7151,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",
@@ -7166,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);
@@ -7177,31 +6839,31 @@ var Layer = ({
                 });
               });
             },
-            onMouseOver: (e) => {
+            onMouseEnter: (e) => {
               e.stopPropagation();
-              setHoveringComponent(itemId);
+              zoneStore.setState({ hoveringComponent: itemId });
             },
-            onMouseOut: (e) => {
+            onMouseLeave: (e) => {
               e.stopPropagation();
-              setHoveringComponent(null);
+              zoneStore.setState({ hoveringComponent: null });
             },
             children: [
-              containsZone && /* @__PURE__ */ 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))
       ]
     }
   );
@@ -7212,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,
@@ -7253,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],
@@ -7395,30 +7057,30 @@ var getBox = function getBox2(el) {
 
 // components/Puck/components/Canvas/index.tsx
 import {
-  useCallback as useCallback14,
-  useEffect as useEffect21,
+  useCallback as useCallback15,
+  useEffect as useEffect22,
   useMemo as useMemo18,
-  useRef as useRef6,
+  useRef as useRef7,
   useState as useState19
 } from "react";
 
 // components/ViewportControls/index.tsx
 init_react_import();
-import { useEffect as useEffect20, useMemo as useMemo17, useState as useState18 } from "react";
+import { useEffect as useEffect21, useMemo as useMemo17, useState as useState18 } from "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
-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",
@@ -7428,10 +7090,10 @@ var ViewportButton = ({
 }) => {
   const viewports = useAppStore((s) => s.state.ui.viewports);
   const [isActive, setIsActive] = useState18(false);
-  useEffect20(() => {
+  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,
@@ -7440,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 })
     }
   ) });
 };
@@ -7476,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,
@@ -7488,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",
@@ -7503,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",
@@ -7520,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,
@@ -7547,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();
@@ -7580,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 {
@@ -7594,7 +7256,7 @@ var Canvas = () => {
     status,
     iframe
   } = useAppStore(
-    useShallow7((s) => ({
+    useShallow8((s) => ({
       dispatch: s.dispatch,
       overrides: s.overrides,
       setUi: s.setUi,
@@ -7605,23 +7267,23 @@ 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(
     () => overrides.preview || defaultRender,
     [overrides]
   );
-  const getFrameDimensions = useCallback14(() => {
+  const getFrameDimensions = useCallback15(() => {
     if (frameRef.current) {
       const frame = frameRef.current;
       const box = getBox(frame);
@@ -7629,7 +7291,7 @@ var Canvas = () => {
     }
     return { width: 0, height: 0 };
   }, [frameRef]);
-  const resetAutoZoom = useCallback14(
+  const resetAutoZoom = useCallback15(
     (newViewports = viewports) => {
       if (frameRef.current) {
         setZoomConfig(
@@ -7643,11 +7305,11 @@ var Canvas = () => {
     },
     [frameRef, zoomConfig, viewports]
   );
-  useEffect21(() => {
+  useEffect22(() => {
     setShowTransition(false);
     resetAutoZoom(viewports);
   }, [frameRef, leftSideBarVisible, rightSideBarVisible]);
-  useEffect21(() => {
+  useEffect22(() => {
     const { height: frameHeight } = getFrameDimensions();
     if (viewports.current.height === "auto") {
       setZoomConfig(__spreadProps(__spreadValues({}, zoomConfig), {
@@ -7655,13 +7317,13 @@ var Canvas = () => {
       }));
     }
   }, [zoomConfig.zoom]);
-  useEffect21(() => {
+  useEffect22(() => {
     if (ZOOM_ON_CHANGE) {
       setShowTransition(true);
       resetAutoZoom(viewports);
     }
   }, [viewports.current.width]);
-  useEffect21(() => {
+  useEffect22(() => {
     const cb = () => {
       setShowTransition(false);
       resetAutoZoom();
@@ -7672,15 +7334,15 @@ var Canvas = () => {
     };
   }, []);
   const [showLoader, setShowLoader] = useState19(false);
-  useEffect21(() => {
+  useEffect22(() => {
     setTimeout(() => {
       setShowLoader(true);
     }, 500);
   }, []);
-  return /* @__PURE__ */ jsxs18(
+  return /* @__PURE__ */ jsxs17(
     "div",
     {
-      className: getClassName26({
+      className: getClassName25({
         ready: status === "READY" || !iframe.enabled || !iframe.waitForStyles,
         showLoader
       }),
@@ -7690,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,
@@ -7716,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,
@@ -7738,10 +7400,10 @@ var Canvas = () => {
                   })
                 );
               },
-              children: /* @__PURE__ */ jsx37(CustomPreview, { children: /* @__PURE__ */ jsx37(Preview3, {}) })
+              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 }) })
         ] })
       ]
     }
@@ -7796,19 +7458,19 @@ 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();
-import { useEffect as useEffect22, useState as useState20 } from "react";
+import { useEffect as useEffect23, useState as useState20 } from "react";
 var styles = ``;
 var useInjectStyleSheet = (initialStyles, iframeEnabled) => {
   const [el, setEl] = useState20();
-  useEffect22(() => {
+  useEffect23(() => {
     setEl(document.createElement("style"));
   }, []);
-  useEffect22(() => {
+  useEffect23(() => {
     var _a;
     if (!el || typeof window === "undefined") {
       return;
@@ -7828,10 +7490,10 @@ var useInjectGlobalCss = (iframeEnabled) => {
 
 // lib/use-preview-mode-hotkeys.ts
 init_react_import();
-import { useCallback as useCallback15 } from "react";
+import { useCallback as useCallback16 } from "react";
 var usePreviewModeHotkeys = () => {
   const appStore = useAppStoreApi();
-  const toggleInteractive = useCallback15(() => {
+  const toggleInteractive = useCallback16(() => {
     const dispatch = appStore.getState().dispatch;
     dispatch({
       type: "setUi",
@@ -7846,7 +7508,7 @@ var usePreviewModeHotkeys = () => {
 
 // lib/use-puck.ts
 init_react_import();
-import { createContext as createContext6, useContext as useContext10, useEffect as useEffect23, useState as useState21 } from "react";
+import { createContext as createContext6, useContext as useContext11, useEffect as useEffect24, useState as useState21 } from "react";
 import { createStore as createStore4, useStore as useStore3 } from "zustand";
 var generateUsePuck = (store) => {
   const history = {
@@ -7899,7 +7561,7 @@ var useRegisterUsePuckStore = (appStore) => {
       () => generateUsePuck(convertToPickedStore(appStore.getState()))
     )
   );
-  useEffect23(() => {
+  useEffect24(() => {
     return appStore.subscribe(
       (store) => convertToPickedStore(store),
       (pickedStore) => {
@@ -7911,7 +7573,7 @@ var useRegisterUsePuckStore = (appStore) => {
 };
 function createUsePuck() {
   return function usePuck2(selector) {
-    const usePuckApi = useContext10(UsePuckStoreContext);
+    const usePuckApi = useContext11(UsePuckStoreContext);
     if (!usePuckApi) {
       throw new Error("usePuck must be used inside <Puck>.");
     }
@@ -7923,18 +7585,241 @@ function createUsePuck() {
   };
 }
 function usePuck() {
-  useEffect23(() => {
+  useEffect24(() => {
     console.warn(
       "You're using the `usePuck` method without a selector, which may cause unnecessary re-renders. Replace with `createUsePuck` and provide a selector for improved performance."
     );
   }, []);
   return createUsePuck()((s) => s);
 }
+function useGetPuck() {
+  const usePuckApi = useContext11(UsePuckStoreContext);
+  if (!usePuckApi) {
+    throw new Error("usePuckGet must be used inside <Puck>.");
+  }
+  return usePuckApi.getState;
+}
 
 // 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) => {
@@ -7942,13 +7827,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__ */ 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 = () => useContext11(propsContext);
+var usePropsContext = () => useContext12(propsContext);
 function PuckProvider({ children }) {
   const {
     config,
@@ -7964,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 = {};
@@ -8028,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 }] : []
@@ -8048,7 +7936,7 @@ function PuckProvider({ children }) {
     overrides,
     plugins
   });
-  const generateAppStore = useCallback16(
+  const generateAppStore = useCallback18(
     (state) => {
       return {
         state,
@@ -8072,10 +7960,10 @@ function PuckProvider({ children }) {
       metadata
     ]
   );
-  const [appStore] = useState22(
+  const [appStore] = useState23(
     () => createAppStore(generateAppStore(initialAppState))
   );
-  useEffect24(() => {
+  useEffect25(() => {
     const state = appStore.getState().state;
     appStore.setState(__spreadValues({}, generateAppStore(state)));
   }, [config, plugins, loadedOverrides, viewports, iframe, onAction, metadata]);
@@ -8084,66 +7972,47 @@ function PuckProvider({ children }) {
     index: initialHistoryIndex,
     initialAppState
   });
-  useEffect24(() => {
-    appStore.subscribe((s) => {
-      if (onChange) onChange(s.state.data);
-    });
+  const previousData = useRef8(null);
+  useEffect25(() => {
+    appStore.subscribe(
+      (s) => s.state.data,
+      (data) => {
+        if (onChange) {
+          if (fdeq(data, previousData.current)) return;
+          onChange(data);
+          previousData.current = data;
+        }
+      }
+    );
   }, []);
   useRegisterPermissionsSlice(appStore, permissions);
   const uPuckStore = useRegisterUsePuckStore(appStore);
-  useEffect24(() => {
+  useEffect25(() => {
     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 {
-    onChange,
-    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();
-  useEffect24(() => {
-    return appStore.subscribe((s) => {
-      if (onChange) onChange(s.state.data);
-    });
-  }, [appStore]);
-  const rootProps = useAppStore(
-    (s) => s.state.data.root.props || s.state.data.root.props
-  );
   const dispatch = useAppStore((s) => s.dispatch);
-  const toggleSidebars = useCallback16(
-    (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]
-  );
-  useEffect24(() => {
+  useEffect25(() => {
     if (!window.matchMedia("(min-width: 638px)").matches) {
       dispatch({
         type: "setUi",
@@ -8166,55 +8035,18 @@ 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);
-  useEffect24(() => {
+  const [mounted, setMounted] = useState23(false);
+  useEffect25(() => {
     setMounted(true);
   }, []);
   const ready = useAppStore((s) => s.status === "READY");
   useMonitorHotkeys();
-  useEffect24(() => {
+  useEffect25(() => {
     if (ready && iframe.enabled) {
       const frameDoc = getFrame();
       if (frameDoc) {
@@ -8223,246 +8055,36 @@ 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;
 Puck.Outline = Outline;
-Puck.Preview = Preview3;
-
-// lib/migrate.ts
-init_react_import();
-var migrations = [
-  // Migrate root to root.props
-  (data) => {
-    const rootProps = data.root.props || data.root;
-    if (Object.keys(data.root).length > 0 && !data.root.props) {
-      console.warn(
-        "Migration applied: Root props moved from `root` to `root.props`."
-      );
-      return __spreadProps(__spreadValues({}, data), {
-        root: {
-          props: __spreadValues({}, rootProps)
-        }
-      });
-    }
-    return data;
-  },
-  // Migrate zones to slots
-  (data, config) => {
-    var _a;
-    if (!config) return data;
-    console.log("Migrating DropZones to slots...");
-    const updatedItems = {};
-    const appState = __spreadProps(__spreadValues({}, defaultAppState), { data });
-    const { indexes } = walkAppState(appState, config);
-    const deletedCompounds = [];
-    walkAppState(appState, config, (content, zoneCompound, zoneType) => {
-      var _a2, _b;
-      if (zoneType === "dropzone") {
-        const [id, slotName] = zoneCompound.split(":");
-        const nodeData = indexes.nodes[id].data;
-        const componentType = nodeData.type;
-        const configForComponent = config.components[componentType];
-        if (((_b = (_a2 = configForComponent == null ? void 0 : configForComponent.fields) == null ? void 0 : _a2[slotName]) == null ? void 0 : _b.type) === "slot") {
-          updatedItems[id] = __spreadProps(__spreadValues({}, nodeData), {
-            props: __spreadProps(__spreadValues({}, nodeData.props), {
-              [slotName]: content
-            })
-          });
-          deletedCompounds.push(zoneCompound);
-        }
-        return content;
-      }
-      return content;
-    });
-    const updated = walkAppState(
-      appState,
-      config,
-      (content) => content,
-      (item) => {
-        var _a2;
-        return (_a2 = updatedItems[item.props.id]) != null ? _a2 : item;
-      }
-    );
-    deletedCompounds.forEach((zoneCompound) => {
-      var _a2;
-      const [_, propName] = zoneCompound.split(":");
-      console.log(
-        `\u2713 Success: Migrated "${zoneCompound}" from DropZone to slot field "${propName}"`
-      );
-      (_a2 = updated.data.zones) == null ? true : delete _a2[zoneCompound];
-    });
-    Object.keys((_a = updated.data.zones) != null ? _a : {}).forEach((zoneCompound) => {
-      const [_, propName] = zoneCompound.split(":");
-      throw new Error(
-        `Could not migrate DropZone "${zoneCompound}" to slot field. No slot exists with the name "${propName}".`
-      );
-    });
-    delete updated.data.zones;
-    return updated.data;
-  }
-];
-function migrate(data, config) {
-  return migrations == null ? void 0 : migrations.reduce(
-    (acc, migration) => migration(acc, config),
-    data
-  );
-}
-
-// lib/data/walk-tree.ts
-init_react_import();
-function walkTree(data, config, callbackFn) {
-  var _a, _b;
-  const isSlot2 = createIsSlotConfig(config);
-  const walkItem = (item) => {
-    return mapSlotsSync(
-      item,
-      (content, parentId, propName) => callbackFn(content, { parentId, propName }),
-      isSlot2
-    );
-  };
-  if ("props" in data) {
-    return walkItem(data);
-  }
-  const _data = data;
-  const zones = (_a = _data.zones) != null ? _a : {};
-  const mappedContent = _data.content.map(walkItem);
-  return {
-    root: walkItem(_data.root),
-    content: (_b = callbackFn(mappedContent, {
-      parentId: "root",
-      propName: "default-zone"
-    })) != null ? _b : mappedContent,
-    zones: Object.keys(zones).reduce(
-      (acc, zoneCompound) => __spreadProps(__spreadValues({}, acc), {
-        [zoneCompound]: zones[zoneCompound].map(walkItem)
-      }),
-      {}
-    )
-  };
-}
+Puck.Preview = Preview2;
 export {
   Action,
   ActionBar,
@@ -8482,6 +8104,7 @@ export {
   renderContext,
   resolveAllData,
   transformProps,
+  useGetPuck,
   usePuck,
   walkTree
 };