@measured/puck 0.18.0-canary.d253d54 → 0.18.0-canary.e2139f5

package/dist/index.js

@@ -308,10 +308,10 @@ init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/AutoField/styles.module.css#css-module
 init_react_import();
-var styles_module_default2 = { "InputWrapper": "_InputWrapper_1l5m8_1", "Input": "_Input_1l5m8_1", "Input-label": "_Input-label_1l5m8_26", "Input-labelIcon": "_Input-labelIcon_1l5m8_35", "Input-disabledIcon": "_Input-disabledIcon_1l5m8_42", "Input-input": "_Input-input_1l5m8_47", "Input--readOnly": "_Input--readOnly_1l5m8_91", "Input-radioGroupItems": "_Input-radioGroupItems_1l5m8_102", "Input-radio": "_Input-radio_1l5m8_102", "Input-radioInner": "_Input-radioInner_1l5m8_119", "Input-radioInput": "_Input-radioInput_1l5m8_164" };
+var styles_module_default2 = { "InputWrapper": "_InputWrapper_1h1p1_1", "Input-label": "_Input-label_1h1p1_5", "Input-labelIcon": "_Input-labelIcon_1h1p1_14", "Input-disabledIcon": "_Input-disabledIcon_1h1p1_21", "Input-input": "_Input-input_1h1p1_26", "Input": "_Input_1h1p1_1", "Input--readOnly": "_Input--readOnly_1h1p1_70", "Input-radioGroupItems": "_Input-radioGroupItems_1h1p1_81", "Input-radio": "_Input-radio_1h1p1_81", "Input-radioInner": "_Input-radioInner_1h1p1_98", "Input-radioInput": "_Input-radioInput_1h1p1_143" };
 
 // components/AutoField/index.tsx
-var import_react19 = require("react");
+var import_react20 = require("react");
 
 // components/AutoField/fields/index.tsx
 init_react_import();
@@ -771,7 +771,7 @@ var IconButton = ({
 };
 
 // components/AutoField/fields/ArrayField/index.tsx
-var import_react11 = require("react");
+var import_react12 = require("react");
 
 // components/DragIcon/index.tsx
 init_react_import();
@@ -988,13 +988,11 @@ var resolveComponentData = (item, config, onResolveStart, onResolveEnd) => __asy
       onResolveStart(item);
     }
     const { props: resolvedProps, readOnly = {} } = yield configForItem.resolveData(item, { changed, lastData: oldItem });
-    const { readOnly: existingReadOnly = {} } = item || {};
-    const newReadOnly = __spreadValues(__spreadValues({}, existingReadOnly), readOnly);
     const resolvedItem = __spreadProps(__spreadValues({}, item), {
       props: __spreadValues(__spreadValues({}, item.props), resolvedProps)
     });
