@measured/puck 0.20.0-canary.33cf4f0e → 0.20.0-canary.3d781f5a

package/dist/index.js

@@ -171,6 +171,7 @@ __export(bundle_exports, {
   createUsePuck: () => createUsePuck,
   migrate: () => migrate,
   overrideKeys: () => overrideKeys,
+  registerOverlayPortal: () => registerOverlayPortal,
   renderContext: () => renderContext,
   resolveAllData: () => resolveAllData,
   transformProps: () => transformProps,
@@ -203,8 +204,9 @@ var overrideKeys = [
   "headerActions",
   "fields",
   "fieldLabel",
-  "components",
-  "componentItem",
+  "drawer",
+  "drawerItem",
+  "componentOverlay",
   "outline",
   "puck",
   "preview"
@@ -309,7 +311,7 @@ init_react_import();
 var styles_module_default2 = { "InputWrapper": "_InputWrapper_py9hf_1", "Input-label": "_Input-label_py9hf_5", "Input-labelIcon": "_Input-labelIcon_py9hf_14", "Input-disabledIcon": "_Input-disabledIcon_py9hf_21", "Input-input": "_Input-input_py9hf_26", "Input": "_Input_py9hf_1", "Input--readOnly": "_Input--readOnly_py9hf_76", "Input-radioGroupItems": "_Input-radioGroupItems_py9hf_87", "Input-radio": "_Input-radio_py9hf_87", "Input-radioInner": "_Input-radioInner_py9hf_104", "Input-radioInput": "_Input-radioInput_py9hf_149" };
 
 // components/AutoField/index.tsx
-var import_react22 = require("react");
+var import_react21 = require("react");
 
 // components/AutoField/fields/index.tsx
 init_react_import();
@@ -653,7 +655,7 @@ init_react_import();
 
 // components/IconButton/IconButton.tsx
 init_react_import();
-var import_react4 = require("react");
+var import_react10 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/IconButton/IconButton.module.css#css-module
 init_react_import();
@@ -686,102 +688,9 @@ var replace = (list, index, newItem) => {
   return result;
 };
 
-// css-module:/home/runner/work/puck/puck/packages/core/components/Loader/styles.module.css#css-module
-init_react_import();
-var styles_module_default4 = { "Loader": "_Loader_nacdm_13", "loader-animation": "_loader-animation_nacdm_1" };
-
-// components/Loader/index.tsx
-var import_jsx_runtime2 = require("react/jsx-runtime");
-var getClassName2 = get_class_name_factory_default("Loader", styles_module_default4);
-var Loader = (_a) => {
-  var _b = _a, {
-    color,
-    size = 16
-  } = _b, props = __objRest(_b, [
-    "color",
-    "size"
-  ]);
-  return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-    "span",
-    __spreadValues({
-      className: getClassName2(),
-      style: {
-        width: size,
-        height: size,
-        color
-      },
-      "aria-label": "loading"
-    }, props)
-  );
-};
-
-// components/IconButton/IconButton.tsx
-var import_jsx_runtime3 = require("react/jsx-runtime");
-var getClassName3 = get_class_name_factory_default("IconButton", IconButton_module_default);
-var IconButton = ({
-  children,
-  href,
-  onClick,
-  variant = "primary",
-  type,
-  disabled,
-  tabIndex,
-  newTab,
-  fullWidth,
-  title
-}) => {
-  const [loading, setLoading] = (0, import_react4.useState)(false);
-  const ElementType = href ? "a" : "button";
-  const el = /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(
-    ElementType,
-    {
-      className: getClassName3({
-        primary: variant === "primary",
-        secondary: variant === "secondary",
-        disabled,
-        fullWidth
-      }),
-      onClick: (e) => {
-        if (!onClick) return;
-        setLoading(true);
-        Promise.resolve(onClick(e)).then(() => {
-          setLoading(false);
-        });
-      },
-      type,
-      disabled: disabled || loading,
-      tabIndex,
-      target: newTab ? "_blank" : void 0,
-      rel: newTab ? "noreferrer" : void 0,
-      href,
-      title,
-      children: [
-        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("span", { className: getClassName3("title"), children: title }),
-        children,
-        loading && /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_jsx_runtime3.Fragment, { children: [
-          "\xA0\xA0",
-          /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Loader, { size: 14 })
-        ] })
-      ]
-    }
-  );
-  return el;
-};
-
-// components/AutoField/fields/ArrayField/index.tsx
-var import_react14 = require("react");
-
-// components/DragIcon/index.tsx
-init_react_import();
-
-// css-module:/home/runner/work/puck/puck/packages/core/components/DragIcon/styles.module.css#css-module
+// lib/use-reset-auto-zoom.ts
 init_react_import();
-var styles_module_default5 = { "DragIcon": "_DragIcon_17p8x_1", "DragIcon--disabled": "_DragIcon--disabled_17p8x_8" };
-
-// components/DragIcon/index.tsx
-var import_jsx_runtime4 = require("react/jsx-runtime");
-var getClassName4 = get_class_name_factory_default("DragIcon", styles_module_default5);
-var DragIcon = ({ isDragDisabled }) => /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: getClassName4({ disabled: isDragDisabled }), children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("svg", { viewBox: "0 0 20 20", width: "12", fill: "currentColor", children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("path", { d: "M7 2a2 2 0 1 0 .001 4.001A2 2 0 0 0 7 2zm0 6a2 2 0 1 0 .001 4.001A2 2 0 0 0 7 8zm0 6a2 2 0 1 0 .001 4.001A2 2 0 0 0 7 14zm6-8a2 2 0 1 0-.001-4.001A2 2 0 0 0 13 6zm0 2a2 2 0 1 0 .001 4.001A2 2 0 0 0 13 8zm0 6a2 2 0 1 0 .001 4.001A2 2 0 0 0 13 14z" }) }) });
+var import_react9 = require("react");
 
 // store/index.ts
 init_react_import();
