@measured/puck 0.20.0-canary.3da831b0 → 0.20.0-canary.6760121f

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { H as History, P as Permissions, C as ComponentData, a as Config, U as UserGenerics, F as Fields, b as PuckAction, R as RootDataWithProps, c as ResolveDataTrigger, d as Plugin, O as Overrides, V as Viewports, I as IframeConfig, e as UiState, f as ComponentConfig, A as AppState, M as Metadata, g as Field, h as FieldProps, D as DropZoneProps, i as Data, j as OnAction, k as InitialHistory, l as ItemSelector } from './walk-tree-DhtH8sAC.mjs';
-export { _ as Adaptor, Y as ArrayField, t as ArrayState, ab as AsFieldProps, B as BaseData, K as BaseField, G as ComponentDataMap, z as ComponentDataOptionalId, J as Content, a2 as CustomField, a1 as CustomFieldRender, a8 as DefaultComponentProps, a5 as DefaultRootFieldProps, a7 as DefaultRootProps, a6 as DefaultRootRenderProps, m as Direction, n as DragAxis, a0 as ExternalField, $ as ExternalFieldWithAdaptor, ad as ExtractPropsFromConfig, ae as ExtractRootPropsFromConfig, r as FieldRenderFunctions, s as ItemWithId, E as MappedItem, N as NumberField, Z as ObjectField, q as OverrideKey, u as PuckComponent, a4 as PuckContext, X as RadioField, v as RootConfig, y as RootData, x as RootDataWithoutProps, Q as SelectField, S as Slot, a3 as SlotField, T as TextField, L as TextareaField, o as Viewport, ac as WithChildren, a9 as WithId, aa as WithPuckProps, W as WithSlotProps, af as migrate, p as overrideKeys, ah as resolveAllData, ag as transformProps, w as walkTree } from './walk-tree-DhtH8sAC.mjs';
+import { H as History, P as Permissions, C as ComponentData, a as Config, U as UserGenerics, F as Fields, b as PuckAction, R as RootDataWithProps, c as ResolveDataTrigger, d as Plugin, O as Overrides, V as Viewports, I as IframeConfig, e as UiState, f as ComponentConfig, A as AppState, M as Metadata, g as Field, h as FieldProps, D as DropZoneProps, i as Data, j as OnAction, k as InitialHistory, l as ItemSelector } from './walk-tree-C7k4UmlP.mjs';
+export { $ as Adaptor, Z as ArrayField, t as ArrayState, ac as AsFieldProps, B as BaseData, L as BaseField, J as ComponentDataMap, E as ComponentDataOptionalId, K as Content, a3 as CustomField, a2 as CustomFieldRender, a9 as DefaultComponentProps, a6 as DefaultRootFieldProps, a8 as DefaultRootProps, a7 as DefaultRootRenderProps, m as Direction, n as DragAxis, a1 as ExternalField, a0 as ExternalFieldWithAdaptor, ae as ExtractPropsFromConfig, af as ExtractRootPropsFromConfig, r as FieldRenderFunctions, s as ItemWithId, G as MappedItem, N as NumberField, _ as ObjectField, q as OverrideKey, v as PuckComponent, a5 as PuckContext, Y as RadioField, x as RootConfig, z as RootData, y as RootDataWithoutProps, X as SelectField, S as Slot, u as SlotComponent, a4 as SlotField, T as TextField, Q as TextareaField, o as Viewport, ad as WithChildren, aa as WithId, ab as WithPuckProps, W as WithSlotProps, ag as migrate, p as overrideKeys, ai as resolveAllData, ah as transformProps, w as walkTree } from './walk-tree-C7k4UmlP.mjs';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import * as react from 'react';
 import react__default, { ReactNode, SyntheticEvent, ReactElement } from 'react';
@@ -249,11 +249,8 @@ declare function Render<UserConfig extends Config = Config, G extends UserGeneri
     metadata?: Metadata;
 }): react_jsx_runtime.JSX.Element;
 
-type WithGet<T> = T & {
-    get: () => T;
-};
 type UsePuckData<UserConfig extends Config = Config, G extends UserGenerics<UserConfig> = UserGenerics<UserConfig>> = {
-    appState: AppState;
+    appState: G["UserPublicAppState"];
     config: UserConfig;
     dispatch: AppStore["dispatch"];
     getPermissions: GetPermissions<UserConfig>;
@@ -274,7 +271,7 @@ type UsePuckData<UserConfig extends Config = Config, G extends UserGenerics<User
     };
 };
 type PuckApi<UserConfig extends Config = Config> = UsePuckData<UserConfig>;
