@measured/puck 0.18.0-canary.cfe4ca8 → 0.18.0-canary.df3d1c2

package/dist/index.js

@@ -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,7 +1721,7 @@ 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") {
               const numberValue = Number(e.currentTarget.value);
@@ -5408,7 +5409,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();
@@ -5604,33 +5605,58 @@ init_react_import();
 var styles_module_default16 = { "PuckFields": "_PuckFields_10bh7_1", "PuckFields--isLoading": "_PuckFields--isLoading_10bh7_6", "PuckFields-loadingOverlay": "_PuckFields-loadingOverlay_10bh7_10", "PuckFields-loadingOverlayInner": "_PuckFields-loadingOverlayInner_10bh7_25", "PuckFields-field": "_PuckFields-field_10bh7_32", "PuckFields--wrapFields": "_PuckFields--wrapFields_10bh7_36" };
 
 // components/Puck/components/Fields/index.tsx
-var import_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();
@@ -5638,20 +5664,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;
@@ -5663,7 +5690,7 @@ var useResolvedFields = () => {
           {
             changed,
             fields,
-            lastFields: resolvedFields,
+            lastFields: lastFields.current,
             lastData,
             appState: state,
             parent
@@ -5674,7 +5701,7 @@ var useResolvedFields = () => {
         return yield config.root.resolveFields(componentData, {
           changed,
           fields,
-          lastFields: resolvedFields,
+          lastFields: lastFields.current,
           lastData,
           appState: state,
           parent
@@ -5683,39 +5710,55 @@ var useResolvedFields = () => {
       return defaultResolveFields(componentData, {
         changed,
         fields,
-        lastFields: resolvedFields,
+        lastFields: lastFields.current,
         lastData
       });
     }),
-    [data, config, componentData, selectedItem, resolvedFields, state, parent]
+    [data, config, componentData, selectedItem, state, parent]
   );
-  const [hasParent, setHasParent] = (0, import_react35.useState)(false);
-  (0, import_react35.useEffect)(() => {
-    setHasParent(!!parent);
-  }, [parent]);
-  (0, import_react35.useEffect)(() => {
+  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" || hasParent) {
+    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;
       }
     }
     setResolvedFields(defaultFields);
-  }, [
-    data,
-    defaultFields,
+  }, [defaultFields, state.ui.itemSelector, hasResolver, parent]);
+  useOnValueChange(
     state.ui.itemSelector,
-    selectedItem,
-    hasResolver,
-    hasParent
-  ]);
+    () => {
+      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];
 };
