@measured/puck 0.19.0-canary.a967ca42 → 0.19.0-canary.af1dc891

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-DOB5QZVq.mjs';
-export { af as migrate, ah as resolveAllData, ag as transformProps, w as walkTree } from './walk-tree-DOB5QZVq.mjs';
+import { a as Config, U as UserGenerics, M as Metadata } from './walk-tree-DBd3aQ_5.mjs';
+export { af as migrate, ah as resolveAllData, ag as transformProps, w as walkTree } from './walk-tree-DBd3aQ_5.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-DOB5QZVq.js';
-export { af as migrate, ah as resolveAllData, ag as transformProps, w as walkTree } from './walk-tree-DOB5QZVq.js';
+import { a as Config, U as UserGenerics, M as Metadata } from './walk-tree-DBd3aQ_5.js';
+export { af as migrate, ah as resolveAllData, ag as transformProps, w as walkTree } from './walk-tree-DBd3aQ_5.js';
 import 'react';
 
 declare function Render<UserConfig extends Config = Config, G extends UserGenerics<UserConfig> = UserGenerics<UserConfig>>({ config, data, metadata, }: {

package/dist/rsc.js

@@ -97,32 +97,165 @@ var setupZone = (data, zoneKey) => {
 
 // lib/use-slots.tsx
 var import_react2 = require("react");
-function useSlots(config, props, renderSlotEdit, renderSlotRender = renderSlotEdit, readOnly, forceReadOnly) {
+
+// lib/data/map-slots.ts
+var isPromise = (v) => !!v && typeof v.then === "function";
+var flatten = (values) => values.reduce((acc, item) => __spreadValues(__spreadValues({}, acc), item), {});
+var containsPromise = (arr) => arr.some(isPromise);
+var walkField = ({
+  value,
+  fields,
+  map,
+  propKey = "",
+  propPath = "",
+  id = "",
+  config,
+  recurseSlots = false
+}) => {
+  var _a, _b, _c;
+  if (((_a = fields[propKey]) == null ? void 0 : _a.type) === "slot") {
+    const content = value || [];
+    const mappedContent = recurseSlots ? content.map((el) => {
+      var _a2;
+      const componentConfig = config.components[el.type];
+      if (!componentConfig) {
+        throw new Error(`Could not find component config for ${el.type}`);
+      }
+      const fields2 = (_a2 = componentConfig.fields) != null ? _a2 : {};
+      return walkField({
+        value: el,
+        fields: fields2,
+        map,
+        id: el.props.id,
+        config,
+        recurseSlots
+      });
+    }) : content;
+    if (containsPromise(mappedContent)) {
+      return Promise.all(mappedContent);
+    }
+    return map(mappedContent, id, propPath, fields[propKey], propPath);
+  }
+  if (value && typeof value === "object") {
+    if (Array.isArray(value)) {
+      const arrayFields = ((_b = fields[propKey]) == null ? void 0 : _b.type) === "array" ? fields[propKey].arrayFields : null;
+      if (!arrayFields) return value;
+      const newValue = value.map(
+        (el, idx) => walkField({
+          value: el,
+          fields: arrayFields,
+          map,
+          propKey,
+          propPath: `${propPath}[${idx}]`,
+          id,
+          config,
+          recurseSlots
+        })
+      );
+      if (containsPromise(newValue)) {
+        return Promise.all(newValue);
+      }
+      return newValue;
+    } else if ("$$typeof" in value) {
+      return value;
+    } else {
+      const objectFields = ((_c = fields[propKey]) == null ? void 0 : _c.type) === "object" ? fields[propKey].objectFields : fields;
+      return walkObject({
+        value,
+        fields: objectFields,
+        map,
+        id,
+        getPropPath: (k) => `${propPath}.${k}`,
+        config,
+        recurseSlots
+      });
+    }
+  }
+  return value;
+};
+var walkObject = ({
+  value,
+  fields,
+  map,
+  id,
+  getPropPath,
+  config,
+  recurseSlots
+}) => {
+  const newProps = Object.entries(value).map(([k, v]) => {
+    const opts = {
+      value: v,
+      fields,
+      map,
+      propKey: k,
+      propPath: getPropPath(k),
+      id,
+      config,
+      recurseSlots
+    };
+    const newValue = walkField(opts);
+    if (isPromise(newValue)) {
+      return newValue.then((resolvedValue) => ({
+        [k]: resolvedValue
+      }));
+    }
+    return {
+      [k]: newValue
+    };
+  }, {});
+  if (containsPromise(newProps)) {
+    return Promise.all(newProps).then(flatten);
+  }
+  return flatten(newProps);
+};
+function mapSlots(item, map, config, recurseSlots = false) {
+  var _a, _b, _c, _d;
+  const itemType = "type" in item ? item.type : "root";
+  const componentConfig = itemType === "root" ? config.root : (_a = config.components) == null ? void 0 : _a[itemType];
+  const newProps = walkObject({
+    value: (_b = item.props) != null ? _b : {},
+    fields: (_c = componentConfig == null ? void 0 : componentConfig.fields) != null ? _c : {},
+    map,
+    id: item.props ? (_d = item.props.id) != null ? _d : "root" : "root",
+    getPropPath: (k) => k,
+    config,
+    recurseSlots
+  });
+  if (isPromise(newProps)) {
+    return newProps.then((resolvedProps) => __spreadProps(__spreadValues({}, item), {
+      props: resolvedProps
+    }));
+  }
+  return __spreadProps(__spreadValues({}, item), {
+    props: newProps
+  });
+}
+
+// lib/use-slots.tsx
+function useSlots(config, item, renderSlotEdit, renderSlotRender = renderSlotEdit, readOnly, forceReadOnly) {
   const slotProps = (0, import_react2.useMemo)(() => {
-    if (!(config == null ? void 0 : config.fields)) return props;
-    const slotProps2 = {};
-    const fieldKeys = Object.keys(config.fields);
-    for (let i = 0; i < fieldKeys.length; i++) {
-      const fieldKey = fieldKeys[i];
-      const field = config.fields[fieldKey];
-      if ((field == null ? void 0 : field.type) === "slot") {
-        const content = props[fieldKey] || [];
-        const render = (readOnly == null ? void 0 : readOnly[fieldKey]) || forceReadOnly ? renderSlotRender : renderSlotEdit;
+    const mapped = mapSlots(
+      item,
+      (content, _parentId, propName, field, propPath) => {
+        const wildcardPath = propPath.replace(/\[\d+\]/g, "[*]");
+        const isReadOnly = (readOnly == null ? void 0 : readOnly[propPath]) || (readOnly == null ? void 0 : readOnly[wildcardPath]) || forceReadOnly;
+        const render = isReadOnly ? renderSlotRender : renderSlotEdit;
         const Slot = (dzProps) => render(__spreadProps(__spreadValues({
-          allow: field.allow,
-          disallow: field.disallow
+          allow: (field == null ? void 0 : field.type) === "slot" ? field.allow : [],
+          disallow: (field == null ? void 0 : field.type) === "slot" ? field.disallow : []
         }, dzProps), {
-          zone: fieldKey,
+          zone: propName,
           content
         }));
-        slotProps2[fieldKey] = Slot;
-      }
-    }
-    return slotProps2;
-  }, [config, readOnly, forceReadOnly]);
+        return Slot;
+      },
+      config
+    ).props;
+    return mapped;
+  }, [config, item, readOnly, forceReadOnly]);
   const mergedProps = (0, import_react2.useMemo)(
-    () => __spreadValues(__spreadValues({}, props), slotProps),
-    [props, slotProps]
+    () => __spreadValues(__spreadValues({}, item.props), slotProps),
+    [item.props, slotProps]
   );
   return mergedProps;
 }
@@ -137,7 +270,7 @@ var Item = ({
   metadata
 }) => {
   const Component = config.components[item.type];
-  const props = useSlots(Component, item.props, (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, slotProps), { config, metadata })));
+  const props = useSlots(config, item, (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, slotProps), { config, metadata })));
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
     Component.render,
     __spreadProps(__spreadValues({}, props), {
@@ -199,12 +332,15 @@ function DropZoneRender({
             metadata
           }
         ),
-        metadata
+        metadata,
+        dragRef: null,
+        isEditing: false
       }
     });