-type UsePuckStore<UserConfig extends Config = Config> = WithGet<PuckApi<UserConfig>>;
+type UsePuckStore<UserConfig extends Config = Config> = PuckApi<UserConfig>;
 /**
  * createUsePuck
  *

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { H as History, P as Permissions, C as ComponentData, a as Config, U as UserGenerics, F as Fields, b as PuckAction, R as RootDataWithProps, c as ResolveDataTrigger, d as Plugin, O as Overrides, V as Viewports, I as IframeConfig, e as UiState, f as ComponentConfig, A as AppState, M as Metadata, g as Field, h as FieldProps, D as DropZoneProps, i as Data, j as OnAction, k as InitialHistory, l as ItemSelector } from './walk-tree-DhtH8sAC.js';
-export { _ as Adaptor, Y as ArrayField, t as ArrayState, ab as AsFieldProps, B as BaseData, K as BaseField, G as ComponentDataMap, z as ComponentDataOptionalId, J as Content, a2 as CustomField, a1 as CustomFieldRender, a8 as DefaultComponentProps, a5 as DefaultRootFieldProps, a7 as DefaultRootProps, a6 as DefaultRootRenderProps, m as Direction, n as DragAxis, a0 as ExternalField, $ as ExternalFieldWithAdaptor, ad as ExtractPropsFromConfig, ae as ExtractRootPropsFromConfig, r as FieldRenderFunctions, s as ItemWithId, E as MappedItem, N as NumberField, Z as ObjectField, q as OverrideKey, u as PuckComponent, a4 as PuckContext, X as RadioField, v as RootConfig, y as RootData, x as RootDataWithoutProps, Q as SelectField, S as Slot, a3 as SlotField, T as TextField, L as TextareaField, o as Viewport, ac as WithChildren, a9 as WithId, aa as WithPuckProps, W as WithSlotProps, af as migrate, p as overrideKeys, ah as resolveAllData, ag as transformProps, w as walkTree } from './walk-tree-DhtH8sAC.js';
+import { H as History, P as Permissions, C as ComponentData, a as Config, U as UserGenerics, F as Fields, b as PuckAction, R as RootDataWithProps, c as ResolveDataTrigger, d as Plugin, O as Overrides, V as Viewports, I as IframeConfig, e as UiState, f as ComponentConfig, A as AppState, M as Metadata, g as Field, h as FieldProps, D as DropZoneProps, i as Data, j as OnAction, k as InitialHistory, l as ItemSelector } from './walk-tree-C7k4UmlP.js';
+export { $ as Adaptor, Z as ArrayField, t as ArrayState, ac as AsFieldProps, B as BaseData, L as BaseField, J as ComponentDataMap, E as ComponentDataOptionalId, K as Content, a3 as CustomField, a2 as CustomFieldRender, a9 as DefaultComponentProps, a6 as DefaultRootFieldProps, a8 as DefaultRootProps, a7 as DefaultRootRenderProps, m as Direction, n as DragAxis, a1 as ExternalField, a0 as ExternalFieldWithAdaptor, ae as ExtractPropsFromConfig, af as ExtractRootPropsFromConfig, r as FieldRenderFunctions, s as ItemWithId, G as MappedItem, N as NumberField, _ as ObjectField, q as OverrideKey, v as PuckComponent, a5 as PuckContext, Y as RadioField, x as RootConfig, z as RootData, y as RootDataWithoutProps, X as SelectField, S as Slot, u as SlotComponent, a4 as SlotField, T as TextField, Q as TextareaField, o as Viewport, ad as WithChildren, aa as WithId, ab as WithPuckProps, W as WithSlotProps, ag as migrate, p as overrideKeys, ai as resolveAllData, ah as transformProps, w as walkTree } from './walk-tree-C7k4UmlP.js';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import * as react from 'react';
 import react__default, { ReactNode, SyntheticEvent, ReactElement } from 'react';
@@ -249,11 +249,8 @@ declare function Render<UserConfig extends Config = Config, G extends UserGeneri
     metadata?: Metadata;
 }): react_jsx_runtime.JSX.Element;
 
-type WithGet<T> = T & {
-    get: () => T;
-};
 type UsePuckData<UserConfig extends Config = Config, G extends UserGenerics<UserConfig> = UserGenerics<UserConfig>> = {
-    appState: AppState;
+    appState: G["UserPublicAppState"];
     config: UserConfig;
     dispatch: AppStore["dispatch"];
     getPermissions: GetPermissions<UserConfig>;
@@ -274,7 +271,7 @@ type UsePuckData<UserConfig extends Config = Config, G extends UserGenerics<User
     };
 };
 type PuckApi<UserConfig extends Config = Config> = UsePuckData<UserConfig>;
-type UsePuckStore<UserConfig extends Config = Config> = WithGet<PuckApi<UserConfig>>;
+type UsePuckStore<UserConfig extends Config = Config> = PuckApi<UserConfig>;
 /**
  * createUsePuck
  *

package/dist/index.js

@@ -4699,19 +4699,9 @@ var DropZoneProvider = ({
     },
     [dispatch]
   );
-  const unregisterZone = (0, import_react25.useCallback)(
-    (zoneCompound) => {
-      dispatch({
-        type: "unregisterZone",
-        zone: zoneCompound
-      });
-    },
-    [dispatch]
-  );
   const memoValue = (0, import_react25.useMemo)(
     () => __spreadValues({
-      registerZone,
-      unregisterZone
+      registerZone
     }, value),
     [value]
   );
@@ -5083,7 +5073,8 @@ var DraggableComponent = ({
       el.removeEventListener("mouseout", _onMouseOut);
     };
   }, [
-    ref,
+    ref.current,
+    // Remount attributes if the element changes
     onClick,
     containsActiveZone,
     zoneCompound,
@@ -5585,7 +5576,8 @@ var DropZoneChild = ({
       return {
         type: preview.componentType,
         props: preview.props,
-        previewType: preview.type
+        previewType: preview.type,
+        element: preview.element
       };
     }
     return null;
@@ -5618,6 +5610,12 @@ var DropZoneChild = ({
   let label = (_b = (_a = componentConfig == null ? void 0 : componentConfig.label) != null ? _a : item == null ? void 0 : item.type.toString()) != null ? _b : "Component";
   const renderPreview = (0, import_react35.useMemo)(
     () => function Preview3() {
+      if (item && "element" in item && item.element) {
+        return (
+          // Safe to use this since the HTML is set by the user
+          /* @__PURE__ */ (0, import_jsx_runtime25.jsx)("div", { dangerouslySetInnerHTML: { __html: item.element.outerHTML } })
+        );
+      }
       return /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(DrawerItemInner, { name: label, children: overrides.componentItem });
     },
     [componentId, label, overrides]
