@measured/puck 0.19.0-canary.91cb9cee → 0.19.0-canary.a60c81eb

package/dist/{walk-tree-DOB5QZVq.d.ts → walk-tree-DBd3aQ_5.d.ts}

@@ -24,6 +24,7 @@ type BaseField = {
     label?: string;
     labelIcon?: ReactElement;
     metadata?: Metadata;
+    visible?: boolean;
 };
 type TextField = BaseField & {
     type: "text";
@@ -147,10 +148,14 @@ type FieldProps<F = Field<any>, ValueType = any> = {
     readOnly?: boolean;
 };
 
+type SlotComponent = (props?: Omit<DropZoneProps, "zone">) => ReactNode;
 type PuckComponent<Props> = (props: WithId<WithPuckProps<{
-    [PropName in keyof Props]: Props[PropName] extends Slot ? (props?: Omit<DropZoneProps, "zone">) => ReactNode : Props[PropName];
+    [K in keyof Props]: WithDeepSlots<Props[K], SlotComponent>;
 }>>) => JSX.Element;
 type ResolveDataTrigger = "insert" | "replace" | "load" | "force";
+type WithPartialProps<T, Props extends DefaultComponentProps> = Omit<T, "props"> & {
+    props?: Partial<Props>;
+};
 type ComponentConfig<RenderProps extends DefaultComponentProps = DefaultComponentProps, FieldProps extends DefaultComponentProps = RenderProps, DataShape = Omit<ComponentData<FieldProps>, "type">> = {
     render: PuckComponent<RenderProps>;
     label?: string;
@@ -175,13 +180,7 @@ type ComponentConfig<RenderProps extends DefaultComponentProps = DefaultComponen
         lastData: DataShape | null;
         metadata: Metadata;
         trigger: ResolveDataTrigger;
-    }) => Promise<{
-        props?: Partial<FieldProps>;
-        readOnly?: Partial<Record<keyof FieldProps, boolean>>;
-    }> | {
-        props?: Partial<FieldProps>;
-        readOnly?: Partial<Record<keyof FieldProps, boolean>>;
-    };
+    }) => Promise<WithPartialProps<DataShape, FieldProps>> | WithPartialProps<DataShape, FieldProps>;
     resolvePermissions?: (data: DataShape, params: {
         changed: Partial<Record<keyof FieldProps, boolean> & {
             id: string;
@@ -239,6 +238,7 @@ type PuckContext = {
     dragRef: ((element: Element | null) => void) | null;
 };
 type DefaultRootFieldProps = {
+    [key: string]: any;
     title?: string;
 };
 type DefaultRootRenderProps<Props extends DefaultComponentProps = DefaultRootFieldProps> = WithPuckProps<WithChildren<Props>>;
@@ -255,13 +255,13 @@ type BaseData<Props extends {
     readOnly?: Partial<Record<keyof Props, boolean>>;
 };
 type RootDataWithProps<Props extends DefaultComponentProps = DefaultRootFieldProps> = BaseData<Props> & {
-    props: WithSlotProps<Props>;
+    props: 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 ComponentData<Props extends DefaultComponentProps = DefaultComponentProps, Name = string, AllProps extends Record<string, DefaultComponentProps> = Record<string, DefaultComponentProps>> = {
     type: Name;
-    props: WithId<WithSlotProps<Props>>;
+    props: WithDeepSlots<WithId<Props>, Content<AllProps>>;
 } & BaseData<Props>;
 type ComponentDataOptionalId<Props extends DefaultComponentProps = DefaultComponentProps, Name = string> = {
     type: Name;
@@ -270,18 +270,18 @@ type ComponentDataOptionalId<Props extends DefaultComponentProps = DefaultCompon
     };
 } & 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 ComponentDataMap<AllProps extends DefaultAllProps = DefaultAllProps> = {
+    [K in keyof AllProps]: ComponentData<AllProps[K], K extends string ? K : never, AllProps>;
+}[keyof AllProps];
 type Content<PropsMap extends {
     [key: string]: DefaultComponentProps;
 } = {
     [key: string]: DefaultComponentProps;
 }> = ComponentDataMap<PropsMap>[];
-type Data<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends DefaultComponentProps = DefaultRootFieldProps> = {
-    root: RootData<RootProps>;
-    content: Content<Props>;
-    zones?: Record<string, Content<Props>>;
+type Data<AllProps extends DefaultAllProps = DefaultAllProps, RootProps extends DefaultComponentProps = DefaultRootFieldProps> = {
+    root: WithDeepSlots<RootData<RootProps>, Content<AllProps>>;
+    content: Content<AllProps>;
+    zones?: Record<string, Content<AllProps>>;
 };
 type Metadata = {
     [key: string]: any;
@@ -345,6 +345,13 @@ type PrivateAppState<UserData extends Data = Data> = AppState<UserData> & {
         zones: ZoneIndex;
     };
 };
+type DefaultAllProps = Record<string, DefaultComponentProps>;
+/**
+ * Recursively walk T and replace Slots with SlotComponents
+ */
+type WithDeepSlots<T, SlotType = T> = T extends Slot ? SlotType : T extends (infer U)[] ? Array<WithDeepSlots<U, SlotType>> : T extends (infer U)[] ? WithDeepSlots<U, SlotType>[] : T extends object ? {
+    [K in keyof T]: WithDeepSlots<T[K], SlotType>;
+} : T;
 
 type RenderFunc<Props extends {
     [key: string]: any;
@@ -459,9 +466,7 @@ type Slot<Props extends {
 }> = {
     [K in keyof Props]: ComponentDataOptionalId<Props[K], K extends string ? K : never>;
 }[keyof Props][];
-type WithSlotProps<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 WithSlotProps<Target extends Record<string, any>, AllProps extends DefaultAllProps = DefaultAllProps, SlotType extends Content<AllProps> = Content<AllProps>> = WithDeepSlots<Target, SlotType>;
 
 type InsertAction = {
     type: "insert";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@measured/puck",
-  "version": "0.19.0-canary.91cb9cee",
+  "version": "0.19.0-canary.a60c81eb",
   "author": "Chris Villa <chris@puckeditor.com>",
   "repository": "measuredco/puck",
   "bugs": "https://github.com/measuredco/puck/issues",
@@ -49,9 +49,12 @@
     "dist"
   ],
   "devDependencies": {
+    "@juggle/resize-observer": "^3.4.0",
+    "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.1.0",
     "@types/deep-diff": "^1.0.3",
-    "@types/jest": "^29.5.4",
+    "@types/flat": "^5.0.5",
+    "@types/jest": "^29.5.14",
     "@types/object-hash": "^3.0.6",
     "@types/react": "^19.0.1",
     "@types/react-dom": "^19.0.2",
@@ -59,20 +62,22 @@
     "css-box-model": "^1.2.1",
     "eslint": "^7.32.0",
     "eslint-config-custom": "*",
-    "jest": "^29.6.4",
-    "jest-environment-jsdom": "^29.6.4",
+    "identity-obj-proxy": "^3.0.0",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^30.0.0-beta.3",
     "lucide-react": "^0.468.0",
-    "ts-jest": "^29.2.4",
+    "ts-jest": "^29.3.4",
     "tsconfig": "*",
     "tsup": "^8.2.4",
     "tsup-config": "*",
     "typescript": "^5.5.4"
   },
   "dependencies": {
-    "@dnd-kit/helpers": "0.1.18-beta-20250525014052",
-    "@dnd-kit/react": "0.1.18-beta-20250525014052",
+    "@dnd-kit/helpers": "0.1.18",
+    "@dnd-kit/react": "0.1.18",
     "deep-diff": "^1.0.2",
     "fast-deep-equal": "^3.1.3",
+    "flat": "^5.0.2",
     "object-hash": "^3.0.0",
     "react-hotkeys-hook": "^4.6.1",
     "use-debounce": "^9.0.4",