+
+// 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 {
@@ -5734,7 +5777,7 @@ var Fields = ({ wrapFields = true }) => {
   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",
     {
@@ -5855,7 +5898,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();
@@ -5922,8 +5965,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 = [];
@@ -5992,22 +6035,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");
@@ -6053,7 +6096,7 @@ var CopyHostStyles = ({
   onStylesLoaded = () => null
 }) => {
   const { document: doc, window: win } = useFrame();
-  (0, import_react38.useEffect)(() => {
+  (0, import_react40.useEffect)(() => {
     if (!win || !doc) {
       return () => {
       };
@@ -6212,8 +6255,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,
@@ -6230,10 +6273,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({
@@ -6327,7 +6370,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;
@@ -6366,7 +6409,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({
@@ -6375,9 +6418,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,
@@ -6474,7 +6517,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();
@@ -6520,7 +6563,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" }) }),
@@ -6627,13 +6670,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",
@@ -6642,7 +6685,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,
@@ -6756,19 +6799,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;
@@ -6928,11 +6971,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();
@@ -6955,8 +6998,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)(
@@ -6992,7 +7035,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 ? [] : [
@@ -7115,17 +7158,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);
@@ -7133,7 +7176,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(
@@ -7143,11 +7186,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), {
@@ -7155,13 +7198,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();
@@ -7171,8 +7214,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);
@@ -7250,7 +7293,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();
@@ -7289,7 +7332,7 @@ var useLoadedOverrides = ({
   overrides,
   plugins
 }) => {
-  return (0, import_react45.useMemo)(() => {
+  return (0, import_react47.useMemo)(() => {
     return loadOverrides({ overrides, plugins });
   }, [plugins, overrides]);
 };
@@ -7301,14 +7344,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;
@@ -7328,10 +7371,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) => ({
@@ -7383,7 +7426,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 = {};
@@ -7455,14 +7498,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)
   );
@@ -7473,14 +7516,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;
@@ -7494,7 +7537,7 @@ function Puck({
     },
     [dispatch, leftSideBarVisible, rightSideBarVisible]
   );
-  (0, import_react48.useEffect)(() => {
+  (0, import_react50.useEffect)(() => {
     if (!window.matchMedia("(min-width: 638px)").matches) {
       dispatch({
         type: "setUi",
@@ -7517,7 +7560,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"
@@ -7531,7 +7574,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."
@@ -7548,20 +7591,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];

package/dist/index.mjs

@@ -1504,12 +1504,13 @@ var DefaultField = ({
   field,
   onChange,
   readOnly,
-  value,
+  value: _value,
   name,
   label,
   Label: Label2,
   id
 }) => {
+  const value = _value;
   return /* @__PURE__ */ jsx9(
     Label2,
     {
@@ -1527,7 +1528,7 @@ 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") {
               const numberValue = Number(e.currentTarget.value);
@@ -2436,7 +2437,7 @@ import {
   useContext as useContext7,
   useEffect as useEffect15,
   useId,
-  useRef as useRef4,
+  useRef as useRef3,
   useState as useState17
 } from "react";
 import { AutoScroller, defaultPreset } from "@dnd-kit/dom";
@@ -2449,7 +2450,7 @@ import {
   useContext as useContext6,
   useEffect as useEffect14,
   useMemo as useMemo8,
-  useRef as useRef3
+  useRef as useRef2
 } from "react";
 
 // components/DraggableComponent/index.tsx
@@ -2459,7 +2460,7 @@ import {
   useContext as useContext5,
   useEffect as useEffect10,
   useMemo as useMemo7,
-  useRef as useRef2,
+  useRef,
   useState as useState13
 } from "react";
 
@@ -3047,7 +3048,7 @@ var DraggableComponent = ({
     }
   });
   const thisIsDragging = status === "dragging";
-  const ref = useRef2(null);
+  const ref = useRef(null);
   const refSetter = useCallback7(
     (el) => {
       sortableRef(el);
@@ -3577,7 +3578,7 @@ var DropZoneEdit = forwardRef3(
       }
       return data.content || [];
     }, [data, zoneCompound]);
-    const ref = useRef3(null);
+    const ref = useRef2(null);
     const acceptsTarget = useCallback10(
       (componentType) => {
         if (!componentType) {
@@ -4734,7 +4735,7 @@ function useDragListener(type, fn, deps = []) {
 }
 var AREA_CHANGE_DEBOUNCE_MS = 100;
 var useTempDisableFallback = (timeout3) => {
-  const lastFallbackDisable = useRef4(null);
+  const lastFallbackDisable = useRef3(null);
   return useCallback11((manager) => {
     collisionStore.setState({ fallbackEnabled: false });
     const fallbackId = generateId();
@@ -4754,7 +4755,7 @@ var DragDropContextClient = ({
   const { state, config, dispatch, resolveData } = useAppContext();
   const id = useId();
   const { data } = state;
-  const debouncedParamsRef = useRef4(null);
+  const debouncedParamsRef = useRef3(null);
   const tempDisableFallback = useTempDisableFallback(100);
   const [zoneStore] = useState17(
     () => createStore3(() => ({
@@ -4893,7 +4894,7 @@ var DragDropContextClient = ({
   ]);
   const [dragListeners, setDragListeners] = useState17({});
   const [pathData, setPathData] = useState17();
-  const dragMode = useRef4(null);
+  const dragMode = useRef3(null);
   const registerPath = useCallback11(
     (selector) => {
       const item = getItem(selector, data);
@@ -4916,7 +4917,7 @@ var DragDropContextClient = ({
     },
     [data, setPathData]
   );
-  const initialSelector = useRef4(void 0);
+  const initialSelector = useRef3(void 0);
   return /* @__PURE__ */ jsx23("div", { id, children: /* @__PURE__ */ jsx23(
     dragListenerContext.Provider,
     {
@@ -5261,9 +5262,9 @@ Drawer.Item = DrawerItem;
 // components/Puck/index.tsx
 init_react_import();
 import {
-  useCallback as useCallback17,
-  useEffect as useEffect23,
-  useMemo as useMemo18,
+  useCallback as useCallback18,
+  useEffect as useEffect24,
+  useMemo as useMemo19,
   useReducer,
   useState as useState26
 } from "react";
@@ -5462,33 +5463,58 @@ init_react_import();
 var styles_module_default16 = { "PuckFields": "_PuckFields_10bh7_1", "PuckFields--isLoading": "_PuckFields--isLoading_10bh7_6", "PuckFields-loadingOverlay": "_PuckFields-loadingOverlay_10bh7_10", "PuckFields-loadingOverlayInner": "_PuckFields-loadingOverlayInner_10bh7_25", "PuckFields-field": "_PuckFields-field_10bh7_32", "PuckFields--wrapFields": "_PuckFields--wrapFields_10bh7_36" };
 
 // components/Puck/components/Fields/index.tsx
-import { useCallback as useCallback12, useEffect as useEffect16, useMemo as useMemo11, useState as useState19 } from "react";
+import { useMemo as useMemo12 } from "react";
+
+// lib/use-resolved-fields.ts
+init_react_import();
+import { useCallback as useCallback13, useEffect as useEffect17, useMemo as useMemo11, useRef as useRef5, useState as useState19 } from "react";
 
 // lib/use-parent.ts
 init_react_import();
-import { useContext as useContext9 } from "react";
-var useParent = (itemSelector) => {
+import { useCallback as useCallback12, useContext as useContext9 } from "react";
+var getParent = (itemSelector, pathData, data) => {
   var _a;
-  const { selectedItem, state } = useAppContext();
-  const { pathData } = useContext9(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 } = useContext9(dropZoneContext) || {};
+  return useCallback12(
+    () => getParent(state.ui.itemSelector, pathData, state.data),
+    [state.ui.itemSelector, pathData, state.data]
+  );
+};
+var useParent = () => {
+  return useGetParent()();
+};
 
-// components/Puck/components/Fields/index.tsx
-import { Fragment as Fragment8, jsx as jsx27, jsxs as jsxs14 } from "react/jsx-runtime";
-var getClassName21 = get_class_name_factory_default("PuckFields", styles_module_default16);
+// lib/use-on-value-change.ts
+init_react_import();
+import { useRef as useRef4, useEffect as useEffect16 } from "react";
+function useOnValueChange(value, onChange, compare = Object.is, deps = []) {
+  const tracked = useRef4(value);
+  useEffect16(() => {
+    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__ */ jsx27(Fragment8, { children });
-};
 var useResolvedFields = () => {
   var _a, _b;
   const { selectedItem, state, config } = useAppContext();
@@ -5504,12 +5530,13 @@ var useResolvedFields = () => {
   const [lastSelectedData, setLastSelectedData] = useState19({});
   const [resolvedFields, setResolvedFields] = useState19(defaultFields);
   const [fieldsLoading, setFieldsLoading] = useState19(false);
+  const lastFields = useRef5(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 = useCallback12(
+  const resolveFields = useCallback13(
     (..._0) => __async(void 0, [..._0], function* (fields = {}) {
       var _a2;
       const lastData = ((_a2 = lastSelectedData.props) == null ? void 0 : _a2.id) === componentData.props.id ? lastSelectedData : null;
@@ -5521,7 +5548,7 @@ var useResolvedFields = () => {
           {
             changed,
             fields,
-            lastFields: resolvedFields,
+            lastFields: lastFields.current,
             lastData,
             appState: state,
             parent
@@ -5532,7 +5559,7 @@ var useResolvedFields = () => {
         return yield config.root.resolveFields(componentData, {
           changed,
           fields,
-          lastFields: resolvedFields,
+          lastFields: lastFields.current,
           lastData,
           appState: state,
           parent
@@ -5541,39 +5568,55 @@ var useResolvedFields = () => {
       return defaultResolveFields(componentData, {
         changed,
         fields,
-        lastFields: resolvedFields,
+        lastFields: lastFields.current,
         lastData
       });
     }),
-    [data, config, componentData, selectedItem, resolvedFields, state, parent]
+    [data, config, componentData, selectedItem, state, parent]
   );
-  const [hasParent, setHasParent] = useState19(false);
-  useEffect16(() => {
-    setHasParent(!!parent);
-  }, [parent]);
-  useEffect16(() => {
+  const triggerResolver = useCallback13(() => {
     var _a2, _b2;
-    if (!((_a2 = state.ui.itemSelector) == null ? void 0 : _a2.zone) || ((_b2 = state.ui.itemSelector) == null ? void 0 : _b2.zone) === "default-zone" || hasParent) {
+    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;
       }
     }
     setResolvedFields(defaultFields);
-  }, [
-    data,
-    defaultFields,
+  }, [defaultFields, state.ui.itemSelector, hasResolver, parent]);
+  useOnValueChange(
     state.ui.itemSelector,
-    selectedItem,
-    hasResolver,
-    hasParent
-  ]);
+    () => {
+      lastFields.current = defaultFields;
+    },
+    selectorIs
+  );
+  useOnValueChange(
+    { data, parent, itemSelector: state.ui.itemSelector },
+    () => {
+      triggerResolver();
+    },
+    (a, b) => JSON.stringify(a) === JSON.stringify(b)
+  );
+  useEffect17(() => {
+    triggerResolver();
+  }, []);
   return [resolvedFields, fieldsLoading];
 };
+
+// components/Puck/components/Fields/index.tsx
+import { Fragment as Fragment8, jsx as jsx27, jsxs as jsxs14 } from "react/jsx-runtime";
+var getClassName21 = get_class_name_factory_default("PuckFields", styles_module_default16);
+var DefaultFields = ({
+  children
+}) => {
+  return /* @__PURE__ */ jsx27(Fragment8, { children });
+};
 var Fields = ({ wrapFields = true }) => {
   var _a, _b;
   const {
@@ -5592,7 +5635,7 @@ var Fields = ({ wrapFields = true }) => {
   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 = useMemo11(() => overrides.fields || DefaultFields, [overrides]);
+  const Wrapper = useMemo12(() => overrides.fields || DefaultFields, [overrides]);
   return /* @__PURE__ */ jsxs14(
     "form",
     {
@@ -5713,7 +5756,7 @@ init_react_import();
 
 // lib/use-component-list.tsx
 init_react_import();
-import { useEffect as useEffect17, useState as useState20 } from "react";
+import { useEffect as useEffect18, useState as useState20 } from "react";
 
 // components/ComponentList/index.tsx
 init_react_import();
@@ -5781,7 +5824,7 @@ ComponentList.Item = ComponentListItem;
 import { jsx as jsx29 } from "react/jsx-runtime";
 var useComponentList = (config, ui) => {
   const [componentList, setComponentList] = useState20();
-  useEffect17(() => {
+  useEffect18(() => {
     var _a, _b, _c;
     if (Object.keys(ui.componentList).length > 0) {
       const matchedComponents = [];
@@ -5850,25 +5893,25 @@ var useComponentList = (config, ui) => {
 };
 
 // components/Puck/components/Components/index.tsx
-import { useMemo as useMemo12 } from "react";
+import { useMemo as useMemo13 } from "react";
 import { jsx as jsx30 } from "react/jsx-runtime";
 var Components = () => {
   const { config, state, overrides } = useAppContext();
   const componentList = useComponentList(config, state.ui);
-  const Wrapper = useMemo12(() => overrides.components || "div", [overrides]);
+  const Wrapper = useMemo13(() => overrides.components || "div", [overrides]);
   return /* @__PURE__ */ jsx30(Wrapper, { children: componentList ? componentList : /* @__PURE__ */ jsx30(ComponentList, { id: "all" }) });
 };
 
 // components/Puck/components/Preview/index.tsx
 init_react_import();
-import { useCallback as useCallback13, useEffect as useEffect19, useRef as useRef6, useMemo as useMemo13 } from "react";
+import { useCallback as useCallback14, useEffect as useEffect20, useRef as useRef7, useMemo as useMemo14 } from "react";
 
 // components/AutoFrame/index.tsx
 init_react_import();
 import {
   createContext as createContext5,
   useContext as useContext10,
-  useEffect as useEffect18,
+  useEffect as useEffect19,
   useState as useState21
 } from "react";
 import hash from "object-hash";
@@ -5916,7 +5959,7 @@ var CopyHostStyles = ({
   onStylesLoaded = () => null
 }) => {
   const { document: doc, window: win } = useFrame();
-  useEffect18(() => {
+  useEffect19(() => {
     if (!win || !doc) {
       return () => {
       };
@@ -6096,7 +6139,7 @@ function AutoFrame(_a) {
   const [loaded, setLoaded] = useState21(false);
   const [ctx, setCtx] = useState21({});
   const [mountTarget, setMountTarget] = useState21();
-  useEffect18(() => {
+  useEffect19(() => {
     var _a2;
     if (frameRef.current) {
       setCtx({
@@ -6190,7 +6233,7 @@ import { Fragment as Fragment10, jsx as jsx33 } from "react/jsx-runtime";
 var getClassName23 = get_class_name_factory_default("PuckPreview", styles_module_default18);
 var useBubbleIframeEvents = (ref) => {
   const { status } = useAppContext();
-  useEffect19(() => {
+  useEffect20(() => {
     var _a;
     if (ref.current && status === "READY") {
       const iframe = ref.current;
@@ -6229,7 +6272,7 @@ var useBubbleIframeEvents = (ref) => {
 };
 var Preview2 = ({ id = "puck-preview" }) => {
   const { config, dispatch, state, setStatus, iframe, overrides } = useAppContext();
-  const Page = useCallback13(
+  const Page = useCallback14(
     (pageProps) => {
       var _a, _b;
       return ((_a = config.root) == null ? void 0 : _a.render) ? (_b = config.root) == null ? void 0 : _b.render(__spreadValues({
@@ -6238,9 +6281,9 @@ var Preview2 = ({ id = "puck-preview" }) => {
     },
     [config.root]
   );
-  const Frame = useMemo13(() => overrides.iframe, [overrides]);
+  const Frame = useMemo14(() => overrides.iframe, [overrides]);
   const rootProps = state.data.root.props || state.data.root;
-  const ref = useRef6(null);
+  const ref = useRef7(null);
   useBubbleIframeEvents(ref);
   const inner = state.ui.previewMode === "edit" ? /* @__PURE__ */ jsx33(
     Page,
@@ -6490,13 +6533,13 @@ var LayerTree = ({
 };
 
 // components/Puck/components/Outline/index.tsx
-import { useCallback as useCallback14, useMemo as useMemo14 } from "react";
+import { useCallback as useCallback15, useMemo as useMemo15 } from "react";
 import { Fragment as Fragment12, jsx as jsx35, jsxs as jsxs17 } from "react/jsx-runtime";
 var Outline = () => {
   const { dispatch, state, overrides, config } = useAppContext();
   const { data, ui } = state;
   const { itemSelector } = ui;
-  const setItemSelector = useCallback14(
+  const setItemSelector = useCallback15(
     (newItemSelector) => {
       dispatch({
         type: "setUi",
@@ -6505,7 +6548,7 @@ var Outline = () => {
     },
     []
   );
-  const Wrapper = useMemo14(() => overrides.outline || "div", [overrides]);
+  const Wrapper = useMemo15(() => overrides.outline || "div", [overrides]);
   return /* @__PURE__ */ jsx35(Wrapper, { children: /* @__PURE__ */ jsx35(dropZoneContext.Consumer, { children: (ctx) => /* @__PURE__ */ jsxs17(Fragment12, { children: [
     (ctx == null ? void 0 : ctx.activeZones) && (ctx == null ? void 0 : ctx.activeZones[rootDroppableId]) && /* @__PURE__ */ jsx35(
       LayerTree,
@@ -6792,16 +6835,16 @@ var getBox = function getBox2(el) {
 
 // components/Puck/components/Canvas/index.tsx
 import {
-  useCallback as useCallback15,
-  useEffect as useEffect21,
-  useMemo as useMemo16,
-  useRef as useRef7,
+  useCallback as useCallback16,
+  useEffect as useEffect22,
+  useMemo as useMemo17,
+  useRef as useRef8,
   useState as useState24
 } from "react";
 
 // components/ViewportControls/index.tsx
 init_react_import();
-import { useEffect as useEffect20, useMemo as useMemo15, useState as useState23 } from "react";
+import { useEffect as useEffect21, useMemo as useMemo16, useState as useState23 } from "react";
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/ViewportControls/styles.module.css#css-module
 init_react_import();
@@ -6825,7 +6868,7 @@ var ViewportButton = ({
 }) => {
   const { state } = useAppContext();
   const [isActive, setIsActive] = useState23(false);
-  useEffect20(() => {
+  useEffect21(() => {
     setIsActive(width === state.ui.viewports.current.width);
   }, [width, state.ui.viewports.current.width]);
   return /* @__PURE__ */ jsx36("span", { className: getClassNameButton({ isActive }), children: /* @__PURE__ */ jsx36(
@@ -6861,7 +6904,7 @@ var ViewportControls = ({
   const defaultsContainAutoZoom = defaultZoomOptions.find(
     (option) => option.value === autoZoom
   );
-  const zoomOptions = useMemo15(
+  const zoomOptions = useMemo16(
     () => [
       ...defaultZoomOptions,
       ...defaultsContainAutoZoom ? [] : [
@@ -6984,17 +7027,17 @@ var Canvas = () => {
   const { status, iframe } = useAppContext();
   const { dispatch, state, overrides, setUi, zoomConfig, setZoomConfig } = useAppContext();
   const { ui } = state;
-  const frameRef = useRef7(null);
+  const frameRef = useRef8(null);
   const [showTransition, setShowTransition] = useState24(false);
-  const defaultRender = useMemo16(() => {
+  const defaultRender = useMemo17(() => {
     const PuckDefault = ({ children }) => /* @__PURE__ */ jsx37(Fragment13, { children });
     return PuckDefault;
   }, []);
-  const CustomPreview = useMemo16(
+  const CustomPreview = useMemo17(
     () => overrides.preview || defaultRender,
     [overrides]
   );
-  const getFrameDimensions = useCallback15(() => {
+  const getFrameDimensions = useCallback16(() => {
     if (frameRef.current) {
       const frame = frameRef.current;
       const box = getBox(frame);
@@ -7002,7 +7045,7 @@ var Canvas = () => {
     }
     return { width: 0, height: 0 };
   }, [frameRef]);
-  const resetAutoZoom = useCallback15(
+  const resetAutoZoom = useCallback16(
     (ui2 = state.ui) => {
       if (frameRef.current) {
         setZoomConfig(
@@ -7012,11 +7055,11 @@ var Canvas = () => {
     },
     [frameRef, zoomConfig, state.ui]
   );
-  useEffect21(() => {
+  useEffect22(() => {
     setShowTransition(false);
     resetAutoZoom();
   }, [frameRef, ui.leftSideBarVisible, ui.rightSideBarVisible]);
-  useEffect21(() => {
+  useEffect22(() => {
     const { height: frameHeight } = getFrameDimensions();
     if (ui.viewports.current.height === "auto") {
       setZoomConfig(__spreadProps(__spreadValues({}, zoomConfig), {
@@ -7024,13 +7067,13 @@ var Canvas = () => {
       }));
     }
   }, [zoomConfig.zoom]);
-  useEffect21(() => {
+  useEffect22(() => {
     if (ZOOM_ON_CHANGE) {
       setShowTransition(true);
       resetAutoZoom(ui);
     }
   }, [ui.viewports.current.width]);
-  useEffect21(() => {
+  useEffect22(() => {
     const cb = () => {
       setShowTransition(false);
       resetAutoZoom();
@@ -7041,7 +7084,7 @@ var Canvas = () => {
     };
   }, []);
   const [showLoader, setShowLoader] = useState24(false);
-  useEffect21(() => {
+  useEffect22(() => {
     setTimeout(() => {
       setShowLoader(true);
     }, 500);
@@ -7119,7 +7162,7 @@ var Canvas = () => {
 
 // lib/use-loaded-overrides.ts
 init_react_import();
-import { useMemo as useMemo17 } from "react";
+import { useMemo as useMemo18 } from "react";
 
 // lib/load-overrides.ts
 init_react_import();
@@ -7158,7 +7201,7 @@ var useLoadedOverrides = ({
   overrides,
   plugins
 }) => {
-  return useMemo17(() => {
+  return useMemo18(() => {
     return loadOverrides({ overrides, plugins });
   }, [plugins, overrides]);
 };
@@ -7170,14 +7213,14 @@ var DefaultOverride = ({ children }) => /* @__PURE__ */ jsx38(Fragment14, { chil
 
 // lib/use-inject-css.ts
 init_react_import();
-import { useEffect as useEffect22, useState as useState25 } from "react";
+import { useEffect as useEffect23, useState as useState25 } from "react";
 var styles = ``;
 var useInjectStyleSheet = (initialStyles, iframeEnabled) => {
   const [el, setEl] = useState25();
-  useEffect22(() => {
+  useEffect23(() => {
     setEl(document.createElement("style"));
   }, []);
-  useEffect22(() => {
+  useEffect23(() => {
     var _a;
     if (!el || typeof window === "undefined") {
       return;
@@ -7197,10 +7240,10 @@ var useInjectGlobalCss = (iframeEnabled) => {
 
 // lib/use-preview-mode-hotkeys.ts
 init_react_import();
-import { useCallback as useCallback16 } from "react";
+import { useCallback as useCallback17 } from "react";
 import { useHotkeys as useHotkeys2 } from "react-hotkeys-hook";
 var usePreviewModeHotkeys = (dispatch, iframeEnabled) => {
-  const toggleInteractive = useCallback16(() => {
+  const toggleInteractive = useCallback17(() => {
     dispatch({
       type: "setUi",
       ui: (ui) => ({
@@ -7345,11 +7388,11 @@ function Puck({
   const [menuOpen, setMenuOpen] = useState26(false);
   const { itemSelector, leftSideBarVisible, rightSideBarVisible } = ui;
   const selectedItem = itemSelector ? getItem(itemSelector, data) : null;
-  useEffect23(() => {
+  useEffect24(() => {
     if (onChange) onChange(data);
   }, [data]);
   const rootProps = data.root.props || data.root;
-  const toggleSidebars = useCallback17(
+  const toggleSidebars = useCallback18(
     (sidebar) => {
       const widerViewport = window.matchMedia("(min-width: 638px)").matches;
       const sideBarVisible = sidebar === "left" ? leftSideBarVisible : rightSideBarVisible;
@@ -7363,7 +7406,7 @@ function Puck({
     },
     [dispatch, leftSideBarVisible, rightSideBarVisible]
   );
-  useEffect23(() => {
+  useEffect24(() => {
     if (!window.matchMedia("(min-width: 638px)").matches) {
       dispatch({
         type: "setUi",
@@ -7386,7 +7429,7 @@ function Puck({
       window.removeEventListener("resize", handleResize);
     };
   }, []);
-  const defaultHeaderRender = useMemo18(() => {
+  const defaultHeaderRender = useMemo19(() => {
     if (renderHeader) {
       console.warn(
         "`renderHeader` is deprecated. Please use `overrides.header` and the `usePuck` hook instead"
@@ -7400,7 +7443,7 @@ function Puck({
     }
     return DefaultOverride;
   }, [renderHeader]);
-  const defaultHeaderActionsRender = useMemo18(() => {
+  const defaultHeaderActionsRender = useMemo19(() => {
     if (renderHeaderActions) {
       console.warn(
         "`renderHeaderActions` is deprecated. Please use `overrides.headerActions` and the `usePuck` hook instead."
@@ -7417,20 +7460,20 @@ function Puck({
     overrides,
     plugins
   });
-  const CustomPuck = useMemo18(
+  const CustomPuck = useMemo19(
     () => loadedOverrides.puck || DefaultOverride,
     [loadedOverrides]
   );
-  const CustomHeader = useMemo18(
+  const CustomHeader = useMemo19(
     () => loadedOverrides.header || defaultHeaderRender,
     [loadedOverrides]
   );
-  const CustomHeaderActions = useMemo18(
+  const CustomHeaderActions = useMemo19(
     () => loadedOverrides.headerActions || defaultHeaderActionsRender,
     [loadedOverrides]
   );
   const [mounted, setMounted] = useState26(false);
-  useEffect23(() => {
+  useEffect24(() => {
     setMounted(true);
   }, []);
   const selectedComponentConfig = selectedItem && config.components[selectedItem.type];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@measured/puck",
-  "version": "0.18.0-canary.cfe4ca8",
+  "version": "0.18.0-canary.df3d1c2",
   "author": "Measured Corporation Ltd <hello@measured.co>",
   "repository": "measuredco/puck",
   "bugs": "https://github.com/measuredco/puck/issues",