@measured/puck 0.18.0-canary.c6df5b2 → 0.18.0-canary.d211707

package/dist/index.js

@@ -308,7 +308,7 @@ init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/AutoField/styles.module.css#css-module
 init_react_import();
-var styles_module_default2 = { "InputWrapper": "_InputWrapper_1l5m8_1", "Input": "_Input_1l5m8_1", "Input-label": "_Input-label_1l5m8_26", "Input-labelIcon": "_Input-labelIcon_1l5m8_35", "Input-disabledIcon": "_Input-disabledIcon_1l5m8_42", "Input-input": "_Input-input_1l5m8_47", "Input--readOnly": "_Input--readOnly_1l5m8_91", "Input-radioGroupItems": "_Input-radioGroupItems_1l5m8_102", "Input-radio": "_Input-radio_1l5m8_102", "Input-radioInner": "_Input-radioInner_1l5m8_119", "Input-radioInput": "_Input-radioInput_1l5m8_164" };
+var styles_module_default2 = { "InputWrapper": "_InputWrapper_1h1p1_1", "Input-label": "_Input-label_1h1p1_5", "Input-labelIcon": "_Input-labelIcon_1h1p1_14", "Input-disabledIcon": "_Input-disabledIcon_1h1p1_21", "Input-input": "_Input-input_1h1p1_26", "Input": "_Input_1h1p1_1", "Input--readOnly": "_Input--readOnly_1h1p1_70", "Input-radioGroupItems": "_Input-radioGroupItems_1h1p1_81", "Input-radio": "_Input-radio_1h1p1_81", "Input-radioInner": "_Input-radioInner_1h1p1_98", "Input-radioInput": "_Input-radioInput_1h1p1_143" };
 
 // components/AutoField/index.tsx
 var import_react20 = require("react");
