@measured/puck 0.21.0-canary.bd7b613d → 0.21.0-canary.c0db75c1

package/dist/{chunk-DBHXESEC.mjs → chunk-E4BOPJJV.mjs}

@@ -1,30 +1,41 @@
+import {
+  createReducer,
+  generateId,
+  getItem,
+  insert,
+  insertAction,
+  makeStatePublic,
+  populateIds
+} from "./chunk-J32NOAUF.mjs";
 import {
   SlotRender,
   SlotRenderPure,
+  defaultAppState,
+  defaultViewports,
+  getChanged,
+  getSlotTransform,
+  resolveComponentData,
+  toComponent,
+  useFieldTransforms,
+  useSlots
+} from "./chunk-PJYARUPI.mjs";
+import {
   __async,
   __commonJS,
   __objRest,
   __spreadProps,
   __spreadValues,
   __toESM,
-  defaultAppState,
   defaultSlots,
-  defaultViewports,
   expandNode,
-  getChanged,
-  getSlotTransform,
   init_react_import,
-  resolveComponentData,
   rootAreaId,
   rootDroppableId,
   rootZone,
   setupZone,
-  useFieldTransforms,
-  useSlots,
   walkAppState,
-  walkField,
-  walkTree
-} from "./chunk-FPQ7BWRD.mjs";
+  walkField
+} from "./chunk-S3RM5GHZ.mjs";
 
 // ../../node_modules/classnames/index.js
 var require_classnames = __commonJS({
@@ -252,513 +263,6 @@ init_react_import();
 
 // store/index.ts
 init_react_import();
-
-// reducer/index.ts
-init_react_import();
-
-// reducer/actions/set.ts
-init_react_import();
-var setAction = (state, action, appStore) => {
-  if (typeof action.state === "object") {
-    const newState = __spreadValues(__spreadValues({}, state), action.state);
-    if (action.state.indexes) {
-      return newState;
-    }
-    console.warn(
-      "`set` is expensive and may cause unnecessary re-renders. Consider using a more atomic action instead."
-    );
-    return walkAppState(newState, appStore.config);
-  }
-  return __spreadValues(__spreadValues({}, state), action.state(state));
-};
-
-// reducer/actions/insert.ts
-init_react_import();
-
-// lib/data/insert.ts
-init_react_import();
-var insert = (list, index, item) => {
-  const result = Array.from(list || []);
-  result.splice(index, 0, item);
-  return result;
-};
-
-// lib/generate-id.ts
-init_react_import();
-import { v4 as uuidv4 } from "uuid";
-var generateId = (type) => type ? `${type}-${uuidv4()}` : uuidv4();
-
-// lib/data/get-ids-for-parent.ts
-init_react_import();
-var getIdsForParent = (zoneCompound, state) => {
-  const [parentId] = zoneCompound.split(":");
-  const node = state.indexes.nodes[parentId];
-  return ((node == null ? void 0 : node.path) || []).map((p) => p.split(":")[0]);
-};
-
-// lib/data/populate-ids.ts
-init_react_import();
-var populateIds = (data, config, override = false) => {
-  const id = generateId(data.type);
-  return walkTree(
-    __spreadProps(__spreadValues({}, data), {
-      props: override ? __spreadProps(__spreadValues({}, data.props), { id }) : __spreadValues({}, data.props)
-    }),
-    config,
-    (contents) => contents.map((item) => {
-      const id2 = generateId(item.type);
-      return __spreadProps(__spreadValues({}, item), {
-        props: override ? __spreadProps(__spreadValues({}, item.props), { id: id2 }) : __spreadValues({ id: id2 }, item.props)
-      });
-    })
-  );
-};
-
-// reducer/actions/insert.ts
-function insertAction(state, action, appStore) {
-  const id = action.id || generateId(action.componentType);
-  const emptyComponentData = populateIds(
-    {
-      type: action.componentType,
-      props: __spreadProps(__spreadValues({}, appStore.config.components[action.componentType].defaultProps || {}), {
-        id
-      })
-    },
-    appStore.config
-  );
-  const [parentId] = action.destinationZone.split(":");
-  const idsInPath = getIdsForParent(action.destinationZone, state);
-  return walkAppState(
-    state,
-    appStore.config,
-    (content, zoneCompound) => {
-      if (zoneCompound === action.destinationZone) {
-        return insert(
-          content || [],
-          action.destinationIndex,
-          emptyComponentData
-        );
-      }
-      return content;
-    },
-    (childItem, path) => {
-      if (childItem.props.id === id || childItem.props.id === parentId) {
-        return childItem;
-      } else if (idsInPath.includes(childItem.props.id)) {
-        return childItem;
-      } else if (path.includes(action.destinationZone)) {
-        return childItem;
-      }
-      return null;
-    }
-  );
-}
-
-// reducer/actions/replace.ts
-init_react_import();
-var replaceAction = (state, action, appStore) => {
-  const [parentId] = action.destinationZone.split(":");
-  const idsInPath = getIdsForParent(action.destinationZone, state);
-  const originalId = state.indexes.zones[action.destinationZone].contentIds[action.destinationIndex];
-  const idChanged = originalId !== action.data.props.id;
-  if (idChanged) {
-    throw new Error(
-      `Can't change the id during a replace action. Please us "remove" and "insert" to define a new node.`
-    );
-  }
-  const newSlotIds = [];
-  const data = walkTree(action.data, appStore.config, (contents, opts) => {
-    newSlotIds.push(`${opts.parentId}:${opts.propName}`);
-    return contents.map((item) => {
-      const id = generateId(item.type);
-      return __spreadProps(__spreadValues({}, item), {
-        props: __spreadValues({ id }, item.props)
-      });
-    });
-  });
-  const stateWithDeepSlotsRemoved = __spreadValues({}, state);
-  Object.keys(state.indexes.zones).forEach((zoneCompound) => {
-    const id = zoneCompound.split(":")[0];
-    if (id === originalId) {
-      if (!newSlotIds.includes(zoneCompound)) {
-        delete stateWithDeepSlotsRemoved.indexes.zones[zoneCompound];
-      }
-    }
-  });
-  return walkAppState(
-    stateWithDeepSlotsRemoved,
-    appStore.config,
-    (content, zoneCompound) => {
-      const newContent = [...content];
-      if (zoneCompound === action.destinationZone) {
-        newContent[action.destinationIndex] = data;
-      }
-      return newContent;
-    },
-    (childItem, path) => {
-      const pathIds = path.map((p) => p.split(":")[0]);
-      if (childItem.props.id === data.props.id) {
-        return data;
-      } else if (childItem.props.id === parentId) {
-        return childItem;
-      } else if (idsInPath.indexOf(childItem.props.id) > -1) {
-        return childItem;
-      } else if (pathIds.indexOf(data.props.id) > -1) {
-        return childItem;
-      }
-      return null;
-    }
-  );
-};
-
-// reducer/actions/replace-root.ts
-init_react_import();
-var replaceRootAction = (state, action, appStore) => {
-  return walkAppState(
-    state,
-    appStore.config,
-    (content) => content,
-    (childItem) => {
-      if (childItem.props.id === "root") {
-        return __spreadProps(__spreadValues({}, childItem), {
-          props: __spreadValues(__spreadValues({}, childItem.props), action.root.props),
-          readOnly: action.root.readOnly
-        });
-      }
-      return childItem;
-    }
-  );
-};
-
-// reducer/actions/duplicate.ts
-init_react_import();
-
-// lib/data/get-item.ts
-init_react_import();
-function getItem(selector, state) {
-  var _a, _b;
-  const zone = (_a = state.indexes.zones) == null ? void 0 : _a[selector.zone || rootDroppableId];
-  return zone ? (_b = state.indexes.nodes[zone.contentIds[selector.index]]) == null ? void 0 : _b.data : void 0;
-}
-
-// reducer/actions/duplicate.ts
-function duplicateAction(state, action, appStore) {
-  const item = getItem(
-    { index: action.sourceIndex, zone: action.sourceZone },
-    state
-  );
-  const idsInPath = getIdsForParent(action.sourceZone, state);
-  const newItem = __spreadProps(__spreadValues({}, item), {
-    props: __spreadProps(__spreadValues({}, item.props), {
-      id: generateId(item.type)
-    })
-  });
-  const modified = walkAppState(
-    state,
-    appStore.config,
-    (content, zoneCompound) => {
-      if (zoneCompound === action.sourceZone) {
-        return insert(content, action.sourceIndex + 1, item);
-      }
-      return content;
-    },
-    (childItem, path, index) => {
-      const zoneCompound = path[path.length - 1];
-      const parents = path.map((p) => p.split(":")[0]);
-      if (parents.indexOf(newItem.props.id) > -1) {
-        return __spreadProps(__spreadValues({}, childItem), {
-          props: __spreadProps(__spreadValues({}, childItem.props), {
-            id: generateId(childItem.type)
-          })
-        });
-      }
-      if (zoneCompound === action.sourceZone && index === action.sourceIndex + 1) {
-        return newItem;
-      }
-      const [sourceZoneParent] = action.sourceZone.split(":");
-      if (sourceZoneParent === childItem.props.id || idsInPath.indexOf(childItem.props.id) > -1) {
-        return childItem;
-      }
-      return null;
-    }
-  );
-  return __spreadProps(__spreadValues({}, modified), {
-    ui: __spreadProps(__spreadValues({}, modified.ui), {
-      itemSelector: {
-        index: action.sourceIndex + 1,
-        zone: action.sourceZone
-      }
-    })
-  });
-}
-
-// reducer/actions/reorder.ts
-init_react_import();
-
-// reducer/actions/move.ts
-init_react_import();
-
-// lib/data/remove.ts
-init_react_import();
-var remove = (list, index) => {
-  const result = Array.from(list);
-  result.splice(index, 1);
-  return result;
-};
-
-// reducer/actions/move.ts
-var moveAction = (state, action, appStore) => {
-  if (action.sourceZone === action.destinationZone && action.sourceIndex === action.destinationIndex) {
-    return state;
-  }
-  const item = getItem(
-    { zone: action.sourceZone, index: action.sourceIndex },
-    state
-  );
-  if (!item) return state;
-  const idsInSourcePath = getIdsForParent(action.sourceZone, state);
-  const idsInDestinationPath = getIdsForParent(action.destinationZone, state);
-  return walkAppState(
-    state,
-    appStore.config,
-    (content, zoneCompound) => {
-      if (zoneCompound === action.sourceZone && zoneCompound === action.destinationZone) {
-        return insert(
-          remove(content, action.sourceIndex),
-          action.destinationIndex,
-          item
-        );
-      } else if (zoneCompound === action.sourceZone) {
-        return remove(content, action.sourceIndex);
-      } else if (zoneCompound === action.destinationZone) {
-        return insert(content, action.destinationIndex, item);
-      }
-      return content;
-    },
-    (childItem, path) => {
-      const [sourceZoneParent] = action.sourceZone.split(":");
-      const [destinationZoneParent] = action.destinationZone.split(":");
-      const childId = childItem.props.id;
-      if (sourceZoneParent === childId || destinationZoneParent === childId || item.props.id === childId || idsInSourcePath.indexOf(childId) > -1 || idsInDestinationPath.indexOf(childId) > -1 || path.includes(action.destinationZone)) {
-        return childItem;
-      }
-      return null;
-    }
-  );
-};
-
-// reducer/actions/reorder.ts
-var reorderAction = (state, action, appStore) => {
-  return moveAction(
-    state,
-    {
-      type: "move",
-      sourceIndex: action.sourceIndex,
-      sourceZone: action.destinationZone,
-      destinationIndex: action.destinationIndex,
-      destinationZone: action.destinationZone
-    },
-    appStore
-  );
-};
-
-// reducer/actions/remove.ts
-init_react_import();
-var removeAction = (state, action, appStore) => {
-  const item = getItem({ index: action.index, zone: action.zone }, state);
-  const nodesToDelete = Object.entries(state.indexes.nodes).reduce(
-    (acc, [nodeId, nodeData]) => {
-      const pathIds = nodeData.path.map((p) => p.split(":")[0]);
-      if (pathIds.includes(item.props.id)) {
-        return [...acc, nodeId];
-      }
-      return acc;
-    },
-    [item.props.id]
-  );
-  const newState = walkAppState(
-    state,
-    appStore.config,
-    (content, zoneCompound) => {
-      if (zoneCompound === action.zone) {
-        return remove(content, action.index);
-      }
-      return content;
-    }
-  );
-  Object.keys(newState.data.zones || {}).forEach((zoneCompound) => {
-    const parentId = zoneCompound.split(":")[0];
-    if (nodesToDelete.includes(parentId) && newState.data.zones) {
-      delete newState.data.zones[zoneCompound];
-    }
-  });
-  Object.keys(newState.indexes.zones).forEach((zoneCompound) => {
-    const parentId = zoneCompound.split(":")[0];
-    if (nodesToDelete.includes(parentId)) {
-      delete newState.indexes.zones[zoneCompound];
-    }
-  });
-  nodesToDelete.forEach((id) => {
-    delete newState.indexes.nodes[id];
-  });
-  return newState;
-};
-
-// reducer/actions/register-zone.ts
-init_react_import();
-var zoneCache = {};
-function registerZoneAction(state, action) {
-  if (zoneCache[action.zone]) {
-    return __spreadProps(__spreadValues({}, state), {
-      data: __spreadProps(__spreadValues({}, state.data), {
-        zones: __spreadProps(__spreadValues({}, state.data.zones), {
-          [action.zone]: zoneCache[action.zone]
-        })
-      }),
-      indexes: __spreadProps(__spreadValues({}, state.indexes), {
-        zones: __spreadProps(__spreadValues({}, state.indexes.zones), {
-          [action.zone]: __spreadProps(__spreadValues({}, state.indexes.zones[action.zone]), {
-            contentIds: zoneCache[action.zone].map((item) => item.props.id),
-            type: "dropzone"
-          })
-        })
-      })
-    });
-  }
-  return __spreadProps(__spreadValues({}, state), { data: setupZone(state.data, action.zone) });
-}
-function unregisterZoneAction(state, action) {
-  const _zones = __spreadValues({}, state.data.zones || {});
-  const zoneIndex = __spreadValues({}, state.indexes.zones || {});
-  if (_zones[action.zone]) {
-    zoneCache[action.zone] = _zones[action.zone];
-    delete _zones[action.zone];
-  }
-  delete zoneIndex[action.zone];
-  return __spreadProps(__spreadValues({}, state), {
-    data: __spreadProps(__spreadValues({}, state.data), {
-      zones: _zones
-    }),
-    indexes: __spreadProps(__spreadValues({}, state.indexes), {
-      zones: zoneIndex
-    })
-  });
-}
-
-// reducer/actions/set-data.ts
-init_react_import();
-var setDataAction = (state, action, appStore) => {
-  if (typeof action.data === "object") {
-    console.warn(
-      "`setData` is expensive and may cause unnecessary re-renders. Consider using a more atomic action instead."
-    );
-    return walkAppState(
-      __spreadProps(__spreadValues({}, state), {
-        data: __spreadValues(__spreadValues({}, state.data), action.data)
-      }),
-      appStore.config
-    );
-  }
-  return walkAppState(
-    __spreadProps(__spreadValues({}, state), {
-      data: __spreadValues(__spreadValues({}, state.data), action.data(state.data))
-    }),
-    appStore.config
-  );
-};
-
-// reducer/actions/set-ui.ts
-init_react_import();
-var setUiAction = (state, action) => {
-  if (typeof action.ui === "object") {
-    return __spreadProps(__spreadValues({}, state), {
-      ui: __spreadValues(__spreadValues({}, state.ui), action.ui)
-    });
-  }
-  return __spreadProps(__spreadValues({}, state), {
-    ui: __spreadValues(__spreadValues({}, state.ui), action.ui(state.ui))
-  });
-};
-
-// lib/data/make-state-public.ts
-init_react_import();
-var makeStatePublic = (state) => {
-  const { data, ui } = state;
-  return { data, ui };
-};
-
-// reducer/actions.tsx
-init_react_import();
-
-// reducer/index.ts
-function storeInterceptor(reducer, record, onAction) {
-  return (state, action) => {
-    const newAppState = reducer(state, action);
-    const isValidType = ![
-      "registerZone",
-      "unregisterZone",
-      "setData",
-      "setUi",
-      "set"
-    ].includes(action.type);
-    if (typeof action.recordHistory !== "undefined" ? action.recordHistory : isValidType) {
-      if (record) record(newAppState);
-    }
-    onAction == null ? void 0 : onAction(action, makeStatePublic(newAppState), makeStatePublic(state));
-    return newAppState;
-  };
-}
-function createReducer({
-  record,
-  onAction,
-  appStore
-}) {
-  return storeInterceptor(
-    (state, action) => {
-      if (action.type === "set") {
-        return setAction(state, action, appStore);
-      }
-      if (action.type === "insert") {
-        return insertAction(state, action, appStore);
-      }
-      if (action.type === "replace") {
-        return replaceAction(state, action, appStore);
-      }
-      if (action.type === "replaceRoot") {
-        return replaceRootAction(state, action, appStore);
-      }
-      if (action.type === "duplicate") {
-        return duplicateAction(state, action, appStore);
-      }
-      if (action.type === "reorder") {
-        return reorderAction(state, action, appStore);
-      }
-      if (action.type === "move") {
-        return moveAction(state, action, appStore);
-      }
-      if (action.type === "remove") {
-        return removeAction(state, action, appStore);
-      }
-      if (action.type === "registerZone") {
-        return registerZoneAction(state, action);
-      }
-      if (action.type === "unregisterZone") {
-        return unregisterZoneAction(state, action);
-      }
-      if (action.type === "setData") {
-        return setDataAction(state, action, appStore);
-      }
-      if (action.type === "setUi") {
-        return setUiAction(state, action);
-      }
-      return state;
-    },
-    record,
-    onAction
-  );
-}
-
-// store/index.ts
 import { create as create2, useStore } from "zustand";
 import { subscribeWithSelector as subscribeWithSelector2 } from "zustand/middleware";
 import { createContext, useContext } from "react";
@@ -856,6 +360,10 @@ var monitorHotkeys = (doc) => {
       useHotkeyStore.getState().reset();
     }
   };
+  const onBlur = () => {
+    useHotkeyStore.getState().reset();
+  };
+  window.addEventListener("blur", onBlur);
   doc.addEventListener("keydown", onKeyDown);
   doc.addEventListener("keyup", onKeyUp);
   doc.addEventListener("visibilitychange", onVisibilityChanged);
@@ -863,6 +371,7 @@ var monitorHotkeys = (doc) => {
     doc.removeEventListener("keydown", onKeyDown);
     doc.removeEventListener("keyup", onKeyUp);
     doc.removeEventListener("visibilitychange", onVisibilityChanged);
+    window.removeEventListener("blur", onBlur);
   };
 };
 var useMonitorHotkeys = () => {
@@ -1065,29 +574,37 @@ var flattenData = (state, config) => {
 
 // store/slices/permissions.ts
 var createPermissionsSlice = (set, get) => {
-  const resolvePermissions = (..._0) => __async(void 0, [..._0], function* (params = {}, force) {
+  const resolvePermissions = (..._0) => __async(null, [..._0], function* (params = {}, force) {
     const { state, permissions, config } = get();
     const { cache, globalPermissions } = permissions;
-    const resolveDataForItem = (item2, force2 = false) => __async(void 0, null, function* () {
-      var _a, _b, _c;
+    const resolvePermissionsForItem = (item2, force2 = false) => __async(null, null, function* () {
+      var _a, _b;
       const { config: config2, state: appState, setComponentLoading } = get();
+      const itemCache = cache[item2.props.id];
+      const nodes = appState.indexes.nodes;
+      const parentId = (_a = nodes[item2.props.id]) == null ? void 0 : _a.parentId;
+      const parentNode = parentId ? nodes[parentId] : null;
+      const parentData = (_b = parentNode == null ? void 0 : parentNode.data) != null ? _b : null;
       const componentConfig = item2.type === "root" ? config2.root : config2.components[item2.type];
       if (!componentConfig) {
         return;
       }
       const initialPermissions = __spreadValues(__spreadValues({}, globalPermissions), componentConfig.permissions);
       if (componentConfig.resolvePermissions) {
-        const changed = getChanged(item2, (_a = cache[item2.props.id]) == null ? void 0 : _a.lastData);
-        if (Object.values(changed).some((el) => el === true) || force2) {
+        const changed = getChanged(item2, itemCache == null ? void 0 : itemCache.lastData);
+        const propsChanged = Object.values(changed).some((el) => el === true);
+        const parentChanged = (itemCache == null ? void 0 : itemCache.lastParentId) !== parentId;
+        if (propsChanged || parentChanged || force2) {
           const clearTimeout2 = setComponentLoading(item2.props.id, true, 50);
           const resolvedPermissions = yield componentConfig.resolvePermissions(
             item2,
             {
               changed,
-              lastPermissions: ((_b = cache[item2.props.id]) == null ? void 0 : _b.lastPermissions) || null,
+              lastPermissions: (itemCache == null ? void 0 : itemCache.lastPermissions) || null,
               permissions: initialPermissions,
               appState: makeStatePublic(appState),
-              lastData: ((_c = cache[item2.props.id]) == null ? void 0 : _c.lastData) || null
+              lastData: (itemCache == null ? void 0 : itemCache.lastData) || null,
+              parent: parentData
             }
           );
           const latest = get().permissions;
@@ -1095,6 +612,7 @@ var createPermissionsSlice = (set, get) => {
             permissions: __spreadProps(__spreadValues({}, latest), {
               cache: __spreadProps(__spreadValues({}, latest.cache), {
                 [item2.props.id]: {
+                  lastParentId: parentId,
                   lastData: item2,
                   lastPermissions: resolvedPermissions
                 }
@@ -1108,9 +626,9 @@ var createPermissionsSlice = (set, get) => {
         }
       }
     });
-    const resolveDataForRoot = (force2 = false) => {
+    const resolvePermissionsForRoot = (force2 = false) => {
       const { state: appState } = get();
-      resolveDataForItem(
+      resolvePermissionsForItem(
         // Shim the root data in by conforming to component data shape
         {
           type: "root",
@@ -1121,16 +639,16 @@ var createPermissionsSlice = (set, get) => {
     };
     const { item, type, root } = params;
     if (item) {
-      yield resolveDataForItem(item, force);
+      yield resolvePermissionsForItem(item, force);
     } else if (type) {
-      flattenData(state, config).filter((item2) => item2.type === type).map((item2) => __async(void 0, null, function* () {
-        yield resolveDataForItem(item2, force);
+      flattenData(state, config).filter((item2) => item2.type === type).map((item2) => __async(null, null, function* () {
+        yield resolvePermissionsForItem(item2, force);
       }));
     } else if (root) {
-      resolveDataForRoot(force);
+      resolvePermissionsForRoot(force);
     } else {
-      flattenData(state, config).map((item2) => __async(void 0, null, function* () {
-        yield resolveDataForItem(item2, force);
+      flattenData(state, config).map((item2) => __async(null, null, function* () {
+        yield resolvePermissionsForItem(item2, force);
       }));
     }
   });
@@ -1210,7 +728,7 @@ var createFieldsSlice = (_set, _get) => {
 };
 var useRegisterFieldsSlice = (appStore, id) => {
   const resolveFields = useCallback(
-    (reset) => __async(void 0, null, function* () {
+    (reset) => __async(null, null, function* () {
       var _a, _b;
       const { fields, lastResolvedData } = appStore.getState().fields;
       const metadata = appStore.getState().metadata;
@@ -1411,7 +929,7 @@ var createAppStore = (initialAppStore) => create2()(
         const selectedItem = state.ui.itemSelector ? getItem(state.ui.itemSelector, state) : null;
         return __spreadProps(__spreadValues({}, s), { state, selectedItem });
       }),
-      resolveComponentData: (componentData, trigger) => __async(void 0, null, function* () {
+      resolveComponentData: (componentData, trigger) => __async(null, null, function* () {
         const { config, metadata, setComponentLoading, permissions } = get();
         const timeouts = {};
         return yield resolveComponentData(
@@ -1422,7 +940,7 @@ var createAppStore = (initialAppStore) => create2()(
             const id = "id" in item.props ? item.props.id : "root";
             timeouts[id] = setComponentLoading(id, true, 50);
           },
-          (item) => __async(void 0, null, function* () {
+          (item) => __async(null, null, function* () {
             const id = "id" in item.props ? item.props.id : "root";
             if ("type" in item) {
               yield permissions.refreshPermissions({ item });
@@ -1434,7 +952,7 @@ var createAppStore = (initialAppStore) => create2()(
           trigger
         );
       }),
-      resolveAndCommitData: () => __async(void 0, null, function* () {
+      resolveAndCommitData: () => __async(null, null, function* () {
         const { config, state, dispatch, resolveComponentData: resolveComponentData2 } = get();
         walkAppState(
           state,
@@ -1611,7 +1129,7 @@ var getZoomConfig = (uiViewport, frame, zoom) => {
   const viewportHeight = uiViewport.height === "auto" ? frameHeight : uiViewport.height;
   let rootHeight = 0;
   let autoZoom = 1;
-  if (uiViewport.width > frameWidth || viewportHeight > frameHeight) {
+  if (typeof uiViewport.width === "number" && (uiViewport.width > frameWidth || viewportHeight > frameHeight)) {
     const widthZoom = Math.min(frameWidth / uiViewport.width, 1);
     const heightZoom = Math.min(frameHeight / viewportHeight, 1);
     zoom = widthZoom;
@@ -1690,7 +1208,8 @@ var IconButton = ({
   tabIndex,
   newTab,
   fullWidth,
-  title
+  title,
+  suppressHydrationWarning
 }) => {
   const [loading, setLoading] = useState(false);
   const ElementType = href ? "a" : "button";
@@ -1717,6 +1236,7 @@ var IconButton = ({
       rel: newTab ? "noreferrer" : void 0,
       href,
       title,
+      suppressHydrationWarning,
       children: [
         /* @__PURE__ */ jsx3("span", { className: getClassName3("title"), children: title }),
         children,
@@ -2526,7 +2046,7 @@ var collisionStore = createStore(() => ({
 
 // lib/dnd/collision/dynamic/index.ts
 var flushNext = "";
-var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input) => {
+var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => ((input) => {
   var _a, _b, _c, _d, _e;
   const { dragOperation, droppable } = input;
   const { position } = dragOperation;
@@ -2619,7 +2139,7 @@ var createDynamicCollisionDetector = (dragAxis, midpointOffset = 0.05) => (input
   }
   collisionDebug(dragCenter, dropCenter, droppable.id.toString(), "hotpink");
   return null;
-};
+});
 
 // components/Sortable/index.tsx
 import { useSortable } from "@dnd-kit/react/sortable";
@@ -3215,8 +2735,9 @@ var ArrayField = ({
                       if (isDraggingAny) return;
                       const value2 = getValue();
                       const existingValue = value2 || [];
+                      const defaultProps = typeof field.defaultItemProps === "function" ? field.defaultItemProps(existingValue.length) : (_a = field.defaultItemProps) != null ? _a : {};
                       const newItem = defaultSlots(
-                        uniqifyItem((_a = field.defaultItemProps) != null ? _a : {}),
+                        uniqifyItem(defaultProps),
                         field.arrayFields
                       );
                       const newValue = [...existingValue, newItem];
@@ -3389,11 +2910,13 @@ var ExternalInput = ({
   id,
   readOnly
 }) => {
+  var _a;
   const {
     mapProp = (val) => val,
     mapRow = (val) => val,
     filterFields
   } = field || {};
+  const { enabled: shouldCacheData } = (_a = field.cache) != null ? _a : { enabled: true };
   const [data, setData] = useState6([]);
   const [isOpen, setOpen] = useState6(false);
   const [isLoading, setIsLoading] = useState6(true);
@@ -3416,14 +2939,21 @@ var ExternalInput = ({
   }, [mappedData]);
   const [searchQuery, setSearchQuery] = useState6(field.initialQuery || "");
   const search = useCallback3(
-    (query, filters2) => __async(void 0, null, function* () {
+    (query, filters2) => __async(null, null, function* () {
       setIsLoading(true);
       const cacheKey = `${id}-${query}-${JSON.stringify(filters2)}`;
-      const listData = dataCache[cacheKey] || (yield field.fetchList({ query, filters: filters2 }));
+      let listData;
+      if (shouldCacheData && dataCache[cacheKey]) {
+        listData = dataCache[cacheKey];
+      } else {
+        listData = yield field.fetchList({ query, filters: filters2 });
+      }
       if (listData) {
         setData(listData);
         setIsLoading(false);
-        dataCache[cacheKey] = listData;
+        if (shouldCacheData) {
+          dataCache[cacheKey] = listData;
+        }
       }
     }),
     [id, field]
@@ -3487,6 +3017,7 @@ var ExternalInput = ({
             }),
             onSubmit: (e) => {
               e.preventDefault();
+              e.stopPropagation();
               search(searchQuery, filters);
             },
             children: [
@@ -3636,7 +3167,7 @@ var ExternalField = ({
             placeholder: ((_a = deprecatedField.adaptor) == null ? void 0 : _a.name) ? `Select from ${deprecatedField.adaptor.name}` : validField.placeholder || "Select data",
             mapProp: ((_b = deprecatedField.adaptor) == null ? void 0 : _b.mapProp) || validField.mapProp,
             mapRow: validField.mapRow,
-            fetchList: ((_c = deprecatedField.adaptor) == null ? void 0 : _c.fetchList) ? () => __async(void 0, null, function* () {
+            fetchList: ((_c = deprecatedField.adaptor) == null ? void 0 : _c.fetchList) ? () => __async(null, null, function* () {
               return yield deprecatedField.adaptor.fetchList(
                 deprecatedField.adaptorParams
               );
@@ -4008,6 +3539,7 @@ function AutoFieldInternal(props) {
     }
     return (_props) => null;
   }, [field.type]);
+  const fieldKey = field.type === "custom" ? field.key : void 0;
   let FieldComponent = useMemo3(() => {
     if (field.type === "custom") {
       if (!field.render) {
@@ -4017,7 +3549,7 @@ function AutoFieldInternal(props) {
     } else if (field.type !== "slot") {
       return render[field.type];
     }
-  }, [field.type, render]);
+  }, [field.type, fieldKey, render]);
   const { visible = true } = props.field;
   if (!visible) {
     return null;
@@ -4415,12 +3947,14 @@ var DraggableComponent = ({
     }
     return cleanup;
   }, [permissions.drag, zoneCompound]);
+  const [, setRerender] = useState10(0);
   const ref = useRef2(null);
   const refSetter = useCallback8(
     (el) => {
       sortableRef(el);
-      if (el) {
+      if (ref.current !== el) {
         ref.current = el;
+        setRerender((update) => update + 1);
       }
     },
     [sortableRef]
@@ -5084,7 +4618,20 @@ var createNestedDroppablePlugin = ({ onChange }, id) => class NestedDroppablePlu
 
 // lib/insert-component.ts
 init_react_import();
-var insertComponent = (componentType, zone, index, appStore) => __async(void 0, null, function* () {
+
+// lib/get-selector-for-id.ts
+init_react_import();
+var getSelectorForId = (state, id) => {
+  const node = state.indexes.nodes[id];
+  if (!node) return;
+  const zoneCompound = `${node.parentId}:${node.zone}`;
+  const index = state.indexes.zones[zoneCompound].contentIds.indexOf(id);
+  return { zone: zoneCompound, index };
+};
+
+// lib/insert-component.ts
+var insertComponent = (componentType, zone, index, appStore) => __async(null, null, function* () {
+  const { getState } = appStore;
   const id = generateId(componentType);
   const insertActionData = {
     type: "insert",
@@ -5093,8 +4640,9 @@ var insertComponent = (componentType, zone, index, appStore) => __async(void 0,
     destinationZone: zone,
     id
   };
-  const { state, dispatch, resolveComponentData: resolveComponentData2 } = appStore;
-  const insertedState = insertAction(state, insertActionData, appStore);
+  const stateBefore = getState().state;
+  const insertedState = insertAction(stateBefore, insertActionData, getState());
+  const dispatch = getState().dispatch;
   dispatch(__spreadProps(__spreadValues({}, insertActionData), {
     // Dispatch insert rather set, as user's may rely on this via onAction
     // We must always record history here so the insert is added to user history
@@ -5102,23 +4650,21 @@ var insertComponent = (componentType, zone, index, appStore) => __async(void 0,
     // entries on insert - one for the initial insert, and one when the data resolves
     recordHistory: true
   }));
-  const itemSelector = {
-    index,
-    zone
-  };
+  const itemSelector = { index, zone };
   dispatch({ type: "setUi", ui: { itemSelector } });
   const itemData = getItem(itemSelector, insertedState);
-  if (itemData) {
-    const resolved = yield resolveComponentData2(itemData, "insert");
-    if (resolved.didChange) {
-      dispatch({
-        type: "replace",
-        destinationZone: itemSelector.zone,
-        destinationIndex: itemSelector.index,
-        data: resolved.node
-      });
-    }
-  }
+  if (!itemData) return;
+  const resolveComponentData2 = getState().resolveComponentData;
+  const resolved = yield resolveComponentData2(itemData, "insert");
+  if (!resolved.didChange) return;
+  const latestItemSelector = getSelectorForId(getState().state, id);
+  if (!latestItemSelector) return;
+  dispatch({
+    type: "replace",
+    destinationZone: latestItemSelector.zone,
+    destinationIndex: latestItemSelector.index,
+    data: resolved.node
+  });
 });
 
 // components/DragDropContext/index.tsx
@@ -5355,7 +4901,7 @@ var DragDropContextClient = ({
                     thisPreview.componentType,
                     thisPreview.zone,
                     thisPreview.index,
-                    appStore.getState()
+                    appStore
                   );
                 } else if (initialSelector.current) {
                   dispatch({
@@ -5739,7 +5285,8 @@ var useMinEmptyHeight = ({
       }
     }
   }, [ref.current, draggedItem, onDragFinished]);
-  return [prevHeight || userMinEmptyHeight, isAnimating];
+  const returnedMinHeight = isNaN(Number(userMinEmptyHeight)) ? userMinEmptyHeight : `${userMinEmptyHeight}px`;
+  return [prevHeight ? `${prevHeight}px` : returnedMinHeight, isAnimating];
 };
 
 // lib/assign-refs.ts
@@ -5768,7 +5315,7 @@ import { useCallback as useCallback10 } from "react";
 function useRenderedCallback(callback, deps) {
   const manager = useDragDropManager();
   return useCallback10(
-    (...args) => __async(this, null, function* () {
+    (...args) => __async(null, null, function* () {
       yield manager == null ? void 0 : manager.renderer.rendering;
       return callback(...args);
     }),
@@ -5934,26 +5481,26 @@ var registerOverlayPortal = (el, opts = {}) => {
       capture: true
     });
   };
-  if (disableDragOnFocus) {
-    el.addEventListener("focus", onFocus, { capture: true });
-    el.addEventListener("blur", onBlur, { capture: true });
-  } else if (disableDrag) {
+  if (disableDrag) {
     el.addEventListener("pointerdown", stopPropagation, {
       capture: true
     });
+  } else if (disableDragOnFocus) {
+    el.addEventListener("focus", onFocus, { capture: true });
+    el.addEventListener("blur", onBlur, { capture: true });
   }
   el.setAttribute("data-puck-overlay-portal", "true");
   return () => {
     el.removeEventListener("mouseover", stopPropagation, {
       capture: true
     });
-    if (disableDragOnFocus) {
-      el.removeEventListener("focus", onFocus, { capture: true });
-      el.removeEventListener("blur", onFocus, { capture: true });
-    } else if (disableDrag) {
+    if (disableDrag) {
       el.removeEventListener("pointerdown", stopPropagation, {
         capture: true
       });
+    } else if (disableDragOnFocus) {
+      el.removeEventListener("focus", onFocus, { capture: true });
+      el.removeEventListener("blur", onBlur, { capture: true });
     }
     el.removeAttribute("data-puck-overlay-portal");
   };
@@ -5961,7 +5508,7 @@ var registerOverlayPortal = (el, opts = {}) => {
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/InlineTextField/styles.module.css#css-module
 init_react_import();
-var styles_module_default13 = { "InlineTextField": "_InlineTextField_1xph6_1" };
+var styles_module_default13 = { "InlineTextField": "_InlineTextField_104qp_1" };
 
 // lib/data/set-deep.ts
 init_react_import();
@@ -5997,16 +5544,6 @@ function setDeep(node, path, newVal) {
   return __spreadValues(__spreadValues({}, node), newNode);
 }
 
-// lib/get-selector-for-id.ts
-init_react_import();
-var getSelectorForId = (state, id) => {
-  const node = state.indexes.nodes[id];
-  if (!node) return;
-  const zoneCompound = `${node.parentId}:${node.zone}`;
-  const index = state.indexes.zones[zoneCompound].contentIds.indexOf(id);
-  return { zone: zoneCompound, index };
-};
-
 // components/InlineTextField/index.tsx
 import { jsx as jsx25 } from "react/jsx-runtime";
 var getClassName18 = get_class_name_factory_default("InlineTextField", styles_module_default13);
@@ -6035,7 +5572,7 @@ var InlineTextFieldInternal = ({
         ref.current.replaceChildren(value);
       }
       const cleanupPortal = registerOverlayPortal(ref.current);
-      const handleInput = (e) => __async(void 0, null, function* () {
+      const handleInput = (e) => __async(null, null, function* () {
         var _a2;
         const appStore2 = appStoreApi.getState();
         const node = appStore2.state.indexes.nodes[componentId];
@@ -6326,8 +5863,9 @@ var DropZoneEdit = forwardRef3(
     disallow,
     style,
     className,
-    minEmptyHeight: userMinEmptyHeight = 128,
-    collisionAxis
+    minEmptyHeight: userMinEmptyHeight = "128px",
+    collisionAxis,
+    as
   }, userRef) {
     const ctx = useContext8(dropZoneContext);
     const appStoreApi = useAppStoreApi();
@@ -6470,8 +6008,9 @@ var DropZoneEdit = forwardRef3(
       userMinEmptyHeight,
       ref
     });
+    const El = as != null ? as : "div";
     return /* @__PURE__ */ jsx27(
-      "div",
+      El,
       {
         className: `${getClassName19({
           isRootZone,
@@ -6487,7 +6026,7 @@ var DropZoneEdit = forwardRef3(
         "data-testid": `dropzone:${zoneCompound}`,
         "data-puck-dropzone": zoneCompound,
         style: __spreadProps(__spreadValues({}, style), {
-          "--min-empty-height": `${minEmptyHeight}px`,
+          "--min-empty-height": minEmptyHeight,
           backgroundColor: RENDER_DEBUG ? getRandomColor() : style == null ? void 0 : style.backgroundColor
         }),
         children: contentIdsWithPreview.map((componentId, i) => {
@@ -6534,7 +6073,7 @@ var DropZoneRenderItem = ({
 };
 var DropZoneRenderPure = (props) => /* @__PURE__ */ jsx27(DropZoneRender, __spreadValues({}, props));
 var DropZoneRender = forwardRef3(
-  function DropZoneRenderInternal({ className, style, zone }, ref) {
+  function DropZoneRenderInternal({ className, style, zone, as }, ref) {
     const ctx = useContext8(dropZoneContext);
     const { areaId = "root" } = ctx || {};
     const { config, data, metadata } = useContext8(renderContext);
@@ -6547,13 +6086,14 @@ var DropZoneRender = forwardRef3(
         }
       }
     }, [content]);
+    const El = as != null ? as : "div";
     if (!data || !config) {
       return null;
     }
     if (zoneCompound !== rootDroppableId) {
       content = setupZone(data, zoneCompound).zones[zoneCompound];
     }
-    return /* @__PURE__ */ jsx27("div", { className, style, ref, children: content.map((item) => {
+    return /* @__PURE__ */ jsx27(El, { className, style, ref, children: content.map((item) => {
       const Component = config.components[item.type];
       if (Component) {
         return /* @__PURE__ */ jsx27(
@@ -6655,7 +6195,18 @@ var generateUsePuck = (store) => {
     selectedItem: store.selectedItem || null,
     getItemBySelector: (selector) => getItem(selector, store.state),
     getItemById: (id) => store.state.indexes.nodes[id].data,
-    getSelectorForId: (id) => getSelectorForId(store.state, id)
+    getSelectorForId: (id) => getSelectorForId(store.state, id),
+    getParentById: (id) => {
+      const node = store.state.indexes.nodes[id];
+      const parentId = node.parentId;
+      if (parentId === null) return;
+      const parentNode = store.state.indexes.nodes[parentId];
+      if (!parentNode) return;
+      return parentNode.data;
+    }
+  };
+  storeData.__private = {
+    appState: store.state
   };
   return storeData;
 };
@@ -6696,7 +6247,7 @@ function createUsePuck() {
     }
     const result = useStore3(
       usePuckApi,
-      selector != null ? selector : (s) => s
+      selector != null ? selector : ((s) => s)
     );
     return result;
   };
@@ -7263,49 +6814,48 @@ var DefaultFields = ({
 }) => {
   return /* @__PURE__ */ jsx37(Fragment10, { children });
 };
-var createOnChange = (fieldName, appStore) => (value, updatedUi) => __async(void 0, null, function* () {
-  let currentProps;
+var createOnChange = (fieldName, appStore) => (value, updatedUi) => __async(null, null, function* () {
   const { dispatch, state, selectedItem, resolveComponentData: resolveComponentData2 } = appStore.getState();
   const { data, ui } = state;
   const { itemSelector } = ui;
   const rootProps = data.root.props || data.root;
-  if (selectedItem) {
-    currentProps = selectedItem.props;
-  } else {
-    currentProps = rootProps;
-  }
-  const newProps = __spreadProps(__spreadValues({}, currentProps), {
-    [fieldName]: value
-  });
+  const currentProps = selectedItem ? selectedItem.props : rootProps;
+  const newProps = __spreadProps(__spreadValues({}, currentProps), { [fieldName]: value });
   if (selectedItem && itemSelector) {
+    const resolved = yield resolveComponentData2(
+      __spreadProps(__spreadValues({}, selectedItem), { props: newProps }),
+      "replace"
+    );
+    const latestSelector = getSelectorForId(
+      appStore.getState().state,
+      selectedItem.props.id
+    );
+    if (!latestSelector) return;
     dispatch({
       type: "replace",
-      destinationIndex: itemSelector.index,
-      destinationZone: itemSelector.zone || rootDroppableId,
-      data: (yield resolveComponentData2(
-        __spreadProps(__spreadValues({}, selectedItem), { props: newProps }),
+      destinationIndex: latestSelector.index,
+      destinationZone: latestSelector.zone || rootDroppableId,
+      data: resolved.node,
+      ui: updatedUi
+    });
+    return;
+  }
+  if (data.root.props) {
+    dispatch({
+      type: "replaceRoot",
+      root: (yield resolveComponentData2(
+        __spreadProps(__spreadValues({}, data.root), { props: newProps }),
         "replace"
       )).node,
-      ui: updatedUi
+      ui: __spreadValues(__spreadValues({}, ui), updatedUi),
+      recordHistory: true
     });
-  } else {
-    if (data.root.props) {
-      dispatch({
-        type: "replaceRoot",
-        root: (yield resolveComponentData2(
-          __spreadProps(__spreadValues({}, data.root), { props: newProps }),
-          "replace"
-        )).node,
-        ui: __spreadValues(__spreadValues({}, ui), updatedUi),
-        recordHistory: true
-      });
-    } else {
-      dispatch({
-        type: "setData",
-        data: { root: newProps }
-      });
-    }
+    return;
   }
+  dispatch({
+    type: "setData",
+    data: { root: newProps }
+  });
 });
 var FieldsChild = ({ fieldName }) => {
   const field = useAppStore((s) => s.fields.fields[fieldName]);
@@ -7492,7 +7042,7 @@ var CopyHostStyles = ({
     let elements = [];
     const hashes = {};
     const lookupEl = (el) => elements.findIndex((elementMap) => elementMap.original === el);
-    const mirrorEl = (el, inlineStyles = false) => __async(void 0, null, function* () {
+    const mirrorEl = (el, inlineStyles = false) => __async(null, null, function* () {
       let mirror;
       if (el.nodeName === "LINK" && inlineStyles) {
         mirror = document.createElement("style");
@@ -7524,7 +7074,7 @@ var CopyHostStyles = ({
       }
       return mirror;
     });
-    const addEl = (el) => __async(void 0, null, function* () {
+    const addEl = (el) => __async(null, null, function* () {
       const index = lookupEl(el);
       if (index > -1) {
         if (debug)
@@ -7597,7 +7147,7 @@ var CopyHostStyles = ({
     const parentBody = parentDocument.getElementsByTagName("body")[0];
     syncAttributes(parentBody, doc.body);
     Promise.all(
-      collectedStyles.map((styleNode, i) => __async(void 0, null, function* () {
+      collectedStyles.map((styleNode, i) => __async(null, null, function* () {
         if (styleNode.nodeName === "LINK") {
           const linkHref = styleNode.href;
           if (hrefs.indexOf(linkHref) > -1) {
@@ -7910,7 +7460,7 @@ import { useEffect as useEffect29, useMemo as useMemo20, useState as useState25
 
 // css-module:/home/runner/work/puck/puck/packages/core/components/Puck/components/Layout/styles.module.css#css-module
 init_react_import();
-var styles_module_default22 = { "Puck": "_Puck_hv23j_19", "Puck-portal": "_Puck-portal_hv23j_31", "PuckLayout": "_PuckLayout_hv23j_36", "PuckLayout-inner": "_PuckLayout-inner_hv23j_40", "PuckLayout--mounted": "_PuckLayout--mounted_hv23j_73", "PuckLayout--mobilePanelHeightToggle": "_PuckLayout--mobilePanelHeightToggle_hv23j_77", "PuckLayout--leftSideBarVisible": "_PuckLayout--leftSideBarVisible_hv23j_77", "PuckLayout--isExpanded": "_PuckLayout--isExpanded_hv23j_83", "PuckLayout--mobilePanelHeightMinContent": "_PuckLayout--mobilePanelHeightMinContent_hv23j_101", "PuckLayout--rightSideBarVisible": "_PuckLayout--rightSideBarVisible_hv23j_128", "PuckLayout-mounted": "_PuckLayout-mounted_hv23j_147", "PuckLayout-nav": "_PuckLayout-nav_hv23j_188", "PuckLayout-header": "_PuckLayout-header_hv23j_204", "PuckPluginTab": "_PuckPluginTab_hv23j_218", "PuckPluginTab--visible": "_PuckPluginTab--visible_hv23j_224", "PuckPluginTab-body": "_PuckPluginTab-body_hv23j_229" };
+var styles_module_default22 = { "Puck": "_Puck_lqzmv_19", "Puck-portal": "_Puck-portal_lqzmv_32", "PuckLayout": "_PuckLayout_lqzmv_37", "PuckLayout-inner": "_PuckLayout-inner_lqzmv_41", "PuckLayout--mounted": "_PuckLayout--mounted_lqzmv_74", "PuckLayout--mobilePanelHeightToggle": "_PuckLayout--mobilePanelHeightToggle_lqzmv_78", "PuckLayout--leftSideBarVisible": "_PuckLayout--leftSideBarVisible_lqzmv_78", "PuckLayout--isExpanded": "_PuckLayout--isExpanded_lqzmv_84", "PuckLayout--mobilePanelHeightMinContent": "_PuckLayout--mobilePanelHeightMinContent_lqzmv_102", "PuckLayout--rightSideBarVisible": "_PuckLayout--rightSideBarVisible_lqzmv_129", "PuckLayout-mounted": "_PuckLayout-mounted_lqzmv_148", "PuckLayout-nav": "_PuckLayout-nav_lqzmv_189", "PuckLayout-header": "_PuckLayout-header_lqzmv_205", "PuckPluginTab": "_PuckPluginTab_lqzmv_219", "PuckPluginTab--visible": "_PuckPluginTab--visible_lqzmv_225", "PuckPluginTab-body": "_PuckPluginTab-body_lqzmv_230" };
 
 // lib/use-inject-css.ts
 init_react_import();
@@ -8267,13 +7817,14 @@ var ActionButton = ({
   isActive,
   disabled
 }) => {
-  return /* @__PURE__ */ jsx45("span", { className: getClassNameButton({ isActive }), children: /* @__PURE__ */ jsx45(
+  return /* @__PURE__ */ jsx45("span", { className: getClassNameButton({ isActive }), suppressHydrationWarning: true, children: /* @__PURE__ */ jsx45(
     IconButton,
     {
       type: "button",
       title,
       disabled: disabled || isActive,
       onClick,
+      suppressHydrationWarning: true,
       children: /* @__PURE__ */ jsx45("span", { className: getClassNameButton("inner"), children })
     }
   ) });
@@ -8948,7 +8499,7 @@ var Layout = ({ children }) => {
     dnd,
     initialHistory: _initialHistory,
     plugins,
-    height = "100dvh"
+    height
   } = usePropsContext();
   const iframe = useMemo20(
     () => __spreadValues({
@@ -9092,92 +8643,85 @@ var Layout = ({ children }) => {
       return (_a = s.state.ui.mobilePanelExpanded) != null ? _a : false;
     }
   );
-  return /* @__PURE__ */ jsxs24(
-    "div",
-    {
-      className: `Puck ${getClassName36()}`,
-      style: { height },
-      id: instanceId,
-      children: [
-        /* @__PURE__ */ jsx51(DragDropContext, { disableAutoScroll: dnd == null ? void 0 : dnd.disableAutoScroll, children: /* @__PURE__ */ jsx51(CustomPuck, { children: children || /* @__PURE__ */ jsx51(FrameProvider, { children: /* @__PURE__ */ jsx51(
+  return /* @__PURE__ */ jsxs24("div", { className: `Puck ${getClassName36()}`, id: instanceId, children: [
+    /* @__PURE__ */ jsx51(DragDropContext, { disableAutoScroll: dnd == null ? void 0 : dnd.disableAutoScroll, children: /* @__PURE__ */ jsx51(CustomPuck, { children: children || /* @__PURE__ */ jsx51(FrameProvider, { children: /* @__PURE__ */ jsx51(
+      "div",
+      {
+        className: getLayoutClassName({
+          leftSideBarVisible,
+          mounted,
+          rightSideBarVisible: !hasDesktopFieldsPlugin && rightSideBarVisible,
+          isExpanded: mobilePanelExpanded,
+          mobilePanelHeightToggle: mobilePanelHeightMode === "toggle",
+          mobilePanelHeightMinContent: mobilePanelHeightMode === "min-content"
+        }),
+        style: { height },
+        children: /* @__PURE__ */ jsxs24(
           "div",
           {
-            className: getLayoutClassName({
-              leftSideBarVisible,
-              mounted,
-              rightSideBarVisible: !hasDesktopFieldsPlugin && rightSideBarVisible,
-              isExpanded: mobilePanelExpanded,
-              mobilePanelHeightToggle: mobilePanelHeightMode === "toggle",
-              mobilePanelHeightMinContent: mobilePanelHeightMode === "min-content"
-            }),
-            children: /* @__PURE__ */ jsxs24(
-              "div",
-              {
-                className: getLayoutClassName("inner"),
-                style: layoutOptions,
-                children: [
-                  /* @__PURE__ */ jsx51("div", { className: getLayoutClassName("header"), children: /* @__PURE__ */ jsx51(Header, {}) }),
-                  /* @__PURE__ */ jsx51("div", { className: getLayoutClassName("nav"), children: /* @__PURE__ */ jsx51(
-                    Nav,
-                    {
-                      items: pluginItems,
-                      mobileActions: leftSideBarVisible && mobilePanelHeightMode === "toggle" && /* @__PURE__ */ jsx51(
-                        IconButton,
-                        {
-                          type: "button",
-                          title: "maximize",
-                          onClick: () => {
-                            setUi({
-                              mobilePanelExpanded: !mobilePanelExpanded
-                            });
-                          },
-                          children: mobilePanelExpanded ? /* @__PURE__ */ jsx51(Minimize2, { size: 21 }) : /* @__PURE__ */ jsx51(Maximize2, { size: 21 })
-                        }
-                      )
-                    }
-                  ) }),
-                  /* @__PURE__ */ jsx51(
-                    Sidebar,
-                    {
-                      position: "left",
-                      sidebarRef: leftSidebarRef,
-                      isVisible: leftSideBarVisible,
-                      onResize: setLeftWidth,
-                      onResizeEnd: handleLeftSidebarResizeEnd,
-                      children: Object.entries(pluginItems).map(
-                        ([id, { mobileOnly, render: Render2, label }]) => /* @__PURE__ */ jsx51(
-                          PluginTab,
-                          {
-                            visible: currentPlugin === id,
-                            mobileOnly,
-                            children: /* @__PURE__ */ jsx51(Render2, {})
-                          },
-                          id
-                        )
-                      )
-                    }
-                  ),
-                  /* @__PURE__ */ jsx51(Canvas, {}),
-                  !hasDesktopFieldsPlugin && /* @__PURE__ */ jsx51(
-                    Sidebar,
+            className: getLayoutClassName("inner"),
+            style: layoutOptions,
+            children: [
+              /* @__PURE__ */ jsx51("div", { className: getLayoutClassName("header"), children: /* @__PURE__ */ jsx51(Header, {}) }),
+              /* @__PURE__ */ jsx51("div", { className: getLayoutClassName("nav"), children: /* @__PURE__ */ jsx51(
+                Nav,
+                {
+                  items: pluginItems,
+                  mobileActions: leftSideBarVisible && mobilePanelHeightMode === "toggle" && /* @__PURE__ */ jsx51(
+                    IconButton,
                     {
-                      position: "right",
-                      sidebarRef: rightSidebarRef,
-                      isVisible: rightSideBarVisible,
-                      onResize: setRightWidth,
-                      onResizeEnd: handleRightSidebarResizeEnd,
-                      children: /* @__PURE__ */ jsx51(FieldSideBar, {})
+                      type: "button",
+                      title: "maximize",
+                      onClick: () => {
+                        setUi({
+                          mobilePanelExpanded: !mobilePanelExpanded
+                        });
+                      },
+                      children: mobilePanelExpanded ? /* @__PURE__ */ jsx51(Minimize2, { size: 21 }) : /* @__PURE__ */ jsx51(Maximize2, { size: 21 })
                     }
                   )
-                ]
-              }
-            )
+                }
+              ) }),
+              /* @__PURE__ */ jsx51(
+                Sidebar,
+                {
+                  position: "left",
+                  sidebarRef: leftSidebarRef,
+                  isVisible: leftSideBarVisible,
+                  onResize: setLeftWidth,
+                  onResizeEnd: handleLeftSidebarResizeEnd,
+                  children: Object.entries(pluginItems).map(
+                    ([id, { mobileOnly, render: Render2, label }]) => /* @__PURE__ */ jsx51(
+                      PluginTab,
+                      {
+                        visible: currentPlugin === id,
+                        mobileOnly,
+                        children: /* @__PURE__ */ jsx51(Render2, {})
+                      },
+                      id
+                    )
+                  )
+                }
+              ),
+              /* @__PURE__ */ jsx51(Canvas, {}),
+              !hasDesktopFieldsPlugin && /* @__PURE__ */ jsx51(
+                Sidebar,
+                {
+                  position: "right",
+                  sidebarRef: rightSidebarRef,
+                  isVisible: rightSideBarVisible,
+                  onResize: setRightWidth,
+                  onResizeEnd: handleRightSidebarResizeEnd,
+                  children: /* @__PURE__ */ jsx51(FieldSideBar, {})
+                }
+              )
+            ]
           }
-        ) }) }) }),
-        /* @__PURE__ */ jsx51("div", { id: "puck-portal-root", className: getClassName36("portal") })
-      ]
-    }
-  );
+        )
+      }
+    ) }) }) }),
+    /* @__PURE__ */ jsx51("div", { id: "puck-portal-root", className: getClassName36("portal") })
+  ] });
 };
 
 // components/Puck/index.tsx
@@ -9255,9 +8799,13 @@ function PuckProvider({ children }) {
     }
     const rootProps = ((_f = initialData == null ? void 0 : initialData.root) == null ? void 0 : _f.props) || (initialData == null ? void 0 : initialData.root) || {};
     const defaultedRootProps = __spreadValues(__spreadValues({}, (_g = config.root) == null ? void 0 : _g.defaultProps), rootProps);
+    const root = populateIds(
+      toComponent(__spreadProps(__spreadValues({}, initialData == null ? void 0 : initialData.root), { props: defaultedRootProps })),
+      config
+    );
     const newAppState = __spreadProps(__spreadValues({}, defaultAppState), {
       data: __spreadProps(__spreadValues({}, initialData), {
-        root: __spreadProps(__spreadValues({}, initialData == null ? void 0 : initialData.root), { props: defaultedRootProps }),
+        root: __spreadProps(__spreadValues({}, initialData == null ? void 0 : initialData.root), { props: root.props }),
         content: initialData.content || []
       }),
       ui: __spreadProps(__spreadValues(__spreadValues({}, initial), clientUiState), {
@@ -9294,7 +8842,12 @@ function PuckProvider({ children }) {
       });
     })
   );
-  const initialHistoryIndex = (_initialHistory == null ? void 0 : _initialHistory.index) || blendedHistories.length - 1;
+  const initialHistoryIndex = useMemo21(() => {
+    if ((_initialHistory == null ? void 0 : _initialHistory.index) !== void 0 && (_initialHistory == null ? void 0 : _initialHistory.index) >= 0 && (_initialHistory == null ? void 0 : _initialHistory.index) < blendedHistories.length) {
+      return _initialHistory == null ? void 0 : _initialHistory.index;
+    }
+    return blendedHistories.length - 1;
+  }, []);
   const initialAppState = blendedHistories[initialHistoryIndex].state;
   const loadedOverrides = useLoadedOverrides({
     overrides,
@@ -9356,7 +8909,7 @@ function PuckProvider({ children }) {
   });
   const previousData = useRef12(null);
   useEffect30(() => {
-    appStore.subscribe(
+    return appStore.subscribe(
       (s) => s.state.data,
       (data) => {
         if (onChange) {
@@ -9366,7 +8919,7 @@ function PuckProvider({ children }) {
         }
       }
     );
-  }, []);
+  }, [onChange]);
   useRegisterPermissionsSlice(appStore, permissions);
   const uPuckStore = useRegisterUsePuckStore(appStore);
   useEffect30(() => {
@@ -9453,325 +9006,45 @@ classnames/index.js:
   *)
 
 lucide-react/dist/esm/shared/src/utils.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/defaultAttributes.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/Icon.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/createLucideIcon.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/chevron-down.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/chevron-right.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/chevron-up.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/circle-check-big.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/copy.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/corner-left-up.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/ellipsis-vertical.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/expand.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/globe.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/hammer.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/hash.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/layers.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/layout-grid.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/link.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/list.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/lock-open.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/lock.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/maximize-2.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/minimize-2.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/monitor.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/panel-left.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/panel-right.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/plus.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/rectangle-ellipsis.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/redo-2.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/search.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/sliders-horizontal.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/smartphone.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/tablet.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/toy-brick.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/trash.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/type.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/undo-2.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/x.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/zoom-in.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/icons/zoom-out.js:
-  (**
-   * @license lucide-react v0.468.0 - ISC
-   *
-   * This source code is licensed under the ISC license.
-   * See the LICENSE file in the root directory of this source tree.
-   *)
-
 lucide-react/dist/esm/lucide-react.js:
   (**
    * @license lucide-react v0.468.0 - ISC