-    const propsWithSlots = useSlots(Component, props, (props2) => /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, props2), { config, metadata })));
+    const renderItem = __spreadProps(__spreadValues({}, item), { props });
+    const propsWithSlots = useSlots(config, renderItem, (props2) => /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, props2), { config, metadata })));
     if (Component) {
-      return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Component.render, __spreadValues({}, propsWithSlots), item.props.id);
+      return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Component.render, __spreadValues({}, propsWithSlots), renderItem.props.id);
     }
     return null;
   }) });
@@ -215,7 +351,7 @@ function Render({
   metadata = {}
 }) {
   var _a;
-  const rootProps = data.root.props || data.root;
+  const rootProps = "props" in data.root ? data.root.props : data.root;
   const title = rootProps.title || "";
   const props = __spreadProps(__spreadValues({}, rootProps), {
     puck: {
@@ -236,7 +372,7 @@ function Render({
     editMode: false,
     id: "puck-root"
   });
-  const propsWithSlots = useSlots(config.root, props, (props2) => /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, props2), { config, metadata })));
+  const propsWithSlots = useSlots(config, { type: "root", props }, (props2) => /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, props2), { config, metadata })));
   if ((_a = config.root) == null ? void 0 : _a.render) {
     return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(config.root.render, __spreadProps(__spreadValues({}, propsWithSlots), { children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
       DropZoneRender,
@@ -259,77 +395,29 @@ function Render({
   );
 }
 
-// lib/data/is-slot.ts
-var isSlot = (prop) => {
-  var _a, _b;
-  return Array.isArray(prop) && typeof ((_a = prop[0]) == null ? void 0 : _a.type) === "string" && typeof ((_b = prop[0]) == null ? void 0 : _b.props) === "object";
-};
-var createIsSlotConfig = (config) => (itemType, propName, propValue) => {
-  var _a, _b;
-  const configForComponent = itemType === "root" ? config == null ? void 0 : config.root : config == null ? void 0 : config.components[itemType];
-  if (!configForComponent) return isSlot(propValue);
-  return ((_b = (_a = configForComponent.fields) == null ? void 0 : _a[propName]) == null ? void 0 : _b.type) === "slot";
-};
-
-// lib/data/map-slots.ts
-function mapSlotsAsync(_0, _1) {
-  return __async(this, arguments, function* (item, map, recursive = true, isSlot2 = isSlot) {
-    const props = __spreadValues({}, item.props);
-    const propKeys = Object.keys(props);
-    for (let i = 0; i < propKeys.length; i++) {
-      const propKey = propKeys[i];
-      const itemType = "type" in item ? item.type : "root";
-      if (isSlot2(itemType, propKey, props[propKey])) {
-        const content = props[propKey];
-        const mappedContent = recursive ? yield Promise.all(
-          content.map((item2) => __async(this, null, function* () {
-            return yield mapSlotsAsync(item2, map, recursive, isSlot2);
-          }))
-        ) : content;
-        props[propKey] = yield map(mappedContent, propKey);
-      }
-    }
-    return __spreadProps(__spreadValues({}, item), { props });
-  });
-}
-function mapSlotsSync(item, map, isSlot2 = isSlot) {
-  var _a, _b;
-  const props = __spreadValues({}, item.props);
-  const propKeys = Object.keys(props);
-  for (let i = 0; i < propKeys.length; i++) {
-    const propKey = propKeys[i];
-    const itemType = "type" in item ? item.type : "root";
-    if (isSlot2(itemType, propKey, props[propKey])) {
-      const content = props[propKey];
-      const mappedContent = content.map((item2) => {
-        return mapSlotsSync(item2, map, isSlot2);
-      });
-      props[propKey] = (_b = map(mappedContent, (_a = props.id) != null ? _a : "root", propKey)) != null ? _b : mappedContent;
-    }
-  }
-  return __spreadProps(__spreadValues({}, item), { props });
-}
-
 // lib/get-changed.ts
+var import_fast_deep_equal = __toESM(require("fast-deep-equal"));
 var getChanged = (newItem, oldItem) => {
   return newItem ? Object.keys(newItem.props || {}).reduce((acc, item) => {
     const newItemProps = (newItem == null ? void 0 : newItem.props) || {};
     const oldItemProps = (oldItem == null ? void 0 : oldItem.props) || {};
     return __spreadProps(__spreadValues({}, acc), {
-      [item]: oldItemProps[item] !== newItemProps[item]
+      [item]: !(0, import_fast_deep_equal.default)(oldItemProps[item], newItemProps[item])
     });
   }, {}) : {};
 };
 
 // lib/resolve-component-data.ts
-var import_fast_deep_equal = __toESM(require("fast-deep-equal"));
+var import_fast_deep_equal2 = __toESM(require("fast-deep-equal"));
 var cache = { lastChange: {} };
-var resolveComponentData = (_0, _1, ..._2) => __async(void 0, [_0, _1, ..._2], function* (item, config, metadata = {}, onResolveStart, onResolveEnd, trigger = "replace", recursive = true) {
+var resolveComponentData = (_0, _1, ..._2) => __async(void 0, [_0, _1, ..._2], function* (item, config, metadata = {}, onResolveStart, onResolveEnd, trigger = "replace") {
   const configForItem = "type" in item && item.type !== "root" ? config.components[item.type] : config.root;
-  if ((configForItem == null ? void 0 : configForItem.resolveData) && item.props) {
-    const id = "id" in item.props ? item.props.id : "root";
+  const resolvedItem = __spreadValues({}, item);
+  const shouldRunResolver = (configForItem == null ? void 0 : configForItem.resolveData) && item.props;
+  const id = "id" in item.props ? item.props.id : "root";
+  if (shouldRunResolver) {
     const { item: oldItem = null, resolved = {} } = cache.lastChange[id] || {};
-    if (item && (0, import_fast_deep_equal.default)(item, oldItem)) {
+    if (item && (0, import_fast_deep_equal2.default)(item, oldItem)) {
       return { node: resolved, didChange: false };
     }
     const changed = getChanged(item, oldItem);
@@ -342,46 +430,42 @@ var resolveComponentData = (_0, _1, ..._2) => __async(void 0, [_0, _1, ..._2], f
       metadata: __spreadValues(__spreadValues({}, metadata), configForItem.metadata),
       trigger
     });
-    let resolvedItem = __spreadProps(__spreadValues({}, item), {
-      props: __spreadValues(__spreadValues({}, item.props), resolvedProps)
-    });
-    if (recursive) {
-      resolvedItem = yield mapSlotsAsync(
-        resolvedItem,
-        (content) => __async(void 0, null, function* () {
-          return Promise.all(
-            content.map(
-              (childItem) => __async(void 0, null, function* () {
-                return (yield resolveComponentData(
-                  childItem,
-                  config,
-                  metadata,
-                  onResolveStart,
-                  onResolveEnd,
-                  trigger,
-                  false
-                )).node;
-              })
-            )
-          );
-        }),
-        false,
-        createIsSlotConfig(config)
-      );
-    }
+    resolvedItem.props = __spreadValues(__spreadValues({}, item.props), resolvedProps);
     if (Object.keys(readOnly).length) {
       resolvedItem.readOnly = readOnly;
     }
-    cache.lastChange[id] = {
-      item,
-      resolved: resolvedItem
-    };
-    if (onResolveEnd) {
-      onResolveEnd(resolvedItem);
-    }
-    return { node: resolvedItem, didChange: !(0, import_fast_deep_equal.default)(item, resolvedItem) };
   }
-  return { node: item, didChange: false };
+  let itemWithResolvedChildren = yield mapSlots(
+    resolvedItem,
+    (content) => __async(void 0, null, function* () {
+      return yield Promise.all(
+        content.map(
+          (childItem) => __async(void 0, null, function* () {
+            return (yield resolveComponentData(
+              childItem,
+              config,
+              metadata,
+              onResolveStart,
+              onResolveEnd,
+              trigger
+            )).node;
+          })
+        )
+      );
+    }),
+    config
+  );
+  if (shouldRunResolver && onResolveEnd) {
+    onResolveEnd(resolvedItem);
+  }
+  cache.lastChange[id] = {
+    item,
+    resolved: itemWithResolvedChildren
+  };
+  return {
+    node: itemWithResolvedChildren,
+    didChange: !(0, import_fast_deep_equal2.default)(item, itemWithResolvedChildren)
+  };
 });
 
 // lib/data/default-data.ts
@@ -414,13 +498,12 @@ function resolveAllData(_0, _1) {
         },
         () => {
         },
-        "force",
-        false
+        "force"
       )).node;
-      const resolvedDeep = yield mapSlotsAsync(
+      const resolvedDeep = yield mapSlots(
         resolved,
         processContent,
-        false
+        config
       );
       onResolveEnd == null ? void 0 : onResolveEnd(toComponent(resolvedDeep));
       return resolvedDeep;
@@ -452,12 +535,15 @@ function resolveAllData(_0, _1) {
 // lib/data/walk-tree.ts
 function walkTree(data, config, callbackFn) {
   var _a, _b;
-  const isSlot2 = createIsSlotConfig(config);
   const walkItem = (item) => {
-    return mapSlotsSync(
+    return mapSlots(
       item,
-      (content, parentId, propName) => callbackFn(content, { parentId, propName }),
-      isSlot2
+      (content, parentId, propName) => {
+        var _a2;
+        return (_a2 = callbackFn(content, { parentId, propName })) != null ? _a2 : content;
+      },
+      config,
+      true
     );
   };
   if ("props" in data) {
@@ -545,27 +631,6 @@ var defaultAppState = {
   }
 };
 
-// lib/data/for-each-slot.ts
-var forEachSlot = (item, cb, recursive = false, isSlot2 = isSlot) => {
-  const props = item.props || {};
-  const propKeys = Object.keys(props);
-  for (let i = 0; i < propKeys.length; i++) {
-    const propKey = propKeys[i];
-    const itemType = "type" in item ? item.type : "root";
-    if (isSlot2(itemType, propKey, props[propKey])) {
-      const content = props[propKey];
-      cb(props.id, propKey, content);
-      if (recursive) {
-        content.forEach(
-          (childItem) => __async(void 0, null, function* () {
-            return forEachSlot(childItem, cb, true, isSlot2);
-          })
-        );
-      }
-    }
-  }
-};
-
 // lib/get-zone-id.ts
 var getZoneId = (zoneCompound) => {
   if (!zoneCompound) {
@@ -587,18 +652,18 @@ function forRelatedZones(item, data, cb, path = []) {
   });
 }
 
+// lib/data/flatten-node.ts
+var import_flat = require("flat");
+
 // lib/data/strip-slots.ts
-var stripSlots = (data) => {
-  return __spreadProps(__spreadValues({}, data), {
-    props: Object.entries(data.props).reduce(
-      (acc, [propKey, propVal]) => {
-        if (isSlot(propVal)) {
-          return acc;
-        }
-        return __spreadProps(__spreadValues({}, acc), { [propKey]: propVal });
-      },
-      { id: data.props.id }
-    )
+var stripSlots = (data, config) => {
+  return mapSlots(data, () => null, config);
+};
+
+// lib/data/flatten-node.ts
+var flattenNode = (node, config) => {
+  return __spreadProps(__spreadValues({}, node), {
+    props: (0, import_flat.flatten)(stripSlots(node, config).props)
   });
 };
 
@@ -644,10 +709,9 @@ function walkAppState(state, config, mapContent = (content) => content, mapNodeO
     const mappedItem = mapNodeOrSkip(item, path, index);
     if (!mappedItem) return item;
     const id = mappedItem.props.id;
-    const newProps = __spreadValues({}, mappedItem.props);
-    forEachSlot(
+    const newProps = __spreadProps(__spreadValues({}, mapSlots(
       mappedItem,
-      (parentId2, slotId, content) => {
+      (content, parentId2, slotId) => {
         const zoneCompound = `${parentId2}:${slotId}`;
         const [_2, newContent2] = processContent(
           path,
@@ -656,18 +720,19 @@ function walkAppState(state, config, mapContent = (content) => content, mapNodeO
           "slot",
           parentId2
         );
-        newProps[slotId] = newContent2;
+        return newContent2;
       },
-      false,
-      createIsSlotConfig(config)
-    );
+      config
+    ).props), {
+      id
+    });
     processRelatedZones(item, id, path);
     const newItem = __spreadProps(__spreadValues({}, item), { props: newProps });
     const thisZoneCompound = path[path.length - 1];
     const [parentId, zone] = thisZoneCompound ? thisZoneCompound.split(":") : [null, ""];
     newNodeIndex[id] = {
       data: newItem,
-      flatData: stripSlots(newItem),
+      flatData: flattenNode(newItem, config),
       path,
       parentId,
       zone

package/dist/rsc.mjs

@@ -5,7 +5,7 @@ import {
   resolveAllData,
   transformProps,
   walkTree
-} from "./chunk-GL73J54P.mjs";
+} from "./chunk-HGAPIQP5.mjs";
 
 // rsc.tsx
 init_react_import();

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

@@ -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";