@@ -1697,12 +1697,13 @@ var DefaultField = ({
   field,
   onChange,
   readOnly,
-  value,
+  value: _value,
   name,
   label,
   Label: Label2,
   id
 }) => {
+  const value = _value;
   return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
     Label2,
     {
@@ -1720,10 +1721,17 @@ var DefaultField = ({
           type: field.type,
           title: label || name,
           name,
-          value: typeof value === "undefined" ? "" : value.toString(),
+          value: (value == null ? void 0 : value.toString) ? value.toString() : "",
           onChange: (e) => {
             if (field.type === "number") {
-              onChange(Number(e.currentTarget.value));
+              const numberValue = Number(e.currentTarget.value);
+              if (typeof field.min !== "undefined" && numberValue < field.min) {
+                return;
+              }
+              if (typeof field.max !== "undefined" && numberValue > field.max) {
+                return;
+              }
+              onChange(numberValue);
             } else {
               onChange(e.currentTarget.value);
             }
@@ -2471,6 +2479,7 @@ var FieldLabelInternal = ({
 function AutoFieldInternal(props) {
   var _a, _b, _c, _d, _e, _f, _g, _h;
   const { dispatch, overrides, selectedItem } = useAppContext();
+  const nestedFieldContext = (0, import_react20.useContext)(NestedFieldContext);
   const { id, Label: Label2 = FieldLabelInternal } = props;
   const field = props.field;
   const label = field.label;
@@ -2535,7 +2544,6 @@ function AutoFieldInternal(props) {
   }
   const children = defaultFields[field.type](mergedProps);
   const Render2 = render[field.type];
-  const nestedFieldContext = (0, import_react20.useContext)(NestedFieldContext);
   return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
     NestedFieldContext.Provider,
     {
@@ -3248,13 +3256,19 @@ var DraggableComponent = ({
     }
   }, [ref.current]);
   (0, import_react23.useEffect)(() => {
-    if (isSelected) {
-      ctx == null ? void 0 : ctx.registerPath({
+    ctx == null ? void 0 : ctx.registerPath(
+      id,
+      {
         index,
         zone: zoneCompound
-      });
-    }
-  }, [isSelected]);
+      },
+      componentType
+    );
+    return () => {
+      var _a;
+      (_a = ctx == null ? void 0 : ctx.unregisterPath) == null ? void 0 : _a.call(ctx, id);
+    };
+  }, [id, zoneCompound, index, componentType]);
   const CustomActionBar = (0, import_react23.useMemo)(
     () => overrides.actionBar || DefaultActionBar,
     [overrides.actionBar]
@@ -3574,9 +3588,20 @@ var useContentWithPreview = (content, zoneCompound) => {
       };
     }
   );
+  const {
+    state: {
+      ui: { isDragging }
+    }
+  } = useAppContext();
   const [contentWithPreview, setContentWithPreview] = (0, import_react27.useState)(content);
+  const [localPreview, setLocalPreview] = (0, import_react27.useState)(
+    preview
+  );
   const updateContent = useRenderedCallback(
-    (content2, preview2) => {
+    (content2, preview2, isDragging2) => {
+      if (isDragging2 && !previewExists) {
+        return;
+      }
       if (preview2) {
         if (preview2.type === "insert") {
           setContentWithPreview(
@@ -3606,13 +3631,14 @@ var useContentWithPreview = (content, zoneCompound) => {
           previewExists ? content2.filter((item) => item.props.id !== draggedItemId) : content2
         );
       }
+      setLocalPreview(preview2);
     },
     [draggedItemId, previewExists]
   );
   (0, import_react27.useEffect)(() => {
-    updateContent(content, preview);
-  }, [content, preview]);
-  return contentWithPreview;
+    updateContent(content, preview, isDragging);
+  }, [content, preview, isDragging]);
+  return [contentWithPreview, localPreview];
 };
 
 // components/DropZone/lib/use-drag-axis.ts
@@ -3656,8 +3682,9 @@ var import_jsx_runtime22 = require("react/jsx-runtime");
 var getClassName17 = get_class_name_factory_default("DropZone", styles_module_default12);
 var getRandomColor = () => `#${Math.floor(Math.random() * 16777215).toString(16)}`;
 var RENDER_DEBUG = false;
+var DropZoneEditPure = (props) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(DropZoneEdit, __spreadValues({}, props));
 var DropZoneEdit = (0, import_react29.forwardRef)(
-  function DropZoneEdit2({
+  function DropZoneEditInternal({
     zone,
     allow,
     disallow,
@@ -3691,8 +3718,7 @@ var DropZoneEdit = (0, import_react29.forwardRef)(
       isDeepestZone,
       inNextDeepestArea,
       draggedComponentType,
-      userIsDragging,
-      preview
+      userIsDragging
     } = useContextStore(ZoneStoreContext, (s) => {
       var _a, _b, _c;
       return {
@@ -3700,8 +3726,7 @@ var DropZoneEdit = (0, import_react29.forwardRef)(
         inNextDeepestArea: s.nextAreaDepthIndex[areaId || ""],
         draggedItemId: (_b = s.draggedItem) == null ? void 0 : _b.id,
         draggedComponentType: (_c = s.draggedItem) == null ? void 0 : _c.data.componentType,
-        userIsDragging: !!s.draggedItem,
-        preview: s.previewIndex[zoneCompound]
+        userIsDragging: !!s.draggedItem
       };
     });
     const { itemSelector } = appContext2.state.ui;
@@ -3767,7 +3792,10 @@ var DropZoneEdit = (0, import_react29.forwardRef)(
     if (isEnabled) {
       isEnabled = acceptsTarget(draggedComponentType);
     }
-    const contentWithPreview = useContentWithPreview(content, zoneCompound);
+    const [contentWithPreview, preview] = useContentWithPreview(
+      content,
+      zoneCompound
+    );
     const isDropEnabled = isEnabled && (preview ? contentWithPreview.length === 1 : contentWithPreview.length === 0);
     const droppableConfig = {
       id: zoneCompound,
@@ -3809,16 +3837,15 @@ var DropZoneEdit = (0, import_react29.forwardRef)(
         },
         "data-testid": `dropzone:${zoneCompound}`,
         "data-puck-dropzone": zoneCompound,
-        "data-puck-dnd": zoneCompound,
         style: __spreadProps(__spreadValues({}, style), {
           "--min-empty-height": `${minEmptyHeight}px`,
-          backgroundColor: RENDER_DEBUG ? getRandomColor() : void 0
+          backgroundColor: RENDER_DEBUG ? getRandomColor() : style == null ? void 0 : style.backgroundColor
         }),
         children: contentWithPreview.map((item, i) => {
-          var _a, _b, _c, _d, _e;
+          var _a, _b, _c, _d, _e, _f, _g;
           const componentId = item.props.id;
           const puckProps = {
-            renderDropZone: DropZone,
+            renderDropZone: DropZoneEditPure,
             isEditing: true,
             dragRef: null
           };
@@ -3835,13 +3862,13 @@ var DropZoneEdit = (0, import_react29.forwardRef)(
           const componentConfig = config.components[item.type];
           let componentType = item.type;
           let label = (_b = componentConfig == null ? void 0 : componentConfig["label"]) != null ? _b : item.type.toString();
-          if (item.type === "preview" && preview) {
+          if (item.type === "preview") {
             let Preview4 = function() {
               return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(DrawerItemInner, { name: label, children: appContext2.overrides.componentItem });
             };
             var Preview3 = Preview4;
-            componentType = preview.componentType;
-            label = (_d = (_c = config.components[componentType]) == null ? void 0 : _c.label) != null ? _d : preview.componentType;
+            componentType = (_c = preview == null ? void 0 : preview.componentType) != null ? _c : "__preview";
+            label = (_f = (_e = (_d = config.components[componentType]) == null ? void 0 : _d.label) != null ? _e : componentType) != null ? _f : "Preview";
             Render2 = Preview4;
           }
           return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
@@ -3856,7 +3883,7 @@ var DropZoneEdit = (0, import_react29.forwardRef)(
                   zoneCompound,
                   depth: depth + 1,
                   index: i,
-                  isLoading: ((_e = appContext2.componentState[componentId]) == null ? void 0 : _e.loadingCount) > 0,
+                  isLoading: ((_g = appContext2.componentState[componentId]) == null ? void 0 : _g.loadingCount) > 0,
                   isSelected,
                   label,
                   isEnabled,
@@ -3881,8 +3908,9 @@ var DropZoneEdit = (0, import_react29.forwardRef)(
     );
   }
 );
+var DropZoneRenderPure = (props) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(DropZoneRender, __spreadValues({}, props));
 var DropZoneRender = (0, import_react29.forwardRef)(
-  function DropZoneRender2({ className, style, zone }, ref) {
+  function DropZoneRenderInternal({ className, style, zone }, ref) {
     const ctx = (0, import_react29.useContext)(dropZoneContext);
     const { data, areaId = "root", config } = ctx || {};
     let zoneCompound = rootDroppableId;
@@ -3920,7 +3948,9 @@ var DropZoneRender = (0, import_react29.forwardRef)(
             children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
               Component.render,
               __spreadProps(__spreadValues({}, item.props), {
-                puck: { renderDropZone: DropZoneRender2 }
+                puck: {
+                  renderDropZone: DropZoneRenderPure
+                }
               })
             )
           },
@@ -3995,6 +4025,48 @@ var getFrame = () => {
   return (frameEl == null ? void 0 : frameEl.ownerDocument) || document;
 };
 
+// lib/global-position.ts
+init_react_import();
+var GlobalPosition = class {
+  constructor(target, original) {
+    this.scaleFactor = 1;
+    this.frameEl = null;
+    this.frameRect = null;
+    var _a;
+    this.target = target;
+    this.original = original;
+    this.frameEl = document.querySelector("iframe");
+    if (this.frameEl) {
+      this.frameRect = this.frameEl.getBoundingClientRect();
+      this.scaleFactor = this.frameRect.width / (((_a = this.frameEl.contentWindow) == null ? void 0 : _a.innerWidth) || 1);
+    }
+  }
+  get x() {
+    return this.original.x;
+  }
+  get y() {
+    return this.original.y;
+  }
+  get global() {
+    if (document !== this.target.ownerDocument && this.frameRect) {
+      return {
+        x: this.x * this.scaleFactor + this.frameRect.left,
+        y: this.y * this.scaleFactor + this.frameRect.top
+      };
+    }
+    return this.original;
+  }
+  get frame() {
+    if (document === this.target.ownerDocument && this.frameRect) {
+      return {
+        x: (this.x - this.frameRect.left) / this.scaleFactor,
+        y: (this.y - this.frameRect.top) / this.scaleFactor
+      };
+    }
+    return this.original;
+  }
+};
+
 // lib/dnd/NestedDroppablePlugin.ts
 var depthSort = (candidates) => {
   return candidates.sort((a, b) => {
@@ -4024,10 +4096,12 @@ var getZoneId2 = (candidate) => {
   }
   return id;
 };
-var getPointerCollisions = (position, manager, ownerDocument) => {
-  var _a;
+var getPointerCollisions = (position, manager) => {
   const candidates = [];
-  let elements = ownerDocument.elementsFromPoint(position.x, position.y);
+  let elements = position.target.ownerDocument.elementsFromPoint(
+    position.x,
+    position.y
+  );
   const previewFrame = elements.find(
     (el) => el.getAttribute("data-puck-preview")
   );
@@ -4036,22 +4110,21 @@ var getPointerCollisions = (position, manager, ownerDocument) => {
     elements = [drawer];
   }
   if (previewFrame) {
-    const iframe = previewFrame.querySelector("iframe");
-    if (iframe) {
-      const rect = iframe.getBoundingClientRect();
-      const frame = getFrame();
-      if (frame) {
-        const scaleFactor = rect.width / (((_a = iframe.contentWindow) == null ? void 0 : _a.innerWidth) || 1);
-        elements = frame.elementsFromPoint(
-          (position.x - rect.left) / scaleFactor,
-          (position.y - rect.top) / scaleFactor
-        );
-      }
+    const frame = getFrame();
+    if (frame) {
+      elements = frame.elementsFromPoint(position.frame.x, position.frame.y);
     }
   }
   if (elements) {
     for (let i = 0; i < elements.length; i++) {
       const element = elements[i];
+      const dropzoneId = element.getAttribute("data-puck-dropzone");
+      if (dropzoneId) {
+        const droppable = manager.registry.droppables.get(dropzoneId);
+        if (droppable) {
+          candidates.push(droppable);
+        }
+      }
       const id = element.getAttribute("data-puck-dnd");
       if (id) {
         const droppable = manager.registry.droppables.get(id);
@@ -4063,9 +4136,9 @@ var getPointerCollisions = (position, manager, ownerDocument) => {
   }
   return candidates;
 };
-var findDeepestCandidate = (position, manager, ownerDocument) => {
+var findDeepestCandidate = (position, manager) => {
   var _a;
-  const candidates = getPointerCollisions(position, manager, ownerDocument);
+  const candidates = getPointerCollisions(position, manager);
   if (candidates.length > 0) {
     const sortedCandidates = depthSort(candidates);
     const draggable = manager.dragOperation.source;
@@ -4118,22 +4191,18 @@ var createNestedDroppablePlugin = ({ onChange }, id) => class NestedDroppablePlu
     }
     const cleanupEffect = (0, import_state.effects)(() => {
       const handleMove = (event) => {
-        const position = {
+        const target = event.originalTarget || event.target;
+        const position = new GlobalPosition(target, {
           x: event.clientX,
           y: event.clientY
-        };
-        const target = event.originalTarget || event.target;
-        const ownerDocument = target == null ? void 0 : target.ownerDocument;
+        });
         const elements = document.elementsFromPoint(
-          event.clientX,
-          event.clientY
+          position.global.x,
+          position.global.y
         );
         const overEl = elements.some((el) => el.id === id);
         if (overEl) {
-          onChange(
-            findDeepestCandidate(position, manager, ownerDocument),
-            manager
-          );
+          onChange(findDeepestCandidate(position, manager), manager);
         }
       };
       const handleMoveThrottled = throttle(handleMove, 50);
@@ -4464,6 +4533,11 @@ var reduceUi = (ui, action) => {
       itemSelector: { index: action.sourceIndex + 1, zone: action.sourceZone }
     });
   }
+  if (action.type === "remove") {
+    return __spreadProps(__spreadValues({}, ui), {
+      itemSelector: null
+    });
+  }
   return ui;
 };
 
@@ -4714,6 +4788,9 @@ var _PointerSensor = class _PointerSensor extends import_abstract10.Sensor {
     }
   }
   handlePointerUp(event) {
+    if (!this.source) {
+      return;
+    }
     event.preventDefault();
     event.stopPropagation();
     const { status } = this.manager.dragOperation;
@@ -4992,27 +5069,33 @@ var DragDropContextClient = ({
   const [pathData, setPathData] = (0, import_react31.useState)();
   const dragMode = (0, import_react31.useRef)(null);
   const registerPath = (0, import_react31.useCallback)(
-    (selector) => {
-      const item = getItem(selector, data);
-      if (!item) {
-        return;
-      }
+    (id2, selector, label) => {
       const [area] = getZoneId(selector.zone);
       setPathData((latestPathData = {}) => {
         const parentPathData = latestPathData[area] || { path: [] };
         return __spreadProps(__spreadValues({}, latestPathData), {
-          [item.props.id]: {
+          [id2]: {
             path: [
               ...parentPathData.path,
               ...selector.zone ? [selector.zone] : []
             ],
-            label: item.type
+            label
           }
         });
       });
     },
     [data, setPathData]
   );
+  const unregisterPath = (0, import_react31.useCallback)(
+    (id2) => {
+      setPathData((latestPathData = {}) => {
+        const newPathData = __spreadValues({}, latestPathData);
+        delete newPathData[id2];
+        return newPathData;
+      });
+    },
+    [data, setPathData]
+  );
   const initialSelector = (0, import_react31.useRef)(void 0);
   return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)("div", { id, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
     dragListenerContext.Provider,
@@ -5209,6 +5292,7 @@ var DragDropContextClient = ({
                 areaId: "root",
                 depth: 0,
                 registerPath,
+                unregisterPath,
                 pathData,
                 path: []
               },
@@ -5335,7 +5419,7 @@ var Drawer = ({
       "Warning: The `direction` prop on Drawer is deprecated and no longer required to achieve multi-directional dragging."
     );
   }
-  const [id] = (0, import_react32.useState)(generateId());
+  const id = (0, import_react32.useId)();
   const { ref } = useDroppableSafe({
     id,
     type: "void",
@@ -5357,7 +5441,7 @@ Drawer.Item = DrawerItem;
 
 // components/Puck/index.tsx
 init_react_import();
-var import_react48 = require("react");
+var import_react50 = require("react");
 
 // components/SidebarSection/index.tsx
 init_react_import();
@@ -5550,36 +5634,61 @@ init_react_import();
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Puck/components/Fields/styles.module.css#css-module
 init_react_import();
-var styles_module_default16 = { "PuckFields": "_PuckFields_jp3lw_1", "PuckFields--isLoading": "_PuckFields--isLoading_jp3lw_6", "PuckFields-loadingOverlay": "_PuckFields-loadingOverlay_jp3lw_10", "PuckFields-loadingOverlayInner": "_PuckFields-loadingOverlayInner_jp3lw_25" };
+var styles_module_default16 = { "PuckFields": "_PuckFields_10bh7_1", "PuckFields--isLoading": "_PuckFields--isLoading_10bh7_6", "PuckFields-loadingOverlay": "_PuckFields-loadingOverlay_10bh7_10", "PuckFields-loadingOverlayInner": "_PuckFields-loadingOverlayInner_10bh7_25", "PuckFields-field": "_PuckFields-field_10bh7_32", "PuckFields--wrapFields": "_PuckFields--wrapFields_10bh7_36" };
 
 // components/Puck/components/Fields/index.tsx
-var import_react35 = require("react");
+var import_react37 = require("react");
+
+// lib/use-resolved-fields.ts
+init_react_import();
+var import_react36 = require("react");
 
 // lib/use-parent.ts
 init_react_import();
 var import_react34 = require("react");
-var useParent = (itemSelector) => {
+var getParent = (itemSelector, pathData, data) => {
   var _a;
-  const { selectedItem, state } = useAppContext();
-  const { pathData } = (0, import_react34.useContext)(dropZoneContext) || {};
-  const item = itemSelector ? getItem(itemSelector, state.data) : selectedItem;
-  const breadcrumbs = convertPathDataToBreadcrumbs(item, pathData, state.data);
+  if (!itemSelector) return null;
+  const item = getItem(itemSelector, data);
+  const breadcrumbs = convertPathDataToBreadcrumbs(item, pathData, data);
   const lastItem = breadcrumbs[breadcrumbs.length - 1];
-  const parent = (lastItem == null ? void 0 : lastItem.selector) ? (_a = getItem(lastItem.selector, state.data)) != null ? _a : null : null;
+  const parent = (lastItem == null ? void 0 : lastItem.selector) ? (_a = getItem(lastItem.selector, data)) != null ? _a : null : null;
   return parent || null;
 };
+var useGetParent = () => {
+  const { state } = useAppContext();
+  const { pathData } = (0, import_react34.useContext)(dropZoneContext) || {};
+  return (0, import_react34.useCallback)(
+    () => getParent(state.ui.itemSelector, pathData, state.data),
+    [state.ui.itemSelector, pathData, state.data]
+  );
+};
+var useParent = () => {
+  return useGetParent()();
+};
 
-// components/Puck/components/Fields/index.tsx
-var import_jsx_runtime27 = require("react/jsx-runtime");
-var getClassName21 = get_class_name_factory_default("PuckFields", styles_module_default16);
+// lib/use-on-value-change.ts
+init_react_import();
+var import_react35 = require("react");
+function useOnValueChange(value, onChange, compare = Object.is, deps = []) {
+  const tracked = (0, import_react35.useRef)(value);
+  (0, import_react35.useEffect)(() => {
+    const oldValue = tracked.current;
+    if (!compare(value, oldValue)) {
+      tracked.current = value;
+      onChange(value, oldValue);
+    }
+  }, [onChange, compare, value, ...deps]);
+}
+
+// lib/selector-is.ts
+init_react_import();
+var selectorIs = (a, b) => (a == null ? void 0 : a.zone) === (b == null ? void 0 : b.zone) && (a == null ? void 0 : a.index) === (b == null ? void 0 : b.index);
+
+// lib/use-resolved-fields.ts
 var defaultPageFields = {
   title: { type: "text" }
 };
-var DefaultFields = ({
-  children
-}) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(import_jsx_runtime27.Fragment, { children });
-};
 var useResolvedFields = () => {
   var _a, _b;
   const { selectedItem, state, config } = useAppContext();
@@ -5587,20 +5696,21 @@ var useResolvedFields = () => {
   const { data } = state;
   const rootFields = ((_a = config.root) == null ? void 0 : _a.fields) || defaultPageFields;
   const componentConfig = selectedItem ? config.components[selectedItem.type] : null;
-  const defaultFields = (0, import_react35.useMemo)(
+  const defaultFields = (0, import_react36.useMemo)(
     () => (selectedItem ? componentConfig == null ? void 0 : componentConfig.fields : rootFields) || {},
     [selectedItem, rootFields, componentConfig == null ? void 0 : componentConfig.fields]
   );
   const rootProps = data.root.props || data.root;
-  const [lastSelectedData, setLastSelectedData] = (0, import_react35.useState)({});
-  const [resolvedFields, setResolvedFields] = (0, import_react35.useState)(defaultFields);
-  const [fieldsLoading, setFieldsLoading] = (0, import_react35.useState)(false);
+  const [lastSelectedData, setLastSelectedData] = (0, import_react36.useState)({});
+  const [resolvedFields, setResolvedFields] = (0, import_react36.useState)(defaultFields);
+  const [fieldsLoading, setFieldsLoading] = (0, import_react36.useState)(false);
+  const lastFields = (0, import_react36.useRef)(defaultFields);
   const defaultResolveFields = (_componentData, _params) => defaultFields;
   const componentData = selectedItem ? selectedItem : { props: rootProps, readOnly: data.root.readOnly };
   const hasComponentResolver = selectedItem && (componentConfig == null ? void 0 : componentConfig.resolveFields);
   const hasRootResolver = !selectedItem && ((_b = config.root) == null ? void 0 : _b.resolveFields);
   const hasResolver = hasComponentResolver || hasRootResolver;
-  const resolveFields = (0, import_react35.useCallback)(
+  const resolveFields = (0, import_react36.useCallback)(
     (..._0) => __async(void 0, [..._0], function* (fields = {}) {
       var _a2;
       const lastData = ((_a2 = lastSelectedData.props) == null ? void 0 : _a2.id) === componentData.props.id ? lastSelectedData : null;
@@ -5612,7 +5722,7 @@ var useResolvedFields = () => {
           {
             changed,
             fields,
-            lastFields: resolvedFields,
+            lastFields: lastFields.current,
             lastData,
             appState: state,
             parent
@@ -5623,7 +5733,7 @@ var useResolvedFields = () => {
         return yield config.root.resolveFields(componentData, {
           changed,
           fields,
-          lastFields: resolvedFields,
+          lastFields: lastFields.current,
           lastData,
           appState: state,
           parent
@@ -5632,26 +5742,56 @@ var useResolvedFields = () => {
       return defaultResolveFields(componentData, {
         changed,
         fields,
-        lastFields: resolvedFields,
+        lastFields: lastFields.current,
         lastData
       });
     }),
-    [data, config, componentData, selectedItem, resolvedFields, state]
+    [data, config, componentData, selectedItem, state, parent]
   );
-  (0, import_react35.useEffect)(() => {
-    if (hasResolver) {
-      setFieldsLoading(true);
-      resolveFields(defaultFields).then((fields) => {
-        setResolvedFields(fields || {});
-        setFieldsLoading(false);
-      });
-    } else {
-      setResolvedFields(defaultFields);
+  const triggerResolver = (0, import_react36.useCallback)(() => {
+    var _a2, _b2;
+    if (!((_a2 = state.ui.itemSelector) == null ? void 0 : _a2.zone) || ((_b2 = state.ui.itemSelector) == null ? void 0 : _b2.zone) === "default-zone" || parent) {
+      if (hasResolver) {
+        setFieldsLoading(true);
+        resolveFields(defaultFields).then((fields) => {
+          setResolvedFields(fields || {});
+          lastFields.current = fields;
+          setFieldsLoading(false);
+        });
+        return;
+      }
     }
-  }, [data, defaultFields, selectedItem, hasResolver]);
+    setResolvedFields(defaultFields);
+  }, [defaultFields, state.ui.itemSelector, hasResolver, parent]);
+  useOnValueChange(
+    state.ui.itemSelector,
+    () => {
+      lastFields.current = defaultFields;
+    },
+    selectorIs
+  );
+  useOnValueChange(
+    { data, parent, itemSelector: state.ui.itemSelector },
+    () => {
+      triggerResolver();
+    },
+    (a, b) => JSON.stringify(a) === JSON.stringify(b)
+  );
+  (0, import_react36.useEffect)(() => {
+    triggerResolver();
+  }, []);
   return [resolvedFields, fieldsLoading];
 };
-var Fields = () => {
+
+// components/Puck/components/Fields/index.tsx
+var import_jsx_runtime27 = require("react/jsx-runtime");
+var getClassName21 = get_class_name_factory_default("PuckFields", styles_module_default16);
+var DefaultFields = ({
+  children
+}) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(import_jsx_runtime27.Fragment, { children });
+};
+var Fields = ({ wrapFields = true }) => {
   var _a, _b;
   const {
     selectedItem,
@@ -5669,11 +5809,11 @@ var Fields = () => {
   const componentResolving = selectedItem ? ((_a = componentState[selectedItem == null ? void 0 : selectedItem.props.id]) == null ? void 0 : _a.loadingCount) > 0 : ((_b = componentState["puck-root"]) == null ? void 0 : _b.loadingCount) > 0;
   const isLoading = fieldsResolving || componentResolving;
   const rootProps = data.root.props || data.root;
-  const Wrapper = (0, import_react35.useMemo)(() => overrides.fields || DefaultFields, [overrides]);
+  const Wrapper = (0, import_react37.useMemo)(() => overrides.fields || DefaultFields, [overrides]);
   return /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)(
     "form",
     {
-      className: getClassName21(),
+      className: getClassName21({ wrapFields }),
       onSubmit: (e) => {
         e.preventDefault();
       },
@@ -5749,7 +5889,7 @@ var Fields = () => {
               item: selectedItem
             });
             const id = `${selectedItem.props.id}_${field.type}_${fieldName}`;
-            return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
+            return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassName21("field"), children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
               AutoFieldPrivate,
               {
                 field,
@@ -5758,16 +5898,15 @@ var Fields = () => {
                 readOnly: !edit || readOnly[fieldName],
                 value: selectedItem.props[fieldName],
                 onChange
-              },
-              id
-            );
+              }
+            ) }, id);
           } else {
             const readOnly = data.root.readOnly || {};
             const { edit } = getPermissions({
               root: true
             });
             const id = `root_${field.type}_${fieldName}`;
-            return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
+            return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassName21("field"), children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
               AutoFieldPrivate,
               {
                 field,
@@ -5776,9 +5915,8 @@ var Fields = () => {
                 readOnly: !edit || readOnly[fieldName],
                 value: rootProps[fieldName],
                 onChange
-              },
-              id
-            );
+              }
+            ) }, id);
           }
         }) }),
         isLoading && /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassName21("loadingOverlay"), children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)("div", { className: getClassName21("loadingOverlayInner"), children: /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(Loader, { size: 16 }) }) })
@@ -5792,7 +5930,7 @@ init_react_import();
 
 // lib/use-component-list.tsx
 init_react_import();
-var import_react36 = require("react");
+var import_react38 = require("react");
 
 // components/ComponentList/index.tsx
 init_react_import();
@@ -5859,8 +5997,8 @@ ComponentList.Item = ComponentListItem;
 // lib/use-component-list.tsx
 var import_jsx_runtime29 = require("react/jsx-runtime");
 var useComponentList = (config, ui) => {
-  const [componentList, setComponentList] = (0, import_react36.useState)();
-  (0, import_react36.useEffect)(() => {
+  const [componentList, setComponentList] = (0, import_react38.useState)();
+  (0, import_react38.useEffect)(() => {
     var _a, _b, _c;
     if (Object.keys(ui.componentList).length > 0) {
       const matchedComponents = [];
@@ -5929,22 +6067,22 @@ var useComponentList = (config, ui) => {
 };
 
 // components/Puck/components/Components/index.tsx
-var import_react37 = require("react");
+var import_react39 = require("react");
 var import_jsx_runtime30 = require("react/jsx-runtime");
 var Components = () => {
   const { config, state, overrides } = useAppContext();
   const componentList = useComponentList(config, state.ui);
-  const Wrapper = (0, import_react37.useMemo)(() => overrides.components || "div", [overrides]);
+  const Wrapper = (0, import_react39.useMemo)(() => overrides.components || "div", [overrides]);
   return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(Wrapper, { children: componentList ? componentList : /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(ComponentList, { id: "all" }) });
 };
 
 // components/Puck/components/Preview/index.tsx
 init_react_import();
-var import_react39 = require("react");
+var import_react41 = require("react");
 
 // components/AutoFrame/index.tsx
 init_react_import();
-var import_react38 = require("react");
+var import_react40 = require("react");
 var import_object_hash = __toESM(require("object-hash"));
 var import_react_dom3 = require("react-dom");
 var import_jsx_runtime31 = require("react/jsx-runtime");
@@ -5990,7 +6128,7 @@ var CopyHostStyles = ({
   onStylesLoaded = () => null
 }) => {
   const { document: doc, window: win } = useFrame();
-  (0, import_react38.useEffect)(() => {
+  (0, import_react40.useEffect)(() => {
     if (!win || !doc) {
       return () => {
       };
@@ -6149,8 +6287,8 @@ var CopyHostStyles = ({
   }, []);
   return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(import_jsx_runtime31.Fragment, { children });
 };
-var autoFrameContext = (0, import_react38.createContext)({});
-var useFrame = () => (0, import_react38.useContext)(autoFrameContext);
+var autoFrameContext = (0, import_react40.createContext)({});
+var useFrame = () => (0, import_react40.useContext)(autoFrameContext);
 function AutoFrame(_a) {
   var _b = _a, {
     children,
@@ -6167,10 +6305,10 @@ function AutoFrame(_a) {
     "onStylesLoaded",
     "frameRef"
   ]);
-  const [loaded, setLoaded] = (0, import_react38.useState)(false);
-  const [ctx, setCtx] = (0, import_react38.useState)({});
-  const [mountTarget, setMountTarget] = (0, import_react38.useState)();
-  (0, import_react38.useEffect)(() => {
+  const [loaded, setLoaded] = (0, import_react40.useState)(false);
+  const [ctx, setCtx] = (0, import_react40.useState)({});
+  const [mountTarget, setMountTarget] = (0, import_react40.useState)();
+  (0, import_react40.useEffect)(() => {
     var _a2;
     if (frameRef.current) {
       setCtx({
@@ -6264,7 +6402,7 @@ var import_jsx_runtime33 = require("react/jsx-runtime");
 var getClassName23 = get_class_name_factory_default("PuckPreview", styles_module_default18);
 var useBubbleIframeEvents = (ref) => {
   const { status } = useAppContext();
-  (0, import_react39.useEffect)(() => {
+  (0, import_react41.useEffect)(() => {
     var _a;
     if (ref.current && status === "READY") {
       const iframe = ref.current;
@@ -6303,7 +6441,7 @@ var useBubbleIframeEvents = (ref) => {
 };
 var Preview2 = ({ id = "puck-preview" }) => {
   const { config, dispatch, state, setStatus, iframe, overrides } = useAppContext();
-  const Page = (0, import_react39.useCallback)(
+  const Page = (0, import_react41.useCallback)(
     (pageProps) => {
       var _a, _b;
       return ((_a = config.root) == null ? void 0 : _a.render) ? (_b = config.root) == null ? void 0 : _b.render(__spreadValues({
@@ -6312,9 +6450,9 @@ var Preview2 = ({ id = "puck-preview" }) => {
     },
     [config.root]
   );
-  const Frame = (0, import_react39.useMemo)(() => overrides.iframe, [overrides]);
+  const Frame = (0, import_react41.useMemo)(() => overrides.iframe, [overrides]);
   const rootProps = state.data.root.props || state.data.root;
-  const ref = (0, import_react39.useRef)(null);
+  const ref = (0, import_react41.useRef)(null);
   useBubbleIframeEvents(ref);
   const inner = state.ui.previewMode === "edit" ? /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
     Page,
@@ -6411,7 +6549,7 @@ var scrollIntoView = (el) => {
 };
 
 // components/LayerTree/index.tsx
-var import_react40 = require("react");
+var import_react42 = require("react");
 
 // lib/is-child-of-zone.ts
 init_react_import();
@@ -6457,7 +6595,7 @@ var LayerTree = ({
   label
 }) => {
   const zones = data.zones || {};
-  const ctx = (0, import_react40.useContext)(dropZoneContext);
+  const ctx = (0, import_react42.useContext)(dropZoneContext);
   return /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)(import_jsx_runtime34.Fragment, { children: [
     label && /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)("div", { className: getClassName24("zoneTitle"), children: [
       /* @__PURE__ */ (0, import_jsx_runtime34.jsx)("div", { className: getClassName24("zoneIcon"), children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Layers, { size: "16" }) }),
@@ -6564,13 +6702,13 @@ var LayerTree = ({
 };
 
 // components/Puck/components/Outline/index.tsx
-var import_react41 = require("react");
+var import_react43 = require("react");
 var import_jsx_runtime35 = require("react/jsx-runtime");
 var Outline = () => {
   const { dispatch, state, overrides, config } = useAppContext();
   const { data, ui } = state;
   const { itemSelector } = ui;
-  const setItemSelector = (0, import_react41.useCallback)(
+  const setItemSelector = (0, import_react43.useCallback)(
     (newItemSelector) => {
       dispatch({
         type: "setUi",
@@ -6579,7 +6717,7 @@ var Outline = () => {
     },
     []
   );
-  const Wrapper = (0, import_react41.useMemo)(() => overrides.outline || "div", [overrides]);
+  const Wrapper = (0, import_react43.useMemo)(() => overrides.outline || "div", [overrides]);
   return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Wrapper, { children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(dropZoneContext.Consumer, { children: (ctx) => /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(import_jsx_runtime35.Fragment, { children: [
     (ctx == null ? void 0 : ctx.activeZones) && (ctx == null ? void 0 : ctx.activeZones[rootDroppableId]) && /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
       LayerTree,
@@ -6693,19 +6831,19 @@ function usePuckHistory({
 
 // lib/use-history-store.ts
 init_react_import();
-var import_react42 = require("react");
+var import_react44 = require("react");
 var import_use_debounce3 = require("use-debounce");
 var EMPTY_HISTORY_INDEX = 0;
 function useHistoryStore(initialHistory) {
   var _a, _b;
-  const [histories, setHistories] = (0, import_react42.useState)(
+  const [histories, setHistories] = (0, import_react44.useState)(
     (_a = initialHistory == null ? void 0 : initialHistory.histories) != null ? _a : []
   );
   const updateHistories = (histories2) => {
     setHistories(histories2);
     setIndex(histories2.length - 1);
   };
-  const [index, setIndex] = (0, import_react42.useState)(
+  const [index, setIndex] = (0, import_react44.useState)(
     (_b = initialHistory == null ? void 0 : initialHistory.index) != null ? _b : EMPTY_HISTORY_INDEX
   );
   const hasPast = index > EMPTY_HISTORY_INDEX;
@@ -6865,11 +7003,11 @@ var getBox = function getBox2(el) {
 };
 
 // components/Puck/components/Canvas/index.tsx
-var import_react44 = require("react");
+var import_react46 = require("react");
 
 // components/ViewportControls/index.tsx
 init_react_import();
-var import_react43 = require("react");
+var import_react45 = require("react");
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/ViewportControls/styles.module.css#css-module
 init_react_import();
@@ -6892,8 +7030,8 @@ var ViewportButton = ({
   onClick
 }) => {
   const { state } = useAppContext();
-  const [isActive, setIsActive] = (0, import_react43.useState)(false);
-  (0, import_react43.useEffect)(() => {
+  const [isActive, setIsActive] = (0, import_react45.useState)(false);
+  (0, import_react45.useEffect)(() => {
     setIsActive(width === state.ui.viewports.current.width);
   }, [width, state.ui.viewports.current.width]);
   return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("span", { className: getClassNameButton({ isActive }), children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
@@ -6929,7 +7067,7 @@ var ViewportControls = ({
   const defaultsContainAutoZoom = defaultZoomOptions.find(
     (option) => option.value === autoZoom
   );
-  const zoomOptions = (0, import_react43.useMemo)(
+  const zoomOptions = (0, import_react45.useMemo)(
     () => [
       ...defaultZoomOptions,
       ...defaultsContainAutoZoom ? [] : [
@@ -7052,17 +7190,17 @@ var Canvas = () => {
   const { status, iframe } = useAppContext();
   const { dispatch, state, overrides, setUi, zoomConfig, setZoomConfig } = useAppContext();
   const { ui } = state;
-  const frameRef = (0, import_react44.useRef)(null);
-  const [showTransition, setShowTransition] = (0, import_react44.useState)(false);
-  const defaultRender = (0, import_react44.useMemo)(() => {
+  const frameRef = (0, import_react46.useRef)(null);
+  const [showTransition, setShowTransition] = (0, import_react46.useState)(false);
+  const defaultRender = (0, import_react46.useMemo)(() => {
     const PuckDefault = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(import_jsx_runtime37.Fragment, { children });
     return PuckDefault;
   }, []);
-  const CustomPreview = (0, import_react44.useMemo)(
+  const CustomPreview = (0, import_react46.useMemo)(
     () => overrides.preview || defaultRender,
     [overrides]
   );
-  const getFrameDimensions = (0, import_react44.useCallback)(() => {
+  const getFrameDimensions = (0, import_react46.useCallback)(() => {
     if (frameRef.current) {
       const frame = frameRef.current;
       const box = getBox(frame);
@@ -7070,7 +7208,7 @@ var Canvas = () => {
     }
     return { width: 0, height: 0 };
   }, [frameRef]);
-  const resetAutoZoom = (0, import_react44.useCallback)(
+  const resetAutoZoom = (0, import_react46.useCallback)(
     (ui2 = state.ui) => {
       if (frameRef.current) {
         setZoomConfig(
@@ -7080,11 +7218,11 @@ var Canvas = () => {
     },
     [frameRef, zoomConfig, state.ui]
   );
-  (0, import_react44.useEffect)(() => {
+  (0, import_react46.useEffect)(() => {
     setShowTransition(false);
     resetAutoZoom();
   }, [frameRef, ui.leftSideBarVisible, ui.rightSideBarVisible]);
-  (0, import_react44.useEffect)(() => {
+  (0, import_react46.useEffect)(() => {
     const { height: frameHeight } = getFrameDimensions();
     if (ui.viewports.current.height === "auto") {
       setZoomConfig(__spreadProps(__spreadValues({}, zoomConfig), {
@@ -7092,13 +7230,13 @@ var Canvas = () => {
       }));
     }
   }, [zoomConfig.zoom]);
-  (0, import_react44.useEffect)(() => {
+  (0, import_react46.useEffect)(() => {
     if (ZOOM_ON_CHANGE) {
       setShowTransition(true);
       resetAutoZoom(ui);
     }
   }, [ui.viewports.current.width]);
-  (0, import_react44.useEffect)(() => {
+  (0, import_react46.useEffect)(() => {
     const cb = () => {
       setShowTransition(false);
       resetAutoZoom();
@@ -7108,8 +7246,8 @@ var Canvas = () => {
       window.removeEventListener("resize", cb);
     };
   }, []);
-  const [showLoader, setShowLoader] = (0, import_react44.useState)(false);
-  (0, import_react44.useEffect)(() => {
+  const [showLoader, setShowLoader] = (0, import_react46.useState)(false);
+  (0, import_react46.useEffect)(() => {
     setTimeout(() => {
       setShowLoader(true);
     }, 500);
@@ -7187,7 +7325,7 @@ var Canvas = () => {
 
 // lib/use-loaded-overrides.ts
 init_react_import();
-var import_react45 = require("react");
+var import_react47 = require("react");
 
 // lib/load-overrides.ts
 init_react_import();
@@ -7226,7 +7364,7 @@ var useLoadedOverrides = ({
   overrides,
   plugins
 }) => {
-  return (0, import_react45.useMemo)(() => {
+  return (0, import_react47.useMemo)(() => {
     return loadOverrides({ overrides, plugins });
   }, [plugins, overrides]);
 };
@@ -7238,14 +7376,14 @@ var DefaultOverride = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime38
 
 // lib/use-inject-css.ts
 init_react_import();
-var import_react46 = require("react");
+var import_react48 = require("react");
 var styles = ``;
 var useInjectStyleSheet = (initialStyles, iframeEnabled) => {
-  const [el, setEl] = (0, import_react46.useState)();
-  (0, import_react46.useEffect)(() => {
+  const [el, setEl] = (0, import_react48.useState)();
+  (0, import_react48.useEffect)(() => {
     setEl(document.createElement("style"));
   }, []);
-  (0, import_react46.useEffect)(() => {
+  (0, import_react48.useEffect)(() => {
     var _a;
     if (!el || typeof window === "undefined") {
       return;
@@ -7265,10 +7403,10 @@ var useInjectGlobalCss = (iframeEnabled) => {
 
 // lib/use-preview-mode-hotkeys.ts
 init_react_import();
-var import_react47 = require("react");
+var import_react49 = require("react");
 var import_react_hotkeys_hook2 = require("react-hotkeys-hook");
 var usePreviewModeHotkeys = (dispatch, iframeEnabled) => {
-  const toggleInteractive = (0, import_react47.useCallback)(() => {
+  const toggleInteractive = (0, import_react49.useCallback)(() => {
     dispatch({
       type: "setUi",
       ui: (ui) => ({
@@ -7320,7 +7458,7 @@ function Puck({
     waitForStyles: true
   }, _iframe);
   useInjectGlobalCss(iframe.enabled);
-  const [generatedAppState] = (0, import_react48.useState)(() => {
+  const [generatedAppState] = (0, import_react50.useState)(() => {
     var _a2, _b2, _c, _d, _e, _f, _g, _h, _i;
     const initial = __spreadValues(__spreadValues({}, defaultAppState.ui), initialUi);
     let clientUiState = {};
@@ -7392,14 +7530,14 @@ function Puck({
     histories,
     index: initialHistoryIndex
   });
-  const [reducer] = (0, import_react48.useState)(
+  const [reducer] = (0, import_react50.useState)(
     () => createReducer({
       config,
       record: historyStore.record,
       onAction
     })
   );
-  const [appState, dispatch] = (0, import_react48.useReducer)(
+  const [appState, dispatch] = (0, import_react50.useReducer)(
     reducer,
     flushZones(initialAppState)
   );
@@ -7410,14 +7548,14 @@ function Puck({
     historyStore,
     iframeEnabled: (_a = _iframe == null ? void 0 : _iframe.enabled) != null ? _a : true
   });
-  const [menuOpen, setMenuOpen] = (0, import_react48.useState)(false);
+  const [menuOpen, setMenuOpen] = (0, import_react50.useState)(false);
   const { itemSelector, leftSideBarVisible, rightSideBarVisible } = ui;
   const selectedItem = itemSelector ? getItem(itemSelector, data) : null;
-  (0, import_react48.useEffect)(() => {
+  (0, import_react50.useEffect)(() => {
     if (onChange) onChange(data);
   }, [data]);
   const rootProps = data.root.props || data.root;
-  const toggleSidebars = (0, import_react48.useCallback)(
+  const toggleSidebars = (0, import_react50.useCallback)(
     (sidebar) => {
       const widerViewport = window.matchMedia("(min-width: 638px)").matches;
       const sideBarVisible = sidebar === "left" ? leftSideBarVisible : rightSideBarVisible;
@@ -7431,7 +7569,7 @@ function Puck({
     },
     [dispatch, leftSideBarVisible, rightSideBarVisible]
   );
-  (0, import_react48.useEffect)(() => {
+  (0, import_react50.useEffect)(() => {
     if (!window.matchMedia("(min-width: 638px)").matches) {
       dispatch({
         type: "setUi",
@@ -7454,7 +7592,7 @@ function Puck({
       window.removeEventListener("resize", handleResize);
     };
   }, []);
-  const defaultHeaderRender = (0, import_react48.useMemo)(() => {
+  const defaultHeaderRender = (0, import_react50.useMemo)(() => {
     if (renderHeader) {
       console.warn(
         "`renderHeader` is deprecated. Please use `overrides.header` and the `usePuck` hook instead"
@@ -7468,7 +7606,7 @@ function Puck({
     }
     return DefaultOverride;
   }, [renderHeader]);
-  const defaultHeaderActionsRender = (0, import_react48.useMemo)(() => {
+  const defaultHeaderActionsRender = (0, import_react50.useMemo)(() => {
     if (renderHeaderActions) {
       console.warn(
         "`renderHeaderActions` is deprecated. Please use `overrides.headerActions` and the `usePuck` hook instead."
@@ -7485,20 +7623,20 @@ function Puck({
     overrides,
     plugins
   });
-  const CustomPuck = (0, import_react48.useMemo)(
+  const CustomPuck = (0, import_react50.useMemo)(
     () => loadedOverrides.puck || DefaultOverride,
     [loadedOverrides]
   );
-  const CustomHeader = (0, import_react48.useMemo)(
+  const CustomHeader = (0, import_react50.useMemo)(
     () => loadedOverrides.header || defaultHeaderRender,
     [loadedOverrides]
   );
-  const CustomHeaderActions = (0, import_react48.useMemo)(
+  const CustomHeaderActions = (0, import_react50.useMemo)(
     () => loadedOverrides.headerActions || defaultHeaderActionsRender,
     [loadedOverrides]
   );
-  const [mounted, setMounted] = (0, import_react48.useState)(false);
-  (0, import_react48.useEffect)(() => {
+  const [mounted, setMounted] = (0, import_react50.useState)(false);
+  (0, import_react50.useEffect)(() => {
     setMounted(true);
   }, []);
   const selectedComponentConfig = selectedItem && config.components[selectedItem.type];