@measured/puck 0.20.0-canary.3da831b0 → 0.20.0-canary.68dd73b8

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-BOSl1o0G.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-BOSl1o0G.mjs';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import * as react from 'react';
 import react__default, { ReactNode, SyntheticEvent, ReactElement } from 'react';
@@ -249,9 +249,6 @@ 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;
     config: 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-BOSl1o0G.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-BOSl1o0G.js';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import * as react from 'react';
 import react__default, { ReactNode, SyntheticEvent, ReactElement } from 'react';
@@ -249,9 +249,6 @@ 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;
     config: 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]
   );
@@ -5693,6 +5683,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 +5725,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 +5898,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 +6158,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);
@@ -7591,7 +7573,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 +8458,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]
   );
@@ -4802,6 +4792,7 @@ var DropZoneEdit = forwardRef3(
     collisionAxis
   }, userRef) {
     const ctx = useContext7(dropZoneContext);
+    const appStoreApi = useAppStoreApi();
     const {
       // These all need setting via context
       areaId,
@@ -4843,13 +4834,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 +5007,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 +5267,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);
@@ -6713,7 +6695,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 +7586,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-BOSl1o0G.mjs';
+export { af as migrate, ah as resolveAllData, ag as transformProps, w as walkTree } from './walk-tree-BOSl1o0G.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-BOSl1o0G.js';
+export { af as migrate, ah as resolveAllData, ag as transformProps, w as walkTree } from './walk-tree-BOSl1o0G.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-BOSl1o0G.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]>;
 };

package/dist/{walk-tree-DhtH8sAC.d.ts → walk-tree-BOSl1o0G.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]>;
 };

package/package.json

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