@measured/puck 0.19.0-canary.e829bea0 → 0.19.0-canary.eda38b34

package/dist/rsc.mjs

@@ -1,114 +1,16 @@
 import {
-  SlotRenderPure,
-  __spreadProps,
-  __spreadValues,
+  Render,
   init_react_import,
   resolveAllData,
-  rootAreaId,
-  rootDroppableId,
-  rootZone,
-  setupZone,
   transformProps,
-  useSlots
-} from "./chunk-ZOHJNF5K.mjs";
+  walkTree
+} from "./chunk-44RES7IE.mjs";
 
 // rsc.tsx
 init_react_import();
-
-// components/ServerRender/index.tsx
-init_react_import();
-import { Fragment, jsx } from "react/jsx-runtime";
-function DropZoneRender({
-  zone,
-  data,
-  areaId = "root",
-  config,
-  metadata = {}
-}) {
-  let zoneCompound = rootDroppableId;
-  let content = (data == null ? void 0 : data.content) || [];
-  if (!data || !config) {
-    return null;
-  }
-  if (areaId !== rootAreaId && zone !== rootZone) {
-    zoneCompound = `${areaId}:${zone}`;
-    content = setupZone(data, zoneCompound).zones[zoneCompound];
-  }
-  return /* @__PURE__ */ jsx(Fragment, { children: content.map((item) => {
-    const Component = config.components[item.type];
-    const props = __spreadProps(__spreadValues({}, item.props), {
-      puck: {
-        renderDropZone: ({ zone: zone2 }) => /* @__PURE__ */ jsx(
-          DropZoneRender,
-          {
-            zone: zone2,
-            data,
-            areaId: item.props.id,
-            config,
-            metadata
-          }
-        ),
-        metadata
-      }
-    });
-    const propsWithSlots = useSlots(config.root, props, (props2) => /* @__PURE__ */ jsx(SlotRenderPure, __spreadProps(__spreadValues({}, props2), { config, metadata })));
-    if (Component) {
-      return /* @__PURE__ */ jsx(Component.render, __spreadValues({}, propsWithSlots), item.props.id);
-    }
-    return null;
-  }) });
-}
-function Render({
-  config,
-  data,
-  metadata = {}
-}) {
-  var _a;
-  const rootProps = data.root.props || data.root;
-  const title = rootProps.title || "";
-  const props = __spreadProps(__spreadValues({}, rootProps), {
-    puck: {
-      renderDropZone: ({ zone }) => /* @__PURE__ */ jsx(
-        DropZoneRender,
-        {
-          zone,
-          data,
-          config,
-          metadata
-        }
-      ),
-      isEditing: false,
-      dragRef: null,
-      metadata
-    },
-    title,
-    editMode: false,
-    id: "puck-root"
-  });
-  const propsWithSlots = useSlots(config.root, props, (props2) => /* @__PURE__ */ jsx(SlotRenderPure, __spreadProps(__spreadValues({}, props2), { config, metadata })));
-  if ((_a = config.root) == null ? void 0 : _a.render) {
-    return /* @__PURE__ */ jsx(config.root.render, __spreadProps(__spreadValues({}, propsWithSlots), { children: /* @__PURE__ */ jsx(
-      DropZoneRender,
-      {
-        config,
-        data,
-        zone: rootZone,
-        metadata
-      }
-    ) }));
-  }
-  return /* @__PURE__ */ jsx(
-    DropZoneRender,
-    {
-      config,
-      data,
-      zone: rootZone,
-      metadata
-    }
-  );
-}
 export {
   Render,
   resolveAllData,
-  transformProps
+  transformProps,
+  walkTree
 };

package/dist/{resolve-all-data-BFRAghCj.d.mts → walk-tree-CM-cu7GU.d.mts}

