@measured/puck 0.21.0-canary.ace4c8b3 → 0.21.0-canary.af48a401

package/dist/index.js

@@ -1979,26 +1979,34 @@ var createPermissionsSlice = (set, get) => {
   const resolvePermissions = (..._0) => __async(null, [..._0], function* (params = {}, force) {
     const { state, permissions, config } = get();
     const { cache: cache2, globalPermissions } = permissions;
-    const resolveDataForItem = (item2, force2 = false) => __async(null, 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 = cache2[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 = cache2[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 = cache2[item2.props.id]) == null ? void 0 : _b.lastPermissions) || null,
+              lastPermissions: (itemCache == null ? void 0 : itemCache.lastPermissions) || null,
               permissions: initialPermissions,
               appState: makeStatePublic(appState),
-              lastData: ((_c = cache2[item2.props.id]) == null ? void 0 : _c.lastData) || null
+              lastData: (itemCache == null ? void 0 : itemCache.lastData) || null,
+              parent: parentData
             }
           );
           const latest = get().permissions;
@@ -2006,6 +2014,7 @@ var createPermissionsSlice = (set, get) => {
             permissions: __spreadProps(__spreadValues({}, latest), {
               cache: __spreadProps(__spreadValues({}, latest.cache), {
                 [item2.props.id]: {
+                  lastParentId: parentId,
                   lastData: item2,
                   lastPermissions: resolvedPermissions
                 }
@@ -2019,9 +2028,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",
@@ -2032,16 +2041,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(null, null, function* () {
-        yield resolveDataForItem(item2, force);
+        yield resolvePermissionsForItem(item2, force);
       }));
     } else if (root) {
-      resolveDataForRoot(force);
+      resolvePermissionsForRoot(force);
     } else {
       flattenData(state, config).map((item2) => __async(null, null, function* () {
-        yield resolveDataForItem(item2, force);
+        yield resolvePermissionsForItem(item2, force);
       }));
     }
   });
@@ -5233,7 +5242,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
@@ -5467,8 +5477,9 @@ var Item = ({
   );
 };
 var SlotRender = (0, import_react31.forwardRef)(
-  function SlotRenderInternal({ className, style, content, config, metadata }, ref) {
-    return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className, style, ref, children: content.map((item) => {
+  function SlotRenderInternal({ className, style, content, config, metadata, as }, ref) {
+    const El = as != null ? as : "div";
+    return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(El, { className, style, ref, children: content.map((item) => {
       if (!config.components[item.type]) {
         return null;
       }
@@ -5982,8 +5993,9 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
     disallow,
     style,
     className,
-    minEmptyHeight: userMinEmptyHeight = 128,
-    collisionAxis
+    minEmptyHeight: userMinEmptyHeight = "128px",
+    collisionAxis,
+    as
   }, userRef) {
     const ctx = (0, import_react34.useContext)(dropZoneContext);
     const appStoreApi = useAppStoreApi();
@@ -6126,8 +6138,9 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
       userMinEmptyHeight,
       ref
     });
+    const El = as != null ? as : "div";
     return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
-      "div",
+      El,
       {
         className: `${getClassName18({
           isRootZone,
@@ -6143,7 +6156,7 @@ var DropZoneEdit = (0, import_react34.forwardRef)(
         "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) => {
@@ -6190,7 +6203,7 @@ var DropZoneRenderItem = ({
 };
 var DropZoneRenderPure = (props) => /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(DropZoneRender, __spreadValues({}, props));
 var DropZoneRender = (0, import_react34.forwardRef)(
-  function DropZoneRenderInternal({ className, style, zone }, ref) {
+  function DropZoneRenderInternal({ className, style, zone, as }, ref) {
     const ctx = (0, import_react34.useContext)(dropZoneContext);
     const { areaId = "root" } = ctx || {};
     const { config, data, metadata } = (0, import_react34.useContext)(renderContext);
@@ -6203,13 +6216,14 @@ var DropZoneRender = (0, import_react34.forwardRef)(
         }
       }
     }, [content]);
+    const El = as != null ? as : "div";
     if (!data || !config) {
       return null;
     }
     if (zoneCompound !== rootDroppableId) {
       content = setupZone(data, zoneCompound).zones[zoneCompound];
     }
-    return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)("div", { className, style, ref, children: content.map((item) => {
+    return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(El, { className, style, ref, children: content.map((item) => {
       const Component = config.components[item.type];
       if (Component) {
         return /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
@@ -6516,6 +6530,7 @@ var createNestedDroppablePlugin = ({ onChange }, id) => class NestedDroppablePlu
 // lib/insert-component.ts
 init_react_import();
 var insertComponent = (componentType, zone, index, appStore) => __async(null, null, function* () {
+  const { getState } = appStore;
   const id = generateId(componentType);
   const insertActionData = {
     type: "insert",
@@ -6524,8 +6539,9 @@ var insertComponent = (componentType, zone, index, appStore) => __async(null, nu
     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
@@ -6533,23 +6549,21 @@ var insertComponent = (componentType, zone, index, appStore) => __async(null, nu
     // 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
@@ -6786,7 +6800,7 @@ var DragDropContextClient = ({
                     thisPreview.componentType,
                     thisPreview.zone,
                     thisPreview.index,
-                    appStore.getState()
+                    appStore
                   );
                 } else if (initialSelector.current) {
                   dispatch({
@@ -7224,48 +7238,47 @@ var DefaultFields = ({
   return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(import_jsx_runtime30.Fragment, { children });
 };
 var createOnChange = (fieldName, appStore) => (value, updatedUi) => __async(null, null, function* () {
-  let currentProps;
   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]);
@@ -8731,7 +8744,15 @@ 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;
+    }
   };
   return storeData;
 };
@@ -9350,7 +9371,12 @@ function PuckProvider({ children }) {
       });
     })
   );
-  const initialHistoryIndex = (_initialHistory == null ? void 0 : _initialHistory.index) || blendedHistories.length - 1;
+  const initialHistoryIndex = (0, import_react60.useMemo)(() => {
+    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,

package/dist/index.mjs

@@ -18,14 +18,14 @@ import {
   setDeep,
   useGetPuck,
   usePuck
-} from "./chunk-AIFI2M23.mjs";
+} from "./chunk-UABEUL66.mjs";
 import {
   init_react_import,
   migrate,
   resolveAllData,
   transformProps,
   walkTree
-} from "./chunk-TC25DCTQ.mjs";
+} from "./chunk-JA7SEUEH.mjs";
 
 // bundle/index.ts
 init_react_import();

package/dist/no-external.d.mts

@@ -1,4 +1,4 @@
-export { ad as Adaptor, A as AppState, ab as ArrayField, B as ArrayState, ar as AsFieldProps, X as BaseData, a5 as BaseField, af as CacheOpts, f as ComponentConfig, J as ComponentConfigExtensions, T as ComponentConfigParams, a as ComponentData, a0 as ComponentDataMap, _ as ComponentDataOptionalId, a3 as ComponentMetadata, C as Config, Q as ConfigParams, a1 as Content, ai as CustomField, ah as CustomFieldRender, j as Data, ao as DefaultComponentProps, L as DefaultComponents, al as DefaultRootFieldProps, an as DefaultRootProps, am as DefaultRootRenderProps, o as Direction, p as DragAxis, ag as ExternalField, ae as ExternalFieldWithAdaptor, N as ExtractConfigParams, at as ExtractField, h as Field, a4 as FieldMetadata, i as FieldProps, y as FieldRenderFunctions, u as FieldTransformFn, s as FieldTransformFnParams, g as FieldTransforms, F as Fields, H as History, I as IframeConfig, l as InitialHistory, z as ItemWithId, $ as MappedItem, M as Metadata, a7 as NumberField, ac as ObjectField, k as OnAction, x as OverrideKey, O as Overrides, P as Permissions, d as Plugin, b as PuckAction, G as PuckComponent, ak as PuckContext, a2 as PuckMetadata, aa as RadioField, c as ResolveDataTrigger, K as RootConfig, Z as RootData, R as RootDataWithProps, Y as RootDataWithoutProps, a9 as SelectField, S as Slot, E as SlotComponent, aj as SlotField, a6 as TextField, a8 as TextareaField, e as UiState, U as UserGenerics, q as Viewport, V as Viewports, as as WithChildren, ap as WithId, aq as WithPuckProps, W as WithSlotProps, m as migrate, v as overrideKeys, r as resolveAllData, t as transformProps, w as walkTree } from './walk-tree-CkSoNBF7.mjs';
+export { ad as Adaptor, A as AppState, ab as ArrayField, B as ArrayState, ar as AsFieldProps, X as BaseData, a5 as BaseField, af as CacheOpts, f as ComponentConfig, J as ComponentConfigExtensions, T as ComponentConfigParams, a as ComponentData, a0 as ComponentDataMap, _ as ComponentDataOptionalId, a3 as ComponentMetadata, C as Config, Q as ConfigParams, a1 as Content, ai as CustomField, ah as CustomFieldRender, j as Data, ao as DefaultComponentProps, L as DefaultComponents, al as DefaultRootFieldProps, an as DefaultRootProps, am as DefaultRootRenderProps, o as Direction, p as DragAxis, ag as ExternalField, ae as ExternalFieldWithAdaptor, N as ExtractConfigParams, at as ExtractField, h as Field, a4 as FieldMetadata, i as FieldProps, y as FieldRenderFunctions, u as FieldTransformFn, s as FieldTransformFnParams, g as FieldTransforms, F as Fields, H as History, I as IframeConfig, l as InitialHistory, z as ItemWithId, $ as MappedItem, M as Metadata, a7 as NumberField, ac as ObjectField, k as OnAction, x as OverrideKey, O as Overrides, P as Permissions, d as Plugin, b as PuckAction, G as PuckComponent, ak as PuckContext, a2 as PuckMetadata, aa as RadioField, c as ResolveDataTrigger, K as RootConfig, Z as RootData, R as RootDataWithProps, Y as RootDataWithoutProps, a9 as SelectField, S as Slot, E as SlotComponent, aj as SlotField, a6 as TextField, a8 as TextareaField, e as UiState, U as UserGenerics, q as Viewport, V as Viewports, as as WithChildren, ap as WithId, aq as WithPuckProps, W as WithSlotProps, m as migrate, v as overrideKeys, r as resolveAllData, t as transformProps, w as walkTree } from './walk-tree-CgWnYC1X.mjs';
 export { Action, ActionBar, AutoField, Button, Drawer, DropZone, FieldLabel, Group, IconButton, Label, Puck, PuckApi, Render, UsePuckData, createUsePuck, registerOverlayPortal, renderContext, setDeep, useGetPuck, usePuck } from './index.mjs';
 import 'react';
 import 'react/jsx-runtime';

package/dist/no-external.d.ts

@@ -1,4 +1,4 @@
-export { ad as Adaptor, A as AppState, ab as ArrayField, B as ArrayState, ar as AsFieldProps, X as BaseData, a5 as BaseField, af as CacheOpts, f as ComponentConfig, J as ComponentConfigExtensions, T as ComponentConfigParams, a as ComponentData, a0 as ComponentDataMap, _ as ComponentDataOptionalId, a3 as ComponentMetadata, C as Config, Q as ConfigParams, a1 as Content, ai as CustomField, ah as CustomFieldRender, j as Data, ao as DefaultComponentProps, L as DefaultComponents, al as DefaultRootFieldProps, an as DefaultRootProps, am as DefaultRootRenderProps, o as Direction, p as DragAxis, ag as ExternalField, ae as ExternalFieldWithAdaptor, N as ExtractConfigParams, at as ExtractField, h as Field, a4 as FieldMetadata, i as FieldProps, y as FieldRenderFunctions, u as FieldTransformFn, s as FieldTransformFnParams, g as FieldTransforms, F as Fields, H as History, I as IframeConfig, l as InitialHistory, z as ItemWithId, $ as MappedItem, M as Metadata, a7 as NumberField, ac as ObjectField, k as OnAction, x as OverrideKey, O as Overrides, P as Permissions, d as Plugin, b as PuckAction, G as PuckComponent, ak as PuckContext, a2 as PuckMetadata, aa as RadioField, c as ResolveDataTrigger, K as RootConfig, Z as RootData, R as RootDataWithProps, Y as RootDataWithoutProps, a9 as SelectField, S as Slot, E as SlotComponent, aj as SlotField, a6 as TextField, a8 as TextareaField, e as UiState, U as UserGenerics, q as Viewport, V as Viewports, as as WithChildren, ap as WithId, aq as WithPuckProps, W as WithSlotProps, m as migrate, v as overrideKeys, r as resolveAllData, t as transformProps, w as walkTree } from './walk-tree-CkSoNBF7.js';
+export { ad as Adaptor, A as AppState, ab as ArrayField, B as ArrayState, ar as AsFieldProps, X as BaseData, a5 as BaseField, af as CacheOpts, f as ComponentConfig, J as ComponentConfigExtensions, T as ComponentConfigParams, a as ComponentData, a0 as ComponentDataMap, _ as ComponentDataOptionalId, a3 as ComponentMetadata, C as Config, Q as ConfigParams, a1 as Content, ai as CustomField, ah as CustomFieldRender, j as Data, ao as DefaultComponentProps, L as DefaultComponents, al as DefaultRootFieldProps, an as DefaultRootProps, am as DefaultRootRenderProps, o as Direction, p as DragAxis, ag as ExternalField, ae as ExternalFieldWithAdaptor, N as ExtractConfigParams, at as ExtractField, h as Field, a4 as FieldMetadata, i as FieldProps, y as FieldRenderFunctions, u as FieldTransformFn, s as FieldTransformFnParams, g as FieldTransforms, F as Fields, H as History, I as IframeConfig, l as InitialHistory, z as ItemWithId, $ as MappedItem, M as Metadata, a7 as NumberField, ac as ObjectField, k as OnAction, x as OverrideKey, O as Overrides, P as Permissions, d as Plugin, b as PuckAction, G as PuckComponent, ak as PuckContext, a2 as PuckMetadata, aa as RadioField, c as ResolveDataTrigger, K as RootConfig, Z as RootData, R as RootDataWithProps, Y as RootDataWithoutProps, a9 as SelectField, S as Slot, E as SlotComponent, aj as SlotField, a6 as TextField, a8 as TextareaField, e as UiState, U as UserGenerics, q as Viewport, V as Viewports, as as WithChildren, ap as WithId, aq as WithPuckProps, W as WithSlotProps, m as migrate, v as overrideKeys, r as resolveAllData, t as transformProps, w as walkTree } from './walk-tree-CgWnYC1X.js';
 export { Action, ActionBar, AutoField, Button, Drawer, DropZone, FieldLabel, Group, IconButton, Label, Puck, PuckApi, Render, UsePuckData, createUsePuck, registerOverlayPortal, renderContext, setDeep, useGetPuck, usePuck } from './index.js';
 import 'react';
 import 'react/jsx-runtime';