@measured/puck 0.11.3 → 0.12.0-canary.01939fc

package/dist/index.js

@@ -327,7 +327,7 @@ var require_react_is_development = __commonJS({
         var ContextProvider = REACT_PROVIDER_TYPE;
         var Element = REACT_ELEMENT_TYPE;
         var ForwardRef = REACT_FORWARD_REF_TYPE;
-        var Fragment12 = REACT_FRAGMENT_TYPE;
+        var Fragment13 = REACT_FRAGMENT_TYPE;
         var Lazy = REACT_LAZY_TYPE;
         var Memo = REACT_MEMO_TYPE;
         var Portal = REACT_PORTAL_TYPE;
@@ -386,7 +386,7 @@ var require_react_is_development = __commonJS({
         exports.ContextProvider = ContextProvider;
         exports.Element = Element;
         exports.ForwardRef = ForwardRef;
-        exports.Fragment = Fragment12;
+        exports.Fragment = Fragment13;
         exports.Lazy = Lazy;
         exports.Memo = Memo;
         exports.Portal = Portal;
@@ -760,7 +760,7 @@ var require_factoryWithTypeCheckers = __commonJS({
         function validate(props, propName, componentName, location, propFullName) {
           if (!(props[propName] instanceof expectedClass)) {
             var expectedClassName = expectedClass.name || ANONYMOUS;
-            var actualClassName = getClassName18(props[propName]);
+            var actualClassName = getClassName19(props[propName]);
             return new PropTypeError("Invalid " + location + " `" + propFullName + "` of type " + ("`" + actualClassName + "` supplied to `" + componentName + "`, expected ") + ("instance of `" + expectedClassName + "`."));
           }
           return null;
@@ -1012,7 +1012,7 @@ var require_factoryWithTypeCheckers = __commonJS({
             return type;
         }
       }
-      function getClassName18(propValue) {
+      function getClassName19(propValue) {
         if (!propValue.constructor || !propValue.constructor.name) {
           return ANONYMOUS;
         }
@@ -9040,7 +9040,7 @@ var require_react_dom_development = __commonJS({
         var HostPortal = 4;
         var HostComponent = 5;
         var HostText = 6;
-        var Fragment12 = 7;
+        var Fragment13 = 7;
         var Mode = 8;
         var ContextConsumer = 9;
         var ContextProvider = 10;
@@ -10196,7 +10196,7 @@ var require_react_dom_development = __commonJS({
               return "DehydratedFragment";
             case ForwardRef:
               return getWrappedName$1(type, type.render, "ForwardRef");
-            case Fragment12:
+            case Fragment13:
               return "Fragment";
             case HostComponent:
               return type;
@@ -14313,7 +14313,7 @@ var require_react_dom_development = __commonJS({
           defaultPrevented: 0,
           isTrusted: 0
         };
-        var SyntheticEvent2 = createSyntheticEvent(EventInterface);
+        var SyntheticEvent3 = createSyntheticEvent(EventInterface);
         var UIEventInterface = assign({}, EventInterface, {
           view: 0,
           detail: 0
@@ -14789,7 +14789,7 @@ var require_react_dom_development = __commonJS({
           enqueueStateRestore(target);
           var listeners = accumulateTwoPhaseListeners(inst, "onChange");
           if (listeners.length > 0) {
-            var event = new SyntheticEvent2("onChange", "change", null, nativeEvent, target);
+            var event = new SyntheticEvent3("onChange", "change", null, nativeEvent, target);
             dispatchQueue.push({
               event,
               listeners
@@ -15293,7 +15293,7 @@ var require_react_dom_development = __commonJS({
             lastSelection = currentSelection;
             var listeners = accumulateTwoPhaseListeners(activeElementInst$1, "onSelect");
             if (listeners.length > 0) {
-              var event = new SyntheticEvent2("onSelect", "select", null, nativeEvent, nativeEventTarget);
+              var event = new SyntheticEvent3("onSelect", "select", null, nativeEvent, nativeEventTarget);
               dispatchQueue.push({
                 event,
                 listeners
@@ -15405,7 +15405,7 @@ var require_react_dom_development = __commonJS({
           if (reactName === void 0) {
             return;
           }
-          var SyntheticEventCtor = SyntheticEvent2;
+          var SyntheticEventCtor = SyntheticEvent3;
           var reactEventType = domEventName;
           switch (domEventName) {
             case "keypress":
@@ -19867,7 +19867,7 @@ var require_react_dom_development = __commonJS({
             }
           }
           function updateFragment2(returnFiber, current2, fragment, lanes, key) {
-            if (current2 === null || current2.tag !== Fragment12) {
+            if (current2 === null || current2.tag !== Fragment13) {
               var created = createFiberFromFragment(fragment, returnFiber.mode, lanes, key);
               created.return = returnFiber;
               return created;
@@ -20270,7 +20270,7 @@ var require_react_dom_development = __commonJS({
               if (child.key === key) {
                 var elementType = element.type;
                 if (elementType === REACT_FRAGMENT_TYPE) {
-                  if (child.tag === Fragment12) {
+                  if (child.tag === Fragment13) {
                     deleteRemainingChildren(returnFiber, child.sibling);
                     var existing = useFiber(child, element.props.children);
                     existing.return = returnFiber;
@@ -24445,7 +24445,7 @@ var require_react_dom_development = __commonJS({
               var _resolvedProps2 = workInProgress2.elementType === type ? _unresolvedProps2 : resolveDefaultProps(type, _unresolvedProps2);
               return updateForwardRef(current2, workInProgress2, type, _resolvedProps2, renderLanes2);
             }
-            case Fragment12:
+            case Fragment13:
               return updateFragment(current2, workInProgress2, renderLanes2);
             case Mode:
               return updateMode(current2, workInProgress2, renderLanes2);
@@ -24718,7 +24718,7 @@ var require_react_dom_development = __commonJS({
             case SimpleMemoComponent:
             case FunctionComponent:
             case ForwardRef:
-            case Fragment12:
+            case Fragment13:
             case Mode:
             case Profiler:
             case ContextConsumer:
@@ -28977,7 +28977,7 @@ var require_react_dom_development = __commonJS({
           return fiber;
         }
         function createFiberFromFragment(elements, mode, lanes, key) {
-          var fiber = createFiber(Fragment12, elements, key, mode);
+          var fiber = createFiber(Fragment13, elements, key, mode);
           fiber.lanes = lanes;
           return fiber;
         }
@@ -30125,7 +30125,7 @@ var import_react2 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Button/Button.module.css#css-module
 init_react_import();
-var Button_module_default = { "Button": "_Button_1muck_1", "Button--medium": "_Button--medium_1muck_20", "Button--large": "_Button--large_1muck_27", "Button-icon": "_Button-icon_1muck_34", "Button--primary": "_Button--primary_1muck_42", "Button--secondary": "_Button--secondary_1muck_51", "Button--flush": "_Button--flush_1muck_62", "Button--disabled": "_Button--disabled_1muck_66", "Button--fullWidth": "_Button--fullWidth_1muck_76" };
+var Button_module_default = { "Button": "_Button_zx1c8_1", "Button--medium": "_Button--medium_zx1c8_21", "Button--large": "_Button--large_zx1c8_28", "Button-icon": "_Button-icon_zx1c8_35", "Button--primary": "_Button--primary_zx1c8_43", "Button--secondary": "_Button--secondary_zx1c8_52", "Button--flush": "_Button--flush_zx1c8_63", "Button--disabled": "_Button--disabled_zx1c8_67", "Button--fullWidth": "_Button--fullWidth_zx1c8_77" };
 
 // lib/get-class-name-factory.ts
 init_react_import();
@@ -30213,12 +30213,12 @@ var Button = ({
 
 // components/DropZone/index.tsx
 init_react_import();
-var import_react26 = require("react");
+var import_react25 = require("react");
 
 // components/DraggableComponent/index.tsx
 init_react_import();
 var import_react22 = require("react");
-var import_react_beautiful_dnd = require("react-beautiful-dnd");
+var import_dnd = require("@hello-pangea/dnd");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/DraggableComponent/styles.module.css#css-module
 init_react_import();
@@ -31746,7 +31746,7 @@ var DraggableComponent = ({
   const isModifierHeld = useModifierHeld("Alt");
   (0, import_react22.useEffect)(onMount, []);
   return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-    import_react_beautiful_dnd.Draggable,
+    import_dnd.Draggable,
     {
       draggableId: id,
       index,
@@ -31789,27 +31789,8 @@ var DraggableComponent = ({
   );
 };
 
-// components/DroppableStrictMode/index.tsx
-init_react_import();
-var import_react23 = require("react");
-var import_react_beautiful_dnd2 = require("react-beautiful-dnd");
-var import_jsx_runtime3 = require("react/jsx-runtime");
-var DroppableStrictMode = (_a) => {
-  var _b = _a, { children } = _b, props = __objRest(_b, ["children"]);
-  const [enabled, setEnabled] = (0, import_react23.useState)(false);
-  (0, import_react23.useEffect)(() => {
-    const animation = requestAnimationFrame(() => setEnabled(true));
-    return () => {
-      cancelAnimationFrame(animation);
-      setEnabled(false);
-    };
-  }, []);
-  if (!enabled) {
-    return null;
-  }
-  return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_react_beautiful_dnd2.Droppable, __spreadProps(__spreadValues({}, props), { children }));
-};
-var DroppableStrictMode_default = DroppableStrictMode;
+// components/DropZone/index.tsx
+var import_dnd2 = require("@hello-pangea/dnd");
 
 // lib/get-item.ts
 init_react_import();
@@ -31870,7 +31851,7 @@ var styles_module_default2 = { "DropZone": "_DropZone_1akqa_1", "DropZone-conten
 
 // components/DropZone/context.tsx
 init_react_import();
-var import_react24 = require("react");
+var import_react23 = require("react");
 var import_use_debounce = require("use-debounce");
 
 // lib/get-zone-id.ts
@@ -31886,30 +31867,30 @@ var getZoneId = (zoneCompound) => {
 };
 
 // components/DropZone/context.tsx
-var import_jsx_runtime4 = require("react/jsx-runtime");
-var dropZoneContext = (0, import_react24.createContext)(null);
+var import_jsx_runtime3 = require("react/jsx-runtime");
+var dropZoneContext = (0, import_react23.createContext)(null);
 var DropZoneProvider = ({
   children,
   value
 }) => {
-  const [hoveringArea, setHoveringArea] = (0, import_react24.useState)(null);
-  const [hoveringZone, setHoveringZone] = (0, import_react24.useState)(
+  const [hoveringArea, setHoveringArea] = (0, import_react23.useState)(null);
+  const [hoveringZone, setHoveringZone] = (0, import_react23.useState)(
     rootDroppableId
   );
-  const [hoveringComponent, setHoveringComponent] = (0, import_react24.useState)();
+  const [hoveringComponent, setHoveringComponent] = (0, import_react23.useState)();
   const [hoveringAreaDb] = (0, import_use_debounce.useDebounce)(hoveringArea, 75, { leading: false });
-  const [areasWithZones, setAreasWithZones] = (0, import_react24.useState)(
+  const [areasWithZones, setAreasWithZones] = (0, import_react23.useState)(
     {}
   );
-  const [activeZones, setActiveZones] = (0, import_react24.useState)({});
+  const [activeZones, setActiveZones] = (0, import_react23.useState)({});
   const { dispatch = null } = value ? value : {};
-  const registerZoneArea = (0, import_react24.useCallback)(
+  const registerZoneArea = (0, import_react23.useCallback)(
     (area) => {
       setAreasWithZones((latest) => __spreadProps(__spreadValues({}, latest), { [area]: true }));
     },
     [setAreasWithZones]
   );
-  const registerZone = (0, import_react24.useCallback)(
+  const registerZone = (0, import_react23.useCallback)(
     (zoneCompound) => {
       if (!dispatch) {
         return;
@@ -31922,7 +31903,7 @@ var DropZoneProvider = ({
     },
     [setActiveZones, dispatch]
   );
-  const unregisterZone = (0, import_react24.useCallback)(
+  const unregisterZone = (0, import_react23.useCallback)(
     (zoneCompound) => {
       if (!dispatch) {
         return;
@@ -31937,8 +31918,8 @@ var DropZoneProvider = ({
     },
     [setActiveZones, dispatch]
   );
-  const [pathData, setPathData] = (0, import_react24.useState)();
-  const registerPath = (0, import_react24.useCallback)(
+  const [pathData, setPathData] = (0, import_react23.useState)();
+  const registerPath = (0, import_react23.useCallback)(
     (selector) => {
       if (!(value == null ? void 0 : value.data)) {
         return;
@@ -31963,7 +31944,7 @@ var DropZoneProvider = ({
     },
     [value, setPathData]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_jsx_runtime4.Fragment, { children: value && /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_jsx_runtime3.Fragment, { children: value && /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
     dropZoneContext.Provider,
     {
       value: __spreadValues({
@@ -31988,7 +31969,7 @@ var DropZoneProvider = ({
 
 // components/Puck/context.tsx
 init_react_import();
-var import_react25 = require("react");
+var import_react24 = require("react");
 var defaultAppState = {
   data: { content: [], root: { title: "" } },
   ui: {
@@ -31998,7 +31979,7 @@ var defaultAppState = {
     componentList: {}
   }
 };
-var appContext = (0, import_react25.createContext)({
+var appContext = (0, import_react24.createContext)({
   state: defaultAppState,
   dispatch: () => null,
   config: { components: {} },
@@ -32006,7 +31987,7 @@ var appContext = (0, import_react25.createContext)({
 });
 var AppProvider = appContext.Provider;
 var useAppContext = () => {
-  const mainContext = (0, import_react25.useContext)(appContext);
+  const mainContext = (0, import_react24.useContext)(appContext);
   const selectedItem = mainContext.state.ui.itemSelector ? getItem(mainContext.state.ui.itemSelector, mainContext.state.data) : void 0;
   return __spreadProps(__spreadValues({}, mainContext), {
     // Helpers
@@ -32022,12 +32003,12 @@ var useAppContext = () => {
 };
 
 // components/DropZone/index.tsx
-var import_jsx_runtime5 = require("react/jsx-runtime");
+var import_jsx_runtime4 = require("react/jsx-runtime");
 var getClassName3 = get_class_name_factory_default("DropZone", styles_module_default2);
 function DropZoneEdit({ zone, style }) {
   var _a;
   const appContext2 = useAppContext();
-  const ctx = (0, import_react26.useContext)(dropZoneContext);
+  const ctx = (0, import_react25.useContext)(dropZoneContext);
   const {
     // These all need setting via context
     data,
@@ -32044,12 +32025,12 @@ function DropZoneEdit({ zone, style }) {
   } = ctx || {};
   let content = data.content || [];
   let zoneCompound = rootDroppableId;
-  (0, import_react26.useEffect)(() => {
+  (0, import_react25.useEffect)(() => {
     if (areaId && registerZoneArea) {
       registerZoneArea(areaId);
     }
   }, [areaId]);
-  (0, import_react26.useEffect)(() => {
+  (0, import_react25.useEffect)(() => {
     if (ctx == null ? void 0 : ctx.registerZone) {
       ctx == null ? void 0 : ctx.registerZone(zoneCompound);
     }
@@ -32070,12 +32051,12 @@ function DropZoneEdit({ zone, style }) {
   const draggedDestinationId = draggedItem && ((_a = draggedItem.destination) == null ? void 0 : _a.droppableId);
   const [zoneArea] = getZoneId(zoneCompound);
   const [draggedSourceArea] = getZoneId(draggedSourceId);
-  const [userWillDrag, setUserWillDrag] = (0, import_react26.useState)(false);
+  const [userWillDrag, setUserWillDrag] = (0, import_react25.useState)(false);
   const userIsDragging = !!draggedItem;
   const draggingOverArea = userIsDragging && zoneArea === draggedSourceArea;
   const draggingNewComponent = draggedSourceId == null ? void 0 : draggedSourceId.startsWith("component-list");
   if (!(ctx == null ? void 0 : ctx.config) || !ctx.setHoveringArea || !ctx.setHoveringZone || !ctx.setHoveringComponent || !ctx.setItemSelector || !ctx.registerPath || !ctx.dispatch) {
-    return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("div", { children: "DropZone requires context to work." });
+    return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { children: "DropZone requires context to work." });
   }
   const {
     hoveringArea = "root",
@@ -32096,7 +32077,7 @@ function DropZoneEdit({ zone, style }) {
   }
   const selectedItem = itemSelector ? getItem(itemSelector, data) : null;
   const isAreaSelected = selectedItem && zoneArea === selectedItem.props.id;
-  return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
     "div",
     {
       className: getClassName3({
@@ -32110,14 +32091,14 @@ function DropZoneEdit({ zone, style }) {
         isAreaSelected,
         hasChildren: content.length > 0
       }),
-      children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
-        DroppableStrictMode_default,
+      children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
+        import_dnd2.Droppable,
         {
           droppableId: zoneCompound,
           direction: "vertical",
           isDropDisabled: !isEnabled,
           children: (provided, snapshot) => {
-            return /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(
+            return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(
               "div",
               __spreadProps(__spreadValues({}, (provided || { droppableProps: {} }).droppableProps), {
                 className: getClassName3("content"),
@@ -32134,6 +32115,7 @@ function DropZoneEdit({ zone, style }) {
                     var _a2, _b;
                     const componentId = item.props.id;
                     const defaultedProps = __spreadProps(__spreadValues(__spreadValues({}, (_a2 = config.components[item.type]) == null ? void 0 : _a2.defaultProps), item.props), {
+                      puck: { renderDropZone: DropZone },
                       editMode: true
                     });
                     const isSelected = (selectedItem == null ? void 0 : selectedItem.props.id) === componentId || false;
@@ -32141,23 +32123,23 @@ function DropZoneEdit({ zone, style }) {
                       "draggable-"
                     )[1] === componentId;
                     const containsZone = areasWithZones ? areasWithZones[componentId] : false;
-                    const Render2 = config.components[item.type] ? config.components[item.type].render : () => /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)("div", { style: { padding: 48, textAlign: "center" }, children: [
+                    const Render2 = config.components[item.type] ? config.components[item.type].render : () => /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { style: { padding: 48, textAlign: "center" }, children: [
                       "No configuration for ",
                       item.type
                     ] });
-                    return /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(
+                    return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(
                       "div",
                       {
                         className: getClassName3("item"),
                         style: { zIndex: isDragging ? 1 : void 0 },
                         children: [
-                          /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
+                          /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
                             DropZoneProvider,
                             {
                               value: __spreadProps(__spreadValues({}, ctx), {
                                 areaId: componentId
                               }),
-                              children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
+                              children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
                                 DraggableComponent,
                                 {
                                   label: item.type.toString(),
@@ -32228,12 +32210,12 @@ function DropZoneEdit({ zone, style }) {
                                   style: {
                                     pointerEvents: userIsDragging && draggingNewComponent ? "all" : void 0
                                   },
-                                  children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)("div", { style: { zoom: 0.75 }, children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(Render2, __spreadValues({}, defaultedProps)) })
+                                  children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { style: { zoom: 0.75 }, children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(Render2, __spreadValues({}, defaultedProps)) })
                                 }
                               )
                             }
                           ),
-                          userIsDragging && /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
+                          userIsDragging && /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
                             "div",
                             {
                               className: getClassName3("hitbox"),
@@ -32250,7 +32232,7 @@ function DropZoneEdit({ zone, style }) {
                     );
                   }),
                   provided == null ? void 0 : provided.placeholder,
-                  (snapshot == null ? void 0 : snapshot.isDraggingOver) && /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
+                  (snapshot == null ? void 0 : snapshot.isDraggingOver) && /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
                     "div",
                     {
                       "data-puck-placeholder": true,
@@ -32271,7 +32253,7 @@ function DropZoneEdit({ zone, style }) {
   );
 }
 function DropZoneRender({ zone }) {
-  const ctx = (0, import_react26.useContext)(dropZoneContext);
+  const ctx = (0, import_react25.useContext)(dropZoneContext);
   const { data, areaId = "root", config } = ctx || {};
   let zoneCompound = rootDroppableId;
   let content = (data == null ? void 0 : data.content) || [];
@@ -32282,14 +32264,19 @@ function DropZoneRender({ zone }) {
     zoneCompound = `${areaId}:${zone}`;
     content = setupZone(data, zoneCompound).zones[zoneCompound];
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_jsx_runtime5.Fragment, { children: content.map((item) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_jsx_runtime4.Fragment, { children: content.map((item) => {
     const Component = config.components[item.type];
     if (Component) {
-      return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
+      return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
         DropZoneProvider,
         {
           value: { data, config, areaId: item.props.id },
-          children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(Component.render, __spreadValues({}, item.props))
+          children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
+            Component.render,
+            __spreadProps(__spreadValues({}, item.props), {
+              puck: { renderDropZone: DropZone }
+            })
+          )
         },
         item.props.id
       );
@@ -32298,11 +32285,11 @@ function DropZoneRender({ zone }) {
   }) });
 }
 function DropZone(props) {
-  const ctx = (0, import_react26.useContext)(dropZoneContext);
+  const ctx = (0, import_react25.useContext)(dropZoneContext);
   if ((ctx == null ? void 0 : ctx.mode) === "edit") {
-    return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(DropZoneEdit, __spreadValues({}, props));
+    return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(DropZoneEdit, __spreadValues({}, props));
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(DropZoneRender, __spreadValues({}, props));
+  return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(DropZoneRender, __spreadValues({}, props));
 }
 
 // components/IconButton/index.ts
@@ -32310,7 +32297,7 @@ init_react_import();
 
 // components/IconButton/IconButton.tsx
 init_react_import();
-var import_react27 = require("react");
+var import_react26 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/IconButton/IconButton.module.css#css-module
 init_react_import();
@@ -32318,7 +32305,7 @@ var IconButton_module_default = { "IconButton": "_IconButton_13gzt_1" };
 
 // components/IconButton/IconButton.tsx
 var import_react_spinners3 = require("react-spinners");
-var import_jsx_runtime6 = require("react/jsx-runtime");
+var import_jsx_runtime5 = require("react/jsx-runtime");
 var getClassName4 = get_class_name_factory_default("IconButton", IconButton_module_default);
 var IconButton = ({
   children,
@@ -32332,9 +32319,9 @@ var IconButton = ({
   fullWidth,
   title
 }) => {
-  const [loading, setLoading] = (0, import_react27.useState)(false);
+  const [loading, setLoading] = (0, import_react26.useState)(false);
   const ElementType = href ? "a" : "button";
-  const el = /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(
+  const el = /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(
     ElementType,
     {
       className: getClassName4({
@@ -32360,9 +32347,9 @@ var IconButton = ({
       title,
       children: [
         children,
-        loading && /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_jsx_runtime6.Fragment, { children: [
+        loading && /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(import_jsx_runtime5.Fragment, { children: [
           "\xA0\xA0",
-          /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_react_spinners3.ClipLoader, { color: "inherit", size: "14px" })
+          /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_react_spinners3.ClipLoader, { color: "inherit", size: "14px" })
         ] })
       ]
     }
@@ -32373,14 +32360,14 @@ var IconButton = ({
 // components/Puck/index.tsx
 init_react_import();
 var import_react39 = require("react");
-var import_react_beautiful_dnd5 = require("react-beautiful-dnd");
+var import_dnd7 = require("@hello-pangea/dnd");
 
 // components/InputOrGroup/index.tsx
 init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/InputOrGroup/styles.module.css#css-module
 init_react_import();
-var styles_module_default3 = { "Input": "_Input_1kw16_1", "Input-label": "_Input-label_1kw16_27", "Input-labelIcon": "_Input-labelIcon_1kw16_34", "Input-disabledIcon": "_Input-disabledIcon_1kw16_40", "Input-input": "_Input-input_1kw16_45", "Input--readOnly": "_Input--readOnly_1kw16_66", "Input-radioGroupItems": "_Input-radioGroupItems_1kw16_78", "Input-radio": "_Input-radio_1kw16_78", "Input-radioInner": "_Input-radioInner_1kw16_95", "Input-radioInput": "_Input-radioInput_1kw16_117" };
+var styles_module_default3 = { "Input": "_Input_199j9_1", "Input-label": "_Input-label_199j9_27", "Input-labelIcon": "_Input-labelIcon_199j9_35", "Input-disabledIcon": "_Input-disabledIcon_199j9_41", "Input-input": "_Input-input_199j9_46", "Input--readOnly": "_Input--readOnly_199j9_68", "Input-radioGroupItems": "_Input-radioGroupItems_199j9_86", "Input-radio": "_Input-radio_199j9_86", "Input-radioInner": "_Input-radioInner_199j9_103", "Input-radioInput": "_Input-radioInput_199j9_125" };
 
 // components/InputOrGroup/index.tsx
 var import_react31 = require("react");
@@ -32393,15 +32380,16 @@ init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/InputOrGroup/fields/ArrayField/styles.module.css#css-module
 init_react_import();
-var styles_module_default4 = { "ArrayField": "_ArrayField_13rp0_5", "ArrayField--isDraggingFrom": "_ArrayField--isDraggingFrom_13rp0_13", "ArrayField-addButton": "_ArrayField-addButton_13rp0_17", "ArrayField--hasItems": "_ArrayField--hasItems_13rp0_31", "ArrayFieldItem": "_ArrayFieldItem_13rp0_45", "ArrayFieldItem--isDragging": "_ArrayFieldItem--isDragging_13rp0_53", "ArrayFieldItem--isExpanded": "_ArrayFieldItem--isExpanded_13rp0_58", "ArrayFieldItem-summary": "_ArrayFieldItem-summary_13rp0_72", "ArrayFieldItem--readOnly": "_ArrayFieldItem--readOnly_13rp0_84", "ArrayFieldItem-body": "_ArrayFieldItem-body_13rp0_105", "ArrayFieldItem-fieldset": "_ArrayFieldItem-fieldset_13rp0_113", "ArrayFieldItem-rhs": "_ArrayFieldItem-rhs_13rp0_120", "ArrayFieldItem-actions": "_ArrayFieldItem-actions_13rp0_126", "ArrayFieldItem-action": "_ArrayFieldItem-action_13rp0_126" };
+var styles_module_default4 = { "ArrayField": "_ArrayField_hsw7n_5", "ArrayField--isDraggingFrom": "_ArrayField--isDraggingFrom_hsw7n_13", "ArrayField-addButton": "_ArrayField-addButton_hsw7n_17", "ArrayField--hasItems": "_ArrayField--hasItems_hsw7n_31", "ArrayFieldItem": "_ArrayFieldItem_hsw7n_45", "ArrayFieldItem--isDragging": "_ArrayFieldItem--isDragging_hsw7n_53", "ArrayFieldItem--isExpanded": "_ArrayFieldItem--isExpanded_hsw7n_58", "ArrayFieldItem-summary": "_ArrayFieldItem-summary_hsw7n_73", "ArrayFieldItem--readOnly": "_ArrayFieldItem--readOnly_hsw7n_86", "ArrayFieldItem-body": "_ArrayFieldItem-body_hsw7n_107", "ArrayFieldItem-fieldset": "_ArrayFieldItem-fieldset_hsw7n_115", "ArrayFieldItem-rhs": "_ArrayFieldItem-rhs_hsw7n_122", "ArrayFieldItem-actions": "_ArrayFieldItem-actions_hsw7n_128", "ArrayFieldItem-action": "_ArrayFieldItem-action_hsw7n_128" };
 
 // components/InputOrGroup/fields/ArrayField/index.tsx
-var import_react_beautiful_dnd4 = require("react-beautiful-dnd");
+var import_dnd4 = require("@hello-pangea/dnd");
+var import_dnd5 = require("@hello-pangea/dnd");
 
 // components/Draggable/index.tsx
 init_react_import();
-var import_react_beautiful_dnd3 = require("react-beautiful-dnd");
-var import_jsx_runtime7 = require("react/jsx-runtime");
+var import_dnd3 = require("@hello-pangea/dnd");
+var import_jsx_runtime6 = require("react/jsx-runtime");
 var Draggable2 = ({
   className,
   children,
@@ -32411,16 +32399,16 @@ var Draggable2 = ({
   disableAnimations = false,
   isDragDisabled = false
 }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
-    import_react_beautiful_dnd3.Draggable,
+  return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
+    import_dnd3.Draggable,
     {
       draggableId: id,
       index,
       isDragDisabled,
       children: (provided, snapshot) => {
         var _a;
-        return /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(import_jsx_runtime7.Fragment, { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+        return /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_jsx_runtime6.Fragment, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
             "div",
             __spreadProps(__spreadValues(__spreadValues({
               className: className && className(provided, snapshot),
@@ -32432,7 +32420,7 @@ var Draggable2 = ({
               children: children(provided, snapshot)
             })
           ),
-          showShadow && snapshot.isDragging && /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+          showShadow && snapshot.isDragging && /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
             "div",
             {
               className: className && className(provided, snapshot),
@@ -32452,7 +32440,7 @@ var import_crypto = require("crypto");
 var generateId = (type) => `${type}-${(0, import_crypto.randomBytes)(20).toString("hex")}`;
 
 // components/InputOrGroup/fields/ArrayField/index.tsx
-var import_react28 = require("react");
+var import_react27 = require("react");
 
 // components/DragIcon/index.tsx
 init_react_import();
@@ -32462,12 +32450,12 @@ init_react_import();
 var styles_module_default5 = { "DragIcon": "_DragIcon_o29on_1" };
 
 // components/DragIcon/index.tsx
-var import_jsx_runtime8 = require("react/jsx-runtime");
+var import_jsx_runtime7 = require("react/jsx-runtime");
 var getClassName5 = get_class_name_factory_default("DragIcon", styles_module_default5);
-var DragIcon = () => /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("div", { className: getClassName5(), children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("svg", { viewBox: "0 0 20 20", width: "12", fill: "currentColor", children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("path", { d: "M7 2a2 2 0 1 0 .001 4.001A2 2 0 0 0 7 2zm0 6a2 2 0 1 0 .001 4.001A2 2 0 0 0 7 8zm0 6a2 2 0 1 0 .001 4.001A2 2 0 0 0 7 14zm6-8a2 2 0 1 0-.001-4.001A2 2 0 0 0 13 6zm0 2a2 2 0 1 0 .001 4.001A2 2 0 0 0 13 8zm0 6a2 2 0 1 0 .001 4.001A2 2 0 0 0 13 14z" }) }) });
+var DragIcon = () => /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("div", { className: getClassName5(), children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("svg", { viewBox: "0 0 20 20", width: "12", fill: "currentColor", children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("path", { d: "M7 2a2 2 0 1 0 .001 4.001A2 2 0 0 0 7 2zm0 6a2 2 0 1 0 .001 4.001A2 2 0 0 0 7 8zm0 6a2 2 0 1 0 .001 4.001A2 2 0 0 0 7 14zm6-8a2 2 0 1 0-.001-4.001A2 2 0 0 0 13 6zm0 2a2 2 0 1 0 .001 4.001A2 2 0 0 0 13 8zm0 6a2 2 0 1 0 .001 4.001A2 2 0 0 0 13 14z" }) }) });
 
 // components/InputOrGroup/fields/ArrayField/index.tsx
-var import_jsx_runtime9 = require("react/jsx-runtime");
+var import_jsx_runtime8 = require("react/jsx-runtime");
 var getClassName6 = get_class_name_factory_default("ArrayField", styles_module_default4);
 var getClassNameItem = get_class_name_factory_default("ArrayFieldItem", styles_module_default4);
 var ArrayField = ({
@@ -32479,32 +32467,39 @@ var ArrayField = ({
   readOnly,
   readOnlyFields = {}
 }) => {
-  const [arrayFieldId] = (0, import_react28.useState)(generateId("ArrayField"));
+  const [arrayFieldId] = (0, import_react27.useState)(generateId("ArrayField"));
   const { state, setUi } = useAppContext();
-  const arrayState = state.ui.arrayState[arrayFieldId] || {
-    items: Array.from(value || []).map((v) => ({
-      _arrayId: generateId("ArrayItem"),
-      data: v
-    })),
-    openId: ""
-  };
-  const setArrayState = (0, import_react28.useCallback)(
-    (newArrayState, recordHistory = false) => {
+  const arrayStateRef = (0, import_react27.useRef)(
+    state.ui.arrayState[arrayFieldId] || {
+      items: [],
+      openId: ""
+    }
+  );
+  const arrayState = arrayStateRef.current;
+  const setArrayState = (0, import_react27.useCallback)(
+    (partialArrayState, recordHistory = false) => {
       setUi(
         {
           arrayState: __spreadProps(__spreadValues({}, state.ui.arrayState), {
-            [arrayFieldId]: __spreadValues(__spreadValues({}, arrayState), newArrayState)
+            [arrayFieldId]: __spreadValues(__spreadValues({}, arrayState), partialArrayState)
           })
         },
         recordHistory
       );
+      arrayStateRef.current = __spreadValues(__spreadValues({}, arrayState), partialArrayState);
     },
     [arrayState]
   );
-  (0, import_react28.useEffect)(() => {
+  (0, import_react27.useEffect)(() => {
+    let highestIndex = arrayState.items.reduce(
+      (acc, item) => item._originalIndex > acc ? item._originalIndex : acc,
+      -1
+    );
     const newItems = Array.from(value || []).map((item, idx) => {
       var _a;
+      const arrayStateItem = arrayState.items[idx];
       return {
+        _originalIndex: typeof (arrayStateItem == null ? void 0 : arrayStateItem._originalIndex) !== "undefined" ? arrayStateItem._originalIndex : ++highestIndex,
         _arrayId: ((_a = arrayState.items[idx]) == null ? void 0 : _a._arrayId) || generateId("ArrayItem"),
         data: item
       };
@@ -32514,15 +32509,15 @@ var ArrayField = ({
   if (field.type !== "array" || !field.arrayFields) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
     FieldLabelInternal,
     {
       label: label || name,
-      icon: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(list_default, { size: 16 }),
+      icon: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(list_default, { size: 16 }),
       el: "div",
       readOnly,
-      children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
-        import_react_beautiful_dnd4.DragDropContext,
+      children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
+        import_dnd5.DragDropContext,
         {
           onDragEnd: (event) => {
             var _a;
@@ -32536,8 +32531,8 @@ var ArrayField = ({
               onChange(newValue.map(({ data }) => data));
             }
           },
-          children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(DroppableStrictMode_default, { droppableId: "array", isDropDisabled: readOnly, children: (provided, snapshot) => {
-            return /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(
+          children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(import_dnd4.Droppable, { droppableId: "array", isDropDisabled: readOnly, children: (provided, snapshot) => {
+            return /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(
               "div",
               __spreadProps(__spreadValues({}, provided.droppableProps), {
                 ref: provided.innerRef,
@@ -32546,99 +32541,97 @@ var ArrayField = ({
                   hasItems: Array.isArray(value) && value.length > 0
                 }),
                 children: [
-                  Array.isArray(value) && value.length > 0 ? arrayState.items.map(({ _arrayId, data }, i) => /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
-                    Draggable2,
-                    {
-                      id: _arrayId,
-                      index: i,
-                      className: (_, snapshot2) => getClassNameItem({
-                        isExpanded: arrayState.openId === _arrayId,
-                        isDragging: snapshot2.isDragging,
-                        readOnly
-                      }),
-                      isDragDisabled: readOnly,
-                      children: () => /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(import_jsx_runtime9.Fragment, { children: [
-                        /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(
-                          "div",
-                          {
-                            onClick: () => {
-                              if (arrayState.openId === _arrayId) {
-                                setArrayState({
-                                  openId: ""
-                                });
-                              } else {
-                                setArrayState({
-                                  openId: _arrayId
-                                });
-                              }
-                            },
-                            className: getClassNameItem("summary"),
-                            children: [
-                              field.getItemSummary ? field.getItemSummary(data, i) : `Item #${i}`,
-                              /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { className: getClassNameItem("rhs"), children: [
-                                !readOnly && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { className: getClassNameItem("actions"), children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { className: getClassNameItem("action"), children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
-                                  IconButton,
-                                  {
-                                    onClick: () => {
-                                      const existingValue = [
-                                        ...value || []
-                                      ];
-                                      const existingItems = [
-                                        ...arrayState.items || []
-                                      ];
-                                      existingValue.splice(i, 1);
-                                      existingItems.splice(i, 1);
-                                      setArrayState(
-                                        { items: existingItems },
-                                        true
-                                      );
-                                      onChange(existingValue);
-                                    },
-                                    title: "Delete",
-                                    children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(trash_default, { size: 16 })
-                                  }
-                                ) }) }),
-                                /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(DragIcon, {}) })
-                              ] })
-                            ]
-                          }
-                        ),
-                        /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { className: getClassNameItem("body"), children: /* @__PURE__ */ (0, import_jsx_runtime9.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}`;
-                                return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
-                                  InputOrGroup,
-                                  {
-                                    name: subFieldName,
-                                    label: subField.label || fieldName,
-                                    readOnly: typeof readOnlyFields[subFieldName] !== "undefined" ? readOnlyFields[subFieldName] : readOnlyFields[wildcardFieldName],
-                                    readOnlyFields,
-                                    field: subField,
-                                    value: data[fieldName],
-                                    onChange: (val) => onChange(
-                                      replace(value, i, __spreadProps(__spreadValues({}, data), {
-                                        [fieldName]: val
-                                      }))
-                                    )
-                                  },
-                                  subFieldName
-                                );
-                              }
-                            )
-                          }
-                        ) })
-                      ] })
-                    },
-                    _arrayId
-                  )) : null,
+                  arrayState.items.map(({ data }, i) => {
+                    const { _arrayId, _originalIndex = i } = arrayState.items[i] || {};
+                    return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
+                      Draggable2,
+                      {
+                        id: _arrayId,
+                        index: i,
+                        className: (_, snapshot2) => getClassNameItem({
+                          isExpanded: arrayState.openId === _arrayId,
+                          isDragging: snapshot2.isDragging,
+                          readOnly
+                        }),
+                        isDragDisabled: readOnly,
+                        children: () => /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(import_jsx_runtime8.Fragment, { children: [
+                          /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)(
+                            "div",
+                            {
+                              onClick: () => {
+                                if (arrayState.openId === _arrayId) {
+                                  setArrayState({
+                                    openId: ""
+                                  });
+                                } else {
+                                  setArrayState({
+                                    openId: _arrayId
+                                  });
+                                }
+                              },
+                              className: getClassNameItem("summary"),
+                              children: [
+                                field.getItemSummary ? field.getItemSummary(data, i) : `Item #${_originalIndex}`,
+                                /* @__PURE__ */ (0, import_jsx_runtime8.jsxs)("div", { className: getClassNameItem("rhs"), children: [
+                                  !readOnly && /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("div", { className: getClassNameItem("actions"), children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("div", { className: getClassNameItem("action"), children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
+                                    IconButton,
+                                    {
+                                      onClick: (e) => {
+                                        e.stopPropagation();
+                                        const existingValue = [
+                                          ...value || []
+                                        ];
+                                        const existingItems = [
+                                          ...arrayState.items || []
+                                        ];
+                                        existingValue.splice(i, 1);
+                                        existingItems.splice(i, 1);
+                                        setArrayState(
+                                          { items: existingItems },
+                                          true
+                                        );
+                                        onChange(existingValue);
+                                      },
+                                      title: "Delete",
+                                      children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(trash_default, { size: 16 })
+                                    }
+                                  ) }) }),
+                                  /* @__PURE__ */ (0, import_jsx_runtime8.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(DragIcon, {}) })
+                                ] })
+                              ]
+                            }
+                          ),
+                          /* @__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(
+                            (fieldName) => {
+                              const subField = field.arrayFields[fieldName];
+                              const subFieldName = `${name}[${i}].${fieldName}`;
+                              const wildcardFieldName = `${name}[*].${fieldName}`;
+                              return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
+                                InputOrGroup,
+                                {
+                                  name: subFieldName,
+                                  label: subField.label || fieldName,
+                                  readOnly: typeof readOnlyFields[subFieldName] !== "undefined" ? readOnlyFields[subFieldName] : readOnlyFields[wildcardFieldName],
+                                  readOnlyFields,
+                                  field: subField,
+                                  value: data[fieldName],
+                                  onChange: (val) => onChange(
+                                    replace(value, i, __spreadProps(__spreadValues({}, data), {
+                                      [fieldName]: val
+                                    }))
+                                  )
+                                },
+                                subFieldName
+                              );
+                            }
+                          ) }) })
+                        ] })
+                      },
+                      _arrayId
+                    );
+                  }),
                   provided.placeholder,
-                  /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+                  /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(
                     "button",
                     {
                       className: getClassName6("addButton"),
@@ -32646,7 +32639,7 @@ var ArrayField = ({
                         const existingValue = value || [];
                         onChange([...existingValue, field.defaultItemProps || {}]);
                       },
-                      children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(plus_default, { size: "21" })
+                      children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(plus_default, { size: "21" })
                     }
                   )
                 ]
@@ -32661,7 +32654,7 @@ var ArrayField = ({
 
 // components/InputOrGroup/fields/DefaultField/index.tsx
 init_react_import();
-var import_jsx_runtime10 = require("react/jsx-runtime");
+var import_jsx_runtime9 = require("react/jsx-runtime");
 var getClassName7 = get_class_name_factory_default("Input", styles_module_default3);
 var DefaultField = ({
   field,
@@ -32671,16 +32664,16 @@ var DefaultField = ({
   name,
   label
 }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
     FieldLabelInternal,
     {
       label: label || name,
-      icon: /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(import_jsx_runtime10.Fragment, { children: [
-        field.type === "text" && /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(type_default, { size: 16 }),
-        field.type === "number" && /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(hash_default, { size: 16 })
+      icon: /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(import_jsx_runtime9.Fragment, { children: [
+        field.type === "text" && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(type_default, { size: 16 }),
+        field.type === "number" && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(hash_default, { size: 16 })
       ] }),
       readOnly,
-      children: /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
         "input",
         {
           className: getClassName7("input"),
@@ -32712,10 +32705,11 @@ var import_react29 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/ExternalInput/styles.module.css#css-module
 init_react_import();
-var styles_module_default6 = { "ExternalInput": "_ExternalInput_z7jih_1", "ExternalInput-actions": "_ExternalInput-actions_z7jih_5", "ExternalInput-button": "_ExternalInput-button_z7jih_9", "ExternalInput-detachButton": "_ExternalInput-detachButton_z7jih_28", "ExternalInput--dataSelected": "_ExternalInput--dataSelected_z7jih_35", "ExternalInputModal": "_ExternalInputModal_z7jih_56", "ExternalInputModal-masthead": "_ExternalInputModal-masthead_z7jih_63", "ExternalInputModal-tableWrapper": "_ExternalInputModal-tableWrapper_z7jih_68", "ExternalInputModal-table": "_ExternalInputModal-table_z7jih_68", "ExternalInputModal-thead": "_ExternalInputModal-thead_z7jih_82", "ExternalInputModal-th": "_ExternalInputModal-th_z7jih_82", "ExternalInputModal-td": "_ExternalInputModal-td_z7jih_96", "ExternalInputModal-tr": "_ExternalInputModal-tr_z7jih_101", "ExternalInputModal-tbody": "_ExternalInputModal-tbody_z7jih_113", "ExternalInputModal--hasData": "_ExternalInputModal--hasData_z7jih_132", "ExternalInputModal-loadingBanner": "_ExternalInputModal-loadingBanner_z7jih_136", "ExternalInputModal--isLoading": "_ExternalInputModal--isLoading_z7jih_144", "ExternalInputModal-noContentBanner": "_ExternalInputModal-noContentBanner_z7jih_148", "ExternalInputModal--loaded": "_ExternalInputModal--loaded_z7jih_152" };
+var styles_module_default6 = { "ExternalInput": "_ExternalInput_157li_1", "ExternalInput-actions": "_ExternalInput-actions_157li_5", "ExternalInput-button": "_ExternalInput-button_157li_9", "ExternalInput-detachButton": "_ExternalInput-detachButton_157li_28", "ExternalInput--dataSelected": "_ExternalInput--dataSelected_157li_35", "ExternalInputModal": "_ExternalInputModal_157li_56", "ExternalInputModal-masthead": "_ExternalInputModal-masthead_157li_63", "ExternalInputModal-tableWrapper": "_ExternalInputModal-tableWrapper_157li_68", "ExternalInputModal-table": "_ExternalInputModal-table_157li_68", "ExternalInputModal-thead": "_ExternalInputModal-thead_157li_83", "ExternalInputModal-th": "_ExternalInputModal-th_157li_83", "ExternalInputModal-td": "_ExternalInputModal-td_157li_97", "ExternalInputModal-tr": "_ExternalInputModal-tr_157li_102", "ExternalInputModal-tbody": "_ExternalInputModal-tbody_157li_114", "ExternalInputModal--hasData": "_ExternalInputModal--hasData_157li_133", "ExternalInputModal-loadingBanner": "_ExternalInputModal-loadingBanner_157li_137", "ExternalInputModal--isLoading": "_ExternalInputModal--isLoading_157li_145", "ExternalInputModal-noContentBanner": "_ExternalInputModal-noContentBanner_157li_149", "ExternalInputModal--loaded": "_ExternalInputModal--loaded_157li_153" };
 
 // components/Modal/index.tsx
 init_react_import();
+var import_react28 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Modal/styles.module.css#css-module
 init_react_import();
@@ -32723,19 +32717,22 @@ var styles_module_default7 = { "Modal": "_Modal_hx2u6_1", "Modal--isOpen": "_Mod
 
 // components/Modal/index.tsx
 var import_react_dom = __toESM(require_react_dom());
-var import_jsx_runtime11 = require("react/jsx-runtime");
+var import_jsx_runtime10 = require("react/jsx-runtime");
 var getClassName8 = get_class_name_factory_default("Modal", styles_module_default7);
 var Modal = ({
   children,
   onClose,
   isOpen
 }) => {
-  const rootEl = document.getElementById("puck-portal-root");
+  const [rootEl, setRootEl] = (0, import_react28.useState)(null);
+  (0, import_react28.useEffect)(() => {
+    setRootEl(document.getElementById("puck-portal-root"));
+  }, []);
   if (!rootEl) {
-    return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("div", {});
+    return /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", {});
   }
   return (0, import_react_dom.createPortal)(
-    /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("div", { className: getClassName8({ isOpen }), onClick: onClose, children: /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", { className: getClassName8({ isOpen }), onClick: onClose, children: /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
       "div",
       {
         className: getClassName8("inner"),
@@ -32755,11 +32752,11 @@ init_react_import();
 var styles_module_default8 = { "Heading": "_Heading_1bvy5_1", "Heading--xxxxl": "_Heading--xxxxl_1bvy5_13", "Heading--xxxl": "_Heading--xxxl_1bvy5_19", "Heading--xxl": "_Heading--xxl_1bvy5_23", "Heading--xl": "_Heading--xl_1bvy5_27", "Heading--l": "_Heading--l_1bvy5_31", "Heading--m": "_Heading--m_1bvy5_35", "Heading--s": "_Heading--s_1bvy5_39", "Heading--xs": "_Heading--xs_1bvy5_43" };
 
 // components/Heading/index.tsx
-var import_jsx_runtime12 = require("react/jsx-runtime");
+var import_jsx_runtime11 = require("react/jsx-runtime");
 var getClassName9 = 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_runtime12.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
     Tag,
     {
       className: getClassName9({
@@ -32772,7 +32769,7 @@ var Heading = ({ children, rank, size = "m" }) => {
 
 // components/ExternalInput/index.tsx
 var import_react_spinners4 = require("react-spinners");
-var import_jsx_runtime13 = require("react/jsx-runtime");
+var import_jsx_runtime12 = 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 = {};
@@ -32807,7 +32804,7 @@ var ExternalInput = ({
       }
     }))();
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(
     "div",
     {
       className: getClassName10({
@@ -32815,30 +32812,30 @@ var ExternalInput = ({
         modalVisible: isOpen
       }),
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)("div", { className: getClassName10("actions"), children: [
-          /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: getClassName10("actions"), children: [
+          /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
             "button",
             {
               onClick: () => setOpen(true),
               className: getClassName10("button"),
-              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_default, { size: "16" }),
-                /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("span", { children: field.placeholder })
+              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_default, { size: "16" }),
+                /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("span", { children: field.placeholder })
               ] })
             }
           ),
-          value && /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
+          value && /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
             "button",
             {
               className: getClassName10("detachButton"),
               onClick: () => {
                 onChange(null);
               },
-              children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(unlock_default, { size: 16 })
+              children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(unlock_default, { size: 16 })
             }
           )
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(Modal, { onClose: () => setOpen(false), isOpen, children: /* @__PURE__ */ (0, import_jsx_runtime13.jsxs)(
+        /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Modal, { onClose: () => setOpen(false), isOpen, children: /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(
           "div",
           {
             className: getClassNameModal({
@@ -32847,9 +32844,9 @@ var ExternalInput = ({
               hasData: !!data
             }),
             children: [
-              /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("div", { className: getClassNameModal("masthead"), children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(Heading, { rank: 2, size: "xxl", children: "Select content" }) }),
-              /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("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)(
+              /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: getClassNameModal("masthead"), children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Heading, { rank: 2, size: "xxl", children: "Select content" }) }),
+              /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("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)(
                   "th",
                   {
                     className: getClassNameModal("th"),
@@ -32858,8 +32855,8 @@ var ExternalInput = ({
                   },
                   key
                 )) }) }),
-                /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("tbody", { className: getClassNameModal("tbody"), children: data.map((item, i) => {
-                  return /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
+                /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("tbody", { className: getClassNameModal("tbody"), children: data.map((item, i) => {
+                  return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
                     "tr",
                     {
                       style: { whiteSpace: "nowrap" },
@@ -32868,14 +32865,14 @@ var ExternalInput = ({
                         onChange(mapProp(item));
                         setOpen(false);
                       },
-                      children: keys.map((key) => /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("td", { className: getClassNameModal("td"), children: item[key] }, key))
+                      children: keys.map((key) => /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("td", { className: getClassNameModal("td"), children: item[key] }, key))
                     },
                     i
                   );
                 }) })
               ] }) }),
-              /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("div", { className: getClassNameModal("noContentBanner"), children: "No content" }),
-              /* @__PURE__ */ (0, import_jsx_runtime13.jsx)("div", { className: getClassNameModal("loadingBanner"), children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(import_react_spinners4.ClipLoader, { size: 24 }) })
+              /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: getClassNameModal("noContentBanner"), children: "No content" }),
+              /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: getClassNameModal("loadingBanner"), children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(import_react_spinners4.ClipLoader, { size: 24 }) })
             ]
           }
         ) })
@@ -32885,7 +32882,7 @@ var ExternalInput = ({
 };
 
 // components/InputOrGroup/fields/ExternalField/index.tsx
-var import_jsx_runtime14 = require("react/jsx-runtime");
+var import_jsx_runtime13 = require("react/jsx-runtime");
 var ExternalField = ({
   field,
   onChange,
@@ -32906,19 +32903,19 @@ var ExternalField = ({
   if (field.type !== "external") {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
     FieldLabelInternal,
     {
       label: label || name,
-      icon: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(link_default, { size: 16 }),
+      icon: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(link_default, { size: 16 }),
       el: "div",
-      children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(
         ExternalInput,
         {
           name,
           field: __spreadProps(__spreadValues({}, validField), {
             // DEPRECATED
-            placeholder: ((_a = deprecatedField.adaptor) == null ? void 0 : _a.name) ? `Select from ${deprecatedField.adaptor.name}` : validField.placeholder,
+            placeholder: ((_a = deprecatedField.adaptor) == null ? void 0 : _a.name) ? `Select from ${deprecatedField.adaptor.name}` : validField.placeholder || "Select data",
             mapProp: ((_b = deprecatedField.adaptor) == null ? void 0 : _b.mapProp) || validField.mapProp,
             fetchList: ((_c = deprecatedField.adaptor) == null ? void 0 : _c.fetchList) ? () => __async(void 0, null, function* () {
               return yield deprecatedField.adaptor.fetchList(
@@ -32936,7 +32933,7 @@ var ExternalField = ({
 
 // components/InputOrGroup/fields/RadioField/index.tsx
 init_react_import();
-var import_jsx_runtime15 = require("react/jsx-runtime");
+var import_jsx_runtime14 = require("react/jsx-runtime");
 var getClassName11 = get_class_name_factory_default("Input", styles_module_default3);
 var RadioField = ({
   field,
@@ -32948,19 +32945,19 @@ var RadioField = ({
   if (field.type !== "radio" || !field.options) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
     FieldLabelInternal,
     {
-      icon: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(check_circle_default, { size: 16 }),
+      icon: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(check_circle_default, { size: 16 }),
       label: field.label || name,
       readOnly,
       el: "div",
-      children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("div", { className: getClassName11("radioGroupItems"), children: field.options.map((option) => /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("div", { className: getClassName11("radioGroupItems"), children: field.options.map((option) => /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(
         "label",
         {
           className: getClassName11("radio"),
           children: [
-            /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
+            /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(
               "input",
               {
                 type: "radio",
@@ -32978,7 +32975,7 @@ var RadioField = ({
                 defaultChecked: value === option.value
               }
             ),
-            /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("div", { className: getClassName11("radioInner"), children: option.label || option.value })
+            /* @__PURE__ */ (0, import_jsx_runtime14.jsx)("div", { className: getClassName11("radioInner"), children: option.label || option.value })
           ]
         },
         option.label + option.value
@@ -32989,7 +32986,7 @@ var RadioField = ({
 
 // components/InputOrGroup/fields/SelectField/index.tsx
 init_react_import();
-var import_jsx_runtime16 = require("react/jsx-runtime");
+var import_jsx_runtime15 = require("react/jsx-runtime");
 var getClassName12 = get_class_name_factory_default("Input", styles_module_default3);
 var SelectField = ({
   field,
@@ -33002,13 +32999,13 @@ var SelectField = ({
   if (field.type !== "select" || !field.options) {
     return null;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
     FieldLabelInternal,
     {
       label: label || name,
-      icon: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(chevron_down_default, { size: 16 }),
+      icon: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(chevron_down_default, { size: 16 }),
       readOnly,
-      children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
         "select",
         {
           className: getClassName12("input"),
@@ -33021,7 +33018,7 @@ var SelectField = ({
             onChange(e.currentTarget.value);
           },
           value,
-          children: field.options.map((option) => /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
+          children: field.options.map((option) => /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
             "option",
             {
               label: option.label,
@@ -33037,7 +33034,7 @@ var SelectField = ({
 
 // components/InputOrGroup/fields/TextareaField/index.tsx
 init_react_import();
-var import_jsx_runtime17 = require("react/jsx-runtime");
+var import_jsx_runtime16 = require("react/jsx-runtime");
 var getClassName13 = get_class_name_factory_default("Input", styles_module_default3);
 var TextareaField = ({
   onChange,
@@ -33046,13 +33043,13 @@ var TextareaField = ({
   name,
   label
 }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
     FieldLabelInternal,
     {
       label: label || name,
-      icon: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(type_default, { size: 16 }),
+      icon: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(type_default, { size: 16 }),
       readOnly,
-      children: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(
         "textarea",
         {
           className: getClassName13("input"),
@@ -33070,7 +33067,7 @@ var TextareaField = ({
 
 // components/InputOrGroup/index.tsx
 var import_use_debounce2 = require("use-debounce");
-var import_jsx_runtime18 = require("react/jsx-runtime");
+var import_jsx_runtime17 = require("react/jsx-runtime");
 var getClassName14 = get_class_name_factory_default("Input", styles_module_default3);
 var FieldLabel = ({
   children,
@@ -33081,11 +33078,11 @@ var FieldLabel = ({
   className
 }) => {
   const El = el;
-  return /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(El, { className, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)("div", { className: getClassName14("label"), children: [
-      icon ? /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: getClassName14("labelIcon"), children: icon }) : /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(import_jsx_runtime18.Fragment, {}),
+  return /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(El, { className, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)("div", { className: getClassName14("label"), children: [
+      icon ? /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("div", { className: getClassName14("labelIcon"), children: icon }) : /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(import_jsx_runtime17.Fragment, {}),
       label,
-      readOnly && /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: getClassName14("disabledIcon"), title: "Read-only", children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(lock_default, { size: "12" }) })
+      readOnly && /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("div", { className: getClassName14("disabledIcon"), title: "Read-only", children: /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(lock_default, { size: "12" }) })
     ] }),
     children
   ] });
@@ -33098,7 +33095,7 @@ var FieldLabelInternal = ({
   readOnly
 }) => {
   const El = el;
-  return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
     FieldLabel,
     {
       label,
@@ -33133,42 +33130,43 @@ var InputOrGroup = (_a) => {
     onChange: onChangeLocal
   };
   if (field.type === "array") {
-    return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(ArrayField, __spreadValues(__spreadValues({}, props), localProps));
+    return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(ArrayField, __spreadValues(__spreadValues({}, props), localProps));
   }
   if (field.type === "external") {
-    return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(ExternalField, __spreadValues(__spreadValues({}, props), localProps));
+    return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(ExternalField, __spreadValues(__spreadValues({}, props), localProps));
   }
   if (field.type === "select") {
-    return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(SelectField, __spreadValues(__spreadValues({}, props), localProps));
+    return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(SelectField, __spreadValues(__spreadValues({}, props), localProps));
   }
   if (field.type === "textarea") {
-    return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(TextareaField, __spreadValues(__spreadValues({}, props), localProps));
+    return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(TextareaField, __spreadValues(__spreadValues({}, props), localProps));
   }
   if (field.type === "radio") {
-    return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(RadioField, __spreadValues(__spreadValues({}, props), localProps));
+    return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(RadioField, __spreadValues(__spreadValues({}, props), localProps));
   }
   if (field.type === "custom") {
     if (!field.render) {
       return null;
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: getClassName14(), children: field.render(__spreadValues({
+    return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)("div", { className: getClassName14(), children: field.render(__spreadValues({
       field,
       name,
       readOnly
     }, localProps)) });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(DefaultField, __spreadValues(__spreadValues({}, props), localProps));
+  return /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(DefaultField, __spreadValues(__spreadValues({}, props), localProps));
 };
 
 // components/ComponentList/index.tsx
 init_react_import();
+var import_dnd6 = require("@hello-pangea/dnd");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/ComponentList/styles.module.css#css-module
 init_react_import();
-var styles_module_default9 = { "ComponentList": "_ComponentList_3rdy2_1", "ComponentList--isExpanded": "_ComponentList--isExpanded_3rdy2_6", "ComponentList-content": "_ComponentList-content_3rdy2_10", "ComponentList-title": "_ComponentList-title_3rdy2_18", "ComponentList-titleIcon": "_ComponentList-titleIcon_3rdy2_39", "ComponentListItem": "_ComponentListItem_3rdy2_43", "ComponentListItem-draggable": "_ComponentListItem-draggable_3rdy2_43", "ComponentListItemIcon": "_ComponentListItemIcon_3rdy2_61", "ComponentList--isDraggingFrom": "_ComponentList--isDraggingFrom_3rdy2_65" };
+var styles_module_default9 = { "ComponentList": "_ComponentList_1m8r5_1", "ComponentList--isExpanded": "_ComponentList--isExpanded_1m8r5_6", "ComponentList-content": "_ComponentList-content_1m8r5_10", "ComponentList-title": "_ComponentList-title_1m8r5_18", "ComponentList-titleIcon": "_ComponentList-titleIcon_1m8r5_39", "ComponentListItem": "_ComponentListItem_1m8r5_43", "ComponentListItem-draggable": "_ComponentListItem-draggable_1m8r5_43", "ComponentListItem-name": "_ComponentListItem-name_1m8r5_60", "ComponentList--isDraggingFrom": "_ComponentList--isDraggingFrom_1m8r5_66" };
 
 // components/ComponentList/index.tsx
-var import_jsx_runtime19 = require("react/jsx-runtime");
+var import_jsx_runtime18 = require("react/jsx-runtime");
 var getClassName15 = get_class_name_factory_default("ComponentList", styles_module_default9);
 var getClassNameItem2 = get_class_name_factory_default("ComponentListItem", styles_module_default9);
 var ComponentListItem = ({
@@ -33176,7 +33174,7 @@ var ComponentListItem = ({
   index,
   id
 }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("div", { className: getClassNameItem2(), children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: getClassNameItem2(), children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
     Draggable2,
     {
       id,
@@ -33184,9 +33182,9 @@ var ComponentListItem = ({
       showShadow: true,
       disableAnimations: true,
       className: () => getClassNameItem2("draggable"),
-      children: () => /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)(import_jsx_runtime19.Fragment, { children: [
-        component,
-        /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("div", { className: getClassNameItem2("icon"), children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(DragIcon, {}) })
+      children: () => /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(import_jsx_runtime18.Fragment, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: getClassNameItem2("name"), children: component }),
+        /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: getClassNameItem2("icon"), children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(DragIcon, {}) })
       ] })
     },
     component
@@ -33199,8 +33197,8 @@ var ComponentList = ({
 }) => {
   const { config, state, setUi } = useAppContext();
   const { expanded = true } = state.ui.componentList[id] || {};
-  return /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)("div", { className: getClassName15({ isExpanded: expanded }), children: [
-    title && /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)("div", { className: getClassName15({ isExpanded: expanded }), children: [
+    title && /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(
       "div",
       {
         className: getClassName15("title"),
@@ -33213,17 +33211,17 @@ var ComponentList = ({
         }),
         title: expanded ? `Collapse${title ? ` ${title}` : ""}` : `Expand${title ? ` ${title}` : ""}`,
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("div", { children: title }),
-          /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("div", { className: getClassName15("titleIcon"), children: expanded ? /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(chevron_up_default, { size: 12 }) : /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(chevron_down_default, { size: 12 }) })
+          /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { children: title }),
+          /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: getClassName15("titleIcon"), children: expanded ? /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(chevron_up_default, { size: 12 }) : /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(chevron_down_default, { size: 12 }) })
         ]
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("div", { className: getClassName15("content"), children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
-      DroppableStrictMode_default,
+    /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: getClassName15("content"), children: /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
+      import_dnd6.Droppable,
       {
         droppableId: `component-list${title ? `:${title}` : ""}`,
         isDropDisabled: true,
-        children: (provided, snapshot) => /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)(
+        children: (provided, snapshot) => /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(
           "div",
           __spreadProps(__spreadValues({}, provided.droppableProps), {
             ref: provided.innerRef,
@@ -33232,7 +33230,7 @@ var ComponentList = ({
             }),
             children: [
               children || Object.keys(config.components).map((componentKey, i) => {
-                return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
+                return /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
                   ComponentListItem,
                   {
                     component: componentKey,
@@ -33242,7 +33240,7 @@ var ComponentList = ({
                   componentKey
                 );
               }),
-              /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("span", { style: { display: "none" }, children: provided.placeholder })
+              /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("span", { style: { display: "none" }, children: provided.placeholder })
             ]
           })
         )
@@ -33256,7 +33254,7 @@ ComponentList.Item = ComponentListItem;
 init_react_import();
 var import_react32 = require("react");
 var usePlaceholderStyle = () => {
-  const queryAttr = "data-rbd-drag-handle-draggable-id";
+  const queryAttr = "data-rfd-drag-handle-draggable-id";
   const [placeholderStyle, setPlaceholderStyle] = (0, import_react32.useState)();
   const onDragStartOrUpdate = (draggedItem) => {
     var _a;
@@ -33269,7 +33267,7 @@ var usePlaceholderStyle = () => {
       return;
     }
     const targetListElement = document.querySelector(
-      `[data-rbd-droppable-id='${droppableId}']`
+      `[data-rfd-droppable-id='${droppableId}']`
     );
     const { clientHeight } = draggedDOM;
     if (!targetListElement) {
@@ -33280,7 +33278,7 @@ var usePlaceholderStyle = () => {
     if (destinationIndex > 0) {
       const end = destinationIndex > draggedItem.source.index && isSameDroppable ? destinationIndex + 1 : destinationIndex;
       const children = Array.from(targetListElement.children).filter(
-        (item) => item !== draggedDOM && item.getAttributeNames().indexOf("data-puck-placeholder") === -1 && item.getAttributeNames().indexOf("data-rbd-placeholder-context-id") === -1
+        (item) => item !== draggedDOM && item.getAttributeNames().indexOf("data-puck-placeholder") === -1 && item.getAttributeNames().indexOf("data-rfd-placeholder-context-id") === -1
       ).slice(0, end);
       clientY = children.reduce(
         (total, item) => total + item.clientHeight + parseInt(window.getComputedStyle(item).marginTop.replace("px", "")) + parseInt(
@@ -33305,7 +33303,7 @@ init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/SidebarSection/styles.module.css#css-module
 init_react_import();
-var styles_module_default10 = { "SidebarSection": "_SidebarSection_r7dv3_1", "SidebarSection-title": "_SidebarSection-title_r7dv3_12", "SidebarSection-content": "_SidebarSection-content_r7dv3_19", "SidebarSection--noPadding": "_SidebarSection--noPadding_r7dv3_24", "SidebarSection-breadcrumbLabel": "_SidebarSection-breadcrumbLabel_r7dv3_33", "SidebarSection-breadcrumbs": "_SidebarSection-breadcrumbs_r7dv3_44", "SidebarSection-breadcrumb": "_SidebarSection-breadcrumb_r7dv3_33", "SidebarSection-heading": "_SidebarSection-heading_r7dv3_56", "SidebarSection-loadingOverlay": "_SidebarSection-loadingOverlay_r7dv3_60" };
+var styles_module_default10 = { "SidebarSection": "_SidebarSection_1uyg2_1", "SidebarSection-title": "_SidebarSection-title_1uyg2_12", "SidebarSection-content": "_SidebarSection-content_1uyg2_19", "SidebarSection--noPadding": "_SidebarSection--noPadding_1uyg2_24", "SidebarSection-breadcrumbLabel": "_SidebarSection-breadcrumbLabel_1uyg2_37", "SidebarSection-breadcrumbs": "_SidebarSection-breadcrumbs_1uyg2_48", "SidebarSection-breadcrumb": "_SidebarSection-breadcrumb_1uyg2_37", "SidebarSection-heading": "_SidebarSection-heading_1uyg2_60", "SidebarSection-loadingOverlay": "_SidebarSection-loadingOverlay_1uyg2_64" };
 
 // lib/use-breadcrumbs.ts
 init_react_import();
@@ -33375,7 +33373,7 @@ var useBreadcrumbs = (renderCount) => {
 
 // components/SidebarSection/index.tsx
 var import_react_spinners5 = require("react-spinners");
-var import_jsx_runtime20 = require("react/jsx-runtime");
+var import_jsx_runtime19 = require("react/jsx-runtime");
 var getClassName16 = get_class_name_factory_default("SidebarSection", styles_module_default10);
 var SidebarSection = ({
   children,
@@ -33387,10 +33385,10 @@ var SidebarSection = ({
 }) => {
   const { setUi } = useAppContext();
   const breadcrumbs = useBreadcrumbs(1);
-  return /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)("div", { className: getClassName16({ noPadding }), style: { background }, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassName16("title"), children: /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)("div", { className: getClassName16("breadcrumbs"), children: [
-      showBreadcrumbs ? breadcrumbs.map((breadcrumb, i) => /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)("div", { className: getClassName16("breadcrumb"), children: [
-        /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)("div", { className: getClassName16({ noPadding }), style: { background }, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("div", { className: getClassName16("title"), children: /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)("div", { className: getClassName16("breadcrumbs"), children: [
+      showBreadcrumbs ? breadcrumbs.map((breadcrumb, i) => /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)("div", { className: getClassName16("breadcrumb"), children: [
+        /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
           "div",
           {
             className: getClassName16("breadcrumbLabel"),
@@ -33398,12 +33396,12 @@ var SidebarSection = ({
             children: breadcrumb.label
           }
         ),
-        /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(chevron_right_default, { size: 16 })
+        /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(chevron_right_default, { size: 16 })
       ] }, i)) : null,
-      /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassName16("heading"), children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Heading, { rank: 2, size: "xs", children: title }) })
+      /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("div", { className: getClassName16("heading"), children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(Heading, { rank: 2, size: "xs", children: title }) })
     ] }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassName16("content"), children }),
-    isLoading && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassName16("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(import_react_spinners5.ClipLoader, {}) })
+    /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("div", { className: getClassName16("content"), children }),
+    isLoading && /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("div", { className: getClassName16("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(import_react_spinners5.ClipLoader, {}) })
   ] });
 };
 
@@ -33841,7 +33839,7 @@ init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/LayerTree/styles.module.css#css-module
 init_react_import();
-var styles_module_default11 = { "LayerTree": "_LayerTree_1dcmd_1", "LayerTree-zoneTitle": "_LayerTree-zoneTitle_1dcmd_11", "LayerTree-helper": "_LayerTree-helper_1dcmd_17", "Layer": "_Layer_1dcmd_1", "Layer-inner": "_Layer-inner_1dcmd_29", "Layer--containsZone": "_Layer--containsZone_1dcmd_35", "Layer-clickable": "_Layer-clickable_1dcmd_39", "Layer--isSelected": "_Layer--isSelected_1dcmd_48", "Layer--isHovering": "_Layer--isHovering_1dcmd_49", "Layer-chevron": "_Layer-chevron_1dcmd_65", "Layer--childIsSelected": "_Layer--childIsSelected_1dcmd_66", "Layer-zones": "_Layer-zones_1dcmd_70", "Layer-title": "_Layer-title_1dcmd_84", "Layer-icon": "_Layer-icon_1dcmd_92", "Layer-zoneIcon": "_Layer-zoneIcon_1dcmd_97" };
+var styles_module_default11 = { "LayerTree": "_LayerTree_o89yt_1", "LayerTree-zoneTitle": "_LayerTree-zoneTitle_o89yt_11", "LayerTree-helper": "_LayerTree-helper_o89yt_17", "Layer": "_Layer_o89yt_1", "Layer-inner": "_Layer-inner_o89yt_29", "Layer--containsZone": "_Layer--containsZone_o89yt_35", "Layer-clickable": "_Layer-clickable_o89yt_39", "Layer--isSelected": "_Layer--isSelected_o89yt_48", "Layer--isHovering": "_Layer--isHovering_o89yt_49", "Layer-chevron": "_Layer-chevron_o89yt_65", "Layer--childIsSelected": "_Layer--childIsSelected_o89yt_66", "Layer-zones": "_Layer-zones_o89yt_70", "Layer-title": "_Layer-title_o89yt_84", "Layer-name": "_Layer-name_o89yt_93", "Layer-icon": "_Layer-icon_o89yt_99", "Layer-zoneIcon": "_Layer-zoneIcon_o89yt_104" };
 
 // lib/scroll-into-view.ts
 init_react_import();
@@ -33881,7 +33879,7 @@ var isChildOfZone = (item, maybeChild, ctx) => {
 };
 
 // components/LayerTree/index.tsx
-var import_jsx_runtime21 = require("react/jsx-runtime");
+var import_jsx_runtime20 = require("react/jsx-runtime");
 var getClassName17 = get_class_name_factory_default("LayerTree", styles_module_default11);
 var getClassNameLayer = get_class_name_factory_default("Layer", styles_module_default11);
 var LayerTree = ({
@@ -33894,14 +33892,14 @@ var LayerTree = ({
 }) => {
   const zones = data.zones || {};
   const ctx = (0, import_react36.useContext)(dropZoneContext);
-  return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(import_jsx_runtime21.Fragment, { children: [
-    label && /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("div", { className: getClassName17("zoneTitle"), children: [
-      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className: getClassName17("zoneIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(layers_default, { size: "16" }) }),
+  return /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(import_jsx_runtime20.Fragment, { children: [
+    label && /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)("div", { className: getClassName17("zoneTitle"), children: [
+      /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassName17("zoneIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(layers_default, { size: "16" }) }),
       " ",
       label
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("ul", { className: getClassName17(), children: [
-      zoneContent.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className: getClassName17("helper"), children: "No items" }),
+    /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)("ul", { className: getClassName17(), children: [
+      zoneContent.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassName17("helper"), children: "No items" }),
       zoneContent.map((item, i) => {
         const isSelected = (itemSelector == null ? void 0 : itemSelector.index) === i && (itemSelector.zone === zone || itemSelector.zone === rootDroppableId && !zone);
         const zonesForItem = findZonesForArea(data, item.props.id);
@@ -33916,7 +33914,7 @@ var LayerTree = ({
         const selectedItem = itemSelector && data ? getItem(itemSelector, data) : null;
         const isHovering = hoveringComponent === item.props.id;
         const childIsSelected = isChildOfZone(item, selectedItem, ctx);
-        return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(
+        return /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(
           "li",
           {
             className: getClassNameLayer({
@@ -33926,7 +33924,7 @@ var LayerTree = ({
               childIsSelected
             }),
             children: [
-              /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className: getClassNameLayer("inner"), children: /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(
+              /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassNameLayer("inner"), children: /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(
                 "div",
                 {
                   className: getClassNameLayer("clickable"),
@@ -33942,7 +33940,7 @@ var LayerTree = ({
                     const id = zoneContent[i].props.id;
                     scrollIntoView(
                       document.querySelector(
-                        `[data-rbd-drag-handle-draggable-id="draggable-${id}"]`
+                        `[data-rfd-drag-handle-draggable-id="draggable-${id}"]`
                       )
                     );
                   },
@@ -33957,22 +33955,22 @@ var LayerTree = ({
                     setHoveringComponent(null);
                   },
                   children: [
-                    containsZone && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+                    containsZone && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
                       "div",
                       {
                         className: getClassNameLayer("chevron"),
                         title: isSelected ? "Collapse" : "Expand",
-                        children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(chevron_down_default, { size: "12" })
+                        children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(chevron_down_default, { size: "12" })
                       }
                     ),
-                    /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("div", { className: getClassNameLayer("title"), children: [
-                      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className: getClassNameLayer("icon"), children: item.type === "Text" || item.type === "Heading" ? /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(type_default, { size: "16" }) : /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(grid_default, { size: "16" }) }),
-                      item.type
+                    /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)("div", { className: getClassNameLayer("title"), children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassNameLayer("icon"), children: item.type === "Text" || item.type === "Heading" ? /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(type_default, { size: "16" }) : /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(grid_default, { size: "16" }) }),
+                      /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassNameLayer("name"), children: item.type })
                     ] })
                   ]
                 }
               ) }),
-              containsZone && Object.keys(zonesForItem).map((zoneKey, idx) => /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className: getClassNameLayer("zones"), children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+              containsZone && Object.keys(zonesForItem).map((zoneKey, idx) => /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: getClassNameLayer("zones"), children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
                 LayerTree,
                 {
                   data,
@@ -34019,7 +34017,7 @@ var flushZones = (appState) => {
 // lib/use-component-list.tsx
 init_react_import();
 var import_react37 = require("react");
-var import_jsx_runtime22 = require("react/jsx-runtime");
+var import_jsx_runtime21 = require("react/jsx-runtime");
 var useComponentList = (config, ui) => {
   const [componentList, setComponentList] = (0, import_react37.useState)();
   (0, import_react37.useEffect)(() => {
@@ -34032,14 +34030,14 @@ var useComponentList = (config, ui) => {
           if (category.visible === false || !category.components) {
             return null;
           }
-          return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+          return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
             ComponentList,
             {
               id: categoryKey,
               title: category.title || categoryKey,
               children: category.components.map((componentName, i) => {
                 matchedComponents.push(componentName);
-                return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+                return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
                   ComponentList.Item,
                   {
                     component: componentName,
@@ -34059,13 +34057,13 @@ 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_runtime22.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
             ComponentList,
             {
               id: "other",
               title: ((_c = ui.componentList.other) == null ? void 0 : _c.title) || "Other",
               children: remainingComponents.map((componentName, i) => {
-                return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+                return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
                   ComponentList.Item,
                   {
                     component: componentName,
@@ -34215,7 +34213,7 @@ var useResolvedData = (data, config, dispatch) => {
         clearTimeout(deferredSetStates[id]);
         delete deferredSetStates[id];
       }
-      const setLoading = deferredSetStates[id] = setTimeout(() => {
+      deferredSetStates[id] = setTimeout(() => {
         setComponentState((prev) => __spreadProps(__spreadValues({}, prev), {
           [id]: __spreadProps(__spreadValues({}, prev[id]), { loading })
         }));
@@ -34282,8 +34280,13 @@ var useResolvedData = (data, config, dispatch) => {
   };
 };
 
+// css-module:/home/runner/work/puck/puck/packages/core/components/Puck/styles.module.css#css-module
+init_react_import();
+var styles_module_default12 = { "Puck": "_Puck_vj9gy_19", "Puck--leftSideBarVisible": "_Puck--leftSideBarVisible_vj9gy_36", "Puck-header": "_Puck-header_vj9gy_72", "Puck-headerInner": "_Puck-headerInner_vj9gy_79", "Puck-headerToggle": "_Puck-headerToggle_vj9gy_89", "Puck-headerTitle": "_Puck-headerTitle_vj9gy_93", "Puck-headerPath": "_Puck-headerPath_vj9gy_97", "Puck-headerTools": "_Puck-headerTools_vj9gy_104", "Puck-leftSideBar": "_Puck-leftSideBar_vj9gy_110", "Puck-frame": "_Puck-frame_vj9gy_119", "Puck-root": "_Puck-root_vj9gy_127", "Puck-page": "_Puck-page_vj9gy_139", "Puck-rightSideBar": "_Puck-rightSideBar_vj9gy_143" };
+
 // components/Puck/index.tsx
-var import_jsx_runtime23 = require("react/jsx-runtime");
+var import_jsx_runtime22 = require("react/jsx-runtime");
+var getClassName18 = get_class_name_factory_default("Puck", styles_module_default12);
 var defaultPageFields = {
   title: { type: "text" }
 };
@@ -34295,7 +34298,7 @@ var PluginRenderer = ({
   renderMethod
 }) => {
   return plugins.filter((item) => item[renderMethod]).map((item) => item[renderMethod]).reduce(
-    (accChildren, Item) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Item, { dispatch, state, children: accChildren }),
+    (accChildren, Item) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Item, { dispatch, state, children: accChildren }),
     children
   );
 };
@@ -34313,7 +34316,7 @@ function Puck({
 }) {
   var _a, _b;
   const [reducer] = (0, import_react39.useState)(() => createReducer({ config }));
-  const initialAppState = __spreadProps(__spreadValues({}, defaultAppState), {
+  const [initialAppState] = (0, import_react39.useState)(__spreadProps(__spreadValues({}, defaultAppState), {
     data: initialData,
     ui: __spreadProps(__spreadValues({}, defaultAppState.ui), {
       // Store categories under componentList on state to allow render functions and plugins to modify
@@ -34331,7 +34334,7 @@ function Puck({
         {}
       ) : {}
     })
-  });
+  }));
   const [appState, dispatch] = (0, import_react39.useReducer)(
     reducer,
     flushZones(initialAppState)
@@ -34360,7 +34363,7 @@ function Puck({
   const Page = (0, import_react39.useCallback)(
     (pageProps) => {
       var _a2, _b2;
-      return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+      return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
         PluginRenderer,
         {
           plugins,
@@ -34374,7 +34377,7 @@ function Puck({
     [config.root]
   );
   const PageFieldWrapper = (0, import_react39.useCallback)(
-    (props) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+    (props) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
       PluginRenderer,
       {
         plugins,
@@ -34387,7 +34390,7 @@ function Puck({
     []
   );
   const ComponentFieldWrapper = (0, import_react39.useCallback)(
-    (props) => /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+    (props) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
       PluginRenderer,
       {
         plugins,
@@ -34400,7 +34403,7 @@ function Puck({
     []
   );
   const ComponentListWrapper = (0, import_react39.useCallback)((props) => {
-    const children = /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+    const children = /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
       PluginRenderer,
       {
         plugins,
@@ -34434,13 +34437,13 @@ function Puck({
       );
     }
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { className: "puck", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
       AppProvider,
       {
         value: { state: appState, dispatch, config, componentState },
-        children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-          import_react_beautiful_dnd5.DragDropContext,
+        children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+          import_dnd7.DragDropContext,
           {
             onDragUpdate: (update) => {
               setDraggedItem(__spreadValues(__spreadValues({}, draggedItem), update));
@@ -34492,7 +34495,7 @@ function Puck({
                 });
               }
             },
-            children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+            children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
               DropZoneProvider,
               {
                 value: {
@@ -34506,363 +34509,239 @@ function Puck({
                   mode: "edit",
                   areaId: "root"
                 },
-                children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(dropZoneContext.Consumer, { children: (ctx) => {
+                children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(dropZoneContext.Consumer, { children: (ctx) => {
                   var _a2, _b2;
-                  return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(
-                    "div",
-                    {
-                      style: {
-                        display: "grid",
-                        gridTemplateAreas: '"header header header" "left editor right"',
-                        gridTemplateColumns: `${leftSideBarVisible ? "288px" : "0px"} auto 288px`,
-                        gridTemplateRows: "min-content auto",
-                        height: "100vh",
-                        position: "fixed",
-                        top: 0,
-                        bottom: 0,
-                        left: 0,
-                        right: 0
-                      },
-                      children: [
-                        /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                          "header",
-                          {
-                            style: {
-                              gridArea: "header",
-                              color: "var(--puck-color-black)",
-                              background: "var(--puck-color-white)",
-                              borderBottom: "1px solid var(--puck-color-grey-8)"
-                            },
-                            children: renderHeader ? renderHeader({
-                              children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                                Button,
+                  return /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { className: getClassName18({ leftSideBarVisible }), children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("header", { className: getClassName18("header"), children: renderHeader ? renderHeader({
+                      children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+                        Button,
+                        {
+                          onClick: () => {
+                            onPublish(data);
+                          },
+                          icon: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(globe_default, { size: "14px" }),
+                          children: "Publish"
+                        }
+                      ),
+                      dispatch,
+                      state: appState
+                    }) : /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { className: getClassName18("headerInner"), children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { className: getClassName18("headerToggle"), children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+                        IconButton,
+                        {
+                          onClick: () => dispatch({
+                            type: "setUi",
+                            ui: {
+                              leftSideBarVisible: !leftSideBarVisible
+                            }
+                          }),
+                          title: "Toggle left sidebar",
+                          children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(sidebar_default, {})
+                        }
+                      ) }),
+                      /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { className: getClassName18("headerTitle"), children: /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(Heading, { rank: 2, size: "xs", children: [
+                        headerTitle || rootProps.title || "Page",
+                        headerPath && /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(import_jsx_runtime22.Fragment, { children: [
+                          " ",
+                          /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("code", { className: getClassName18("headerPath"), children: headerPath })
+                        ] })
+                      ] }) }),
+                      /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { className: getClassName18("headerTools"), children: [
+                        /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { style: { display: "flex" }, children: [
+                          /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+                            IconButton,
+                            {
+                              title: "undo",
+                              disabled: !canRewind,
+                              onClick: rewind,
+                              children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+                                chevron_left_default,
                                 {
-                                  onClick: () => {
-                                    onPublish(data);
-                                  },
-                                  icon: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(globe_default, { size: "14px" }),
-                                  children: "Publish"
+                                  size: 21,
+                                  stroke: canRewind ? "var(--puck-color-black)" : "var(--puck-color-grey-7)"
                                 }
-                              ),
-                              dispatch,
-                              state: appState
-                            }) : /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(
-                              "div",
-                              {
-                                style: {
-                                  display: "grid",
-                                  padding: 16,
-                                  gridTemplateAreas: '"left middle right"',
-                                  gridTemplateColumns: "344px auto 344px",
-                                  gridTemplateRows: "auto"
-                                },
-                                children: [
-                                  /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                                    "div",
-                                    {
-                                      style: {
-                                        display: "flex",
-                                        gap: 16
-                                      },
-                                      children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                                        IconButton,
-                                        {
-                                          onClick: () => dispatch({
-                                            type: "setUi",
-                                            ui: {
-                                              leftSideBarVisible: !leftSideBarVisible
-                                            }
-                                          }),
-                                          title: "Toggle left sidebar",
-                                          children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(sidebar_default, {})
-                                        }
-                                      )
-                                    }
-                                  ),
-                                  /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                                    "div",
-                                    {
-                                      style: {
-                                        display: "flex",
-                                        justifyContent: "center",
-                                        alignItems: "center"
-                                      },
-                                      children: /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Heading, { rank: 2, size: "xs", children: [
-                                        headerTitle || rootProps.title || "Page",
-                                        headerPath && /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                                          "small",
-                                          {
-                                            style: { fontWeight: 400, marginLeft: 4 },
-                                            children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("code", { children: headerPath })
-                                          }
-                                        )
-                                      ] })
-                                    }
-                                  ),
-                                  /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(
-                                    "div",
-                                    {
-                                      style: {
-                                        display: "flex",
-                                        gap: 16,
-                                        justifyContent: "flex-end"
-                                      },
-                                      children: [
-                                        /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { style: { display: "flex" }, children: [
-                                          /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                                            IconButton,
-                                            {
-                                              title: "undo",
-                                              disabled: !canRewind,
-                                              onClick: rewind,
-                                              children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                                                chevron_left_default,
-                                                {
-                                                  size: 21,
-                                                  stroke: canRewind ? "var(--puck-color-black)" : "var(--puck-color-grey-7)"
-                                                }
-                                              )
-                                            }
-                                          ),
-                                          /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                                            IconButton,
-                                            {
-                                              title: "redo",
-                                              disabled: !canForward,
-                                              onClick: forward,
-                                              children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                                                chevron_right_default,
-                                                {
-                                                  size: 21,
-                                                  stroke: canForward ? "var(--puck-color-black)" : "var(--puck-color-grey-7)"
-                                                }
-                                              )
-                                            }
-                                          )
-                                        ] }),
-                                        renderHeaderActions && renderHeaderActions({
-                                          state: appState,
-                                          dispatch
-                                        }),
-                                        /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                                          Button,
-                                          {
-                                            onClick: () => {
-                                              onPublish(data);
-                                            },
-                                            icon: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(globe_default, { size: "14px" }),
-                                            children: "Publish"
-                                          }
-                                        )
-                                      ]
-                                    }
-                                  )
-                                ]
-                              }
-                            )
-                          }
-                        ),
-                        /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(
-                          "div",
+                              )
+                            }
+                          ),
+                          /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+                            IconButton,
+                            {
+                              title: "redo",
+                              disabled: !canForward,
+                              onClick: forward,
+                              children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+                                chevron_right_default,
+                                {
+                                  size: 21,
+                                  stroke: canForward ? "var(--puck-color-black)" : "var(--puck-color-grey-7)"
+                                }
+                              )
+                            }
+                          )
+                        ] }),
+                        /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { children: renderHeaderActions && renderHeaderActions({
+                          state: appState,
+                          dispatch
+                        }) }),
+                        /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+                          Button,
                           {
-                            style: {
-                              gridArea: "left",
-                              background: "var(--puck-color-grey-11)",
-                              borderRight: "1px solid var(--puck-color-grey-8)",
-                              overflowY: "auto",
-                              display: "flex",
-                              flexDirection: "column"
+                            onClick: () => {
+                              onPublish(data);
                             },
-                            children: [
-                              /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(SidebarSection, { title: "Components", children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(ComponentListWrapper, { children: componentList ? componentList : /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(ComponentList, { id: "all" }) }) }),
-                              /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(SidebarSection, { title: "Outline", children: [
-                                (ctx == null ? void 0 : ctx.activeZones) && (ctx == null ? void 0 : ctx.activeZones[rootDroppableId]) && /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                                  LayerTree,
-                                  {
-                                    data,
-                                    label: areaContainsZones(data, "root") ? rootDroppableId : "",
-                                    zoneContent: data.content,
-                                    setItemSelector,
-                                    itemSelector
-                                  }
-                                ),
-                                Object.entries(findZonesForArea(data, "root")).map(
-                                  ([zoneKey, zone]) => {
-                                    return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                                      LayerTree,
-                                      {
-                                        data,
-                                        label: zoneKey,
-                                        zone: zoneKey,
-                                        zoneContent: zone,
-                                        setItemSelector,
-                                        itemSelector
-                                      },
-                                      zoneKey
-                                    );
-                                  }
-                                )
-                              ] })
-                            ]
+                            icon: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(globe_default, { size: "14px" }),
+                            children: "Publish"
                           }
-                        ),
-                        /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(
-                          "div",
+                        ) })
+                      ] })
+                    ] }) }),
+                    /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { className: getClassName18("leftSideBar"), children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(SidebarSection, { title: "Components", children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(ComponentListWrapper, { children: componentList ? componentList : /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(ComponentList, { id: "all" }) }) }),
+                      /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(SidebarSection, { title: "Outline", children: [
+                        (ctx == null ? void 0 : ctx.activeZones) && (ctx == null ? void 0 : ctx.activeZones[rootDroppableId]) && /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+                          LayerTree,
                           {
-                            style: {
-                              overflowY: "auto",
-                              gridArea: "editor",
-                              position: "relative",
-                              display: "flex",
-                              flexDirection: "column"
-                            },
-                            onClick: () => setItemSelector(null),
-                            id: "puck-frame",
-                            children: [
-                              /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                                "div",
-                                {
-                                  className: "puck-root",
-                                  style: {
-                                    boxShadow: "0px 0px 0px 32px var(--puck-color-grey-10)",
-                                    margin: 32,
-                                    zoom: 0.75
-                                  },
-                                  children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                                    "div",
-                                    {
-                                      style: {
-                                        border: "1px solid var(--puck-color-grey-8)"
-                                      },
-                                      children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                                        Page,
-                                        __spreadProps(__spreadValues({
-                                          dispatch,
-                                          state: appState
-                                        }, data.root), {
-                                          children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DropZone, { zone: rootDroppableId })
-                                        })
-                                      )
-                                    }
-                                  )
-                                }
-                              ),
-                              /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                                "div",
-                                {
-                                  style: {
-                                    background: "var(--puck-color-grey-10)",
-                                    height: "100%",
-                                    flexGrow: 1
-                                  }
-                                }
-                              )
-                            ]
+                            data,
+                            label: areaContainsZones(data, "root") ? rootDroppableId : "",
+                            zoneContent: data.content,
+                            setItemSelector,
+                            itemSelector
                           }
                         ),
-                        /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                          "div",
-                          {
-                            style: {
-                              borderLeft: "1px solid var(--puck-color-grey-8)",
-                              overflowY: "auto",
-                              gridArea: "right",
-                              fontFamily: "var(--puck-font-stack)",
-                              display: "flex",
-                              flexDirection: "column",
-                              background: "var(--puck-color-white)"
-                            },
-                            children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(FieldWrapper, { dispatch, state: appState, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                              SidebarSection,
+                        Object.entries(findZonesForArea(data, "root")).map(
+                          ([zoneKey, zone]) => {
+                            return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+                              LayerTree,
                               {
-                                noPadding: true,
-                                showBreadcrumbs: true,
-                                title: selectedItem ? selectedItem.type : "Page",
-                                isLoading: selectedItem ? (_a2 = componentState[selectedItem == null ? void 0 : selectedItem.props.id]) == null ? void 0 : _a2.loading : (_b2 = componentState["puck-root"]) == null ? void 0 : _b2.loading,
-                                children: Object.keys(fields).map((fieldName) => {
-                                  const field = fields[fieldName];
-                                  const onChange2 = (value) => {
-                                    var _a3, _b3;
-                                    let currentProps;
-                                    if (selectedItem) {
-                                      currentProps = selectedItem.props;
-                                    } else {
-                                      currentProps = data.root;
-                                    }
-                                    const newProps = __spreadProps(__spreadValues({}, currentProps), {
-                                      [fieldName]: value
-                                    });
-                                    if (itemSelector) {
-                                      const action = {
-                                        type: "replace",
-                                        destinationIndex: itemSelector.index,
-                                        destinationZone: itemSelector.zone || rootDroppableId,
-                                        data: __spreadProps(__spreadValues({}, selectedItem), { props: newProps })
-                                      };
-                                      if ((_a3 = config.components[selectedItem.type]) == null ? void 0 : _a3.resolveData) {
-                                        resolveData(replaceAction(data, action));
-                                      } else {
-                                        dispatch(action);
-                                      }
-                                    } else {
-                                      if (data.root.props) {
-                                        if ((_b3 = config.root) == null ? void 0 : _b3.resolveData) {
-                                          resolveData(__spreadProps(__spreadValues({}, data), {
-                                            root: { props: { newProps } }
-                                          }));
-                                        } else {
-                                          dispatch({
-                                            type: "setData",
-                                            data: { root: { props: { newProps } } }
-                                          });
-                                        }
-                                      } else {
-                                        dispatch({
-                                          type: "setData",
-                                          data: { root: newProps }
-                                        });
-                                      }
-                                    }
-                                  };
-                                  if (selectedItem && itemSelector) {
-                                    const { readOnly = {} } = selectedItem;
-                                    return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                                      InputOrGroup,
-                                      {
-                                        field,
-                                        name: fieldName,
-                                        label: field.label,
-                                        readOnly: readOnly[fieldName],
-                                        readOnlyFields: readOnly,
-                                        value: selectedItem.props[fieldName],
-                                        onChange: onChange2
-                                      },
-                                      `${selectedItem.props.id}_${fieldName}`
-                                    );
-                                  } else {
-                                    const { readOnly = {} } = data.root;
-                                    return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-                                      InputOrGroup,
-                                      {
-                                        field,
-                                        name: fieldName,
-                                        label: field.label,
-                                        readOnly: readOnly[fieldName],
-                                        readOnlyFields: readOnly,
-                                        value: rootProps[fieldName],
-                                        onChange: onChange2
-                                      },
-                                      `page_${fieldName}`
-                                    );
-                                  }
-                                })
-                              }
-                            ) })
+                                data,
+                                label: zoneKey,
+                                zone: zoneKey,
+                                zoneContent: zone,
+                                setItemSelector,
+                                itemSelector
+                              },
+                              zoneKey
+                            );
                           }
                         )
-                      ]
-                    }
-                  );
+                      ] })
+                    ] }),
+                    /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(
+                      "div",
+                      {
+                        className: getClassName18("frame"),
+                        onClick: () => setItemSelector(null),
+                        id: "puck-frame",
+                        children: [
+                          /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { className: getClassName18("root"), children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { className: getClassName18("page"), children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+                            Page,
+                            __spreadProps(__spreadValues({
+                              dispatch,
+                              state: appState
+                            }, rootProps), {
+                              children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(DropZone, { zone: rootDroppableId })
+                            })
+                          ) }) }),
+                          /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+                            "div",
+                            {
+                              style: {
+                                background: "var(--puck-color-grey-10)",
+                                height: "100%",
+                                flexGrow: 1
+                              }
+                            }
+                          )
+                        ]
+                      }
+                    ),
+                    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { className: getClassName18("rightSideBar"), children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(FieldWrapper, { dispatch, state: appState, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+                      SidebarSection,
+                      {
+                        noPadding: true,
+                        showBreadcrumbs: true,
+                        title: selectedItem ? selectedItem.type : "Page",
+                        isLoading: selectedItem ? (_a2 = componentState[selectedItem == null ? void 0 : selectedItem.props.id]) == null ? void 0 : _a2.loading : (_b2 = componentState["puck-root"]) == null ? void 0 : _b2.loading,
+                        children: Object.keys(fields).map((fieldName) => {
+                          const field = fields[fieldName];
+                          const onChange2 = (value) => {
+                            var _a3, _b3;
+                            let currentProps;
+                            if (selectedItem) {
+                              currentProps = selectedItem.props;
+                            } else {
+                              currentProps = rootProps;
+                            }
+                            const newProps = __spreadProps(__spreadValues({}, currentProps), {
+                              [fieldName]: value
+                            });
+                            if (itemSelector) {
+                              const action = {
+                                type: "replace",
+                                destinationIndex: itemSelector.index,
+                                destinationZone: itemSelector.zone || rootDroppableId,
+                                data: __spreadProps(__spreadValues({}, selectedItem), { props: newProps })
+                              };
+                              if ((_a3 = config.components[selectedItem.type]) == null ? void 0 : _a3.resolveData) {
+                                resolveData(replaceAction(data, action));
+                              } else {
+                                dispatch(action);
+                              }
+                            } else {
+                              if (data.root.props) {
+                                if ((_b3 = config.root) == null ? void 0 : _b3.resolveData) {
+                                  resolveData(__spreadProps(__spreadValues({}, data), {
+                                    root: { props: newProps }
+                                  }));
+                                } else {
+                                  dispatch({
+                                    type: "setData",
+                                    data: { root: { props: newProps } }
+                                  });
+                                }
+                              } else {
+                                dispatch({
+                                  type: "setData",
+                                  data: { root: newProps }
+                                });
+                              }
+                            }
+                          };
+                          if (selectedItem && itemSelector) {
+                            const { readOnly = {} } = selectedItem;
+                            return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+                              InputOrGroup,
+                              {
+                                field,
+                                name: fieldName,
+                                label: field.label,
+                                readOnly: readOnly[fieldName],
+                                readOnlyFields: readOnly,
+                                value: selectedItem.props[fieldName],
+                                onChange: onChange2
+                              },
+                              `${selectedItem.props.id}_${fieldName}`
+                            );
+                          } else {
+                            const { readOnly = {} } = data.root;
+                            return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+                              InputOrGroup,
+                              {
+                                field,
+                                name: fieldName,
+                                label: field.label,
+                                readOnly: readOnly[fieldName],
+                                readOnlyFields: readOnly,
+                                value: rootProps[fieldName],
+                                onChange: onChange2
+                              },
+                              `page_${fieldName}`
+                            );
+                          }
+                        })
+                      }
+                    ) }) })
+                  ] });
                 } })
               }
             )
@@ -34870,29 +34749,32 @@ function Puck({
         )
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { id: "puck-portal-root" })
+    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { id: "puck-portal-root" })
   ] });
 }
 
 // components/Render/index.tsx
 init_react_import();
-var import_jsx_runtime24 = require("react/jsx-runtime");
+var import_jsx_runtime23 = require("react/jsx-runtime");
 function Render({ config, data }) {
   var _a;
   const rootProps = data.root.props || data.root;
   const title = rootProps.title || "";
   if ((_a = config.root) == null ? void 0 : _a.render) {
-    return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DropZoneProvider, { value: { data, config, mode: "render" }, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DropZoneProvider, { value: { data, config, mode: "render" }, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
       config.root.render,
       __spreadProps(__spreadValues({}, rootProps), {
+        puck: {
+          renderDropZone: DropZone
+        },
         title,
         editMode: false,
         id: "puck-root",
-        children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DropZone, { zone: rootDroppableId })
+        children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DropZone, { zone: rootDroppableId })
       })
     ) });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DropZoneProvider, { value: { data, config, mode: "render" }, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DropZone, { zone: rootDroppableId }) });
+  return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DropZoneProvider, { value: { data, config, mode: "render" }, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(DropZone, { zone: rootDroppableId }) });
 }
 
 // lib/resolve-all-data.ts