@measured/puck 0.18.0-canary.066aba9 → 0.18.0-canary.874ba1b

package/dist/index.mjs

@@ -1085,7 +1085,7 @@ init_react_import();
 import { DragDropProvider } from "@dnd-kit/react";
 import { useState as useState5 } from "react";
 
-// lib/dnd-kit/safe.ts
+// lib/dnd/dnd-kit/safe.ts
 init_react_import();
 import {
   useDraggable,
@@ -1379,14 +1379,18 @@ var ArrayField = ({
                               const subFieldName = `${name}[${i}].${fieldName}`;
                               const wildcardFieldName = `${name}[*].${fieldName}`;
                               const subReadOnly = forceReadOnly ? forceReadOnly : typeof readOnlyFields[subFieldName] !== "undefined" ? readOnlyFields[subFieldName] : readOnlyFields[wildcardFieldName];
+                              const label2 = subField.label || fieldName;
                               return /* @__PURE__ */ jsx7(
                                 AutoFieldPrivate,
                                 {
                                   name: subFieldName,
-                                  label: subField.label || fieldName,
+                                  label: label2,
                                   id: `${_arrayId}_${fieldName}`,
                                   readOnly: subReadOnly,
-                                  field: subField,
+                                  field: __spreadProps(__spreadValues({}, subField), {
+                                    label: label2
+                                    // May be used by custom fields
+                                  }),
                                   value: data[fieldName],
                                   onChange: (val, ui) => {
                                     onChange(
@@ -2115,14 +2119,18 @@ var ObjectField = ({
         const subFieldName = `${name}.${fieldName}`;
         const wildcardFieldName = `${name}.${fieldName}`;
         const subReadOnly = readOnly ? readOnly : typeof readOnlyFields[subFieldName] !== "undefined" ? readOnlyFields[subFieldName] : readOnlyFields[wildcardFieldName];
+        const label2 = subField.label || fieldName;
         return /* @__PURE__ */ jsx17(
           AutoFieldPrivate,
           {
             name: subFieldName,
-            label: subField.label || fieldName,
+            label: label2,
             id: `${id}_${fieldName}`,
             readOnly: subReadOnly,
-            field: subField,
+            field: __spreadProps(__spreadValues({}, subField), {
+              label: label2
+              // May be used by custom fields
+            }),
             value: data[fieldName],
             onChange: (val, ui) => {
               onChange(
@@ -2334,18 +2342,19 @@ 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" };
 
 // components/Drawer/index.tsx
-import { useMemo as useMemo8, useState as useState17 } from "react";
+import { useMemo as useMemo8, useState as useState18 } from "react";
 
 // components/DragDropContext/index.tsx
 init_react_import();
 import { DragDropProvider as DragDropProvider2 } from "@dnd-kit/react";
 import {
   createContext as createContext3,
-  useCallback as useCallback9,
-  useContext as useContext4,
-  useEffect as useEffect13,
+  useCallback as useCallback11,
+  useContext as useContext5,
+  useEffect as useEffect15,
+  useId,
   useRef as useRef5,
-  useState as useState16
+  useState as useState17
 } from "react";
 import { AutoScroller, defaultPreset } from "@dnd-kit/dom";
 
@@ -2353,23 +2362,22 @@ import { AutoScroller, defaultPreset } from "@dnd-kit/dom";
 init_react_import();
 import {
   forwardRef as forwardRef3,
-  useCallback as useCallback8,
-  useContext as useContext3,
-  useEffect as useEffect12,
+  useCallback as useCallback10,
+  useContext as useContext4,
+  useEffect as useEffect14,
   useMemo as useMemo7,
-  useRef as useRef4,
-  useState as useState15
+  useRef as useRef4
 } from "react";
 
 // components/DraggableComponent/index.tsx
 init_react_import();
 import {
-  useCallback as useCallback6,
-  useContext as useContext2,
+  useCallback as useCallback7,
+  useContext as useContext3,
   useEffect as useEffect10,
-  useMemo as useMemo5,
+  useMemo as useMemo6,
   useRef as useRef3,
-  useState as useState12
+  useState as useState13
 } from "react";
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/DraggableComponent/styles.module.css#css-module
@@ -2379,18 +2387,18 @@ var styles_module_default11 = { "DraggableComponent": "_DraggableComponent_1ukn8
 // components/DraggableComponent/index.tsx
 import { createPortal as createPortal2 } from "react-dom";
 
-// components/DraggableComponent/collision/dynamic/index.ts
+// lib/dnd/collision/dynamic/index.ts
 init_react_import();
 import {
   CollisionPriority as CollisionPriority7,
   CollisionType as CollisionType7
 } from "@dnd-kit/abstract";
 
-// components/DraggableComponent/collision/directional/index.ts
+// lib/dnd/collision/directional/index.ts
 init_react_import();
 import { CollisionType } from "@dnd-kit/abstract";
 
-// components/DraggableComponent/collision/collision-debug.ts
+// lib/dnd/collision/collision-debug.ts
 init_react_import();
 var DEBUG = false;
 var debugElements = {};
@@ -2439,7 +2447,7 @@ var collisionDebug = (a, b, id, color, label) => {
   });
 };
 
-// components/DraggableComponent/collision/directional/index.ts
+// lib/dnd/collision/directional/index.ts
 var distanceChange = "increasing";
 var directionalCollision = (input, previous) => {
   var _a;
@@ -2472,7 +2480,7 @@ var directionalCollision = (input, previous) => {
   return null;
 };
 
-// components/DraggableComponent/collision/dynamic/get-direction.ts
+// lib/dnd/collision/dynamic/get-direction.ts
 init_react_import();
 var getDirection = (dragAxis, delta) => {
   if (dragAxis === "dynamic") {
@@ -2487,7 +2495,7 @@ var getDirection = (dragAxis, delta) => {
   return delta.y === 0 ? null : delta.y > 0 ? "down" : "up";
 };
 
-// components/DraggableComponent/collision/dynamic/get-midpoint-impact.ts
+// lib/dnd/collision/dynamic/get-midpoint-impact.ts
 init_react_import();
 var getMidpointImpact = (dragShape, dropShape, direction, offsetMultiplier = 0) => {
   const dragRect = dragShape.boundingRectangle;
@@ -2506,7 +2514,7 @@ var getMidpointImpact = (dragShape, dropShape, direction, offsetMultiplier = 0)
   return dragRect.right - offset >= dropCenter.x;
 };
 
-// components/DraggableComponent/collision/dynamic/track-movement-interval.ts
+// lib/dnd/collision/dynamic/track-movement-interval.ts
 init_react_import();
 import { Point } from "@dnd-kit/geometry";
 var INTERVAL_SENSITIVITY = 10;
@@ -2610,7 +2618,14 @@ var closestCorners = (input) => {
   };
 };
 
-// components/DraggableComponent/collision/dynamic/index.ts
+// lib/dnd/collision/dynamic/store.ts
+init_react_import();
+import { createStore } from "zustand/vanilla";
+var collisionStore = createStore(() => ({
+  fallbackEnabled: false
+}));
+
+// lib/dnd/collision/dynamic/index.ts
 var flushNext = "";
 var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input) => {
   var _a, _b, _c, _d, _e;
@@ -2622,6 +2637,7 @@ var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input
     return null;
   }
   const { center: dragCenter } = dragShape;
+  const { fallbackEnabled } = collisionStore.getState();
   const interval = trackMovementInterval(position.current, dragAxis);
   dragOperation.data = __spreadProps(__spreadValues({}, dragOperation.data), {
     direction: interval.direction
@@ -2667,7 +2683,7 @@ var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input
     flushNext = "";
     return __spreadProps(__spreadValues({}, collision), { id: shouldFlushId ? "flush" : collision.id });
   }
-  if (((_c = dragOperation.source) == null ? void 0 : _c.id) !== droppable.id) {
+  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;
     const yAxisIntersection = dropShape.boundingRectangle.bottom > dragShape.boundingRectangle.top && dropShape.boundingRectangle.top < dragShape.boundingRectangle.bottom;
     if (dragAxis === "y" && xAxisIntersection || yAxisIntersection) {
@@ -2728,8 +2744,107 @@ function getDeepScrollPosition(element) {
   return totalScroll;
 }
 
+// components/DropZone/context.tsx
+init_react_import();
+import {
+  createContext as createContext2,
+  useCallback as useCallback6,
+  useMemo as useMemo5,
+  useState as useState12
+} from "react";
+import { createStore as createStore2 } from "zustand";
+import { Fragment as Fragment5, jsx as jsx19 } from "react/jsx-runtime";
+var dropZoneContext = createContext2(null);
+var ZoneStoreContext = createContext2(
+  createStore2(() => ({
+    zoneDepthIndex: {},
+    nextZoneDepthIndex: {},
+    areaDepthIndex: {},
+    nextAreaDepthIndex: {},
+    draggedItem: null,
+    previewIndex: {}
+  }))
+);
+var ZoneStoreProvider = ({
+  children,
+  store
+}) => {
+  return /* @__PURE__ */ jsx19(ZoneStoreContext.Provider, { value: store, children });
+};
+var DropZoneProvider = ({
+  children,
+  value
+}) => {
+  const [hoveringComponent, setHoveringComponent] = useState12();
+  const [areasWithZones, setAreasWithZones] = useState12(
+    {}
+  );
+  const [activeZones, setActiveZones] = useState12({});
+  const { dispatch } = useAppContext();
+  const registerZoneArea = useCallback6(
+    (area) => {
+      setAreasWithZones((latest) => __spreadProps(__spreadValues({}, latest), { [area]: true }));
+    },
+    [setAreasWithZones]
+  );
+  const registerZone = useCallback6(
+    (zoneCompound) => {
+      if (!dispatch) {
+        return;
+      }
+      dispatch({
+        type: "registerZone",
+        zone: zoneCompound
+      });
+      setActiveZones((latest) => __spreadProps(__spreadValues({}, latest), { [zoneCompound]: true }));
+    },
+    [setActiveZones, dispatch]
+  );
+  const unregisterZone = useCallback6(
+    (zoneCompound) => {
+      if (!dispatch) {
+        return;
+      }
+      dispatch({
+        type: "unregisterZone",
+        zone: zoneCompound
+      });
+      setActiveZones((latest) => __spreadProps(__spreadValues({}, latest), {
+        [zoneCompound]: false
+      }));
+    },
+    [setActiveZones, dispatch]
+  );
+  const memoValue = useMemo5(
+    () => __spreadValues({
+      hoveringComponent,
+      setHoveringComponent,
+      registerZoneArea,
+      areasWithZones,
+      registerZone,
+      unregisterZone,
+      activeZones
+    }, value),
+    [value, hoveringComponent, areasWithZones, activeZones]
+  );
+  return /* @__PURE__ */ jsx19(Fragment5, { children: memoValue && /* @__PURE__ */ jsx19(dropZoneContext.Provider, { value: memoValue, children }) });
+};
+
+// lib/use-context-store.ts
+init_react_import();
+import { useContext as useContext2 } from "react";
+import { useStore } from "zustand";
+import { useShallow } from "zustand/react/shallow";
+function useContextStore(context, selector) {
+  const store = useContext2(context);
+  if (!store) {
+    throw new Error("useContextStore must be used inside context");
+  }
+  return useStore(store, useShallow(selector));
+}
+
 // components/DraggableComponent/index.tsx
-import { jsx as jsx19, jsxs as jsxs9 } from "react/jsx-runtime";
+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;
 var space = 8;
@@ -2743,9 +2858,9 @@ var DefaultActionBar = ({
 }) => /* @__PURE__ */ jsxs9(ActionBar, { children: [
   /* @__PURE__ */ jsxs9(ActionBar.Group, { children: [
     parentAction,
-    label && /* @__PURE__ */ jsx19(ActionBar.Label, { label })
+    label && /* @__PURE__ */ jsx20(ActionBar.Label, { label })
   ] }),
-  /* @__PURE__ */ jsx19(ActionBar.Group, { children })
+  /* @__PURE__ */ jsx20(ActionBar.Group, { children })
 ] });
 var convertIdToSelector = (id, zoneCompound, data) => {
   const content = zoneCompound && data.zones && zoneCompound !== "default-zone" ? data.zones[zoneCompound] : data.content;
@@ -2780,9 +2895,9 @@ var DraggableComponent = ({
     iframe,
     state
   } = useAppContext();
-  const ctx = useContext2(dropZoneContext);
-  const [localZones, setLocalZones] = useState12({});
-  const registerLocalZone = useCallback6(
+  const ctx = useContext3(dropZoneContext);
+  const [localZones, setLocalZones] = useState13({});
+  const registerLocalZone = useCallback7(
     (zoneCompound2, active) => {
       var _a;
       (_a = ctx == null ? void 0 : ctx.registerLocalZone) == null ? void 0 : _a.call(ctx, zoneCompound2, active);
@@ -2792,7 +2907,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);
@@ -2806,7 +2921,7 @@ var DraggableComponent = ({
   );
   const containsActiveZone = Object.values(localZones).filter(Boolean).length > 0;
   const { path = [] } = ctx || {};
-  const [canDrag, setCanDrag] = useState12(false);
+  const [canDrag, setCanDrag] = useState13(false);
   useEffect10(() => {
     var _a;
     const item = getItem({ index, zone: zoneCompound }, state.data);
@@ -2817,10 +2932,13 @@ var DraggableComponent = ({
       setCanDrag((_a = perms.drag) != null ? _a : true);
     }
   }, [state, index, zoneCompound, getPermissions]);
-  const userIsDragging = !!(ctx == null ? void 0 : ctx.draggedItem);
+  const userIsDragging = useContextStore(
+    ZoneStoreContext,
+    (s) => !!s.draggedItem
+  );
   const canCollide = canDrag || userIsDragging;
   const disabled = !isEnabled || !canCollide;
-  const [dragAxis, setDragAxis] = useState12(userDragAxis || autoDragAxis);
+  const [dragAxis, setDragAxis] = useState13(userDragAxis || autoDragAxis);
   const { ref: sortableRef, status } = useSortableSafe({
     id,
     index,
@@ -2847,7 +2965,7 @@ var DraggableComponent = ({
   });
   const thisIsDragging = status === "dragging";
   const ref = useRef3(null);
-  const refSetter = useCallback6(
+  const refSetter = useCallback7(
     (el) => {
       sortableRef(el);
       if (el) {
@@ -2856,14 +2974,14 @@ var DraggableComponent = ({
     },
     [sortableRef]
   );
-  const [portalEl, setPortalEl] = useState12();
+  const [portalEl, setPortalEl] = useState13();
   useEffect10(() => {
     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();
@@ -2883,8 +3001,8 @@ var DraggableComponent = ({
     };
     return style2;
   }, [ref.current]);
-  const [style, setStyle] = useState12();
-  const sync = useCallback6(() => {
+  const [style, setStyle] = useState13();
+  const sync = useCallback7(() => {
     setStyle(getStyle());
   }, [ref.current, iframe]);
   useEffect10(() => {
@@ -2897,19 +3015,21 @@ var DraggableComponent = ({
     }
   }, [ref.current]);
   useEffect10(() => {
-    ctx == null ? void 0 : ctx.registerPath({
-      index,
-      zone: zoneCompound
-    });
+    if (isSelected) {
+      ctx == null ? void 0 : ctx.registerPath({
+        index,
+        zone: zoneCompound
+      });
+    }
   }, [isSelected]);
-  const CustomActionBar = useMemo5(
+  const CustomActionBar = useMemo6(
     () => overrides.actionBar || DefaultActionBar,
     [overrides.actionBar]
   );
   const permissions = getPermissions({
     item: selectedItem
   });
-  const onClick = useCallback6(
+  const onClick = useCallback7(
     (e) => {
       e.stopPropagation();
       dispatch({
@@ -2921,7 +3041,7 @@ var DraggableComponent = ({
     },
     [index, zoneCompound, id]
   );
-  const onSelectParent = useCallback6(() => {
+  const onSelectParent = useCallback7(() => {
     if (!(ctx == null ? void 0 : ctx.areaId)) {
       return;
     }
@@ -2939,21 +3059,21 @@ 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,
       zone: zoneCompound
     });
   }, [index, zoneCompound]);
-  const [hover, setHover] = useState12(false);
+  const [hover, setHover] = useState13(false);
   const indicativeHover = (ctx == null ? void 0 : ctx.hoveringComponent) === id;
   useEffect10(() => {
     if (!ref.current) {
@@ -3014,7 +3134,7 @@ var DraggableComponent = ({
       };
     }
   }, [disabled, ref]);
-  const [isVisible, setIsVisible] = useState12(false);
+  const [isVisible, setIsVisible] = useState13(false);
   useEffect10(() => {
     sync();
     if ((isSelected || hover || indicativeHover) && !userIsDragging) {
@@ -3023,7 +3143,7 @@ var DraggableComponent = ({
       setIsVisible(false);
     }
   }, [isSelected, hover, indicativeHover, iframe, state.data, userIsDragging]);
-  const syncActionsPosition = useCallback6(
+  const syncActionsPosition = useCallback7(
     (el) => {
       if (el) {
         const view = el.ownerDocument.defaultView;
@@ -3054,7 +3174,7 @@ var DraggableComponent = ({
     }
     setDragAxis(autoDragAxis);
   }, [ref, userDragAxis, autoDragAxis]);
-  const parentAction = (ctx == null ? void 0 : ctx.areaId) && (ctx == null ? void 0 : ctx.areaId) !== "root" && /* @__PURE__ */ jsx19(ActionBar.Action, { onClick: onSelectParent, label: "Select parent", children: /* @__PURE__ */ jsx19(CornerLeftUp, { size: 16 }) });
+  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 }) });
   return /* @__PURE__ */ jsxs9(
     DropZoneProvider,
     {
@@ -3081,15 +3201,15 @@ var DraggableComponent = ({
               "data-puck-overlay": true,
               children: [
                 debug,
-                isLoading && /* @__PURE__ */ jsx19("div", { className: getClassName16("loadingOverlay"), children: /* @__PURE__ */ jsx19(Loader, {}) }),
-                /* @__PURE__ */ jsx19(
+                isLoading && /* @__PURE__ */ jsx20("div", { className: getClassName16("loadingOverlay"), children: /* @__PURE__ */ jsx20(Loader, {}) }),
+                /* @__PURE__ */ jsx20(
                   "div",
                   {
                     className: getClassName16("actionsOverlay"),
                     style: {
                       top: actionsOverlayTop / zoomConfig.zoom
                     },
-                    children: /* @__PURE__ */ jsx19(
+                    children: /* @__PURE__ */ jsx20(
                       "div",
                       {
                         className: getClassName16("actions"),
@@ -3107,8 +3227,8 @@ var DraggableComponent = ({
                             parentAction,
                             label: DEBUG2 ? id : label,
                             children: [
-                              permissions.duplicate && /* @__PURE__ */ jsx19(ActionBar.Action, { onClick: onDuplicate, label: "Duplicate", children: /* @__PURE__ */ jsx19(Copy, { size: 16 }) }),
-                              permissions.delete && /* @__PURE__ */ jsx19(ActionBar.Action, { onClick: onDelete, label: "Delete", children: /* @__PURE__ */ jsx19(Trash, { size: 16 }) })
+                              permissions.duplicate && /* @__PURE__ */ jsx20(ActionBar.Action, { onClick: onDuplicate, label: "Duplicate", children: /* @__PURE__ */ jsx20(Copy, { size: 16 }) }),
+                              permissions.delete && /* @__PURE__ */ jsx20(ActionBar.Action, { onClick: onDelete, label: "Delete", children: /* @__PURE__ */ jsx20(Trash, { size: 16 }) })
                             ]
                           }
                         )
@@ -3116,7 +3236,7 @@ var DraggableComponent = ({
                     )
                   }
                 ),
-                /* @__PURE__ */ jsx19("div", { className: getClassName16("overlay") })
+                /* @__PURE__ */ jsx20("div", { className: getClassName16("overlay") })
               ]
             }
           ),
@@ -3132,98 +3252,26 @@ var DraggableComponent = ({
 init_react_import();
 var styles_module_default12 = { "DropZone": "_DropZone_kmkdc_1", "DropZone--isActive": "_DropZone--isActive_kmkdc_10", "DropZone--hasChildren": "_DropZone--hasChildren_kmkdc_14", "DropZone--userIsDragging": "_DropZone--userIsDragging_kmkdc_22", "DropZone--isAreaSelected": "_DropZone--isAreaSelected_kmkdc_26", "DropZone--hoveringOverArea": "_DropZone--hoveringOverArea_kmkdc_27", "DropZone--isRootZone": "_DropZone--isRootZone_kmkdc_27", "DropZone--isDestination": "_DropZone--isDestination_kmkdc_37", "DropZone-item": "_DropZone-item_kmkdc_49", "DropZone-hitbox": "_DropZone-hitbox_kmkdc_53", "DropZone--isEnabled": "_DropZone--isEnabled_kmkdc_61", "DropZone--isAnimating": "_DropZone--isAnimating_kmkdc_70" };
 
-// components/DropZone/context.tsx
-init_react_import();
-import {
-  createContext as createContext2,
-  useCallback as useCallback7,
-  useMemo as useMemo6,
-  useState as useState13
-} from "react";
-import { Fragment as Fragment5, jsx as jsx20 } from "react/jsx-runtime";
-var dropZoneContext = createContext2(null);
-var DropZoneProvider = ({
-  children,
-  value
-}) => {
-  const [hoveringComponent, setHoveringComponent] = useState13();
-  const [areasWithZones, setAreasWithZones] = useState13(
-    {}
-  );
-  const [activeZones, setActiveZones] = useState13({});
-  const { dispatch } = useAppContext();
-  const registerZoneArea = useCallback7(
-    (area) => {
-      setAreasWithZones((latest) => __spreadProps(__spreadValues({}, latest), { [area]: true }));
-    },
-    [setAreasWithZones]
-  );
-  const registerZone = useCallback7(
-    (zoneCompound) => {
-      if (!dispatch) {
-        return;
-      }
-      dispatch({
-        type: "registerZone",
-        zone: zoneCompound
-      });
-      setActiveZones((latest) => __spreadProps(__spreadValues({}, latest), { [zoneCompound]: true }));
-    },
-    [setActiveZones, dispatch]
-  );
-  const unregisterZone = useCallback7(
-    (zoneCompound) => {
-      if (!dispatch) {
-        return;
-      }
-      dispatch({
-        type: "unregisterZone",
-        zone: zoneCompound
-      });
-      setActiveZones((latest) => __spreadProps(__spreadValues({}, latest), {
-        [zoneCompound]: false
-      }));
-    },
-    [setActiveZones, dispatch]
-  );
-  const memoValue = useMemo6(
-    () => __spreadValues({
-      hoveringComponent,
-      setHoveringComponent,
-      registerZoneArea,
-      areasWithZones,
-      registerZone,
-      unregisterZone,
-      activeZones
-    }, value),
-    [value, hoveringComponent, areasWithZones, activeZones]
-  );
-  return /* @__PURE__ */ jsx20(Fragment5, { children: memoValue && /* @__PURE__ */ jsx20(dropZoneContext.Provider, { value: memoValue, children }) });
-};
-
-// lib/insert.ts
-init_react_import();
-var insert = (list, index, item) => {
-  const result = Array.from(list);
-  result.splice(index, 0, item);
-  return result;
-};
-
-// components/DropZone/use-min-empty-height.ts
+// components/DropZone/lib/use-min-empty-height.ts
 init_react_import();
 import { useEffect as useEffect11, useState as useState14 } from "react";
 var useMinEmptyHeight = ({
-  draggedItem,
   zoneCompound,
   userMinEmptyHeight,
   ref
 }) => {
   const [prevHeight, setPrevHeight] = useState14(0);
   const [isAnimating, setIsAnimating] = useState14(false);
+  const { draggedItem, isZone } = useContextStore(ZoneStoreContext, (s) => {
+    var _a, _b;
+    return {
+      draggedItem: ((_a = s.draggedItem) == null ? void 0 : _a.data.zone) === zoneCompound ? s.draggedItem : null,
+      isZone: ((_b = s.draggedItem) == null ? void 0 : _b.data.zone) === zoneCompound
+    };
+  });
   useEffect11(() => {
     if (draggedItem && ref.current) {
-      const componentData = draggedItem.data;
-      if (componentData.zone === zoneCompound) {
+      if (isZone) {
         const rect = ref.current.getBoundingClientRect();
         setPrevHeight(rect.height);
         setIsAnimating(true);
@@ -3253,13 +3301,128 @@ function assignRefs(refs, node) {
   });
 }
 
-// components/DropZone/index.tsx
-import { Fragment as Fragment6, jsx as jsx21, jsxs as jsxs10 } from "react/jsx-runtime";
-var getClassName17 = get_class_name_factory_default("DropZone", styles_module_default12);
-var DEBUG3 = false;
+// components/DropZone/lib/use-content-with-preview.ts
+init_react_import();
+import { useEffect as useEffect12, useState as useState15 } from "react";
+
+// lib/dnd/use-rendered-callback.ts
+init_react_import();
+import { useDragDropManager } from "@dnd-kit/react";
+import { useCallback as useCallback8 } from "react";
+function useRenderedCallback(callback, deps) {
+  const manager = useDragDropManager();
+  return useCallback8(
+    (...args) => __async(this, null, function* () {
+      yield manager == null ? void 0 : manager.renderer.rendering;
+      return callback(...args);
+    }),
+    [...deps, manager]
+  );
+}
+
+// lib/insert.ts
+init_react_import();
+var insert = (list, index, item) => {
+  const result = Array.from(list);
+  result.splice(index, 0, item);
+  return result;
+};
+
+// components/DropZone/lib/use-content-with-preview.ts
+var useContentWithPreview = (content, zoneCompound) => {
+  const { draggedItemId, preview, previewExists } = 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
+      };
+    }
+  );
+  const [contentWithPreview, setContentWithPreview] = useState15(content);
+  const updateContent = useRenderedCallback(
+    (content2, preview2) => {
+      if (preview2) {
+        if (preview2.type === "insert") {
+          setContentWithPreview(
+            insert(
+              content2.filter((item) => item.props.id !== preview2.props.id),
+              preview2.index,
+              {
+                type: "preview",
+                props: { id: preview2.props.id }
+              }
+            )
+          );
+        } else {
+          setContentWithPreview(
+            insert(
+              content2.filter((item) => item.props.id !== preview2.props.id),
+              preview2.index,
+              {
+                type: preview2.componentType,
+                props: preview2.props
+              }
+            )
+          );
+        }
+      } else {
+        setContentWithPreview(
+          previewExists ? content2.filter((item) => item.props.id !== draggedItemId) : content2
+        );
+      }
+    },
+    [draggedItemId, previewExists]
+  );
+  useEffect12(() => {
+    updateContent(content, preview);
+  }, [content, preview]);
+  return contentWithPreview;
+};
+
+// components/DropZone/lib/use-drag-axis.ts
+init_react_import();
+import { useCallback as useCallback9, useEffect as useEffect13, useState as useState16 } from "react";
 var GRID_DRAG_AXIS = "dynamic";
 var FLEX_ROW_DRAG_AXIS = "x";
 var DEFAULT_DRAG_AXIS = "y";
+var useDragAxis = (ref, collisionAxis) => {
+  const { status } = useAppContext();
+  const [dragAxis, setDragAxis] = useState16(
+    collisionAxis || DEFAULT_DRAG_AXIS
+  );
+  const calculateDragAxis = useCallback9(() => {
+    if (ref.current) {
+      const computedStyle = window.getComputedStyle(ref.current);
+      if (computedStyle.display === "grid") {
+        setDragAxis(GRID_DRAG_AXIS);
+      } else if (computedStyle.display === "flex" && computedStyle.flexDirection === "row") {
+        setDragAxis(FLEX_ROW_DRAG_AXIS);
+      } else {
+        setDragAxis(DEFAULT_DRAG_AXIS);
+      }
+    }
+  }, [ref.current]);
+  useEffect13(() => {
+    const onViewportChange = () => {
+      calculateDragAxis();
+    };
+    window.addEventListener("viewportchange", onViewportChange);
+    return () => {
+      window.removeEventListener("viewportchange", onViewportChange);
+    };
+  }, []);
+  useEffect13(calculateDragAxis, [status, collisionAxis]);
+  return [dragAxis, calculateDragAxis];
+};
+
+// components/DropZone/index.tsx
+import { Fragment as Fragment6, jsx as jsx21, jsxs as jsxs10 } from "react/jsx-runtime";
+var getClassName17 = get_class_name_factory_default("DropZone", styles_module_default12);
+var getRandomColor = () => `#${Math.floor(Math.random() * 16777215).toString(16)}`;
+var RENDER_DEBUG = false;
 var DropZoneEdit = forwardRef3(
   function DropZoneEdit2({
     zone,
@@ -3271,31 +3434,50 @@ var DropZoneEdit = forwardRef3(
     collisionAxis
   }, userRef) {
     const appContext2 = useAppContext();
-    const ctx = useContext3(dropZoneContext);
+    const ctx = useContext4(dropZoneContext);
     const {
       // These all need setting via context
       data,
       config,
       areaId,
-      draggedItem,
       registerZoneArea,
       depth,
       registerLocalZone,
       unregisterLocalZone,
-      deepestZone = rootDroppableId,
-      deepestArea,
-      nextDeepestArea,
       path = [],
       activeZones
     } = ctx;
-    const { itemSelector } = appContext2.state.ui;
     let zoneCompound = rootDroppableId;
-    useEffect12(() => {
+    if (areaId) {
+      if (zone !== rootDroppableId) {
+        zoneCompound = `${areaId}:${zone}`;
+      }
+    }
+    const isRootZone = zoneCompound === rootDroppableId || zone === rootDroppableId || areaId === "root";
+    const {
+      isDeepestZone,
+      inNextDeepestArea,
+      draggedComponentType,
+      userIsDragging,
+      preview
+    } = useContextStore(ZoneStoreContext, (s) => {
+      var _a, _b, _c;
+      return {
+        isDeepestZone: (_a = s.zoneDepthIndex[zoneCompound]) != null ? _a : false,
+        inNextDeepestArea: s.nextAreaDepthIndex[areaId || ""],
+        draggedItemId: (_b = s.draggedItem) == null ? void 0 : _b.id,
+        draggedComponentType: (_c = s.draggedItem) == null ? void 0 : _c.data.componentType,
+        userIsDragging: !!s.draggedItem,
+        preview: s.previewIndex[zoneCompound]
+      };
+    });
+    const { itemSelector } = appContext2.state.ui;
+    useEffect14(() => {
       if (areaId && registerZoneArea) {
         registerZoneArea(areaId);
       }
     }, [areaId]);
-    useEffect12(() => {
+    useEffect14(() => {
       if (ctx == null ? void 0 : ctx.registerZone) {
         ctx == null ? void 0 : ctx.registerZone(zoneCompound);
       }
@@ -3305,11 +3487,6 @@ var DropZoneEdit = forwardRef3(
         }
       };
     }, []);
-    if (areaId) {
-      if (zone !== rootDroppableId) {
-        zoneCompound = `${areaId}:${zone}`;
-      }
-    }
     const content = useMemo7(() => {
       if (areaId && zone !== rootDroppableId) {
         return setupZone(data, zoneCompound).zones[zoneCompound];
@@ -3317,13 +3494,11 @@ var DropZoneEdit = forwardRef3(
       return data.content || [];
     }, [data, zoneCompound]);
     const ref = useRef4(null);
-    const acceptsTarget = useCallback8(
-      (target) => {
-        if (!target) {
+    const acceptsTarget = useCallback10(
+      (componentType) => {
+        if (!componentType) {
           return true;
         }
-        const data2 = target.data;
-        const { componentType } = data2;
         if (disallow) {
           const defaultedAllow = allow || [];
           const filteredDisallow = (disallow || []).filter(
@@ -3341,49 +3516,26 @@ var DropZoneEdit = forwardRef3(
       },
       [allow, disallow]
     );
-    useEffect12(() => {
+    useEffect14(() => {
       if (registerLocalZone) {
-        registerLocalZone(zoneCompound, acceptsTarget(draggedItem));
+        registerLocalZone(zoneCompound, acceptsTarget(draggedComponentType));
       }
       return () => {
         if (unregisterLocalZone) {
           unregisterLocalZone(zoneCompound);
         }
       };
-    }, [draggedItem, zoneCompound]);
-    const isRootZone = zoneCompound === rootDroppableId || zone === rootDroppableId || areaId === "root";
-    const hoveringOverArea = nextDeepestArea ? nextDeepestArea === areaId : isRootZone;
-    const userIsDragging = !!draggedItem;
+    }, [draggedComponentType, zoneCompound]);
+    const hoveringOverArea = inNextDeepestArea || isRootZone;
     let isEnabled = true;
-    if (draggedItem) {
-      isEnabled = deepestZone === zoneCompound;
+    if (userIsDragging) {
+      isEnabled = isDeepestZone;
     }
     if (isEnabled) {
-      isEnabled = acceptsTarget(draggedItem);
-    }
-    const preview = useContext3(previewContext);
-    const previewInZone = (preview == null ? void 0 : preview.zone) === zoneCompound;
-    const contentWithPreview = useMemo7(() => {
-      let contentWithPreview2 = preview ? content.filter((item) => item.props.id !== preview.props.id) : content;
-      if (previewInZone) {
-        contentWithPreview2 = content.filter(
-          (item) => item.props.id !== preview.props.id
-        );
-        if (preview.type === "insert") {
-          contentWithPreview2 = insert(contentWithPreview2, preview.index, {
-            type: "preview",
-            props: { id: preview.props.id }
-          });
-        } else {
-          contentWithPreview2 = insert(contentWithPreview2, preview.index, {
-            type: preview.componentType,
-            props: preview.props
-          });
-        }
-      }
-      return contentWithPreview2;
-    }, [preview, content]);
-    const isDropEnabled = isEnabled && (previewInZone ? contentWithPreview.length === 1 : contentWithPreview.length === 0);
+      isEnabled = acceptsTarget(draggedComponentType);
+    }
+    const contentWithPreview = useContentWithPreview(content, zoneCompound);
+    const isDropEnabled = isEnabled && (preview ? contentWithPreview.length === 1 : contentWithPreview.length === 0);
     const droppableConfig = {
       id: zoneCompound,
       collisionPriority: isEnabled ? depth : 0,
@@ -3393,45 +3545,20 @@ var DropZoneEdit = forwardRef3(
       data: {
         areaId,
         depth,
-        isDroppableTarget: acceptsTarget(draggedItem),
+        isDroppableTarget: acceptsTarget(draggedComponentType),
         path
       }
     };
     const { ref: dropRef } = useDroppableSafe(droppableConfig);
     const selectedItem = itemSelector ? getItem(itemSelector, data) : null;
     const isAreaSelected = selectedItem && areaId === selectedItem.props.id;
-    const [dragAxis, setDragAxis] = useState15(
-      collisionAxis || DEFAULT_DRAG_AXIS
-    );
-    const calculateDragAxis = useCallback8(() => {
-      if (ref.current) {
-        const computedStyle = window.getComputedStyle(ref.current);
-        if (computedStyle.display === "grid") {
-          setDragAxis(GRID_DRAG_AXIS);
-        } else if (computedStyle.display === "flex" && computedStyle.flexDirection === "row") {
-          setDragAxis(FLEX_ROW_DRAG_AXIS);
-        } else {
-          setDragAxis(DEFAULT_DRAG_AXIS);
-        }
-      }
-    }, [ref.current]);
-    useEffect12(calculateDragAxis, [appContext2.status, collisionAxis]);
-    useEffect12(() => {
-      const onViewportChange = () => {
-        calculateDragAxis();
-      };
-      window.addEventListener("viewportchange", onViewportChange);
-      return () => {
-        window.removeEventListener("viewportchange", onViewportChange);
-      };
-    }, []);
+    const [dragAxis] = useDragAxis(ref, collisionAxis);
     const [minEmptyHeight, isAnimating] = useMinEmptyHeight({
-      draggedItem,
       zoneCompound,
       userMinEmptyHeight,
       ref
     });
-    return /* @__PURE__ */ jsxs10(
+    return /* @__PURE__ */ jsx21(
       "div",
       {
         className: `${getClassName17({
@@ -3451,88 +3578,83 @@ var DropZoneEdit = forwardRef3(
         "data-puck-dropzone": zoneCompound,
         "data-puck-dnd": zoneCompound,
         style: __spreadProps(__spreadValues({}, style), {
-          "--min-empty-height": `${minEmptyHeight}px`
+          "--min-empty-height": `${minEmptyHeight}px`,
+          backgroundColor: RENDER_DEBUG ? getRandomColor() : void 0
         }),
-        children: [
-          isRootZone && DEBUG3 && /* @__PURE__ */ jsxs10("div", { "data-puck-component": true, children: [
-            /* @__PURE__ */ jsx21("p", { children: deepestZone || rootDroppableId }),
-            /* @__PURE__ */ jsx21("p", { children: deepestArea || "No area" })
-          ] }),
-          contentWithPreview.map((item, i) => {
-            var _a, _b, _c, _d, _e;
-            const componentId = item.props.id;
-            const puckProps = {
-              renderDropZone: DropZone,
-              isEditing: true,
-              dragRef: null
+        children: contentWithPreview.map((item, i) => {
+          var _a, _b, _c, _d, _e;
+          const componentId = item.props.id;
+          const puckProps = {
+            renderDropZone: DropZone,
+            isEditing: true,
+            dragRef: null
+          };
+          const defaultedProps = __spreadProps(__spreadValues(__spreadValues({}, (_a = config.components[item.type]) == null ? void 0 : _a.defaultProps), item.props), {
+            puck: puckProps,
+            editMode: true
+            // DEPRECATED
+          });
+          const isSelected = (selectedItem == null ? void 0 : selectedItem.props.id) === componentId || false;
+          let Render2 = config.components[item.type] && item.type !== "preview" ? config.components[item.type].render : () => /* @__PURE__ */ jsxs10("div", { style: { padding: 48, textAlign: "center" }, children: [
+            "No configuration for ",
+            item.type
+          ] });
+          const componentConfig = config.components[item.type];
+          let componentType = item.type;
+          let label = (_b = componentConfig == null ? void 0 : componentConfig["label"]) != null ? _b : item.type.toString();
+          if (item.type === "preview" && preview) {
+            let Preview4 = function() {
+              return /* @__PURE__ */ jsx21(DrawerItemInner, { name: label, children: appContext2.overrides.componentItem });
             };
-            const defaultedProps = __spreadProps(__spreadValues(__spreadValues({}, (_a = config.components[item.type]) == null ? void 0 : _a.defaultProps), item.props), {
-              puck: puckProps,
-              editMode: true
-              // DEPRECATED
-            });
-            const isSelected = (selectedItem == null ? void 0 : selectedItem.props.id) === componentId || false;
-            let Render2 = config.components[item.type] ? config.components[item.type].render : () => /* @__PURE__ */ jsxs10("div", { style: { padding: 48, textAlign: "center" }, children: [
-              "No configuration for ",
-              item.type
-            ] });
-            const componentConfig = config.components[item.type];
-            let componentType = item.type;
-            let label = (_b = componentConfig == null ? void 0 : componentConfig["label"]) != null ? _b : item.type.toString();
-            if (item.type === "preview") {
-              let Preview3 = function() {
-                return /* @__PURE__ */ jsx21(DrawerItemInner, { name: label });
-              };
-              var Preview2 = Preview3;
-              componentType = preview.componentType;
-              label = (_d = (_c = config.components[componentType]) == null ? void 0 : _c.label) != null ? _d : preview.componentType;
-              Render2 = Preview3;
-            }
-            return /* @__PURE__ */ jsx21(
-              DropZoneProvider,
-              {
-                value: __spreadProps(__spreadValues({}, ctx), { path: [...path, zoneCompound] }),
-                children: /* @__PURE__ */ jsx21(
-                  DraggableComponent,
-                  {
-                    id: componentId,
-                    componentType,
-                    zoneCompound,
-                    depth: depth + 1,
-                    index: i,
-                    isLoading: ((_e = appContext2.componentState[componentId]) == null ? void 0 : _e.loadingCount) > 0,
-                    isSelected,
-                    label,
-                    isEnabled,
-                    autoDragAxis: dragAxis,
-                    userDragAxis: collisionAxis,
-                    inDroppableZone: acceptsTarget(draggedItem),
-                    children: (dragRef) => (componentConfig == null ? void 0 : componentConfig.inline) ? /* @__PURE__ */ jsx21(
-                      Render2,
-                      __spreadProps(__spreadValues({}, defaultedProps), {
-                        puck: __spreadProps(__spreadValues({}, defaultedProps.puck), {
-                          dragRef
-                        })
+            var Preview3 = Preview4;
+            componentType = preview.componentType;
+            label = (_d = (_c = config.components[componentType]) == null ? void 0 : _c.label) != null ? _d : preview.componentType;
+            Render2 = Preview4;
+          }
+          return /* @__PURE__ */ jsx21(
+            DropZoneProvider,
+            {
+              value: __spreadProps(__spreadValues({}, ctx), { path: [...path, zoneCompound] }),
+              children: /* @__PURE__ */ jsx21(
+                DraggableComponent,
+                {
+                  id: componentId,
+                  componentType,
+                  zoneCompound,
+                  depth: depth + 1,
+                  index: i,
+                  isLoading: ((_e = appContext2.componentState[componentId]) == null ? void 0 : _e.loadingCount) > 0,
+                  isSelected,
+                  label,
+                  isEnabled,
+                  autoDragAxis: dragAxis,
+                  userDragAxis: collisionAxis,
+                  inDroppableZone: acceptsTarget(draggedComponentType),
+                  children: (dragRef) => (componentConfig == null ? void 0 : componentConfig.inline) ? /* @__PURE__ */ jsx21(
+                    Render2,
+                    __spreadProps(__spreadValues({}, defaultedProps), {
+                      puck: __spreadProps(__spreadValues({}, defaultedProps.puck), {
+                        dragRef
                       })
-                    ) : /* @__PURE__ */ jsx21("div", { ref: dragRef, children: /* @__PURE__ */ jsx21(Render2, __spreadValues({}, defaultedProps)) })
-                  }
-                )
-              },
-              componentId
-            );
-          })
-        ]
+                    })
+                  ) : /* @__PURE__ */ jsx21("div", { ref: dragRef, children: /* @__PURE__ */ jsx21(Render2, __spreadValues({}, defaultedProps)) })
+                }
+              )
+            },
+            componentId
+          );
+        })
       }
     );
   }
 );
 var DropZoneRender = forwardRef3(
   function DropZoneRender2({ className, style, zone }, ref) {
-    const ctx = useContext3(dropZoneContext);
+    const ctx = useContext4(dropZoneContext);
     const { data, areaId = "root", config } = ctx || {};
     let zoneCompound = rootDroppableId;
     let content = (data == null ? void 0 : data.content) || [];
-    useEffect12(() => {
+    useEffect14(() => {
       if (ctx == null ? void 0 : ctx.registerZone) {
         ctx == null ? void 0 : ctx.registerZone(zoneCompound);
       }
@@ -3578,7 +3700,7 @@ var DropZoneRender = forwardRef3(
 );
 var DropZone = forwardRef3(
   function DropZone2(props, ref) {
-    const ctx = useContext3(dropZoneContext);
+    const ctx = useContext4(dropZoneContext);
     if ((ctx == null ? void 0 : ctx.mode) === "edit") {
       return /* @__PURE__ */ jsx21(Fragment6, { children: /* @__PURE__ */ jsx21(DropZoneEdit, __spreadProps(__spreadValues({}, props), { ref })) });
     }
@@ -3598,7 +3720,7 @@ var getZoneId = (zoneCompound) => {
   return [rootDroppableId, zoneCompound];
 };
 
-// components/DragDropContext/NestedDroppablePlugin.ts
+// lib/dnd/NestedDroppablePlugin.ts
 init_react_import();
 import { Plugin } from "@dnd-kit/abstract";
 import { effects } from "@dnd-kit/state";
@@ -3640,7 +3762,7 @@ var getFrame = () => {
   return (frameEl == null ? void 0 : frameEl.ownerDocument) || document;
 };
 
-// components/DragDropContext/NestedDroppablePlugin.ts
+// lib/dnd/NestedDroppablePlugin.ts
 var depthSort = (candidates) => {
   return candidates.sort((a, b) => {
     const aData = a.data;
@@ -3755,9 +3877,7 @@ var findDeepestCandidate = (position, manager, ownerDocument) => {
     area: null
   };
 };
-var createNestedDroppablePlugin = ({
-  onChange
-}) => class NestedDroppablePlugin extends Plugin {
+var createNestedDroppablePlugin = ({ onChange }, id) => class NestedDroppablePlugin extends Plugin {
   constructor(manager, options) {
     super(manager);
     if (typeof window === "undefined") {
@@ -3771,10 +3891,17 @@ var createNestedDroppablePlugin = ({
         };
         const target = event.originalTarget || event.target;
         const ownerDocument = target == null ? void 0 : target.ownerDocument;
-        onChange(
-          findDeepestCandidate(position, manager, ownerDocument),
-          manager
+        const elements = document.elementsFromPoint(
+          event.clientX,
+          event.clientY
         );
+        const overEl = elements.some((el) => el.id === id);
+        if (overEl) {
+          onChange(
+            findDeepestCandidate(position, manager, ownerDocument),
+            manager
+          );
+        }
       };
       const handleMoveThrottled = throttle(handleMove, 50);
       const handlePointerMove = (event) => {
@@ -4191,7 +4318,7 @@ var insertComponent = (componentType, zone, index, {
 import { useDebouncedCallback as useDebouncedCallback2 } from "use-debounce";
 import { isElement as isElement2 } from "@dnd-kit/dom/utilities";
 
-// components/DragDropContext/PointerSensor.ts
+// lib/dnd/PointerSensor.ts
 init_react_import();
 import { batch, effect } from "@dnd-kit/state";
 import { Sensor, configurator } from "@dnd-kit/abstract";
@@ -4462,13 +4589,15 @@ function patchWindow(window2) {
 }
 
 // components/DragDropContext/index.tsx
+import { createStore as createStore3 } from "zustand";
 import { jsx as jsx22 } from "react/jsx-runtime";
+var DEBUG3 = false;
 var dragListenerContext = createContext3({
   dragListeners: {}
 });
 function useDragListener(type, fn, deps = []) {
-  const { setDragListeners } = useContext4(dragListenerContext);
-  useEffect13(() => {
+  const { setDragListeners } = useContext5(dragListenerContext);
+  useEffect15(() => {
     if (setDragListeners) {
       setDragListeners((old) => __spreadProps(__spreadValues({}, old), {
         [type]: [...old[type] || [], fn]
@@ -4476,80 +4605,147 @@ function useDragListener(type, fn, deps = []) {
     }
   }, deps);
 }
-var previewContext = createContext3(null);
 var AREA_CHANGE_DEBOUNCE_MS = 100;
+var useTempDisableFallback = (timeout3) => {
+  const lastFallbackDisable = useRef5(null);
+  return useCallback11((manager) => {
+    collisionStore.setState({ fallbackEnabled: false });
+    const fallbackId = generateId();
+    lastFallbackDisable.current = fallbackId;
+    setTimeout(() => {
+      if (lastFallbackDisable.current === fallbackId) {
+        collisionStore.setState({ fallbackEnabled: true });
+        manager.collisionObserver.forceUpdate(true);
+      }
+    }, timeout3);
+  }, []);
+};
 var DragDropContextClient = ({
   children,
   disableAutoScroll
 }) => {
   const { state, config, dispatch, resolveData } = useAppContext();
-  const [preview, setPreview] = useState16(null);
-  const previewRef = useRef5(null);
+  const id = useId();
   const { data } = state;
-  const [deepest, setDeepest] = useState16(null);
-  const [nextDeepest, setNextDeepest] = useState16(null);
-  const deepestRef = useRef5(deepest);
   const debouncedParamsRef = useRef5(null);
-  const setDeepestAndCollide = useCallback9(
+  const tempDisableFallback = useTempDisableFallback(100);
+  const [zoneStore] = useState17(
+    () => createStore3(() => ({
+      zoneDepthIndex: {},
+      nextZoneDepthIndex: {},
+      areaDepthIndex: {},
+      nextAreaDepthIndex: {},
+      draggedItem: null,
+      previewIndex: {}
+    }))
+  );
+  const getChanged2 = useCallback11(
+    (params, id2) => {
+      const { zoneDepthIndex = {}, areaDepthIndex = {} } = zoneStore.getState() || {};
+      const stateHasZone = Object.keys(zoneDepthIndex).length > 0;
+      const stateHasArea = Object.keys(areaDepthIndex).length > 0;
+      let zoneChanged = false;
+      let areaChanged = false;
+      if (params.zone && !zoneDepthIndex[params.zone]) {
+        zoneChanged = true;
+      } else if (!params.zone && stateHasZone) {
+        zoneChanged = true;
+      }
+      if (params.area && !areaDepthIndex[params.area]) {
+        areaChanged = true;
+      } else if (!params.area && stateHasArea) {
+        areaChanged = true;
+      }
+      return { zoneChanged, areaChanged };
+    },
+    [zoneStore]
+  );
+  const setDeepestAndCollide = useCallback11(
     (params, manager) => {
-      setDeepest(params);
+      const { zoneChanged, areaChanged } = getChanged2(params, id);
+      if (!zoneChanged && !areaChanged) return;
+      zoneStore.setState({
+        zoneDepthIndex: params.zone ? { [params.zone]: true } : {},
+        areaDepthIndex: params.area ? { [params.area]: true } : {}
+      });
+      tempDisableFallback(manager);
       setTimeout(() => {
         manager.collisionObserver.forceUpdate(true);
       }, 50);
       debouncedParamsRef.current = null;
     },
-    []
+    [zoneStore]
   );
   const setDeepestDb = useDebouncedCallback2(
     setDeepestAndCollide,
     AREA_CHANGE_DEBOUNCE_MS
   );
-  useEffect13(() => {
-    deepestRef.current = deepest;
-  }, [deepest]);
   const cancelDb = () => {
     setDeepestDb.cancel();
     debouncedParamsRef.current = null;
   };
-  const [plugins] = useState16(() => [
-    ...disableAutoScroll ? defaultPreset.plugins.filter((plugin) => plugin !== AutoScroller) : defaultPreset.plugins,
-    createNestedDroppablePlugin({
-      onChange: (params, manager) => {
-        const lastParams = deepestRef.current;
-        const areaChanged = params.area !== (lastParams == null ? void 0 : lastParams.area);
-        const zoneChanged = params.zone !== (lastParams == null ? void 0 : lastParams.zone);
-        const isDragging = manager.dragOperation.status.dragging;
-        if (areaChanged || zoneChanged) {
-          setNextDeepest(params);
-        }
-        if (params.zone !== "void" && (lastParams == null ? void 0 : lastParams.zone) === "void") {
-          setDeepest(params);
-          manager.collisionObserver.forceUpdate(true);
-          return;
+  useEffect15(() => {
+    if (DEBUG3) {
+      zoneStore.subscribe(
+        (s) => {
+          var _a, _b;
+          return console.log(
+            s.previewIndex,
+            (_a = Object.entries(s.zoneDepthIndex || {})[0]) == null ? void 0 : _a[0],
+            (_b = Object.entries(s.areaDepthIndex || {})[0]) == null ? void 0 : _b[0]
+          );
         }
-        if (areaChanged) {
-          if (isDragging) {
-            const debouncedParams = debouncedParamsRef.current;
-            const isSameParams = debouncedParams && debouncedParams.area === params.area && debouncedParams.zone === params.zone;
-            if (!isSameParams) {
+      );
+    }
+  }, []);
+  const [plugins] = useState17(() => [
+    ...disableAutoScroll ? defaultPreset.plugins.filter((plugin) => plugin !== AutoScroller) : defaultPreset.plugins,
+    createNestedDroppablePlugin(
+      {
+        onChange: (params, manager) => {
+          const state2 = zoneStore.getState();
+          const { zoneChanged, areaChanged } = getChanged2(params, id);
+          const isDragging = manager.dragOperation.status.dragging;
+          if (areaChanged || zoneChanged) {
+            let nextZoneDepthIndex = {};
+            let nextAreaDepthIndex = {};
+            if (params.zone) {
+              nextZoneDepthIndex = { [params.zone]: true };
+            }
+            if (params.area) {
+              nextAreaDepthIndex = { [params.area]: true };
+            }
+            zoneStore.setState({ nextZoneDepthIndex, nextAreaDepthIndex });
+          }
+          if (params.zone !== "void" && (state2 == null ? void 0 : state2.zoneDepthIndex["void"])) {
+            setDeepestAndCollide(params, manager);
+            return;
+          }
+          if (areaChanged) {
+            if (isDragging) {
+              const debouncedParams = debouncedParamsRef.current;
+              const isSameParams = debouncedParams && debouncedParams.area === params.area && debouncedParams.zone === params.zone;
+              if (!isSameParams) {
+                cancelDb();
+                setDeepestDb(params, manager);
+                debouncedParamsRef.current = params;
+              }
+            } else {
               cancelDb();
-              setDeepestDb(params, manager);
-              debouncedParamsRef.current = params;
+              setDeepestAndCollide(params, manager);
             }
-          } else {
-            cancelDb();
+            return;
+          }
+          if (zoneChanged) {
             setDeepestAndCollide(params, manager);
           }
-          return;
-        }
-        if (zoneChanged) {
-          setDeepestAndCollide(params, manager);
+          cancelDb();
         }
-        cancelDb();
-      }
-    })
+      },
+      id
+    )
   ]);
-  const [sensors] = useState16(() => [
+  const [sensors] = useState17(() => [
     PointerSensor.configure({
       activationConstraints(event, source) {
         var _a;
@@ -4568,11 +4764,10 @@ var DragDropContextClient = ({
       }
     })
   ]);
-  const [draggedItem, setDraggedItem] = useState16();
-  const [dragListeners, setDragListeners] = useState16({});
-  const [pathData, setPathData] = useState16();
+  const [dragListeners, setDragListeners] = useState17({});
+  const [pathData, setPathData] = useState17();
   const dragMode = useRef5(null);
-  const registerPath = useCallback9(
+  const registerPath = useCallback11(
     (selector) => {
       const item = getItem(selector, data);
       if (!item) {
@@ -4595,40 +4790,40 @@ var DragDropContextClient = ({
     [data, setPathData]
   );
   const initialSelector = useRef5(void 0);
-  return /* @__PURE__ */ jsx22(
+  return /* @__PURE__ */ jsx22("div", { id, children: /* @__PURE__ */ jsx22(
     dragListenerContext.Provider,
     {
       value: {
         dragListeners,
         setDragListeners
       },
-      children: /* @__PURE__ */ jsx22(previewContext.Provider, { value: preview, children: /* @__PURE__ */ jsx22(
+      children: /* @__PURE__ */ jsx22(
         DragDropProvider2,
         {
           plugins,
           sensors,
           onDragEnd: (event, manager) => {
+            var _a;
             const { source, target } = event.operation;
-            deepestRef.current = null;
             if (!source) {
-              setDraggedItem(null);
+              zoneStore.setState({ draggedItem: null });
               return;
             }
             const { zone, index } = source.data;
-            const thisPreview = previewRef.current ? __spreadValues({}, previewRef.current) : null;
-            previewRef.current = null;
+            const { previewIndex = {} } = zoneStore.getState() || {};
+            const thisPreview = ((_a = previewIndex[zone]) == null ? void 0 : _a.props.id) === source.id ? previewIndex[zone] : null;
             setTimeout(() => {
-              var _a, _b;
-              setDraggedItem(null);
+              var _a2, _b;
+              zoneStore.setState({ draggedItem: null });
               if (event.canceled || (target == null ? void 0 : target.type) === "void") {
-                setPreview(null);
-                (_a = dragListeners.dragend) == null ? void 0 : _a.forEach((fn) => {
+                zoneStore.setState({ previewIndex: {} });
+                (_a2 = dragListeners.dragend) == null ? void 0 : _a2.forEach((fn) => {
                   fn(event, manager);
                 });
                 return;
               }
               if (thisPreview) {
-                setPreview(null);
+                zoneStore.setState({ previewIndex: {} });
                 if (thisPreview.type === "insert") {
                   insertComponent(
                     thisPreview.componentType,
@@ -4663,8 +4858,9 @@ var DragDropContextClient = ({
             }, 250);
           },
           onDragOver: (event, manager) => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             event.preventDefault();
+            const draggedItem = (_a = zoneStore.getState()) == null ? void 0 : _a.draggedItem;
             if (!draggedItem) return;
             cancelDb();
             const { source, target } = event.operation;
@@ -4680,7 +4876,7 @@ var DragDropContextClient = ({
               const targetData = target.data;
               targetZone = targetData.zone;
               targetIndex = targetData.index;
-              const collisionData = (_b = (_a = manager.dragOperation.data) == null ? void 0 : _a.collisionMap) == null ? void 0 : _b[targetId];
+              const collisionData = (_c = (_b = manager.dragOperation.data) == null ? void 0 : _b.collisionMap) == null ? void 0 : _c[targetId];
               const collisionPosition = (collisionData == null ? void 0 : collisionData.direction) === "up" || (collisionData == null ? void 0 : collisionData.direction) === "left" ? "before" : "after";
               if (targetIndex >= sourceIndex && sourceZone === targetZone) {
                 targetIndex = targetIndex - 1;
@@ -4692,23 +4888,26 @@ var DragDropContextClient = ({
               targetZone = target.id.toString();
               targetIndex = 0;
             }
-            if (targetId === sourceId || ((_c = pathData == null ? void 0 : pathData[target.id]) == null ? void 0 : _c.path.find((path) => {
+            if (targetId === sourceId || ((_d = pathData == null ? void 0 : pathData[target.id]) == null ? void 0 : _d.path.find((path) => {
               const [pathId] = path.split(":");
               return pathId === sourceId;
             }))) {
               return;
             }
             if (dragMode.current === "new") {
-              previewRef.current = {
-                componentType: sourceData.componentType,
-                type: "insert",
-                index: targetIndex,
-                zone: targetZone,
-                props: {
-                  id: source.id.toString()
+              zoneStore.setState({
+                previewIndex: {
+                  [targetZone]: {
+                    componentType: sourceData.componentType,
+                    type: "insert",
+                    index: targetIndex,
+                    zone: targetZone,
+                    props: {
+                      id: source.id.toString()
+                    }
+                  }
                 }
-              };
-              setPreview(previewRef.current);
+              });
             } else {
               if (!initialSelector.current) {
                 initialSelector.current = {
@@ -4718,17 +4917,20 @@ var DragDropContextClient = ({
               }
               const item = getItem(initialSelector.current, data);
               if (item) {
-                previewRef.current = {
-                  componentType: sourceData.componentType,
-                  type: "move",
-                  index: targetIndex,
-                  zone: targetZone,
-                  props: item.props
-                };
-                setPreview(previewRef.current);
+                zoneStore.setState({
+                  previewIndex: {
+                    [targetZone]: {
+                      componentType: sourceData.componentType,
+                      type: "move",
+                      index: targetIndex,
+                      zone: targetZone,
+                      props: item.props
+                    }
+                  }
+                });
               }
             }
-            (_d = dragListeners.dragover) == null ? void 0 : _d.forEach((fn) => {
+            (_e = dragListeners.dragover) == null ? void 0 : _e.forEach((fn) => {
               fn(event, manager);
             });
           },
@@ -4738,45 +4940,61 @@ var DragDropContextClient = ({
               type: "setUi",
               ui: { itemSelector: null, isDragging: true }
             });
+            const { source } = event.operation;
+            if (source && source.type !== "void") {
+              const sourceData = source.data;
+              const item = getItem(
+                {
+                  zone: sourceData.zone,
+                  index: sourceData.index
+                },
+                data
+              );
+              if (item) {
+                zoneStore.setState({
+                  previewIndex: {
+                    [sourceData.zone]: {
+                      componentType: sourceData.componentType,
+                      type: "move",
+                      index: sourceData.index,
+                      zone: sourceData.zone,
+                      props: item.props
+                    }
+                  }
+                });
+              }
+            }
             (_a = dragListeners.dragstart) == null ? void 0 : _a.forEach((fn) => {
               fn(event, manager);
             });
           },
           onBeforeDragStart: (event) => {
             var _a;
-            if (draggedItem) {
-              console.warn("New drag started before previous drag cleaned up");
-            }
             const isNewComponent = ((_a = event.operation.source) == null ? void 0 : _a.data.type) === "drawer";
             dragMode.current = isNewComponent ? "new" : "existing";
             initialSelector.current = void 0;
-            setDraggedItem(event.operation.source);
+            zoneStore.setState({ draggedItem: event.operation.source });
           },
-          children: /* @__PURE__ */ jsx22(
+          children: /* @__PURE__ */ jsx22(ZoneStoreProvider, { store: zoneStore, children: /* @__PURE__ */ jsx22(
             DropZoneProvider,
             {
               value: {
                 data,
                 config,
-                draggedItem,
                 mode: "edit",
                 areaId: "root",
                 depth: 0,
                 registerPath,
                 pathData,
-                deepestZone: deepest == null ? void 0 : deepest.zone,
-                deepestArea: deepest == null ? void 0 : deepest.area,
-                nextDeepestZone: nextDeepest == null ? void 0 : nextDeepest.zone,
-                nextDeepestArea: nextDeepest == null ? void 0 : nextDeepest.area,
                 path: []
               },
               children
             }
-          )
+          ) })
         }
-      ) })
+      )
     }
-  );
+  ) });
 };
 var DragDropContext = ({
   children,
@@ -4854,7 +5072,7 @@ var DrawerItem = ({
   isDragDisabled
 }) => {
   const resolvedId = id || name;
-  const [dynamicId, setDynamicId] = useState17(generateId(resolvedId));
+  const [dynamicId, setDynamicId] = useState18(generateId(resolvedId));
   if (typeof index !== "undefined") {
     console.error(
       "Warning: The `index` prop on Drawer.Item is deprecated and no longer required."
@@ -4893,7 +5111,7 @@ var Drawer = ({
       "Warning: The `direction` prop on Drawer is deprecated and no longer required to achieve multi-directional dragging."
     );
   }
-  const [id] = useState17(generateId());
+  const [id] = useState18(generateId());
   const { ref } = useDroppableSafe({
     id,
     type: "void",
@@ -4916,11 +5134,11 @@ Drawer.Item = DrawerItem;
 // components/Puck/index.tsx
 init_react_import();
 import {
-  useCallback as useCallback15,
-  useEffect as useEffect21,
+  useCallback as useCallback17,
+  useEffect as useEffect23,
   useMemo as useMemo17,
   useReducer,
-  useState as useState25
+  useState as useState26
 } from "react";
 
 // components/SidebarSection/index.tsx
@@ -4932,7 +5150,7 @@ var styles_module_default13 = { "SidebarSection": "_SidebarSection_125qe_1", "Si
 
 // lib/use-breadcrumbs.ts
 init_react_import();
-import { useContext as useContext5, useMemo as useMemo9 } from "react";
+import { useContext as useContext6, useMemo as useMemo9 } from "react";
 var convertPathDataToBreadcrumbs = (selectedItem, pathData, data) => {
   const id = selectedItem ? selectedItem == null ? void 0 : selectedItem.props.id : "";
   const currentPathData = pathData && id && pathData[id] ? __spreadValues({}, pathData[id]) : { label: "Page", path: [] };
@@ -4982,7 +5200,7 @@ var useBreadcrumbs = (renderCount) => {
     state: { data },
     selectedItem
   } = useAppContext();
-  const dzContext = useContext5(dropZoneContext);
+  const dzContext = useContext6(dropZoneContext);
   return useMemo9(() => {
     const breadcrumbs = convertPathDataToBreadcrumbs(
       selectedItem,
@@ -5107,7 +5325,7 @@ function MenuBar({
 
 // 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_1g88c_19", "Puck-portal": "_Puck-portal_1g88c_24", "PuckLayout": "_PuckLayout_1g88c_31", "PuckLayout-inner": "_PuckLayout-inner_1g88c_39", "PuckLayout--mounted": "_PuckLayout--mounted_1g88c_51", "PuckLayout--leftSideBarVisible": "_PuckLayout--leftSideBarVisible_1g88c_55", "PuckLayout--rightSideBarVisible": "_PuckLayout--rightSideBarVisible_1g88c_61", "PuckLayout-mounted": "_PuckLayout-mounted_1g88c_75", "PuckLayout-header": "_PuckLayout-header_1g88c_116", "PuckLayout-headerInner": "_PuckLayout-headerInner_1g88c_125", "PuckLayout-headerToggle": "_PuckLayout-headerToggle_1g88c_135", "PuckLayout-rightSideBarToggle": "_PuckLayout-rightSideBarToggle_1g88c_142", "PuckLayout-leftSideBarToggle": "_PuckLayout-leftSideBarToggle_1g88c_143", "PuckLayout-headerTitle": "_PuckLayout-headerTitle_1g88c_147", "PuckLayout-headerPath": "_PuckLayout-headerPath_1g88c_151", "PuckLayout-headerTools": "_PuckLayout-headerTools_1g88c_158", "PuckLayout-menuButton": "_PuckLayout-menuButton_1g88c_164", "PuckLayout--menuOpen": "_PuckLayout--menuOpen_1g88c_169", "PuckLayout-leftSideBar": "_PuckLayout-leftSideBar_1g88c_143", "PuckLayout-rightSideBar": "_PuckLayout-rightSideBar_1g88c_142" };
+var styles_module_default15 = { "Puck": "_Puck_12s9r_19", "Puck-portal": "_Puck-portal_12s9r_24", "PuckLayout-inner": "_PuckLayout-inner_12s9r_31", "PuckLayout--mounted": "_PuckLayout--mounted_12s9r_43", "PuckLayout--leftSideBarVisible": "_PuckLayout--leftSideBarVisible_12s9r_47", "PuckLayout--rightSideBarVisible": "_PuckLayout--rightSideBarVisible_12s9r_53", "PuckLayout-mounted": "_PuckLayout-mounted_12s9r_67", "PuckLayout": "_PuckLayout_12s9r_31", "PuckLayout-header": "_PuckLayout-header_12s9r_108", "PuckLayout-headerInner": "_PuckLayout-headerInner_12s9r_117", "PuckLayout-headerToggle": "_PuckLayout-headerToggle_12s9r_127", "PuckLayout-rightSideBarToggle": "_PuckLayout-rightSideBarToggle_12s9r_134", "PuckLayout-leftSideBarToggle": "_PuckLayout-leftSideBarToggle_12s9r_135", "PuckLayout-headerTitle": "_PuckLayout-headerTitle_12s9r_139", "PuckLayout-headerPath": "_PuckLayout-headerPath_12s9r_143", "PuckLayout-headerTools": "_PuckLayout-headerTools_12s9r_150", "PuckLayout-menuButton": "_PuckLayout-menuButton_12s9r_156", "PuckLayout--menuOpen": "_PuckLayout--menuOpen_12s9r_161", "PuckLayout-leftSideBar": "_PuckLayout-leftSideBar_12s9r_135", "PuckLayout-rightSideBar": "_PuckLayout-rightSideBar_12s9r_134" };
 
 // components/Puck/components/Fields/index.tsx
 init_react_import();
@@ -5117,15 +5335,15 @@ init_react_import();
 var styles_module_default16 = { "PuckFields": "_PuckFields_jp3lw_1", "PuckFields--isLoading": "_PuckFields--isLoading_jp3lw_6", "PuckFields-loadingOverlay": "_PuckFields-loadingOverlay_jp3lw_10", "PuckFields-loadingOverlayInner": "_PuckFields-loadingOverlayInner_jp3lw_25" };
 
 // components/Puck/components/Fields/index.tsx
-import { useCallback as useCallback10, useEffect as useEffect14, useMemo as useMemo10, useState as useState18 } from "react";
+import { useCallback as useCallback12, useEffect as useEffect16, useMemo as useMemo10, useState as useState19 } from "react";
 
 // lib/use-parent.ts
 init_react_import();
-import { useContext as useContext6 } from "react";
+import { useContext as useContext7 } from "react";
 var useParent = (itemSelector) => {
   var _a;
   const { selectedItem, state } = useAppContext();
-  const { pathData } = useContext6(dropZoneContext) || {};
+  const { pathData } = useContext7(dropZoneContext) || {};
   const item = itemSelector ? getItem(itemSelector, state.data) : selectedItem;
   const breadcrumbs = convertPathDataToBreadcrumbs(item, pathData, state.data);
   const lastItem = breadcrumbs[breadcrumbs.length - 1];
@@ -5156,15 +5374,15 @@ var useResolvedFields = () => {
     [selectedItem, rootFields, componentConfig == null ? void 0 : componentConfig.fields]
   );
   const rootProps = data.root.props || data.root;
-  const [lastSelectedData, setLastSelectedData] = useState18({});
-  const [resolvedFields, setResolvedFields] = useState18(defaultFields);
-  const [fieldsLoading, setFieldsLoading] = useState18(false);
+  const [lastSelectedData, setLastSelectedData] = useState19({});
+  const [resolvedFields, setResolvedFields] = useState19(defaultFields);
+  const [fieldsLoading, setFieldsLoading] = useState19(false);
   const defaultResolveFields = (_componentData, _params) => defaultFields;
   const componentData = selectedItem ? selectedItem : { props: rootProps, readOnly: data.root.readOnly };
   const hasComponentResolver = selectedItem && (componentConfig == null ? void 0 : componentConfig.resolveFields);
   const hasRootResolver = !selectedItem && ((_b = config.root) == null ? void 0 : _b.resolveFields);
   const hasResolver = hasComponentResolver || hasRootResolver;
-  const resolveFields = useCallback10(
+  const resolveFields = useCallback12(
     (..._0) => __async(void 0, [..._0], function* (fields = {}) {
       var _a2;
       const lastData = ((_a2 = lastSelectedData.props) == null ? void 0 : _a2.id) === componentData.props.id ? lastSelectedData : null;
@@ -5202,7 +5420,7 @@ var useResolvedFields = () => {
     }),
     [data, config, componentData, selectedItem, resolvedFields, state]
   );
-  useEffect14(() => {
+  useEffect16(() => {
     if (hasResolver) {
       setFieldsLoading(true);
       resolveFields(defaultFields).then((fields) => {
@@ -5356,7 +5574,7 @@ init_react_import();
 
 // lib/use-component-list.tsx
 init_react_import();
-import { useEffect as useEffect15, useState as useState19 } from "react";
+import { useEffect as useEffect17, useState as useState20 } from "react";
 
 // components/ComponentList/index.tsx
 init_react_import();
@@ -5423,8 +5641,8 @@ ComponentList.Item = ComponentListItem;
 // lib/use-component-list.tsx
 import { jsx as jsx28 } from "react/jsx-runtime";
 var useComponentList = (config, ui) => {
-  const [componentList, setComponentList] = useState19();
-  useEffect15(() => {
+  const [componentList, setComponentList] = useState20();
+  useEffect17(() => {
     var _a, _b, _c;
     if (Object.keys(ui.componentList).length > 0) {
       const matchedComponents = [];
@@ -5504,15 +5722,15 @@ var Components = () => {
 
 // components/Puck/components/Preview/index.tsx
 init_react_import();
-import { useCallback as useCallback11, useEffect as useEffect17, useRef as useRef7, useMemo as useMemo12 } from "react";
+import { useCallback as useCallback13, useEffect as useEffect19, useRef as useRef7, useMemo as useMemo12 } from "react";
 
 // components/AutoFrame/index.tsx
 init_react_import();
 import {
   createContext as createContext4,
-  useContext as useContext7,
-  useEffect as useEffect16,
-  useState as useState20
+  useContext as useContext8,
+  useEffect as useEffect18,
+  useState as useState21
 } from "react";
 import hash from "object-hash";
 import { createPortal as createPortal3 } from "react-dom";
@@ -5559,7 +5777,7 @@ var CopyHostStyles = ({
   onStylesLoaded = () => null
 }) => {
   const { document: doc, window: win } = useFrame();
-  useEffect16(() => {
+  useEffect18(() => {
     if (!win || !doc) {
       return () => {
       };
@@ -5719,7 +5937,7 @@ var CopyHostStyles = ({
   return /* @__PURE__ */ jsx30(Fragment9, { children });
 };
 var autoFrameContext = createContext4({});
-var useFrame = () => useContext7(autoFrameContext);
+var useFrame = () => useContext8(autoFrameContext);
 function AutoFrame(_a) {
   var _b = _a, {
     children,
@@ -5736,10 +5954,10 @@ function AutoFrame(_a) {
     "onStylesLoaded",
     "frameRef"
   ]);
-  const [loaded, setLoaded] = useState20(false);
-  const [ctx, setCtx] = useState20({});
-  const [mountTarget, setMountTarget] = useState20();
-  useEffect16(() => {
+  const [loaded, setLoaded] = useState21(false);
+  const [ctx, setCtx] = useState21({});
+  const [mountTarget, setMountTarget] = useState21();
+  useEffect18(() => {
     var _a2;
     if (frameRef.current) {
       setCtx({
@@ -5833,7 +6051,7 @@ import { Fragment as Fragment10, jsx as jsx32 } from "react/jsx-runtime";
 var getClassName23 = get_class_name_factory_default("PuckPreview", styles_module_default18);
 var useBubbleIframeEvents = (ref) => {
   const { status } = useAppContext();
-  useEffect17(() => {
+  useEffect19(() => {
     var _a;
     if (ref.current && status === "READY") {
       const iframe = ref.current;
@@ -5870,9 +6088,9 @@ var useBubbleIframeEvents = (ref) => {
     }
   }, [status]);
 };
-var Preview = ({ id = "puck-preview" }) => {
+var Preview2 = ({ id = "puck-preview" }) => {
   const { config, dispatch, state, setStatus, iframe, overrides } = useAppContext();
-  const Page = useCallback11(
+  const Page = useCallback13(
     (pageProps) => {
       var _a, _b;
       return ((_a = config.root) == null ? void 0 : _a.render) ? (_b = config.root) == null ? void 0 : _b.render(__spreadValues({
@@ -5980,7 +6198,7 @@ var scrollIntoView = (el) => {
 };
 
 // components/LayerTree/index.tsx
-import { useContext as useContext8 } from "react";
+import { useContext as useContext9 } from "react";
 
 // lib/is-child-of-zone.ts
 init_react_import();
@@ -6026,7 +6244,7 @@ var LayerTree = ({
   label
 }) => {
   const zones = data.zones || {};
-  const ctx = useContext8(dropZoneContext);
+  const ctx = useContext9(dropZoneContext);
   return /* @__PURE__ */ jsxs16(Fragment11, { children: [
     label && /* @__PURE__ */ jsxs16("div", { className: getClassName24("zoneTitle"), children: [
       /* @__PURE__ */ jsx33("div", { className: getClassName24("zoneIcon"), children: /* @__PURE__ */ jsx33(Layers, { size: "16" }) }),
@@ -6133,13 +6351,13 @@ var LayerTree = ({
 };
 
 // components/Puck/components/Outline/index.tsx
-import { useCallback as useCallback12, useMemo as useMemo13 } from "react";
+import { useCallback as useCallback14, useMemo as useMemo13 } from "react";
 import { Fragment as Fragment12, jsx as jsx34, jsxs as jsxs17 } from "react/jsx-runtime";
 var Outline = () => {
   const { dispatch, state, overrides, config } = useAppContext();
   const { data, ui } = state;
   const { itemSelector } = ui;
-  const setItemSelector = useCallback12(
+  const setItemSelector = useCallback14(
     (newItemSelector) => {
       dispatch({
         type: "setUi",
@@ -6262,19 +6480,19 @@ function usePuckHistory({
 
 // lib/use-history-store.ts
 init_react_import();
-import { useState as useState21 } from "react";
+import { useState as useState22 } from "react";
 import { useDebouncedCallback as useDebouncedCallback3 } from "use-debounce";
 var EMPTY_HISTORY_INDEX = 0;
 function useHistoryStore(initialHistory) {
   var _a, _b;
-  const [histories, setHistories] = useState21(
+  const [histories, setHistories] = useState22(
     (_a = initialHistory == null ? void 0 : initialHistory.histories) != null ? _a : []
   );
   const updateHistories = (histories2) => {
     setHistories(histories2);
     setIndex(histories2.length - 1);
   };
-  const [index, setIndex] = useState21(
+  const [index, setIndex] = useState22(
     (_b = initialHistory == null ? void 0 : initialHistory.index) != null ? _b : EMPTY_HISTORY_INDEX
   );
   const hasPast = index > EMPTY_HISTORY_INDEX;
@@ -6435,16 +6653,16 @@ var getBox = function getBox2(el) {
 
 // components/Puck/components/Canvas/index.tsx
 import {
-  useCallback as useCallback13,
-  useEffect as useEffect19,
+  useCallback as useCallback15,
+  useEffect as useEffect21,
   useMemo as useMemo15,
   useRef as useRef8,
-  useState as useState23
+  useState as useState24
 } from "react";
 
 // components/ViewportControls/index.tsx
 init_react_import();
-import { useEffect as useEffect18, useMemo as useMemo14, useState as useState22 } from "react";
+import { useEffect as useEffect20, useMemo as useMemo14, useState as useState23 } from "react";
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/ViewportControls/styles.module.css#css-module
 init_react_import();
@@ -6467,8 +6685,8 @@ var ViewportButton = ({
   onClick
 }) => {
   const { state } = useAppContext();
-  const [isActive, setIsActive] = useState22(false);
-  useEffect18(() => {
+  const [isActive, setIsActive] = useState23(false);
+  useEffect20(() => {
     setIsActive(width === state.ui.viewports.current.width);
   }, [width, state.ui.viewports.current.width]);
   return /* @__PURE__ */ jsx35("span", { className: getClassNameButton({ isActive }), children: /* @__PURE__ */ jsx35(
@@ -6628,7 +6846,7 @@ var Canvas = () => {
   const { dispatch, state, overrides, setUi, zoomConfig, setZoomConfig } = useAppContext();
   const { ui } = state;
   const frameRef = useRef8(null);
-  const [showTransition, setShowTransition] = useState23(false);
+  const [showTransition, setShowTransition] = useState24(false);
   const defaultRender = useMemo15(() => {
     const PuckDefault = ({ children }) => /* @__PURE__ */ jsx36(Fragment13, { children });
     return PuckDefault;
@@ -6637,7 +6855,7 @@ var Canvas = () => {
     () => overrides.preview || defaultRender,
     [overrides]
   );
-  const getFrameDimensions = useCallback13(() => {
+  const getFrameDimensions = useCallback15(() => {
     if (frameRef.current) {
       const frame = frameRef.current;
       const box = getBox(frame);
@@ -6645,7 +6863,7 @@ var Canvas = () => {
     }
     return { width: 0, height: 0 };
   }, [frameRef]);
-  const resetAutoZoom = useCallback13(
+  const resetAutoZoom = useCallback15(
     (ui2 = state.ui) => {
       if (frameRef.current) {
         setZoomConfig(
@@ -6655,11 +6873,11 @@ var Canvas = () => {
     },
     [frameRef, zoomConfig, state.ui]
   );
-  useEffect19(() => {
+  useEffect21(() => {
     setShowTransition(false);
     resetAutoZoom();
   }, [frameRef, ui.leftSideBarVisible, ui.rightSideBarVisible]);
-  useEffect19(() => {
+  useEffect21(() => {
     const { height: frameHeight } = getFrameDimensions();
     if (ui.viewports.current.height === "auto") {
       setZoomConfig(__spreadProps(__spreadValues({}, zoomConfig), {
@@ -6667,13 +6885,13 @@ var Canvas = () => {
       }));
     }
   }, [zoomConfig.zoom]);
-  useEffect19(() => {
+  useEffect21(() => {
     if (ZOOM_ON_CHANGE) {
       setShowTransition(true);
       resetAutoZoom(ui);
     }
   }, [ui.viewports.current.width]);
-  useEffect19(() => {
+  useEffect21(() => {
     const cb = () => {
       setShowTransition(false);
       resetAutoZoom();
@@ -6683,8 +6901,8 @@ var Canvas = () => {
       window.removeEventListener("resize", cb);
     };
   }, []);
-  const [showLoader, setShowLoader] = useState23(false);
-  useEffect19(() => {
+  const [showLoader, setShowLoader] = useState24(false);
+  useEffect21(() => {
     setTimeout(() => {
       setShowLoader(true);
     }, 500);
@@ -6750,7 +6968,7 @@ var Canvas = () => {
                   })
                 );
               },
-              children: /* @__PURE__ */ jsx36(CustomPreview, { children: /* @__PURE__ */ jsx36(Preview, {}) })
+              children: /* @__PURE__ */ jsx36(CustomPreview, { children: /* @__PURE__ */ jsx36(Preview2, {}) })
             }
           ),
           /* @__PURE__ */ jsx36("div", { className: getClassName26("loader"), children: /* @__PURE__ */ jsx36(Loader, { size: 24 }) })
@@ -6813,14 +7031,14 @@ var DefaultOverride = ({ children }) => /* @__PURE__ */ jsx37(Fragment14, { chil
 
 // lib/use-inject-css.ts
 init_react_import();
-import { useEffect as useEffect20, useState as useState24 } from "react";
+import { useEffect as useEffect22, useState as useState25 } from "react";
 var styles = ``;
 var useInjectStyleSheet = (initialStyles, iframeEnabled) => {
-  const [el, setEl] = useState24();
-  useEffect20(() => {
+  const [el, setEl] = useState25();
+  useEffect22(() => {
     setEl(document.createElement("style"));
   }, []);
-  useEffect20(() => {
+  useEffect22(() => {
     var _a;
     if (!el || typeof window === "undefined") {
       return;
@@ -6840,10 +7058,10 @@ var useInjectGlobalCss = (iframeEnabled) => {
 
 // lib/use-preview-mode-hotkeys.ts
 init_react_import();
-import { useCallback as useCallback14 } from "react";
+import { useCallback as useCallback16 } from "react";
 import { useHotkeys as useHotkeys2 } from "react-hotkeys-hook";
 var usePreviewModeHotkeys = (dispatch, iframeEnabled) => {
-  const toggleInteractive = useCallback14(() => {
+  const toggleInteractive = useCallback16(() => {
     dispatch({
       type: "setUi",
       ui: (ui) => ({
@@ -6895,7 +7113,7 @@ function Puck({
     waitForStyles: true
   }, _iframe);
   useInjectGlobalCss(iframe.enabled);
-  const [generatedAppState] = useState25(() => {
+  const [generatedAppState] = useState26(() => {
     var _a2, _b2, _c, _d, _e, _f, _g, _h, _i;
     const initial = __spreadValues(__spreadValues({}, defaultAppState.ui), initialUi);
     let clientUiState = {};
@@ -6967,7 +7185,7 @@ function Puck({
     histories,
     index: initialHistoryIndex
   });
-  const [reducer] = useState25(
+  const [reducer] = useState26(
     () => createReducer({
       config,
       record: historyStore.record,
@@ -6985,14 +7203,14 @@ function Puck({
     historyStore,
     iframeEnabled: (_a = _iframe == null ? void 0 : _iframe.enabled) != null ? _a : true
   });
-  const [menuOpen, setMenuOpen] = useState25(false);
+  const [menuOpen, setMenuOpen] = useState26(false);
   const { itemSelector, leftSideBarVisible, rightSideBarVisible } = ui;
   const selectedItem = itemSelector ? getItem(itemSelector, data) : null;
-  useEffect21(() => {
+  useEffect23(() => {
     if (onChange) onChange(data);
   }, [data]);
   const rootProps = data.root.props || data.root;
-  const toggleSidebars = useCallback15(
+  const toggleSidebars = useCallback17(
     (sidebar) => {
       const widerViewport = window.matchMedia("(min-width: 638px)").matches;
       const sideBarVisible = sidebar === "left" ? leftSideBarVisible : rightSideBarVisible;
@@ -7006,7 +7224,7 @@ function Puck({
     },
     [dispatch, leftSideBarVisible, rightSideBarVisible]
   );
-  useEffect21(() => {
+  useEffect23(() => {
     if (!window.matchMedia("(min-width: 638px)").matches) {
       dispatch({
         type: "setUi",
@@ -7072,8 +7290,8 @@ function Puck({
     () => loadedOverrides.headerActions || defaultHeaderActionsRender,
     [loadedOverrides]
   );
-  const [mounted, setMounted] = useState25(false);
-  useEffect21(() => {
+  const [mounted, setMounted] = useState26(false);
+  useEffect23(() => {
     setMounted(true);
   }, []);
   const selectedComponentConfig = selectedItem && config.components[selectedItem.type];
@@ -7234,7 +7452,7 @@ function Puck({
 Puck.Components = Components;
 Puck.Fields = Fields;
 Puck.Outline = Outline;
-Puck.Preview = Preview;
+Puck.Preview = Preview2;
 
 // lib/migrate.ts
 init_react_import();