-    if (Object.keys(newReadOnly).length) {
-      resolvedItem.readOnly = newReadOnly;
+    if (Object.keys(readOnly).length) {
+      resolvedItem.readOnly = readOnly;
     }
     cache.lastChange[item.props.id] = {
       item,
@@ -1161,6 +1159,7 @@ var defaultAppState = {
     itemSelector: null,
     componentList: {},
     isDragging: false,
+    previewMode: "edit",
     viewports: {
       current: {
         width: defaultViewports[0].width,
@@ -1283,7 +1282,7 @@ init_react_import();
 var import_react9 = require("@dnd-kit/react");
 var import_react10 = require("react");
 
-// lib/dnd-kit/safe.ts
+// lib/dnd/dnd-kit/safe.ts
 init_react_import();
 var import_react8 = require("@dnd-kit/react");
 var import_sortable = require("@dnd-kit/react/sortable");
@@ -1360,8 +1359,53 @@ var Sortable = ({
   return children({ status, ref: sortableRef });
 };
 
-// components/AutoField/fields/ArrayField/index.tsx
+// components/AutoField/context.tsx
+init_react_import();
+var import_react11 = require("react");
 var import_jsx_runtime7 = require("react/jsx-runtime");
+var NestedFieldContext = (0, import_react11.createContext)({});
+var useNestedFieldContext = () => {
+  const context = (0, import_react11.useContext)(NestedFieldContext);
+  return __spreadProps(__spreadValues({}, context), {
+    readOnlyFields: context.readOnlyFields || {}
+  });
+};
+var NestedFieldProvider = ({
+  children,
+  name,
+  subName,
+  wildcardName = name,
+  readOnlyFields
+}) => {
+  const subPath = `${name}.${subName}`;
+  const wildcardSubPath = `${wildcardName}.${subName}`;
+  const subReadOnlyFields = (0, import_react11.useMemo)(
+    () => Object.keys(readOnlyFields).reduce((acc, readOnlyKey) => {
+      const isLocal = readOnlyKey.indexOf(subPath) > -1 || readOnlyKey.indexOf(wildcardSubPath) > -1;
+      if (isLocal) {
+        const subPathPattern = new RegExp(
+          `^(${name}|${wildcardName}).`.replace(/\[/g, "\\[").replace(/\]/g, "\\]").replace(/\./g, "\\.").replace(/\*/g, "\\*")
+        );
+        const localName = readOnlyKey.replace(subPathPattern, "");
+        return __spreadProps(__spreadValues({}, acc), {
+          [localName]: readOnlyFields[readOnlyKey]
+        });
+      }
+      return acc;
+    }, {}),
+    [name, subName, wildcardName, readOnlyFields]
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+    NestedFieldContext.Provider,
+    {
+      value: { readOnlyFields: subReadOnlyFields, localName: subName },
+      children
+    }
+  );
+};
+
+// components/AutoField/fields/ArrayField/index.tsx
+var import_jsx_runtime8 = require("react/jsx-runtime");
 var getClassName5 = get_class_name_factory_default("ArrayField", styles_module_default3);
 var getClassNameItem = get_class_name_factory_default("ArrayFieldItem", styles_module_default3);
 var ArrayField = ({
@@ -1372,10 +1416,10 @@ var ArrayField = ({
   label,
   readOnly,
   id,
-  Label: Label2 = (props) => /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("div", __spreadValues({}, props))
+  Label: Label2 = (props) => /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("div", __spreadValues({}, props))
 }) => {
   const { state, setUi, selectedItem, getPermissions } = useAppContext();
-  const readOnlyFields = (selectedItem == null ? void 0 : selectedItem.readOnly) || {};
+  const { readOnlyFields, localName = name } = useNestedFieldContext();
   const value = _value;
   const arrayState = state.ui.arrayState[id] || {
     items: Array.from(value || []).map((item, idx) => {
@@ -1386,11 +1430,11 @@ var ArrayField = ({
     }),
     openId: ""
   };
-  const [localState, setLocalState] = (0, import_react11.useState)({ arrayState, value });
-  (0, import_react11.useEffect)(() => {
+  const [localState, setLocalState] = (0, import_react12.useState)({ arrayState, value });
+  (0, import_react12.useEffect)(() => {
     setLocalState({ arrayState, value });
   }, [value, state.ui.arrayState[id]]);
-  const mapArrayStateToUi = (0, import_react11.useCallback)(
+  const mapArrayStateToUi = (0, import_react12.useCallback)(
     (partialArrayState) => {
       return {
         arrayState: __spreadProps(__spreadValues({}, state.ui.arrayState), {
@@ -1400,13 +1444,13 @@ var ArrayField = ({
     },
     [arrayState]
   );
-  const getHighestIndex = (0, import_react11.useCallback)(() => {
+  const getHighestIndex = (0, import_react12.useCallback)(() => {
     return arrayState.items.reduce(
       (acc, item) => item._originalIndex > acc ? item._originalIndex : acc,
       -1
     );
   }, [arrayState]);
-  const regenerateArrayState = (0, import_react11.useCallback)(
+  const regenerateArrayState = (0, import_react12.useCallback)(
     (value2) => {
       let highestIndex = getHighestIndex();
       const newItems = Array.from(value2 || []).map((item, idx) => {
@@ -1425,7 +1469,7 @@ var ArrayField = ({
     },
     [arrayState]
   );
-  (0, import_react11.useEffect)(() => {
+  (0, import_react12.useEffect)(() => {
     if (arrayState.items.length > 0) {
       setUi(mapArrayStateToUi(arrayState));
     }
@@ -1435,14 +1479,14 @@ var ArrayField = ({
     return null;
   }
   const addDisabled = field.max !== void 0 && localState.arrayState.items.length >= field.max || readOnly;
-  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
     Label2,
     {
       label: label || name,
-      icon: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(List, { size: 16 }),
+      icon: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(List, { size: 16 }),
       el: "div",
       readOnly,
-      children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
         SortableProvider,
         {
           onMove: (move) => {
@@ -1464,7 +1508,7 @@ var ArrayField = ({
               arrayState: __spreadProps(__spreadValues({}, arrayState), { items: newArrayStateItems })
             });
           },
-          children: /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(
+          children: /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(
             "div",
             {
               className: getClassName5({
@@ -1478,13 +1522,13 @@ var ArrayField = ({
                 localState.arrayState.items.map((item, i) => {
                   const { _arrayId = `${id}-${i}`, _originalIndex = i } = item;
                   const data = Array.from(localState.value || [])[i] || {};
-                  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+                  return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
                     Sortable,
                     {
                       id: _arrayId,
                       index: i,
                       disabled: readOnly,
-                      children: ({ status, ref }) => /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(
+                      children: ({ status, ref }) => /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(
                         "div",
                         {
                           ref,
@@ -1494,7 +1538,7 @@ var ArrayField = ({
                             readOnly
                           }),
                           children: [
-                            /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(
+                            /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(
                               "div",
                               {
                                 onClick: (e) => {
@@ -1517,9 +1561,9 @@ var ArrayField = ({
                                 className: getClassNameItem("summary"),
                                 children: [
                                   field.getItemSummary ? field.getItemSummary(data, i) : `Item #${_originalIndex}`,
-                                  /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)("div", { className: getClassNameItem("rhs"), children: [
-                                    !readOnly && /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)("div", { className: getClassNameItem("actions"), children: [
-                                      /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("div", { className: getClassNameItem("action"), children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+                                  /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)("div", { className: getClassNameItem("rhs"), children: [
+                                    !readOnly && /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)("div", { className: getClassNameItem("actions"), children: [
+                                      /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("div", { className: getClassNameItem("action"), children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
                                         IconButton,
                                         {
                                           type: "button",
@@ -1536,10 +1580,10 @@ var ArrayField = ({
                                             );
                                           },
                                           title: "Duplicate",
-                                          children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(Copy, { size: 16 })
+                                          children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Copy, { size: 16 })
                                         }
                                       ) }),
-                                      /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("div", { className: getClassNameItem("action"), children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+                                      /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("div", { className: getClassNameItem("action"), children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
                                         IconButton,
                                         {
                                           type: "button",
@@ -1560,39 +1604,56 @@ var ArrayField = ({
                                             );
                                           },
                                           title: "Delete",
-                                          children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(Trash, { size: 16 })
+                                          children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Trash, { size: 16 })
                                         }
                                       ) })
                                     ] }),
-                                    /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(DragIcon, {}) })
+                                    /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(DragIcon, {}) })
                                   ] })
                                 ]
                               }
                             ),
-                            /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("div", { className: getClassNameItem("body"), children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("fieldset", { className: getClassNameItem("fieldset"), children: Object.keys(field.arrayFields).map((fieldName) => {
-                              const subField = field.arrayFields[fieldName];
-                              const subFieldName = `${name}[${i}].${fieldName}`;
-                              const wildcardFieldName = `${name}[*].${fieldName}`;
-                              const subReadOnly = forceReadOnly ? forceReadOnly : typeof readOnlyFields[subFieldName] !== "undefined" ? readOnlyFields[subFieldName] : readOnlyFields[wildcardFieldName];
-                              return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
-                                AutoFieldPrivate,
+                            /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("div", { className: getClassNameItem("body"), children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("fieldset", { className: getClassNameItem("fieldset"), children: Object.keys(field.arrayFields).map((subName) => {
+                              const subField = field.arrayFields[subName];
+                              const indexName = `${name}[${i}]`;
+                              const subPath = `${indexName}.${subName}`;
+                              const localIndexName = `${localName}[${i}]`;
+                              const localWildcardName = `${localName}[*]`;
+                              const localSubPath = `${localIndexName}.${subName}`;
+                              const localWildcardSubPath = `${localWildcardName}.${subName}`;
+                              const subReadOnly = forceReadOnly ? forceReadOnly : typeof readOnlyFields[subPath] !== "undefined" ? readOnlyFields[localSubPath] : readOnlyFields[localWildcardSubPath];
+                              const label2 = subField.label || subName;
+                              return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
+                                NestedFieldProvider,
                                 {
-                                  name: subFieldName,
-                                  label: subField.label || fieldName,
-                                  id: `${_arrayId}_${fieldName}`,
-                                  readOnly: subReadOnly,
-                                  field: subField,
-                                  value: data[fieldName],
-                                  onChange: (val, ui) => {
-                                    onChange(
-                                      replace(value, i, __spreadProps(__spreadValues({}, data), {
-                                        [fieldName]: val
-                                      })),
-                                      ui
-                                    );
-                                  }
+                                  name: localIndexName,
+                                  wildcardName: localWildcardName,
+                                  subName,
+                                  readOnlyFields,
+                                  children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
+                                    AutoFieldPrivate,
+                                    {
+                                      name: subPath,
+                                      label: label2,
+                                      id: `${_arrayId}_${subName}`,
+                                      readOnly: subReadOnly,
+                                      field: __spreadProps(__spreadValues({}, subField), {
+                                        label: label2
+                                        // May be used by custom fields
+                                      }),
+                                      value: data[subName],
+                                      onChange: (val, ui) => {
+                                        onChange(
+                                          replace(value, i, __spreadProps(__spreadValues({}, data), {
+                                            [subName]: val
+                                          })),
+                                          ui
+                                        );
+                                      }
+                                    }
+                                  )
                                 },
-                                subFieldName
+                                subPath
                               );
                             }) }) })
                           ]
@@ -1602,7 +1663,7 @@ var ArrayField = ({
                     _arrayId
                   );
                 }),
-                !addDisabled && /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+                !addDisabled && /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
                   "button",
                   {
                     type: "button",
@@ -1616,7 +1677,7 @@ var ArrayField = ({
                       const newArrayState = regenerateArrayState(newValue);
                       onChange(newValue, mapArrayStateToUi(newArrayState));
                     },
-                    children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(Plus, { size: 21 })
+                    children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Plus, { size: 21 })
                   }
                 )
               ]
@@ -1630,28 +1691,29 @@ var ArrayField = ({
 
 // components/AutoField/fields/DefaultField/index.tsx
 init_react_import();
-var import_jsx_runtime8 = require("react/jsx-runtime");
+var import_jsx_runtime9 = require("react/jsx-runtime");
 var getClassName6 = get_class_name_factory_default("Input", styles_module_default2);
 var DefaultField = ({
   field,
   onChange,
   readOnly,
-  value,
+  value: _value,
   name,
   label,
   Label: Label2,
   id
 }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
+  const value = _value;
+  return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
     Label2,
     {
       label: label || name,
-      icon: /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(import_jsx_runtime8.Fragment, { children: [
-        field.type === "text" && /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Type, { size: 16 }),
-        field.type === "number" && /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(Hash, { size: 16 })
+      icon: /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(import_jsx_runtime9.Fragment, { children: [
+        field.type === "text" && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(Type, { size: 16 }),
+        field.type === "number" && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(Hash, { size: 16 })
       ] }),
       readOnly,
-      children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
         "input",
         {
           className: getClassName6("input"),
@@ -1659,10 +1721,17 @@ var DefaultField = ({
           type: field.type,
           title: label || name,
           name,
-          value: typeof value === "undefined" ? "" : value.toString(),
+          value: (value == null ? void 0 : value.toString) ? value.toString() : "",
           onChange: (e) => {
             if (field.type === "number") {
-              onChange(Number(e.currentTarget.value));
+              const numberValue = Number(e.currentTarget.value);
+              if (typeof field.min !== "undefined" && numberValue < field.min) {
+                return;
+              }
+              if (typeof field.max !== "undefined" && numberValue > field.max) {
+                return;
+              }
+              onChange(numberValue);
             } else {
               onChange(e.currentTarget.value);
             }
@@ -1680,11 +1749,11 @@ var DefaultField = ({
 
 // components/AutoField/fields/ExternalField/index.tsx
 init_react_import();
-var import_react15 = require("react");
+var import_react16 = require("react");
 
 // components/ExternalInput/index.tsx
 init_react_import();
-var import_react14 = require("react");
+var import_react15 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/ExternalInput/styles.module.css#css-module
 init_react_import();
@@ -1692,7 +1761,7 @@ var styles_module_default6 = { "ExternalInput-actions": "_ExternalInput-actions_
 
 // components/Modal/index.tsx
 init_react_import();
-var import_react12 = require("react");
+var import_react13 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Modal/styles.module.css#css-module
 init_react_import();
@@ -1700,22 +1769,22 @@ var styles_module_default7 = { "Modal": "_Modal_ikbaj_1", "Modal--isOpen": "_Mod
 
 // components/Modal/index.tsx
 var import_react_dom = require("react-dom");
-var import_jsx_runtime9 = require("react/jsx-runtime");
+var import_jsx_runtime10 = require("react/jsx-runtime");
 var getClassName7 = get_class_name_factory_default("Modal", styles_module_default7);
 var Modal = ({
   children,
   onClose,
   isOpen
 }) => {
-  const [rootEl, setRootEl] = (0, import_react12.useState)(null);
-  (0, import_react12.useEffect)(() => {
+  const [rootEl, setRootEl] = (0, import_react13.useState)(null);
+  (0, import_react13.useEffect)(() => {
     setRootEl(document.getElementById("puck-portal-root"));
   }, []);
   if (!rootEl) {
-    return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", {});
+    return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", {});
   }
   return (0, import_react_dom.createPortal)(
-    /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { className: getClassName7({ isOpen }), onClick: onClose, children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", { className: getClassName7({ isOpen }), onClick: onClose, children: /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
       "div",
       {
         className: getClassName7("inner"),
@@ -1735,11 +1804,11 @@ init_react_import();
 var styles_module_default8 = { "Heading": "_Heading_qxrry_1", "Heading--xxxxl": "_Heading--xxxxl_qxrry_12", "Heading--xxxl": "_Heading--xxxl_qxrry_18", "Heading--xxl": "_Heading--xxl_qxrry_22", "Heading--xl": "_Heading--xl_qxrry_26", "Heading--l": "_Heading--l_qxrry_30", "Heading--m": "_Heading--m_qxrry_34", "Heading--s": "_Heading--s_qxrry_38", "Heading--xs": "_Heading--xs_qxrry_42" };
 
 // components/Heading/index.tsx
-var import_jsx_runtime10 = require("react/jsx-runtime");
+var import_jsx_runtime11 = require("react/jsx-runtime");
 var getClassName8 = get_class_name_factory_default("Heading", styles_module_default8);
 var Heading = ({ children, rank, size = "m" }) => {
   const Tag = rank ? `h${rank}` : "span";
-  return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
     Tag,
     {
       className: getClassName8({
@@ -1755,7 +1824,7 @@ init_react_import();
 
 // components/Button/Button.tsx
 init_react_import();
-var import_react13 = require("react");
+var import_react14 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Button/Button.module.css#css-module
 init_react_import();
@@ -1775,7 +1844,7 @@ var filterDataAttrs = (props) => {
 };
 
 // components/Button/Button.tsx
-var import_jsx_runtime11 = require("react/jsx-runtime");
+var import_jsx_runtime12 = require("react/jsx-runtime");
 var getClassName9 = get_class_name_factory_default("Button", Button_module_default);
 var Button = (_a) => {
   var _b = _a, {
@@ -1805,11 +1874,11 @@ var Button = (_a) => {
     "size",
     "loading"
   ]);
-  const [loading, setLoading] = (0, import_react13.useState)(loadingProp);
-  (0, import_react13.useEffect)(() => setLoading(loadingProp), [loadingProp]);
+  const [loading, setLoading] = (0, import_react14.useState)(loadingProp);
+  (0, import_react14.useEffect)(() => setLoading(loadingProp), [loadingProp]);
   const ElementType = href ? "a" : type ? "button" : "span";
   const dataAttrs = filterDataAttrs(props);
-  const el = /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)(
+  const el = /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(
     ElementType,
     __spreadProps(__spreadValues({
       className: getClassName9({
@@ -1834,9 +1903,9 @@ var Button = (_a) => {
       href
     }, dataAttrs), {
       children: [
-        icon && /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("div", { className: getClassName9("icon"), children: icon }),
+        icon && /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: getClassName9("icon"), children: icon }),
         children,
-        loading && /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("div", { className: getClassName9("spinner"), children: /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Loader, { size: 14 }) })
+        loading && /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: getClassName9("spinner"), children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Loader, { size: 14 }) })
       ]
     })
   );
@@ -1844,7 +1913,7 @@ var Button = (_a) => {
 };
 
 // components/ExternalInput/index.tsx
-var import_jsx_runtime12 = require("react/jsx-runtime");
+var import_jsx_runtime13 = require("react/jsx-runtime");
 var getClassName10 = get_class_name_factory_default("ExternalInput", styles_module_default6);
 var getClassNameModal = get_class_name_factory_default("ExternalInputModal", styles_module_default6);
 var dataCache = {};
@@ -1861,28 +1930,28 @@ var ExternalInput = ({
     mapRow = (val) => val,
     filterFields
   } = field || {};
-  const [data, setData] = (0, import_react14.useState)([]);
-  const [isOpen, setOpen] = (0, import_react14.useState)(false);
-  const [isLoading, setIsLoading] = (0, import_react14.useState)(true);
+  const [data, setData] = (0, import_react15.useState)([]);
+  const [isOpen, setOpen] = (0, import_react15.useState)(false);
+  const [isLoading, setIsLoading] = (0, import_react15.useState)(true);
   const hasFilterFields = !!filterFields;
-  const [filters, setFilters] = (0, import_react14.useState)(field.initialFilters || {});
-  const [filtersToggled, setFiltersToggled] = (0, import_react14.useState)(hasFilterFields);
-  const mappedData = (0, import_react14.useMemo)(() => {
+  const [filters, setFilters] = (0, import_react15.useState)(field.initialFilters || {});
+  const [filtersToggled, setFiltersToggled] = (0, import_react15.useState)(hasFilterFields);
+  const mappedData = (0, import_react15.useMemo)(() => {
     return data.map(mapRow);
   }, [data]);
-  const keys = (0, import_react14.useMemo)(() => {
+  const keys = (0, import_react15.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_react14.isValidElement)(item[key])) {
+        if (typeof item[key] === "string" || typeof item[key] === "number" || (0, import_react15.isValidElement)(item[key])) {
           validKeys.add(key);
         }
       }
     }
     return Array.from(validKeys);
   }, [mappedData]);
-  const [searchQuery, setSearchQuery] = (0, import_react14.useState)(field.initialQuery || "");
-  const search = (0, import_react14.useCallback)(
+  const [searchQuery, setSearchQuery] = (0, import_react15.useState)(field.initialQuery || "");
+  const search = (0, import_react15.useCallback)(
     (query, filters2) => __async(void 0, null, function* () {
       setIsLoading(true);
       const cacheKey = `${id}-${query}-${JSON.stringify(filters2)}`;
@@ -1895,18 +1964,18 @@ var ExternalInput = ({
     }),
     [id, field]
   );
-  const Footer = (0, import_react14.useCallback)(
-    (props) => field.renderFooter ? field.renderFooter(props) : /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("span", { className: getClassNameModal("footer"), children: [
+  const Footer = (0, import_react15.useCallback)(
+    (props) => field.renderFooter ? field.renderFooter(props) : /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("span", { className: getClassNameModal("footer"), children: [
       props.items.length,
       " result",
       props.items.length === 1 ? "" : "s"
     ] }),
     [field.renderFooter]
   );
-  (0, import_react14.useEffect)(() => {
+  (0, import_react15.useEffect)(() => {
     search(searchQuery, filters);
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)(
     "div",
     {
       className: getClassName10({
@@ -1916,21 +1985,21 @@ var ExternalInput = ({
       }),
       id,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: getClassName10("actions"), children: [
-          /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("div", { className: getClassName10("actions"), children: [
+          /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
             "button",
             {
               type: "button",
               onClick: () => setOpen(true),
               className: getClassName10("button"),
               disabled: readOnly,
-              children: value ? field.getItemSummary ? field.getItemSummary(value) : "External item" : /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(import_jsx_runtime12.Fragment, { children: [
-                /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Link, { size: "16" }),
-                /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("span", { children: field.placeholder })
+              children: value ? field.getItemSummary ? field.getItemSummary(value) : "External item" : /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)(import_jsx_runtime13.Fragment, { children: [
+                /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(Link, { size: "16" }),
+                /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("span", { children: field.placeholder })
               ] })
             }
           ),
-          value && /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+          value && /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
             "button",
             {
               type: "button",
@@ -1939,11 +2008,11 @@ var ExternalInput = ({
                 onChange(null);
               },
               disabled: readOnly,
-              children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(LockOpen, { size: 16 })
+              children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(LockOpen, { size: 16 })
             }
           )
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Modal, { onClose: () => setOpen(false), isOpen, children: /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(
+        /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(Modal, { onClose: () => setOpen(false), isOpen, children: /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)(
           "form",
           {
             className: getClassNameModal({
@@ -1957,11 +2026,11 @@ var ExternalInput = ({
               search(searchQuery, filters);
             },
             children: [
-              /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: getClassNameModal("masthead"), children: field.showSearch ? /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: getClassNameModal("searchForm"), children: [
-                /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("label", { className: getClassNameModal("search"), children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("span", { className: getClassNameModal("searchIconText"), children: "Search" }),
-                  /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: getClassNameModal("searchIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Search, { size: "18" }) }),
-                  /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+              /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("div", { className: getClassNameModal("masthead"), children: field.showSearch ? /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("div", { className: getClassNameModal("searchForm"), children: [
+                /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("label", { className: getClassNameModal("search"), children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("span", { className: getClassNameModal("searchIconText"), children: "Search" }),
+                  /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("div", { className: getClassNameModal("searchIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(Search, { size: "18" }) }),
+                  /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
                     "input",
                     {
                       className: getClassNameModal("searchInput"),
@@ -1976,9 +2045,9 @@ var ExternalInput = ({
                     }
                   )
                 ] }),
-                /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: getClassNameModal("searchActions"), children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Button, { type: "submit", loading: isLoading, fullWidth: true, children: "Search" }),
-                  hasFilterFields && /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: getClassNameModal("searchActionIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+                /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("div", { className: getClassNameModal("searchActions"), children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(Button, { type: "submit", loading: isLoading, fullWidth: true, children: "Search" }),
+                  hasFilterFields && /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("div", { className: getClassNameModal("searchActionIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
                     IconButton,
                     {
                       title: "Toggle filters",
@@ -1987,15 +2056,15 @@ var ExternalInput = ({
                         e.stopPropagation();
                         setFiltersToggled(!filtersToggled);
                       },
-                      children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(SlidersHorizontal, { size: 20 })
+                      children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(SlidersHorizontal, { size: 20 })
                     }
                   ) })
                 ] })
-              ] }) : /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Heading, { rank: "2", size: "xs", children: field.placeholder || "Select data" }) }),
-              /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: getClassNameModal("grid"), children: [
-                hasFilterFields && /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: getClassNameModal("filters"), children: hasFilterFields && Object.keys(filterFields).map((fieldName) => {
+              ] }) : /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(Heading, { rank: "2", size: "xs", children: field.placeholder || "Select data" }) }),
+              /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("div", { className: getClassNameModal("grid"), children: [
+                hasFilterFields && /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("div", { className: getClassNameModal("filters"), children: hasFilterFields && Object.keys(filterFields).map((fieldName) => {
                   const filterField = filterFields[fieldName];
-                  return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+                  return /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
                     AutoFieldPrivate,
                     {
                       field: filterField,
@@ -2012,9 +2081,9 @@ var ExternalInput = ({
                     fieldName
                   );
                 }) }),
-                /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: getClassNameModal("tableWrapper"), children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("table", { className: getClassNameModal("table"), children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("thead", { className: getClassNameModal("thead"), children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("tr", { className: getClassNameModal("tr"), children: keys.map((key) => /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+                /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("div", { className: getClassNameModal("tableWrapper"), children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("table", { className: getClassNameModal("table"), children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("thead", { className: getClassNameModal("thead"), children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("tr", { className: getClassNameModal("tr"), children: keys.map((key) => /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
                       "th",
                       {
                         className: getClassNameModal("th"),
@@ -2023,8 +2092,8 @@ var ExternalInput = ({
                       },
                       key
                     )) }) }),
-                    /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("tbody", { className: getClassNameModal("tbody"), children: mappedData.map((item, i) => {
-                      return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+                    /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("tbody", { className: getClassNameModal("tbody"), children: mappedData.map((item, i) => {
+                      return /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
                         "tr",
                         {
                           style: { whiteSpace: "nowrap" },
@@ -2033,16 +2102,16 @@ var ExternalInput = ({
                             onChange(mapProp(data[i]));
                             setOpen(false);
                           },
-                          children: keys.map((key) => /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("td", { className: getClassNameModal("td"), children: item[key] }, key))
+                          children: keys.map((key) => /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("td", { className: getClassNameModal("td"), children: item[key] }, key))
                         },
                         i
                       );
                     }) })
                   ] }),
-                  /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: getClassNameModal("loadingBanner"), children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Loader, { size: 24 }) })
+                  /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("div", { className: getClassNameModal("loadingBanner"), children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(Loader, { size: 24 }) })
                 ] })
               ] }),
-              /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: getClassNameModal("footerContainer"), children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Footer, { items: mappedData }) })
+              /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("div", { className: getClassNameModal("footerContainer"), children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(Footer, { items: mappedData }) })
             ]
           }
         ) })
@@ -2052,7 +2121,7 @@ var ExternalInput = ({
 };
 
 // components/AutoField/fields/ExternalField/index.tsx
-var import_jsx_runtime13 = require("react/jsx-runtime");
+var import_jsx_runtime14 = require("react/jsx-runtime");
 var ExternalField = ({
   field,
   onChange,
@@ -2066,7 +2135,7 @@ var ExternalField = ({
   var _a, _b, _c;
   const validField = field;
   const deprecatedField = field;
-  (0, import_react15.useEffect)(() => {
+  (0, import_react16.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."
@@ -2076,7 +2145,7 @@ var ExternalField = ({
   if (field.type !== "external") {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(Label2, { label: label || name, icon: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(Link, { size: 16 }), el: "div", children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(Label2, { label: label || name, icon: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(Link, { size: 16 }), el: "div", children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
     ExternalInput,
     {
       name,
@@ -2101,7 +2170,7 @@ var ExternalField = ({
 
 // components/AutoField/fields/RadioField/index.tsx
 init_react_import();
-var import_react16 = require("react");
+var import_react17 = require("react");
 
 // lib/safe-json-parse.ts
 init_react_import();
@@ -2115,7 +2184,7 @@ var safeJsonParse = (str) => {
 };
 
 // components/AutoField/fields/RadioField/index.tsx
-var import_jsx_runtime14 = require("react/jsx-runtime");
+var import_jsx_runtime15 = require("react/jsx-runtime");
 var getClassName11 = get_class_name_factory_default("Input", styles_module_default2);
 var RadioField = ({
   field,
@@ -2127,26 +2196,26 @@ var RadioField = ({
   label,
   Label: Label2
 }) => {
-  const flatOptions = (0, import_react16.useMemo)(
+  const flatOptions = (0, import_react17.useMemo)(
     () => field.type === "radio" ? field.options.map(({ value: value2 }) => value2) : [],
     [field]
   );
   if (field.type !== "radio" || !field.options) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
     Label2,
     {
-      icon: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(CircleCheckBig, { size: 16 }),
+      icon: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(CircleCheckBig, { size: 16 }),
       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)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("div", { className: getClassName11("radioGroupItems"), id, children: field.options.map((option) => /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(
         "label",
         {
           className: getClassName11("radio"),
           children: [
-            /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
+            /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
               "input",
               {
                 type: "radio",
@@ -2166,7 +2235,7 @@ var RadioField = ({
                 checked: value === option.value
               }
             ),
-            /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("div", { className: getClassName11("radioInner"), children: option.label || option.value })
+            /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("div", { className: getClassName11("radioInner"), children: option.label || option.value })
           ]
         },
         option.label + option.value
@@ -2177,8 +2246,8 @@ var RadioField = ({
 
 // components/AutoField/fields/SelectField/index.tsx
 init_react_import();
-var import_react17 = require("react");
-var import_jsx_runtime15 = require("react/jsx-runtime");
+var import_react18 = require("react");
+var import_jsx_runtime16 = require("react/jsx-runtime");
 var getClassName12 = get_class_name_factory_default("Input", styles_module_default2);
 var SelectField = ({
   field,
@@ -2190,20 +2259,20 @@ var SelectField = ({
   readOnly,
   id
 }) => {
-  const flatOptions = (0, import_react17.useMemo)(
+  const flatOptions = (0, import_react18.useMemo)(
     () => field.type === "select" ? field.options.map(({ value: value2 }) => value2) : [],
     [field]
   );
   if (field.type !== "select" || !field.options) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
     Label2,
     {
       label: label || name,
-      icon: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(ChevronDown, { size: 16 }),
+      icon: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(ChevronDown, { size: 16 }),
       readOnly,
-      children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
         "select",
         {
           id,
@@ -2220,7 +2289,7 @@ var SelectField = ({
             }
           },
           value,
-          children: field.options.map((option) => /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+          children: field.options.map((option) => /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
             "option",
             {
               label: option.label,
@@ -2236,7 +2305,7 @@ var SelectField = ({
 
 // components/AutoField/fields/TextareaField/index.tsx
 init_react_import();
-var import_jsx_runtime16 = require("react/jsx-runtime");
+var import_jsx_runtime17 = require("react/jsx-runtime");
 var getClassName13 = get_class_name_factory_default("Input", styles_module_default2);
 var TextareaField = ({
   onChange,
@@ -2247,7 +2316,7 @@ var TextareaField = ({
   Label: Label2,
   id
 }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Label2, { label: label || name, icon: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(Type, { size: 16 }), readOnly, children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(Label2, { label: label || name, icon: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(Type, { size: 16 }), readOnly, children: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
     "textarea",
     {
       id,
@@ -2274,7 +2343,7 @@ init_react_import();
 var styles_module_default9 = { "ObjectField": "_ObjectField_1ua3y_5", "ObjectField-fieldset": "_ObjectField-fieldset_1ua3y_13" };
 
 // components/AutoField/fields/ObjectField/index.tsx
-var import_jsx_runtime17 = require("react/jsx-runtime");
+var import_jsx_runtime18 = require("react/jsx-runtime");
 var getClassName14 = get_class_name_factory_default("ObjectField", styles_module_default9);
 var ObjectField = ({
   field,
@@ -2286,43 +2355,54 @@ var ObjectField = ({
   readOnly,
   id
 }) => {
-  const { selectedItem } = useAppContext();
+  const { readOnlyFields, localName = name } = useNestedFieldContext();
   if (field.type !== "object" || !field.objectFields) {
     return null;
   }
-  const readOnlyFields = (selectedItem == null ? void 0 : selectedItem.readOnly) || {};
   const data = value || {};
-  return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
     Label2,
     {
       label: label || name,
-      icon: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(EllipsisVertical, { size: 16 }),
+      icon: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(EllipsisVertical, { size: 16 }),
       el: "div",
       readOnly,
-      children: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("div", { className: getClassName14(), children: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("fieldset", { className: getClassName14("fieldset"), children: Object.keys(field.objectFields).map((fieldName) => {
-        const subField = field.objectFields[fieldName];
-        const subFieldName = `${name}.${fieldName}`;
-        const wildcardFieldName = `${name}.${fieldName}`;
-        const subReadOnly = readOnly ? readOnly : typeof readOnlyFields[subFieldName] !== "undefined" ? readOnlyFields[subFieldName] : readOnlyFields[wildcardFieldName];
-        return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
-          AutoFieldPrivate,
+      children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: getClassName14(), children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("fieldset", { className: getClassName14("fieldset"), children: Object.keys(field.objectFields).map((subName) => {
+        const subField = field.objectFields[subName];
+        const subPath = `${name}.${subName}`;
+        const localSubPath = `${localName || name}.${subName}`;
+        const subReadOnly = readOnly ? readOnly : readOnlyFields[localSubPath];
+        const label2 = subField.label || subName;
+        return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
+          NestedFieldProvider,
           {
-            name: subFieldName,
-            label: subField.label || fieldName,
-            id: `${id}_${fieldName}`,
-            readOnly: subReadOnly,
-            field: subField,
-            value: data[fieldName],
-            onChange: (val, ui) => {
-              onChange(
-                __spreadProps(__spreadValues({}, data), {
-                  [fieldName]: val
+            name: localName || id,
+            subName,
+            readOnlyFields,
+            children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
+              AutoFieldPrivate,
+              {
+                name: subPath,
+                label: subPath,
+                id: `${id}_${subName}`,
+                readOnly: subReadOnly,
+                field: __spreadProps(__spreadValues({}, subField), {
+                  label: label2
+                  // May be used by custom fields
                 }),
-                ui
-              );
-            }
+                value: data[subName],
+                onChange: (val, ui) => {
+                  onChange(
+                    __spreadProps(__spreadValues({}, data), {
+                      [subName]: val
+                    }),
+                    ui
+                  );
+                }
+              }
+            )
           },
-          subFieldName
+          subPath
         );
       }) }) })
     }
@@ -2331,7 +2411,7 @@ var ObjectField = ({
 
 // lib/use-safe-id.ts
 init_react_import();
-var import_react18 = __toESM(require("react"));
+var import_react19 = __toESM(require("react"));
 
 // lib/generate-id.ts
 init_react_import();
@@ -2340,15 +2420,15 @@ var generateId = (type) => type ? `${type}-${(0, import_uuid.v4)()}` : (0, impor
 
 // lib/use-safe-id.ts
 var useSafeId = () => {
-  if (typeof import_react18.default.useId !== "undefined") {
-    return import_react18.default.useId();
+  if (typeof import_react19.default.useId !== "undefined") {
+    return import_react19.default.useId();
   }
-  const [id] = (0, import_react18.useState)(generateId());
+  const [id] = (0, import_react19.useState)(generateId());
   return id;
 };
 
 // components/AutoField/index.tsx
-var import_jsx_runtime18 = require("react/jsx-runtime");
+var import_jsx_runtime19 = require("react/jsx-runtime");
 var getClassName15 = get_class_name_factory_default("Input", styles_module_default2);
 var getClassNameWrapper = get_class_name_factory_default("InputWrapper", styles_module_default2);
 var FieldLabel = ({
@@ -2360,16 +2440,16 @@ var FieldLabel = ({
   className
 }) => {
   const El = el;
-  return /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(El, { className, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)("div", { className: getClassName15("label"), children: [
-      icon ? /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: getClassName15("labelIcon"), children: icon }) : /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(import_jsx_runtime18.Fragment, {}),
+  return /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)(El, { className, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)("div", { className: getClassName15("label"), children: [
+      icon ? /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("div", { className: getClassName15("labelIcon"), children: icon }) : /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(import_jsx_runtime19.Fragment, {}),
       label,
-      readOnly && /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: getClassName15("disabledIcon"), title: "Read-only", children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(Lock, { size: "12" }) })
+      readOnly && /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("div", { className: getClassName15("disabledIcon"), title: "Read-only", children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(Lock, { size: "12" }) })
     ] }),
     children
   ] });
 };
-var FieldLabelInternal2 = ({
+var FieldLabelInternal = ({
   children,
   icon,
   label,
@@ -2377,14 +2457,14 @@ var FieldLabelInternal2 = ({
   readOnly
 }) => {
   const { overrides } = useAppContext();
-  const Wrapper = (0, import_react19.useMemo)(
+  const Wrapper = (0, import_react20.useMemo)(
     () => overrides.fieldLabel || FieldLabel,
     [overrides]
   );
   if (!label) {
-    return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(import_jsx_runtime18.Fragment, { children });
+    return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(import_jsx_runtime19.Fragment, { children });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
     Wrapper,
     {
       label,
@@ -2398,8 +2478,9 @@ var FieldLabelInternal2 = ({
 };
 function AutoFieldInternal(props) {
   var _a, _b, _c, _d, _e, _f, _g, _h;
-  const { dispatch, overrides } = useAppContext();
-  const { id, Label: Label2 = FieldLabelInternal2 } = props;
+  const { dispatch, overrides, selectedItem } = useAppContext();
+  const nestedFieldContext = (0, import_react20.useContext)(NestedFieldContext);
+  const { id, Label: Label2 = FieldLabelInternal } = props;
   const field = props.field;
   const label = field.label;
   const defaultId = useSafeId();
@@ -2430,7 +2511,7 @@ function AutoFieldInternal(props) {
     Label: Label2,
     id: resolvedId
   });
-  const onFocus = (0, import_react19.useCallback)(
+  const onFocus = (0, import_react20.useCallback)(
     (e) => {
       if (mergedProps.name && e.target.nodeName === "INPUT") {
         e.stopPropagation();
@@ -2444,7 +2525,7 @@ function AutoFieldInternal(props) {
     },
     [mergedProps.name]
   );
-  const onBlur = (0, import_react19.useCallback)((e) => {
+  const onBlur = (0, import_react20.useCallback)((e) => {
     if ("name" in e.target) {
       dispatch({
         type: "setUi",
@@ -2459,27 +2540,36 @@ function AutoFieldInternal(props) {
       return null;
     }
     const CustomField = field.render;
-    return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: getClassNameWrapper(), onFocus, onBlur, children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: getClassName15(), children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(CustomField, __spreadValues({}, mergedProps)) }) });
+    return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("div", { className: getClassNameWrapper(), onFocus, onBlur, children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("div", { className: getClassName15(), children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(CustomField, __spreadValues({}, mergedProps)) }) });
   }
   const children = defaultFields[field.type](mergedProps);
   const Render2 = render[field.type];
-  return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
-    "div",
+  return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
+    NestedFieldContext.Provider,
     {
-      className: getClassNameWrapper(),
-      onFocus,
-      onBlur,
-      onClick: (e) => {
-        e.stopPropagation();
+      value: {
+        readOnlyFields: nestedFieldContext.readOnlyFields || (selectedItem == null ? void 0 : selectedItem.readOnly) || {},
+        localName: nestedFieldContext.localName
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(Render2, __spreadProps(__spreadValues({}, mergedProps), { children }))
+      children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
+        "div",
+        {
+          className: getClassNameWrapper(),
+          onFocus,
+          onBlur,
+          onClick: (e) => {
+            e.stopPropagation();
+          },
+          children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(Render2, __spreadProps(__spreadValues({}, mergedProps), { children }))
+        }
+      )
     }
   );
 }
 function AutoFieldPrivate(props) {
   const { state } = useAppContext();
   const { value, onChange } = props;
-  const [localValue, setLocalValue] = (0, import_react19.useState)(value);
+  const [localValue, setLocalValue] = (0, import_react20.useState)(value);
   const onChangeDb = (0, import_use_debounce.useDebouncedCallback)(
     (val, ui) => {
       onChange(val, ui);
@@ -2487,11 +2577,11 @@ function AutoFieldPrivate(props) {
     50,
     { leading: true }
   );
-  const onChangeLocal = (0, import_react19.useCallback)((val, ui) => {
+  const onChangeLocal = (0, import_react20.useCallback)((val, ui) => {
     setLocalValue(val);
     onChangeDb(val, ui);
   }, []);
-  (0, import_react19.useEffect)(() => {
+  (0, import_react20.useEffect)(() => {
     if (state.ui.field.focus !== props.name) {
       setLocalValue(value);
     }
@@ -2500,11 +2590,11 @@ function AutoFieldPrivate(props) {
     value: localValue,
     onChange: onChangeLocal
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(AutoFieldInternal, __spreadValues(__spreadValues({}, props), localProps));
+  return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(AutoFieldInternal, __spreadValues(__spreadValues({}, props), localProps));
 }
 function AutoField(props) {
-  const DefaultLabel = (0, import_react19.useMemo)(() => {
-    const DefaultLabel2 = (labelProps) => /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
+  const DefaultLabel = (0, import_react20.useMemo)(() => {
+    const DefaultLabel2 = (labelProps) => /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
       "div",
       __spreadProps(__spreadValues({}, labelProps), {
         className: getClassName15({ readOnly: props.readOnly })
@@ -2512,7 +2602,7 @@ function AutoField(props) {
     );
     return DefaultLabel2;
   }, [props.readOnly]);
-  return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(AutoFieldInternal, __spreadProps(__spreadValues({}, props), { Label: DefaultLabel }));
+  return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(AutoFieldInternal, __spreadProps(__spreadValues({}, props), { Label: DefaultLabel }));
 }
 
 // components/Drawer/index.tsx
@@ -2523,64 +2613,38 @@ init_react_import();
 var styles_module_default10 = { "Drawer": "_Drawer_fkqfo_1", "Drawer-draggable": "_Drawer-draggable_fkqfo_8", "Drawer-draggableBg": "_Drawer-draggableBg_fkqfo_12", "Drawer-draggableFg": "_Drawer-draggableFg_fkqfo_21", "DrawerItem-draggable": "_DrawerItem-draggable_fkqfo_25", "DrawerItem--disabled": "_DrawerItem--disabled_fkqfo_38", "DrawerItem": "_DrawerItem_fkqfo_25", "Drawer--isDraggingFrom": "_Drawer--isDraggingFrom_fkqfo_48", "DrawerItem-name": "_DrawerItem-name_fkqfo_66" };
 
 // components/Drawer/index.tsx
-var import_react27 = require("react");
+var import_react32 = require("react");
 
 // components/DragDropContext/index.tsx
 init_react_import();
-var import_react25 = require("@dnd-kit/react");
-var import_react26 = require("react");
+var import_react30 = require("@dnd-kit/react");
+var import_react31 = require("react");
 var import_dom = require("@dnd-kit/dom");
 
 // components/DropZone/index.tsx
 init_react_import();
-var import_react24 = require("react");
+var import_react29 = require("react");
 
 // components/DraggableComponent/index.tsx
 init_react_import();
-var import_react21 = require("react");
+var import_react23 = 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_1ukn8_1", "DraggableComponent-overlay": "_DraggableComponent-overlay_1ukn8_12", "DraggableComponent-loadingOverlay": "_DraggableComponent-loadingOverlay_1ukn8_29", "DraggableComponent--hover": "_DraggableComponent--hover_1ukn8_45", "DraggableComponent--isLocked": "_DraggableComponent--isLocked_1ukn8_45", "DraggableComponent--isSelected": "_DraggableComponent--isSelected_1ukn8_54", "DraggableComponent-actionsOverlay": "_DraggableComponent-actionsOverlay_1ukn8_66", "DraggableComponent-actions": "_DraggableComponent-actions_1ukn8_66" };
 
-// lib/use-modifier-held.ts
-init_react_import();
-var import_react20 = require("react");
-var useModifierHeld = (modifier) => {
-  const [modifierHeld, setModifierHeld] = (0, import_react20.useState)(false);
-  (0, import_react20.useEffect)(() => {
-    function downHandler({ key }) {
-      if (key === modifier) {
-        setModifierHeld(true);
-      }
-    }
-    function upHandler({ key }) {
-      if (key === modifier) {
-        setModifierHeld(false);
-      }
-    }
-    window.addEventListener("keydown", downHandler);
-    window.addEventListener("keyup", upHandler);
-    return () => {
-      window.removeEventListener("keydown", downHandler);
-      window.removeEventListener("keyup", upHandler);
-    };
-  }, [modifier]);
-  return modifierHeld;
-};
-
 // components/DraggableComponent/index.tsx
 var import_react_dom2 = require("react-dom");
 
-// components/DraggableComponent/collision/dynamic/index.ts
+// lib/dnd/collision/dynamic/index.ts
 init_react_import();
 var import_abstract8 = require("@dnd-kit/abstract");
 
-// components/DraggableComponent/collision/directional/index.ts
+// lib/dnd/collision/directional/index.ts
 init_react_import();
 var import_abstract = require("@dnd-kit/abstract");
 
-// components/DraggableComponent/collision/collision-debug.ts
+// lib/dnd/collision/collision-debug.ts
 init_react_import();
 var DEBUG = false;
 var debugElements = {};
@@ -2629,7 +2693,7 @@ var collisionDebug = (a, b, id, color, label) => {
   });
 };
 
-// components/DraggableComponent/collision/directional/index.ts
+// lib/dnd/collision/directional/index.ts
 var distanceChange = "increasing";
 var directionalCollision = (input, previous) => {
   var _a;
@@ -2662,7 +2726,7 @@ var directionalCollision = (input, previous) => {
   return null;
 };
 
-// components/DraggableComponent/collision/dynamic/get-direction.ts
+// lib/dnd/collision/dynamic/get-direction.ts
 init_react_import();
 var getDirection = (dragAxis, delta) => {
   if (dragAxis === "dynamic") {
@@ -2677,7 +2741,7 @@ var getDirection = (dragAxis, delta) => {
   return delta.y === 0 ? null : delta.y > 0 ? "down" : "up";
 };
 
-// components/DraggableComponent/collision/dynamic/get-midpoint-impact.ts
+// lib/dnd/collision/dynamic/get-midpoint-impact.ts
 init_react_import();
 var getMidpointImpact = (dragShape, dropShape, direction, offsetMultiplier = 0) => {
   const dragRect = dragShape.boundingRectangle;
@@ -2696,7 +2760,7 @@ var getMidpointImpact = (dragShape, dropShape, direction, offsetMultiplier = 0)
   return dragRect.right - offset >= dropCenter.x;
 };
 
-// components/DraggableComponent/collision/dynamic/track-movement-interval.ts
+// lib/dnd/collision/dynamic/track-movement-interval.ts
 init_react_import();
 var import_geometry = require("@dnd-kit/geometry");
 var INTERVAL_SENSITIVITY = 10;
@@ -2800,7 +2864,14 @@ var closestCorners = (input) => {
   };
 };
 
-// components/DraggableComponent/collision/dynamic/index.ts
+// lib/dnd/collision/dynamic/store.ts
+init_react_import();
+var import_vanilla = require("zustand/vanilla");
+var collisionStore = (0, import_vanilla.createStore)(() => ({
+  fallbackEnabled: false
+}));
+
+// lib/dnd/collision/dynamic/index.ts
 var flushNext = "";
 var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input) => {
   var _a, _b, _c, _d, _e;
@@ -2812,6 +2883,7 @@ var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input
     return null;
   }
   const { center: dragCenter } = dragShape;
+  const { fallbackEnabled } = collisionStore.getState();
   const interval = trackMovementInterval(position.current, dragAxis);
   dragOperation.data = __spreadProps(__spreadValues({}, dragOperation.data), {
     direction: interval.direction
@@ -2857,7 +2929,7 @@ var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input
     flushNext = "";
     return __spreadProps(__spreadValues({}, collision), { id: shouldFlushId ? "flush" : collision.id });
   }
-  if (((_c = dragOperation.source) == null ? void 0 : _c.id) !== droppable.id) {
+  if (fallbackEnabled && ((_c = dragOperation.source) == null ? void 0 : _c.id) !== droppable.id) {
     const xAxisIntersection = dropShape.boundingRectangle.right > dragShape.boundingRectangle.left && dropShape.boundingRectangle.left < dragShape.boundingRectangle.right;
     const yAxisIntersection = dropShape.boundingRectangle.bottom > dragShape.boundingRectangle.top && dropShape.boundingRectangle.top < dragShape.boundingRectangle.bottom;
     if (dragAxis === "y" && xAxisIntersection || yAxisIntersection) {
@@ -2918,8 +2990,102 @@ function getDeepScrollPosition(element) {
   return totalScroll;
 }
 
+// components/DropZone/context.tsx
+init_react_import();
+var import_react21 = require("react");
+var import_zustand = require("zustand");
+var import_jsx_runtime20 = require("react/jsx-runtime");
+var dropZoneContext = (0, import_react21.createContext)(null);
+var ZoneStoreContext = (0, import_react21.createContext)(
+  (0, import_zustand.createStore)(() => ({
+    zoneDepthIndex: {},
+    nextZoneDepthIndex: {},
+    areaDepthIndex: {},
+    nextAreaDepthIndex: {},
+    draggedItem: null,
+    previewIndex: {}
+  }))
+);
+var ZoneStoreProvider = ({
+  children,
+  store
+}) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(ZoneStoreContext.Provider, { value: store, children });
+};
+var DropZoneProvider = ({
+  children,
+  value
+}) => {
+  const [hoveringComponent, setHoveringComponent] = (0, import_react21.useState)();
+  const [areasWithZones, setAreasWithZones] = (0, import_react21.useState)(
+    {}
+  );
+  const [activeZones, setActiveZones] = (0, import_react21.useState)({});
+  const { dispatch } = useAppContext();
+  const registerZoneArea = (0, import_react21.useCallback)(
+    (area) => {
+      setAreasWithZones((latest) => __spreadProps(__spreadValues({}, latest), { [area]: true }));
+    },
+    [setAreasWithZones]
+  );
+  const registerZone = (0, import_react21.useCallback)(
+    (zoneCompound) => {
+      if (!dispatch) {
+        return;
+      }
+      dispatch({
+        type: "registerZone",
+        zone: zoneCompound
+      });
+      setActiveZones((latest) => __spreadProps(__spreadValues({}, latest), { [zoneCompound]: true }));
+    },
+    [setActiveZones, dispatch]
+  );
+  const unregisterZone = (0, import_react21.useCallback)(
+    (zoneCompound) => {
+      if (!dispatch) {
+        return;
+      }
+      dispatch({
+        type: "unregisterZone",
+        zone: zoneCompound
+      });
+      setActiveZones((latest) => __spreadProps(__spreadValues({}, latest), {
+        [zoneCompound]: false
+      }));
+    },
+    [setActiveZones, dispatch]
+  );
+  const memoValue = (0, import_react21.useMemo)(
+    () => __spreadValues({
+      hoveringComponent,
+      setHoveringComponent,
+      registerZoneArea,
+      areasWithZones,
+      registerZone,
+      unregisterZone,
+      activeZones
+    }, value),
+    [value, hoveringComponent, areasWithZones, activeZones]
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(import_jsx_runtime20.Fragment, { children: memoValue && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(dropZoneContext.Provider, { value: memoValue, children }) });
+};
+
+// lib/use-context-store.ts
+init_react_import();
+var import_react22 = require("react");
+var import_zustand2 = require("zustand");
+var import_shallow = require("zustand/react/shallow");
+function useContextStore(context, selector) {
+  const store = (0, import_react22.useContext)(context);
+  if (!store) {
+    throw new Error("useContextStore must be used inside context");
+  }
+  return (0, import_zustand2.useStore)(store, (0, import_shallow.useShallow)(selector));
+}
+
 // components/DraggableComponent/index.tsx
-var import_jsx_runtime19 = require("react/jsx-runtime");
+var import_jsx_runtime21 = require("react/jsx-runtime");
 var getClassName16 = get_class_name_factory_default("DraggableComponent", styles_module_default11);
 var DEBUG2 = false;
 var space = 8;
@@ -2930,12 +3096,12 @@ var DefaultActionBar = ({
   label,
   children,
   parentAction
-}) => /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)(ActionBar, { children: [
-  /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)(ActionBar.Group, { children: [
+}) => /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(ActionBar, { children: [
+  /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(ActionBar.Group, { children: [
     parentAction,
-    label && /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(ActionBar.Label, { label })
+    label && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(ActionBar.Label, { label })
   ] }),
-  /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(ActionBar.Group, { children })
+  /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(ActionBar.Group, { children })
 ] });
 var convertIdToSelector = (id, zoneCompound, data) => {
   const content = zoneCompound && data.zones && zoneCompound !== "default-zone" ? data.zones[zoneCompound] : data.content;
@@ -2970,10 +3136,9 @@ var DraggableComponent = ({
     iframe,
     state
   } = useAppContext();
-  const isModifierHeld = useModifierHeld("Alt");
-  const ctx = (0, import_react21.useContext)(dropZoneContext);
-  const [localZones, setLocalZones] = (0, import_react21.useState)({});
-  const registerLocalZone = (0, import_react21.useCallback)(
+  const ctx = (0, import_react23.useContext)(dropZoneContext);
+  const [localZones, setLocalZones] = (0, import_react23.useState)({});
+  const registerLocalZone = (0, import_react23.useCallback)(
     (zoneCompound2, active) => {
       var _a;
       (_a = ctx == null ? void 0 : ctx.registerLocalZone) == null ? void 0 : _a.call(ctx, zoneCompound2, active);
@@ -2983,7 +3148,7 @@ var DraggableComponent = ({
     },
     [setLocalZones]
   );
-  const unregisterLocalZone = (0, import_react21.useCallback)(
+  const unregisterLocalZone = (0, import_react23.useCallback)(
     (zoneCompound2) => {
       var _a;
       (_a = ctx == null ? void 0 : ctx.unregisterLocalZone) == null ? void 0 : _a.call(ctx, zoneCompound2);
@@ -2997,8 +3162,8 @@ var DraggableComponent = ({
   );
   const containsActiveZone = Object.values(localZones).filter(Boolean).length > 0;
   const { path = [] } = ctx || {};
-  const [canDrag, setCanDrag] = (0, import_react21.useState)(false);
-  (0, import_react21.useEffect)(() => {
+  const [canDrag, setCanDrag] = (0, import_react23.useState)(false);
+  (0, import_react23.useEffect)(() => {
     var _a;
     const item = getItem({ index, zone: zoneCompound }, state.data);
     if (item) {
@@ -3008,10 +3173,13 @@ var DraggableComponent = ({
       setCanDrag((_a = perms.drag) != null ? _a : true);
     }
   }, [state, index, zoneCompound, getPermissions]);
-  const userIsDragging = !!(ctx == null ? void 0 : ctx.draggedItem);
+  const userIsDragging = useContextStore(
+    ZoneStoreContext,
+    (s) => !!s.draggedItem
+  );
   const canCollide = canDrag || userIsDragging;
   const disabled = !isEnabled || !canCollide;
-  const [dragAxis, setDragAxis] = (0, import_react21.useState)(userDragAxis || autoDragAxis);
+  const [dragAxis, setDragAxis] = (0, import_react23.useState)(userDragAxis || autoDragAxis);
   const { ref: sortableRef, status } = useSortableSafe({
     id,
     index,
@@ -3037,8 +3205,8 @@ var DraggableComponent = ({
     }
   });
   const thisIsDragging = status === "dragging";
-  const ref = (0, import_react21.useRef)(null);
-  const refSetter = (0, import_react21.useCallback)(
+  const ref = (0, import_react23.useRef)(null);
+  const refSetter = (0, import_react23.useCallback)(
     (el) => {
       sortableRef(el);
       if (el) {
@@ -3047,14 +3215,14 @@ var DraggableComponent = ({
     },
     [sortableRef]
   );
-  const [portalEl, setPortalEl] = (0, import_react21.useState)();
-  (0, import_react21.useEffect)(() => {
+  const [portalEl, setPortalEl] = (0, import_react23.useState)();
+  (0, import_react23.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_react21.useCallback)(() => {
+  const getStyle = (0, import_react23.useCallback)(() => {
     var _a, _b, _c;
     if (!ref.current) return;
     const rect = ref.current.getBoundingClientRect();
@@ -3074,11 +3242,11 @@ var DraggableComponent = ({
     };
     return style2;
   }, [ref.current]);
-  const [style, setStyle] = (0, import_react21.useState)();
-  const sync = (0, import_react21.useCallback)(() => {
+  const [style, setStyle] = (0, import_react23.useState)();
+  const sync = (0, import_react23.useCallback)(() => {
     setStyle(getStyle());
   }, [ref.current, iframe]);
-  (0, import_react21.useEffect)(() => {
+  (0, import_react23.useEffect)(() => {
     if (ref.current) {
       const observer = new ResizeObserver(sync);
       observer.observe(ref.current);
@@ -3087,20 +3255,28 @@ var DraggableComponent = ({
       };
     }
   }, [ref.current]);
-  (0, import_react21.useEffect)(() => {
-    ctx == null ? void 0 : ctx.registerPath({
-      index,
-      zone: zoneCompound
-    });
-  }, [isSelected]);
-  const CustomActionBar = (0, import_react21.useMemo)(
+  (0, import_react23.useEffect)(() => {
+    ctx == null ? void 0 : ctx.registerPath(
+      id,
+      {
+        index,
+        zone: zoneCompound
+      },
+      componentType
+    );
+    return () => {
+      var _a;
+      (_a = ctx == null ? void 0 : ctx.unregisterPath) == null ? void 0 : _a.call(ctx, id);
+    };
+  }, [id, zoneCompound, index, componentType]);
+  const CustomActionBar = (0, import_react23.useMemo)(
     () => overrides.actionBar || DefaultActionBar,
     [overrides.actionBar]
   );
   const permissions = getPermissions({
     item: selectedItem
   });
-  const onClick = (0, import_react21.useCallback)(
+  const onClick = (0, import_react23.useCallback)(
     (e) => {
       e.stopPropagation();
       dispatch({
@@ -3112,7 +3288,7 @@ var DraggableComponent = ({
     },
     [index, zoneCompound, id]
   );
-  const onSelectParent = (0, import_react21.useCallback)(() => {
+  const onSelectParent = (0, import_react23.useCallback)(() => {
     if (!(ctx == null ? void 0 : ctx.areaId)) {
       return;
     }
@@ -3130,23 +3306,23 @@ var DraggableComponent = ({
       }
     });
   }, [ctx, path]);
-  const onDuplicate = (0, import_react21.useCallback)(() => {
+  const onDuplicate = (0, import_react23.useCallback)(() => {
     dispatch({
       type: "duplicate",
       sourceIndex: index,
       sourceZone: zoneCompound
     });
   }, [index, zoneCompound]);
-  const onDelete = (0, import_react21.useCallback)(() => {
+  const onDelete = (0, import_react23.useCallback)(() => {
     dispatch({
       type: "remove",
       index,
       zone: zoneCompound
     });
   }, [index, zoneCompound]);
-  const [hover, setHover] = (0, import_react21.useState)(false);
+  const [hover, setHover] = (0, import_react23.useState)(false);
   const indicativeHover = (ctx == null ? void 0 : ctx.hoveringComponent) === id;
-  (0, import_react21.useEffect)(() => {
+  (0, import_react23.useEffect)(() => {
     if (!ref.current) {
       return;
     }
@@ -3196,7 +3372,7 @@ var DraggableComponent = ({
     thisIsDragging,
     inDroppableZone
   ]);
-  (0, import_react21.useEffect)(() => {
+  (0, import_react23.useEffect)(() => {
     if (ref.current && disabled) {
       ref.current.setAttribute("data-puck-disabled", "");
       return () => {
@@ -3205,8 +3381,8 @@ var DraggableComponent = ({
       };
     }
   }, [disabled, ref]);
-  const [isVisible, setIsVisible] = (0, import_react21.useState)(false);
-  (0, import_react21.useEffect)(() => {
+  const [isVisible, setIsVisible] = (0, import_react23.useState)(false);
+  (0, import_react23.useEffect)(() => {
     sync();
     if ((isSelected || hover || indicativeHover) && !userIsDragging) {
       setIsVisible(true);
@@ -3214,7 +3390,7 @@ var DraggableComponent = ({
       setIsVisible(false);
     }
   }, [isSelected, hover, indicativeHover, iframe, state.data, userIsDragging]);
-  const syncActionsPosition = (0, import_react21.useCallback)(
+  const syncActionsPosition = (0, import_react23.useCallback)(
     (el) => {
       if (el) {
         const view = el.ownerDocument.defaultView;
@@ -3231,7 +3407,7 @@ var DraggableComponent = ({
     },
     [zoomConfig]
   );
-  (0, import_react21.useEffect)(() => {
+  (0, import_react23.useEffect)(() => {
     if (userDragAxis) {
       setDragAxis(userDragAxis);
       return;
@@ -3245,8 +3421,8 @@ var DraggableComponent = ({
     }
     setDragAxis(autoDragAxis);
   }, [ref, userDragAxis, autoDragAxis]);
-  const parentAction = (ctx == null ? void 0 : ctx.areaId) && (ctx == null ? void 0 : ctx.areaId) !== "root" && /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(ActionBar.Action, { onClick: onSelectParent, label: "Select parent", children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(CornerLeftUp, { size: 16 }) });
-  return /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)(
+  const parentAction = (ctx == null ? void 0 : ctx.areaId) && (ctx == null ? void 0 : ctx.areaId) !== "root" && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(ActionBar.Action, { onClick: onSelectParent, label: "Select parent", children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(CornerLeftUp, { size: 16 }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(
     DropZoneProvider,
     {
       value: __spreadProps(__spreadValues({}, ctx), {
@@ -3260,28 +3436,27 @@ var DraggableComponent = ({
       }),
       children: [
         isVisible && (0, import_react_dom2.createPortal)(
-          /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)(
+          /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(
             "div",
             {
               className: getClassName16({
                 isSelected,
                 isDragging: thisIsDragging,
-                isModifierHeld,
                 hover: hover || indicativeHover
               }),
               style: __spreadValues({}, style),
               "data-puck-overlay": true,
               children: [
                 debug,
-                isLoading && /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("div", { className: getClassName16("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(Loader, {}) }),
-                /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
+                isLoading && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className: getClassName16("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Loader, {}) }),
+                /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
                   "div",
                   {
                     className: getClassName16("actionsOverlay"),
                     style: {
                       top: actionsOverlayTop / zoomConfig.zoom
                     },
-                    children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
+                    children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
                       "div",
                       {
                         className: getClassName16("actions"),
@@ -3293,14 +3468,14 @@ var DraggableComponent = ({
                           paddingRight: actionsSide
                         },
                         ref: syncActionsPosition,
-                        children: /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)(
+                        children: /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(
                           CustomActionBar,
                           {
                             parentAction,
                             label: DEBUG2 ? id : label,
                             children: [
-                              permissions.duplicate && /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(ActionBar.Action, { onClick: onDuplicate, label: "Duplicate", children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(Copy, { size: 16 }) }),
-                              permissions.delete && /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(ActionBar.Action, { onClick: onDelete, label: "Delete", children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(Trash, { size: 16 }) })
+                              permissions.duplicate && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(ActionBar.Action, { onClick: onDuplicate, label: "Duplicate", children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Copy, { size: 16 }) }),
+                              permissions.delete && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(ActionBar.Action, { onClick: onDelete, label: "Delete", children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Trash, { size: 16 }) })
                             ]
                           }
                         )
@@ -3308,7 +3483,7 @@ var DraggableComponent = ({
                     )
                   }
                 ),
-                /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("div", { className: getClassName16("overlay") })
+                /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className: getClassName16("overlay") })
               ]
             }
           ),
@@ -3324,96 +3499,29 @@ var DraggableComponent = ({
 init_react_import();
 var styles_module_default12 = { "DropZone": "_DropZone_kmkdc_1", "DropZone--isActive": "_DropZone--isActive_kmkdc_10", "DropZone--hasChildren": "_DropZone--hasChildren_kmkdc_14", "DropZone--userIsDragging": "_DropZone--userIsDragging_kmkdc_22", "DropZone--isAreaSelected": "_DropZone--isAreaSelected_kmkdc_26", "DropZone--hoveringOverArea": "_DropZone--hoveringOverArea_kmkdc_27", "DropZone--isRootZone": "_DropZone--isRootZone_kmkdc_27", "DropZone--isDestination": "_DropZone--isDestination_kmkdc_37", "DropZone-item": "_DropZone-item_kmkdc_49", "DropZone-hitbox": "_DropZone-hitbox_kmkdc_53", "DropZone--isEnabled": "_DropZone--isEnabled_kmkdc_61", "DropZone--isAnimating": "_DropZone--isAnimating_kmkdc_70" };
 
-// components/DropZone/context.tsx
+// components/DropZone/lib/use-min-empty-height.ts
 init_react_import();
-var import_react22 = require("react");
-var import_jsx_runtime20 = require("react/jsx-runtime");
-var dropZoneContext = (0, import_react22.createContext)(null);
-var DropZoneProvider = ({
-  children,
-  value
+var import_react24 = require("react");
+var useMinEmptyHeight = ({
+  zoneCompound,
+  userMinEmptyHeight,
+  ref
 }) => {
-  const [hoveringComponent, setHoveringComponent] = (0, import_react22.useState)();
-  const [areasWithZones, setAreasWithZones] = (0, import_react22.useState)(
-    {}
-  );
-  const [activeZones, setActiveZones] = (0, import_react22.useState)({});
-  const { dispatch = null } = value ? value : {};
-  const registerZoneArea = (0, import_react22.useCallback)(
-    (area) => {
-      setAreasWithZones((latest) => __spreadProps(__spreadValues({}, latest), { [area]: true }));
-    },
-    [setAreasWithZones]
-  );
-  const registerZone = (0, import_react22.useCallback)(
-    (zoneCompound) => {
-      if (!dispatch) {
-        return;
-      }
-      dispatch({
-        type: "registerZone",
-        zone: zoneCompound
-      });
-      setActiveZones((latest) => __spreadProps(__spreadValues({}, latest), { [zoneCompound]: true }));
-    },
-    [setActiveZones, dispatch]
-  );
-  const unregisterZone = (0, import_react22.useCallback)(
-    (zoneCompound) => {
-      if (!dispatch) {
-        return;
-      }
-      dispatch({
-        type: "unregisterZone",
-        zone: zoneCompound
-      });
-      setActiveZones((latest) => __spreadProps(__spreadValues({}, latest), {
-        [zoneCompound]: false
-      }));
-    },
-    [setActiveZones, dispatch]
-  );
-  const memoValue = (0, import_react22.useMemo)(
-    () => __spreadValues({
-      hoveringComponent,
-      setHoveringComponent,
-      registerZoneArea,
-      areasWithZones,
-      registerZone,
-      unregisterZone,
-      activeZones
-    }, value),
-    [value, hoveringComponent, areasWithZones, activeZones]
-  );
-  return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(import_jsx_runtime20.Fragment, { children: memoValue && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(dropZoneContext.Provider, { value: memoValue, children }) });
-};
-
-// lib/insert.ts
-init_react_import();
-var insert = (list, index, item) => {
-  const result = Array.from(list);
-  result.splice(index, 0, item);
-  return result;
-};
-
-// components/DropZone/use-min-empty-height.ts
-init_react_import();
-var import_react23 = require("react");
-var useMinEmptyHeight = ({
-  draggedItem,
-  zoneCompound,
-  userMinEmptyHeight,
-  ref
-}) => {
-  const [prevHeight, setPrevHeight] = (0, import_react23.useState)(0);
-  const [isAnimating, setIsAnimating] = (0, import_react23.useState)(false);
-  (0, import_react23.useEffect)(() => {
-    if (draggedItem && ref.current) {
-      const componentData = draggedItem.data;
-      if (componentData.zone === zoneCompound) {
-        const rect = ref.current.getBoundingClientRect();
-        setPrevHeight(rect.height);
-        setIsAnimating(true);
+  const [prevHeight, setPrevHeight] = (0, import_react24.useState)(0);
+  const [isAnimating, setIsAnimating] = (0, import_react24.useState)(false);
+  const { draggedItem, isZone } = useContextStore(ZoneStoreContext, (s) => {
+    var _a, _b;
+    return {
+      draggedItem: ((_a = s.draggedItem) == null ? void 0 : _a.data.zone) === zoneCompound ? s.draggedItem : null,
+      isZone: ((_b = s.draggedItem) == null ? void 0 : _b.data.zone) === zoneCompound
+    };
+  });
+  (0, import_react24.useEffect)(() => {
+    if (draggedItem && ref.current) {
+      if (isZone) {
+        const rect = ref.current.getBoundingClientRect();
+        setPrevHeight(rect.height);
+        setIsAnimating(true);
         return;
       }
     }
@@ -3440,15 +3548,131 @@ function assignRefs(refs, node) {
   });
 }
 
-// components/DropZone/index.tsx
-var import_jsx_runtime21 = require("react/jsx-runtime");
-var getClassName17 = get_class_name_factory_default("DropZone", styles_module_default12);
-var DEBUG3 = false;
+// components/DropZone/lib/use-content-with-preview.ts
+init_react_import();
+var import_react27 = require("react");
+
+// lib/dnd/use-rendered-callback.ts
+init_react_import();
+var import_react25 = require("@dnd-kit/react");
+var import_react26 = require("react");
+function useRenderedCallback(callback, deps) {
+  const manager = (0, import_react25.useDragDropManager)();
+  return (0, import_react26.useCallback)(
+    (...args) => __async(this, null, function* () {
+      yield manager == null ? void 0 : manager.renderer.rendering;
+      return callback(...args);
+    }),
+    [...deps, manager]
+  );
+}
+
+// lib/insert.ts
+init_react_import();
+var insert = (list, index, item) => {
+  const result = Array.from(list);
+  result.splice(index, 0, item);
+  return result;
+};
+
+// components/DropZone/lib/use-content-with-preview.ts
+var useContentWithPreview = (content, zoneCompound) => {
+  const { draggedItemId, preview, previewExists } = useContextStore(
+    ZoneStoreContext,
+    (s) => {
+      var _a;
+      return {
+        draggedItemId: (_a = s.draggedItem) == null ? void 0 : _a.id,
+        preview: s.previewIndex[zoneCompound],
+        previewExists: Object.keys(s.previewIndex || {}).length > 0
+      };
+    }
+  );
+  const [contentWithPreview, setContentWithPreview] = (0, import_react27.useState)(content);
+  const updateContent = useRenderedCallback(
+    (content2, preview2) => {
+      if (preview2) {
+        if (preview2.type === "insert") {
+          setContentWithPreview(
+            insert(
+              content2.filter((item) => item.props.id !== preview2.props.id),
+              preview2.index,
+              {
+                type: "preview",
+                props: { id: preview2.props.id }
+              }
+            )
+          );
+        } else {
+          setContentWithPreview(
+            insert(
+              content2.filter((item) => item.props.id !== preview2.props.id),
+              preview2.index,
+              {
+                type: preview2.componentType,
+                props: preview2.props
+              }
+            )
+          );
+        }
+      } else {
+        setContentWithPreview(
+          previewExists ? content2.filter((item) => item.props.id !== draggedItemId) : content2
+        );
+      }
+    },
+    [draggedItemId, previewExists]
+  );
+  (0, import_react27.useEffect)(() => {
+    updateContent(content, preview);
+  }, [content, preview]);
+  return contentWithPreview;
+};
+
+// components/DropZone/lib/use-drag-axis.ts
+init_react_import();
+var import_react28 = require("react");
 var GRID_DRAG_AXIS = "dynamic";
 var FLEX_ROW_DRAG_AXIS = "x";
 var DEFAULT_DRAG_AXIS = "y";
-var DropZoneEdit = (0, import_react24.forwardRef)(
-  function DropZoneEdit2({
+var useDragAxis = (ref, collisionAxis) => {
+  const { status } = useAppContext();
+  const [dragAxis, setDragAxis] = (0, import_react28.useState)(
+    collisionAxis || DEFAULT_DRAG_AXIS
+  );
+  const calculateDragAxis = (0, import_react28.useCallback)(() => {
+    if (ref.current) {
+      const computedStyle = window.getComputedStyle(ref.current);
+      if (computedStyle.display === "grid") {
+        setDragAxis(GRID_DRAG_AXIS);
+      } else if (computedStyle.display === "flex" && computedStyle.flexDirection === "row") {
+        setDragAxis(FLEX_ROW_DRAG_AXIS);
+      } else {
+        setDragAxis(DEFAULT_DRAG_AXIS);
+      }
+    }
+  }, [ref.current]);
+  (0, import_react28.useEffect)(() => {
+    const onViewportChange = () => {
+      calculateDragAxis();
+    };
+    window.addEventListener("viewportchange", onViewportChange);
+    return () => {
+      window.removeEventListener("viewportchange", onViewportChange);
+    };
+  }, []);
+  (0, import_react28.useEffect)(calculateDragAxis, [status, collisionAxis]);
+  return [dragAxis, calculateDragAxis];
+};
+
+// components/DropZone/index.tsx
+var import_jsx_runtime22 = require("react/jsx-runtime");
+var getClassName17 = get_class_name_factory_default("DropZone", styles_module_default12);
+var getRandomColor = () => `#${Math.floor(Math.random() * 16777215).toString(16)}`;
+var RENDER_DEBUG = false;
+var DropZoneEditPure = (props) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(DropZoneEdit, __spreadValues({}, props));
+var DropZoneEdit = (0, import_react29.forwardRef)(
+  function DropZoneEditInternal({
     zone,
     allow,
     disallow,
@@ -3458,31 +3682,50 @@ var DropZoneEdit = (0, import_react24.forwardRef)(
     collisionAxis
   }, userRef) {
     const appContext2 = useAppContext();
-    const ctx = (0, import_react24.useContext)(dropZoneContext);
+    const ctx = (0, import_react29.useContext)(dropZoneContext);
     const {
       // These all need setting via context
       data,
       config,
       areaId,
-      draggedItem,
       registerZoneArea,
       depth,
       registerLocalZone,
       unregisterLocalZone,
-      deepestZone = rootDroppableId,
-      deepestArea,
-      nextDeepestArea,
       path = [],
       activeZones
     } = ctx;
-    const { itemSelector } = appContext2.state.ui;
     let zoneCompound = rootDroppableId;
-    (0, import_react24.useEffect)(() => {
+    if (areaId) {
+      if (zone !== rootDroppableId) {
+        zoneCompound = `${areaId}:${zone}`;
+      }
+    }
+    const isRootZone = zoneCompound === rootDroppableId || zone === rootDroppableId || areaId === "root";
+    const {
+      isDeepestZone,
+      inNextDeepestArea,
+      draggedComponentType,
+      userIsDragging,
+      preview
+    } = useContextStore(ZoneStoreContext, (s) => {
+      var _a, _b, _c;
+      return {
+        isDeepestZone: (_a = s.zoneDepthIndex[zoneCompound]) != null ? _a : false,
+        inNextDeepestArea: s.nextAreaDepthIndex[areaId || ""],
+        draggedItemId: (_b = s.draggedItem) == null ? void 0 : _b.id,
+        draggedComponentType: (_c = s.draggedItem) == null ? void 0 : _c.data.componentType,
+        userIsDragging: !!s.draggedItem,
+        preview: s.previewIndex[zoneCompound]
+      };
+    });
+    const { itemSelector } = appContext2.state.ui;
+    (0, import_react29.useEffect)(() => {
       if (areaId && registerZoneArea) {
         registerZoneArea(areaId);
       }
     }, [areaId]);
-    (0, import_react24.useEffect)(() => {
+    (0, import_react29.useEffect)(() => {
       if (ctx == null ? void 0 : ctx.registerZone) {
         ctx == null ? void 0 : ctx.registerZone(zoneCompound);
       }
@@ -3492,25 +3735,18 @@ var DropZoneEdit = (0, import_react24.forwardRef)(
         }
       };
     }, []);
-    if (areaId) {
-      if (zone !== rootDroppableId) {
-        zoneCompound = `${areaId}:${zone}`;
-      }
-    }
-    const content = (0, import_react24.useMemo)(() => {
+    const content = (0, import_react29.useMemo)(() => {
       if (areaId && zone !== rootDroppableId) {
         return setupZone(data, zoneCompound).zones[zoneCompound];
       }
       return data.content || [];
     }, [data, zoneCompound]);
-    const ref = (0, import_react24.useRef)(null);
-    const acceptsTarget = (0, import_react24.useCallback)(
-      (target) => {
-        if (!target) {
+    const ref = (0, import_react29.useRef)(null);
+    const acceptsTarget = (0, import_react29.useCallback)(
+      (componentType) => {
+        if (!componentType) {
           return true;
         }
-        const data2 = target.data;
-        const { componentType } = data2;
         if (disallow) {
           const defaultedAllow = allow || [];
           const filteredDisallow = (disallow || []).filter(
@@ -3528,49 +3764,26 @@ var DropZoneEdit = (0, import_react24.forwardRef)(
       },
       [allow, disallow]
     );
-    (0, import_react24.useEffect)(() => {
+    (0, import_react29.useEffect)(() => {
       if (registerLocalZone) {
-        registerLocalZone(zoneCompound, acceptsTarget(draggedItem));
+        registerLocalZone(zoneCompound, acceptsTarget(draggedComponentType));
       }
       return () => {
         if (unregisterLocalZone) {
           unregisterLocalZone(zoneCompound);
         }
       };
-    }, [draggedItem, zoneCompound]);
-    const isRootZone = zoneCompound === rootDroppableId || zone === rootDroppableId || areaId === "root";
-    const hoveringOverArea = nextDeepestArea ? nextDeepestArea === areaId : isRootZone;
-    const userIsDragging = !!draggedItem;
+    }, [draggedComponentType, zoneCompound]);
+    const hoveringOverArea = inNextDeepestArea || isRootZone;
     let isEnabled = true;
-    if (draggedItem) {
-      isEnabled = deepestZone === zoneCompound;
+    if (userIsDragging) {
+      isEnabled = isDeepestZone;
     }
     if (isEnabled) {
-      isEnabled = acceptsTarget(draggedItem);
-    }
-    const preview = (0, import_react24.useContext)(previewContext);
-    const previewInZone = (preview == null ? void 0 : preview.zone) === zoneCompound;
-    const contentWithPreview = (0, import_react24.useMemo)(() => {
-      let contentWithPreview2 = preview ? content.filter((item) => item.props.id !== preview.props.id) : content;
-      if (previewInZone) {
-        contentWithPreview2 = content.filter(
-          (item) => item.props.id !== preview.props.id
-        );
-        if (preview.type === "insert") {
-          contentWithPreview2 = insert(contentWithPreview2, preview.index, {
-            type: "preview",
-            props: { id: preview.props.id }
-          });
-        } else {
-          contentWithPreview2 = insert(contentWithPreview2, preview.index, {
-            type: preview.componentType,
-            props: preview.props
-          });
-        }
-      }
-      return contentWithPreview2;
-    }, [preview, content]);
-    const isDropEnabled = isEnabled && (previewInZone ? contentWithPreview.length === 1 : contentWithPreview.length === 0);
+      isEnabled = acceptsTarget(draggedComponentType);
+    }
+    const contentWithPreview = useContentWithPreview(content, zoneCompound);
+    const isDropEnabled = isEnabled && (preview ? contentWithPreview.length === 1 : contentWithPreview.length === 0);
     const droppableConfig = {
       id: zoneCompound,
       collisionPriority: isEnabled ? depth : 0,
@@ -3580,45 +3793,20 @@ var DropZoneEdit = (0, import_react24.forwardRef)(
       data: {
         areaId,
         depth,
-        isDroppableTarget: acceptsTarget(draggedItem),
+        isDroppableTarget: acceptsTarget(draggedComponentType),
         path
       }
     };
     const { ref: dropRef } = useDroppableSafe(droppableConfig);
     const selectedItem = itemSelector ? getItem(itemSelector, data) : null;
     const isAreaSelected = selectedItem && areaId === selectedItem.props.id;
-    const [dragAxis, setDragAxis] = (0, import_react24.useState)(
-      collisionAxis || DEFAULT_DRAG_AXIS
-    );
-    const calculateDragAxis = (0, import_react24.useCallback)(() => {
-      if (ref.current) {
-        const computedStyle = window.getComputedStyle(ref.current);
-        if (computedStyle.display === "grid") {
-          setDragAxis(GRID_DRAG_AXIS);
-        } else if (computedStyle.display === "flex" && computedStyle.flexDirection === "row") {
-          setDragAxis(FLEX_ROW_DRAG_AXIS);
-        } else {
-          setDragAxis(DEFAULT_DRAG_AXIS);
-        }
-      }
-    }, [ref.current]);
-    (0, import_react24.useEffect)(calculateDragAxis, [appContext2.status, collisionAxis]);
-    (0, import_react24.useEffect)(() => {
-      const onViewportChange = () => {
-        calculateDragAxis();
-      };
-      window.addEventListener("viewportchange", onViewportChange);
-      return () => {
-        window.removeEventListener("viewportchange", onViewportChange);
-      };
-    }, []);
+    const [dragAxis] = useDragAxis(ref, collisionAxis);
     const [minEmptyHeight, isAnimating] = useMinEmptyHeight({
-      draggedItem,
       zoneCompound,
       userMinEmptyHeight,
       ref
     });
-    return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(
+    return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
       "div",
       {
         className: `${getClassName17({
@@ -3638,87 +3826,93 @@ var DropZoneEdit = (0, import_react24.forwardRef)(
         "data-puck-dropzone": zoneCompound,
         "data-puck-dnd": zoneCompound,
         style: __spreadProps(__spreadValues({}, style), {
-          "--min-empty-height": `${minEmptyHeight}px`
+          "--min-empty-height": `${minEmptyHeight}px`,
+          backgroundColor: RENDER_DEBUG ? getRandomColor() : void 0
         }),
-        children: [
-          isRootZone && DEBUG3 && /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("div", { "data-puck-component": true, children: [
-            /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("p", { children: deepestZone || rootDroppableId }),
-            /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("p", { children: deepestArea || "No area" })
-          ] }),
-          contentWithPreview.map((item, i) => {
-            var _a, _b, _c, _d, _e;
-            const componentId = item.props.id;
-            const puckProps = {
-              renderDropZone: DropZone,
-              isEditing: true,
-              dragRef: null
+        children: contentWithPreview.map((item, i) => {
+          var _a, _b, _c, _d, _e, _f, _g;
+          const componentId = item.props.id;
+          const puckProps = {
+            renderDropZone: DropZoneEditPure,
+            isEditing: true,
+            dragRef: null
+          };
+          const defaultedProps = __spreadProps(__spreadValues(__spreadValues({}, (_a = config.components[item.type]) == null ? void 0 : _a.defaultProps), item.props), {
+            puck: puckProps,
+            editMode: true
+            // DEPRECATED
+          });
+          const isSelected = (selectedItem == null ? void 0 : selectedItem.props.id) === componentId || false;
+          let Render2 = config.components[item.type] && item.type !== "preview" ? config.components[item.type].render : () => /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { style: { padding: 48, textAlign: "center" }, children: [
+            "No configuration for ",
+            item.type
+          ] });
+          const componentConfig = config.components[item.type];
+          let componentType = item.type;
+          let label = (_b = componentConfig == null ? void 0 : componentConfig["label"]) != null ? _b : item.type.toString();
+          if (item.type === "preview") {
+            let Preview4 = function() {
+              return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(DrawerItemInner, { name: label, children: appContext2.overrides.componentItem });
             };
-            const defaultedProps = __spreadProps(__spreadValues(__spreadValues({}, (_a = config.components[item.type]) == null ? void 0 : _a.defaultProps), item.props), {
-              puck: puckProps,
-              editMode: true
-              // DEPRECATED
-            });
-            const isSelected = (selectedItem == null ? void 0 : selectedItem.props.id) === componentId || false;
-            let Render2 = config.components[item.type] ? config.components[item.type].render : () => /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("div", { style: { padding: 48, textAlign: "center" }, children: [
-              "No configuration for ",
-              item.type
-            ] });
-            const componentConfig = config.components[item.type];
-            let componentType = item.type;
-            let label = (_b = componentConfig == null ? void 0 : componentConfig["label"]) != null ? _b : item.type.toString();
-            if (item.type === "preview") {
-              let Preview3 = function() {
-                return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(DrawerItemInner, { name: label });
-              };
-              var Preview2 = Preview3;
-              componentType = preview.componentType;
-              label = (_d = (_c = config.components[componentType]) == null ? void 0 : _c.label) != null ? _d : preview.componentType;
-              Render2 = Preview3;
-            }
-            return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
-              DropZoneProvider,
-              {
-                value: __spreadProps(__spreadValues({}, ctx), { path: [...path, zoneCompound] }),
-                children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
-                  DraggableComponent,
-                  {
-                    id: componentId,
-                    componentType,
-                    zoneCompound,
-                    depth: depth + 1,
-                    index: i,
-                    isLoading: ((_e = appContext2.componentState[componentId]) == null ? void 0 : _e.loadingCount) > 0,
-                    isSelected,
-                    label,
-                    isEnabled,
-                    autoDragAxis: dragAxis,
-                    userDragAxis: collisionAxis,
-                    inDroppableZone: acceptsTarget(draggedItem),
-                    children: (dragRef) => (componentConfig == null ? void 0 : componentConfig.inline) ? /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
-                      Render2,
-                      __spreadProps(__spreadValues({}, defaultedProps), {
-                        puck: __spreadProps(__spreadValues({}, defaultedProps.puck), {
-                          dragRef
-                        })
+            var Preview3 = Preview4;
+            componentType = (_c = preview == null ? void 0 : preview.componentType) != null ? _c : "__preview";
+            label = (_f = (_e = (_d = config.components[componentType]) == null ? void 0 : _d.label) != null ? _e : componentType) != null ? _f : "Preview";
+            Render2 = Preview4;
+          }
+          return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+            DropZoneProvider,
+            {
+              value: __spreadProps(__spreadValues({}, ctx), { path: [...path, zoneCompound] }),
+              children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+                DraggableComponent,
+                {
+                  id: componentId,
+                  componentType,
+                  zoneCompound,
+                  depth: depth + 1,
+                  index: i,
+                  isLoading: ((_g = appContext2.componentState[componentId]) == null ? void 0 : _g.loadingCount) > 0,
+                  isSelected,
+                  label,
+                  isEnabled,
+                  autoDragAxis: dragAxis,
+                  userDragAxis: collisionAxis,
+                  inDroppableZone: acceptsTarget(draggedComponentType),
+                  children: (dragRef) => (componentConfig == null ? void 0 : componentConfig.inline) ? /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+                    Render2,
+                    __spreadProps(__spreadValues({}, defaultedProps), {
+                      puck: __spreadProps(__spreadValues({}, defaultedProps.puck), {
+                        dragRef
                       })
-                    ) : /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { ref: dragRef, children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Render2, __spreadValues({}, defaultedProps)) })
-                  }
-                )
-              },
-              componentId
-            );
-          })
-        ]
+                    })
+                  ) : /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { ref: dragRef, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Render2, __spreadValues({}, defaultedProps)) })
+                }
+              )
+            },
+            componentId
+          );
+        })
       }
     );
   }
 );
-var DropZoneRender = (0, import_react24.forwardRef)(
-  function DropZoneRender2({ className, style, zone }, ref) {
-    const ctx = (0, import_react24.useContext)(dropZoneContext);
+var DropZoneRenderPure = (props) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(DropZoneRender, __spreadValues({}, props));
+var DropZoneRender = (0, import_react29.forwardRef)(
+  function DropZoneRenderInternal({ className, style, zone }, ref) {
+    const ctx = (0, import_react29.useContext)(dropZoneContext);
     const { data, areaId = "root", config } = ctx || {};
     let zoneCompound = rootDroppableId;
     let content = (data == null ? void 0 : data.content) || [];
+    (0, import_react29.useEffect)(() => {
+      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);
+        }
+      };
+    }, []);
     if (!data || !config) {
       return null;
     }
@@ -3726,10 +3920,10 @@ var DropZoneRender = (0, import_react24.forwardRef)(
       zoneCompound = `${areaId}:${zone}`;
       content = setupZone(data, zoneCompound).zones[zoneCompound];
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className, style, ref, children: content.map((item) => {
+    return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { className, style, ref, children: content.map((item) => {
       const Component = config.components[item.type];
       if (Component) {
-        return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+        return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
           DropZoneProvider,
           {
             value: {
@@ -3739,10 +3933,12 @@ var DropZoneRender = (0, import_react24.forwardRef)(
               depth: 1,
               path: []
             },
-            children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+            children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
               Component.render,
               __spreadProps(__spreadValues({}, item.props), {
-                puck: { renderDropZone: DropZoneRender2 }
+                puck: {
+                  renderDropZone: DropZoneRenderPure
+                }
               })
             )
           },
@@ -3753,13 +3949,13 @@ var DropZoneRender = (0, import_react24.forwardRef)(
     }) });
   }
 );
-var DropZone = (0, import_react24.forwardRef)(
+var DropZone = (0, import_react29.forwardRef)(
   function DropZone2(props, ref) {
-    const ctx = (0, import_react24.useContext)(dropZoneContext);
+    const ctx = (0, import_react29.useContext)(dropZoneContext);
     if ((ctx == null ? void 0 : ctx.mode) === "edit") {
-      return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(import_jsx_runtime21.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(DropZoneEdit, __spreadProps(__spreadValues({}, props), { ref })) });
+      return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(import_jsx_runtime22.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(DropZoneEdit, __spreadProps(__spreadValues({}, props), { ref })) });
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(import_jsx_runtime21.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(DropZoneRender, __spreadProps(__spreadValues({}, props), { ref })) });
+    return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(import_jsx_runtime22.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(DropZoneRender, __spreadProps(__spreadValues({}, props), { ref })) });
   }
 );
 
@@ -3775,7 +3971,7 @@ var getZoneId = (zoneCompound) => {
   return [rootDroppableId, zoneCompound];
 };
 
-// components/DragDropContext/NestedDroppablePlugin.ts
+// lib/dnd/NestedDroppablePlugin.ts
 init_react_import();
 var import_abstract9 = require("@dnd-kit/abstract");
 var import_state = require("@dnd-kit/state");
@@ -3817,7 +4013,49 @@ var getFrame = () => {
   return (frameEl == null ? void 0 : frameEl.ownerDocument) || document;
 };
 
-// components/DragDropContext/NestedDroppablePlugin.ts
+// lib/global-position.ts
+init_react_import();
+var GlobalPosition = class {
+  constructor(target, original) {
+    this.scaleFactor = 1;
+    this.frameEl = null;
+    this.frameRect = null;
+    var _a;
+    this.target = target;
+    this.original = original;
+    this.frameEl = document.querySelector("iframe");
+    if (this.frameEl) {
+      this.frameRect = this.frameEl.getBoundingClientRect();
+      this.scaleFactor = this.frameRect.width / (((_a = this.frameEl.contentWindow) == null ? void 0 : _a.innerWidth) || 1);
+    }
+  }
+  get x() {
+    return this.original.x;
+  }
+  get y() {
+    return this.original.y;
+  }
+  get global() {
+    if (document !== this.target.ownerDocument && this.frameRect) {
+      return {
+        x: this.x * this.scaleFactor + this.frameRect.left,
+        y: this.y * this.scaleFactor + this.frameRect.top
+      };
+    }
+    return this.original;
+  }
+  get frame() {
+    if (document === this.target.ownerDocument && this.frameRect) {
+      return {
+        x: (this.x - this.frameRect.left) / this.scaleFactor,
+        y: (this.y - this.frameRect.top) / this.scaleFactor
+      };
+    }
+    return this.original;
+  }
+};
+
+// lib/dnd/NestedDroppablePlugin.ts
 var depthSort = (candidates) => {
   return candidates.sort((a, b) => {
     const aData = a.data;
@@ -3846,10 +4084,12 @@ var getZoneId2 = (candidate) => {
   }
   return id;
 };
-var getPointerCollisions = (position, manager, ownerDocument) => {
-  var _a;
+var getPointerCollisions = (position, manager) => {
   const candidates = [];
-  let elements = ownerDocument.elementsFromPoint(position.x, position.y);
+  let elements = position.target.ownerDocument.elementsFromPoint(
+    position.x,
+    position.y
+  );
   const previewFrame = elements.find(
     (el) => el.getAttribute("data-puck-preview")
   );
@@ -3858,17 +4098,9 @@ var getPointerCollisions = (position, manager, ownerDocument) => {
     elements = [drawer];
   }
   if (previewFrame) {
-    const iframe = previewFrame.querySelector("iframe");
-    if (iframe) {
-      const rect = iframe.getBoundingClientRect();
-      const frame = getFrame();
-      if (frame) {
-        const scaleFactor = rect.width / (((_a = iframe.contentWindow) == null ? void 0 : _a.innerWidth) || 1);
-        elements = frame.elementsFromPoint(
-          (position.x - rect.left) / scaleFactor,
-          (position.y - rect.top) / scaleFactor
-        );
-      }
+    const frame = getFrame();
+    if (frame) {
+      elements = frame.elementsFromPoint(position.frame.x, position.frame.y);
     }
   }
   if (elements) {
@@ -3885,9 +4117,9 @@ var getPointerCollisions = (position, manager, ownerDocument) => {
   }
   return candidates;
 };
-var findDeepestCandidate = (position, manager, ownerDocument) => {
+var findDeepestCandidate = (position, manager) => {
   var _a;
-  const candidates = getPointerCollisions(position, manager, ownerDocument);
+  const candidates = getPointerCollisions(position, manager);
   if (candidates.length > 0) {
     const sortedCandidates = depthSort(candidates);
     const draggable = manager.dragOperation.source;
@@ -3932,9 +4164,7 @@ var findDeepestCandidate = (position, manager, ownerDocument) => {
     area: null
   };
 };
-var createNestedDroppablePlugin = ({
-  onChange
-}) => class NestedDroppablePlugin extends import_abstract9.Plugin {
+var createNestedDroppablePlugin = ({ onChange }, id) => class NestedDroppablePlugin extends import_abstract9.Plugin {
   constructor(manager, options) {
     super(manager);
     if (typeof window === "undefined") {
@@ -3942,16 +4172,19 @@ var createNestedDroppablePlugin = ({
     }
     const cleanupEffect = (0, import_state.effects)(() => {
       const handleMove = (event) => {
-        const position = {
+        const target = event.originalTarget || event.target;
+        const position = new GlobalPosition(target, {
           x: event.clientX,
           y: event.clientY
-        };
-        const target = event.originalTarget || event.target;
-        const ownerDocument = target == null ? void 0 : target.ownerDocument;
-        onChange(
-          findDeepestCandidate(position, manager, ownerDocument),
-          manager
+        });
+        const elements = document.elementsFromPoint(
+          position.global.x,
+          position.global.y
         );
+        const overEl = elements.some((el) => el.id === id);
+        if (overEl) {
+          onChange(findDeepestCandidate(position, manager), manager);
+        }
       };
       const handleMoveThrottled = throttle(handleMove, 50);
       const handlePointerMove = (event) => {
@@ -4281,6 +4514,11 @@ var reduceUi = (ui, action) => {
       itemSelector: { index: action.sourceIndex + 1, zone: action.sourceZone }
     });
   }
+  if (action.type === "remove") {
+    return __spreadProps(__spreadValues({}, ui), {
+      itemSelector: null
+    });
+  }
   return ui;
 };
 
@@ -4368,7 +4606,7 @@ var insertComponent = (componentType, zone, index, {
 var import_use_debounce2 = require("use-debounce");
 var import_utilities2 = require("@dnd-kit/dom/utilities");
 
-// components/DragDropContext/PointerSensor.ts
+// lib/dnd/PointerSensor.ts
 init_react_import();
 var import_state3 = require("@dnd-kit/state");
 var import_abstract10 = require("@dnd-kit/abstract");
@@ -4531,6 +4769,9 @@ var _PointerSensor = class _PointerSensor extends import_abstract10.Sensor {
     }
   }
   handlePointerUp(event) {
+    if (!this.source) {
+      return;
+    }
     event.preventDefault();
     event.stopPropagation();
     const { status } = this.manager.dragOperation;
@@ -4630,13 +4871,15 @@ function patchWindow(window2) {
 }
 
 // components/DragDropContext/index.tsx
-var import_jsx_runtime22 = require("react/jsx-runtime");
-var dragListenerContext = (0, import_react26.createContext)({
+var import_zustand3 = require("zustand");
+var import_jsx_runtime23 = require("react/jsx-runtime");
+var DEBUG3 = false;
+var dragListenerContext = (0, import_react31.createContext)({
   dragListeners: {}
 });
 function useDragListener(type, fn, deps = []) {
-  const { setDragListeners } = (0, import_react26.useContext)(dragListenerContext);
-  (0, import_react26.useEffect)(() => {
+  const { setDragListeners } = (0, import_react31.useContext)(dragListenerContext);
+  (0, import_react31.useEffect)(() => {
     if (setDragListeners) {
       setDragListeners((old) => __spreadProps(__spreadValues({}, old), {
         [type]: [...old[type] || [], fn]
@@ -4644,80 +4887,147 @@ function useDragListener(type, fn, deps = []) {
     }
   }, deps);
 }
-var previewContext = (0, import_react26.createContext)(null);
 var AREA_CHANGE_DEBOUNCE_MS = 100;
+var useTempDisableFallback = (timeout3) => {
+  const lastFallbackDisable = (0, import_react31.useRef)(null);
+  return (0, import_react31.useCallback)((manager) => {
+    collisionStore.setState({ fallbackEnabled: false });
+    const fallbackId = generateId();
+    lastFallbackDisable.current = fallbackId;
+    setTimeout(() => {
+      if (lastFallbackDisable.current === fallbackId) {
+        collisionStore.setState({ fallbackEnabled: true });
+        manager.collisionObserver.forceUpdate(true);
+      }
+    }, timeout3);
+  }, []);
+};
 var DragDropContextClient = ({
   children,
   disableAutoScroll
 }) => {
   const { state, config, dispatch, resolveData } = useAppContext();
-  const [preview, setPreview] = (0, import_react26.useState)(null);
-  const previewRef = (0, import_react26.useRef)(null);
+  const id = (0, import_react31.useId)();
   const { data } = state;
-  const [deepest, setDeepest] = (0, import_react26.useState)(null);
-  const [nextDeepest, setNextDeepest] = (0, import_react26.useState)(null);
-  const deepestRef = (0, import_react26.useRef)(deepest);
-  const debouncedParamsRef = (0, import_react26.useRef)(null);
-  const setDeepestAndCollide = (0, import_react26.useCallback)(
+  const debouncedParamsRef = (0, import_react31.useRef)(null);
+  const tempDisableFallback = useTempDisableFallback(100);
+  const [zoneStore] = (0, import_react31.useState)(
+    () => (0, import_zustand3.createStore)(() => ({
+      zoneDepthIndex: {},
+      nextZoneDepthIndex: {},
+      areaDepthIndex: {},
+      nextAreaDepthIndex: {},
+      draggedItem: null,
+      previewIndex: {}
+    }))
+  );
+  const getChanged2 = (0, import_react31.useCallback)(
+    (params, id2) => {
+      const { zoneDepthIndex = {}, areaDepthIndex = {} } = zoneStore.getState() || {};
+      const stateHasZone = Object.keys(zoneDepthIndex).length > 0;
+      const stateHasArea = Object.keys(areaDepthIndex).length > 0;
+      let zoneChanged = false;
+      let areaChanged = false;
+      if (params.zone && !zoneDepthIndex[params.zone]) {
+        zoneChanged = true;
+      } else if (!params.zone && stateHasZone) {
+        zoneChanged = true;
+      }
+      if (params.area && !areaDepthIndex[params.area]) {
+        areaChanged = true;
+      } else if (!params.area && stateHasArea) {
+        areaChanged = true;
+      }
+      return { zoneChanged, areaChanged };
+    },
+    [zoneStore]
+  );
+  const setDeepestAndCollide = (0, import_react31.useCallback)(
     (params, manager) => {
-      setDeepest(params);
+      const { zoneChanged, areaChanged } = getChanged2(params, id);
+      if (!zoneChanged && !areaChanged) return;
+      zoneStore.setState({
+        zoneDepthIndex: params.zone ? { [params.zone]: true } : {},
+        areaDepthIndex: params.area ? { [params.area]: true } : {}
+      });
+      tempDisableFallback(manager);
       setTimeout(() => {
         manager.collisionObserver.forceUpdate(true);
       }, 50);
       debouncedParamsRef.current = null;
     },
-    []
+    [zoneStore]
   );
   const setDeepestDb = (0, import_use_debounce2.useDebouncedCallback)(
     setDeepestAndCollide,
     AREA_CHANGE_DEBOUNCE_MS
   );
-  (0, import_react26.useEffect)(() => {
-    deepestRef.current = deepest;
-  }, [deepest]);
   const cancelDb = () => {
     setDeepestDb.cancel();
     debouncedParamsRef.current = null;
   };
-  const [plugins] = (0, import_react26.useState)(() => [
-    ...disableAutoScroll ? import_dom.defaultPreset.plugins.filter((plugin) => plugin !== import_dom.AutoScroller) : import_dom.defaultPreset.plugins,
-    createNestedDroppablePlugin({
-      onChange: (params, manager) => {
-        const lastParams = deepestRef.current;
-        const areaChanged = params.area !== (lastParams == null ? void 0 : lastParams.area);
-        const zoneChanged = params.zone !== (lastParams == null ? void 0 : lastParams.zone);
-        const isDragging = manager.dragOperation.status.dragging;
-        if (areaChanged || zoneChanged) {
-          setNextDeepest(params);
-        }
-        if (params.zone !== "void" && (lastParams == null ? void 0 : lastParams.zone) === "void") {
-          setDeepest(params);
-          manager.collisionObserver.forceUpdate(true);
-          return;
+  (0, import_react31.useEffect)(() => {
+    if (DEBUG3) {
+      zoneStore.subscribe(
+        (s) => {
+          var _a, _b;
+          return console.log(
+            s.previewIndex,
+            (_a = Object.entries(s.zoneDepthIndex || {})[0]) == null ? void 0 : _a[0],
+            (_b = Object.entries(s.areaDepthIndex || {})[0]) == null ? void 0 : _b[0]
+          );
         }
-        if (areaChanged) {
-          if (isDragging) {
-            const debouncedParams = debouncedParamsRef.current;
-            const isSameParams = debouncedParams && debouncedParams.area === params.area && debouncedParams.zone === params.zone;
-            if (!isSameParams) {
+      );
+    }
+  }, []);
+  const [plugins] = (0, import_react31.useState)(() => [
+    ...disableAutoScroll ? import_dom.defaultPreset.plugins.filter((plugin) => plugin !== import_dom.AutoScroller) : import_dom.defaultPreset.plugins,
+    createNestedDroppablePlugin(
+      {
+        onChange: (params, manager) => {
+          const state2 = zoneStore.getState();
+          const { zoneChanged, areaChanged } = getChanged2(params, id);
+          const isDragging = manager.dragOperation.status.dragging;
+          if (areaChanged || zoneChanged) {
+            let nextZoneDepthIndex = {};
+            let nextAreaDepthIndex = {};
+            if (params.zone) {
+              nextZoneDepthIndex = { [params.zone]: true };
+            }
+            if (params.area) {
+              nextAreaDepthIndex = { [params.area]: true };
+            }
+            zoneStore.setState({ nextZoneDepthIndex, nextAreaDepthIndex });
+          }
+          if (params.zone !== "void" && (state2 == null ? void 0 : state2.zoneDepthIndex["void"])) {
+            setDeepestAndCollide(params, manager);
+            return;
+          }
+          if (areaChanged) {
+            if (isDragging) {
+              const debouncedParams = debouncedParamsRef.current;
+              const isSameParams = debouncedParams && debouncedParams.area === params.area && debouncedParams.zone === params.zone;
+              if (!isSameParams) {
+                cancelDb();
+                setDeepestDb(params, manager);
+                debouncedParamsRef.current = params;
+              }
+            } else {
               cancelDb();
-              setDeepestDb(params, manager);
-              debouncedParamsRef.current = params;
+              setDeepestAndCollide(params, manager);
             }
-          } else {
-            cancelDb();
+            return;
+          }
+          if (zoneChanged) {
             setDeepestAndCollide(params, manager);
           }
-          return;
+          cancelDb();
         }
-        if (zoneChanged) {
-          setDeepestAndCollide(params, manager);
-        }
-        cancelDb();
-      }
-    })
+      },
+      id
+    )
   ]);
-  const [sensors] = (0, import_react26.useState)(() => [
+  const [sensors] = (0, import_react31.useState)(() => [
     PointerSensor.configure({
       activationConstraints(event, source) {
         var _a;
@@ -4736,67 +5046,72 @@ var DragDropContextClient = ({
       }
     })
   ]);
-  const [draggedItem, setDraggedItem] = (0, import_react26.useState)();
-  const [dragListeners, setDragListeners] = (0, import_react26.useState)({});
-  const [pathData, setPathData] = (0, import_react26.useState)();
-  const dragMode = (0, import_react26.useRef)(null);
-  const registerPath = (0, import_react26.useCallback)(
-    (selector) => {
-      const item = getItem(selector, data);
-      if (!item) {
-        return;
-      }
+  const [dragListeners, setDragListeners] = (0, import_react31.useState)({});
+  const [pathData, setPathData] = (0, import_react31.useState)();
+  const dragMode = (0, import_react31.useRef)(null);
+  const registerPath = (0, import_react31.useCallback)(
+    (id2, selector, label) => {
       const [area] = getZoneId(selector.zone);
       setPathData((latestPathData = {}) => {
         const parentPathData = latestPathData[area] || { path: [] };
         return __spreadProps(__spreadValues({}, latestPathData), {
-          [item.props.id]: {
+          [id2]: {
             path: [
               ...parentPathData.path,
               ...selector.zone ? [selector.zone] : []
             ],
-            label: item.type
+            label
           }
         });
       });
     },
     [data, setPathData]
   );
-  const initialSelector = (0, import_react26.useRef)(void 0);
-  return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+  const unregisterPath = (0, import_react31.useCallback)(
+    (id2) => {
+      setPathData((latestPathData = {}) => {
+        const newPathData = __spreadValues({}, latestPathData);
+        delete newPathData[id2];
+        return newPathData;
+      });
+    },
+    [data, setPathData]
+  );
+  const initialSelector = (0, import_react31.useRef)(void 0);
+  return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { id, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
     dragListenerContext.Provider,
     {
       value: {
         dragListeners,
         setDragListeners
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(previewContext.Provider, { value: preview, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
-        import_react25.DragDropProvider,
+      children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+        import_react30.DragDropProvider,
         {
           plugins,
           sensors,
           onDragEnd: (event, manager) => {
+            var _a;
             const { source, target } = event.operation;
-            deepestRef.current = null;
             if (!source) {
-              setDraggedItem(null);
+              zoneStore.setState({ draggedItem: null });
               return;
             }
             const { zone, index } = source.data;
-            const thisPreview = previewRef.current ? __spreadValues({}, previewRef.current) : null;
-            previewRef.current = null;
+            const { previewIndex = {} } = zoneStore.getState() || {};
+            const thisPreview = ((_a = previewIndex[zone]) == null ? void 0 : _a.props.id) === source.id ? previewIndex[zone] : null;
             setTimeout(() => {
-              var _a, _b;
-              setDraggedItem(null);
+              var _a2, _b;
+              zoneStore.setState({ draggedItem: null });
               if (event.canceled || (target == null ? void 0 : target.type) === "void") {
-                setPreview(null);
-                (_a = dragListeners.dragend) == null ? void 0 : _a.forEach((fn) => {
+                zoneStore.setState({ previewIndex: {} });
+                (_a2 = dragListeners.dragend) == null ? void 0 : _a2.forEach((fn) => {
                   fn(event, manager);
                 });
                 return;
               }
               if (thisPreview) {
-                setPreview(null);
+                zoneStore.setState({ previewIndex: {} });
                 if (thisPreview.type === "insert") {
                   insertComponent(
                     thisPreview.componentType,
@@ -4831,8 +5146,9 @@ var DragDropContextClient = ({
             }, 250);
           },
           onDragOver: (event, manager) => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             event.preventDefault();
+            const draggedItem = (_a = zoneStore.getState()) == null ? void 0 : _a.draggedItem;
             if (!draggedItem) return;
             cancelDb();
             const { source, target } = event.operation;
@@ -4848,7 +5164,7 @@ var DragDropContextClient = ({
               const targetData = target.data;
               targetZone = targetData.zone;
               targetIndex = targetData.index;
-              const collisionData = (_b = (_a = manager.dragOperation.data) == null ? void 0 : _a.collisionMap) == null ? void 0 : _b[targetId];
+              const collisionData = (_c = (_b = manager.dragOperation.data) == null ? void 0 : _b.collisionMap) == null ? void 0 : _c[targetId];
               const collisionPosition = (collisionData == null ? void 0 : collisionData.direction) === "up" || (collisionData == null ? void 0 : collisionData.direction) === "left" ? "before" : "after";
               if (targetIndex >= sourceIndex && sourceZone === targetZone) {
                 targetIndex = targetIndex - 1;
@@ -4860,23 +5176,26 @@ var DragDropContextClient = ({
               targetZone = target.id.toString();
               targetIndex = 0;
             }
-            if (targetId === sourceId || ((_c = pathData == null ? void 0 : pathData[target.id]) == null ? void 0 : _c.path.find((path) => {
+            if (targetId === sourceId || ((_d = pathData == null ? void 0 : pathData[target.id]) == null ? void 0 : _d.path.find((path) => {
               const [pathId] = path.split(":");
               return pathId === sourceId;
             }))) {
               return;
             }
             if (dragMode.current === "new") {
-              previewRef.current = {
-                componentType: sourceData.componentType,
-                type: "insert",
-                index: targetIndex,
-                zone: targetZone,
-                props: {
-                  id: source.id.toString()
+              zoneStore.setState({
+                previewIndex: {
+                  [targetZone]: {
+                    componentType: sourceData.componentType,
+                    type: "insert",
+                    index: targetIndex,
+                    zone: targetZone,
+                    props: {
+                      id: source.id.toString()
+                    }
+                  }
                 }
-              };
-              setPreview(previewRef.current);
+              });
             } else {
               if (!initialSelector.current) {
                 initialSelector.current = {
@@ -4886,17 +5205,20 @@ var DragDropContextClient = ({
               }
               const item = getItem(initialSelector.current, data);
               if (item) {
-                previewRef.current = {
-                  componentType: sourceData.componentType,
-                  type: "move",
-                  index: targetIndex,
-                  zone: targetZone,
-                  props: item.props
-                };
-                setPreview(previewRef.current);
+                zoneStore.setState({
+                  previewIndex: {
+                    [targetZone]: {
+                      componentType: sourceData.componentType,
+                      type: "move",
+                      index: targetIndex,
+                      zone: targetZone,
+                      props: item.props
+                    }
+                  }
+                });
               }
             }
-            (_d = dragListeners.dragover) == null ? void 0 : _d.forEach((fn) => {
+            (_e = dragListeners.dragover) == null ? void 0 : _e.forEach((fn) => {
               fn(event, manager);
             });
           },
@@ -4906,46 +5228,62 @@ var DragDropContextClient = ({
               type: "setUi",
               ui: { itemSelector: null, isDragging: true }
             });
+            const { source } = event.operation;
+            if (source && source.type !== "void") {
+              const sourceData = source.data;
+              const item = getItem(
+                {
+                  zone: sourceData.zone,
+                  index: sourceData.index
+                },
+                data
+              );
+              if (item) {
+                zoneStore.setState({
+                  previewIndex: {
+                    [sourceData.zone]: {
+                      componentType: sourceData.componentType,
+                      type: "move",
+                      index: sourceData.index,
+                      zone: sourceData.zone,
+                      props: item.props
+                    }
+                  }
+                });
+              }
+            }
             (_a = dragListeners.dragstart) == null ? void 0 : _a.forEach((fn) => {
               fn(event, manager);
             });
           },
           onBeforeDragStart: (event) => {
             var _a;
-            if (draggedItem) {
-              console.warn("New drag started before previous drag cleaned up");
-            }
             const isNewComponent = ((_a = event.operation.source) == null ? void 0 : _a.data.type) === "drawer";
             dragMode.current = isNewComponent ? "new" : "existing";
             initialSelector.current = void 0;
-            setDraggedItem(event.operation.source);
+            zoneStore.setState({ draggedItem: event.operation.source });
           },
-          children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+          children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(ZoneStoreProvider, { store: zoneStore, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
             DropZoneProvider,
             {
               value: {
                 data,
                 config,
-                dispatch,
-                draggedItem,
                 mode: "edit",
                 areaId: "root",
                 depth: 0,
                 registerPath,
+                unregisterPath,
                 pathData,
-                deepestZone: deepest == null ? void 0 : deepest.zone,
-                deepestArea: deepest == null ? void 0 : deepest.area,
-                nextDeepestZone: nextDeepest == null ? void 0 : nextDeepest.zone,
-                nextDeepestArea: nextDeepest == null ? void 0 : nextDeepest.area,
                 path: []
               },
               children
             }
-          )
+          ) })
         }
-      ) })
+      )
     }
-  );
+  ) });
 };
 var DragDropContext = ({
   children,
@@ -4955,11 +5293,11 @@ var DragDropContext = ({
   if (status === "LOADING") {
     return children;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(DragDropContextClient, { disableAutoScroll, children });
+  return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DragDropContextClient, { disableAutoScroll, children });
 };
 
 // components/Drawer/index.tsx
-var import_jsx_runtime23 = require("react/jsx-runtime");
+var import_jsx_runtime24 = 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);
 var DrawerItemInner = ({
@@ -4969,11 +5307,11 @@ var DrawerItemInner = ({
   dragRef,
   isDragDisabled
 }) => {
-  const CustomInner = (0, import_react27.useMemo)(
-    () => children || (({ children: children2 }) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { className: getClassNameItem2("default"), children: children2 })),
+  const CustomInner = (0, import_react32.useMemo)(
+    () => children || (({ children: children2 }) => /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { className: getClassNameItem2("default"), children: children2 })),
     [children]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
     "div",
     {
       className: getClassNameItem2({ disabled: isDragDisabled }),
@@ -4981,9 +5319,9 @@ var DrawerItemInner = ({
       onMouseDown: (e) => e.preventDefault(),
       "data-testid": dragRef ? `drawer-item:${name}` : "",
       "data-puck-drawer-item": true,
-      children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(CustomInner, { name, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { className: getClassNameItem2("draggableWrapper"), children: /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { className: getClassNameItem2("draggable"), children: [
-        /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { className: getClassNameItem2("name"), children: label != null ? label : name }),
-        /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { className: getClassNameItem2("icon"), children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DragIcon, {}) })
+      children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(CustomInner, { name, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { className: getClassNameItem2("draggableWrapper"), children: /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { className: getClassNameItem2("draggable"), children: [
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { className: getClassNameItem2("name"), children: label != null ? label : name }),
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { className: getClassNameItem2("icon"), children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DragIcon, {}) })
       ] }) }) })
     }
   );
@@ -5000,9 +5338,9 @@ var DrawerItemDraggable = ({
     data: { type: "drawer", componentType: name },
     disabled: isDragDisabled
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { className: getClassName18("draggable"), children: [
-    /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { className: getClassName18("draggableBg"), children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DrawerItemInner, { name, label, children }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { className: getClassName18("draggableFg"), children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { className: getClassName18("draggable"), children: [
+    /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { className: getClassName18("draggableBg"), children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DrawerItemInner, { name, label, children }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { className: getClassName18("draggableFg"), children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
       DrawerItemInner,
       {
         name,
@@ -5023,7 +5361,7 @@ var DrawerItem = ({
   isDragDisabled
 }) => {
   const resolvedId = id || name;
-  const [dynamicId, setDynamicId] = (0, import_react27.useState)(generateId(resolvedId));
+  const [dynamicId, setDynamicId] = (0, import_react32.useState)(generateId(resolvedId));
   if (typeof index !== "undefined") {
     console.error(
       "Warning: The `index` prop on Drawer.Item is deprecated and no longer required."
@@ -5036,7 +5374,7 @@ var DrawerItem = ({
     },
     [resolvedId]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
     DrawerItemDraggable,
     {
       name,
@@ -5062,14 +5400,14 @@ var Drawer = ({
       "Warning: The `direction` prop on Drawer is deprecated and no longer required to achieve multi-directional dragging."
     );
   }
-  const [id] = (0, import_react27.useState)(generateId());
+  const id = (0, import_react32.useId)();
   const { ref } = useDroppableSafe({
     id,
     type: "void",
     collisionPriority: 0
     // Never collide with this, but we use it so NestedDroppablePlugin respects the Drawer
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
     "div",
     {
       className: getClassName18(),
@@ -5084,7 +5422,7 @@ Drawer.Item = DrawerItem;
 
 // components/Puck/index.tsx
 init_react_import();
-var import_react42 = require("react");
+var import_react50 = require("react");
 
 // components/SidebarSection/index.tsx
 init_react_import();
@@ -5095,7 +5433,7 @@ var styles_module_default13 = { "SidebarSection": "_SidebarSection_125qe_1", "Si
 
 // lib/use-breadcrumbs.ts
 init_react_import();
-var import_react28 = require("react");
+var import_react33 = require("react");
 var convertPathDataToBreadcrumbs = (selectedItem, pathData, data) => {
   const id = selectedItem ? selectedItem == null ? void 0 : selectedItem.props.id : "";
   const currentPathData = pathData && id && pathData[id] ? __spreadValues({}, pathData[id]) : { label: "Page", path: [] };
@@ -5145,8 +5483,8 @@ var useBreadcrumbs = (renderCount) => {
     state: { data },
     selectedItem
   } = useAppContext();
-  const dzContext = (0, import_react28.useContext)(dropZoneContext);
-  return (0, import_react28.useMemo)(() => {
+  const dzContext = (0, import_react33.useContext)(dropZoneContext);
+  return (0, import_react33.useMemo)(() => {
     const breadcrumbs = convertPathDataToBreadcrumbs(
       selectedItem,
       dzContext == null ? void 0 : dzContext.pathData,
@@ -5160,7 +5498,7 @@ var useBreadcrumbs = (renderCount) => {
 };
 
 // components/SidebarSection/index.tsx
-var import_jsx_runtime24 = require("react/jsx-runtime");
+var import_jsx_runtime25 = require("react/jsx-runtime");
 var getClassName19 = get_class_name_factory_default("SidebarSection", styles_module_default13);
 var SidebarSection = ({
   children,
@@ -5173,15 +5511,15 @@ var SidebarSection = ({
 }) => {
   const { setUi } = useAppContext();
   const breadcrumbs = useBreadcrumbs(1);
-  return /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(
     "div",
     {
       className: getClassName19({ noBorderTop, noPadding }),
       style: { background },
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { className: getClassName19("title"), children: /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { className: getClassName19("breadcrumbs"), children: [
-          showBreadcrumbs ? breadcrumbs.map((breadcrumb, i) => /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { className: getClassName19("breadcrumb"), children: [
-            /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: getClassName19("title"), children: /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: getClassName19("breadcrumbs"), children: [
+          showBreadcrumbs ? breadcrumbs.map((breadcrumb, i) => /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: getClassName19("breadcrumb"), children: [
+            /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
               "button",
               {
                 type: "button",
@@ -5190,12 +5528,12 @@ var SidebarSection = ({
                 children: breadcrumb.label
               }
             ),
-            /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(ChevronRight, { size: 16 })
+            /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(ChevronRight, { size: 16 })
           ] }, i)) : null,
-          /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { className: getClassName19("heading"), children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Heading, { rank: "2", size: "xs", children: title }) })
+          /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: getClassName19("heading"), children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Heading, { rank: "2", size: "xs", children: title }) })
         ] }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { className: getClassName19("content"), children }),
-        isLoading && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { className: getClassName19("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Loader, { size: 32 }) })
+        /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: getClassName19("content"), children }),
+        isLoading && /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { className: getClassName19("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Loader, { size: 32 }) })
       ]
     }
   );
@@ -5226,7 +5564,7 @@ init_react_import();
 var styles_module_default14 = { "MenuBar": "_MenuBar_8pf8c_1", "MenuBar--menuOpen": "_MenuBar--menuOpen_8pf8c_14", "MenuBar-inner": "_MenuBar-inner_8pf8c_29", "MenuBar-history": "_MenuBar-history_8pf8c_45" };
 
 // components/MenuBar/index.tsx
-var import_jsx_runtime25 = require("react/jsx-runtime");
+var import_jsx_runtime26 = require("react/jsx-runtime");
 var getClassName20 = get_class_name_factory_default("MenuBar", styles_module_default14);
 function MenuBar({
   appState,
@@ -5240,7 +5578,7 @@ function MenuBar({
     history: { back, forward, historyStore }
   } = useAppContext();
   const { hasFuture = false, hasPast = false } = historyStore || {};
-  return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
     "div",
     {
       className: getClassName20({ menuOpen }),
@@ -5254,12 +5592,12 @@ function MenuBar({
           setMenuOpen(false);
         }
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: getClassName20("inner"), children: [
-        /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)("div", { className: getClassName20("history"), children: [
-          /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(IconButton, { title: "undo", disabled: !hasPast, onClick: back, children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Undo2, { size: 21 }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(IconButton, { title: "redo", disabled: !hasFuture, onClick: forward, children: /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(Redo2, { size: 21 }) })
+      children: /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)("div", { className: getClassName20("inner"), children: [
+        /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)("div", { className: getClassName20("history"), children: [
+          /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(IconButton, { title: "undo", disabled: !hasPast, onClick: back, children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Undo2, { size: 21 }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(IconButton, { title: "redo", disabled: !hasFuture, onClick: forward, children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Redo2, { size: 21 }) })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(import_jsx_runtime25.Fragment, { children: renderHeaderActions && renderHeaderActions({
+        /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(import_jsx_runtime26.Fragment, { children: renderHeaderActions && renderHeaderActions({
           state: appState,
           dispatch
         }) })
@@ -5270,43 +5608,68 @@ function MenuBar({
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Puck/styles.module.css#css-module
 init_react_import();
-var styles_module_default15 = { "Puck": "_Puck_1g88c_19", "Puck-portal": "_Puck-portal_1g88c_24", "PuckLayout": "_PuckLayout_1g88c_31", "PuckLayout-inner": "_PuckLayout-inner_1g88c_39", "PuckLayout--mounted": "_PuckLayout--mounted_1g88c_51", "PuckLayout--leftSideBarVisible": "_PuckLayout--leftSideBarVisible_1g88c_55", "PuckLayout--rightSideBarVisible": "_PuckLayout--rightSideBarVisible_1g88c_61", "PuckLayout-mounted": "_PuckLayout-mounted_1g88c_75", "PuckLayout-header": "_PuckLayout-header_1g88c_116", "PuckLayout-headerInner": "_PuckLayout-headerInner_1g88c_125", "PuckLayout-headerToggle": "_PuckLayout-headerToggle_1g88c_135", "PuckLayout-rightSideBarToggle": "_PuckLayout-rightSideBarToggle_1g88c_142", "PuckLayout-leftSideBarToggle": "_PuckLayout-leftSideBarToggle_1g88c_143", "PuckLayout-headerTitle": "_PuckLayout-headerTitle_1g88c_147", "PuckLayout-headerPath": "_PuckLayout-headerPath_1g88c_151", "PuckLayout-headerTools": "_PuckLayout-headerTools_1g88c_158", "PuckLayout-menuButton": "_PuckLayout-menuButton_1g88c_164", "PuckLayout--menuOpen": "_PuckLayout--menuOpen_1g88c_169", "PuckLayout-leftSideBar": "_PuckLayout-leftSideBar_1g88c_143", "PuckLayout-rightSideBar": "_PuckLayout-rightSideBar_1g88c_142" };
+var styles_module_default15 = { "Puck": "_Puck_12s9r_19", "Puck-portal": "_Puck-portal_12s9r_24", "PuckLayout-inner": "_PuckLayout-inner_12s9r_31", "PuckLayout--mounted": "_PuckLayout--mounted_12s9r_43", "PuckLayout--leftSideBarVisible": "_PuckLayout--leftSideBarVisible_12s9r_47", "PuckLayout--rightSideBarVisible": "_PuckLayout--rightSideBarVisible_12s9r_53", "PuckLayout-mounted": "_PuckLayout-mounted_12s9r_67", "PuckLayout": "_PuckLayout_12s9r_31", "PuckLayout-header": "_PuckLayout-header_12s9r_108", "PuckLayout-headerInner": "_PuckLayout-headerInner_12s9r_117", "PuckLayout-headerToggle": "_PuckLayout-headerToggle_12s9r_127", "PuckLayout-rightSideBarToggle": "_PuckLayout-rightSideBarToggle_12s9r_134", "PuckLayout-leftSideBarToggle": "_PuckLayout-leftSideBarToggle_12s9r_135", "PuckLayout-headerTitle": "_PuckLayout-headerTitle_12s9r_139", "PuckLayout-headerPath": "_PuckLayout-headerPath_12s9r_143", "PuckLayout-headerTools": "_PuckLayout-headerTools_12s9r_150", "PuckLayout-menuButton": "_PuckLayout-menuButton_12s9r_156", "PuckLayout--menuOpen": "_PuckLayout--menuOpen_12s9r_161", "PuckLayout-leftSideBar": "_PuckLayout-leftSideBar_12s9r_135", "PuckLayout-rightSideBar": "_PuckLayout-rightSideBar_12s9r_134" };
 
 // components/Puck/components/Fields/index.tsx
 init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Puck/components/Fields/styles.module.css#css-module
 init_react_import();
-var styles_module_default16 = { "PuckFields": "_PuckFields_jp3lw_1", "PuckFields--isLoading": "_PuckFields--isLoading_jp3lw_6", "PuckFields-loadingOverlay": "_PuckFields-loadingOverlay_jp3lw_10", "PuckFields-loadingOverlayInner": "_PuckFields-loadingOverlayInner_jp3lw_25" };
+var styles_module_default16 = { "PuckFields": "_PuckFields_10bh7_1", "PuckFields--isLoading": "_PuckFields--isLoading_10bh7_6", "PuckFields-loadingOverlay": "_PuckFields-loadingOverlay_10bh7_10", "PuckFields-loadingOverlayInner": "_PuckFields-loadingOverlayInner_10bh7_25", "PuckFields-field": "_PuckFields-field_10bh7_32", "PuckFields--wrapFields": "_PuckFields--wrapFields_10bh7_36" };
 
 // components/Puck/components/Fields/index.tsx
-var import_react30 = require("react");
+var import_react37 = require("react");
+
+// lib/use-resolved-fields.ts
+init_react_import();
+var import_react36 = require("react");
 
 // lib/use-parent.ts
 init_react_import();
-var import_react29 = require("react");
-var useParent = (itemSelector) => {
+var import_react34 = require("react");
+var getParent = (itemSelector, pathData, data) => {
   var _a;
-  const { selectedItem, state } = useAppContext();
-  const { pathData } = (0, import_react29.useContext)(dropZoneContext) || {};
-  const item = itemSelector ? getItem(itemSelector, state.data) : selectedItem;
-  const breadcrumbs = convertPathDataToBreadcrumbs(item, pathData, state.data);
+  if (!itemSelector) return null;
+  const item = getItem(itemSelector, data);
+  const breadcrumbs = convertPathDataToBreadcrumbs(item, pathData, data);
   const lastItem = breadcrumbs[breadcrumbs.length - 1];
-  const parent = (lastItem == null ? void 0 : lastItem.selector) ? (_a = getItem(lastItem.selector, state.data)) != null ? _a : null : null;
+  const parent = (lastItem == null ? void 0 : lastItem.selector) ? (_a = getItem(lastItem.selector, data)) != null ? _a : null : null;
   return parent || null;
 };
+var useGetParent = () => {
+  const { state } = useAppContext();
+  const { pathData } = (0, import_react34.useContext)(dropZoneContext) || {};
+  return (0, import_react34.useCallback)(
+    () => getParent(state.ui.itemSelector, pathData, state.data),
+    [state.ui.itemSelector, pathData, state.data]
+  );
+};
+var useParent = () => {
+  return useGetParent()();
+};
 
-// components/Puck/components/Fields/index.tsx
-var import_jsx_runtime26 = require("react/jsx-runtime");
-var getClassName21 = get_class_name_factory_default("PuckFields", styles_module_default16);
+// lib/use-on-value-change.ts
+init_react_import();
+var import_react35 = require("react");
+function useOnValueChange(value, onChange, compare = Object.is, deps = []) {
+  const tracked = (0, import_react35.useRef)(value);
+  (0, import_react35.useEffect)(() => {
+    const oldValue = tracked.current;
+    if (!compare(value, oldValue)) {
+      tracked.current = value;
+      onChange(value, oldValue);
+    }
+  }, [onChange, compare, value, ...deps]);
+}
+
+// lib/selector-is.ts
+init_react_import();
+var selectorIs = (a, b) => (a == null ? void 0 : a.zone) === (b == null ? void 0 : b.zone) && (a == null ? void 0 : a.index) === (b == null ? void 0 : b.index);
+
+// lib/use-resolved-fields.ts
 var defaultPageFields = {
   title: { type: "text" }
 };
-var DefaultFields = ({
-  children
-}) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(import_jsx_runtime26.Fragment, { children });
-};
 var useResolvedFields = () => {
   var _a, _b;
   const { selectedItem, state, config } = useAppContext();
@@ -5314,20 +5677,21 @@ var useResolvedFields = () => {
   const { data } = state;
   const rootFields = ((_a = config.root) == null ? void 0 : _a.fields) || defaultPageFields;
   const componentConfig = selectedItem ? config.components[selectedItem.type] : null;
-  const defaultFields = (0, import_react30.useMemo)(
+  const defaultFields = (0, import_react36.useMemo)(
     () => (selectedItem ? componentConfig == null ? void 0 : componentConfig.fields : rootFields) || {},
     [selectedItem, rootFields, componentConfig == null ? void 0 : componentConfig.fields]
   );
   const rootProps = data.root.props || data.root;
-  const [lastSelectedData, setLastSelectedData] = (0, import_react30.useState)({});
-  const [resolvedFields, setResolvedFields] = (0, import_react30.useState)(defaultFields);
-  const [fieldsLoading, setFieldsLoading] = (0, import_react30.useState)(false);
+  const [lastSelectedData, setLastSelectedData] = (0, import_react36.useState)({});
+  const [resolvedFields, setResolvedFields] = (0, import_react36.useState)(defaultFields);
+  const [fieldsLoading, setFieldsLoading] = (0, import_react36.useState)(false);
+  const lastFields = (0, import_react36.useRef)(defaultFields);
   const defaultResolveFields = (_componentData, _params) => defaultFields;
   const componentData = selectedItem ? selectedItem : { props: rootProps, readOnly: data.root.readOnly };
   const hasComponentResolver = selectedItem && (componentConfig == null ? void 0 : componentConfig.resolveFields);
   const hasRootResolver = !selectedItem && ((_b = config.root) == null ? void 0 : _b.resolveFields);
   const hasResolver = hasComponentResolver || hasRootResolver;
-  const resolveFields = (0, import_react30.useCallback)(
+  const resolveFields = (0, import_react36.useCallback)(
     (..._0) => __async(void 0, [..._0], function* (fields = {}) {
       var _a2;
       const lastData = ((_a2 = lastSelectedData.props) == null ? void 0 : _a2.id) === componentData.props.id ? lastSelectedData : null;
@@ -5339,7 +5703,7 @@ var useResolvedFields = () => {
           {
             changed,
             fields,
-            lastFields: resolvedFields,
+            lastFields: lastFields.current,
             lastData,
             appState: state,
             parent
@@ -5350,7 +5714,7 @@ var useResolvedFields = () => {
         return yield config.root.resolveFields(componentData, {
           changed,
           fields,
-          lastFields: resolvedFields,
+          lastFields: lastFields.current,
           lastData,
           appState: state,
           parent
@@ -5359,26 +5723,56 @@ var useResolvedFields = () => {
       return defaultResolveFields(componentData, {
         changed,
         fields,
-        lastFields: resolvedFields,
+        lastFields: lastFields.current,
         lastData
       });
     }),
-    [data, config, componentData, selectedItem, resolvedFields, state]
+    [data, config, componentData, selectedItem, state, parent]
   );
-  (0, import_react30.useEffect)(() => {
-    if (hasResolver) {
-      setFieldsLoading(true);
-      resolveFields(defaultFields).then((fields) => {
-        setResolvedFields(fields || {});
-        setFieldsLoading(false);
-      });
-    } else {
-      setResolvedFields(defaultFields);
+  const triggerResolver = (0, import_react36.useCallback)(() => {
+    var _a2, _b2;
+    if (!((_a2 = state.ui.itemSelector) == null ? void 0 : _a2.zone) || ((_b2 = state.ui.itemSelector) == null ? void 0 : _b2.zone) === "default-zone" || parent) {
+      if (hasResolver) {
+        setFieldsLoading(true);
+        resolveFields(defaultFields).then((fields) => {
+          setResolvedFields(fields || {});
+          lastFields.current = fields;
+          setFieldsLoading(false);
+        });
+        return;
+      }
     }
-  }, [data, defaultFields, selectedItem, hasResolver]);
+    setResolvedFields(defaultFields);
+  }, [defaultFields, state.ui.itemSelector, hasResolver, parent]);
+  useOnValueChange(
+    state.ui.itemSelector,
+    () => {
+      lastFields.current = defaultFields;
+    },
+    selectorIs
+  );
+  useOnValueChange(
+    { data, parent, itemSelector: state.ui.itemSelector },
+    () => {
+      triggerResolver();
+    },
+    (a, b) => JSON.stringify(a) === JSON.stringify(b)
+  );
+  (0, import_react36.useEffect)(() => {
+    triggerResolver();
+  }, []);
   return [resolvedFields, fieldsLoading];
 };
-var Fields = () => {
+
+// components/Puck/components/Fields/index.tsx
+var import_jsx_runtime27 = require("react/jsx-runtime");
+var getClassName21 = get_class_name_factory_default("PuckFields", styles_module_default16);
+var DefaultFields = ({
+  children
+}) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(import_jsx_runtime27.Fragment, { children });
+};
+var Fields = ({ wrapFields = true }) => {
   var _a, _b;
   const {
     selectedItem,
@@ -5396,16 +5790,16 @@ var Fields = () => {
   const componentResolving = selectedItem ? ((_a = componentState[selectedItem == null ? void 0 : selectedItem.props.id]) == null ? void 0 : _a.loadingCount) > 0 : ((_b = componentState["puck-root"]) == null ? void 0 : _b.loadingCount) > 0;
   const isLoading = fieldsResolving || componentResolving;
   const rootProps = data.root.props || data.root;
-  const Wrapper = (0, import_react30.useMemo)(() => overrides.fields || DefaultFields, [overrides]);
-  return /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(
+  const Wrapper = (0, import_react37.useMemo)(() => overrides.fields || DefaultFields, [overrides]);
+  return /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)(
     "form",
     {
-      className: getClassName21(),
+      className: getClassName21({ wrapFields }),
       onSubmit: (e) => {
         e.preventDefault();
       },
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Wrapper, { isLoading, itemSelector, children: Object.keys(fields).map((fieldName) => {
+        /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Wrapper, { isLoading, itemSelector, children: Object.keys(fields).map((fieldName) => {
           const field = fields[fieldName];
           if (!(field == null ? void 0 : field.type)) return null;
           const onChange = (value, updatedUi) => {
@@ -5476,7 +5870,7 @@ var Fields = () => {
               item: selectedItem
             });
             const id = `${selectedItem.props.id}_${field.type}_${fieldName}`;
-            return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
+            return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassName21("field"), children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
               AutoFieldPrivate,
               {
                 field,
@@ -5485,16 +5879,15 @@ var Fields = () => {
                 readOnly: !edit || readOnly[fieldName],
                 value: selectedItem.props[fieldName],
                 onChange
-              },
-              id
-            );
+              }
+            ) }, id);
           } else {
             const readOnly = data.root.readOnly || {};
             const { edit } = getPermissions({
               root: true
             });
             const id = `root_${field.type}_${fieldName}`;
-            return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
+            return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassName21("field"), children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
               AutoFieldPrivate,
               {
                 field,
@@ -5503,12 +5896,11 @@ var Fields = () => {
                 readOnly: !edit || readOnly[fieldName],
                 value: rootProps[fieldName],
                 onChange
-              },
-              id
-            );
+              }
+            ) }, id);
           }
         }) }),
-        isLoading && /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("div", { className: getClassName21("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("div", { className: getClassName21("loadingOverlayInner"), children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Loader, { size: 16 }) }) })
+        isLoading && /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassName21("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassName21("loadingOverlayInner"), children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Loader, { size: 16 }) }) })
       ]
     }
   );
@@ -5519,7 +5911,7 @@ init_react_import();
 
 // lib/use-component-list.tsx
 init_react_import();
-var import_react31 = require("react");
+var import_react38 = require("react");
 
 // components/ComponentList/index.tsx
 init_react_import();
@@ -5529,7 +5921,7 @@ init_react_import();
 var styles_module_default17 = { "ComponentList": "_ComponentList_odh9d_1", "ComponentList--isExpanded": "_ComponentList--isExpanded_odh9d_5", "ComponentList-content": "_ComponentList-content_odh9d_9", "ComponentList-title": "_ComponentList-title_odh9d_17", "ComponentList-titleIcon": "_ComponentList-titleIcon_odh9d_53" };
 
 // components/ComponentList/index.tsx
-var import_jsx_runtime27 = require("react/jsx-runtime");
+var import_jsx_runtime28 = require("react/jsx-runtime");
 var getClassName22 = get_class_name_factory_default("ComponentList", styles_module_default17);
 var ComponentListItem = ({
   name,
@@ -5539,7 +5931,7 @@ var ComponentListItem = ({
   const canInsert = getPermissions({
     type: name
   }).insert;
-  return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Drawer.Item, { label, name, isDragDisabled: !canInsert, children: overrides.componentItem });
+  return /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(Drawer.Item, { label, name, isDragDisabled: !canInsert, children: overrides.componentItem });
 };
 var ComponentList = ({
   children,
@@ -5548,8 +5940,8 @@ var ComponentList = ({
 }) => {
   const { config, state, setUi } = useAppContext();
   const { expanded = true } = state.ui.componentList[id] || {};
-  return /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)("div", { className: getClassName22({ isExpanded: expanded }), children: [
-    title && /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)("div", { className: getClassName22({ isExpanded: expanded }), children: [
+    title && /* @__PURE__ */ (0, import_jsx_runtime28.jsxs)(
       "button",
       {
         type: "button",
@@ -5563,14 +5955,14 @@ var ComponentList = ({
         }),
         title: expanded ? `Collapse${title ? ` ${title}` : ""}` : `Expand${title ? ` ${title}` : ""}`,
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { children: title }),
-          /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassName22("titleIcon"), children: expanded ? /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(ChevronUp, { size: 12 }) : /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(ChevronDown, { size: 12 }) })
+          /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { children: title }),
+          /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassName22("titleIcon"), children: expanded ? /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(ChevronUp, { size: 12 }) : /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(ChevronDown, { size: 12 }) })
         ]
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassName22("content"), children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Drawer, { children: children || Object.keys(config.components).map((componentKey) => {
+    /* @__PURE__ */ (0, import_jsx_runtime28.jsx)("div", { className: getClassName22("content"), children: /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(Drawer, { children: children || Object.keys(config.components).map((componentKey) => {
       var _a;
-      return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
+      return /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
         ComponentListItem,
         {
           label: (_a = config.components[componentKey]["label"]) != null ? _a : componentKey,
@@ -5584,10 +5976,10 @@ var ComponentList = ({
 ComponentList.Item = ComponentListItem;
 
 // lib/use-component-list.tsx
-var import_jsx_runtime28 = require("react/jsx-runtime");
+var import_jsx_runtime29 = require("react/jsx-runtime");
 var useComponentList = (config, ui) => {
-  const [componentList, setComponentList] = (0, import_react31.useState)();
-  (0, import_react31.useEffect)(() => {
+  const [componentList, setComponentList] = (0, import_react38.useState)();
+  (0, import_react38.useEffect)(() => {
     var _a, _b, _c;
     if (Object.keys(ui.componentList).length > 0) {
       const matchedComponents = [];
@@ -5597,7 +5989,7 @@ var useComponentList = (config, ui) => {
           if (category.visible === false || !category.components) {
             return null;
           }
-          return /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
+          return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
             ComponentList,
             {
               id: categoryKey,
@@ -5606,7 +5998,7 @@ var useComponentList = (config, ui) => {
                 var _a2;
                 matchedComponents.push(componentName);
                 const componentConf = config.components[componentName] || {};
-                return /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
+                return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
                   ComponentList.Item,
                   {
                     label: (_a2 = componentConf["label"]) != null ? _a2 : componentName,
@@ -5626,7 +6018,7 @@ var useComponentList = (config, ui) => {
       );
       if (remainingComponents.length > 0 && !((_a = ui.componentList.other) == null ? void 0 : _a.components) && ((_b = ui.componentList.other) == null ? void 0 : _b.visible) !== false) {
         _componentList.push(
-          /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
             ComponentList,
             {
               id: "other",
@@ -5634,7 +6026,7 @@ var useComponentList = (config, ui) => {
               children: remainingComponents.map((componentName, i) => {
                 var _a2;
                 const componentConf = config.components[componentName] || {};
-                return /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
+                return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
                   ComponentList.Item,
                   {
                     name: componentName,
@@ -5656,25 +6048,25 @@ var useComponentList = (config, ui) => {
 };
 
 // components/Puck/components/Components/index.tsx
-var import_react32 = require("react");
-var import_jsx_runtime29 = require("react/jsx-runtime");
+var import_react39 = require("react");
+var import_jsx_runtime30 = require("react/jsx-runtime");
 var Components = () => {
   const { config, state, overrides } = useAppContext();
   const componentList = useComponentList(config, state.ui);
-  const Wrapper = (0, import_react32.useMemo)(() => overrides.components || "div", [overrides]);
-  return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Wrapper, { children: componentList ? componentList : /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(ComponentList, { id: "all" }) });
+  const Wrapper = (0, import_react39.useMemo)(() => overrides.components || "div", [overrides]);
+  return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(Wrapper, { children: componentList ? componentList : /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(ComponentList, { id: "all" }) });
 };
 
 // components/Puck/components/Preview/index.tsx
 init_react_import();
-var import_react34 = require("react");
+var import_react41 = require("react");
 
 // components/AutoFrame/index.tsx
 init_react_import();
-var import_react33 = require("react");
+var import_react40 = require("react");
 var import_object_hash = __toESM(require("object-hash"));
 var import_react_dom3 = require("react-dom");
-var import_jsx_runtime30 = require("react/jsx-runtime");
+var import_jsx_runtime31 = require("react/jsx-runtime");
 var styleSelector = 'style, link[rel="stylesheet"]';
 var collectStyles = (doc) => {
   const collected = [];
@@ -5717,7 +6109,7 @@ var CopyHostStyles = ({
   onStylesLoaded = () => null
 }) => {
   const { document: doc, window: win } = useFrame();
-  (0, import_react33.useEffect)(() => {
+  (0, import_react40.useEffect)(() => {
     if (!win || !doc) {
       return () => {
       };
@@ -5874,10 +6266,10 @@ var CopyHostStyles = ({
       observer.disconnect();
     };
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(import_jsx_runtime30.Fragment, { children });
+  return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(import_jsx_runtime31.Fragment, { children });
 };
-var autoFrameContext = (0, import_react33.createContext)({});
-var useFrame = () => (0, import_react33.useContext)(autoFrameContext);
+var autoFrameContext = (0, import_react40.createContext)({});
+var useFrame = () => (0, import_react40.useContext)(autoFrameContext);
 function AutoFrame(_a) {
   var _b = _a, {
     children,
@@ -5894,10 +6286,10 @@ function AutoFrame(_a) {
     "onStylesLoaded",
     "frameRef"
   ]);
-  const [loaded, setLoaded] = (0, import_react33.useState)(false);
-  const [ctx, setCtx] = (0, import_react33.useState)({});
-  const [mountTarget, setMountTarget] = (0, import_react33.useState)();
-  (0, import_react33.useEffect)(() => {
+  const [loaded, setLoaded] = (0, import_react40.useState)(false);
+  const [ctx, setCtx] = (0, import_react40.useState)({});
+  const [mountTarget, setMountTarget] = (0, import_react40.useState)();
+  (0, import_react40.useEffect)(() => {
     var _a2;
     if (frameRef.current) {
       setCtx({
@@ -5909,7 +6301,7 @@ function AutoFrame(_a) {
       );
     }
   }, [frameRef, loaded]);
-  return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
     "iframe",
     __spreadProps(__spreadValues({}, props), {
       className,
@@ -5919,7 +6311,7 @@ function AutoFrame(_a) {
       onLoad: () => {
         setLoaded(true);
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(autoFrameContext.Provider, { value: ctx, children: loaded && mountTarget && /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(CopyHostStyles, { debug, onStylesLoaded, children: (0, import_react_dom3.createPortal)(children, mountTarget) }) })
+      children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(autoFrameContext.Provider, { value: ctx, children: loaded && mountTarget && /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(CopyHostStyles, { debug, onStylesLoaded, children: (0, import_react_dom3.createPortal)(children, mountTarget) }) })
     })
   );
 }
@@ -5930,12 +6322,68 @@ var AutoFrame_default = AutoFrame;
 init_react_import();
 var styles_module_default18 = { "PuckPreview": "_PuckPreview_z2rgu_1", "PuckPreview-frame": "_PuckPreview-frame_z2rgu_6" };
 
+// components/Render/index.tsx
+init_react_import();
+var import_jsx_runtime32 = require("react/jsx-runtime");
+function Render({
+  config,
+  data
+}) {
+  var _a;
+  const defaultedData = __spreadProps(__spreadValues({}, data), {
+    root: data.root || {},
+    content: data.content || []
+  });
+  const rootProps = defaultedData.root.props || defaultedData.root;
+  const title = (rootProps == null ? void 0 : rootProps.title) || "";
+  if ((_a = config.root) == null ? void 0 : _a.render) {
+    return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+      DropZoneProvider,
+      {
+        value: {
+          data: defaultedData,
+          config,
+          mode: "render",
+          depth: 0,
+          path: []
+        },
+        children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+          config.root.render,
+          __spreadProps(__spreadValues({}, rootProps), {
+            puck: {
+              renderDropZone: DropZone,
+              isEditing: false
+            },
+            title,
+            editMode: false,
+            id: "puck-root",
+            children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(DropZone, { zone: rootDroppableId })
+          })
+        )
+      }
+    );
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+    DropZoneProvider,
+    {
+      value: {
+        data: defaultedData,
+        config,
+        mode: "render",
+        depth: 0,
+        path: []
+      },
+      children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(DropZone, { zone: rootDroppableId })
+    }
+  );
+}
+
 // components/Puck/components/Preview/index.tsx
-var import_jsx_runtime31 = require("react/jsx-runtime");
+var import_jsx_runtime33 = require("react/jsx-runtime");
 var getClassName23 = get_class_name_factory_default("PuckPreview", styles_module_default18);
 var useBubbleIframeEvents = (ref) => {
   const { status } = useAppContext();
-  (0, import_react34.useEffect)(() => {
+  (0, import_react41.useEffect)(() => {
     var _a;
     if (ref.current && status === "READY") {
       const iframe = ref.current;
@@ -5972,22 +6420,34 @@ var useBubbleIframeEvents = (ref) => {
     }
   }, [status]);
 };
-var Preview = ({ id = "puck-preview" }) => {
+var Preview2 = ({ id = "puck-preview" }) => {
   const { config, dispatch, state, setStatus, iframe, overrides } = useAppContext();
-  const Page = (0, import_react34.useCallback)(
+  const Page = (0, import_react41.useCallback)(
     (pageProps) => {
       var _a, _b;
       return ((_a = config.root) == null ? void 0 : _a.render) ? (_b = config.root) == null ? void 0 : _b.render(__spreadValues({
         id: "puck-root"
-      }, pageProps)) : /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(import_jsx_runtime31.Fragment, { children: pageProps.children });
+      }, pageProps)) : /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(import_jsx_runtime33.Fragment, { children: pageProps.children });
     },
     [config.root]
   );
-  const Frame = (0, import_react34.useMemo)(() => overrides.iframe, [overrides]);
+  const Frame = (0, import_react41.useMemo)(() => overrides.iframe, [overrides]);
   const rootProps = state.data.root.props || state.data.root;
-  const ref = (0, import_react34.useRef)(null);
+  const ref = (0, import_react41.useRef)(null);
   useBubbleIframeEvents(ref);
-  return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+  const inner = state.ui.previewMode === "edit" ? /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
+    Page,
+    __spreadProps(__spreadValues({}, rootProps), {
+      puck: {
+        renderDropZone: DropZone,
+        isEditing: true,
+        dragRef: null
+      },
+      editMode: true,
+      children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(DropZone, { zone: rootDroppableId })
+    })
+  ) : /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Render, { data: state.data, config });
+  return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
     "div",
     {
       className: getClassName23(),
@@ -5996,7 +6456,7 @@ var Preview = ({ id = "puck-preview" }) => {
       onClick: () => {
         dispatch({ type: "setUi", ui: __spreadProps(__spreadValues({}, state.ui), { itemSelector: null }) });
       },
-      children: iframe.enabled ? /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+      children: iframe.enabled ? /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
         AutoFrame_default,
         {
           id: "preview-frame",
@@ -6006,40 +6466,21 @@ var Preview = ({ id = "puck-preview" }) => {
             setStatus("READY");
           },
           frameRef: ref,
-          children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(autoFrameContext.Consumer, { children: ({ document: document2 }) => {
-            const inner = /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
-              Page,
-              __spreadProps(__spreadValues({}, rootProps), {
-                puck: {
-                  renderDropZone: DropZone,
-                  isEditing: true,
-                  dragRef: null
-                },
-                editMode: true,
-                children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(DropZone, { zone: rootDroppableId })
-              })
-            );
+          children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(autoFrameContext.Consumer, { children: ({ document: document2 }) => {
             if (Frame) {
-              return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Frame, { document: document2, children: inner });
+              return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Frame, { document: document2, children: inner });
             }
             return inner;
           } })
         }
-      ) : /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+      ) : /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
         "div",
         {
           id: "preview-frame",
           className: getClassName23("frame"),
           ref,
           "data-puck-entry": true,
-          children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
-            Page,
-            __spreadProps(__spreadValues({}, rootProps), {
-              puck: { renderDropZone: DropZone, isEditing: true, dragRef: null },
-              editMode: true,
-              children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(DropZone, { zone: rootDroppableId })
-            })
-          )
+          children: inner
         }
       )
     }
@@ -6089,7 +6530,7 @@ var scrollIntoView = (el) => {
 };
 
 // components/LayerTree/index.tsx
-var import_react35 = require("react");
+var import_react42 = require("react");
 
 // lib/is-child-of-zone.ts
 init_react_import();
@@ -6122,7 +6563,7 @@ var onScrollEnd = (frame, cb) => {
 };
 
 // components/LayerTree/index.tsx
-var import_jsx_runtime32 = require("react/jsx-runtime");
+var import_jsx_runtime34 = require("react/jsx-runtime");
 var getClassName24 = get_class_name_factory_default("LayerTree", styles_module_default19);
 var getClassNameLayer = get_class_name_factory_default("Layer", styles_module_default19);
 var LayerTree = ({
@@ -6135,15 +6576,15 @@ var LayerTree = ({
   label
 }) => {
   const zones = data.zones || {};
-  const ctx = (0, import_react35.useContext)(dropZoneContext);
-  return /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(import_jsx_runtime32.Fragment, { children: [
-    label && /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)("div", { className: getClassName24("zoneTitle"), children: [
-      /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { className: getClassName24("zoneIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Layers, { size: "16" }) }),
+  const ctx = (0, import_react42.useContext)(dropZoneContext);
+  return /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)(import_jsx_runtime34.Fragment, { children: [
+    label && /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)("div", { className: getClassName24("zoneTitle"), children: [
+      /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: getClassName24("zoneIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Layers, { size: "16" }) }),
       " ",
       label
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)("ul", { className: getClassName24(), children: [
-      zoneContent.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { className: getClassName24("helper"), children: "No items" }),
+    /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)("ul", { className: getClassName24(), children: [
+      zoneContent.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: getClassName24("helper"), children: "No items" }),
       zoneContent.map((item, i) => {
         var _a;
         const isSelected = (itemSelector == null ? void 0 : itemSelector.index) === i && (itemSelector.zone === zone || itemSelector.zone === rootDroppableId && !zone);
@@ -6156,7 +6597,7 @@ var LayerTree = ({
         const childIsSelected = isChildOfZone(item, selectedItem, ctx);
         const componentConfig = config.components[item.type];
         const label2 = (_a = componentConfig == null ? void 0 : componentConfig["label"]) != null ? _a : item.type.toString();
-        return /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(
+        return /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)(
           "li",
           {
             className: getClassNameLayer({
@@ -6166,7 +6607,7 @@ var LayerTree = ({
               childIsSelected
             }),
             children: [
-              /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { className: getClassNameLayer("inner"), children: /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(
+              /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: getClassNameLayer("inner"), children: /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)(
                 "button",
                 {
                   type: "button",
@@ -6205,22 +6646,22 @@ var LayerTree = ({
                     setHoveringComponent(null);
                   },
                   children: [
-                    containsZone && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+                    containsZone && /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
                       "div",
                       {
                         className: getClassNameLayer("chevron"),
                         title: isSelected ? "Collapse" : "Expand",
-                        children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(ChevronDown, { size: "12" })
+                        children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(ChevronDown, { size: "12" })
                       }
                     ),
-                    /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)("div", { className: getClassNameLayer("title"), children: [
-                      /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { className: getClassNameLayer("icon"), children: item.type === "Text" || item.type === "Heading" ? /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Type, { size: "16" }) : /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(LayoutGrid, { size: "16" }) }),
-                      /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { className: getClassNameLayer("name"), children: label2 })
+                    /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)("div", { className: getClassNameLayer("title"), children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: getClassNameLayer("icon"), children: item.type === "Text" || item.type === "Heading" ? /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Type, { size: "16" }) : /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(LayoutGrid, { size: "16" }) }),
+                      /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: getClassNameLayer("name"), children: label2 })
                     ] })
                   ]
                 }
               ) }),
-              containsZone && Object.keys(zonesForItem).map((zoneKey, idx) => /* @__PURE__ */ (0, import_jsx_runtime32.jsx)("div", { className: getClassNameLayer("zones"), children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+              containsZone && Object.keys(zonesForItem).map((zoneKey, idx) => /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: getClassNameLayer("zones"), children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
                 LayerTree,
                 {
                   config,
@@ -6242,13 +6683,13 @@ var LayerTree = ({
 };
 
 // components/Puck/components/Outline/index.tsx
-var import_react36 = require("react");
-var import_jsx_runtime33 = require("react/jsx-runtime");
+var import_react43 = require("react");
+var import_jsx_runtime35 = require("react/jsx-runtime");
 var Outline = () => {
   const { dispatch, state, overrides, config } = useAppContext();
   const { data, ui } = state;
   const { itemSelector } = ui;
-  const setItemSelector = (0, import_react36.useCallback)(
+  const setItemSelector = (0, import_react43.useCallback)(
     (newItemSelector) => {
       dispatch({
         type: "setUi",
@@ -6257,9 +6698,9 @@ var Outline = () => {
     },
     []
   );
-  const Wrapper = (0, import_react36.useMemo)(() => overrides.outline || "div", [overrides]);
-  return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Wrapper, { children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(dropZoneContext.Consumer, { children: (ctx) => /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(import_jsx_runtime33.Fragment, { children: [
-    (ctx == null ? void 0 : ctx.activeZones) && (ctx == null ? void 0 : ctx.activeZones[rootDroppableId]) && /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
+  const Wrapper = (0, import_react43.useMemo)(() => overrides.outline || "div", [overrides]);
+  return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Wrapper, { children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(dropZoneContext.Consumer, { children: (ctx) => /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(import_jsx_runtime35.Fragment, { children: [
+    (ctx == null ? void 0 : ctx.activeZones) && (ctx == null ? void 0 : ctx.activeZones[rootDroppableId]) && /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
       LayerTree,
       {
         config,
@@ -6272,7 +6713,7 @@ var Outline = () => {
     ),
     Object.entries(findZonesForArea(data, "root")).map(
       ([zoneKey, zone]) => {
-        return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
+        return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
           LayerTree,
           {
             config,
@@ -6371,19 +6812,19 @@ function usePuckHistory({
 
 // lib/use-history-store.ts
 init_react_import();
-var import_react37 = require("react");
+var import_react44 = require("react");
 var import_use_debounce3 = require("use-debounce");
 var EMPTY_HISTORY_INDEX = 0;
 function useHistoryStore(initialHistory) {
   var _a, _b;
-  const [histories, setHistories] = (0, import_react37.useState)(
+  const [histories, setHistories] = (0, import_react44.useState)(
     (_a = initialHistory == null ? void 0 : initialHistory.histories) != null ? _a : []
   );
   const updateHistories = (histories2) => {
     setHistories(histories2);
     setIndex(histories2.length - 1);
   };
-  const [index, setIndex] = (0, import_react37.useState)(
+  const [index, setIndex] = (0, import_react44.useState)(
     (_b = initialHistory == null ? void 0 : initialHistory.index) != null ? _b : EMPTY_HISTORY_INDEX
   );
   const hasPast = index > EMPTY_HISTORY_INDEX;
@@ -6543,22 +6984,22 @@ var getBox = function getBox2(el) {
 };
 
 // components/Puck/components/Canvas/index.tsx
-var import_react39 = require("react");
+var import_react46 = require("react");
 
 // components/ViewportControls/index.tsx
 init_react_import();
-var import_react38 = require("react");
+var import_react45 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/ViewportControls/styles.module.css#css-module
 init_react_import();
 var styles_module_default20 = { "ViewportControls": "_ViewportControls_g1wgg_1", "ViewportControls-divider": "_ViewportControls-divider_g1wgg_15", "ViewportControls-zoomSelect": "_ViewportControls-zoomSelect_g1wgg_21", "ViewportButton--isActive": "_ViewportButton--isActive_g1wgg_34", "ViewportButton-inner": "_ViewportButton-inner_g1wgg_34" };
 
 // components/ViewportControls/index.tsx
-var import_jsx_runtime34 = require("react/jsx-runtime");
+var import_jsx_runtime36 = require("react/jsx-runtime");
 var icons = {
-  Smartphone: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Smartphone, { size: 16 }),
-  Tablet: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Tablet, { size: 16 }),
-  Monitor: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Monitor, { size: 16 })
+  Smartphone: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Smartphone, { size: 16 }),
+  Tablet: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Tablet, { size: 16 }),
+  Monitor: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Monitor, { size: 16 })
 };
 var getClassName25 = get_class_name_factory_default("ViewportControls", styles_module_default20);
 var getClassNameButton = get_class_name_factory_default("ViewportButton", styles_module_default20);
@@ -6570,11 +7011,11 @@ var ViewportButton = ({
   onClick
 }) => {
   const { state } = useAppContext();
-  const [isActive, setIsActive] = (0, import_react38.useState)(false);
-  (0, import_react38.useEffect)(() => {
+  const [isActive, setIsActive] = (0, import_react45.useState)(false);
+  (0, import_react45.useEffect)(() => {
     setIsActive(width === state.ui.viewports.current.width);
   }, [width, state.ui.viewports.current.width]);
-  return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("span", { className: getClassNameButton({ isActive }), children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("span", { className: getClassNameButton({ isActive }), children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
     IconButton,
     {
       title,
@@ -6583,7 +7024,7 @@ var ViewportButton = ({
         e.stopPropagation();
         onClick({ width, height });
       },
-      children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("span", { className: getClassNameButton("inner"), children })
+      children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("span", { className: getClassNameButton("inner"), children })
     }
   ) });
 };
@@ -6607,7 +7048,7 @@ var ViewportControls = ({
   const defaultsContainAutoZoom = defaultZoomOptions.find(
     (option) => option.value === autoZoom
   );
-  const zoomOptions = (0, import_react38.useMemo)(
+  const zoomOptions = (0, import_react45.useMemo)(
     () => [
       ...defaultZoomOptions,
       ...defaultsContainAutoZoom ? [] : [
@@ -6619,8 +7060,8 @@ var ViewportControls = ({
     ].filter((a) => a.value <= autoZoom).sort((a, b) => a.value > b.value ? 1 : -1),
     [autoZoom]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)("div", { className: getClassName25(), children: [
-    viewports.map((viewport, i) => /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { className: getClassName25(), children: [
+    viewports.map((viewport, i) => /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
       ViewportButton,
       {
         height: viewport.height,
@@ -6631,8 +7072,8 @@ var ViewportControls = ({
       },
       i
     )),
-    /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: getClassName25("divider") }),
-    /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassName25("divider") }),
+    /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
       IconButton,
       {
         title: "Zoom viewport out",
@@ -6646,10 +7087,10 @@ var ViewportControls = ({
             )].value
           );
         },
-        children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(ZoomOut, { size: 16 })
+        children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(ZoomOut, { size: 16 })
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
       IconButton,
       {
         title: "Zoom viewport in",
@@ -6663,11 +7104,11 @@ var ViewportControls = ({
             )].value
           );
         },
-        children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(ZoomIn, { size: 16 })
+        children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(ZoomIn, { size: 16 })
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: getClassName25("divider") }),
-    /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: getClassName25("divider") }),
+    /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
       "select",
       {
         className: getClassName25("zoomSelect"),
@@ -6675,7 +7116,7 @@ var ViewportControls = ({
         onChange: (e) => {
           onZoom(parseFloat(e.currentTarget.value));
         },
-        children: zoomOptions.map((option) => /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
+        children: zoomOptions.map((option) => /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
           "option",
           {
             value: option.value,
@@ -6723,24 +7164,24 @@ var getZoomConfig = (uiViewport, frame, zoom) => {
 };
 
 // components/Puck/components/Canvas/index.tsx
-var import_jsx_runtime35 = require("react/jsx-runtime");
+var import_jsx_runtime37 = require("react/jsx-runtime");
 var getClassName26 = get_class_name_factory_default("PuckCanvas", styles_module_default21);
 var ZOOM_ON_CHANGE = true;
 var Canvas = () => {
   const { status, iframe } = useAppContext();
   const { dispatch, state, overrides, setUi, zoomConfig, setZoomConfig } = useAppContext();
   const { ui } = state;
-  const frameRef = (0, import_react39.useRef)(null);
-  const [showTransition, setShowTransition] = (0, import_react39.useState)(false);
-  const defaultRender = (0, import_react39.useMemo)(() => {
-    const PuckDefault = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(import_jsx_runtime35.Fragment, { children });
+  const frameRef = (0, import_react46.useRef)(null);
+  const [showTransition, setShowTransition] = (0, import_react46.useState)(false);
+  const defaultRender = (0, import_react46.useMemo)(() => {
+    const PuckDefault = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(import_jsx_runtime37.Fragment, { children });
     return PuckDefault;
   }, []);
-  const CustomPreview = (0, import_react39.useMemo)(
+  const CustomPreview = (0, import_react46.useMemo)(
     () => overrides.preview || defaultRender,
     [overrides]
   );
-  const getFrameDimensions = (0, import_react39.useCallback)(() => {
+  const getFrameDimensions = (0, import_react46.useCallback)(() => {
     if (frameRef.current) {
       const frame = frameRef.current;
       const box = getBox(frame);
@@ -6748,7 +7189,7 @@ var Canvas = () => {
     }
     return { width: 0, height: 0 };
   }, [frameRef]);
-  const resetAutoZoom = (0, import_react39.useCallback)(
+  const resetAutoZoom = (0, import_react46.useCallback)(
     (ui2 = state.ui) => {
       if (frameRef.current) {
         setZoomConfig(
@@ -6758,11 +7199,11 @@ var Canvas = () => {
     },
     [frameRef, zoomConfig, state.ui]
   );
-  (0, import_react39.useEffect)(() => {
+  (0, import_react46.useEffect)(() => {
     setShowTransition(false);
     resetAutoZoom();
   }, [frameRef, ui.leftSideBarVisible, ui.rightSideBarVisible]);
-  (0, import_react39.useEffect)(() => {
+  (0, import_react46.useEffect)(() => {
     const { height: frameHeight } = getFrameDimensions();
     if (ui.viewports.current.height === "auto") {
       setZoomConfig(__spreadProps(__spreadValues({}, zoomConfig), {
@@ -6770,13 +7211,13 @@ var Canvas = () => {
       }));
     }
   }, [zoomConfig.zoom]);
-  (0, import_react39.useEffect)(() => {
+  (0, import_react46.useEffect)(() => {
     if (ZOOM_ON_CHANGE) {
       setShowTransition(true);
       resetAutoZoom(ui);
     }
   }, [ui.viewports.current.width]);
-  (0, import_react39.useEffect)(() => {
+  (0, import_react46.useEffect)(() => {
     const cb = () => {
       setShowTransition(false);
       resetAutoZoom();
@@ -6786,13 +7227,13 @@ var Canvas = () => {
       window.removeEventListener("resize", cb);
     };
   }, []);
-  const [showLoader, setShowLoader] = (0, import_react39.useState)(false);
-  (0, import_react39.useEffect)(() => {
+  const [showLoader, setShowLoader] = (0, import_react46.useState)(false);
+  (0, import_react46.useEffect)(() => {
     setTimeout(() => {
       setShowLoader(true);
     }, 500);
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)(
     "div",
     {
       className: getClassName26({
@@ -6805,7 +7246,7 @@ var Canvas = () => {
         recordHistory: true
       }),
       children: [
-        ui.viewports.controlsVisible && iframe.enabled && /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: getClassName26("controls"), children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+        ui.viewports.controlsVisible && iframe.enabled && /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("div", { className: getClassName26("controls"), children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
           ViewportControls,
           {
             autoZoom: zoomConfig.autoZoom,
@@ -6831,8 +7272,8 @@ var Canvas = () => {
             }
           }
         ) }),
-        /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)("div", { className: getClassName26("inner"), ref: frameRef, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)("div", { className: getClassName26("inner"), ref: frameRef, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
             "div",
             {
               className: getClassName26("root"),
@@ -6853,10 +7294,10 @@ var Canvas = () => {
                   })
                 );
               },
-              children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(CustomPreview, { children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Preview, {}) })
+              children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(CustomPreview, { children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Preview2, {}) })
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime35.jsx)("div", { className: getClassName26("loader"), children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Loader, { size: 24 }) })
+          /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("div", { className: getClassName26("loader"), children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Loader, { size: 24 }) })
         ] })
       ]
     }
@@ -6865,7 +7306,7 @@ var Canvas = () => {
 
 // lib/use-loaded-overrides.ts
 init_react_import();
-var import_react40 = require("react");
+var import_react47 = require("react");
 
 // lib/load-overrides.ts
 init_react_import();
@@ -6904,26 +7345,26 @@ var useLoadedOverrides = ({
   overrides,
   plugins
 }) => {
-  return (0, import_react40.useMemo)(() => {
+  return (0, import_react47.useMemo)(() => {
     return loadOverrides({ overrides, plugins });
   }, [plugins, overrides]);
 };
 
 // components/DefaultOverride/index.tsx
 init_react_import();
-var import_jsx_runtime36 = require("react/jsx-runtime");
-var DefaultOverride = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(import_jsx_runtime36.Fragment, { children });
+var import_jsx_runtime38 = require("react/jsx-runtime");
+var DefaultOverride = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(import_jsx_runtime38.Fragment, { children });
 
 // lib/use-inject-css.ts
 init_react_import();
-var import_react41 = require("react");
+var import_react48 = require("react");
 var styles = ``;
 var useInjectStyleSheet = (initialStyles, iframeEnabled) => {
-  const [el, setEl] = (0, import_react41.useState)();
-  (0, import_react41.useEffect)(() => {
+  const [el, setEl] = (0, import_react48.useState)();
+  (0, import_react48.useEffect)(() => {
     setEl(document.createElement("style"));
   }, []);
-  (0, import_react41.useEffect)(() => {
+  (0, import_react48.useEffect)(() => {
     var _a;
     if (!el || typeof window === "undefined") {
       return;
@@ -6941,8 +7382,35 @@ var useInjectGlobalCss = (iframeEnabled) => {
   return useInjectStyleSheet(styles, iframeEnabled);
 };
 
+// lib/use-preview-mode-hotkeys.ts
+init_react_import();
+var import_react49 = require("react");
+var import_react_hotkeys_hook2 = require("react-hotkeys-hook");
+var usePreviewModeHotkeys = (dispatch, iframeEnabled) => {
+  const toggleInteractive = (0, import_react49.useCallback)(() => {
+    dispatch({
+      type: "setUi",
+      ui: (ui) => ({
+        previewMode: ui.previewMode === "edit" ? "interactive" : "edit"
+      })
+    });
+  }, [dispatch]);
+  const toggleInteractiveIframe = () => {
+    if (iframeEnabled) {
+      toggleInteractive();
+    }
+  };
+  const frame = getFrame();
+  const resolvedFrame = typeof window !== "undefined" && frame !== document ? frame : void 0;
+  (0, import_react_hotkeys_hook2.useHotkeys)("meta+i", toggleInteractive, { preventDefault: true });
+  (0, import_react_hotkeys_hook2.useHotkeys)("meta+i", toggleInteractiveIframe, {
+    preventDefault: true,
+    document: resolvedFrame
+  });
+};
+
 // components/Puck/index.tsx
-var import_jsx_runtime37 = require("react/jsx-runtime");
+var import_jsx_runtime39 = require("react/jsx-runtime");
 var getClassName27 = get_class_name_factory_default("Puck", styles_module_default15);
 var getLayoutClassName = get_class_name_factory_default("PuckLayout", styles_module_default15);
 function Puck({
@@ -6971,7 +7439,7 @@ function Puck({
     waitForStyles: true
   }, _iframe);
   useInjectGlobalCss(iframe.enabled);
-  const [generatedAppState] = (0, import_react42.useState)(() => {
+  const [generatedAppState] = (0, import_react50.useState)(() => {
     var _a2, _b2, _c, _d, _e, _f, _g, _h, _i;
     const initial = __spreadValues(__spreadValues({}, defaultAppState.ui), initialUi);
     let clientUiState = {};
@@ -7043,14 +7511,14 @@ function Puck({
     histories,
     index: initialHistoryIndex
   });
-  const [reducer] = (0, import_react42.useState)(
+  const [reducer] = (0, import_react50.useState)(
     () => createReducer({
       config,
       record: historyStore.record,
       onAction
     })
   );
-  const [appState, dispatch] = (0, import_react42.useReducer)(
+  const [appState, dispatch] = (0, import_react50.useReducer)(
     reducer,
     flushZones(initialAppState)
   );
@@ -7061,14 +7529,14 @@ function Puck({
     historyStore,
     iframeEnabled: (_a = _iframe == null ? void 0 : _iframe.enabled) != null ? _a : true
   });
-  const [menuOpen, setMenuOpen] = (0, import_react42.useState)(false);
+  const [menuOpen, setMenuOpen] = (0, import_react50.useState)(false);
   const { itemSelector, leftSideBarVisible, rightSideBarVisible } = ui;
   const selectedItem = itemSelector ? getItem(itemSelector, data) : null;
-  (0, import_react42.useEffect)(() => {
+  (0, import_react50.useEffect)(() => {
     if (onChange) onChange(data);
   }, [data]);
   const rootProps = data.root.props || data.root;
-  const toggleSidebars = (0, import_react42.useCallback)(
+  const toggleSidebars = (0, import_react50.useCallback)(
     (sidebar) => {
       const widerViewport = window.matchMedia("(min-width: 638px)").matches;
       const sideBarVisible = sidebar === "left" ? leftSideBarVisible : rightSideBarVisible;
@@ -7082,7 +7550,7 @@ function Puck({
     },
     [dispatch, leftSideBarVisible, rightSideBarVisible]
   );
-  (0, import_react42.useEffect)(() => {
+  (0, import_react50.useEffect)(() => {
     if (!window.matchMedia("(min-width: 638px)").matches) {
       dispatch({
         type: "setUi",
@@ -7105,7 +7573,7 @@ function Puck({
       window.removeEventListener("resize", handleResize);
     };
   }, []);
-  const defaultHeaderRender = (0, import_react42.useMemo)(() => {
+  const defaultHeaderRender = (0, import_react50.useMemo)(() => {
     if (renderHeader) {
       console.warn(
         "`renderHeader` is deprecated. Please use `overrides.header` and the `usePuck` hook instead"
@@ -7113,20 +7581,20 @@ function Puck({
       const RenderHeader = (_a2) => {
         var _b2 = _a2, { actions } = _b2, props = __objRest(_b2, ["actions"]);
         const Comp = renderHeader;
-        return /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState, children: actions }));
+        return /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState, children: actions }));
       };
       return RenderHeader;
     }
     return DefaultOverride;
   }, [renderHeader]);
-  const defaultHeaderActionsRender = (0, import_react42.useMemo)(() => {
+  const defaultHeaderActionsRender = (0, import_react50.useMemo)(() => {
     if (renderHeaderActions) {
       console.warn(
         "`renderHeaderActions` is deprecated. Please use `overrides.headerActions` and the `usePuck` hook instead."
       );
       const RenderHeader = (props) => {
         const Comp = renderHeaderActions;
-        return /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState }));
+        return /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Comp, __spreadProps(__spreadValues({}, props), { dispatch, state: appState }));
       };
       return RenderHeader;
     }
@@ -7136,26 +7604,27 @@ function Puck({
     overrides,
     plugins
   });
-  const CustomPuck = (0, import_react42.useMemo)(
+  const CustomPuck = (0, import_react50.useMemo)(
     () => loadedOverrides.puck || DefaultOverride,
     [loadedOverrides]
   );
-  const CustomHeader = (0, import_react42.useMemo)(
+  const CustomHeader = (0, import_react50.useMemo)(
     () => loadedOverrides.header || defaultHeaderRender,
     [loadedOverrides]
   );
-  const CustomHeaderActions = (0, import_react42.useMemo)(
+  const CustomHeaderActions = (0, import_react50.useMemo)(
     () => loadedOverrides.headerActions || defaultHeaderActionsRender,
     [loadedOverrides]
   );
-  const [mounted, setMounted] = (0, import_react42.useState)(false);
-  (0, import_react42.useEffect)(() => {
+  const [mounted, setMounted] = (0, import_react50.useState)(false);
+  (0, import_react50.useEffect)(() => {
     setMounted(true);
   }, []);
   const selectedComponentConfig = selectedItem && config.components[selectedItem.type];
   const selectedComponentLabel = selectedItem ? (_b = selectedComponentConfig == null ? void 0 : selectedComponentConfig["label"]) != null ? _b : selectedItem.type.toString() : "";
-  return /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)("div", { className: `Puck ${getClassName27()}`, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+  usePreviewModeHotkeys(dispatch, iframe.enabled);
+  return /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: `Puck ${getClassName27()}`, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
       AppProvider,
       {
         value: {
@@ -7177,7 +7646,7 @@ function Puck({
           getPermissions: () => ({}),
           refreshPermissions: () => null
         },
-        children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(DragDropContext, { disableAutoScroll: dnd == null ? void 0 : dnd.disableAutoScroll, children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(CustomPuck, { children: children || /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+        children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(DragDropContext, { disableAutoScroll: dnd == null ? void 0 : dnd.disableAutoScroll, children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(CustomPuck, { children: children || /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
           "div",
           {
             className: getLayoutClassName({
@@ -7186,60 +7655,60 @@ function Puck({
               mounted,
               rightSideBarVisible
             }),
-            children: /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)("div", { className: getLayoutClassName("inner"), children: [
-              /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+            children: /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: getLayoutClassName("inner"), children: [
+              /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
                 CustomHeader,
                 {
-                  actions: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(import_jsx_runtime37.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(CustomHeaderActions, { children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+                  actions: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(import_jsx_runtime39.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(CustomHeaderActions, { children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
                     Button,
                     {
                       onClick: () => {
                         onPublish && onPublish(data);
                       },
-                      icon: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Globe, { size: "14px" }),
+                      icon: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Globe, { size: "14px" }),
                       children: "Publish"
                     }
                   ) }) }),
-                  children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("header", { className: getLayoutClassName("header"), children: /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)("div", { className: getLayoutClassName("headerInner"), children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)("div", { className: getLayoutClassName("headerToggle"), children: [
-                      /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+                  children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("header", { className: getLayoutClassName("header"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: getLayoutClassName("headerInner"), children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: getLayoutClassName("headerToggle"), children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
                         "div",
                         {
                           className: getLayoutClassName("leftSideBarToggle"),
-                          children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+                          children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
                             IconButton,
                             {
                               onClick: () => {
                                 toggleSidebars("left");
                               },
                               title: "Toggle left sidebar",
-                              children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(PanelLeft, { focusable: "false" })
+                              children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(PanelLeft, { focusable: "false" })
                             }
                           )
                         }
                       ),
-                      /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+                      /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
                         "div",
                         {
                           className: getLayoutClassName("rightSideBarToggle"),
-                          children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+                          children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
                             IconButton,
                             {
                               onClick: () => {
                                 toggleSidebars("right");
                               },
                               title: "Toggle right sidebar",
-                              children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(PanelRight, { focusable: "false" })
+                              children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(PanelRight, { focusable: "false" })
                             }
                           )
                         }
                       )
                     ] }),
-                    /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("div", { className: getLayoutClassName("headerTitle"), children: /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)(Heading, { rank: "2", size: "xs", children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: getLayoutClassName("headerTitle"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(Heading, { rank: "2", size: "xs", children: [
                       headerTitle || rootProps.title || "Page",
-                      headerPath && /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)(import_jsx_runtime37.Fragment, { children: [
+                      headerPath && /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(import_jsx_runtime39.Fragment, { children: [
                         " ",
-                        /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+                        /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
                           "code",
                           {
                             className: getLayoutClassName("headerPath"),
@@ -7248,31 +7717,31 @@ function Puck({
                         )
                       ] })
                     ] }) }),
-                    /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)("div", { className: getLayoutClassName("headerTools"), children: [
-                      /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("div", { className: getLayoutClassName("menuButton"), children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+                    /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: getLayoutClassName("headerTools"), children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: getLayoutClassName("menuButton"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
                         IconButton,
                         {
                           onClick: () => {
                             return setMenuOpen(!menuOpen);
                           },
                           title: "Toggle menu bar",
-                          children: menuOpen ? /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(ChevronUp, { focusable: "false" }) : /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(ChevronDown, { focusable: "false" })
+                          children: menuOpen ? /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(ChevronUp, { focusable: "false" }) : /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(ChevronDown, { focusable: "false" })
                         }
                       ) }),
-                      /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+                      /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
                         MenuBar,
                         {
                           appState,
                           dispatch,
                           onPublish,
                           menuOpen,
-                          renderHeaderActions: () => /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(CustomHeaderActions, { children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+                          renderHeaderActions: () => /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(CustomHeaderActions, { children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
                             Button,
                             {
                               onClick: () => {
                                 onPublish && onPublish(data);
                               },
-                              icon: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Globe, { size: "14px" }),
+                              icon: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Globe, { size: "14px" }),
                               children: "Publish"
                             }
                           ) }),
@@ -7283,19 +7752,19 @@ function Puck({
                   ] }) })
                 }
               ),
-              /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)("div", { className: getLayoutClassName("leftSideBar"), children: [
-                /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(SidebarSection, { title: "Components", noBorderTop: true, children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Components, {}) }),
-                /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(SidebarSection, { title: "Outline", children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Outline, {}) })
+              /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: getLayoutClassName("leftSideBar"), children: [
+                /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(SidebarSection, { title: "Components", noBorderTop: true, children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Components, {}) }),
+                /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(SidebarSection, { title: "Outline", children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Outline, {}) })
               ] }),
-              /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Canvas, {}),
-              /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("div", { className: getLayoutClassName("rightSideBar"), children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(
+              /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Canvas, {}),
+              /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: getLayoutClassName("rightSideBar"), children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
                 SidebarSection,
                 {
                   noPadding: true,
                   noBorderTop: true,
                   showBreadcrumbs: true,
                   title: selectedItem ? selectedComponentLabel : "Page",
-                  children: /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Fields, {})
+                  children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Fields, {})
                 }
               ) })
             ] })
@@ -7303,69 +7772,13 @@ function Puck({
         ) }) })
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("div", { id: "puck-portal-root", className: getClassName27("portal") })
+    /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { id: "puck-portal-root", className: getClassName27("portal") })
   ] });
 }
 Puck.Components = Components;
 Puck.Fields = Fields;
 Puck.Outline = Outline;
-Puck.Preview = Preview;
-
-// components/Render/index.tsx
-init_react_import();
-var import_jsx_runtime38 = require("react/jsx-runtime");
-function Render({
-  config,
-  data
-}) {
-  var _a;
-  const defaultedData = __spreadProps(__spreadValues({}, data), {
-    root: data.root || {},
-    content: data.content || []
-  });
-  const rootProps = defaultedData.root.props || defaultedData.root;
-  const title = (rootProps == null ? void 0 : rootProps.title) || "";
-  if ((_a = config.root) == null ? void 0 : _a.render) {
-    return /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
-      DropZoneProvider,
-      {
-        value: {
-          data: defaultedData,
-          config,
-          mode: "render",
-          depth: 0,
-          path: []
-        },
-        children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
-          config.root.render,
-          __spreadProps(__spreadValues({}, rootProps), {
-            puck: {
-              renderDropZone: DropZone,
-              isEditing: false
-            },
-            title,
-            editMode: false,
-            id: "puck-root",
-            children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(DropZone, { zone: rootDroppableId })
-          })
-        )
-      }
-    );
-  }
-  return /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(
-    DropZoneProvider,
-    {
-      value: {
-        data: defaultedData,
-        config,
-        mode: "render",
-        depth: 0,
-        path: []
-      },
-      children: /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(DropZone, { zone: rootDroppableId })
-    }
-  );
-}
+Puck.Preview = Preview2;
 
 // lib/migrate.ts
 init_react_import();