@@ -5693,6 +5691,7 @@ var DropZoneEdit = (0, import_react35.forwardRef)(
     collisionAxis
   }, userRef) {
     const ctx = (0, import_react35.useContext)(dropZoneContext);
+    const appStoreApi = useAppStoreApi();
     const {
       // These all need setting via context
       areaId,
@@ -5734,13 +5733,8 @@ var DropZoneEdit = (0, import_react35.forwardRef)(
         if (ctx == null ? void 0 : ctx.registerZone) {
           ctx == null ? void 0 : ctx.registerZone(zoneCompound);
         }
-        return () => {
-          if (ctx == null ? void 0 : ctx.unregisterZone) {
-            ctx == null ? void 0 : ctx.unregisterZone(zoneCompound);
-          }
-        };
       }
-    }, [zoneType]);
+    }, [zoneType, appStoreApi]);
     (0, import_react35.useEffect)(() => {
       if (zoneType === "dropzone") {
         if (zoneCompound !== rootDroppableId) {
@@ -5912,11 +5906,6 @@ var DropZoneRender2 = (0, import_react35.forwardRef)(
         if (ctx == null ? void 0 : ctx.registerZone) {
           ctx == null ? void 0 : ctx.registerZone(zoneCompound);
         }
-        return () => {
-          if (ctx == null ? void 0 : ctx.unregisterZone) {
-            ctx == null ? void 0 : ctx.unregisterZone(zoneCompound);
-          }
-        };
       }
     }, [content]);
     if (!data || !config) {
@@ -6177,6 +6166,7 @@ var findDeepestCandidate = (position, manager) => {
     });
     filteredCandidates.reverse();
     const primaryCandidate = filteredCandidates[0];
+    if (!primaryCandidate) return { zone: null, area: null };
     const primaryCandidateData = primaryCandidate.data;
     const primaryCandidateIsComponent = "containsActiveZone" in primaryCandidateData;
     const zone = getZoneId2(primaryCandidate);
@@ -6581,6 +6571,7 @@ var DragDropContextClient = ({
                     type: "insert",
                     index: targetIndex,
                     zone: targetZone,
+                    element: source.element,
                     props: {
                       id: source.id.toString()
                     }
@@ -6606,7 +6597,8 @@ var DragDropContextClient = ({
                       type: "move",
                       index: targetIndex,
                       zone: targetZone,
-                      props: item.props
+                      props: item.props,
+                      element: source.element
                     }
                   }
                 });
@@ -6636,7 +6628,8 @@ var DragDropContextClient = ({
                       type: "move",
                       index: sourceData.index,
                       zone: sourceData.zone,
-                      props: item.props
+                      props: item.props,
+                      element: source.element
                     }
                   }
                 });
@@ -7591,7 +7584,7 @@ var Preview2 = ({ id = "puck-preview" }) => {
       editMode: true,
       children: /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(DropZonePure, { zone: rootDroppableId })
     })