@@ -1684,15 +1593,15 @@ var defaultViewports = [
 // store/index.ts
 var import_zustand2 = require("zustand");
 var import_middleware2 = require("zustand/middleware");
-var import_react9 = require("react");
+var import_react8 = require("react");
 
 // store/slices/history.ts
 init_react_import();
-var import_react6 = require("react");
+var import_react5 = require("react");
 
 // lib/use-hotkey.ts
 init_react_import();
-var import_react5 = require("react");
+var import_react4 = require("react");
 var import_zustand = require("zustand");
 var import_middleware = require("zustand/middleware");
 var keyCodeMap = {
@@ -1785,10 +1694,10 @@ var monitorHotkeys = (doc) => {
   };
 };
 var useMonitorHotkeys = () => {
-  (0, import_react5.useEffect)(() => monitorHotkeys(document), []);
+  (0, import_react4.useEffect)(() => monitorHotkeys(document), []);
 };
 var useHotkey = (combo, cb) => {
-  (0, import_react5.useEffect)(
+  (0, import_react4.useEffect)(
     () => useHotkeyStore.setState((s) => ({
       triggers: __spreadProps(__spreadValues({}, s.triggers), {
         [`${Object.keys(combo).join("+")}`]: { combo, cb }
@@ -1897,7 +1806,7 @@ function useRegisterHistorySlice(appStore, {
   index,
   initialAppState
 }) {
-  (0, import_react6.useEffect)(
+  (0, import_react5.useEffect)(
     () => appStore.setState({
       history: __spreadProps(__spreadValues({}, appStore.getState().history), {
         histories,
@@ -1964,7 +1873,7 @@ var createNodesSlice = (set, get) => ({
 
 // store/slices/permissions.ts
 init_react_import();
-var import_react7 = require("react");
+var import_react6 = require("react");
 
 // lib/data/flatten-data.ts
 init_react_import();
@@ -2101,7 +2010,7 @@ var createPermissionsSlice = (set, get) => {
   };
 };
 var useRegisterPermissionsSlice = (appStore, globalPermissions) => {
-  (0, import_react7.useEffect)(() => {
+  (0, import_react6.useEffect)(() => {
     const { permissions } = appStore.getState();
     const { globalPermissions: existingGlobalPermissions } = permissions;
     appStore.setState({
@@ -2111,7 +2020,7 @@ var useRegisterPermissionsSlice = (appStore, globalPermissions) => {
     });
     permissions.resolvePermissions();
   }, [globalPermissions]);
-  (0, import_react7.useEffect)(() => {
+  (0, import_react6.useEffect)(() => {
     return appStore.subscribe(
       (s) => s.state.data,
       () => {
@@ -2119,7 +2028,7 @@ var useRegisterPermissionsSlice = (appStore, globalPermissions) => {
       }
     );
   }, []);
-  (0, import_react7.useEffect)(() => {
+  (0, import_react6.useEffect)(() => {
     return appStore.subscribe(
       (s) => s.config,
       () => {
@@ -2131,7 +2040,7 @@ var useRegisterPermissionsSlice = (appStore, globalPermissions) => {
 
 // store/slices/fields.ts
 init_react_import();
-var import_react8 = require("react");
+var import_react7 = require("react");
 var createFieldsSlice = (_set, _get) => {
   return {
     fields: {},
@@ -2141,7 +2050,7 @@ var createFieldsSlice = (_set, _get) => {
   };
 };
 var useRegisterFieldsSlice = (appStore, id) => {
-  const resolveFields = (0, import_react8.useCallback)(
+  const resolveFields = (0, import_react7.useCallback)(
     (reset) => __async(void 0, null, function* () {
       var _a, _b;
       const { fields, lastResolvedData } = appStore.getState().fields;
@@ -2198,7 +2107,7 @@ var useRegisterFieldsSlice = (appStore, id) => {
     }),
     [id]
   );
-  (0, import_react8.useEffect)(() => {
+  (0, import_react7.useEffect)(() => {
     resolveFields(true);
     return appStore.subscribe(
       (s) => s.state.indexes.nodes[id || "root"],
@@ -2490,133 +2399,435 @@ var createAppStore = (initialAppStore) => (0, import_zustand2.create)()(
     });
   })
 );
-var appStoreContext = (0, import_react9.createContext)(createAppStore());
+var appStoreContext = (0, import_react8.createContext)(createAppStore());
 function useAppStore(selector) {
-  const context = (0, import_react9.useContext)(appStoreContext);
+  const context = (0, import_react8.useContext)(appStoreContext);
   return (0, import_zustand2.useStore)(context, selector);
 }
 function useAppStoreApi() {
-  return (0, import_react9.useContext)(appStoreContext);
+  return (0, import_react8.useContext)(appStoreContext);
 }
 
-// components/Sortable/index.tsx
-init_react_import();
-var import_react12 = require("@dnd-kit/react");
-
-// lib/dnd/use-sensors.ts
+// lib/get-zoom-config.ts
 init_react_import();
-var import_react10 = require("react");
-var import_react11 = require("@dnd-kit/react");
-var import_utilities = require("@dnd-kit/dom/utilities");
-var touchDefault = { delay: { value: 200, tolerance: 10 } };
-var otherDefault = {
-  delay: { value: 200, tolerance: 10 },
-  distance: { value: 5 }
-};
-var useSensors = ({
-  other = otherDefault,
-  mouse,
-  touch = touchDefault
-} = {
-  touch: touchDefault,
-  other: otherDefault
-}) => {
-  const [sensors] = (0, import_react10.useState)(() => [
-    import_react11.PointerSensor.configure({
-      activationConstraints(event, source) {
-        var _a;
-        const { pointerType, target } = event;
-        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") {
-          return touch;
-        }
-        return other;
-      }
-    })
-  ]);
-  return sensors;
-};
 
-// lib/dnd/collision/dynamic/index.ts
+// ../../node_modules/css-box-model/dist/css-box-model.esm.js
 init_react_import();
-var import_abstract8 = require("@dnd-kit/abstract");
 
-// lib/dnd/collision/directional/index.ts
+// ../../node_modules/tiny-invariant/dist/esm/tiny-invariant.js
 init_react_import();
-var import_abstract = require("@dnd-kit/abstract");
+var isProduction = process.env.NODE_ENV === "production";
+var prefix = "Invariant failed";
+function invariant(condition, message) {
+  if (condition) {
+    return;
+  }
+  if (isProduction) {
+    throw new Error(prefix);
+  }
+  var provided = typeof message === "function" ? message() : message;
+  var value = provided ? "".concat(prefix, ": ").concat(provided) : prefix;
+  throw new Error(value);
+}
 
-// lib/dnd/collision/collision-debug.ts
-init_react_import();
-var DEBUG = false;
-var debugElements = {};
-var timeout;
-var collisionDebug = (a, b, id, color, label) => {
-  if (!DEBUG) return;
-  const debugId = `${id}-debug`;
-  clearTimeout(timeout);
-  timeout = setTimeout(() => {
-    Object.entries(debugElements).forEach(([id2, { svg }]) => {
-      svg.remove();
-      delete debugElements[id2];
-    });
-  }, 1e3);
-  requestAnimationFrame(() => {
-    var _a, _b;
-    const existingEl = debugElements[debugId];
-    let line = (_a = debugElements[debugId]) == null ? void 0 : _a.line;
-    let text = (_b = debugElements[debugId]) == null ? void 0 : _b.text;
-    if (!existingEl) {
-      const svgNs = "http://www.w3.org/2000/svg";
-      const svg = document.createElementNS(svgNs, "svg");
-      line = document.createElementNS(svgNs, "line");
-      text = document.createElementNS(svgNs, "text");
-      svg.setAttribute("id", debugId);
-      svg.setAttribute(
-        "style",
-        "position: fixed; height: 100%; width: 100%; pointer-events: none; top: 0px; left: 0px;"
-      );
-      svg.appendChild(line);
-      svg.appendChild(text);
-      text.setAttribute("fill", `black`);
-      document.body.appendChild(svg);
-      debugElements[debugId] = { svg, line, text };
-    }
-    line.setAttribute("x1", a.x.toString());
-    line.setAttribute("x2", b.x.toString());
-    line.setAttribute("y1", a.y.toString());
-    line.setAttribute("y2", b.y.toString());
-    line.setAttribute("style", `stroke:${color};stroke-width:2`);
-    text.setAttribute("x", (a.x - (a.x - b.x) / 2).toString());
-    text.setAttribute("y", (a.y - (a.y - b.y) / 2).toString());
-    if (label) {
-      text.innerHTML = label;
+// ../../node_modules/css-box-model/dist/css-box-model.esm.js
+var getRect = function getRect2(_ref) {
+  var top = _ref.top, right = _ref.right, bottom = _ref.bottom, left = _ref.left;
+  var width = right - left;
+  var height = bottom - top;
+  var rect = {
+    top,
+    right,
+    bottom,
+    left,
+    width,
+    height,
+    x: left,
+    y: top,
+    center: {
+      x: (right + left) / 2,
+      y: (bottom + top) / 2
     }
-  });
+  };
+  return rect;
 };
-
-// lib/dnd/collision/directional/index.ts
-var distanceChange = "increasing";
-var directionalCollision = (input, previous) => {
-  var _a;
-  const { dragOperation, droppable } = input;
-  const { shape: dropShape } = droppable;
-  const { position } = dragOperation;
-  const dragShape = (_a = dragOperation.shape) == null ? void 0 : _a.current;
-  if (!dragShape || !dropShape) return null;
-  const dropCenter = dropShape.center;
-  const distanceToPrevious = Math.sqrt(
-    Math.pow(dropCenter.x - previous.x, 2) + Math.pow(dropCenter.y - previous.y, 2)
-  );
-  const distanceToCurrent = Math.sqrt(
-    Math.pow(dropCenter.x - position.current.x, 2) + Math.pow(dropCenter.y - position.current.y, 2)
-  );
-  distanceChange = distanceToCurrent === distanceToPrevious ? distanceChange : distanceToCurrent < distanceToPrevious ? "decreasing" : "increasing";
-  collisionDebug(
-    dragShape.center,
-    dropCenter,
-    droppable.id.toString(),
+var expand = function expand2(target, expandBy) {
+  return {
+    top: target.top - expandBy.top,
+    left: target.left - expandBy.left,
+    bottom: target.bottom + expandBy.bottom,
+    right: target.right + expandBy.right
+  };
+};
+var shrink = function shrink2(target, shrinkBy) {
+  return {
+    top: target.top + shrinkBy.top,
+    left: target.left + shrinkBy.left,
+    bottom: target.bottom - shrinkBy.bottom,
+    right: target.right - shrinkBy.right
+  };
+};
+var noSpacing = {
+  top: 0,
+  right: 0,
+  bottom: 0,
+  left: 0
+};
+var createBox = function createBox2(_ref2) {
+  var borderBox = _ref2.borderBox, _ref2$margin = _ref2.margin, margin = _ref2$margin === void 0 ? noSpacing : _ref2$margin, _ref2$border = _ref2.border, border = _ref2$border === void 0 ? noSpacing : _ref2$border, _ref2$padding = _ref2.padding, padding = _ref2$padding === void 0 ? noSpacing : _ref2$padding;
+  var marginBox = getRect(expand(borderBox, margin));
+  var paddingBox = getRect(shrink(borderBox, border));
+  var contentBox = getRect(shrink(paddingBox, padding));
+  return {
+    marginBox,
+    borderBox: getRect(borderBox),
+    paddingBox,
+    contentBox,
+    margin,
+    border,
+    padding
+  };
+};
+var parse = function parse2(raw) {
+  var value = raw.slice(0, -2);
+  var suffix = raw.slice(-2);
+  if (suffix !== "px") {
+    return 0;
+  }
+  var result = Number(value);
+  !!isNaN(result) ? process.env.NODE_ENV !== "production" ? invariant(false, "Could not parse value [raw: " + raw + ", without suffix: " + value + "]") : invariant(false) : void 0;
+  return result;
+};
+var calculateBox = function calculateBox2(borderBox, styles2) {
+  var margin = {
+    top: parse(styles2.marginTop),
+    right: parse(styles2.marginRight),
+    bottom: parse(styles2.marginBottom),
+    left: parse(styles2.marginLeft)
+  };
+  var padding = {
+    top: parse(styles2.paddingTop),
+    right: parse(styles2.paddingRight),
+    bottom: parse(styles2.paddingBottom),
+    left: parse(styles2.paddingLeft)
+  };
+  var border = {
+    top: parse(styles2.borderTopWidth),
+    right: parse(styles2.borderRightWidth),
+    bottom: parse(styles2.borderBottomWidth),
+    left: parse(styles2.borderLeftWidth)
+  };
+  return createBox({
+    borderBox,
+    margin,
+    padding,
+    border
+  });
+};
+var getBox = function getBox2(el) {
+  var borderBox = el.getBoundingClientRect();
+  var styles2 = window.getComputedStyle(el);
+  return calculateBox(borderBox, styles2);
+};
+
+// lib/get-zoom-config.ts
+var RESET_ZOOM_SMALLER_THAN_FRAME = true;
+var getZoomConfig = (uiViewport, frame, zoom) => {
+  const box = getBox(frame);
+  const { width: frameWidth, height: frameHeight } = box.contentBox;
+  const viewportHeight = uiViewport.height === "auto" ? frameHeight : uiViewport.height;
+  let rootHeight = 0;
+  let autoZoom = 1;
+  if (uiViewport.width > frameWidth || viewportHeight > frameHeight) {
+    const widthZoom = Math.min(frameWidth / uiViewport.width, 1);
+    const heightZoom = Math.min(frameHeight / viewportHeight, 1);
+    zoom = widthZoom;
+    if (widthZoom < heightZoom) {
+      rootHeight = viewportHeight / zoom;
+    } else {
+      rootHeight = viewportHeight;
+      zoom = heightZoom;
+    }
+    autoZoom = zoom;
+  } else {
+    if (RESET_ZOOM_SMALLER_THAN_FRAME) {
+      autoZoom = 1;
+      zoom = 1;
+      rootHeight = viewportHeight;
+    }
+  }
+  return { autoZoom, rootHeight, zoom };
+};
+
+// lib/use-reset-auto-zoom.ts
+var import_shallow = require("zustand/react/shallow");
+var useResetAutoZoom = (frameRef) => {
+  const { viewports, zoomConfig, setZoomConfig } = useAppStore(
+    (0, import_shallow.useShallow)((s) => ({
+      viewports: s.state.ui.viewports,
+      zoomConfig: s.zoomConfig,
+      setZoomConfig: s.setZoomConfig
+    }))
+  );
+  const resetAutoZoom = (0, import_react9.useCallback)(
+    (options) => {
+      const newViewports = (options == null ? void 0 : options.viewports) || viewports;
+      if (!(options == null ? void 0 : options.isResettingRef)) {
+        if (frameRef.current) {
+          setZoomConfig(
+            getZoomConfig(
+              newViewports == null ? void 0 : newViewports.current,
+              frameRef.current,
+              zoomConfig.zoom
+            )
+          );
+        }
+        return;
+      }
+      const {
+        isResettingRef,
+        setShowTransition,
+        showTransition = false
+      } = options;
+      if (!isResettingRef.current) {
+        isResettingRef.current = true;
+        if (setShowTransition) {
+          setShowTransition(showTransition);
+        }
+        if (frameRef.current) {
+          setZoomConfig(
+            getZoomConfig(
+              newViewports == null ? void 0 : newViewports.current,
+              frameRef.current,
+              zoomConfig.zoom
+            )
+          );
+        }
+        setTimeout(() => {
+          isResettingRef.current = false;
+        }, 0);
+      }
+    },
+    [frameRef, zoomConfig, viewports, setZoomConfig]
+  );
+  return resetAutoZoom;
+};
+
+// css-module:/home/runner/work/puck/puck/packages/core/components/Loader/styles.module.css#css-module
+init_react_import();
+var styles_module_default4 = { "Loader": "_Loader_nacdm_13", "loader-animation": "_loader-animation_nacdm_1" };
+
+// components/Loader/index.tsx
+var import_jsx_runtime2 = require("react/jsx-runtime");
+var getClassName2 = get_class_name_factory_default("Loader", styles_module_default4);
+var Loader = (_a) => {
+  var _b = _a, {
+    color,
+    size = 16
+  } = _b, props = __objRest(_b, [
+    "color",
+    "size"
+  ]);
+  return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+    "span",
+    __spreadValues({
+      className: getClassName2(),
+      style: {
+        width: size,
+        height: size,
+        color
+      },
+      "aria-label": "loading"
+    }, props)
+  );
+};
+
+// components/IconButton/IconButton.tsx
+var import_jsx_runtime3 = require("react/jsx-runtime");
+var getClassName3 = get_class_name_factory_default("IconButton", IconButton_module_default);
+var IconButton = ({
+  children,
+  href,
+  onClick,
+  variant = "primary",
+  type,
+  disabled,
+  tabIndex,
+  newTab,
+  fullWidth,
+  title
+}) => {
+  const [loading, setLoading] = (0, import_react10.useState)(false);
+  const ElementType = href ? "a" : "button";
+  const el = /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(
+    ElementType,
+    {
+      className: getClassName3({
+        primary: variant === "primary",
+        secondary: variant === "secondary",
+        disabled,
+        fullWidth
+      }),
+      onClick: (e) => {
+        if (!onClick) return;
+        setLoading(true);
+        Promise.resolve(onClick(e)).then(() => {
+          setLoading(false);
+        });
+      },
+      type,
+      disabled: disabled || loading,
+      tabIndex,
+      target: newTab ? "_blank" : void 0,
+      rel: newTab ? "noreferrer" : void 0,
+      href,
+      title,
+      children: [
+        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("span", { className: getClassName3("title"), children: title }),
+        children,
+        loading && /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_jsx_runtime3.Fragment, { children: [
+          "\xA0\xA0",
+          /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Loader, { size: 14 })
+        ] })
+      ]
+    }
+  );
+  return el;
+};
+
+// components/AutoField/fields/ArrayField/index.tsx
+var import_react15 = require("react");
+
+// components/DragIcon/index.tsx
+init_react_import();
+
+// css-module:/home/runner/work/puck/puck/packages/core/components/DragIcon/styles.module.css#css-module
+init_react_import();
+var styles_module_default5 = { "DragIcon": "_DragIcon_17p8x_1", "DragIcon--disabled": "_DragIcon--disabled_17p8x_8" };
+
+// components/DragIcon/index.tsx
+var import_jsx_runtime4 = require("react/jsx-runtime");
+var getClassName4 = get_class_name_factory_default("DragIcon", styles_module_default5);
+var DragIcon = ({ isDragDisabled }) => /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: getClassName4({ disabled: isDragDisabled }), children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("svg", { viewBox: "0 0 20 20", width: "12", fill: "currentColor", children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("path", { d: "M7 2a2 2 0 1 0 .001 4.001A2 2 0 0 0 7 2zm0 6a2 2 0 1 0 .001 4.001A2 2 0 0 0 7 8zm0 6a2 2 0 1 0 .001 4.001A2 2 0 0 0 7 14zm6-8a2 2 0 1 0-.001-4.001A2 2 0 0 0 13 6zm0 2a2 2 0 1 0 .001 4.001A2 2 0 0 0 13 8zm0 6a2 2 0 1 0 .001 4.001A2 2 0 0 0 13 14z" }) }) });
+
+// components/Sortable/index.tsx
+init_react_import();
+var import_react13 = require("@dnd-kit/react");
+
+// lib/dnd/use-sensors.ts
+init_react_import();
+var import_react11 = require("react");
+var import_react12 = require("@dnd-kit/react");
+var import_utilities = require("@dnd-kit/dom/utilities");
+var touchDefault = { delay: { value: 200, tolerance: 10 } };
+var otherDefault = {
+  delay: { value: 200, tolerance: 10 },
+  distance: { value: 5 }
+};
+var useSensors = ({
+  other = otherDefault,
+  mouse,
+  touch = touchDefault
+} = {
+  touch: touchDefault,
+  other: otherDefault
+}) => {
+  const [sensors] = (0, import_react11.useState)(() => [
+    import_react12.PointerSensor.configure({
+      activationConstraints(event, source) {
+        var _a;
+        const { pointerType, target } = event;
+        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") {
+          return touch;
+        }
+        return other;
+      }
+    })
+  ]);
+  return sensors;
+};
+
+// lib/dnd/collision/dynamic/index.ts
+init_react_import();
+var import_abstract8 = require("@dnd-kit/abstract");
+
+// lib/dnd/collision/directional/index.ts
+init_react_import();
+var import_abstract = require("@dnd-kit/abstract");
+
+// lib/dnd/collision/collision-debug.ts
+init_react_import();
+var DEBUG = false;
+var debugElements = {};
+var timeout;
+var collisionDebug = (a, b, id, color, label) => {
+  if (!DEBUG) return;
+  const debugId = `${id}-debug`;
+  clearTimeout(timeout);
+  timeout = setTimeout(() => {
+    Object.entries(debugElements).forEach(([id2, { svg }]) => {
+      svg.remove();
+      delete debugElements[id2];
+    });
+  }, 1e3);
+  requestAnimationFrame(() => {
+    var _a, _b;
+    const existingEl = debugElements[debugId];
+    let line = (_a = debugElements[debugId]) == null ? void 0 : _a.line;
+    let text = (_b = debugElements[debugId]) == null ? void 0 : _b.text;
+    if (!existingEl) {
+      const svgNs = "http://www.w3.org/2000/svg";
+      const svg = document.createElementNS(svgNs, "svg");
+      line = document.createElementNS(svgNs, "line");
+      text = document.createElementNS(svgNs, "text");
+      svg.setAttribute("id", debugId);
+      svg.setAttribute(
+        "style",
+        "position: fixed; height: 100%; width: 100%; pointer-events: none; top: 0px; left: 0px;"
+      );
+      svg.appendChild(line);
+      svg.appendChild(text);
+      text.setAttribute("fill", `black`);
+      document.body.appendChild(svg);
+      debugElements[debugId] = { svg, line, text };
+    }
+    line.setAttribute("x1", a.x.toString());
+    line.setAttribute("x2", b.x.toString());
+    line.setAttribute("y1", a.y.toString());
+    line.setAttribute("y2", b.y.toString());
+    line.setAttribute("style", `stroke:${color};stroke-width:2`);
+    text.setAttribute("x", (a.x - (a.x - b.x) / 2).toString());
+    text.setAttribute("y", (a.y - (a.y - b.y) / 2).toString());
+    if (label) {
+      text.innerHTML = label;
+    }
+  });
+};
+
+// lib/dnd/collision/directional/index.ts
+var distanceChange = "increasing";
+var directionalCollision = (input, previous) => {
+  var _a;
+  const { dragOperation, droppable } = input;
+  const { shape: dropShape } = droppable;
+  const { position } = dragOperation;
+  const dragShape = (_a = dragOperation.shape) == null ? void 0 : _a.current;
+  if (!dragShape || !dropShape) return null;
+  const dropCenter = dropShape.center;
+  const distanceToPrevious = Math.sqrt(
+    Math.pow(dropCenter.x - previous.x, 2) + Math.pow(dropCenter.y - previous.y, 2)
+  );
+  const distanceToCurrent = Math.sqrt(
+    Math.pow(dropCenter.x - position.current.x, 2) + Math.pow(dropCenter.y - position.current.y, 2)
+  );
+  distanceChange = distanceToCurrent === distanceToPrevious ? distanceChange : distanceToCurrent < distanceToPrevious ? "decreasing" : "increasing";
+  collisionDebug(
+    dragShape.center,
+    dropCenter,
+    droppable.id.toString(),
     "rebeccapurple"
   );
   if (distanceChange === "decreasing") {
@@ -2868,7 +3079,7 @@ var SortableProvider = ({
     mouse: { distance: { value: 5 } }
   });
   return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
-    import_react12.DragDropProvider,
+    import_react13.DragDropProvider,
     {
       sensors,
       onDragStart: (event) => {
@@ -2932,11 +3143,11 @@ var Sortable = ({
 
 // components/AutoField/context.tsx
 init_react_import();
-var import_react13 = require("react");
+var import_react14 = require("react");
 var import_jsx_runtime6 = require("react/jsx-runtime");
-var NestedFieldContext = (0, import_react13.createContext)({});
+var NestedFieldContext = (0, import_react14.createContext)({});
 var useNestedFieldContext = () => {
-  const context = (0, import_react13.useContext)(NestedFieldContext);
+  const context = (0, import_react14.useContext)(NestedFieldContext);
   return __spreadProps(__spreadValues({}, context), {
     readOnlyFields: context.readOnlyFields || {}
   });
@@ -2950,7 +3161,7 @@ var NestedFieldProvider = ({
 }) => {
   const subPath = `${name}.${subName}`;
   const wildcardSubPath = `${wildcardName}.${subName}`;
-  const subReadOnlyFields = (0, import_react13.useMemo)(
+  const subReadOnlyFields = (0, import_react14.useMemo)(
     () => Object.keys(readOnlyFields).reduce((acc, readOnlyKey) => {
       const isLocal = readOnlyKey.indexOf(subPath) > -1 || readOnlyKey.indexOf(wildcardSubPath) > -1;
       if (isLocal) {
@@ -3003,14 +3214,14 @@ var ArrayField = ({
     }),
     openId: ""
   };
-  const [localState, setLocalState] = (0, import_react14.useState)({ arrayState, value });
-  (0, import_react14.useEffect)(() => {
+  const [localState, setLocalState] = (0, import_react15.useState)({ arrayState, value });
+  (0, import_react15.useEffect)(() => {
     var _a;
     const _arrayState = (_a = appStore.getState().state.ui.arrayState[id]) != null ? _a : arrayState;
     setLocalState({ arrayState: _arrayState, value });
   }, [value]);
   const appStore = useAppStoreApi();
-  const mapArrayStateToUi = (0, import_react14.useCallback)(
+  const mapArrayStateToUi = (0, import_react15.useCallback)(
     (partialArrayState) => {
       const state = appStore.getState().state;
       return {
@@ -3021,13 +3232,13 @@ var ArrayField = ({
     },
     [arrayState, appStore]
   );
-  const getHighestIndex = (0, import_react14.useCallback)(() => {
+  const getHighestIndex = (0, import_react15.useCallback)(() => {
     return arrayState.items.reduce(
       (acc, item) => item._originalIndex > acc ? item._originalIndex : acc,
       -1
     );
   }, [arrayState]);
-  const regenerateArrayState = (0, import_react14.useCallback)(
+  const regenerateArrayState = (0, import_react15.useCallback)(
     (value2) => {
       let highestIndex = getHighestIndex();
       const newItems = Array.from(value2 || []).map((item, idx) => {
@@ -3046,19 +3257,19 @@ var ArrayField = ({
     },
     [arrayState]
   );
-  (0, import_react14.useEffect)(() => {
+  (0, import_react15.useEffect)(() => {
     if (arrayState.items.length > 0) {
       setUi(mapArrayStateToUi(arrayState));
     }
   }, []);
-  const [draggedItem, setDraggedItem] = (0, import_react14.useState)("");
+  const [draggedItem, setDraggedItem] = (0, import_react15.useState)("");
   const isDraggingAny = !!draggedItem;
   const canEdit = useAppStore(
     (s) => s.permissions.getPermissions({ item: s.selectedItem }).edit
   );
   const forceReadOnly = !canEdit;
-  const valueRef = (0, import_react14.useRef)(value);
-  const uniqifyItem = (0, import_react14.useCallback)(
+  const valueRef = (0, import_react15.useRef)(value);
+  const uniqifyItem = (0, import_react15.useCallback)(
     (val) => {
       if (field.type !== "array" || !field.arrayFields) return;
       const config = appStore.getState().config;
@@ -3363,11 +3574,11 @@ var DefaultField = ({
 
 // components/AutoField/fields/ExternalField/index.tsx
 init_react_import();
-var import_react18 = require("react");
+var import_react19 = require("react");
 
 // components/ExternalInput/index.tsx
 init_react_import();
-var import_react17 = require("react");
+var import_react18 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/ExternalInput/styles.module.css#css-module
 init_react_import();
@@ -3375,7 +3586,7 @@ var styles_module_default6 = { "ExternalInput-actions": "_ExternalInput-actions_
 
 // components/Modal/index.tsx
 init_react_import();
-var import_react15 = require("react");
+var import_react16 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Modal/styles.module.css#css-module
 init_react_import();
@@ -3390,8 +3601,8 @@ var Modal = ({
   onClose,
   isOpen
 }) => {
-  const [rootEl, setRootEl] = (0, import_react15.useState)(null);
-  (0, import_react15.useEffect)(() => {
+  const [rootEl, setRootEl] = (0, import_react16.useState)(null);
+  (0, import_react16.useEffect)(() => {
     setRootEl(document.getElementById("puck-portal-root"));
   }, []);
   if (!rootEl) {
@@ -3438,7 +3649,7 @@ init_react_import();
 
 // components/Button/Button.tsx
 init_react_import();
-var import_react16 = require("react");
+var import_react17 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Button/Button.module.css#css-module
 init_react_import();
@@ -3488,8 +3699,8 @@ var Button = (_a) => {
     "size",
     "loading"
   ]);
-  const [loading, setLoading] = (0, import_react16.useState)(loadingProp);
-  (0, import_react16.useEffect)(() => setLoading(loadingProp), [loadingProp]);
+  const [loading, setLoading] = (0, import_react17.useState)(loadingProp);
+  (0, import_react17.useEffect)(() => setLoading(loadingProp), [loadingProp]);
   const ElementType = href ? "a" : type ? "button" : "span";
   const dataAttrs = filterDataAttrs(props);
   const el = /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)(
@@ -3544,28 +3755,28 @@ var ExternalInput = ({
     mapRow = (val) => val,
     filterFields
   } = field || {};
-  const [data, setData] = (0, import_react17.useState)([]);
-  const [isOpen, setOpen] = (0, import_react17.useState)(false);
-  const [isLoading, setIsLoading] = (0, import_react17.useState)(true);
+  const [data, setData] = (0, import_react18.useState)([]);
+  const [isOpen, setOpen] = (0, import_react18.useState)(false);
+  const [isLoading, setIsLoading] = (0, import_react18.useState)(true);
   const hasFilterFields = !!filterFields;
-  const [filters, setFilters] = (0, import_react17.useState)(field.initialFilters || {});
-  const [filtersToggled, setFiltersToggled] = (0, import_react17.useState)(hasFilterFields);
-  const mappedData = (0, import_react17.useMemo)(() => {
+  const [filters, setFilters] = (0, import_react18.useState)(field.initialFilters || {});
+  const [filtersToggled, setFiltersToggled] = (0, import_react18.useState)(hasFilterFields);
+  const mappedData = (0, import_react18.useMemo)(() => {
     return data.map(mapRow);
   }, [data]);
-  const keys = (0, import_react17.useMemo)(() => {
+  const keys = (0, import_react18.useMemo)(() => {
     const validKeys = /* @__PURE__ */ new Set();
     for (const item of mappedData) {
       for (const key of Object.keys(item)) {
-        if (typeof item[key] === "string" || typeof item[key] === "number" || (0, import_react17.isValidElement)(item[key])) {
+        if (typeof item[key] === "string" || typeof item[key] === "number" || (0, import_react18.isValidElement)(item[key])) {
           validKeys.add(key);
         }
       }
     }
     return Array.from(validKeys);
   }, [mappedData]);
-  const [searchQuery, setSearchQuery] = (0, import_react17.useState)(field.initialQuery || "");
-  const search = (0, import_react17.useCallback)(
+  const [searchQuery, setSearchQuery] = (0, import_react18.useState)(field.initialQuery || "");
+  const search = (0, import_react18.useCallback)(
     (query, filters2) => __async(void 0, null, function* () {
       setIsLoading(true);
       const cacheKey = `${id}-${query}-${JSON.stringify(filters2)}`;
@@ -3578,7 +3789,7 @@ var ExternalInput = ({
     }),
     [id, field]
   );
-  const Footer = (0, import_react17.useCallback)(
+  const Footer = (0, import_react18.useCallback)(
     (props) => field.renderFooter ? field.renderFooter(props) : /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("span", { className: getClassNameModal("footer"), children: [
       props.items.length,
       " result",
@@ -3586,7 +3797,7 @@ var ExternalInput = ({
     ] }),
     [field.renderFooter]
   );
-  (0, import_react17.useEffect)(() => {
+  (0, import_react18.useEffect)(() => {
     search(searchQuery, filters);
   }, []);
   return /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(
@@ -3759,7 +3970,7 @@ var ExternalField = ({
   var _a, _b, _c;
   const validField = field;
   const deprecatedField = field;
-  (0, import_react18.useEffect)(() => {
+  (0, import_react19.useEffect)(() => {
     if (deprecatedField.adaptor) {
       console.error(
         "Warning: The `adaptor` API is deprecated. Please use updated APIs on the `external` field instead. This will be a breaking change in a future release."
@@ -3802,20 +4013,6 @@ var ExternalField = ({
 
 // components/AutoField/fields/RadioField/index.tsx
 init_react_import();
-var import_react19 = require("react");
-
-// lib/safe-json-parse.ts
-init_react_import();
-var safeJsonParse = (str) => {
-  try {
-    const jsonValue = JSON.parse(str);
-    return jsonValue;
-  } catch (e) {
-    return str;
-  }
-};
-
-// components/AutoField/fields/RadioField/index.tsx
 var import_jsx_runtime14 = require("react/jsx-runtime");
 var getClassName11 = get_class_name_factory_default("Input", styles_module_default2);
 var RadioField = ({
@@ -3829,10 +4026,6 @@ var RadioField = ({
   labelIcon,
   Label: Label2
 }) => {
-  const flatOptions = (0, import_react19.useMemo)(
-    () => field.type === "radio" ? field.options.map(({ value: value2 }) => value2) : [],
-    [field]
-  );
   if (field.type !== "radio" || !field.options) {
     return null;
   }
@@ -3843,43 +4036,39 @@ var RadioField = ({
       label: label || name,
       readOnly,
       el: "div",
-      children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("div", { className: getClassName11("radioGroupItems"), id, children: field.options.map((option) => /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(
-        "label",
-        {
-          className: getClassName11("radio"),
-          children: [
-            /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
-              "input",
-              {
-                type: "radio",
-                className: getClassName11("radioInput"),
-                value: option.value,
-                name,
-                onChange: (e) => {
-                  var _a;
-                  const jsonValue = (_a = safeJsonParse(e.target.value)) != null ? _a : e.target.value;
-                  if (flatOptions.indexOf(jsonValue) > -1) {
-                    onChange(jsonValue);
-                  } else {
-                    onChange(e.target.value);
-                  }
-                },
-                disabled: readOnly,
-                checked: value === option.value
-              }
-            ),
-            /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("div", { className: getClassName11("radioInner"), children: option.label || option.value })
-          ]
-        },
-        option.label + option.value
-      )) })
+      children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("div", { className: getClassName11("radioGroupItems"), id, children: field.options.map((option) => {
+        var _a;
+        return /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(
+          "label",
+          {
+            className: getClassName11("radio"),
+            children: [
+              /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
+                "input",
+                {
+                  type: "radio",
+                  className: getClassName11("radioInput"),
+                  value: JSON.stringify({ value: option.value }),
+                  name,
+                  onChange: (e) => {
+                    onChange(JSON.parse(e.target.value).value);
+                  },
+                  disabled: readOnly,
+                  checked: value === option.value
+                }
+              ),
+              /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("div", { className: getClassName11("radioInner"), children: option.label || ((_a = option.value) == null ? void 0 : _a.toString()) })
+            ]
+          },
+          option.label + option.value
+        );
+      }) })
     }
   );
 };
 
 // components/AutoField/fields/SelectField/index.tsx
 init_react_import();
-var import_react20 = require("react");
 var import_jsx_runtime15 = require("react/jsx-runtime");
 var getClassName12 = get_class_name_factory_default("Input", styles_module_default2);
 var SelectField = ({
@@ -3893,10 +4082,6 @@ var SelectField = ({
   readOnly,
   id
 }) => {
-  const flatOptions = (0, import_react20.useMemo)(
-    () => field.type === "select" ? field.options.map(({ value: value2 }) => value2) : [],
-    [field]
-  );
   if (field.type !== "select" || !field.options) {
     return null;
   }
@@ -3914,22 +4099,16 @@ var SelectField = ({
           className: getClassName12("input"),
           disabled: readOnly,
           onChange: (e) => {
-            var _a;
-            const jsonValue = (_a = safeJsonParse(e.target.value)) != null ? _a : e.target.value;
-            if (flatOptions.indexOf(jsonValue) > -1) {
-              onChange(jsonValue);
-            } else {
-              onChange(e.target.value);
-            }
+            onChange(JSON.parse(e.target.value).value);
           },
-          value,
+          value: JSON.stringify({ value }),
           children: field.options.map((option) => /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
             "option",
             {
               label: option.label,
-              value: option.value
+              value: JSON.stringify({ value: option.value })
             },
-            option.label + option.value
+            option.label + JSON.stringify(option.value)
           ))
         }
       )
@@ -4053,12 +4232,12 @@ var ObjectField = ({
 
 // lib/use-safe-id.ts
 init_react_import();
-var import_react21 = __toESM(require("react"));
+var import_react20 = __toESM(require("react"));
 var useSafeId = () => {
-  if (typeof import_react21.default.useId !== "undefined") {
-    return import_react21.default.useId();
+  if (typeof import_react20.default.useId !== "undefined") {
+    return import_react20.default.useId();
   }
-  const [id] = (0, import_react21.useState)(generateId());
+  const [id] = (0, import_react20.useState)(generateId());
   return id;
 };
 
@@ -4092,7 +4271,7 @@ var FieldLabelInternal = ({
   readOnly
 }) => {
   const overrides = useAppStore((s) => s.overrides);
-  const Wrapper = (0, import_react22.useMemo)(
+  const Wrapper = (0, import_react21.useMemo)(
     () => overrides.fieldLabel || FieldLabel,
     [overrides]
   );
@@ -4119,7 +4298,7 @@ function AutoFieldInternal(props) {
     var _a2;
     return (_a2 = s.selectedItem) == null ? void 0 : _a2.readOnly;
   });
-  const nestedFieldContext = (0, import_react22.useContext)(NestedFieldContext);
+  const nestedFieldContext = (0, import_react21.useContext)(NestedFieldContext);
   const { id, Label: Label2 = FieldLabelInternal } = props;
   const field = props.field;
   const label = field.label;
@@ -4153,7 +4332,7 @@ function AutoFieldInternal(props) {
     Label: Label2,
     id: resolvedId
   });
-  const onFocus = (0, import_react22.useCallback)(
+  const onFocus = (0, import_react21.useCallback)(
     (e) => {
       if (mergedProps.name && (e.target.nodeName === "INPUT" || e.target.nodeName === "TEXTAREA")) {
         e.stopPropagation();
@@ -4167,7 +4346,7 @@ function AutoFieldInternal(props) {
     },
     [mergedProps.name]
   );
-  const onBlur = (0, import_react22.useCallback)((e) => {
+  const onBlur = (0, import_react21.useCallback)((e) => {
     if ("name" in e.target) {
       dispatch({
         type: "setUi",
@@ -4220,20 +4399,20 @@ function AutoFieldInternal(props) {
 function AutoFieldPrivate(props) {
   const isFocused = useAppStore((s) => s.state.ui.field.focus === props.name);
   const { value, onChange } = props;
-  const [localValue, setLocalValue] = (0, import_react22.useState)(value);
-  const onChangeLocal = (0, import_react22.useCallback)(
+  const [localValue, setLocalValue] = (0, import_react21.useState)(value);
+  const onChangeLocal = (0, import_react21.useCallback)(
     (val, ui) => {
       setLocalValue(val);
       onChange(val, ui);
     },
     [onChange]
   );
-  (0, import_react22.useEffect)(() => {
+  (0, import_react21.useEffect)(() => {
     if (!isFocused) {
       setLocalValue(value);
     }
   }, [value]);
-  (0, import_react22.useEffect)(() => {
+  (0, import_react21.useEffect)(() => {
     if (!isFocused) {
       if (value !== localValue) {
         setLocalValue(value);
@@ -4247,7 +4426,7 @@ function AutoFieldPrivate(props) {
   return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(AutoFieldInternal, __spreadValues(__spreadValues({}, props), localProps));
 }
 function AutoField(props) {
-  const DefaultLabel = (0, import_react22.useMemo)(() => {
+  const DefaultLabel = (0, import_react21.useMemo)(() => {
     const DefaultLabel2 = (labelProps) => /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
       "div",
       __spreadProps(__spreadValues({}, labelProps), {
@@ -4270,25 +4449,25 @@ 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_react39 = require("react");
+var import_react38 = require("react");
 
 // components/DragDropContext/index.tsx
 init_react_import();
-var import_react37 = require("@dnd-kit/react");
-var import_react38 = 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
 init_react_import();
-var import_react35 = require("react");
+var import_react34 = require("react");
 
 // components/DraggableComponent/index.tsx
 init_react_import();
-var import_react26 = require("react");
+var import_react25 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/DraggableComponent/styles.module.css#css-module
 init_react_import();
-var styles_module_default11 = { "DraggableComponent": "_DraggableComponent_qzbgx_1", "DraggableComponent-overlay": "_DraggableComponent-overlay_qzbgx_12", "DraggableComponent-loadingOverlay": "_DraggableComponent-loadingOverlay_qzbgx_29", "DraggableComponent--hover": "_DraggableComponent--hover_qzbgx_45", "DraggableComponent--isLocked": "_DraggableComponent--isLocked_qzbgx_45", "DraggableComponent--isSelected": "_DraggableComponent--isSelected_qzbgx_54", "DraggableComponent-actionsOverlay": "_DraggableComponent-actionsOverlay_qzbgx_66", "DraggableComponent-actions": "_DraggableComponent-actions_qzbgx_66" };
+var styles_module_default11 = { "DraggableComponent": "_DraggableComponent_1vaqy_1", "DraggableComponent-overlayWrapper": "_DraggableComponent-overlayWrapper_1vaqy_12", "DraggableComponent-overlay": "_DraggableComponent-overlay_1vaqy_12", "DraggableComponent-loadingOverlay": "_DraggableComponent-loadingOverlay_1vaqy_34", "DraggableComponent--hover": "_DraggableComponent--hover_1vaqy_50", "DraggableComponent--isSelected": "_DraggableComponent--isSelected_1vaqy_57", "DraggableComponent-actionsOverlay": "_DraggableComponent-actionsOverlay_1vaqy_71", "DraggableComponent-actions": "_DraggableComponent-actions_1vaqy_71" };
 
 // components/DraggableComponent/index.tsx
 var import_react_dom2 = require("react-dom");
@@ -4314,11 +4493,11 @@ function getDeepScrollPosition(element) {
 
 // components/DropZone/context.tsx
 init_react_import();
-var import_react23 = require("react");
+var import_react22 = require("react");
 var import_zustand3 = require("zustand");
 var import_jsx_runtime19 = require("react/jsx-runtime");
-var dropZoneContext = (0, import_react23.createContext)(null);
-var ZoneStoreContext = (0, import_react23.createContext)(
+var dropZoneContext = (0, import_react22.createContext)(null);
+var ZoneStoreContext = (0, import_react22.createContext)(
   (0, import_zustand3.createStore)(() => ({
     zoneDepthIndex: {},
     nextZoneDepthIndex: {},
@@ -4341,7 +4520,7 @@ var DropZoneProvider = ({
   value
 }) => {
   const dispatch = useAppStore((s) => s.dispatch);
-  const registerZone = (0, import_react23.useCallback)(
+  const registerZone = (0, import_react22.useCallback)(
     (zoneCompound) => {
       dispatch({
         type: "registerZone",
@@ -4350,19 +4529,9 @@ var DropZoneProvider = ({
     },
     [dispatch]
   );
-  const unregisterZone = (0, import_react23.useCallback)(
-    (zoneCompound) => {
-      dispatch({
-        type: "unregisterZone",
-        zone: zoneCompound
-      });
-    },
-    [dispatch]
-  );
-  const memoValue = (0, import_react23.useMemo)(
+  const memoValue = (0, import_react22.useMemo)(
     () => __spreadValues({
-      registerZone,
-      unregisterZone
+      registerZone
     }, value),
     [value]
   );
@@ -4370,7 +4539,7 @@ var DropZoneProvider = ({
 };
 
 // components/DraggableComponent/index.tsx
-var import_shallow2 = require("zustand/react/shallow");
+var import_shallow3 = require("zustand/react/shallow");
 var import_sortable2 = require("@dnd-kit/react/sortable");
 
 // lib/accumulate-transform.ts
@@ -4390,23 +4559,23 @@ function accumulateTransform(el) {
 
 // lib/use-context-store.ts
 init_react_import();
-var import_react24 = require("react");
+var import_react23 = require("react");
 var import_zustand4 = require("zustand");
-var import_shallow = require("zustand/react/shallow");
+var import_shallow2 = require("zustand/react/shallow");
 function useContextStore(context, selector) {
-  const store = (0, import_react24.useContext)(context);
+  const store = (0, import_react23.useContext)(context);
   if (!store) {
     throw new Error("useContextStore must be used inside context");
   }
-  return (0, import_zustand4.useStore)(store, (0, import_shallow.useShallow)(selector));
+  return (0, import_zustand4.useStore)(store, (0, import_shallow2.useShallow)(selector));
 }
 
 // lib/dnd/use-on-drag-finished.ts
 init_react_import();
-var import_react25 = require("react");
+var import_react24 = require("react");
 var useOnDragFinished = (cb, deps = []) => {
   const appStore = useAppStoreApi();
-  return (0, import_react25.useCallback)(() => {
+  return (0, import_react24.useCallback)(() => {
     let dispose = () => {
     };
     const processDragging = (isDragging2) => {
@@ -4452,6 +4621,9 @@ var DefaultActionBar = ({
   ] }),
   /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(ActionBar.Group, { children })
 ] });
+var DefaultOverlay = ({
+  children
+}) => /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(import_jsx_runtime20.Fragment, { children });
 var DraggableComponent = ({
   children,
   depth,
@@ -4476,9 +4648,9 @@ var DraggableComponent = ({
   const overrides = useAppStore((s) => s.overrides);
   const dispatch = useAppStore((s) => s.dispatch);
   const iframe = useAppStore((s) => s.iframe);
-  const ctx = (0, import_react26.useContext)(dropZoneContext);
-  const [localZones, setLocalZones] = (0, import_react26.useState)({});
-  const registerLocalZone = (0, import_react26.useCallback)(
+  const ctx = (0, import_react25.useContext)(dropZoneContext);
+  const [localZones, setLocalZones] = (0, import_react25.useState)({});
+  const registerLocalZone = (0, import_react25.useCallback)(
     (zoneCompound2, active) => {
       var _a;
       (_a = ctx == null ? void 0 : ctx.registerLocalZone) == null ? void 0 : _a.call(ctx, zoneCompound2, active);
@@ -4488,7 +4660,7 @@ var DraggableComponent = ({
     },
     [setLocalZones]
   );
-  const unregisterLocalZone = (0, import_react26.useCallback)(
+  const unregisterLocalZone = (0, import_react25.useCallback)(
     (zoneCompound2) => {
       var _a;
       (_a = ctx == null ? void 0 : ctx.unregisterLocalZone) == null ? void 0 : _a.call(ctx, zoneCompound2);
@@ -4501,19 +4673,19 @@ var DraggableComponent = ({
     [setLocalZones]
   );
   const containsActiveZone = Object.values(localZones).filter(Boolean).length > 0;
-  const path = useAppStore((0, import_shallow2.useShallow)((s) => {
+  const path = useAppStore((0, import_shallow3.useShallow)((s) => {
     var _a;
     return (_a = s.state.indexes.nodes[id]) == null ? void 0 : _a.path;
   }));
   const permissions = useAppStore(
-    (0, import_shallow2.useShallow)((s) => {
+    (0, import_shallow3.useShallow)((s) => {
       const item = getItem({ index, zone: zoneCompound }, s.state);
       return s.permissions.getPermissions({ item });
     })
   );
-  const zoneStore = (0, import_react26.useContext)(ZoneStoreContext);
-  const [dragAxis, setDragAxis] = (0, import_react26.useState)(userDragAxis || autoDragAxis);
-  const dynamicCollisionDetector = (0, import_react26.useMemo)(
+  const zoneStore = (0, import_react25.useContext)(ZoneStoreContext);
+  const [dragAxis, setDragAxis] = (0, import_react25.useState)(userDragAxis || autoDragAxis);
+  const dynamicCollisionDetector = (0, import_react25.useMemo)(
     () => createDynamicCollisionDetector(dragAxis),
     [dragAxis]
   );
@@ -4545,7 +4717,7 @@ var DraggableComponent = ({
     },
     feedback: "clone"
   });
-  (0, import_react26.useEffect)(() => {
+  (0, import_react25.useEffect)(() => {
     const isEnabled = zoneStore.getState().enabledIndex[zoneCompound];
     sortable.droppable.disabled = !isEnabled;
     sortable.draggable.disabled = !permissions.drag;
@@ -4562,8 +4734,8 @@ var DraggableComponent = ({
     }
     return cleanup;
   }, [permissions.drag, zoneCompound]);
-  const ref = (0, import_react26.useRef)(null);
-  const refSetter = (0, import_react26.useCallback)(
+  const ref = (0, import_react25.useRef)(null);
+  const refSetter = (0, import_react25.useCallback)(
     (el) => {
       sortableRef(el);
       if (el) {
@@ -4572,14 +4744,14 @@ var DraggableComponent = ({
     },
     [sortableRef]
   );
-  const [portalEl, setPortalEl] = (0, import_react26.useState)();
-  (0, import_react26.useEffect)(() => {
+  const [portalEl, setPortalEl] = (0, import_react25.useState)();
+  (0, import_react25.useEffect)(() => {
     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 = (0, import_react26.useCallback)(() => {
+  const getStyle = (0, import_react25.useCallback)(() => {
     var _a, _b, _c;
     if (!ref.current) return;
     const rect = ref.current.getBoundingClientRect();
@@ -4604,11 +4776,11 @@ var DraggableComponent = ({
     };
     return style2;
   }, [ref.current]);
-  const [style, setStyle] = (0, import_react26.useState)();
-  const sync = (0, import_react26.useCallback)(() => {
+  const [style, setStyle] = (0, import_react25.useState)();
+  const sync = (0, import_react25.useCallback)(() => {
     setStyle(getStyle());
   }, [ref.current, iframe]);
-  (0, import_react26.useEffect)(() => {
+  (0, import_react25.useEffect)(() => {
     if (ref.current) {
       const observer = new ResizeObserver(sync);
       observer.observe(ref.current);
@@ -4618,13 +4790,13 @@ var DraggableComponent = ({
     }
   }, [ref.current]);
   const registerNode = useAppStore((s) => s.nodes.registerNode);
-  const hideOverlay = (0, import_react26.useCallback)(() => {
+  const hideOverlay = (0, import_react25.useCallback)(() => {
     setIsVisible(false);
   }, []);
-  const showOverlay = (0, import_react26.useCallback)(() => {
+  const showOverlay = (0, import_react25.useCallback)(() => {
     setIsVisible(true);
   }, []);
-  (0, import_react26.useEffect)(() => {
+  (0, import_react25.useEffect)(() => {
     var _a;
     registerNode(id, {
       methods: { sync, showOverlay, hideOverlay },
@@ -4641,13 +4813,20 @@ var DraggableComponent = ({
       });
     };
   }, [id, zoneCompound, index, componentType, sync]);
-  const CustomActionBar = (0, import_react26.useMemo)(
+  const CustomActionBar = (0, import_react25.useMemo)(
     () => overrides.actionBar || DefaultActionBar,
     [overrides.actionBar]
   );
-  const onClick = (0, import_react26.useCallback)(
+  const CustomOverlay = (0, import_react25.useMemo)(
+    () => overrides.componentOverlay || DefaultOverlay,
+    [overrides.componentOverlay]
+  );
+  const onClick = (0, import_react25.useCallback)(
     (e) => {
-      e.stopPropagation();
+      const el = e.target;
+      if (!el.closest("[data-puck-overlay-portal]")) {
+        e.stopPropagation();
+      }
       dispatch({
         type: "setUi",
         ui: {
@@ -4658,7 +4837,7 @@ var DraggableComponent = ({
     [index, zoneCompound, id]
   );
   const appStore = useAppStoreApi();
-  const onSelectParent = (0, import_react26.useCallback)(() => {
+  const onSelectParent = (0, import_react25.useCallback)(() => {
     const { nodes, zones } = appStore.getState().state.indexes;
     const node = nodes[id];
     const parentNode = (node == null ? void 0 : node.parentId) ? nodes[node == null ? void 0 : node.parentId] : null;
@@ -4679,26 +4858,26 @@ var DraggableComponent = ({
       }
     });
   }, [ctx, path]);
-  const onDuplicate = (0, import_react26.useCallback)(() => {
+  const onDuplicate = (0, import_react25.useCallback)(() => {
     dispatch({
       type: "duplicate",
       sourceIndex: index,
       sourceZone: zoneCompound
     });
   }, [index, zoneCompound]);
-  const onDelete = (0, import_react26.useCallback)(() => {
+  const onDelete = (0, import_react25.useCallback)(() => {
     dispatch({
       type: "remove",
       index,
       zone: zoneCompound
     });
   }, [index, zoneCompound]);
-  const [hover, setHover] = (0, import_react26.useState)(false);
+  const [hover, setHover] = (0, import_react25.useState)(false);
   const indicativeHover = useContextStore(
     ZoneStoreContext,
     (s) => s.hoveringComponent === id
   );
-  (0, import_react26.useEffect)(() => {
+  (0, import_react25.useEffect)(() => {
     if (!ref.current) {
       return;
     }
@@ -4734,7 +4913,8 @@ var DraggableComponent = ({
       el.removeEventListener("mouseout", _onMouseOut);
     };
   }, [
-    ref,
+    ref.current,
+    // Remount attributes if the element changes
     onClick,
     containsActiveZone,
     zoneCompound,
@@ -4742,10 +4922,10 @@ var DraggableComponent = ({
     thisIsDragging,
     inDroppableZone
   ]);
-  const [isVisible, setIsVisible] = (0, import_react26.useState)(false);
-  const [dragFinished, setDragFinished] = (0, import_react26.useState)(true);
-  const [_, startTransition] = (0, import_react26.useTransition)();
-  (0, import_react26.useEffect)(() => {
+  const [isVisible, setIsVisible] = (0, import_react25.useState)(false);
+  const [dragFinished, setDragFinished] = (0, import_react25.useState)(true);
+  const [_, startTransition] = (0, import_react25.useTransition)();
+  (0, import_react25.useEffect)(() => {
     startTransition(() => {
       if (hover || indicativeHover || isSelected) {
         sync();
@@ -4756,7 +4936,7 @@ var DraggableComponent = ({
       }
     });
   }, [hover, indicativeHover, isSelected, iframe]);
-  const [thisWasDragging, setThisWasDragging] = (0, import_react26.useState)(false);
+  const [thisWasDragging, setThisWasDragging] = (0, import_react25.useState)(false);
   const onDragFinished = useOnDragFinished((finished) => {
     if (finished) {
       startTransition(() => {
@@ -4767,15 +4947,15 @@ var DraggableComponent = ({
       setDragFinished(false);
     }
   });
-  (0, import_react26.useEffect)(() => {
+  (0, import_react25.useEffect)(() => {
     if (thisIsDragging) {
       setThisWasDragging(true);
     }
   }, [thisIsDragging]);
-  (0, import_react26.useEffect)(() => {
+  (0, import_react25.useEffect)(() => {
     if (thisWasDragging) return onDragFinished();
   }, [thisWasDragging, onDragFinished]);
-  const syncActionsPosition = (0, import_react26.useCallback)(
+  const syncActionsPosition = (0, import_react25.useCallback)(
     (el) => {
       if (el) {
         const view = el.ownerDocument.defaultView;
@@ -4800,7 +4980,7 @@ var DraggableComponent = ({
     },
     [zoom]
   );
-  (0, import_react26.useEffect)(() => {
+  (0, import_react25.useEffect)(() => {
     if (userDragAxis) {
       setDragAxis(userDragAxis);
       return;
@@ -4814,11 +4994,11 @@ var DraggableComponent = ({
     }
     setDragAxis(autoDragAxis);
   }, [ref, userDragAxis, autoDragAxis]);
-  const parentAction = (0, import_react26.useMemo)(
+  const parentAction = (0, import_react25.useMemo)(
     () => (ctx == null ? void 0 : ctx.areaId) && (ctx == null ? void 0 : ctx.areaId) !== "root" && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(ActionBar.Action, { onClick: onSelectParent, label: "Select parent", children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(CornerLeftUp, { size: 16 }) }),
     [ctx == null ? void 0 : ctx.areaId]
   );
-  const nextContextValue = (0, import_react26.useMemo)(
+  const nextContextValue = (0, import_react25.useMemo)(
     () => __spreadProps(__spreadValues({}, ctx), {
       areaId: id,
       zoneCompound,
@@ -4886,7 +5066,16 @@ var DraggableComponent = ({
                 )
               }
             ),
-            /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassName16("overlay") })
+            /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassName16("overlayWrapper"), children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+              CustomOverlay,
+              {
+                componentId: id,
+                componentType,
+                hover,
+                isSelected,
+                children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassName16("overlay") })
+              }
+            ) })
           ]
         }
       ),
@@ -4901,11 +5090,11 @@ init_react_import();
 var styles_module_default12 = { "DropZone": "_DropZone_1i2sv_1", "DropZone--hasChildren": "_DropZone--hasChildren_1i2sv_11", "DropZone--isAreaSelected": "_DropZone--isAreaSelected_1i2sv_24", "DropZone--hoveringOverArea": "_DropZone--hoveringOverArea_1i2sv_25", "DropZone--isRootZone": "_DropZone--isRootZone_1i2sv_25", "DropZone--isDestination": "_DropZone--isDestination_1i2sv_35", "DropZone-item": "_DropZone-item_1i2sv_47", "DropZone-hitbox": "_DropZone-hitbox_1i2sv_51", "DropZone--isEnabled": "_DropZone--isEnabled_1i2sv_59", "DropZone--isAnimating": "_DropZone--isAnimating_1i2sv_68" };
 
 // components/DropZone/index.tsx
-var import_react36 = require("@dnd-kit/react");
+var import_react35 = require("@dnd-kit/react");
 
 // components/DropZone/lib/use-min-empty-height.ts
 init_react_import();
-var import_react27 = require("react");
+var import_react26 = require("react");
 var getNumItems = (appStore, zoneCompound) => appStore.getState().state.indexes.zones[zoneCompound].contentIds.length;
 var useMinEmptyHeight = ({
   zoneCompound,
@@ -4913,8 +5102,8 @@ var useMinEmptyHeight = ({
   ref
 }) => {
   const appStore = useAppStoreApi();
-  const [prevHeight, setPrevHeight] = (0, import_react27.useState)(0);
-  const [isAnimating, setIsAnimating] = (0, import_react27.useState)(false);
+  const [prevHeight, setPrevHeight] = (0, import_react26.useState)(0);
+  const [isAnimating, setIsAnimating] = (0, import_react26.useState)(false);
   const { draggedItem, isZone } = useContextStore(ZoneStoreContext, (s) => {
     var _a, _b;
     return {
@@ -4922,7 +5111,7 @@ var useMinEmptyHeight = ({
       isZone: ((_b = s.draggedItem) == null ? void 0 : _b.data.zone) === zoneCompound
     };
   });
-  const numItems = (0, import_react27.useRef)(0);
+  const numItems = (0, import_react26.useRef)(0);
   const onDragFinished = useOnDragFinished(
     (finished) => {
       var _a;
@@ -4957,7 +5146,7 @@ var useMinEmptyHeight = ({
     },
     [appStore, prevHeight, zoneCompound]
   );
-  (0, import_react27.useEffect)(() => {
+  (0, import_react26.useEffect)(() => {
     if (draggedItem && ref.current) {
       if (isZone) {
         const rect = ref.current.getBoundingClientRect();
@@ -4988,15 +5177,15 @@ function assignRefs(refs, node) {
 
 // components/DropZone/lib/use-content-with-preview.ts
 init_react_import();
-var import_react30 = require("react");
+var import_react29 = require("react");
 
 // lib/dnd/use-rendered-callback.ts
 init_react_import();
-var import_react28 = require("@dnd-kit/react");
-var import_react29 = require("react");
+var import_react27 = require("@dnd-kit/react");
+var import_react28 = require("react");
 function useRenderedCallback(callback, deps) {
-  const manager = (0, import_react28.useDragDropManager)();
-  return (0, import_react29.useCallback)(
+  const manager = (0, import_react27.useDragDropManager)();
+  return (0, import_react28.useCallback)(
     (...args) => __async(this, null, function* () {
       yield manager == null ? void 0 : manager.renderer.rendering;
       return callback(...args);
@@ -5007,14 +5196,14 @@ function useRenderedCallback(callback, deps) {
 
 // components/DropZone/lib/use-content-with-preview.ts
 var useContentIdsWithPreview = (contentIds, zoneCompound) => {
-  const zoneStore = (0, import_react30.useContext)(ZoneStoreContext);
+  const zoneStore = (0, import_react29.useContext)(ZoneStoreContext);
   const preview = useContextStore(
     ZoneStoreContext,
     (s) => s.previewIndex[zoneCompound]
   );
   const isDragging = useAppStore((s) => s.state.ui.isDragging);
-  const [contentIdsWithPreview, setContentIdsWithPreview] = (0, import_react30.useState)(contentIds);
-  const [localPreview, setLocalPreview] = (0, import_react30.useState)(
+  const [contentIdsWithPreview, setContentIdsWithPreview] = (0, import_react29.useState)(contentIds);
+  const [localPreview, setLocalPreview] = (0, import_react29.useState)(
     preview
   );
   const updateContent = useRenderedCallback(
@@ -5049,7 +5238,7 @@ var useContentIdsWithPreview = (contentIds, zoneCompound) => {
     },
     []
   );
-  (0, import_react30.useEffect)(() => {
+  (0, import_react29.useEffect)(() => {
     var _a;
     const s = zoneStore.getState();
     const draggedItemId = (_a = s.draggedItem) == null ? void 0 : _a.id;
@@ -5067,16 +5256,16 @@ var useContentIdsWithPreview = (contentIds, zoneCompound) => {
 
 // components/DropZone/lib/use-drag-axis.ts
 init_react_import();
-var import_react31 = require("react");
+var import_react30 = require("react");
 var GRID_DRAG_AXIS = "dynamic";
 var FLEX_ROW_DRAG_AXIS = "x";
 var DEFAULT_DRAG_AXIS = "y";
 var useDragAxis = (ref, collisionAxis) => {
   const status = useAppStore((s) => s.status);
-  const [dragAxis, setDragAxis] = (0, import_react31.useState)(
+  const [dragAxis, setDragAxis] = (0, import_react30.useState)(
     collisionAxis || DEFAULT_DRAG_AXIS
   );
-  const calculateDragAxis = (0, import_react31.useCallback)(() => {
+  const calculateDragAxis = (0, import_react30.useCallback)(() => {
     if (ref.current) {
       const computedStyle = window.getComputedStyle(ref.current);
       if (computedStyle.display === "grid") {
@@ -5088,7 +5277,7 @@ var useDragAxis = (ref, collisionAxis) => {
       }
     }
   }, [ref.current]);
-  (0, import_react31.useEffect)(() => {
+  (0, import_react30.useEffect)(() => {
     const onViewportChange = () => {
       calculateDragAxis();
     };
@@ -5097,21 +5286,21 @@ var useDragAxis = (ref, collisionAxis) => {
       window.removeEventListener("viewportchange", onViewportChange);
     };
   }, []);
-  (0, import_react31.useEffect)(calculateDragAxis, [status, collisionAxis]);
+  (0, import_react30.useEffect)(calculateDragAxis, [status, collisionAxis]);
   return [dragAxis, calculateDragAxis];
 };
 
 // components/DropZone/index.tsx
-var import_shallow4 = require("zustand/react/shallow");
+var import_shallow5 = require("zustand/react/shallow");
 
 // components/Render/index.tsx
 init_react_import();
 
 // lib/use-slots.tsx
 init_react_import();
-var import_react32 = require("react");
+var import_react31 = require("react");
 function useSlots(config, item, renderSlotEdit, renderSlotRender = renderSlotEdit, readOnly, forceReadOnly) {
-  const slotProps = (0, import_react32.useMemo)(() => {
+  const slotProps = (0, import_react31.useMemo)(() => {
     const mapped = mapSlots(
       item,
       (content, _parentId, propName, field, propPath) => {
@@ -5131,7 +5320,7 @@ function useSlots(config, item, renderSlotEdit, renderSlotRender = renderSlotEdi
     ).props;
     return mapped;
   }, [config, item, readOnly, forceReadOnly]);
-  const mergedProps = (0, import_react32.useMemo)(
+  const mergedProps = (0, import_react31.useMemo)(
     () => __spreadValues(__spreadValues({}, item.props), slotProps),
     [item.props, slotProps]
   );
@@ -5139,15 +5328,15 @@ function useSlots(config, item, renderSlotEdit, renderSlotRender = renderSlotEdi
 }
 
 // components/Render/index.tsx
-var import_react34 = __toESM(require("react"));
+var import_react33 = __toESM(require("react"));
 
 // components/SlotRender/index.tsx
 init_react_import();
-var import_shallow3 = require("zustand/react/shallow");
+var import_shallow4 = require("zustand/react/shallow");
 
 // components/SlotRender/server.tsx
 init_react_import();
-var import_react33 = require("react");
+var import_react32 = require("react");
 
 // components/ServerRender/index.tsx
 init_react_import();
@@ -5216,7 +5405,7 @@ var Item = ({
     })
   );
 };
-var SlotRender = (0, import_react33.forwardRef)(
+var SlotRender = (0, import_react32.forwardRef)(
   function SlotRenderInternal({ className, style, content, config, metadata }, ref) {
     return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { className, style, ref, children: content.map((item) => {
       if (!config.components[item.type]) {
@@ -5244,7 +5433,7 @@ var ContextSlotRender = ({
   const config = useAppStore((s) => s.config);
   const metadata = useAppStore((s) => s.metadata);
   const slotContent = useAppStore(
-    (0, import_shallow3.useShallow)((s) => {
+    (0, import_shallow4.useShallow)((s) => {
       var _a, _b;
       const indexes = s.state.indexes;
       const contentIds = (_b = (_a = indexes.zones[`${componentId}:${zone}`]) == null ? void 0 : _a.contentIds) != null ? _b : [];
@@ -5264,7 +5453,7 @@ var ContextSlotRender = ({
 
 // components/Render/index.tsx
 var import_jsx_runtime24 = require("react/jsx-runtime");
-var renderContext = import_react34.default.createContext({
+var renderContext = import_react33.default.createContext({
   config: { components: {} },
   data: { root: {}, content: [] },
   metadata: {}
@@ -5297,7 +5486,7 @@ function Render({
     { type: "root", props: pageProps },
     (props) => /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(SlotRender, __spreadProps(__spreadValues({}, props), { config, metadata }))
   );
-  const nextContextValue = (0, import_react34.useMemo)(
+  const nextContextValue = (0, import_react33.useMemo)(
     () => ({
       mode: "render",
       depth: 0
@@ -5326,11 +5515,11 @@ var DropZoneChild = ({
 }) => {
   var _a, _b;
   const metadata = useAppStore((s) => s.metadata);
-  const ctx = (0, import_react35.useContext)(dropZoneContext);
+  const ctx = (0, import_react34.useContext)(dropZoneContext);
   const { depth = 1 } = ctx != null ? ctx : {};
-  const zoneStore = (0, import_react35.useContext)(ZoneStoreContext);
+  const zoneStore = (0, import_react34.useContext)(ZoneStoreContext);
   const nodeProps = useAppStore(
-    (0, import_shallow4.useShallow)((s) => {
+    (0, import_shallow5.useShallow)((s) => {
       var _a2;
       return (_a2 = s.state.indexes.nodes[componentId]) == null ? void 0 : _a2.flatData.props;
     })
@@ -5342,13 +5531,13 @@ var DropZoneChild = ({
     }
   );
   const nodeReadOnly = useAppStore(
-    (0, import_shallow4.useShallow)((s) => {
+    (0, import_shallow5.useShallow)((s) => {
       var _a2;
       return (_a2 = s.state.indexes.nodes[componentId]) == null ? void 0 : _a2.data.readOnly;
     })
   );
   const appStore = useAppStoreApi();
-  const item = (0, import_react35.useMemo)(() => {
+  const item = (0, import_react34.useMemo)(() => {
     if (nodeProps) {
       const expanded = expandNode({
         type: nodeType,
@@ -5361,7 +5550,8 @@ var DropZoneChild = ({
       return {
         type: preview.componentType,
         props: preview.props,
-        previewType: preview.type
+        previewType: preview.type,
+        element: preview.element
       };
     }
     return null;
@@ -5369,7 +5559,7 @@ var DropZoneChild = ({
   const componentConfig = useAppStore(
     (s) => (item == null ? void 0 : item.type) ? s.config.components[item.type] : null
   );
-  const puckProps = (0, import_react35.useMemo)(
+  const puckProps = (0, import_react34.useMemo)(
     () => ({
       renderDropZone: DropZoneEditPure,
       isEditing: true,
@@ -5392,13 +5582,20 @@ var DropZoneChild = ({
     }
   );
   let label = (_b = (_a = componentConfig == null ? void 0 : componentConfig.label) != null ? _a : item == null ? void 0 : item.type.toString()) != null ? _b : "Component";
-  const renderPreview = (0, import_react35.useMemo)(
+  const renderPreview = (0, import_react34.useMemo)(
     () => function Preview3() {
-      return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DrawerItemInner, { name: label, children: overrides.componentItem });
+      var _a2;
+      if (item && "element" in item && item.element) {
+        return (
+          // Safe to use this since the HTML is set by the user
+          /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { dangerouslySetInnerHTML: { __html: item.element.outerHTML } })
+        );
+      }
+      return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DrawerItemInner, { name: label, children: (_a2 = overrides.componentItem) != null ? _a2 : overrides.drawerItem });
     },
     [componentId, label, overrides]
   );
-  const defaultsProps = (0, import_react35.useMemo)(
+  const defaultsProps = (0, import_react34.useMemo)(
     () => __spreadProps(__spreadValues(__spreadValues({}, componentConfig == null ? void 0 : componentConfig.defaultProps), item == null ? void 0 : item.props), {
       puck: puckProps,
       editMode: true
@@ -5406,7 +5603,7 @@ var DropZoneChild = ({
     }),
     [componentConfig == null ? void 0 : componentConfig.defaultProps, item == null ? void 0 : item.props, puckProps]
   );
-  const defaultedNode = (0, import_react35.useMemo)(
+  const defaultedNode = (0, import_react34.useMemo)(
     () => {
       var _a2;
       return { type: (_a2 = item == null ? void 0 : item.type) != null ? _a2 : nodeType, props: defaultsProps };
@@ -5457,8 +5654,8 @@ var DropZoneChild = ({
     }
   );
 };
-var DropZoneChildMemo = (0, import_react35.memo)(DropZoneChild);
-var DropZoneEdit = (0, import_react35.forwardRef)(
+var DropZoneChildMemo = (0, import_react34.memo)(DropZoneChild);
+var DropZoneEdit = (0, import_react34.forwardRef)(
   function DropZoneEditInternal({
     zone,
     allow,
@@ -5468,7 +5665,8 @@ var DropZoneEdit = (0, import_react35.forwardRef)(
     minEmptyHeight: userMinEmptyHeight = 128,
     collisionAxis
   }, userRef) {
-    const ctx = (0, import_react35.useContext)(dropZoneContext);
+    const ctx = (0, import_react34.useContext)(dropZoneContext);
+    const appStoreApi = useAppStoreApi();
     const {
       // These all need setting via context
       areaId,
@@ -5477,7 +5675,7 @@ var DropZoneEdit = (0, import_react35.forwardRef)(
       unregisterLocalZone
     } = ctx != null ? ctx : {};
     const path = useAppStore(
-      (0, import_shallow4.useShallow)((s) => {
+      (0, import_shallow5.useShallow)((s) => {
         var _a;
         return areaId ? (_a = s.state.indexes.nodes[areaId]) == null ? void 0 : _a.path : null;
       })
@@ -5494,30 +5692,25 @@ var DropZoneEdit = (0, import_react35.forwardRef)(
       (s) => s.nextAreaDepthIndex[areaId || ""]
     );
     const zoneContentIds = useAppStore(
-      (0, import_shallow4.useShallow)((s) => {
+      (0, import_shallow5.useShallow)((s) => {
         var _a;
         return (_a = s.state.indexes.zones[zoneCompound]) == null ? void 0 : _a.contentIds;
       })
     );
     const zoneType = useAppStore(
-      (0, import_shallow4.useShallow)((s) => {
+      (0, import_shallow5.useShallow)((s) => {
         var _a;
         return (_a = s.state.indexes.zones[zoneCompound]) == null ? void 0 : _a.type;
       })
     );
-    (0, import_react35.useEffect)(() => {
+    (0, import_react34.useEffect)(() => {
       if (!zoneType || zoneType === "dropzone") {
         if (ctx == null ? void 0 : ctx.registerZone) {
           ctx == null ? void 0 : ctx.registerZone(zoneCompound);
         }
-        return () => {
-          if (ctx == null ? void 0 : ctx.unregisterZone) {
-            ctx == null ? void 0 : ctx.unregisterZone(zoneCompound);
-          }
-        };
       }
-    }, [zoneType]);
-    (0, import_react35.useEffect)(() => {
+    }, [zoneType, appStoreApi]);
+    (0, import_react34.useEffect)(() => {
       if (zoneType === "dropzone") {
         if (zoneCompound !== rootDroppableId) {
           console.warn(
@@ -5526,11 +5719,11 @@ var DropZoneEdit = (0, import_react35.forwardRef)(
         }
       }
     }, [zoneType]);
-    const contentIds = (0, import_react35.useMemo)(() => {
+    const contentIds = (0, import_react34.useMemo)(() => {
       return zoneContentIds || [];
     }, [zoneContentIds]);
-    const ref = (0, import_react35.useRef)(null);
-    const acceptsTarget = (0, import_react35.useCallback)(
+    const ref = (0, import_react34.useRef)(null);
+    const acceptsTarget = (0, import_react34.useCallback)(
       (componentType) => {
         if (!componentType) {
           return true;
@@ -5568,7 +5761,7 @@ var DropZoneEdit = (0, import_react35.forwardRef)(
       }
       return _isEnabled;
     });
-    (0, import_react35.useEffect)(() => {
+    (0, import_react34.useEffect)(() => {
       if (registerLocalZone) {
         registerLocalZone(zoneCompound, targetAccepted || isEnabled);
       }
@@ -5583,8 +5776,8 @@ var DropZoneEdit = (0, import_react35.forwardRef)(
       zoneCompound
     );
     const isDropEnabled = isEnabled && (preview ? contentIdsWithPreview.length === 1 : contentIdsWithPreview.length === 0);
-    const zoneStore = (0, import_react35.useContext)(ZoneStoreContext);
-    (0, import_react35.useEffect)(() => {
+    const zoneStore = (0, import_react34.useContext)(ZoneStoreContext);
+    (0, import_react34.useEffect)(() => {
       const { enabledIndex } = zoneStore.getState();
       zoneStore.setState({
         enabledIndex: __spreadProps(__spreadValues({}, enabledIndex), { [zoneCompound]: isEnabled })
@@ -5603,7 +5796,7 @@ var DropZoneEdit = (0, import_react35.forwardRef)(
         path: path || []
       }
     };
-    const { ref: dropRef } = (0, import_react36.useDroppable)(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)
     );
@@ -5658,7 +5851,7 @@ var DropZoneRenderItem = ({
 }) => {
   const Component = config.components[item.type];
   const props = useSlots(config, item, (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, slotProps), { config, metadata })));
-  const nextContextValue = (0, import_react35.useMemo)(
+  const nextContextValue = (0, import_react34.useMemo)(
     () => ({
       areaId: props.id,
       depth: 1
@@ -5676,23 +5869,18 @@ var DropZoneRenderItem = ({
   ) }, props.id);
 };
 var DropZoneRenderPure = (props) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DropZoneRender2, __spreadValues({}, props));
-var DropZoneRender2 = (0, import_react35.forwardRef)(
+var DropZoneRender2 = (0, import_react34.forwardRef)(
   function DropZoneRenderInternal({ className, style, zone }, ref) {
-    const ctx = (0, import_react35.useContext)(dropZoneContext);
+    const ctx = (0, import_react34.useContext)(dropZoneContext);
     const { areaId = "root" } = ctx || {};
-    const { config, data, metadata } = (0, import_react35.useContext)(renderContext);
+    const { config, data, metadata } = (0, import_react34.useContext)(renderContext);
     let zoneCompound = `${areaId}:${zone}`;
     let content = (data == null ? void 0 : data.content) || [];
-    (0, import_react35.useEffect)(() => {
+    (0, import_react34.useEffect)(() => {
       if (!content) {
         if (ctx == null ? void 0 : ctx.registerZone) {
           ctx == null ? void 0 : ctx.registerZone(zoneCompound);
         }
-        return () => {
-          if (ctx == null ? void 0 : ctx.unregisterZone) {
-            ctx == null ? void 0 : ctx.unregisterZone(zoneCompound);
-          }
-        };
       }
     }, [content]);
     if (!data || !config) {
@@ -5719,9 +5907,9 @@ var DropZoneRender2 = (0, import_react35.forwardRef)(
   }
 );
 var DropZonePure = (props) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DropZone, __spreadValues({}, props));
-var DropZone = (0, import_react35.forwardRef)(
+var DropZone = (0, import_react34.forwardRef)(
   function DropZone2(props, ref) {
-    const ctx = (0, import_react35.useContext)(dropZoneContext);
+    const ctx = (0, import_react34.useContext)(dropZoneContext);
     if ((ctx == null ? void 0 : ctx.mode) === "edit") {
       return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(import_jsx_runtime25.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DropZoneEdit, __spreadProps(__spreadValues({}, props), { ref })) });
     }
@@ -5953,6 +6141,7 @@ var findDeepestCandidate = (position, manager) => {
     });
     filteredCandidates.reverse();
     const primaryCandidate = filteredCandidates[0];
+    if (!primaryCandidate) return { zone: null, area: null };
     const primaryCandidateData = primaryCandidate.data;
     const primaryCandidateIsComponent = "containsActiveZone" in primaryCandidateData;
     const zone = getZoneId2(primaryCandidate);
@@ -6062,12 +6251,12 @@ function getDeepDir(el) {
 var import_state = require("@dnd-kit/state");
 var import_jsx_runtime26 = require("react/jsx-runtime");
 var DEBUG3 = false;
-var dragListenerContext = (0, import_react38.createContext)({
+var dragListenerContext = (0, import_react37.createContext)({
   dragListeners: {}
 });
 function useDragListener(type, fn, deps = []) {
-  const { setDragListeners } = (0, import_react38.useContext)(dragListenerContext);
-  (0, import_react38.useEffect)(() => {
+  const { setDragListeners } = (0, import_react37.useContext)(dragListenerContext);
+  (0, import_react37.useEffect)(() => {
     if (setDragListeners) {
       setDragListeners((old) => __spreadProps(__spreadValues({}, old), {
         [type]: [...old[type] || [], fn]
@@ -6077,8 +6266,8 @@ function useDragListener(type, fn, deps = []) {
 }
 var AREA_CHANGE_DEBOUNCE_MS = 100;
 var useTempDisableFallback = (timeout3) => {
-  const lastFallbackDisable = (0, import_react38.useRef)(null);
-  return (0, import_react38.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;
@@ -6097,9 +6286,9 @@ var DragDropContextClient = ({
   const dispatch = useAppStore((s) => s.dispatch);
   const appStore = useAppStoreApi();
   const id = useSafeId();
-  const debouncedParamsRef = (0, import_react38.useRef)(null);
+  const debouncedParamsRef = (0, import_react37.useRef)(null);
   const tempDisableFallback = useTempDisableFallback(100);
-  const [zoneStore] = (0, import_react38.useState)(
+  const [zoneStore] = (0, import_react37.useState)(
     () => (0, import_zustand5.createStore)(() => ({
       zoneDepthIndex: {},
       nextZoneDepthIndex: {},
@@ -6111,7 +6300,7 @@ var DragDropContextClient = ({
       hoveringComponent: null
     }))
   );
-  const getChanged2 = (0, import_react38.useCallback)(
+  const getChanged2 = (0, import_react37.useCallback)(
     (params, id2) => {
       const { zoneDepthIndex = {}, areaDepthIndex = {} } = zoneStore.getState() || {};
       const stateHasZone = Object.keys(zoneDepthIndex).length > 0;
@@ -6132,7 +6321,7 @@ var DragDropContextClient = ({
     },
     [zoneStore]
   );
-  const setDeepestAndCollide = (0, import_react38.useCallback)(
+  const setDeepestAndCollide = (0, import_react37.useCallback)(
     (params, manager) => {
       const { zoneChanged, areaChanged } = getChanged2(params, id);
       if (!zoneChanged && !areaChanged) return;
@@ -6156,7 +6345,7 @@ var DragDropContextClient = ({
     setDeepestDb.cancel();
     debouncedParamsRef.current = null;
   };
-  (0, import_react38.useEffect)(() => {
+  (0, import_react37.useEffect)(() => {
     if (DEBUG3) {
       zoneStore.subscribe(
         (s) => {
@@ -6170,7 +6359,7 @@ var DragDropContextClient = ({
       );
     }
   }, []);
-  const [plugins] = (0, import_react38.useState)(() => [
+  const [plugins] = (0, import_react37.useState)(() => [
     ...disableAutoScroll ? import_dom.defaultPreset.plugins.filter((plugin) => plugin !== import_dom.AutoScroller) : import_dom.defaultPreset.plugins,
     createNestedDroppablePlugin(
       {
@@ -6218,10 +6407,10 @@ var DragDropContextClient = ({
     )
   ]);
   const sensors = useSensors();
-  const [dragListeners, setDragListeners] = (0, import_react38.useState)({});
-  const dragMode = (0, import_react38.useRef)(null);
-  const initialSelector = (0, import_react38.useRef)(void 0);
-  const nextContextValue = (0, import_react38.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",
@@ -6237,7 +6426,7 @@ var DragDropContextClient = ({
         setDragListeners
       },
       children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
-        import_react37.DragDropProvider,
+        import_react36.DragDropProvider,
         {
           plugins,
           sensors,
@@ -6357,6 +6546,7 @@ var DragDropContextClient = ({
                     type: "insert",
                     index: targetIndex,
                     zone: targetZone,
+                    element: source.element,
                     props: {
                       id: source.id.toString()
                     }
@@ -6382,7 +6572,8 @@ var DragDropContextClient = ({
                       type: "move",
                       index: targetIndex,
                       zone: targetZone,
-                      props: item.props
+                      props: item.props,
+                      element: source.element
                     }
                   }
                 });
@@ -6412,7 +6603,8 @@ var DragDropContextClient = ({
                       type: "move",
                       index: sourceData.index,
                       zone: sourceData.zone,
-                      props: item.props
+                      props: item.props,
+                      element: source.element
                     }
                   }
                 });
@@ -6467,7 +6659,7 @@ var DragDropContext = ({
 };
 
 // components/Drawer/index.tsx
-var import_react40 = require("@dnd-kit/react");
+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);
@@ -6478,7 +6670,7 @@ var DrawerItemInner = ({
   dragRef,
   isDragDisabled
 }) => {
-  const CustomInner = (0, import_react39.useMemo)(
+  const CustomInner = (0, import_react38.useMemo)(
     () => children || (({ children: children2 }) => /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassNameItem2("default"), children: children2 })),
     [children]
   );
@@ -6504,7 +6696,7 @@ var DrawerItemDraggable = ({
   id,
   isDragDisabled
 }) => {
-  const { ref } = (0, import_react40.useDraggable)({
+  const { ref } = (0, import_react39.useDraggable)({
     id,
     data: { componentType: name },
     disabled: isDragDisabled,
@@ -6533,7 +6725,7 @@ var DrawerItem = ({
   isDragDisabled
 }) => {
   const resolvedId = id || name;
-  const [dynamicId, setDynamicId] = (0, import_react39.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."
@@ -6573,7 +6765,7 @@ var Drawer = ({
     );
   }
   const id = useSafeId();
-  const { ref } = (0, import_react40.useDroppable)({
+  const { ref } = (0, import_react39.useDroppable)({
     id,
     type: "void",
     collisionPriority: 0
@@ -6595,7 +6787,7 @@ Drawer.Item = DrawerItem;
 
 // components/Puck/index.tsx
 init_react_import();
-var import_react56 = require("react");
+var import_react59 = require("react");
 
 // components/SidebarSection/index.tsx
 init_react_import();
@@ -6606,7 +6798,7 @@ var styles_module_default13 = { "SidebarSection": "_SidebarSection_8boj8_1", "Si
 
 // lib/use-breadcrumbs.ts
 init_react_import();
-var import_react41 = require("react");
+var import_react40 = require("react");
 var useBreadcrumbs = (renderCount) => {
   const selectedId = useAppStore((s) => {
     var _a;
@@ -6618,7 +6810,7 @@ var useBreadcrumbs = (renderCount) => {
     return (_a = s.state.indexes.nodes[selectedId]) == null ? void 0 : _a.path;
   });
   const appStore = useAppStoreApi();
-  return (0, import_react41.useMemo)(() => {
+  return (0, import_react40.useMemo)(() => {
     const breadcrumbs = (path == null ? void 0 : path.map((zoneCompound) => {
       var _a, _b, _c;
       const [componentId] = zoneCompound.split(":");
@@ -6692,7 +6884,7 @@ var SidebarSection = ({
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Puck/styles.module.css#css-module
 init_react_import();
-var styles_module_default14 = { "Puck": "_Puck_dnlfp_19", "Puck-portal": "_Puck-portal_dnlfp_31", "PuckLayout-inner": "_PuckLayout-inner_dnlfp_38", "PuckLayout--mounted": "_PuckLayout--mounted_dnlfp_50", "PuckLayout--leftSideBarVisible": "_PuckLayout--leftSideBarVisible_dnlfp_54", "PuckLayout--rightSideBarVisible": "_PuckLayout--rightSideBarVisible_dnlfp_60", "PuckLayout-mounted": "_PuckLayout-mounted_dnlfp_74", "PuckLayout": "_PuckLayout_dnlfp_38", "PuckLayout-leftSideBar": "_PuckLayout-leftSideBar_dnlfp_115", "PuckLayout-rightSideBar": "_PuckLayout-rightSideBar_dnlfp_124" };
+var styles_module_default14 = { "Puck": "_Puck_vnhjy_19", "Puck-portal": "_Puck-portal_vnhjy_31", "PuckLayout-inner": "_PuckLayout-inner_vnhjy_38", "PuckLayout--mounted": "_PuckLayout--mounted_vnhjy_50", "PuckLayout--leftSideBarVisible": "_PuckLayout--leftSideBarVisible_vnhjy_54", "PuckLayout--rightSideBarVisible": "_PuckLayout--rightSideBarVisible_vnhjy_60", "PuckLayout-mounted": "_PuckLayout-mounted_vnhjy_74", "PuckLayout": "_PuckLayout_vnhjy_38" };
 
 // components/Puck/components/Fields/index.tsx
 init_react_import();
@@ -6702,8 +6894,8 @@ init_react_import();
 var styles_module_default15 = { "PuckFields": "_PuckFields_10bh7_1", "PuckFields--isLoading": "_PuckFields--isLoading_10bh7_6", "PuckFields-loadingOverlay": "_PuckFields-loadingOverlay_10bh7_10", "PuckFields-loadingOverlayInner": "_PuckFields-loadingOverlayInner_10bh7_25", "PuckFields-field": "_PuckFields-field_10bh7_32", "PuckFields--wrapFields": "_PuckFields--wrapFields_10bh7_36" };
 
 // components/Puck/components/Fields/index.tsx
-var import_react42 = require("react");
-var import_shallow5 = require("zustand/react/shallow");
+var import_react41 = require("react");
+var import_shallow6 = require("zustand/react/shallow");
 var import_jsx_runtime29 = require("react/jsx-runtime");
 var getClassName20 = get_class_name_factory_default("PuckFields", styles_module_default15);
 var DefaultFields = ({
@@ -6769,13 +6961,13 @@ var FieldsChild = ({ fieldName }) => {
     return s.selectedItem ? `${s.selectedItem.props.id}_${field.type}_${fieldName}` : `root_${field.type}_${fieldName}`;
   });
   const permissions = useAppStore(
-    (0, import_shallow5.useShallow)((s) => {
+    (0, import_shallow6.useShallow)((s) => {
       const { selectedItem, permissions: permissions2 } = s;
       return selectedItem ? permissions2.getPermissions({ item: selectedItem }) : permissions2.getPermissions({ root: true });
     })
   );
   const appStore = useAppStoreApi();
-  const onChange = (0, import_react42.useCallback)(createOnChange(fieldName, appStore), [
+  const onChange = (0, import_react41.useCallback)(createOnChange(fieldName, appStore), [
     fieldName
   ]);
   const { visible = true } = field != null ? field : {};
@@ -6793,7 +6985,7 @@ var FieldsChild = ({ fieldName }) => {
     }
   ) }, id);
 };
-var FieldsChildMemo = (0, import_react42.memo)(FieldsChild);
+var FieldsChildMemo = (0, import_react41.memo)(FieldsChild);
 var FieldsInternal = ({ wrapFields = true }) => {
   const overrides = useAppStore((s) => s.overrides);
   const componentResolving = useAppStore((s) => {
@@ -6801,7 +6993,7 @@ var FieldsInternal = ({ wrapFields = true }) => {
     const loadingCount = s.selectedItem ? (_a = s.componentState[s.selectedItem.props.id]) == null ? void 0 : _a.loadingCount : (_b = s.componentState["root"]) == null ? void 0 : _b.loadingCount;
     return (loadingCount != null ? loadingCount : 0) > 0;
   });
-  const itemSelector = useAppStore((0, import_shallow5.useShallow)((s) => s.state.ui.itemSelector));
+  const itemSelector = useAppStore((0, import_shallow6.useShallow)((s) => s.state.ui.itemSelector));
   const id = useAppStore((s) => {
     var _a;
     return (_a = s.selectedItem) == null ? void 0 : _a.props.id;
@@ -6810,7 +7002,7 @@ var FieldsInternal = ({ wrapFields = true }) => {
   useRegisterFieldsSlice(appStore, id);
   const fieldsLoading = useAppStore((s) => s.fields.loading);
   const fieldNames = useAppStore(
-    (0, import_shallow5.useShallow)((s) => {
+    (0, import_shallow6.useShallow)((s) => {
       if (s.fields.id === id) {
         return Object.keys(s.fields.fields);
       }
@@ -6818,7 +7010,7 @@ var FieldsInternal = ({ wrapFields = true }) => {
     })
   );
   const isLoading = fieldsLoading || componentResolving;
-  const Wrapper = (0, import_react42.useMemo)(() => overrides.fields || DefaultFields, [overrides]);
+  const Wrapper = (0, import_react41.useMemo)(() => overrides.fields || DefaultFields, [overrides]);
   return /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)(
     "form",
     {
@@ -6833,7 +7025,7 @@ var FieldsInternal = ({ wrapFields = true }) => {
     }
   );
 };
-var Fields = (0, import_react42.memo)(FieldsInternal);
+var Fields = (0, import_react41.memo)(FieldsInternal);
 
 // components/Puck/components/Components/index.tsx
 init_react_import();
@@ -6850,19 +7042,28 @@ init_react_import();
 var styles_module_default16 = { "ComponentList": "_ComponentList_1rrlt_1", "ComponentList--isExpanded": "_ComponentList--isExpanded_1rrlt_5", "ComponentList-content": "_ComponentList-content_1rrlt_9", "ComponentList-title": "_ComponentList-title_1rrlt_17", "ComponentList-titleIcon": "_ComponentList-titleIcon_1rrlt_53" };
 
 // components/ComponentList/index.tsx
+var import_react42 = require("react");
 var import_jsx_runtime30 = require("react/jsx-runtime");
 var getClassName21 = get_class_name_factory_default("ComponentList", styles_module_default16);
 var ComponentListItem = ({
   name,
   label
 }) => {
+  var _a;
   const overrides = useAppStore((s) => s.overrides);
   const canInsert = useAppStore(
     (s) => s.permissions.getPermissions({
       type: name
     }).insert
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(Drawer.Item, { label, name, isDragDisabled: !canInsert, children: overrides.componentItem });
+  (0, import_react42.useEffect)(() => {
+    if (overrides.componentItem) {
+      console.warn(
+        "The `componentItem` override has been deprecated and renamed to `drawerItem`"
+      );
+    }
+  }, [overrides]);
+  return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(Drawer.Item, { label, name, isDragDisabled: !canInsert, children: (_a = overrides.componentItem) != null ? _a : overrides.drawerItem });
 };
 var ComponentList = ({
   children,
@@ -6988,7 +7189,14 @@ var import_jsx_runtime32 = require("react/jsx-runtime");
 var Components = () => {
   const overrides = useAppStore((s) => s.overrides);
   const componentList = useComponentList();
-  const Wrapper = (0, import_react44.useMemo)(() => overrides.components || "div", [overrides]);
+  const Wrapper = (0, import_react44.useMemo)(() => {
+    if (overrides.components) {
+      console.warn(
+        "The `components` override has been deprecated and renamed to `drawer`"
+      );
+    }
+    return overrides.components || overrides.drawer || "div";
+  }, [overrides]);
   return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Wrapper, { children: componentList ? componentList : /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(ComponentList, { id: "all" }) });
 };
 
@@ -7367,7 +7575,7 @@ var Preview2 = ({ id = "puck-preview" }) => {
       editMode: true,
       children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(DropZonePure, { zone: rootDroppableId })
     })
-  ) : /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Render, { data: renderData, config });
+  ) : /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Render, { data: renderData, config, metadata });
   (0, import_react46.useEffect)(() => {
     if (!iframe.enabled) {
       setStatus("READY");
@@ -7379,8 +7587,11 @@ var Preview2 = ({ id = "puck-preview" }) => {
       className: getClassName22(),
       id,
       "data-puck-preview": true,
-      onClick: () => {
-        dispatch({ type: "setUi", ui: { itemSelector: null } });
+      onClick: (e) => {
+        const el = e.target;
+        if (!el.hasAttribute("data-puck-component") && !el.hasAttribute("data-puck-dropzone")) {
+          dispatch({ type: "setUi", ui: { itemSelector: null } });
+        }
       },
       children: iframe.enabled ? /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
         AutoFrame_default,
@@ -7460,7 +7671,7 @@ var onScrollEnd = (frame, cb) => {
 };
 
 // components/LayerTree/index.tsx
-var import_shallow6 = require("zustand/react/shallow");
+var import_shallow7 = require("zustand/react/shallow");
 var import_jsx_runtime35 = require("react/jsx-runtime");
 var getClassName23 = get_class_name_factory_default("LayerTree", styles_module_default18);
 var getClassNameLayer = get_class_name_factory_default("Layer", styles_module_default18);
@@ -7486,7 +7697,7 @@ var Layer = ({
   const isSelected = selecedItemId === itemId || itemSelector && itemSelector.zone === rootDroppableId && !zoneCompound;
   const nodeData = useAppStore((s) => s.state.indexes.nodes[itemId]);
   const zonesForItem = useAppStore(
-    (0, import_shallow6.useShallow)(
+    (0, import_shallow7.useShallow)(
       (s) => Object.keys(s.state.indexes.zones).filter(
         (z) => z.split(":")[0] === itemId
       )
@@ -7572,207 +7783,86 @@ var Layer = ({
           }
         ) }),
         containsZone && zonesForItem.map((subzone) => /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: getClassNameLayer("zones"), children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(LayerTree, { zoneCompound: subzone }) }, subzone))
-      ]
-    }
-  );
-};
-var LayerTree = ({
-  label: _label,
-  zoneCompound
-}) => {
-  const label = useAppStore((s) => {
-    var _a, _b, _c, _d;
-    if (_label) return _label;
-    if (zoneCompound === rootDroppableId) return;
-    const [componentId, slotId] = zoneCompound.split(":");
-    const componentType = (_a = s.state.indexes.nodes[componentId]) == null ? void 0 : _a.data.type;
-    const configForComponent = componentType && componentType !== rootAreaId ? s.config.components[componentType] : s.config.root;
-    return (_d = (_c = (_b = configForComponent == null ? void 0 : configForComponent.fields) == null ? void 0 : _b[slotId]) == null ? void 0 : _c.label) != null ? _d : slotId;
-  });
-  const contentIds = useAppStore(
-    (0, import_shallow6.useShallow)(
-      (s) => {
-        var _a, _b;
-        return zoneCompound ? (_b = (_a = s.state.indexes.zones[zoneCompound]) == null ? void 0 : _a.contentIds) != null ? _b : [] : [];
-      }
-    )
-  );
-  return /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(import_jsx_runtime35.Fragment, { children: [
-    label && /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { className: getClassName23("zoneTitle"), children: [
-      /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: getClassName23("zoneIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Layers, { size: "16" }) }),
-      label
-    ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("ul", { className: getClassName23(), children: [
-      contentIds.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: getClassName23("helper"), children: "No items" }),
-      contentIds.map((itemId, i) => {
-        return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
-          Layer,
-          {
-            index: i,
-            itemId,
-            zoneCompound
-          },
-          itemId
-        );
-      })
-    ] })
-  ] });
-};
-
-// components/Puck/components/Outline/index.tsx
-var import_react48 = require("react");
-
-// lib/data/find-zones-for-area.ts
-init_react_import();
-var findZonesForArea = (state, area) => {
-  return Object.keys(state.indexes.zones).filter(
-    (zone) => zone.split(":")[0] === area
-  );
-};
-
-// components/Puck/components/Outline/index.tsx
-var import_shallow7 = require("zustand/react/shallow");
-var import_jsx_runtime36 = require("react/jsx-runtime");
-var Outline = () => {
-  const outlineOverride = useAppStore((s) => s.overrides.outline);
-  const rootZones = useAppStore(
-    (0, import_shallow7.useShallow)((s) => findZonesForArea(s.state, "root"))
-  );
-  const Wrapper = (0, import_react48.useMemo)(() => outlineOverride || "div", [outlineOverride]);
-  return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Wrapper, { children: rootZones.map((zoneCompound) => /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
-    LayerTree,
-    {
-      label: rootZones.length === 1 ? "" : zoneCompound.split(":")[1],
-      zoneCompound
-    },
-    zoneCompound
-  )) });
-};
-
-// components/Puck/components/Canvas/index.tsx
-init_react_import();
-
-// ../../node_modules/css-box-model/dist/css-box-model.esm.js
-init_react_import();
-
-// ../../node_modules/tiny-invariant/dist/esm/tiny-invariant.js
-init_react_import();
-var isProduction = process.env.NODE_ENV === "production";
-var prefix = "Invariant failed";
-function invariant(condition, message) {
-  if (condition) {
-    return;
-  }
-  if (isProduction) {
-    throw new Error(prefix);
-  }
-  var provided = typeof message === "function" ? message() : message;
-  var value = provided ? "".concat(prefix, ": ").concat(provided) : prefix;
-  throw new Error(value);
-}
-
-// ../../node_modules/css-box-model/dist/css-box-model.esm.js
-var getRect = function getRect2(_ref) {
-  var top = _ref.top, right = _ref.right, bottom = _ref.bottom, left = _ref.left;
-  var width = right - left;
-  var height = bottom - top;
-  var rect = {
-    top,
-    right,
-    bottom,
-    left,
-    width,
-    height,
-    x: left,
-    y: top,
-    center: {
-      x: (right + left) / 2,
-      y: (bottom + top) / 2
-    }
-  };
-  return rect;
-};
-var expand = function expand2(target, expandBy) {
-  return {
-    top: target.top - expandBy.top,
-    left: target.left - expandBy.left,
-    bottom: target.bottom + expandBy.bottom,
-    right: target.right + expandBy.right
-  };
-};
-var shrink = function shrink2(target, shrinkBy) {
-  return {
-    top: target.top + shrinkBy.top,
-    left: target.left + shrinkBy.left,
-    bottom: target.bottom - shrinkBy.bottom,
-    right: target.right - shrinkBy.right
-  };
-};
-var noSpacing = {
-  top: 0,
-  right: 0,
-  bottom: 0,
-  left: 0
-};
-var createBox = function createBox2(_ref2) {
-  var borderBox = _ref2.borderBox, _ref2$margin = _ref2.margin, margin = _ref2$margin === void 0 ? noSpacing : _ref2$margin, _ref2$border = _ref2.border, border = _ref2$border === void 0 ? noSpacing : _ref2$border, _ref2$padding = _ref2.padding, padding = _ref2$padding === void 0 ? noSpacing : _ref2$padding;
-  var marginBox = getRect(expand(borderBox, margin));
-  var paddingBox = getRect(shrink(borderBox, border));
-  var contentBox = getRect(shrink(paddingBox, padding));
-  return {
-    marginBox,
-    borderBox: getRect(borderBox),
-    paddingBox,
-    contentBox,
-    margin,
-    border,
-    padding
-  };
-};
-var parse = function parse2(raw) {
-  var value = raw.slice(0, -2);
-  var suffix = raw.slice(-2);
-  if (suffix !== "px") {
-    return 0;
-  }
-  var result = Number(value);
-  !!isNaN(result) ? process.env.NODE_ENV !== "production" ? invariant(false, "Could not parse value [raw: " + raw + ", without suffix: " + value + "]") : invariant(false) : void 0;
-  return result;
-};
-var calculateBox = function calculateBox2(borderBox, styles2) {
-  var margin = {
-    top: parse(styles2.marginTop),
-    right: parse(styles2.marginRight),
-    bottom: parse(styles2.marginBottom),
-    left: parse(styles2.marginLeft)
-  };
-  var padding = {
-    top: parse(styles2.paddingTop),
-    right: parse(styles2.paddingRight),
-    bottom: parse(styles2.paddingBottom),
-    left: parse(styles2.paddingLeft)
-  };
-  var border = {
-    top: parse(styles2.borderTopWidth),
-    right: parse(styles2.borderRightWidth),
-    bottom: parse(styles2.borderBottomWidth),
-    left: parse(styles2.borderLeftWidth)
-  };
-  return createBox({
-    borderBox,
-    margin,
-    padding,
-    border
+      ]
+    }
+  );
+};
+var LayerTree = ({
+  label: _label,
+  zoneCompound
+}) => {
+  const label = useAppStore((s) => {
+    var _a, _b, _c, _d;
+    if (_label) return _label;
+    if (zoneCompound === rootDroppableId) return;
+    const [componentId, slotId] = zoneCompound.split(":");
+    const componentType = (_a = s.state.indexes.nodes[componentId]) == null ? void 0 : _a.data.type;
+    const configForComponent = componentType && componentType !== rootAreaId ? s.config.components[componentType] : s.config.root;
+    return (_d = (_c = (_b = configForComponent == null ? void 0 : configForComponent.fields) == null ? void 0 : _b[slotId]) == null ? void 0 : _c.label) != null ? _d : slotId;
   });
+  const contentIds = useAppStore(
+    (0, import_shallow7.useShallow)(
+      (s) => {
+        var _a, _b;
+        return zoneCompound ? (_b = (_a = s.state.indexes.zones[zoneCompound]) == null ? void 0 : _a.contentIds) != null ? _b : [] : [];
+      }
+    )
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(import_jsx_runtime35.Fragment, { children: [
+    label && /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { className: getClassName23("zoneTitle"), children: [
+      /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: getClassName23("zoneIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Layers, { size: "16" }) }),
+      label
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("ul", { className: getClassName23(), children: [
+      contentIds.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: getClassName23("helper"), children: "No items" }),
+      contentIds.map((itemId, i) => {
+        return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+          Layer,
+          {
+            index: i,
+            itemId,
+            zoneCompound
+          },
+          itemId
+        );
+      })
+    ] })
+  ] });
 };
-var getBox = function getBox2(el) {
-  var borderBox = el.getBoundingClientRect();
-  var styles2 = window.getComputedStyle(el);
-  return calculateBox(borderBox, styles2);
+
+// components/Puck/components/Outline/index.tsx
+var import_react48 = require("react");
+
+// lib/data/find-zones-for-area.ts
+init_react_import();
+var findZonesForArea = (state, area) => {
+  return Object.keys(state.indexes.zones).filter(
+    (zone) => zone.split(":")[0] === area
+  );
+};
+
+// components/Puck/components/Outline/index.tsx
+var import_shallow8 = require("zustand/react/shallow");
+var import_jsx_runtime36 = require("react/jsx-runtime");
+var Outline = () => {
+  const outlineOverride = useAppStore((s) => s.overrides.outline);
+  const rootZones = useAppStore(
+    (0, import_shallow8.useShallow)((s) => findZonesForArea(s.state, "root"))
+  );
+  const Wrapper = (0, import_react48.useMemo)(() => outlineOverride || "div", [outlineOverride]);
+  return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Wrapper, { children: rootZones.map((zoneCompound) => /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
+    LayerTree,
+    {
+      label: rootZones.length === 1 ? "" : zoneCompound.split(":")[1],
+      zoneCompound
+    },
+    zoneCompound
+  )) });
 };
 
 // components/Puck/components/Canvas/index.tsx
-var import_react50 = require("react");
+init_react_import();
+var import_react51 = require("react");
 
 // components/ViewportControls/index.tsx
 init_react_import();
@@ -7924,42 +8014,41 @@ var ViewportControls = ({
 init_react_import();
 var styles_module_default20 = { "PuckCanvas": "_PuckCanvas_18jay_1", "PuckCanvas-controls": "_PuckCanvas-controls_18jay_16", "PuckCanvas-inner": "_PuckCanvas-inner_18jay_21", "PuckCanvas-root": "_PuckCanvas-root_18jay_30", "PuckCanvas--ready": "_PuckCanvas--ready_18jay_55", "PuckCanvas-loader": "_PuckCanvas-loader_18jay_60", "PuckCanvas--showLoader": "_PuckCanvas--showLoader_18jay_70" };
 
-// lib/get-zoom-config.ts
+// components/Puck/components/Canvas/index.tsx
+var import_shallow9 = require("zustand/react/shallow");
+
+// lib/frame-context.tsx
 init_react_import();
-var RESET_ZOOM_SMALLER_THAN_FRAME = true;
-var getZoomConfig = (uiViewport, frame, zoom) => {
-  const box = getBox(frame);
-  const { width: frameWidth, height: frameHeight } = box.contentBox;
-  const viewportHeight = uiViewport.height === "auto" ? frameHeight : uiViewport.height;
-  let rootHeight = 0;
-  let autoZoom = 1;
-  if (uiViewport.width > frameWidth || viewportHeight > frameHeight) {
-    const widthZoom = Math.min(frameWidth / uiViewport.width, 1);
-    const heightZoom = Math.min(frameHeight / viewportHeight, 1);
-    zoom = widthZoom;
-    if (widthZoom < heightZoom) {
-      rootHeight = viewportHeight / zoom;
-    } else {
-      rootHeight = viewportHeight;
-      zoom = heightZoom;
-    }
-    autoZoom = zoom;
-  } else {
-    if (RESET_ZOOM_SMALLER_THAN_FRAME) {
-      autoZoom = 1;
-      zoom = 1;
-      rootHeight = viewportHeight;
-    }
+var import_react50 = require("react");
+var import_jsx_runtime38 = require("react/jsx-runtime");
+var FrameContext = (0, import_react50.createContext)(null);
+var FrameProvider = ({
+  children
+}) => {
+  const frameRef = (0, import_react50.useRef)(null);
+  const value = (0, import_react50.useMemo)(
+    () => ({
+      frameRef
+    }),
+    []
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(FrameContext.Provider, { value, children });
+};
+var useCanvasFrame = () => {
+  const context = (0, import_react50.useContext)(FrameContext);
+  if (context === null) {
+    throw new Error("useCanvasFrame must be used within a FrameProvider");
   }
-  return { autoZoom, rootHeight, zoom };
+  return context;
 };
 
 // components/Puck/components/Canvas/index.tsx
-var import_shallow8 = require("zustand/react/shallow");
-var import_jsx_runtime38 = require("react/jsx-runtime");
+var import_jsx_runtime39 = require("react/jsx-runtime");
 var getClassName25 = get_class_name_factory_default("PuckCanvas", styles_module_default20);
 var ZOOM_ON_CHANGE = true;
 var Canvas = () => {
+  const { frameRef } = useCanvasFrame();
+  const resetAutoZoom = useResetAutoZoom(frameRef);
   const {
     dispatch,
     overrides,
@@ -7969,7 +8058,7 @@ var Canvas = () => {
     status,
     iframe
   } = useAppStore(
-    (0, import_shallow8.useShallow)((s) => ({
+    (0, import_shallow9.useShallow)((s) => ({
       dispatch: s.dispatch,
       overrides: s.overrides,
       setUi: s.setUi,
@@ -7979,24 +8068,32 @@ var Canvas = () => {
       iframe: s.iframe
     }))
   );
-  const { leftSideBarVisible, rightSideBarVisible, viewports } = useAppStore(
-    (0, import_shallow8.useShallow)((s) => ({
+  const {
+    leftSideBarVisible,
+    rightSideBarVisible,
+    leftSideBarWidth,
+    rightSideBarWidth,
+    viewports
+  } = useAppStore(
+    (0, import_shallow9.useShallow)((s) => ({
       leftSideBarVisible: s.state.ui.leftSideBarVisible,
       rightSideBarVisible: s.state.ui.rightSideBarVisible,
+      leftSideBarWidth: s.state.ui.leftSideBarWidth,
+      rightSideBarWidth: s.state.ui.rightSideBarWidth,
       viewports: s.state.ui.viewports
     }))
   );
-  const frameRef = (0, import_react50.useRef)(null);
-  const [showTransition, setShowTransition] = (0, import_react50.useState)(false);
-  const defaultRender = (0, import_react50.useMemo)(() => {
-    const PuckDefault = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(import_jsx_runtime38.Fragment, { children });
+  const [showTransition, setShowTransition] = (0, import_react51.useState)(false);
+  const isResettingZoomRef = (0, import_react51.useRef)(false);
+  const defaultRender = (0, import_react51.useMemo)(() => {
+    const PuckDefault = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(import_jsx_runtime39.Fragment, { children });
     return PuckDefault;
   }, []);
-  const CustomPreview = (0, import_react50.useMemo)(
+  const CustomPreview = (0, import_react51.useMemo)(
     () => overrides.preview || defaultRender,
     [overrides]
   );
-  const getFrameDimensions = (0, import_react50.useCallback)(() => {
+  const getFrameDimensions = (0, import_react51.useCallback)(() => {
     if (frameRef.current) {
       const frame = frameRef.current;
       const box = getBox(frame);
@@ -8004,68 +8101,78 @@ var Canvas = () => {
     }
     return { width: 0, height: 0 };
   }, [frameRef]);
-  const resetAutoZoom = (0, import_react50.useCallback)(
-    (newViewports = viewports) => {
-      if (frameRef.current) {
-        setZoomConfig(
-          getZoomConfig(
-            newViewports == null ? void 0 : newViewports.current,
-            frameRef.current,
-            zoomConfig.zoom
-          )
-        );
-      }
-    },
-    [frameRef, zoomConfig, viewports]
-  );
-  (0, import_react50.useEffect)(() => {
-    setShowTransition(false);
-    resetAutoZoom(viewports);
-  }, [frameRef, leftSideBarVisible, rightSideBarVisible]);
-  (0, import_react50.useEffect)(() => {
+  (0, import_react51.useEffect)(() => {
+    resetAutoZoom({
+      isResettingRef: isResettingZoomRef,
+      setShowTransition,
+      showTransition: false,
+      viewports
+    });
+  }, [
+    frameRef,
+    leftSideBarVisible,
+    rightSideBarVisible,
+    leftSideBarWidth,
+    rightSideBarWidth,
+    resetAutoZoom,
+    viewports
+  ]);
+  (0, import_react51.useEffect)(() => {
     const { height: frameHeight } = getFrameDimensions();
     if (viewports.current.height === "auto") {
       setZoomConfig(__spreadProps(__spreadValues({}, zoomConfig), {
         rootHeight: frameHeight / zoomConfig.zoom
       }));
     }
-  }, [zoomConfig.zoom]);
-  (0, import_react50.useEffect)(() => {
+  }, [zoomConfig.zoom, getFrameDimensions, setZoomConfig]);
+  (0, import_react51.useEffect)(() => {
     if (ZOOM_ON_CHANGE) {
-      setShowTransition(true);
-      resetAutoZoom(viewports);
+      resetAutoZoom({
+        isResettingRef: isResettingZoomRef,
+        setShowTransition,
+        showTransition: true,
+        viewports
+      });
     }
-  }, [viewports.current.width]);
-  (0, import_react50.useEffect)(() => {
+  }, [viewports.current.width, resetAutoZoom, viewports]);
+  (0, import_react51.useEffect)(() => {
     const cb = () => {
-      setShowTransition(false);
-      resetAutoZoom();
+      resetAutoZoom({
+        isResettingRef: isResettingZoomRef,
+        setShowTransition,
+        showTransition: false
+      });
     };
     window.addEventListener("resize", cb);
     return () => {
       window.removeEventListener("resize", cb);
     };
-  }, []);
-  const [showLoader, setShowLoader] = (0, import_react50.useState)(false);
-  (0, import_react50.useEffect)(() => {
+  }, [resetAutoZoom]);
+  const [showLoader, setShowLoader] = (0, import_react51.useState)(false);
+  (0, import_react51.useEffect)(() => {
     setTimeout(() => {
       setShowLoader(true);
     }, 500);
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(
     "div",
     {
       className: getClassName25({
         ready: status === "READY" || !iframe.enabled || !iframe.waitForStyles,
         showLoader
       }),
-      onClick: () => dispatch({
-        type: "setUi",
-        ui: { itemSelector: null },
-        recordHistory: true
-      }),
+      onClick: (e) => {
+        const el = e.target;
+        if (!el.hasAttribute("data-puck-component") && !el.hasAttribute("data-puck-dropzone")) {
+          dispatch({
+            type: "setUi",
+            ui: { itemSelector: null },
+            recordHistory: true
+          });
+        }
+      },
       children: [
-        viewports.controlsVisible && iframe.enabled && /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: getClassName25("controls"), children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
+        viewports.controlsVisible && iframe.enabled && /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: getClassName25("controls"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
           ViewportControls,
           {
             autoZoom: zoomConfig.autoZoom,
@@ -8082,7 +8189,12 @@ var Canvas = () => {
               };
               setUi(newUi);
               if (ZOOM_ON_CHANGE) {
-                resetAutoZoom(__spreadProps(__spreadValues({}, viewports), { current: uiViewport }));
+                resetAutoZoom({
+                  isResettingRef: isResettingZoomRef,
+                  setShowTransition,
+                  showTransition: true,
+                  viewports: __spreadProps(__spreadValues({}, viewports), { current: uiViewport })
+                });
               }
             },
             onZoom: (zoom) => {
@@ -8091,8 +8203,8 @@ var Canvas = () => {
             }
           }
         ) }),
-        /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)("div", { className: getClassName25("inner"), ref: frameRef, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: getClassName25("inner"), ref: frameRef, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
             "div",
             {
               className: getClassName25("root"),
@@ -8106,17 +8218,14 @@ var Canvas = () => {
               suppressHydrationWarning: true,
               id: "puck-canvas-root",
               onTransitionEnd: () => {
-                window.dispatchEvent(
-                  new CustomEvent("viewportchange", {
-                    bubbles: true,
-                    cancelable: false
-                  })
-                );
+                resetAutoZoom({
+                  isResettingRef: isResettingZoomRef
+                });
               },
-              children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(CustomPreview, { children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Preview2, {}) })
+              children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(CustomPreview, { children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Preview2, {}) })
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime38.jsx)("div", { className: getClassName25("loader"), children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Loader, { size: 24 }) })
+          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: getClassName25("loader"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Loader, { size: 24 }) })
         ] })
       ]
     }
@@ -8125,7 +8234,7 @@ var Canvas = () => {
 
 // lib/use-loaded-overrides.ts
 init_react_import();
-var import_react51 = require("react");
+var import_react52 = require("react");
 
 // lib/load-overrides.ts
 init_react_import();
@@ -8164,26 +8273,26 @@ var useLoadedOverrides = ({
   overrides,
   plugins
 }) => {
-  return (0, import_react51.useMemo)(() => {
+  return (0, import_react52.useMemo)(() => {
     return loadOverrides({ overrides, plugins });
   }, [plugins, overrides]);
 };
 
 // components/DefaultOverride/index.tsx
 init_react_import();
-var import_jsx_runtime39 = require("react/jsx-runtime");
-var DefaultOverride = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(import_jsx_runtime39.Fragment, { children });
+var import_jsx_runtime40 = require("react/jsx-runtime");
+var DefaultOverride = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(import_jsx_runtime40.Fragment, { children });
 
 // lib/use-inject-css.ts
 init_react_import();
-var import_react52 = require("react");
+var import_react53 = require("react");
 var styles = ``;
 var useInjectStyleSheet = (initialStyles, iframeEnabled) => {
-  const [el, setEl] = (0, import_react52.useState)();
-  (0, import_react52.useEffect)(() => {
+  const [el, setEl] = (0, import_react53.useState)();
+  (0, import_react53.useEffect)(() => {
     setEl(document.createElement("style"));
   }, []);
-  (0, import_react52.useEffect)(() => {
+  (0, import_react53.useEffect)(() => {
     var _a;
     if (!el || typeof window === "undefined") {
       return;
@@ -8203,10 +8312,10 @@ var useInjectGlobalCss = (iframeEnabled) => {
 
 // lib/use-preview-mode-hotkeys.ts
 init_react_import();
-var import_react53 = require("react");
+var import_react54 = require("react");
 var usePreviewModeHotkeys = () => {
   const appStore = useAppStoreApi();
-  const toggleInteractive = (0, import_react53.useCallback)(() => {
+  const toggleInteractive = (0, import_react54.useCallback)(() => {
     const dispatch = appStore.getState().dispatch;
     dispatch({
       type: "setUi",
@@ -8221,7 +8330,7 @@ var usePreviewModeHotkeys = () => {
 
 // lib/use-puck.ts
 init_react_import();
-var import_react54 = require("react");
+var import_react55 = require("react");
 var import_zustand6 = require("zustand");
 var generateUsePuck = (store) => {
   const history = {
@@ -8252,10 +8361,9 @@ var generateUsePuck = (store) => {
       return { zone: zoneCompound, index };
     }
   };
-  const get = () => storeData;
-  return __spreadProps(__spreadValues({}, storeData), { get });
+  return storeData;
 };
-var UsePuckStoreContext = (0, import_react54.createContext)(
+var UsePuckStoreContext = (0, import_react55.createContext)(
   null
 );
 var convertToPickedStore = (store) => {
@@ -8269,12 +8377,12 @@ var convertToPickedStore = (store) => {
   };
 };
 var useRegisterUsePuckStore = (appStore) => {
-  const [usePuckStore] = (0, import_react54.useState)(
+  const [usePuckStore] = (0, import_react55.useState)(
     () => (0, import_zustand6.createStore)(
       () => generateUsePuck(convertToPickedStore(appStore.getState()))
     )
   );
-  (0, import_react54.useEffect)(() => {
+  (0, import_react55.useEffect)(() => {
     return appStore.subscribe(
       (store) => convertToPickedStore(store),
       (pickedStore) => {
@@ -8286,7 +8394,7 @@ var useRegisterUsePuckStore = (appStore) => {
 };
 function createUsePuck() {
   return function usePuck2(selector) {
-    const usePuckApi = (0, import_react54.useContext)(UsePuckStoreContext);
+    const usePuckApi = (0, import_react55.useContext)(UsePuckStoreContext);
     if (!usePuckApi) {
       throw new Error("usePuck must be used inside <Puck>.");
     }
@@ -8298,7 +8406,7 @@ function createUsePuck() {
   };
 }
 function usePuck() {
-  (0, import_react54.useEffect)(() => {
+  (0, import_react55.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."
     );
@@ -8306,7 +8414,7 @@ function usePuck() {
   return createUsePuck()((s) => s);
 }
 function useGetPuck() {
-  const usePuckApi = (0, import_react54.useContext)(UsePuckStoreContext);
+  const usePuckApi = (0, import_react55.useContext)(UsePuckStoreContext);
   if (!usePuckApi) {
     throw new Error("usePuckGet must be used inside <Puck>.");
   }
@@ -8318,7 +8426,7 @@ var import_fast_deep_equal3 = __toESM(require("fast-deep-equal"));
 
 // components/Puck/components/Header/index.tsx
 init_react_import();
-var import_react55 = require("react");
+var import_react56 = require("react");
 
 // components/MenuBar/index.tsx
 init_react_import();
@@ -8328,7 +8436,7 @@ init_react_import();
 var styles_module_default21 = { "MenuBar": "_MenuBar_8pf8c_1", "MenuBar--menuOpen": "_MenuBar--menuOpen_8pf8c_14", "MenuBar-inner": "_MenuBar-inner_8pf8c_29", "MenuBar-history": "_MenuBar-history_8pf8c_45" };
 
 // components/MenuBar/index.tsx
-var import_jsx_runtime40 = require("react/jsx-runtime");
+var import_jsx_runtime41 = require("react/jsx-runtime");
 var getClassName26 = get_class_name_factory_default("MenuBar", styles_module_default21);
 function MenuBar({
   menuOpen = false,
@@ -8339,7 +8447,7 @@ function MenuBar({
   const forward = useAppStore((s) => s.history.forward);
   const hasFuture = useAppStore((s) => s.history.hasFuture());
   const hasPast = useAppStore((s) => s.history.hasPast());
-  return /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
     "div",
     {
       className: getClassName26({ menuOpen }),
@@ -8353,30 +8461,30 @@ function MenuBar({
           setMenuOpen(false);
         }
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)("div", { className: getClassName26("inner"), children: [
-        /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)("div", { className: getClassName26("history"), children: [
-          /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getClassName26("inner"), children: [
+        /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getClassName26("history"), children: [
+          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
             IconButton,
             {
               type: "button",
               title: "undo",
               disabled: !hasPast,
               onClick: back,
-              children: /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Undo2, { size: 21 })
+              children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Undo2, { size: 21 })
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
             IconButton,
             {
               type: "button",
               title: "redo",
               disabled: !hasFuture,
               onClick: forward,
-              children: /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Redo2, { size: 21 })
+              children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Redo2, { size: 21 })
             }
           )
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(import_jsx_runtime40.Fragment, { children: renderHeaderActions && renderHeaderActions() })
+        /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(import_jsx_runtime41.Fragment, { children: renderHeaderActions && renderHeaderActions() })
       ] })
     }
   );
@@ -8387,7 +8495,7 @@ init_react_import();
 var styles_module_default22 = { "PuckHeader": "_PuckHeader_15xnq_1", "PuckHeader-inner": "_PuckHeader-inner_15xnq_10", "PuckHeader-toggle": "_PuckHeader-toggle_15xnq_20", "PuckHeader--rightSideBarVisible": "_PuckHeader--rightSideBarVisible_15xnq_27", "PuckHeader-rightSideBarToggle": "_PuckHeader-rightSideBarToggle_15xnq_27", "PuckHeader--leftSideBarVisible": "_PuckHeader--leftSideBarVisible_15xnq_28", "PuckHeader-leftSideBarToggle": "_PuckHeader-leftSideBarToggle_15xnq_28", "PuckHeader-title": "_PuckHeader-title_15xnq_32", "PuckHeader-path": "_PuckHeader-path_15xnq_36", "PuckHeader-tools": "_PuckHeader-tools_15xnq_43", "PuckHeader-menuButton": "_PuckHeader-menuButton_15xnq_49", "PuckHeader--menuOpen": "_PuckHeader--menuOpen_15xnq_54" };
 
 // components/Puck/components/Header/index.tsx
-var import_jsx_runtime41 = require("react/jsx-runtime");
+var import_jsx_runtime42 = require("react/jsx-runtime");
 var getClassName27 = get_class_name_factory_default("PuckHeader", styles_module_default22);
 var HeaderInner = () => {
   const {
@@ -8400,7 +8508,7 @@ var HeaderInner = () => {
   } = usePropsContext();
   const dispatch = useAppStore((s) => s.dispatch);
   const appStore = useAppStoreApi();
-  const defaultHeaderRender = (0, import_react55.useMemo)(() => {
+  const defaultHeaderRender = (0, import_react56.useMemo)(() => {
     if (renderHeader) {
       console.warn(
         "`renderHeader` is deprecated. Please use `overrides.header` and the `usePuck` hook instead"
@@ -8409,13 +8517,13 @@ var HeaderInner = () => {
         var _b = _a, { actions } = _b, props = __objRest(_b, ["actions"]);
         const Comp = renderHeader;
         const appState = useAppStore((s) => s.state);
-        return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState, children: actions }));
+        return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState, children: actions }));
       };
       return RenderHeader;
     }
     return DefaultOverride;
   }, [renderHeader]);
-  const defaultHeaderActionsRender = (0, import_react55.useMemo)(() => {
+  const defaultHeaderActionsRender = (0, import_react56.useMemo)(() => {
     if (renderHeaderActions) {
       console.warn(
         "`renderHeaderActions` is deprecated. Please use `overrides.headerActions` and the `usePuck` hook instead."
@@ -8423,7 +8531,7 @@ var HeaderInner = () => {
       const RenderHeader = (props) => {
         const Comp = renderHeaderActions;
         const appState = useAppStore((s) => s.state);
-        return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState }));
+        return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState }));
       };
       return RenderHeader;
     }
@@ -8435,7 +8543,7 @@ var HeaderInner = () => {
   const CustomHeaderActions = useAppStore(
     (s) => s.overrides.headerActions || defaultHeaderActionsRender
   );
-  const [menuOpen, setMenuOpen] = (0, import_react55.useState)(false);
+  const [menuOpen, setMenuOpen] = (0, import_react56.useState)(false);
   const rootTitle = useAppStore((s) => {
     var _a, _b;
     const rootData = (_a = s.state.indexes.nodes["root"]) == null ? void 0 : _a.data;
@@ -8445,7 +8553,7 @@ var HeaderInner = () => {
   const rightSideBarVisible = useAppStore(
     (s) => s.state.ui.rightSideBarVisible
   );
-  const toggleSidebars = (0, import_react55.useCallback)(
+  const toggleSidebars = (0, import_react56.useCallback)(
     (sidebar) => {
       const widerViewport = window.matchMedia("(min-width: 638px)").matches;
       const sideBarVisible = sidebar === "left" ? leftSideBarVisible : rightSideBarVisible;
@@ -8459,27 +8567,27 @@ var HeaderInner = () => {
     },
     [dispatch, leftSideBarVisible, rightSideBarVisible]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
     CustomHeader,
     {
-      actions: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(import_jsx_runtime41.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(CustomHeaderActions, { children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+      actions: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(import_jsx_runtime42.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(CustomHeaderActions, { children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
         Button,
         {
           onClick: () => {
             const data = appStore.getState().state.data;
             onPublish && onPublish(data);
           },
-          icon: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Globe, { size: "14px" }),
+          icon: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Globe, { size: "14px" }),
           children: "Publish"
         }
       ) }) }),
-      children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
         "header",
         {
           className: getClassName27({ leftSideBarVisible, rightSideBarVisible }),
-          children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getClassName27("inner"), children: [
-            /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getClassName27("toggle"), children: [
-              /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: getClassName27("leftSideBarToggle"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+          children: /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: getClassName27("inner"), children: [
+            /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: getClassName27("toggle"), children: [
+              /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("div", { className: getClassName27("leftSideBarToggle"), children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
                 IconButton,
                 {
                   type: "button",
@@ -8487,10 +8595,10 @@ var HeaderInner = () => {
                     toggleSidebars("left");
                   },
                   title: "Toggle left sidebar",
-                  children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PanelLeft, { focusable: "false" })
+                  children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(PanelLeft, { focusable: "false" })
                 }
               ) }),
-              /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: getClassName27("rightSideBarToggle"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+              /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("div", { className: getClassName27("rightSideBarToggle"), children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
                 IconButton,
                 {
                   type: "button",
@@ -8498,19 +8606,19 @@ var HeaderInner = () => {
                     toggleSidebars("right");
                   },
                   title: "Toggle right sidebar",
-                  children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(PanelRight, { focusable: "false" })
+                  children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(PanelRight, { focusable: "false" })
                 }
               ) })
             ] }),
-            /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: getClassName27("title"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Heading, { rank: "2", size: "xs", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("div", { className: getClassName27("title"), children: /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Heading, { rank: "2", size: "xs", children: [
               headerTitle || rootTitle || "Page",
-              headerPath && /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(import_jsx_runtime41.Fragment, { children: [
+              headerPath && /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(import_jsx_runtime42.Fragment, { children: [
                 " ",
-                /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("code", { className: getClassName27("path"), children: headerPath })
+                /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("code", { className: getClassName27("path"), children: headerPath })
               ] })
             ] }) }),
-            /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)("div", { className: getClassName27("tools"), children: [
-              /* @__PURE__ */ (0, import_jsx_runtime41.jsx)("div", { className: getClassName27("menuButton"), children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+            /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: getClassName27("tools"), children: [
+              /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("div", { className: getClassName27("menuButton"), children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
                 IconButton,
                 {
                   type: "button",
@@ -8518,23 +8626,23 @@ var HeaderInner = () => {
                     return setMenuOpen(!menuOpen);
                   },
                   title: "Toggle menu bar",
-                  children: menuOpen ? /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(ChevronUp, { focusable: "false" }) : /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(ChevronDown, { focusable: "false" })
+                  children: menuOpen ? /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(ChevronUp, { focusable: "false" }) : /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(ChevronDown, { focusable: "false" })
                 }
               ) }),
-              /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+              /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
                 MenuBar,
                 {
                   dispatch,
                   onPublish,
                   menuOpen,
-                  renderHeaderActions: () => /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(CustomHeaderActions, { children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+                  renderHeaderActions: () => /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(CustomHeaderActions, { children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
                     Button,
                     {
                       onClick: () => {
                         const data = appStore.getState().state.data;
                         onPublish && onPublish(data);
                       },
-                      icon: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Globe, { size: "14px" }),
+                      icon: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Globe, { size: "14px" }),
                       children: "Publish"
                     }
                   ) }),
@@ -8548,11 +8656,203 @@ var HeaderInner = () => {
     }
   );
 };
-var Header = (0, import_react55.memo)(HeaderInner);
+var Header = (0, import_react56.memo)(HeaderInner);
+
+// components/Puck/components/Sidebar/index.tsx
+init_react_import();
+
+// components/Puck/components/ResizeHandle/index.tsx
+init_react_import();
+var import_react57 = require("react");
+
+// css-module:/home/runner/work/puck/puck/packages/core/components/Puck/components/ResizeHandle/styles.module.css#css-module
+init_react_import();
+var styles_module_default23 = { "ResizeHandle": "_ResizeHandle_v7w0r_1", "ResizeHandle--left": "_ResizeHandle--left_v7w0r_15", "ResizeHandle--right": "_ResizeHandle--right_v7w0r_19" };
+
+// components/Puck/components/ResizeHandle/index.tsx
+var import_jsx_runtime43 = require("react/jsx-runtime");
+var getClassName28 = get_class_name_factory_default("ResizeHandle", styles_module_default23);
+var ResizeHandle = ({
+  position,
+  sidebarRef,
+  onResize,
+  onResizeEnd
+}) => {
+  const { frameRef } = useCanvasFrame();
+  const resetAutoZoom = useResetAutoZoom(frameRef);
+  const handleRef = (0, import_react57.useRef)(null);
+  const isDragging = (0, import_react57.useRef)(false);
+  const startX = (0, import_react57.useRef)(0);
+  const startWidth = (0, import_react57.useRef)(0);
+  const handleMouseMove = (0, import_react57.useCallback)(
+    (e) => {
+      if (!isDragging.current) return;
+      const delta = e.clientX - startX.current;
+      const newWidth = position === "left" ? startWidth.current + delta : startWidth.current - delta;
+      const width = Math.max(192, newWidth);
+      onResize(width);
+      e.preventDefault();
+    },
+    [onResize, position]
+  );
+  const handleMouseUp = (0, import_react57.useCallback)(() => {
+    var _a;
+    if (!isDragging.current) return;
+    isDragging.current = false;
+    document.body.style.cursor = "";
+    document.body.style.userSelect = "";
+    const overlay = document.getElementById("resize-overlay");
+    if (overlay) {
+      document.body.removeChild(overlay);
+    }
+    document.removeEventListener("mousemove", handleMouseMove);
+    document.removeEventListener("mouseup", handleMouseUp);
+    const finalWidth = ((_a = sidebarRef.current) == null ? void 0 : _a.getBoundingClientRect().width) || 0;
+    onResizeEnd(finalWidth);
+    resetAutoZoom();
+  }, [onResizeEnd, resetAutoZoom]);
+  const handleMouseDown = (0, import_react57.useCallback)(
+    (e) => {
+      var _a;
+      isDragging.current = true;
+      startX.current = e.clientX;
+      startWidth.current = ((_a = sidebarRef.current) == null ? void 0 : _a.getBoundingClientRect().width) || 0;
+      document.body.style.cursor = "col-resize";
+      document.body.style.userSelect = "none";
+      const overlay = document.createElement("div");
+      overlay.id = "resize-overlay";
+      overlay.setAttribute("data-resize-overlay", "");
+      document.body.appendChild(overlay);
+      document.addEventListener("mousemove", handleMouseMove);
+      document.addEventListener("mouseup", handleMouseUp);
+      e.preventDefault();
+    },
+    [position, handleMouseMove, handleMouseUp]
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(
+    "div",
+    {
+      ref: handleRef,
+      className: getClassName28({ [position]: true }),
+      onMouseDown: handleMouseDown
+    }
+  );
+};
+
+// css-module:/home/runner/work/puck/puck/packages/core/components/Puck/components/Sidebar/styles.module.css#css-module
+init_react_import();
+var styles_module_default24 = { "Sidebar": "_Sidebar_1xksb_1", "Sidebar--left": "_Sidebar--left_1xksb_8", "Sidebar--right": "_Sidebar--right_1xksb_14", "Sidebar-resizeHandle": "_Sidebar-resizeHandle_1xksb_20" };
+
+// components/Puck/components/Sidebar/index.tsx
+var import_jsx_runtime44 = require("react/jsx-runtime");
+var getClassName29 = get_class_name_factory_default("Sidebar", styles_module_default24);
+var Sidebar = ({
+  position,
+  sidebarRef,
+  isVisible,
+  width,
+  onResize,
+  onResizeEnd,
+  children
+}) => {
+  if (!isVisible) return null;
+  return /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(import_jsx_runtime44.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("div", { ref: sidebarRef, className: getClassName29({ [position]: true }), children }),
+    /* @__PURE__ */ (0, import_jsx_runtime44.jsx)("div", { className: `${getClassName29("resizeHandle")}`, children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(
+      ResizeHandle,
+      {
+        position,
+        sidebarRef,
+        onResize,
+        onResizeEnd
+      }
+    ) })
+  ] });
+};
+
+// lib/use-sidebar-resize.ts
+init_react_import();
+var import_react58 = require("react");
+function useSidebarResize(position, dispatch) {
+  const [width, setWidth] = (0, import_react58.useState)(null);
+  const sidebarRef = (0, import_react58.useRef)(null);
+  const storeWidth = useAppStore(
+    (s) => position === "left" ? s.state.ui.leftSideBarWidth : s.state.ui.rightSideBarWidth
+  );
+  (0, import_react58.useEffect)(() => {
+    if (typeof window !== "undefined" && !storeWidth) {
+      try {
+        const savedWidths = localStorage.getItem("puck-sidebar-widths");
+        if (savedWidths) {
+          const widths = JSON.parse(savedWidths);
+          const savedWidth = widths[position];
+          if (savedWidth) {
+            dispatch({
+              type: "setUi",
+              ui: {
+                [position === "left" ? "leftSideBarWidth" : "rightSideBarWidth"]: savedWidth
+              }
+            });
+          }
+        }
+      } catch (error) {
+        console.error(
+          `Failed to load ${position} sidebar width from localStorage`,
+          error
+        );
+      }
+    }
+  }, [dispatch, position, storeWidth]);
+  (0, import_react58.useEffect)(() => {
+    if (storeWidth !== void 0) {
+      setWidth(storeWidth);
+    }
+  }, [storeWidth]);
+  const handleResizeEnd = (0, import_react58.useCallback)(
+    (width2) => {
+      dispatch({
+        type: "setUi",
+        ui: {
+          [position === "left" ? "leftSideBarWidth" : "rightSideBarWidth"]: width2
+        }
+      });
+      let widths = {};
+      try {
+        const savedWidths = localStorage.getItem("puck-sidebar-widths");
+        widths = savedWidths ? JSON.parse(savedWidths) : {};
+      } catch (error) {
+        console.error(
+          `Failed to save ${position} sidebar width to localStorage`,
+          error
+        );
+      } finally {
+        localStorage.setItem(
+          "puck-sidebar-widths",
+          JSON.stringify(__spreadProps(__spreadValues({}, widths), {
+            [position]: width2
+          }))
+        );
+      }
+      window.dispatchEvent(
+        new CustomEvent("viewportchange", {
+          bubbles: true,
+          cancelable: false
+        })
+      );
+    },
+    [dispatch, position]
+  );
+  return {
+    width,
+    setWidth,
+    sidebarRef,
+    handleResizeEnd
+  };
+}
 
 // components/Puck/index.tsx
-var import_jsx_runtime42 = require("react/jsx-runtime");
-var getClassName28 = get_class_name_factory_default("Puck", styles_module_default14);
+var import_jsx_runtime45 = require("react/jsx-runtime");
+var getClassName30 = get_class_name_factory_default("Puck", styles_module_default14);
 var getLayoutClassName = get_class_name_factory_default("PuckLayout", styles_module_default14);
 var FieldSideBar = () => {
   const title = useAppStore(
@@ -8561,13 +8861,13 @@ var FieldSideBar = () => {
       return s.selectedItem ? (_b = (_a = s.config.components[s.selectedItem.type]) == null ? void 0 : _a["label"]) != null ? _b : s.selectedItem.type.toString() : "Page";
     }
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(SidebarSection, { noPadding: true, noBorderTop: true, showBreadcrumbs: true, title, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Fields, {}) });
+  return /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(SidebarSection, { noPadding: true, noBorderTop: true, showBreadcrumbs: true, title, children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(Fields, {}) });
 };
-var propsContext = (0, import_react56.createContext)({});
+var propsContext = (0, import_react59.createContext)({});
 function PropsProvider(props) {
-  return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(propsContext.Provider, { value: props, children: props.children });
+  return /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(propsContext.Provider, { value: props, children: props.children });
 }
-var usePropsContext = () => (0, import_react56.useContext)(propsContext);
+var usePropsContext = () => (0, import_react59.useContext)(propsContext);
 function PuckProvider({ children }) {
   const {
     config,
@@ -8583,14 +8883,14 @@ function PuckProvider({ children }) {
     metadata,
     onAction
   } = usePropsContext();
-  const iframe = (0, import_react56.useMemo)(
+  const iframe = (0, import_react59.useMemo)(
     () => __spreadValues({
       enabled: true,
       waitForStyles: true
     }, _iframe),
     [_iframe]
   );
-  const [generatedAppState] = (0, import_react56.useState)(() => {
+  const [generatedAppState] = (0, import_react59.useState)(() => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const initial = __spreadValues(__spreadValues({}, defaultAppState.ui), initialUi);
     let clientUiState = {};
@@ -8619,7 +8919,7 @@ function PuckProvider({ children }) {
       }
     }
     if (Object.keys((initialData == null ? void 0 : initialData.root) || {}).length > 0 && !((_g = initialData == null ? void 0 : initialData.root) == null ? void 0 : _g.props)) {
-      console.error(
+      console.warn(
         "Warning: Defining props on `root` is deprecated. Please use `root.props`, or republish this page to migrate automatically."
       );
     }
@@ -8650,7 +8950,7 @@ function PuckProvider({ children }) {
     return walkAppState(newAppState, config);
   });
   const { appendData = true } = _initialHistory || {};
-  const [blendedHistories] = (0, import_react56.useState)(
+  const [blendedHistories] = (0, import_react59.useState)(
     [
       ...(_initialHistory == null ? void 0 : _initialHistory.histories) || [],
       ...appendData ? [{ state: generatedAppState }] : []
@@ -8670,7 +8970,7 @@ function PuckProvider({ children }) {
     overrides,
     plugins
   });
-  const generateAppStore = (0, import_react56.useCallback)(
+  const generateAppStore = (0, import_react59.useCallback)(
     (state) => {
       return {
         state,
@@ -8694,15 +8994,15 @@ function PuckProvider({ children }) {
       metadata
     ]
   );
-  const [appStore] = (0, import_react56.useState)(
+  const [appStore] = (0, import_react59.useState)(
     () => createAppStore(generateAppStore(initialAppState))
   );
-  (0, import_react56.useEffect)(() => {
+  (0, import_react59.useEffect)(() => {
     if (process.env.NODE_ENV !== "production") {
       window.__PUCK_INTERNAL_DO_NOT_USE = { appStore };
     }
   }, [appStore]);
-  (0, import_react56.useEffect)(() => {
+  (0, import_react59.useEffect)(() => {
     const state = appStore.getState().state;
     appStore.setState(__spreadValues({}, generateAppStore(state)));
   }, [config, plugins, loadedOverrides, viewports, iframe, onAction, metadata]);
@@ -8711,8 +9011,8 @@ function PuckProvider({ children }) {
     index: initialHistoryIndex,
     initialAppState
   });
-  const previousData = (0, import_react56.useRef)(null);
-  (0, import_react56.useEffect)(() => {
+  const previousData = (0, import_react59.useRef)(null);
+  (0, import_react59.useEffect)(() => {
     appStore.subscribe(
       (s) => s.state.data,
       (data) => {
@@ -8726,11 +9026,11 @@ function PuckProvider({ children }) {
   }, []);
   useRegisterPermissionsSlice(appStore, permissions);
   const uPuckStore = useRegisterUsePuckStore(appStore);
-  (0, import_react56.useEffect)(() => {
+  (0, import_react59.useEffect)(() => {
     const { resolveAndCommitData } = appStore.getState();
     resolveAndCommitData();
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(appStoreContext.Provider, { value: appStore, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(UsePuckStoreContext.Provider, { value: uPuckStore, children }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(appStoreContext.Provider, { value: appStore, children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(UsePuckStoreContext.Provider, { value: uPuckStore, children }) });
 }
 function PuckLayout({ children }) {
   const {
@@ -8738,7 +9038,7 @@ function PuckLayout({ children }) {
     dnd,
     initialHistory: _initialHistory
   } = usePropsContext();
-  const iframe = (0, import_react56.useMemo)(
+  const iframe = (0, import_react59.useMemo)(
     () => __spreadValues({
       enabled: true,
       waitForStyles: true
@@ -8746,12 +9046,24 @@ function PuckLayout({ children }) {
     [_iframe]
   );
   useInjectGlobalCss(iframe.enabled);
+  const dispatch = useAppStore((s) => s.dispatch);
   const leftSideBarVisible = useAppStore((s) => s.state.ui.leftSideBarVisible);
   const rightSideBarVisible = useAppStore(
     (s) => s.state.ui.rightSideBarVisible
   );
-  const dispatch = useAppStore((s) => s.dispatch);
-  (0, import_react56.useEffect)(() => {
+  const {
+    width: leftWidth,
+    setWidth: setLeftWidth,
+    sidebarRef: leftSidebarRef,
+    handleResizeEnd: handleLeftSidebarResizeEnd
+  } = useSidebarResize("left", dispatch);
+  const {
+    width: rightWidth,
+    setWidth: setRightWidth,
+    sidebarRef: rightSidebarRef,
+    handleResizeEnd: handleRightSidebarResizeEnd
+  } = useSidebarResize("right", dispatch);
+  (0, import_react59.useEffect)(() => {
     if (!window.matchMedia("(min-width: 638px)").matches) {
       dispatch({
         type: "setUi",
@@ -8775,17 +9087,17 @@ function PuckLayout({ children }) {
     };
   }, []);
   const overrides = useAppStore((s) => s.overrides);
-  const CustomPuck = (0, import_react56.useMemo)(
+  const CustomPuck = (0, import_react59.useMemo)(
     () => overrides.puck || DefaultOverride,
     [overrides]
   );
-  const [mounted, setMounted] = (0, import_react56.useState)(false);
-  (0, import_react56.useEffect)(() => {
+  const [mounted, setMounted] = (0, import_react59.useState)(false);
+  (0, import_react59.useEffect)(() => {
     setMounted(true);
   }, []);
   const ready = useAppStore((s) => s.status === "READY");
   useMonitorHotkeys();
-  (0, import_react56.useEffect)(() => {
+  (0, import_react59.useEffect)(() => {
     if (ready && iframe.enabled) {
       const frameDoc = getFrame();
       if (frameDoc) {
@@ -8794,8 +9106,8 @@ function PuckLayout({ children }) {
     }
   }, [ready, iframe.enabled]);
   usePreviewModeHotkeys();
-  return /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: `Puck ${getClassName28()}`, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(DragDropContext, { disableAutoScroll: dnd == null ? void 0 : dnd.disableAutoScroll, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(CustomPuck, { children: children || /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)("div", { className: `Puck ${getClassName30()}`, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(DragDropContext, { disableAutoScroll: dnd == null ? void 0 : dnd.disableAutoScroll, children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(CustomPuck, { children: children || /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(FrameProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(
       "div",
       {
         className: getLayoutClassName({
@@ -8803,22 +9115,57 @@ function PuckLayout({ children }) {
           mounted,
           rightSideBarVisible
         }),
-        children: /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: getLayoutClassName("inner"), children: [
-          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Header, {}),
-          /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)("div", { className: getLayoutClassName("leftSideBar"), children: [
-            /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(SidebarSection, { title: "Components", noBorderTop: true, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Components, {}) }),
-            /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(SidebarSection, { title: "Outline", children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Outline, {}) })
-          ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Canvas, {}),
-          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("div", { className: getLayoutClassName("rightSideBar"), children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(FieldSideBar, {}) })
-        ] })
+        children: /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)(
+          "div",
+          {
+            className: getLayoutClassName("inner"),
+            style: {
+              gridTemplateColumns: `
+                    ${leftSideBarVisible ? leftWidth ? `${leftWidth}px` : "var(--puck-side-bar-width)" : "0"} 
+                    var(--puck-frame-width) 
+                    ${rightSideBarVisible ? rightWidth ? `${rightWidth}px` : "var(--puck-side-bar-width)" : "0"}
+                  `
+            },
+            children: [
+              /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(Header, {}),
+              /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)(
+                Sidebar,
+                {
+                  position: "left",
+                  sidebarRef: leftSidebarRef,
+                  isVisible: leftSideBarVisible,
+                  width: leftWidth,
+                  onResize: setLeftWidth,
+                  onResizeEnd: handleLeftSidebarResizeEnd,
+                  children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(SidebarSection, { title: "Components", noBorderTop: true, children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(Components, {}) }),
+                    /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(SidebarSection, { title: "Outline", children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(Outline, {}) })
+                  ]
+                }
+              ),
+              /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(Canvas, {}),
+              /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(
+                Sidebar,
+                {
+                  position: "right",
+                  sidebarRef: rightSidebarRef,
+                  isVisible: rightSideBarVisible,
+                  width: rightWidth,
+                  onResize: setRightWidth,
+                  onResizeEnd: handleRightSidebarResizeEnd,
+                  children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(FieldSideBar, {})
+                }
+              )
+            ]
+          }
+        )
       }
-    ) }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)("div", { id: "puck-portal-root", className: getClassName28("portal") })
+    ) }) }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime45.jsx)("div", { id: "puck-portal-root", className: getClassName30("portal") })
   ] });
 }
 function Puck(props) {
-  return /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(PropsProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(PuckProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(PuckLayout, __spreadValues({}, props)) })) }));
+  return /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(PropsProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(PuckProvider, __spreadProps(__spreadValues({}, props), { children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(PuckLayout, __spreadValues({}, props)) })) }));
 }
 Puck.Components = Components;
 Puck.Fields = Fields;
@@ -8987,6 +9334,36 @@ function transformProps(data, propTransforms, config = { components: {} }) {
   return updatedData;
 }
 
+// lib/overlay-portal/index.tsx
+init_react_import();
+var registerOverlayPortal = (el, opts = {}) => {
+  if (!el) return;
+  const { disableDrag = true } = opts;
+  const stopPropagation = (e) => {
+    e.stopPropagation();
+  };
+  el.addEventListener("mouseover", stopPropagation, {
+    capture: true
+  });
+  if (disableDrag) {
+    el.addEventListener("pointerdown", stopPropagation, {
+      capture: true
+    });
+  }
+  el.setAttribute("data-puck-overlay-portal", "true");
+  return () => {
+    el.removeEventListener("mouseover", stopPropagation, {
+      capture: true
+    });
+    if (disableDrag) {
+      el.removeEventListener("pointerdown", stopPropagation, {
+        capture: true
+      });
+    }
+    el.removeAttribute("data-puck-overlay-portal");
+  };
+};
+
 // lib/resolve-all-data.ts
 init_react_import();
 
@@ -9065,6 +9442,7 @@ function resolveAllData(_0, _1) {
   createUsePuck,
   migrate,
   overrideKeys,
+  registerOverlayPortal,
   renderContext,
   resolveAllData,
   transformProps,