@measured/puck 0.19.0-canary.5bf4fccf → 0.19.0-canary.6dc5101e

package/dist/index.js

@@ -9,9 +9,6 @@ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __typeError = (msg) => {
-  throw TypeError(msg);
-};
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __spreadValues = (a, b) => {
   for (var prop in b || (b = {}))
@@ -64,10 +61,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
-var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -181,6 +174,7 @@ __export(core_exports, {
   renderContext: () => renderContext,
   resolveAllData: () => resolveAllData,
   transformProps: () => transformProps,
+  useGetPuck: () => useGetPuck,
   usePuck: () => usePuck,
   walkTree: () => walkTree
 });
@@ -2186,7 +2180,8 @@ var toRoot = (item) => {
   return { props: {}, readOnly };
 };
 
-// store/index.ts
+// store/default-app-state.ts
+init_react_import();
 var defaultAppState = {
   data: { content: [], root: {}, zones: {} },
   ui: {
@@ -2212,6 +2207,8 @@ var defaultAppState = {
     zones: {}
   }
 };
+
+// store/index.ts
 var defaultPageFields = {
   title: { type: "text" }
 };
@@ -2400,314 +2397,11 @@ function useAppStoreApi() {
 init_react_import();
 var import_react12 = require("@dnd-kit/react");
 
-// lib/dnd/dnd-kit/safe.ts
-init_react_import();
-var import_react10 = require("@dnd-kit/react");
-var import_sortable = require("@dnd-kit/react/sortable");
-function useDroppableSafe(input) {
-  if (typeof window === "undefined") {
-    return { ref: () => {
-    } };
-  }
-  return (0, import_react10.useDroppable)(input);
-}
-function useDraggableSafe(input) {
-  if (typeof window === "undefined") {
-    return { ref: () => {
-    } };
-  }
-  return (0, import_react10.useDraggable)(input);
-}
-function useSortableSafe(input) {
-  if (typeof window === "undefined") {
-    return { ref: () => {
-    }, status: "idle", handleRef: () => {
-    } };
-  }
-  return (0, import_sortable.useSortable)(input);
-}
-
 // lib/dnd/use-sensors.ts
 init_react_import();
-var import_react11 = require("react");
-
-// lib/dnd/PointerSensor.ts
-init_react_import();
-var import_state = require("@dnd-kit/state");
-var import_abstract = require("@dnd-kit/abstract");
-var import_geometry = require("@dnd-kit/geometry");
+var import_react10 = require("react");
+var import_react11 = require("@dnd-kit/react");
 var import_utilities = require("@dnd-kit/dom/utilities");
-var _clearTimeout;
-var _PointerSensor = class _PointerSensor extends import_abstract.Sensor {
-  constructor(manager, options) {
-    super(manager);
-    this.manager = manager;
-    this.options = options;
-    this.listeners = new import_utilities.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);
-    (0, import_state.effect)(() => {
-      const unbindGlobal = this.bindGlobal(options != null ? options : {});
-      return () => {
-        unbindGlobal();
-      };
-    });
-  }
-  bind(source, options = this.options) {
-    const unbind = (0, import_state.effect)(() => {
-      var _a;
-      const target = (_a = source.handle) != null ? _a : source.element;
-      const listener = (event) => {
-        if ((0, import_utilities.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((0, import_utilities.getDocument)(draggable.element));
-      }
-    }
-    for (const droppable of this.manager.registry.droppables.value) {
-      if (droppable.element) {
-        documents.add((0, import_utilities.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 || !(0, import_utilities.isElement)(event.target) || source.disabled) {
-      return;
-    }
-    const offset = (0, import_utilities.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 && (0, import_utilities.getDocument)(this.source.element);
-    if (doc !== ownerDocument) {
-      return;
-    }
-    const coordinates = {
-      x: event.clientX,
-      y: event.clientY
-    };
-    const offset = (0, import_utilities.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 && (0, import_geometry.exceedsDistance)(delta, distance.tolerance)) {
-        return this.handleCancel();
-      }
-      if ((0, import_geometry.exceedsDistance)(delta, distance.value)) {
-        return this.handleStart(this.source, event);
-      }
-    }
-    if (delay) {
-      if ((0, import_geometry.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();
-    (0, import_state.batch)(() => {
-      manager.actions.setDragSource(source.id);
-      manager.actions.start({ coordinates: initialCoordinates, event });
-    });
-    const ownerDocument = (0, import_utilities.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 (!(0, import_utilities.isElement)(target)) {
-      return;
-    }
-    const isNativeDraggable = (0, import_utilities.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 = (0, import_abstract.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
-var import_utilities2 = require("@dnd-kit/dom/utilities");
 var useSensors = ({
   other,
   mouse,
@@ -2716,12 +2410,12 @@ var useSensors = ({
   touch: { delay: { value: 200, tolerance: 10 } },
   other: { delay: { value: 200, tolerance: 10 }, distance: { value: 5 } }
 }) => {
-  const [sensors] = (0, import_react11.useState)(() => [
-    PointerSensor.configure({
+  const [sensors] = (0, import_react10.useState)(() => [
+    import_react11.PointerSensor.configure({
       activationConstraints(event, source) {
         var _a;
         const { pointerType, target } = event;
-        if (pointerType === "mouse" && (0, import_utilities2.isElement)(target) && (source.handle === target || ((_a = source.handle) == null ? void 0 : _a.contains(target)))) {
+        if (pointerType === "mouse" && (0, import_utilities.isElement)(target) && (source.handle === target || ((_a = source.handle) == null ? void 0 : _a.contains(target)))) {
           return mouse;
         }
         if (pointerType === "touch") {
@@ -2736,11 +2430,11 @@ var useSensors = ({
 
 // lib/dnd/collision/dynamic/index.ts
 init_react_import();
-var import_abstract9 = require("@dnd-kit/abstract");
+var import_abstract8 = require("@dnd-kit/abstract");
 
 // lib/dnd/collision/directional/index.ts
 init_react_import();
-var import_abstract2 = require("@dnd-kit/abstract");
+var import_abstract = require("@dnd-kit/abstract");
 
 // lib/dnd/collision/collision-debug.ts
 init_react_import();
@@ -2818,7 +2512,7 @@ var directionalCollision = (input, previous) => {
     return {
       id: droppable.id,
       value: 1,
-      type: import_abstract2.CollisionType.Collision
+      type: import_abstract.CollisionType.Collision
     };
   }
   return null;
@@ -2860,7 +2554,7 @@ var getMidpointImpact = (dragShape, dropShape, direction, offsetMultiplier = 0)
 
 // lib/dnd/collision/dynamic/track-movement-interval.ts
 init_react_import();
-var import_geometry2 = require("@dnd-kit/geometry");
+var import_geometry = require("@dnd-kit/geometry");
 var INTERVAL_SENSITIVITY = 10;
 var intervalCache = {
   current: { x: 0, y: 0 },
@@ -2876,13 +2570,15 @@ var trackMovementInterval = (point, dragAxis = "dynamic") => {
   };
   intervalCache.direction = getDirection(dragAxis, intervalCache.delta) || intervalCache.direction;
   if (Math.abs(intervalCache.delta.x) > INTERVAL_SENSITIVITY || Math.abs(intervalCache.delta.y) > INTERVAL_SENSITIVITY) {
-    intervalCache.previous = import_geometry2.Point.from(point);
+    intervalCache.previous = import_geometry.Point.from(point);
   }
   return intervalCache;
 };
 
 // ../../node_modules/@dnd-kit/collision/dist/index.js
 init_react_import();
+var import_abstract2 = require("@dnd-kit/abstract");
+var import_geometry2 = require("@dnd-kit/geometry");
 var import_abstract3 = require("@dnd-kit/abstract");
 var import_geometry3 = require("@dnd-kit/geometry");
 var import_abstract4 = require("@dnd-kit/abstract");
@@ -2893,8 +2589,6 @@ var import_abstract6 = require("@dnd-kit/abstract");
 var import_geometry6 = require("@dnd-kit/geometry");
 var import_abstract7 = require("@dnd-kit/abstract");
 var import_geometry7 = require("@dnd-kit/geometry");
-var import_abstract8 = require("@dnd-kit/abstract");
-var import_geometry8 = require("@dnd-kit/geometry");
 var pointerIntersection = ({
   dragOperation,
   droppable
@@ -2908,12 +2602,12 @@ var pointerIntersection = ({
     return null;
   }
   if (droppable.shape.containsPoint(pointerCoordinates)) {
-    const distance = import_geometry3.Point.distance(droppable.shape.center, pointerCoordinates);
+    const distance = import_geometry2.Point.distance(droppable.shape.center, pointerCoordinates);
     return {
       id,
       value: 1 / distance,
-      type: import_abstract3.CollisionType.PointerIntersection,
-      priority: import_abstract3.CollisionPriority.High
+      type: import_abstract2.CollisionType.PointerIntersection,
+      priority: import_abstract2.CollisionPriority.High
     };
   }
   return null;
@@ -2924,31 +2618,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 ? import_geometry4.Rectangle.from(shape.current.boundingRectangle).corners : void 0;
+  const distance = import_geometry4.Rectangle.from(
+    droppable.shape.boundingRectangle
+  ).corners.reduce(
+    (acc, corner, index) => {
       var _a;
-      return acc + import_geometry5.Point.distance(
-        import_geometry5.Point.from(corner),
-        (_a = shape == null ? void 0 : shape.current.center) != null ? _a : position.current
+      return acc + import_geometry4.Point.distance(
+        import_geometry4.Point.from(corner),
+        (_a = shapeCorners == null ? void 0 : shapeCorners[index]) != null ? _a : position.current
       );
     },
     0
@@ -2957,8 +2635,8 @@ var closestCorners = (input) => {
   return {
     id: droppable.id,
     value: 1 / value,
-    type: import_abstract5.CollisionType.Collision,
-    priority: import_abstract5.CollisionPriority.Normal
+    type: import_abstract4.CollisionType.Collision,
+    priority: import_abstract4.CollisionPriority.Normal
   };
 };
 
@@ -2983,12 +2661,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;
@@ -3003,7 +2676,8 @@ var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input
     collisionDebug(dragCenter, dropCenter, droppable.id.toString(), "yellow");
     if (collision) {
       return __spreadProps(__spreadValues({}, collision), {
-        priority: import_abstract9.CollisionPriority.Highest
+        priority: import_abstract8.CollisionPriority.Highest,
+        data
       });
     }
   }
@@ -3020,12 +2694,12 @@ var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input
     const collision = {
       id: droppable.id,
       value: intersectionRatio,
-      priority: import_abstract9.CollisionPriority.High,
-      type: import_abstract9.CollisionType.Collision
+      priority: import_abstract8.CollisionPriority.High,
+      type: import_abstract8.CollisionType.Collision
     };
     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;
@@ -3037,9 +2711,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,
@@ -3050,7 +2722,8 @@ var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input
           );
           flushNext = droppable.id;
           return __spreadProps(__spreadValues({}, fallbackCollision), {
-            priority: import_abstract9.CollisionPriority.Low
+            priority: import_abstract8.CollisionPriority.Low,
+            data
           });
         }
         collisionDebug(
@@ -3060,16 +2733,19 @@ var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input
           "orange",
           direction || ""
         );
-        return __spreadProps(__spreadValues({}, fallbackCollision), { priority: import_abstract9.CollisionPriority.Lowest });
+        return __spreadProps(__spreadValues({}, fallbackCollision), {
+          priority: import_abstract8.CollisionPriority.Lowest,
+          data
+        });
       }
     }
   }
   collisionDebug(dragCenter, dropCenter, droppable.id.toString(), "hotpink");
-  delete collisionMap[droppable.id];
   return null;
 };
 
 // components/Sortable/index.tsx
+var import_sortable = require("@dnd-kit/react/sortable");
 var import_jsx_runtime5 = require("react/jsx-runtime");
 var SortableProvider = ({
   children,
@@ -3089,16 +2765,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;
           }
@@ -3129,9 +2805,10 @@ var Sortable = ({
 }) => {
   const {
     ref: sortableRef,
-    status,
+    isDragging,
+    isDropping,
     handleRef
-  } = useSortableSafe({
+  } = (0, import_sortable.useSortable)({
     id,
     type,
     index,
@@ -3139,7 +2816,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
@@ -3264,7 +2941,7 @@ var ArrayField = ({
     }
   }, []);
   const [draggedItem, setDraggedItem] = (0, import_react14.useState)("");
-  const isDragging = !!draggedItem;
+  const isDraggingAny = !!draggedItem;
   const canEdit = useAppStore(
     (s) => s.permissions.getPermissions({ item: s.selectedItem }).edit
   );
@@ -3329,13 +3006,13 @@ var ArrayField = ({
                       id: _arrayId,
                       index: i,
                       disabled: readOnly,
-                      children: ({ status, ref, handleRef }) => /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(
+                      children: ({ isDragging, ref, handleRef }) => /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(
                         "div",
                         {
                           ref,
                           className: getClassNameItem({
                             isExpanded: arrayState.openId === _arrayId,
-                            isDragging: status === "dragging",
+                            isDragging,
                             readOnly
                           }),
                           children: [
@@ -3476,7 +3153,7 @@ var ArrayField = ({
                     type: "button",
                     className: getClassName5("addButton"),
                     onClick: () => {
-                      if (isDragging) return;
+                      if (isDraggingAny) return;
                       const existingValue = value || [];
                       const newValue = [
                         ...existingValue,
@@ -4462,12 +4139,12 @@ init_react_import();
 var styles_module_default10 = { "Drawer": "_Drawer_pl7z0_1", "Drawer-draggable": "_Drawer-draggable_pl7z0_8", "Drawer-draggableBg": "_Drawer-draggableBg_pl7z0_12", "DrawerItem-draggable": "_DrawerItem-draggable_pl7z0_22", "DrawerItem--disabled": "_DrawerItem--disabled_pl7z0_35", "DrawerItem": "_DrawerItem_pl7z0_22", "Drawer--isDraggingFrom": "_Drawer--isDraggingFrom_pl7z0_45", "DrawerItem-name": "_DrawerItem-name_pl7z0_63" };
 
 // components/Drawer/index.tsx
-var import_react37 = require("react");
+var import_react38 = require("react");
 
 // components/DragDropContext/index.tsx
 init_react_import();
-var import_react35 = require("@dnd-kit/react");
-var import_react36 = require("react");
+var import_react36 = require("@dnd-kit/react");
+var import_react37 = require("react");
 var import_dom = require("@dnd-kit/dom");
 
 // components/DropZone/index.tsx
@@ -4577,6 +4254,7 @@ function useContextStore(context, selector) {
 
 // components/DraggableComponent/index.tsx
 var import_shallow2 = require("zustand/react/shallow");
+var import_sortable2 = require("@dnd-kit/react/sortable");
 var import_jsx_runtime20 = require("react/jsx-runtime");
 var getClassName16 = get_class_name_factory_default("DraggableComponent", styles_module_default11);
 var DEBUG2 = false;
@@ -4662,7 +4340,7 @@ var DraggableComponent = ({
   const canCollide = permissions.drag || userIsDragging;
   const disabled = !isEnabled || !canCollide;
   const [dragAxis, setDragAxis] = (0, import_react25.useState)(userDragAxis || autoDragAxis);
-  const { ref: sortableRef, status } = useSortableSafe({
+  const { ref: sortableRef, isDragging: thisIsDragging } = (0, import_sortable2.useSortable)({
     id,
     index,
     group: zoneCompound,
@@ -4684,9 +4362,9 @@ var DraggableComponent = ({
     transition: {
       duration: 200,
       easing: "cubic-bezier(0.2, 0, 0, 1)"
-    }
+    },
+    feedback: "clone"
   });
-  const thisIsDragging = status === "dragging";
   const ref = (0, import_react25.useRef)(null);
   const refSetter = (0, import_react25.useCallback)(
     (el) => {
@@ -4826,18 +4504,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,
@@ -4989,6 +4661,9 @@ var DraggableComponent = ({
 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" };
 
+// components/DropZone/index.tsx
+var import_react35 = require("@dnd-kit/react");
+
 // components/DropZone/lib/use-min-empty-height.ts
 init_react_import();
 var import_react26 = require("react");
@@ -5621,7 +5296,7 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
         path: path || []
       }
     };
-    const { ref: dropRef } = useDroppableSafe(droppableConfig);
+    const { ref: dropRef } = (0, import_react35.useDroppable)(droppableConfig);
     const isAreaSelected = useAppStore(
       (s) => (s == null ? void 0 : s.selectedItem) && areaId === (s == null ? void 0 : s.selectedItem.props.id)
     );
@@ -5753,8 +5428,7 @@ var DropZone = (0, import_react34.forwardRef)(
 
 // lib/dnd/NestedDroppablePlugin.ts
 init_react_import();
-var import_abstract10 = require("@dnd-kit/abstract");
-var import_state2 = require("@dnd-kit/state");
+var import_abstract9 = require("@dnd-kit/abstract");
 
 // lib/throttle.ts
 init_react_import();
@@ -5908,7 +5582,8 @@ var getPointerCollisions = (position, manager) => {
       const element = elements[i];
       const dropzoneId = element.getAttribute("data-puck-dropzone");
       const id = element.getAttribute("data-puck-dnd");
-      if (BUFFER && (dropzoneId || id)) {
+      const isVoid = element.hasAttribute("data-puck-dnd-void");
+      if (BUFFER && (dropzoneId || id) && !isVoid) {
         const box = element.getBoundingClientRect();
         const contractedBox = {
           left: box.left + BUFFER,
@@ -5983,13 +5658,13 @@ var findDeepestCandidate = (position, manager) => {
     area: rootAreaId
   };
 };
-var createNestedDroppablePlugin = ({ onChange }, id) => class NestedDroppablePlugin extends import_abstract10.Plugin {
+var createNestedDroppablePlugin = ({ onChange }, id) => class NestedDroppablePlugin extends import_abstract9.Plugin {
   constructor(manager, options) {
     super(manager);
     if (typeof window === "undefined") {
       return;
     }
-    const cleanupEffect = (0, import_state2.effects)(() => {
+    this.registerEffect(() => {
       const handleMove = (event) => {
         const target = event instanceof BubbledPointerEvent ? event.originalTarget || event.target : event.target;
         const position = new GlobalPosition(target, {
@@ -6013,12 +5688,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;
     });
   }
 };
@@ -6080,12 +5755,12 @@ function getDeepDir(el) {
 // components/DragDropContext/index.tsx
 var import_jsx_runtime26 = require("react/jsx-runtime");
 var DEBUG3 = false;
-var dragListenerContext = (0, import_react36.createContext)({
+var dragListenerContext = (0, import_react37.createContext)({
   dragListeners: {}
 });
 function useDragListener(type, fn, deps = []) {
-  const { setDragListeners } = (0, import_react36.useContext)(dragListenerContext);
-  (0, import_react36.useEffect)(() => {
+  const { setDragListeners } = (0, import_react37.useContext)(dragListenerContext);
+  (0, import_react37.useEffect)(() => {
     if (setDragListeners) {
       setDragListeners((old) => __spreadProps(__spreadValues({}, old), {
         [type]: [...old[type] || [], fn]
@@ -6095,8 +5770,8 @@ function useDragListener(type, fn, deps = []) {
 }
 var AREA_CHANGE_DEBOUNCE_MS = 100;
 var useTempDisableFallback = (timeout3) => {
-  const lastFallbackDisable = (0, import_react36.useRef)(null);
-  return (0, import_react36.useCallback)((manager) => {
+  const lastFallbackDisable = (0, import_react37.useRef)(null);
+  return (0, import_react37.useCallback)((manager) => {
     collisionStore.setState({ fallbackEnabled: false });
     const fallbackId = generateId();
     lastFallbackDisable.current = fallbackId;
@@ -6115,9 +5790,9 @@ var DragDropContextClient = ({
   const dispatch = useAppStore((s) => s.dispatch);
   const appStore = useAppStoreApi();
   const id = useSafeId();
-  const debouncedParamsRef = (0, import_react36.useRef)(null);
+  const debouncedParamsRef = (0, import_react37.useRef)(null);
   const tempDisableFallback = useTempDisableFallback(100);
-  const [zoneStore] = (0, import_react36.useState)(
+  const [zoneStore] = (0, import_react37.useState)(
     () => (0, import_zustand5.createStore)(() => ({
       zoneDepthIndex: {},
       nextZoneDepthIndex: {},
@@ -6127,7 +5802,7 @@ var DragDropContextClient = ({
       previewIndex: {}
     }))
   );
-  const getChanged2 = (0, import_react36.useCallback)(
+  const getChanged2 = (0, import_react37.useCallback)(
     (params, id2) => {
       const { zoneDepthIndex = {}, areaDepthIndex = {} } = zoneStore.getState() || {};
       const stateHasZone = Object.keys(zoneDepthIndex).length > 0;
@@ -6148,7 +5823,7 @@ var DragDropContextClient = ({
     },
     [zoneStore]
   );
-  const setDeepestAndCollide = (0, import_react36.useCallback)(
+  const setDeepestAndCollide = (0, import_react37.useCallback)(
     (params, manager) => {
       const { zoneChanged, areaChanged } = getChanged2(params, id);
       if (!zoneChanged && !areaChanged) return;
@@ -6172,7 +5847,7 @@ var DragDropContextClient = ({
     setDeepestDb.cancel();
     debouncedParamsRef.current = null;
   };
-  (0, import_react36.useEffect)(() => {
+  (0, import_react37.useEffect)(() => {
     if (DEBUG3) {
       zoneStore.subscribe(
         (s) => {
@@ -6186,7 +5861,7 @@ var DragDropContextClient = ({
       );
     }
   }, []);
-  const [plugins] = (0, import_react36.useState)(() => [
+  const [plugins] = (0, import_react37.useState)(() => [
     ...disableAutoScroll ? import_dom.defaultPreset.plugins.filter((plugin) => plugin !== import_dom.AutoScroller) : import_dom.defaultPreset.plugins,
     createNestedDroppablePlugin(
       {
@@ -6234,10 +5909,10 @@ var DragDropContextClient = ({
     )
   ]);
   const sensors = useSensors();
-  const [dragListeners, setDragListeners] = (0, import_react36.useState)({});
-  const dragMode = (0, import_react36.useRef)(null);
-  const initialSelector = (0, import_react36.useRef)(void 0);
-  const nextContextValue = (0, import_react36.useMemo)(
+  const [dragListeners, setDragListeners] = (0, import_react37.useState)({});
+  const dragMode = (0, import_react37.useRef)(null);
+  const initialSelector = (0, import_react37.useRef)(void 0);
+  const nextContextValue = (0, import_react37.useMemo)(
     () => ({
       mode: "edit",
       areaId: "root",
@@ -6253,7 +5928,7 @@ var DragDropContextClient = ({
         setDragListeners
       },
       children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
-        import_react35.DragDropProvider,
+        import_react36.DragDropProvider,
         {
           plugins,
           sensors,
@@ -6320,7 +5995,7 @@ var DragDropContextClient = ({
             }, 250);
           },
           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;
@@ -6338,7 +6013,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) {
@@ -6351,7 +6026,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;
@@ -6397,16 +6072,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;
@@ -6437,10 +6108,17 @@ var DragDropContextClient = ({
           },
           onBeforeDragStart: (event) => {
             var _a;
-            const isNewComponent = ((_a = event.operation.source) == null ? void 0 : _a.data.type) === "drawer";
+            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 });
+            dispatch({
+              type: "setUi",
+              ui: {
+                isDragging: true
+              },
+              recordHistory: false
+            });
           },
           children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(ZoneStoreProvider, { store: zoneStore, children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(DropZoneProvider, { value: nextContextValue, children }) })
         }
@@ -6460,6 +6138,7 @@ var DragDropContext = ({
 };
 
 // components/Drawer/index.tsx
+var import_react39 = require("@dnd-kit/react");
 var import_jsx_runtime27 = require("react/jsx-runtime");
 var getClassName18 = get_class_name_factory_default("Drawer", styles_module_default10);
 var getClassNameItem2 = get_class_name_factory_default("DrawerItem", styles_module_default10);
@@ -6470,7 +6149,7 @@ var DrawerItemInner = ({
   dragRef,
   isDragDisabled
 }) => {
-  const CustomInner = (0, import_react37.useMemo)(
+  const CustomInner = (0, import_react38.useMemo)(
     () => children || (({ children: children2 }) => /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassNameItem2("default"), children: children2 })),
     [children]
   );
@@ -6496,10 +6175,11 @@ var DrawerItemDraggable = ({
   id,
   isDragDisabled
 }) => {
-  const { ref } = useDraggableSafe({
+  const { ref } = (0, import_react39.useDraggable)({
     id,
-    data: { type: "drawer", componentType: name },
-    disabled: isDragDisabled
+    data: { componentType: name },
+    disabled: isDragDisabled,
+    type: "drawer"
   });
   return /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)("div", { className: getClassName18("draggable"), children: [
     /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassName18("draggableBg"), children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(DrawerItemInner, { name, label, children }) }),
@@ -6524,7 +6204,7 @@ var DrawerItem = ({
   isDragDisabled
 }) => {
   const resolvedId = id || name;
-  const [dynamicId, setDynamicId] = (0, import_react37.useState)(generateId(resolvedId));
+  const [dynamicId, setDynamicId] = (0, import_react38.useState)(generateId(resolvedId));
   if (typeof index !== "undefined") {
     console.error(
       "Warning: The `index` prop on Drawer.Item is deprecated and no longer required."
@@ -6564,7 +6244,7 @@ var Drawer = ({
     );
   }
   const id = useSafeId();
-  const { ref } = useDroppableSafe({
+  const { ref } = (0, import_react39.useDroppable)({
     id,
     type: "void",
     collisionPriority: 0
@@ -6577,6 +6257,7 @@ var Drawer = ({
       ref,
       "data-puck-dnd": id,
       "data-puck-drawer": true,
+      "data-puck-dnd-void": true,
       children
     }
   );
@@ -6585,7 +6266,7 @@ Drawer.Item = DrawerItem;
 
 // components/Puck/index.tsx
 init_react_import();
-var import_react52 = require("react");
+var import_react54 = require("react");
 
 // components/SidebarSection/index.tsx
 init_react_import();
@@ -6596,7 +6277,7 @@ var styles_module_default13 = { "SidebarSection": "_SidebarSection_8boj8_1", "Si
 
 // lib/use-breadcrumbs.ts
 init_react_import();
-var import_react38 = require("react");
+var import_react40 = require("react");
 var useBreadcrumbs = (renderCount) => {
   const selectedId = useAppStore((s) => {
     var _a;
@@ -6608,7 +6289,7 @@ var useBreadcrumbs = (renderCount) => {
     return (_a = s.state.indexes.nodes[selectedId]) == null ? void 0 : _a.path;
   });
   const appStore = useAppStoreApi();
-  return (0, import_react38.useMemo)(() => {
+  return (0, import_react40.useMemo)(() => {
     const breadcrumbs = (path == null ? void 0 : path.map((zoneCompound) => {
       var _a, _b, _c;
       const [componentId] = zoneCompound.split(":");
@@ -6736,7 +6417,7 @@ 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" };
 
 // components/Puck/components/Fields/index.tsx
-var import_react39 = require("react");
+var import_react41 = require("react");
 var import_shallow4 = require("zustand/react/shallow");
 var import_jsx_runtime30 = require("react/jsx-runtime");
 var getClassName21 = get_class_name_factory_default("PuckFields", styles_module_default16);
@@ -6809,7 +6490,7 @@ var FieldsChild = ({ fieldName }) => {
     })
   );
   const appStore = useAppStoreApi();
-  const onChange = (0, import_react39.useCallback)(createOnChange(fieldName, appStore), [
+  const onChange = (0, import_react41.useCallback)(createOnChange(fieldName, appStore), [
     fieldName
   ]);
   if (!field || !id) return null;
@@ -6850,7 +6531,7 @@ var Fields = ({ wrapFields = true }) => {
     })
   );
   const isLoading = fieldsLoading || componentResolving;
-  const Wrapper = (0, import_react39.useMemo)(() => overrides.fields || DefaultFields, [overrides]);
+  const Wrapper = (0, import_react41.useMemo)(() => overrides.fields || DefaultFields, [overrides]);
   return /* @__PURE__ */ (0, import_jsx_runtime30.jsxs)(
     "form",
     {
@@ -6871,7 +6552,7 @@ init_react_import();
 
 // lib/use-component-list.tsx
 init_react_import();
-var import_react40 = require("react");
+var import_react42 = require("react");
 
 // components/ComponentList/index.tsx
 init_react_import();
@@ -6942,10 +6623,10 @@ ComponentList.Item = ComponentListItem;
 // lib/use-component-list.tsx
 var import_jsx_runtime32 = require("react/jsx-runtime");
 var useComponentList = () => {
-  const [componentList, setComponentList] = (0, import_react40.useState)();
+  const [componentList, setComponentList] = (0, import_react42.useState)();
   const config = useAppStore((s) => s.config);
   const uiComponentList = useAppStore((s) => s.state.ui.componentList);
-  (0, import_react40.useEffect)(() => {
+  (0, import_react42.useEffect)(() => {
     var _a, _b, _c;
     if (Object.keys(uiComponentList).length > 0) {
       const matchedComponents = [];
@@ -7014,22 +6695,22 @@ var useComponentList = () => {
 };
 
 // components/Puck/components/Components/index.tsx
-var import_react41 = require("react");
+var import_react43 = require("react");
 var import_jsx_runtime33 = require("react/jsx-runtime");
 var Components = () => {
   const overrides = useAppStore((s) => s.overrides);
   const componentList = useComponentList();
-  const Wrapper = (0, import_react41.useMemo)(() => overrides.components || "div", [overrides]);
+  const Wrapper = (0, import_react43.useMemo)(() => overrides.components || "div", [overrides]);
   return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Wrapper, { children: componentList ? componentList : /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(ComponentList, { id: "all" }) });
 };
 
 // components/Puck/components/Preview/index.tsx
 init_react_import();
-var import_react43 = require("react");
+var import_react45 = require("react");
 
 // components/AutoFrame/index.tsx
 init_react_import();
-var import_react42 = require("react");
+var import_react44 = require("react");
 var import_object_hash = __toESM(require("object-hash"));
 var import_react_dom3 = require("react-dom");
 var import_jsx_runtime34 = require("react/jsx-runtime");
@@ -7075,7 +6756,7 @@ var CopyHostStyles = ({
   onStylesLoaded = () => null
 }) => {
   const { document: doc, window: win } = useFrame();
-  (0, import_react42.useEffect)(() => {
+  (0, import_react44.useEffect)(() => {
     if (!win || !doc) {
       return () => {
       };
@@ -7234,8 +6915,8 @@ var CopyHostStyles = ({
   }, []);
   return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(import_jsx_runtime34.Fragment, { children });
 };
-var autoFrameContext = (0, import_react42.createContext)({});
-var useFrame = () => (0, import_react42.useContext)(autoFrameContext);
+var autoFrameContext = (0, import_react44.createContext)({});
+var useFrame = () => (0, import_react44.useContext)(autoFrameContext);
 function AutoFrame(_a) {
   var _b = _a, {
     children,
@@ -7256,11 +6937,11 @@ function AutoFrame(_a) {
     "onNotReady",
     "frameRef"
   ]);
-  const [loaded, setLoaded] = (0, import_react42.useState)(false);
-  const [ctx, setCtx] = (0, import_react42.useState)({});
-  const [mountTarget, setMountTarget] = (0, import_react42.useState)();
-  const [stylesLoaded, setStylesLoaded] = (0, import_react42.useState)(false);
-  (0, import_react42.useEffect)(() => {
+  const [loaded, setLoaded] = (0, import_react44.useState)(false);
+  const [ctx, setCtx] = (0, import_react44.useState)({});
+  const [mountTarget, setMountTarget] = (0, import_react44.useState)();
+  const [stylesLoaded, setStylesLoaded] = (0, import_react44.useState)(false);
+  (0, import_react44.useEffect)(() => {
     var _a2;
     if (frameRef.current) {
       const doc = frameRef.current.contentDocument;
@@ -7312,7 +6993,7 @@ var import_jsx_runtime35 = require("react/jsx-runtime");
 var getClassName23 = get_class_name_factory_default("PuckPreview", styles_module_default18);
 var useBubbleIframeEvents = (ref) => {
   const status = useAppStore((s) => s.status);
-  (0, import_react43.useEffect)(() => {
+  (0, import_react45.useEffect)(() => {
     if (ref.current && status === "READY") {
       const iframe = ref.current;
       const handlePointerMove = (event) => {
@@ -7361,7 +7042,7 @@ var Preview3 = ({ id = "puck-preview" }) => {
   const renderData = useAppStore(
     (s) => s.state.ui.previewMode === "edit" ? null : s.state.data
   );
-  const Page = (0, import_react43.useCallback)(
+  const Page = (0, import_react45.useCallback)(
     (pageProps) => {
       var _a, _b;
       const rootConfig = config.root;
@@ -7372,9 +7053,9 @@ var Preview3 = ({ id = "puck-preview" }) => {
     },
     [config.root]
   );
-  const Frame = (0, import_react43.useMemo)(() => overrides.iframe, [overrides]);
+  const Frame = (0, import_react45.useMemo)(() => overrides.iframe, [overrides]);
   const rootProps = root.props || root;
-  const ref = (0, import_react43.useRef)(null);
+  const ref = (0, import_react45.useRef)(null);
   useBubbleIframeEvents(ref);
   const inner = !renderData ? /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
     Page,
@@ -7389,7 +7070,7 @@ var Preview3 = ({ id = "puck-preview" }) => {
       children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(DropZonePure, { zone: rootDroppableId })
     })
   ) : /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Render, { data: renderData, config });
-  (0, import_react43.useEffect)(() => {
+  (0, import_react45.useEffect)(() => {
     if (!iframe.enabled) {
       setStatus("READY");
     }
@@ -7459,7 +7140,7 @@ var scrollIntoView = (el) => {
 };
 
 // components/LayerTree/index.tsx
-var import_react44 = require("react");
+var import_react46 = require("react");
 
 // lib/on-scroll-end.ts
 init_react_import();
@@ -7491,11 +7172,11 @@ var Layer = ({
   zoneCompound
 }) => {
   var _a;
-  const ctx = (0, import_react44.useContext)(dropZoneContext);
+  const ctx = (0, import_react46.useContext)(dropZoneContext);
   const config = useAppStore((s) => s.config);
   const itemSelector = useAppStore((s) => s.state.ui.itemSelector);
   const dispatch = useAppStore((s) => s.dispatch);
-  const setItemSelector = (0, import_react44.useCallback)(
+  const setItemSelector = (0, import_react46.useCallback)(
     (itemSelector2) => {
       dispatch({ type: "setUi", ui: { itemSelector: itemSelector2 } });
     },
@@ -7629,7 +7310,7 @@ var LayerTree = ({
 };
 
 // components/Puck/components/Outline/index.tsx
-var import_react45 = require("react");
+var import_react47 = require("react");
 
 // lib/data/find-zones-for-area.ts
 init_react_import();
@@ -7647,7 +7328,7 @@ var Outline = () => {
   const rootZones = useAppStore(
     (0, import_shallow6.useShallow)((s) => findZonesForArea(s.state, "root"))
   );
-  const Wrapper = (0, import_react45.useMemo)(() => outlineOverride || "div", [outlineOverride]);
+  const Wrapper = (0, import_react47.useMemo)(() => outlineOverride || "div", [outlineOverride]);
   return /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Wrapper, { children: rootZones.map((zoneCompound) => /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
     LayerTree,
     {
@@ -7781,11 +7462,11 @@ var getBox = function getBox2(el) {
 };
 
 // components/Puck/components/Canvas/index.tsx
-var import_react47 = require("react");
+var import_react49 = require("react");
 
 // components/ViewportControls/index.tsx
 init_react_import();
-var import_react46 = require("react");
+var import_react48 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/ViewportControls/styles.module.css#css-module
 init_react_import();
@@ -7808,8 +7489,8 @@ var ViewportButton = ({
   onClick
 }) => {
   const viewports = useAppStore((s) => s.state.ui.viewports);
-  const [isActive, setIsActive] = (0, import_react46.useState)(false);
-  (0, import_react46.useEffect)(() => {
+  const [isActive, setIsActive] = (0, import_react48.useState)(false);
+  (0, import_react48.useEffect)(() => {
     setIsActive(width === viewports.current.width);
   }, [width, viewports.current.width]);
   return /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("span", { className: getClassNameButton({ isActive }), children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
@@ -7845,7 +7526,7 @@ var ViewportControls = ({
   const defaultsContainAutoZoom = defaultZoomOptions.find(
     (option) => option.value === autoZoom
   );
-  const zoomOptions = (0, import_react46.useMemo)(
+  const zoomOptions = (0, import_react48.useMemo)(
     () => [
       ...defaultZoomOptions,
       ...defaultsContainAutoZoom ? [] : [
@@ -7992,17 +7673,17 @@ var Canvas = () => {
       viewports: s.state.ui.viewports
     }))
   );
-  const frameRef = (0, import_react47.useRef)(null);
-  const [showTransition, setShowTransition] = (0, import_react47.useState)(false);
-  const defaultRender = (0, import_react47.useMemo)(() => {
+  const frameRef = (0, import_react49.useRef)(null);
+  const [showTransition, setShowTransition] = (0, import_react49.useState)(false);
+  const defaultRender = (0, import_react49.useMemo)(() => {
     const PuckDefault = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(import_jsx_runtime39.Fragment, { children });
     return PuckDefault;
   }, []);
-  const CustomPreview = (0, import_react47.useMemo)(
+  const CustomPreview = (0, import_react49.useMemo)(
     () => overrides.preview || defaultRender,
     [overrides]
   );
-  const getFrameDimensions = (0, import_react47.useCallback)(() => {
+  const getFrameDimensions = (0, import_react49.useCallback)(() => {
     if (frameRef.current) {
       const frame = frameRef.current;
       const box = getBox(frame);
@@ -8010,7 +7691,7 @@ var Canvas = () => {
     }
     return { width: 0, height: 0 };
   }, [frameRef]);
-  const resetAutoZoom = (0, import_react47.useCallback)(
+  const resetAutoZoom = (0, import_react49.useCallback)(
     (newViewports = viewports) => {
       if (frameRef.current) {
         setZoomConfig(
@@ -8024,11 +7705,11 @@ var Canvas = () => {
     },
     [frameRef, zoomConfig, viewports]
   );
-  (0, import_react47.useEffect)(() => {
+  (0, import_react49.useEffect)(() => {
     setShowTransition(false);
     resetAutoZoom(viewports);
   }, [frameRef, leftSideBarVisible, rightSideBarVisible]);
-  (0, import_react47.useEffect)(() => {
+  (0, import_react49.useEffect)(() => {
     const { height: frameHeight } = getFrameDimensions();
     if (viewports.current.height === "auto") {
       setZoomConfig(__spreadProps(__spreadValues({}, zoomConfig), {
@@ -8036,13 +7717,13 @@ var Canvas = () => {
       }));
     }
   }, [zoomConfig.zoom]);
-  (0, import_react47.useEffect)(() => {
+  (0, import_react49.useEffect)(() => {
     if (ZOOM_ON_CHANGE) {
       setShowTransition(true);
       resetAutoZoom(viewports);
     }
   }, [viewports.current.width]);
-  (0, import_react47.useEffect)(() => {
+  (0, import_react49.useEffect)(() => {
     const cb = () => {
       setShowTransition(false);
       resetAutoZoom();
@@ -8052,8 +7733,8 @@ var Canvas = () => {
       window.removeEventListener("resize", cb);
     };
   }, []);
-  const [showLoader, setShowLoader] = (0, import_react47.useState)(false);
-  (0, import_react47.useEffect)(() => {
+  const [showLoader, setShowLoader] = (0, import_react49.useState)(false);
+  (0, import_react49.useEffect)(() => {
     setTimeout(() => {
       setShowLoader(true);
     }, 500);
@@ -8131,7 +7812,7 @@ var Canvas = () => {
 
 // lib/use-loaded-overrides.ts
 init_react_import();
-var import_react48 = require("react");
+var import_react50 = require("react");
 
 // lib/load-overrides.ts
 init_react_import();
@@ -8170,7 +7851,7 @@ var useLoadedOverrides = ({
   overrides,
   plugins
 }) => {
-  return (0, import_react48.useMemo)(() => {
+  return (0, import_react50.useMemo)(() => {
     return loadOverrides({ overrides, plugins });
   }, [plugins, overrides]);
 };
@@ -8182,14 +7863,14 @@ var DefaultOverride = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime40
 
 // lib/use-inject-css.ts
 init_react_import();
-var import_react49 = require("react");
+var import_react51 = require("react");
 var styles = ``;
 var useInjectStyleSheet = (initialStyles, iframeEnabled) => {
-  const [el, setEl] = (0, import_react49.useState)();
-  (0, import_react49.useEffect)(() => {
+  const [el, setEl] = (0, import_react51.useState)();
+  (0, import_react51.useEffect)(() => {
     setEl(document.createElement("style"));
   }, []);
-  (0, import_react49.useEffect)(() => {
+  (0, import_react51.useEffect)(() => {
     var _a;
     if (!el || typeof window === "undefined") {
       return;
@@ -8209,10 +7890,10 @@ var useInjectGlobalCss = (iframeEnabled) => {
 
 // lib/use-preview-mode-hotkeys.ts
 init_react_import();
-var import_react50 = require("react");
+var import_react52 = require("react");
 var usePreviewModeHotkeys = () => {
   const appStore = useAppStoreApi();
-  const toggleInteractive = (0, import_react50.useCallback)(() => {
+  const toggleInteractive = (0, import_react52.useCallback)(() => {
     const dispatch = appStore.getState().dispatch;
     dispatch({
       type: "setUi",
@@ -8227,7 +7908,7 @@ var usePreviewModeHotkeys = () => {
 
 // lib/use-puck.ts
 init_react_import();
-var import_react51 = require("react");
+var import_react53 = require("react");
 var import_zustand6 = require("zustand");
 var generateUsePuck = (store) => {
   const history = {
@@ -8261,7 +7942,7 @@ var generateUsePuck = (store) => {
   const get = () => storeData;
   return __spreadProps(__spreadValues({}, storeData), { get });
 };
-var UsePuckStoreContext = (0, import_react51.createContext)(
+var UsePuckStoreContext = (0, import_react53.createContext)(
   null
 );
 var convertToPickedStore = (store) => {
@@ -8275,12 +7956,12 @@ var convertToPickedStore = (store) => {
   };
 };
 var useRegisterUsePuckStore = (appStore) => {
-  const [usePuckStore] = (0, import_react51.useState)(
+  const [usePuckStore] = (0, import_react53.useState)(
     () => (0, import_zustand6.createStore)(
       () => generateUsePuck(convertToPickedStore(appStore.getState()))
     )
   );
-  (0, import_react51.useEffect)(() => {
+  (0, import_react53.useEffect)(() => {
     return appStore.subscribe(
       (store) => convertToPickedStore(store),
       (pickedStore) => {
@@ -8292,7 +7973,7 @@ var useRegisterUsePuckStore = (appStore) => {
 };
 function createUsePuck() {
   return function usePuck2(selector) {
-    const usePuckApi = (0, import_react51.useContext)(UsePuckStoreContext);
+    const usePuckApi = (0, import_react53.useContext)(UsePuckStoreContext);
     if (!usePuckApi) {
       throw new Error("usePuck must be used inside <Puck>.");
     }
@@ -8304,13 +7985,20 @@ function createUsePuck() {
   };
 }
 function usePuck() {
-  (0, import_react51.useEffect)(() => {
+  (0, import_react53.useEffect)(() => {
     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 = (0, import_react53.useContext)(UsePuckStoreContext);
+  if (!usePuckApi) {
+    throw new Error("usePuckGet must be used inside <Puck>.");
+  }
+  return usePuckApi.getState;
+}
 
 // components/Puck/index.tsx
 var import_fast_deep_equal2 = __toESM(require("fast-deep-equal"));
@@ -8326,11 +8014,11 @@ var FieldSideBar = () => {
   );
   return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(SidebarSection, { noPadding: true, noBorderTop: true, showBreadcrumbs: true, title, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Fields, {}) });
 };
-var propsContext = (0, import_react52.createContext)({});
+var propsContext = (0, import_react54.createContext)({});
 function PropsProvider(props) {
   return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(propsContext.Provider, { value: props, children: props.children });
 }
-var usePropsContext = () => (0, import_react52.useContext)(propsContext);
+var usePropsContext = () => (0, import_react54.useContext)(propsContext);
 function PuckProvider({ children }) {
   const {
     config,
@@ -8350,7 +8038,7 @@ function PuckProvider({ children }) {
     enabled: true,
     waitForStyles: true
   }, _iframe);
-  const [generatedAppState] = (0, import_react52.useState)(() => {
+  const [generatedAppState] = (0, import_react54.useState)(() => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const initial = __spreadValues(__spreadValues({}, defaultAppState.ui), initialUi);
     let clientUiState = {};
@@ -8410,7 +8098,7 @@ function PuckProvider({ children }) {
     return walkAppState(newAppState, config);
   });
   const { appendData = true } = _initialHistory || {};
-  const [blendedHistories] = (0, import_react52.useState)(
+  const [blendedHistories] = (0, import_react54.useState)(
     [
       ...(_initialHistory == null ? void 0 : _initialHistory.histories) || [],
       ...appendData ? [{ state: generatedAppState }] : []
@@ -8430,7 +8118,7 @@ function PuckProvider({ children }) {
     overrides,
     plugins
   });
-  const generateAppStore = (0, import_react52.useCallback)(
+  const generateAppStore = (0, import_react54.useCallback)(
     (state) => {
       return {
         state,
@@ -8454,10 +8142,10 @@ function PuckProvider({ children }) {
       metadata
     ]
   );
-  const [appStore] = (0, import_react52.useState)(
+  const [appStore] = (0, import_react54.useState)(
     () => createAppStore(generateAppStore(initialAppState))
   );
-  (0, import_react52.useEffect)(() => {
+  (0, import_react54.useEffect)(() => {
     const state = appStore.getState().state;
     appStore.setState(__spreadValues({}, generateAppStore(state)));
   }, [config, plugins, loadedOverrides, viewports, iframe, onAction, metadata]);
@@ -8466,8 +8154,8 @@ function PuckProvider({ children }) {
     index: initialHistoryIndex,
     initialAppState
   });
-  const previousData = (0, import_react52.useRef)(null);
-  (0, import_react52.useEffect)(() => {
+  const previousData = (0, import_react54.useRef)(null);
+  (0, import_react54.useEffect)(() => {
     appStore.subscribe(
       (s) => s.state.data,
       (data) => {
@@ -8481,7 +8169,7 @@ function PuckProvider({ children }) {
   }, []);
   useRegisterPermissionsSlice(appStore, permissions);
   const uPuckStore = useRegisterUsePuckStore(appStore);
-  (0, import_react52.useEffect)(() => {
+  (0, import_react54.useEffect)(() => {
     const { resolveAndCommitData } = appStore.getState();
     resolveAndCommitData();
   }, []);
@@ -8507,13 +8195,13 @@ function PuckLayout({ children }) {
   const rightSideBarVisible = useAppStore(
     (s) => s.state.ui.rightSideBarVisible
   );
-  const [menuOpen, setMenuOpen] = (0, import_react52.useState)(false);
+  const [menuOpen, setMenuOpen] = (0, import_react54.useState)(false);
   const appStore = useAppStoreApi();
   const rootProps = useAppStore(
     (s) => s.state.data.root.props || s.state.data.root.props
   );
   const dispatch = useAppStore((s) => s.dispatch);
-  const toggleSidebars = (0, import_react52.useCallback)(
+  const toggleSidebars = (0, import_react54.useCallback)(
     (sidebar) => {
       const widerViewport = window.matchMedia("(min-width: 638px)").matches;
       const sideBarVisible = sidebar === "left" ? leftSideBarVisible : rightSideBarVisible;
@@ -8527,7 +8215,7 @@ function PuckLayout({ children }) {
     },
     [dispatch, leftSideBarVisible, rightSideBarVisible]
   );
-  (0, import_react52.useEffect)(() => {
+  (0, import_react54.useEffect)(() => {
     if (!window.matchMedia("(min-width: 638px)").matches) {
       dispatch({
         type: "setUi",
@@ -8550,7 +8238,7 @@ function PuckLayout({ children }) {
       window.removeEventListener("resize", handleResize);
     };
   }, []);
-  const defaultHeaderRender = (0, import_react52.useMemo)(() => {
+  const defaultHeaderRender = (0, import_react54.useMemo)(() => {
     if (renderHeader) {
       console.warn(
         "`renderHeader` is deprecated. Please use `overrides.header` and the `usePuck` hook instead"
@@ -8565,7 +8253,7 @@ function PuckLayout({ children }) {
     }
     return DefaultOverride;
   }, [renderHeader]);
-  const defaultHeaderActionsRender = (0, import_react52.useMemo)(() => {
+  const defaultHeaderActionsRender = (0, import_react54.useMemo)(() => {
     if (renderHeaderActions) {
       console.warn(
         "`renderHeaderActions` is deprecated. Please use `overrides.headerActions` and the `usePuck` hook instead."
@@ -8580,25 +8268,25 @@ function PuckLayout({ children }) {
     return DefaultOverride;
   }, [renderHeader]);
   const overrides = useAppStore((s) => s.overrides);
-  const CustomPuck = (0, import_react52.useMemo)(
+  const CustomPuck = (0, import_react54.useMemo)(
     () => overrides.puck || DefaultOverride,
     [overrides]
   );
-  const CustomHeader = (0, import_react52.useMemo)(
+  const CustomHeader = (0, import_react54.useMemo)(
     () => overrides.header || defaultHeaderRender,
     [overrides]
   );
-  const CustomHeaderActions = (0, import_react52.useMemo)(
+  const CustomHeaderActions = (0, import_react54.useMemo)(
     () => overrides.headerActions || defaultHeaderActionsRender,
     [overrides]
   );
-  const [mounted, setMounted] = (0, import_react52.useState)(false);
-  (0, import_react52.useEffect)(() => {
+  const [mounted, setMounted] = (0, import_react54.useState)(false);
+  (0, import_react54.useEffect)(() => {
     setMounted(true);
   }, []);
   const ready = useAppStore((s) => s.status === "READY");
   useMonitorHotkeys();
-  (0, import_react52.useEffect)(() => {
+  (0, import_react54.useEffect)(() => {
     if (ready && iframe.enabled) {
       const frameDoc = getFrame();
       if (frameDoc) {
@@ -8768,7 +8456,7 @@ var migrations = [
         const [id, slotName] = zoneCompound.split(":");
         const nodeData = indexes.nodes[id].data;
         const componentType = nodeData.type;
-        const configForComponent = config.components[componentType];
+        const configForComponent = id === "root" ? config.root : 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), {
@@ -8826,11 +8514,13 @@ var defaultData = (data) => __spreadProps(__spreadValues({}, data), {
 });
 
 // lib/transform-props.ts
-function transformProps(data, propTransforms) {
+function transformProps(data, propTransforms, config = { components: {} }) {
   const mapItem = (item) => {
     if (propTransforms[item.type]) {
       return __spreadProps(__spreadValues({}, item), {
-        props: propTransforms[item.type](item.props)
+        props: __spreadValues({
+          id: item.props.id
+        }, propTransforms[item.type](item.props))
       });
     }
     return item;
@@ -8839,23 +8529,18 @@ function transformProps(data, propTransforms) {
   const rootProps = defaultedData.root.props || defaultedData.root;
   let newRoot = __spreadValues({}, defaultedData.root);
   if (propTransforms["root"]) {
-    if (defaultedData.root.props) {
-      newRoot.props = propTransforms["root"](rootProps);
-    } else {
-      newRoot = propTransforms["root"](rootProps);
-    }
+    newRoot.props = propTransforms["root"](rootProps);
   }
-  const afterPropTransforms = __spreadProps(__spreadValues({}, defaultedData), {
-    root: newRoot,
-    content: defaultedData.content.map(mapItem),
-    zones: Object.keys(data.zones || {}).reduce(
-      (acc, zoneKey) => __spreadProps(__spreadValues({}, acc), {
-        [zoneKey]: data.zones[zoneKey].map(mapItem)
-      }),
-      {}
-    )
-  });
-  return afterPropTransforms;
+  const dataWithUpdatedRoot = __spreadProps(__spreadValues({}, defaultedData), { root: newRoot });
+  const updatedData = walkTree(
+    dataWithUpdatedRoot,
+    config,
+    (content) => content.map(mapItem)
+  );
+  if (!defaultedData.root.props) {
+    updatedData.root = updatedData.root.props;
+  }
+  return updatedData;
 }
 
 // lib/resolve-all-data.ts
@@ -8940,6 +8625,7 @@ function resolveAllData(_0, _1) {
   renderContext,
   resolveAllData,
   transformProps,
+  useGetPuck,
   usePuck,
   walkTree
 });