@@ -1,4 +1,4 @@
-import { CSSProperties, ReactElement, JSX, ReactNode } from 'react';
+import { CSSProperties, ReactElement, ReactNode, JSX } from 'react';
 
 type ItemSelector = {
     index: number;
@@ -110,16 +110,17 @@ type ExternalField<Props extends {
     filterFields?: Record<string, Field>;
     initialFilters?: Record<string, any>;
 };
-type CustomField<Props extends any = {}> = BaseField & {
+type CustomFieldRender<Value extends any> = (props: {
+    field: CustomField<Value>;
+    name: string;
+    id: string;
+    value: Value;
+    onChange: (value: Value) => void;
+    readOnly?: boolean;
+}) => ReactElement;
+type CustomField<Value extends any> = BaseField & {
     type: "custom";
-    render: (props: {
-        field: CustomField<Props>;
-        name: string;
-        id: string;
-        value: Props;
-        onChange: (value: Props) => void;
-        readOnly?: boolean;
-    }) => ReactElement;
+    render: CustomFieldRender<Value>;
 };
 type SlotField = BaseField & {
     type: "slot";
@@ -146,12 +147,12 @@ type FieldProps<F = Field<any>, ValueType = any> = {
     readOnly?: boolean;
 };
 
-type PuckComponent<Props> = (props: WithId<WithPuckProps<Props>>) => JSX.Element;
+type PuckComponent<Props> = (props: WithId<WithPuckProps<{
+    [PropName in keyof Props]: Props[PropName] extends Slot ? (props?: Omit<DropZoneProps, "zone">) => ReactNode : Props[PropName];
+}>>) => JSX.Element;
 type ResolveDataTrigger = "insert" | "replace" | "load" | "force";
 type ComponentConfig<RenderProps extends DefaultComponentProps = DefaultComponentProps, FieldProps extends DefaultComponentProps = RenderProps, DataShape = Omit<ComponentData<FieldProps>, "type">> = {
-    render: PuckComponent<{
-        [PropName in keyof RenderProps]: RenderProps[PropName] extends Slot ? (props?: Omit<DropZoneProps, "zone">) => ReactNode : RenderProps[PropName];
-    }>;
+    render: PuckComponent<RenderProps>;
     label?: string;
     defaultProps?: FieldProps;
     fields?: Fields<FieldProps>;
@@ -254,22 +255,28 @@ type BaseData<Props extends {
     readOnly?: Partial<Record<keyof Props, boolean>>;
 };
 type RootDataWithProps<Props extends DefaultComponentProps = DefaultRootFieldProps> = BaseData<Props> & {
-    props: Props;
+    props: WithPopulatedSlots<Props>;
 };
 type RootDataWithoutProps<Props extends DefaultComponentProps = DefaultRootFieldProps> = Props;
 type RootData<Props extends DefaultComponentProps = DefaultRootFieldProps> = Partial<RootDataWithProps<AsFieldProps<Props>>> & Partial<RootDataWithoutProps<Props>>;
 type ComponentData<Props extends DefaultComponentProps = DefaultComponentProps, Name = string> = {
     type: Name;
-    props: WithId<Props>;
+    props: WithId<WithPopulatedSlots<Props>>;
+} & BaseData<Props>;
+type ComponentDataOptionalId<Props extends DefaultComponentProps = DefaultComponentProps, Name = string> = {
+    type: Name;
+    props: Props & {
+        id?: string;
+    };
 } & BaseData<Props>;
 type MappedItem = ComponentData;
 type ComponentDataMap<Props extends Record<string, DefaultComponentProps> = DefaultComponentProps> = {
     [K in keyof Props]: ComponentData<Props[K], K extends string ? K : never>;
 }[keyof Props];
 type Content<PropsMap extends {
-    [key: string]: any;
+    [key: string]: DefaultComponentProps;
 } = {
-    [key: string]: any;
+    [key: string]: DefaultComponentProps;
 }> = ComponentDataMap<PropsMap>[];
 type Data<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends DefaultComponentProps = DefaultRootFieldProps> = {
     root: RootData<RootProps>;
@@ -338,6 +345,9 @@ type PrivateAppState<UserData extends Data = Data> = AppState<UserData> & {
         zones: ZoneIndex;
     };
 };
+type WithPopulatedSlots<Props extends DefaultComponentProps = DefaultComponentProps, SlotProps extends DefaultComponentProps = Props> = Props extends any ? any : {
+    [PropName in keyof Props]: Props[PropName] extends Slot<SlotProps> ? Content<SlotProps> : Props[PropName];
+};
 
 type RenderFunc<Props extends {
     [key: string]: any;
@@ -445,7 +455,13 @@ type InitialHistoryNoAppend<AS = Partial<AppState>> = {
     appendData?: false;
 };
 type InitialHistory<AS = Partial<AppState>> = InitialHistoryAppend<AS> | InitialHistoryNoAppend<AS>;
-type Slot = Content;
+type Slot<Props extends {
+    [key: string]: DefaultComponentProps;
+} = {
+    [key: string]: DefaultComponentProps;
+}> = {
+    [K in keyof Props]: ComponentDataOptionalId<Props[K], K extends string ? K : never>;
+}[keyof Props][];
 
 type InsertAction = {
     type: "insert";
@@ -526,4 +542,10 @@ declare function transformProps<Props extends DefaultComponentProps = DefaultCom
 
 declare function resolveAllData<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends Record<string, any> = DefaultRootFieldProps>(data: Partial<Data>, config: Config, metadata?: Metadata, onResolveStart?: (item: ComponentData) => void, onResolveEnd?: (item: ComponentData) => void): Promise<Data<Props, RootProps>>;
 
-export { type SlotField as $, type AppState as A, type BaseData as B, type ComponentData as C, type DropZoneProps as D, type ComponentDataMap as E, type Fields as F, type BaseField as G, type History as H, type IframeConfig as I, type TextareaField as J, type SelectField as K, type RadioField as L, type Metadata as M, type NumberField as N, type Overrides as O, type Permissions as P, type ArrayField as Q, type RootDataWithProps as R, type Slot as S, type TextField as T, type UserGenerics as U, type Viewports as V, type ObjectField as W, type Adaptor as X, type ExternalFieldWithAdaptor as Y, type ExternalField as Z, type CustomField as _, type Config as a, type PuckContext as a0, type DefaultRootFieldProps as a1, type DefaultRootRenderProps as a2, type DefaultRootProps as a3, type DefaultComponentProps as a4, type WithId as a5, type WithPuckProps as a6, type AsFieldProps as a7, type WithChildren as a8, type ExtractPropsFromConfig as a9, type ExtractRootPropsFromConfig as aa, transformProps as ab, resolveAllData as ac, 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 RootData as l, type Content as m, type ItemSelector as n, type Direction as o, type DragAxis as p, type Viewport as q, overrideKeys as r, type OverrideKey as s, type FieldRenderFunctions as t, type ItemWithId as u, type ArrayState as v, type PuckComponent as w, type RootConfig as x, type RootDataWithoutProps as y, type MappedItem as z };
+type WalkTreeOptions = {
+    parentId: string;
+    propName: string;
+};
+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 ExternalField 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 RadioField as W, type ArrayField as X, type ObjectField as Y, type Adaptor as Z, type ExternalFieldWithAdaptor as _, type Config as a, type CustomFieldRender as a0, type CustomField as a1, type SlotField as a2, type PuckContext as a3, type DefaultRootFieldProps as a4, type DefaultRootRenderProps as a5, type DefaultRootProps as a6, type DefaultComponentProps as a7, type WithId as a8, type WithPuckProps as a9, type AsFieldProps as aa, type WithChildren as ab, type ExtractPropsFromConfig as ac, type ExtractRootPropsFromConfig as ad, transformProps as ae, resolveAllData as af, 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 };

package/dist/{resolve-all-data-BFRAghCj.d.ts → walk-tree-CM-cu7GU.d.ts}

@@ -1,4 +1,4 @@
-import { CSSProperties, ReactElement, JSX, ReactNode } from 'react';
+import { CSSProperties, ReactElement, ReactNode, JSX } from 'react';
 
 type ItemSelector = {
     index: number;
@@ -110,16 +110,17 @@ type ExternalField<Props extends {
     filterFields?: Record<string, Field>;
     initialFilters?: Record<string, any>;
 };
-type CustomField<Props extends any = {}> = BaseField & {
+type CustomFieldRender<Value extends any> = (props: {
+    field: CustomField<Value>;
+    name: string;
+    id: string;
+    value: Value;
+    onChange: (value: Value) => void;
+    readOnly?: boolean;
+}) => ReactElement;
+type CustomField<Value extends any> = BaseField & {
     type: "custom";
-    render: (props: {
-        field: CustomField<Props>;
-        name: string;
-        id: string;
-        value: Props;
-        onChange: (value: Props) => void;
-        readOnly?: boolean;
-    }) => ReactElement;
+    render: CustomFieldRender<Value>;
 };
 type SlotField = BaseField & {
     type: "slot";
@@ -146,12 +147,12 @@ type FieldProps<F = Field<any>, ValueType = any> = {
     readOnly?: boolean;
 };
 
-type PuckComponent<Props> = (props: WithId<WithPuckProps<Props>>) => JSX.Element;
+type PuckComponent<Props> = (props: WithId<WithPuckProps<{
+    [PropName in keyof Props]: Props[PropName] extends Slot ? (props?: Omit<DropZoneProps, "zone">) => ReactNode : Props[PropName];
+}>>) => JSX.Element;
 type ResolveDataTrigger = "insert" | "replace" | "load" | "force";
 type ComponentConfig<RenderProps extends DefaultComponentProps = DefaultComponentProps, FieldProps extends DefaultComponentProps = RenderProps, DataShape = Omit<ComponentData<FieldProps>, "type">> = {
-    render: PuckComponent<{
-        [PropName in keyof RenderProps]: RenderProps[PropName] extends Slot ? (props?: Omit<DropZoneProps, "zone">) => ReactNode : RenderProps[PropName];
-    }>;
+    render: PuckComponent<RenderProps>;
     label?: string;
     defaultProps?: FieldProps;
     fields?: Fields<FieldProps>;
@@ -254,22 +255,28 @@ type BaseData<Props extends {
     readOnly?: Partial<Record<keyof Props, boolean>>;
 };
 type RootDataWithProps<Props extends DefaultComponentProps = DefaultRootFieldProps> = BaseData<Props> & {
-    props: Props;
+    props: WithPopulatedSlots<Props>;
 };
 type RootDataWithoutProps<Props extends DefaultComponentProps = DefaultRootFieldProps> = Props;
 type RootData<Props extends DefaultComponentProps = DefaultRootFieldProps> = Partial<RootDataWithProps<AsFieldProps<Props>>> & Partial<RootDataWithoutProps<Props>>;
 type ComponentData<Props extends DefaultComponentProps = DefaultComponentProps, Name = string> = {
     type: Name;
-    props: WithId<Props>;
+    props: WithId<WithPopulatedSlots<Props>>;
+} & BaseData<Props>;
+type ComponentDataOptionalId<Props extends DefaultComponentProps = DefaultComponentProps, Name = string> = {
+    type: Name;
+    props: Props & {
+        id?: string;
+    };
 } & BaseData<Props>;
 type MappedItem = ComponentData;
 type ComponentDataMap<Props extends Record<string, DefaultComponentProps> = DefaultComponentProps> = {
     [K in keyof Props]: ComponentData<Props[K], K extends string ? K : never>;
 }[keyof Props];
 type Content<PropsMap extends {
-    [key: string]: any;
+    [key: string]: DefaultComponentProps;
 } = {
-    [key: string]: any;
+    [key: string]: DefaultComponentProps;
 }> = ComponentDataMap<PropsMap>[];
 type Data<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends DefaultComponentProps = DefaultRootFieldProps> = {
     root: RootData<RootProps>;
@@ -338,6 +345,9 @@ type PrivateAppState<UserData extends Data = Data> = AppState<UserData> & {
         zones: ZoneIndex;
     };
 };
+type WithPopulatedSlots<Props extends DefaultComponentProps = DefaultComponentProps, SlotProps extends DefaultComponentProps = Props> = Props extends any ? any : {
+    [PropName in keyof Props]: Props[PropName] extends Slot<SlotProps> ? Content<SlotProps> : Props[PropName];
+};
 
 type RenderFunc<Props extends {
     [key: string]: any;
@@ -445,7 +455,13 @@ type InitialHistoryNoAppend<AS = Partial<AppState>> = {
     appendData?: false;
 };
 type InitialHistory<AS = Partial<AppState>> = InitialHistoryAppend<AS> | InitialHistoryNoAppend<AS>;
-type Slot = Content;
+type Slot<Props extends {
+    [key: string]: DefaultComponentProps;
+} = {
+    [key: string]: DefaultComponentProps;
+}> = {
+    [K in keyof Props]: ComponentDataOptionalId<Props[K], K extends string ? K : never>;
+}[keyof Props][];
 
 type InsertAction = {
     type: "insert";
@@ -526,4 +542,10 @@ declare function transformProps<Props extends DefaultComponentProps = DefaultCom
 
 declare function resolveAllData<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends Record<string, any> = DefaultRootFieldProps>(data: Partial<Data>, config: Config, metadata?: Metadata, onResolveStart?: (item: ComponentData) => void, onResolveEnd?: (item: ComponentData) => void): Promise<Data<Props, RootProps>>;
 
-export { type SlotField as $, type AppState as A, type BaseData as B, type ComponentData as C, type DropZoneProps as D, type ComponentDataMap as E, type Fields as F, type BaseField as G, type History as H, type IframeConfig as I, type TextareaField as J, type SelectField as K, type RadioField as L, type Metadata as M, type NumberField as N, type Overrides as O, type Permissions as P, type ArrayField as Q, type RootDataWithProps as R, type Slot as S, type TextField as T, type UserGenerics as U, type Viewports as V, type ObjectField as W, type Adaptor as X, type ExternalFieldWithAdaptor as Y, type ExternalField as Z, type CustomField as _, type Config as a, type PuckContext as a0, type DefaultRootFieldProps as a1, type DefaultRootRenderProps as a2, type DefaultRootProps as a3, type DefaultComponentProps as a4, type WithId as a5, type WithPuckProps as a6, type AsFieldProps as a7, type WithChildren as a8, type ExtractPropsFromConfig as a9, type ExtractRootPropsFromConfig as aa, transformProps as ab, resolveAllData as ac, 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 RootData as l, type Content as m, type ItemSelector as n, type Direction as o, type DragAxis as p, type Viewport as q, overrideKeys as r, type OverrideKey as s, type FieldRenderFunctions as t, type ItemWithId as u, type ArrayState as v, type PuckComponent as w, type RootConfig as x, type RootDataWithoutProps as y, type MappedItem as z };
+type WalkTreeOptions = {
+    parentId: string;
+    propName: string;
+};
+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 ExternalField 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 RadioField as W, type ArrayField as X, type ObjectField as Y, type Adaptor as Z, type ExternalFieldWithAdaptor as _, type Config as a, type CustomFieldRender as a0, type CustomField as a1, type SlotField as a2, type PuckContext as a3, type DefaultRootFieldProps as a4, type DefaultRootRenderProps as a5, type DefaultRootProps as a6, type DefaultComponentProps as a7, type WithId as a8, type WithPuckProps as a9, type AsFieldProps as aa, type WithChildren as ab, type ExtractPropsFromConfig as ac, type ExtractRootPropsFromConfig as ad, transformProps as ae, resolveAllData as af, 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 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@measured/puck",
-  "version": "0.19.0-canary.e829bea0",
+  "version": "0.19.0-canary.eda38b34",
   "author": "Chris Villa <chris@puckeditor.com>",
   "repository": "measuredco/puck",
   "bugs": "https://github.com/measuredco/puck/issues",
@@ -49,6 +49,8 @@
     "dist"
   ],
   "devDependencies": {
+    "@dnd-kit/helpers": "^0.1.12",
+    "@dnd-kit/react": "^0.1.12",
     "@testing-library/react": "^16.1.0",
     "@types/deep-diff": "^1.0.3",
     "@types/jest": "^29.5.4",
@@ -69,8 +71,6 @@
     "typescript": "^5.5.4"
   },
   "dependencies": {
-    "@dnd-kit/helpers": "0.0.7-beta-20250130032138",
-    "@dnd-kit/react": "0.0.7-beta-20250130032138",
     "deep-diff": "^1.0.2",
     "fast-deep-equal": "^3.1.3",
     "object-hash": "^3.0.0",
@@ -80,6 +80,8 @@
     "zustand": "^5.0.3"
   },
   "peerDependencies": {
+    "@dnd-kit/helpers": "^0.1.12",
+    "@dnd-kit/react": "0.1.12",
     "react": "^18.0.0 || ^19.0.0"
   }
 }