-  ) : /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Render2, { data: renderData, config });
+  ) : /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Render2, { data: renderData, config, metadata });
   (0, import_react46.useEffect)(() => {
     if (!iframe.enabled) {
       setStatus("READY");
@@ -8476,8 +8469,7 @@ var generateUsePuck = (store) => {
       return { zone: zoneCompound, index };
     }
   };
-  const get = () => storeData;
-  return __spreadProps(__spreadValues({}, storeData), { get });
+  return storeData;
 };
 var UsePuckStoreContext = (0, import_react54.createContext)(
   null

package/dist/index.mjs

@@ -3808,19 +3808,9 @@ var DropZoneProvider = ({
     },
     [dispatch]
   );
-  const unregisterZone = useCallback5(
-    (zoneCompound) => {
-      dispatch({
-        type: "unregisterZone",
-        zone: zoneCompound
-      });
-    },
-    [dispatch]
-  );
   const memoValue = useMemo6(
     () => __spreadValues({
-      registerZone,
-      unregisterZone
+      registerZone
     }, value),
     [value]
   );
@@ -4192,7 +4182,8 @@ var DraggableComponent = ({
       el.removeEventListener("mouseout", _onMouseOut);
     };
   }, [
-    ref,
+    ref.current,
+    // Remount attributes if the element changes
     onClick,
     containsActiveZone,
     zoneCompound,
@@ -4694,7 +4685,8 @@ var DropZoneChild = ({
       return {
         type: preview.componentType,
         props: preview.props,
-        previewType: preview.type
+        previewType: preview.type,
+        element: preview.element
       };
     }
     return null;
@@ -4727,6 +4719,12 @@ var DropZoneChild = ({
   let label = (_b = (_a = componentConfig == null ? void 0 : componentConfig.label) != null ? _a : item == null ? void 0 : item.type.toString()) != null ? _b : "Component";
   const renderPreview = useMemo9(
     () => function Preview3() {
+      if (item && "element" in item && item.element) {
+        return (
+          // Safe to use this since the HTML is set by the user
+          /* @__PURE__ */ jsx23("div", { dangerouslySetInnerHTML: { __html: item.element.outerHTML } })
+        );
+      }
       return /* @__PURE__ */ jsx23(DrawerItemInner, { name: label, children: overrides.componentItem });
     },
     [componentId, label, overrides]
@@ -4802,6 +4800,7 @@ var DropZoneEdit = forwardRef3(
     collisionAxis
   }, userRef) {
     const ctx = useContext7(dropZoneContext);
+    const appStoreApi = useAppStoreApi();
     const {
       // These all need setting via context
       areaId,
@@ -4843,13 +4842,8 @@ var DropZoneEdit = forwardRef3(
         if (ctx == null ? void 0 : ctx.registerZone) {
           ctx == null ? void 0 : ctx.registerZone(zoneCompound);
         }
-        return () => {
-          if (ctx == null ? void 0 : ctx.unregisterZone) {
-            ctx == null ? void 0 : ctx.unregisterZone(zoneCompound);
-          }
-        };
       }
-    }, [zoneType]);
+    }, [zoneType, appStoreApi]);
     useEffect16(() => {
       if (zoneType === "dropzone") {
         if (zoneCompound !== rootDroppableId) {
@@ -5021,11 +5015,6 @@ var DropZoneRender = forwardRef3(
         if (ctx == null ? void 0 : ctx.registerZone) {
           ctx == null ? void 0 : ctx.registerZone(zoneCompound);
         }
-        return () => {
-          if (ctx == null ? void 0 : ctx.unregisterZone) {
-            ctx == null ? void 0 : ctx.unregisterZone(zoneCompound);
-          }
-        };
       }
     }, [content]);
     if (!data || !config) {
@@ -5286,6 +5275,7 @@ var findDeepestCandidate = (position, manager) => {
     });
     filteredCandidates.reverse();
     const primaryCandidate = filteredCandidates[0];
+    if (!primaryCandidate) return { zone: null, area: null };
     const primaryCandidateData = primaryCandidate.data;
     const primaryCandidateIsComponent = "containsActiveZone" in primaryCandidateData;
     const zone = getZoneId(primaryCandidate);
@@ -5690,6 +5680,7 @@ var DragDropContextClient = ({
                     type: "insert",
                     index: targetIndex,
                     zone: targetZone,
+                    element: source.element,
                     props: {
                       id: source.id.toString()
                     }
@@ -5715,7 +5706,8 @@ var DragDropContextClient = ({
                       type: "move",
                       index: targetIndex,
                       zone: targetZone,
-                      props: item.props
+                      props: item.props,
+                      element: source.element
                     }
                   }
                 });
@@ -5745,7 +5737,8 @@ var DragDropContextClient = ({
                       type: "move",
                       index: sourceData.index,
                       zone: sourceData.zone,
-                      props: item.props
+                      props: item.props,
+                      element: source.element
                     }
                   }
                 });
@@ -6713,7 +6706,7 @@ var Preview2 = ({ id = "puck-preview" }) => {
       editMode: true,
       children: /* @__PURE__ */ jsx32(DropZonePure, { zone: rootDroppableId })
     })
-  ) : /* @__PURE__ */ jsx32(Render, { data: renderData, config });
+  ) : /* @__PURE__ */ jsx32(Render, { data: renderData, config, metadata });
   useEffect20(() => {
     if (!iframe.enabled) {
       setStatus("READY");
@@ -7604,8 +7597,7 @@ var generateUsePuck = (store) => {
       return { zone: zoneCompound, index };
     }
   };
-  const get = () => storeData;
-  return __spreadProps(__spreadValues({}, storeData), { get });
+  return storeData;
 };
 var UsePuckStoreContext = createContext6(
   null

package/dist/rsc.d.mts

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { a as Config, U as UserGenerics, M as Metadata } from './walk-tree-DhtH8sAC.mjs';
-export { af as migrate, ah as resolveAllData, ag as transformProps, w as walkTree } from './walk-tree-DhtH8sAC.mjs';
+import { a as Config, U as UserGenerics, M as Metadata } from './walk-tree-C7k4UmlP.mjs';
+export { ag as migrate, ai as resolveAllData, ah as transformProps, w as walkTree } from './walk-tree-C7k4UmlP.mjs';
 import 'react';
 
 declare function Render<UserConfig extends Config = Config, G extends UserGenerics<UserConfig> = UserGenerics<UserConfig>>({ config, data, metadata, }: {

package/dist/rsc.d.ts

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { a as Config, U as UserGenerics, M as Metadata } from './walk-tree-DhtH8sAC.js';
-export { af as migrate, ah as resolveAllData, ag as transformProps, w as walkTree } from './walk-tree-DhtH8sAC.js';
+import { a as Config, U as UserGenerics, M as Metadata } from './walk-tree-C7k4UmlP.js';
+export { ag as migrate, ai as resolveAllData, ah as transformProps, w as walkTree } from './walk-tree-C7k4UmlP.js';
 import 'react';
 
 declare function Render<UserConfig extends Config = Config, G extends UserGenerics<UserConfig> = UserGenerics<UserConfig>>({ config, data, metadata, }: {

package/dist/{walk-tree-DhtH8sAC.d.mts → walk-tree-C7k4UmlP.d.mts}

@@ -49,11 +49,11 @@ type RadioField = BaseField & {
     type: "radio";
     options: FieldOptions;
 };
-type ArrayField<Props extends {
+type ArrayField<Props extends any = {
     [key: string]: any;
-} = {
+}> = Props extends {
     [key: string]: any;
-}> = BaseField & {
+} ? BaseField & {
     type: "array";
     arrayFields: {
         [SubPropName in keyof Props[0]]: Field<Props[0][SubPropName]>;
@@ -62,14 +62,12 @@ type ArrayField<Props extends {
     getItemSummary?: (item: Props[0], index?: number) => string;
     max?: number;
     min?: number;
-};
-type ObjectField<Props extends {
-    [key: string]: any;
-} = {
+} : never;
+type ObjectField<Props extends any = {
     [key: string]: any;
 }> = BaseField & {
     type: "object";
-    objectFields: Props extends any[] ? never : {
+    objectFields: {
         [SubPropName in keyof Props]: Field<Props[SubPropName]>;
     };
 };
@@ -78,20 +76,17 @@ type Adaptor<AdaptorParams = {}, TableShape extends Record<string, any> = {}, Pr
     fetchList: (adaptorParams?: AdaptorParams) => Promise<TableShape[] | null>;
     mapProp?: (value: TableShape) => PropShape;
 };
-type ExternalFieldWithAdaptor<Props extends {
-    [key: string]: any;
-} = {
+type NotUndefined<T> = T extends undefined ? Record<string, any> : T;
+type ExternalFieldWithAdaptor<Props extends any = {
     [key: string]: any;
 }> = BaseField & {
     type: "external";
     placeholder?: string;
     adaptor: Adaptor<any, any, Props>;
     adaptorParams?: object;
-    getItemSummary: (item: Props, index?: number) => string;
+    getItemSummary: (item: NotUndefined<Props>, index?: number) => string;
 };
-type ExternalField<Props extends {
-    [key: string]: any;
-} = {
+type ExternalField<Props extends any = {
     [key: string]: any;
 }> = BaseField & {
     type: "external";
@@ -102,7 +97,7 @@ type ExternalField<Props extends {
     }) => Promise<any[] | null>;
     mapProp?: (value: any) => Props;
     mapRow?: (value: any) => Record<string, string | number | ReactElement>;
-    getItemSummary?: (item: Props, index?: number) => string;
+    getItemSummary?: (item: NotUndefined<Props>, index?: number) => string;
     showSearch?: boolean;
     renderFooter?: (props: {
         items: any[];
@@ -128,15 +123,7 @@ type SlotField = BaseField & {
     allow?: string[];
     disallow?: string[];
 };
-type Field<Props extends any = any> = TextField | NumberField | TextareaField | SelectField | RadioField | ArrayField<Props extends {
-    [key: string]: any;
-} ? Props : any> | ObjectField<Props extends {
-    [key: string]: any;
-} ? Props : any> | ExternalField<Props extends {
-    [key: string]: any;
-} ? Props : any> | ExternalFieldWithAdaptor<Props extends {
-    [key: string]: any;
-} ? Props : any> | CustomField<Props> | SlotField;
+type Field<ValueType = any> = TextField | NumberField | TextareaField | SelectField | RadioField | ArrayField<ValueType> | ObjectField<ValueType> | ExternalField<ValueType> | ExternalFieldWithAdaptor<ValueType> | CustomField<ValueType> | SlotField;
 type Fields<ComponentProps extends DefaultComponentProps = DefaultComponentProps> = {
     [PropName in keyof Omit<ComponentProps, "editMode">]: Field<ComponentProps[PropName]>;
 };
@@ -222,12 +209,13 @@ type WithChildren<Props> = Props & {
 };
 type ExtractPropsFromConfig<UserConfig> = UserConfig extends Config<infer P, any, any> ? P : never;
 type ExtractRootPropsFromConfig<UserConfig> = UserConfig extends Config<any, infer P, any> ? P : never;
-type UserGenerics<UserConfig extends Config = Config, UserProps extends ExtractPropsFromConfig<UserConfig> = ExtractPropsFromConfig<UserConfig>, UserRootProps extends ExtractRootPropsFromConfig<UserConfig> = ExtractRootPropsFromConfig<UserConfig>, UserData extends Data<UserProps, UserRootProps> | Data = Data<UserProps, UserRootProps>, UserAppState extends PrivateAppState<UserData> = PrivateAppState<UserData>, UserComponentData extends ComponentData = UserData["content"][0]> = {
+type UserGenerics<UserConfig extends Config = Config, UserProps extends ExtractPropsFromConfig<UserConfig> = ExtractPropsFromConfig<UserConfig>, UserRootProps extends ExtractRootPropsFromConfig<UserConfig> = ExtractRootPropsFromConfig<UserConfig>, UserData extends Data<UserProps, UserRootProps> | Data = Data<UserProps, UserRootProps>, UserAppState extends PrivateAppState<UserData> = PrivateAppState<UserData>, UserPublicAppState extends AppState<UserData> = AppState<UserData>, UserComponentData extends ComponentData = UserData["content"][0]> = {
     UserConfig: UserConfig;
     UserProps: UserProps;
     UserRootProps: UserRootProps;
     UserData: UserData;
     UserAppState: UserAppState;
+    UserPublicAppState: UserPublicAppState;
     UserComponentData: UserComponentData;
 };
 
@@ -561,4 +549,4 @@ type WalkTreeOptions = {
 };
 declare function walkTree<T extends ComponentData | RootData | G["UserData"], UserConfig extends Config = Config, G extends UserGenerics<UserConfig> = UserGenerics<UserConfig>>(data: T, config: UserConfig, callbackFn: (data: Content, options: WalkTreeOptions) => Content | null | void): T;
 
-export { type ExternalFieldWithAdaptor as $, type AppState as A, type BaseData as B, type ComponentData as C, type DropZoneProps as D, type MappedItem as E, type Fields as F, type ComponentDataMap as G, type History as H, type IframeConfig as I, type Content as J, type BaseField as K, type TextareaField as L, type Metadata as M, type NumberField as N, type Overrides as O, type Permissions as P, type SelectField as Q, type RootDataWithProps as R, type Slot as S, type TextField as T, type UserGenerics as U, type Viewports as V, type WithSlotProps as W, type RadioField as X, type ArrayField as Y, type ObjectField as Z, type Adaptor as _, type Config as a, type ExternalField as a0, type CustomFieldRender as a1, type CustomField as a2, type SlotField as a3, type PuckContext as a4, type DefaultRootFieldProps as a5, type DefaultRootRenderProps as a6, type DefaultRootProps as a7, type DefaultComponentProps as a8, type WithId as a9, type WithPuckProps as aa, type AsFieldProps as ab, type WithChildren as ac, type ExtractPropsFromConfig as ad, type ExtractRootPropsFromConfig as ae, migrate as af, transformProps as ag, resolveAllData as ah, type PuckAction as b, type ResolveDataTrigger as c, type Plugin as d, type UiState as e, type ComponentConfig as f, type Field as g, type FieldProps as h, type Data as i, type OnAction as j, type InitialHistory as k, type ItemSelector as l, type Direction as m, type DragAxis as n, type Viewport as o, overrideKeys as p, type OverrideKey as q, type FieldRenderFunctions as r, type ItemWithId as s, type ArrayState as t, type PuckComponent as u, type RootConfig as v, walkTree as w, type RootDataWithoutProps as x, type RootData as y, type ComponentDataOptionalId as z };
+export { type Adaptor as $, type AppState as A, type BaseData as B, type ComponentData as C, type DropZoneProps as D, type ComponentDataOptionalId as E, type Fields as F, type MappedItem as G, type History as H, type IframeConfig as I, type ComponentDataMap as J, type Content as K, type BaseField as L, type Metadata as M, type NumberField as N, type Overrides as O, type Permissions as P, type TextareaField as Q, type RootDataWithProps as R, type Slot as S, type TextField as T, type UserGenerics as U, type Viewports as V, type WithSlotProps as W, type SelectField as X, type RadioField as Y, type ArrayField as Z, type ObjectField as _, type Config as a, type ExternalFieldWithAdaptor as a0, type ExternalField as a1, type CustomFieldRender as a2, type CustomField as a3, type SlotField as a4, type PuckContext as a5, type DefaultRootFieldProps as a6, type DefaultRootRenderProps as a7, type DefaultRootProps as a8, type DefaultComponentProps as a9, type WithId as aa, type WithPuckProps as ab, type AsFieldProps as ac, type WithChildren as ad, type ExtractPropsFromConfig as ae, type ExtractRootPropsFromConfig as af, migrate as ag, transformProps as ah, resolveAllData as ai, type PuckAction as b, type ResolveDataTrigger as c, type Plugin as d, type UiState as e, type ComponentConfig as f, type Field as g, type FieldProps as h, type Data as i, type OnAction as j, type InitialHistory as k, type ItemSelector as l, type Direction as m, type DragAxis as n, type Viewport as o, overrideKeys as p, type OverrideKey as q, type FieldRenderFunctions as r, type ItemWithId as s, type ArrayState as t, type SlotComponent as u, type PuckComponent as v, walkTree as w, type RootConfig as x, type RootDataWithoutProps as y, type RootData as z };

package/dist/{walk-tree-DhtH8sAC.d.ts → walk-tree-C7k4UmlP.d.ts}

@@ -49,11 +49,11 @@ type RadioField = BaseField & {
     type: "radio";
     options: FieldOptions;
 };
-type ArrayField<Props extends {
+type ArrayField<Props extends any = {
     [key: string]: any;
-} = {
+}> = Props extends {
     [key: string]: any;
-}> = BaseField & {
+} ? BaseField & {
     type: "array";
     arrayFields: {
         [SubPropName in keyof Props[0]]: Field<Props[0][SubPropName]>;
@@ -62,14 +62,12 @@ type ArrayField<Props extends {
     getItemSummary?: (item: Props[0], index?: number) => string;
     max?: number;
     min?: number;
-};
-type ObjectField<Props extends {
-    [key: string]: any;
-} = {
+} : never;
+type ObjectField<Props extends any = {
     [key: string]: any;
 }> = BaseField & {
     type: "object";
-    objectFields: Props extends any[] ? never : {
+    objectFields: {
         [SubPropName in keyof Props]: Field<Props[SubPropName]>;
     };
 };
@@ -78,20 +76,17 @@ type Adaptor<AdaptorParams = {}, TableShape extends Record<string, any> = {}, Pr
     fetchList: (adaptorParams?: AdaptorParams) => Promise<TableShape[] | null>;
     mapProp?: (value: TableShape) => PropShape;
 };
-type ExternalFieldWithAdaptor<Props extends {
-    [key: string]: any;
-} = {
+type NotUndefined<T> = T extends undefined ? Record<string, any> : T;
+type ExternalFieldWithAdaptor<Props extends any = {
     [key: string]: any;
 }> = BaseField & {
     type: "external";
     placeholder?: string;
     adaptor: Adaptor<any, any, Props>;
     adaptorParams?: object;
-    getItemSummary: (item: Props, index?: number) => string;
+    getItemSummary: (item: NotUndefined<Props>, index?: number) => string;
 };
-type ExternalField<Props extends {
-    [key: string]: any;
-} = {
+type ExternalField<Props extends any = {
     [key: string]: any;
 }> = BaseField & {
     type: "external";
@@ -102,7 +97,7 @@ type ExternalField<Props extends {
     }) => Promise<any[] | null>;
     mapProp?: (value: any) => Props;
     mapRow?: (value: any) => Record<string, string | number | ReactElement>;
-    getItemSummary?: (item: Props, index?: number) => string;
+    getItemSummary?: (item: NotUndefined<Props>, index?: number) => string;
     showSearch?: boolean;
     renderFooter?: (props: {
         items: any[];
@@ -128,15 +123,7 @@ type SlotField = BaseField & {
     allow?: string[];
     disallow?: string[];
 };
-type Field<Props extends any = any> = TextField | NumberField | TextareaField | SelectField | RadioField | ArrayField<Props extends {
-    [key: string]: any;
-} ? Props : any> | ObjectField<Props extends {
-    [key: string]: any;
-} ? Props : any> | ExternalField<Props extends {
-    [key: string]: any;
-} ? Props : any> | ExternalFieldWithAdaptor<Props extends {
-    [key: string]: any;
-} ? Props : any> | CustomField<Props> | SlotField;
+type Field<ValueType = any> = TextField | NumberField | TextareaField | SelectField | RadioField | ArrayField<ValueType> | ObjectField<ValueType> | ExternalField<ValueType> | ExternalFieldWithAdaptor<ValueType> | CustomField<ValueType> | SlotField;
 type Fields<ComponentProps extends DefaultComponentProps = DefaultComponentProps> = {
     [PropName in keyof Omit<ComponentProps, "editMode">]: Field<ComponentProps[PropName]>;
 };
@@ -222,12 +209,13 @@ type WithChildren<Props> = Props & {
 };
 type ExtractPropsFromConfig<UserConfig> = UserConfig extends Config<infer P, any, any> ? P : never;
 type ExtractRootPropsFromConfig<UserConfig> = UserConfig extends Config<any, infer P, any> ? P : never;
-type UserGenerics<UserConfig extends Config = Config, UserProps extends ExtractPropsFromConfig<UserConfig> = ExtractPropsFromConfig<UserConfig>, UserRootProps extends ExtractRootPropsFromConfig<UserConfig> = ExtractRootPropsFromConfig<UserConfig>, UserData extends Data<UserProps, UserRootProps> | Data = Data<UserProps, UserRootProps>, UserAppState extends PrivateAppState<UserData> = PrivateAppState<UserData>, UserComponentData extends ComponentData = UserData["content"][0]> = {
+type UserGenerics<UserConfig extends Config = Config, UserProps extends ExtractPropsFromConfig<UserConfig> = ExtractPropsFromConfig<UserConfig>, UserRootProps extends ExtractRootPropsFromConfig<UserConfig> = ExtractRootPropsFromConfig<UserConfig>, UserData extends Data<UserProps, UserRootProps> | Data = Data<UserProps, UserRootProps>, UserAppState extends PrivateAppState<UserData> = PrivateAppState<UserData>, UserPublicAppState extends AppState<UserData> = AppState<UserData>, UserComponentData extends ComponentData = UserData["content"][0]> = {
     UserConfig: UserConfig;
     UserProps: UserProps;
     UserRootProps: UserRootProps;
     UserData: UserData;
     UserAppState: UserAppState;
+    UserPublicAppState: UserPublicAppState;
     UserComponentData: UserComponentData;
 };
 
@@ -561,4 +549,4 @@ type WalkTreeOptions = {
 };
 declare function walkTree<T extends ComponentData | RootData | G["UserData"], UserConfig extends Config = Config, G extends UserGenerics<UserConfig> = UserGenerics<UserConfig>>(data: T, config: UserConfig, callbackFn: (data: Content, options: WalkTreeOptions) => Content | null | void): T;
 
-export { type ExternalFieldWithAdaptor as $, type AppState as A, type BaseData as B, type ComponentData as C, type DropZoneProps as D, type MappedItem as E, type Fields as F, type ComponentDataMap as G, type History as H, type IframeConfig as I, type Content as J, type BaseField as K, type TextareaField as L, type Metadata as M, type NumberField as N, type Overrides as O, type Permissions as P, type SelectField as Q, type RootDataWithProps as R, type Slot as S, type TextField as T, type UserGenerics as U, type Viewports as V, type WithSlotProps as W, type RadioField as X, type ArrayField as Y, type ObjectField as Z, type Adaptor as _, type Config as a, type ExternalField as a0, type CustomFieldRender as a1, type CustomField as a2, type SlotField as a3, type PuckContext as a4, type DefaultRootFieldProps as a5, type DefaultRootRenderProps as a6, type DefaultRootProps as a7, type DefaultComponentProps as a8, type WithId as a9, type WithPuckProps as aa, type AsFieldProps as ab, type WithChildren as ac, type ExtractPropsFromConfig as ad, type ExtractRootPropsFromConfig as ae, migrate as af, transformProps as ag, resolveAllData as ah, type PuckAction as b, type ResolveDataTrigger as c, type Plugin as d, type UiState as e, type ComponentConfig as f, type Field as g, type FieldProps as h, type Data as i, type OnAction as j, type InitialHistory as k, type ItemSelector as l, type Direction as m, type DragAxis as n, type Viewport as o, overrideKeys as p, type OverrideKey as q, type FieldRenderFunctions as r, type ItemWithId as s, type ArrayState as t, type PuckComponent as u, type RootConfig as v, walkTree as w, type RootDataWithoutProps as x, type RootData as y, type ComponentDataOptionalId as z };
+export { type Adaptor as $, type AppState as A, type BaseData as B, type ComponentData as C, type DropZoneProps as D, type ComponentDataOptionalId as E, type Fields as F, type MappedItem as G, type History as H, type IframeConfig as I, type ComponentDataMap as J, type Content as K, type BaseField as L, type Metadata as M, type NumberField as N, type Overrides as O, type Permissions as P, type TextareaField as Q, type RootDataWithProps as R, type Slot as S, type TextField as T, type UserGenerics as U, type Viewports as V, type WithSlotProps as W, type SelectField as X, type RadioField as Y, type ArrayField as Z, type ObjectField as _, type Config as a, type ExternalFieldWithAdaptor as a0, type ExternalField as a1, type CustomFieldRender as a2, type CustomField as a3, type SlotField as a4, type PuckContext as a5, type DefaultRootFieldProps as a6, type DefaultRootRenderProps as a7, type DefaultRootProps as a8, type DefaultComponentProps as a9, type WithId as aa, type WithPuckProps as ab, type AsFieldProps as ac, type WithChildren as ad, type ExtractPropsFromConfig as ae, type ExtractRootPropsFromConfig as af, migrate as ag, transformProps as ah, resolveAllData as ai, type PuckAction as b, type ResolveDataTrigger as c, type Plugin as d, type UiState as e, type ComponentConfig as f, type Field as g, type FieldProps as h, type Data as i, type OnAction as j, type InitialHistory as k, type ItemSelector as l, type Direction as m, type DragAxis as n, type Viewport as o, overrideKeys as p, type OverrideKey as q, type FieldRenderFunctions as r, type ItemWithId as s, type ArrayState as t, type SlotComponent as u, type PuckComponent as v, walkTree as w, type RootConfig as x, type RootDataWithoutProps as y, type RootData as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@measured/puck",
-  "version": "0.20.0-canary.3da831b0",
+  "version": "0.20.0-canary.6760121f",
   "author": "Chris Villa <chris@puckeditor.com>",
   "repository": "measuredco/puck",
   "bugs": "https://github.com/measuredco/puck/issues",