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

package/dist/index.js

@@ -792,43 +792,6 @@ init_react_import();
 // lib/data/walk-app-state.ts
 init_react_import();
 
-// lib/data/for-each-slot.ts
-init_react_import();
-
-// lib/data/is-slot.ts
-init_react_import();
-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/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/data/for-related-zones.ts
 init_react_import();
 
@@ -862,19 +825,160 @@ function forRelatedZones(item, data, cb, path = []) {
   });
 }
 
+// lib/data/map-slots.ts
+init_react_import();
+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/data/flatten-node.ts
+init_react_import();
+var import_flat = require("flat");
+
 // lib/data/strip-slots.ts
 init_react_import();
-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)
+  });
+};
+var expandNode = (node) => {
+  const props = (0, import_flat.unflatten)(node.props);
+  return __spreadProps(__spreadValues({}, node), {
+    props
   });
 };
 
@@ -920,10 +1024,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,
@@ -932,18 +1035,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
@@ -1046,56 +1150,17 @@ init_react_import();
 
 // lib/data/walk-tree.ts
 init_react_import();
-
-// lib/data/map-slots.ts
-init_react_import();
-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/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) {
@@ -1124,7 +1189,7 @@ var populateIds = (data, config, override = false) => {
   const id = generateId(data.type);
   return walkTree(
     __spreadProps(__spreadValues({}, data), {
-      props: override ? __spreadProps(__spreadValues({}, data.props), { id }) : __spreadValues({ id }, data.props)
+      props: override ? __spreadProps(__spreadValues({}, data.props), { id }) : __spreadValues({}, data.props)
     }),
     config,
     (contents) => contents.map((item) => {
@@ -1881,12 +1946,13 @@ var flattenData = (state, config) => {
 
 // lib/get-changed.ts
 init_react_import();
+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])
     });
   }, {}) : {};
 };
@@ -2105,14 +2171,16 @@ var useRegisterFieldsSlice = (appStore, id) => {
 
 // lib/resolve-component-data.ts
 init_react_import();
-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);
@@ -2125,46 +2193,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/to-root.ts
@@ -2406,13 +2470,18 @@ init_react_import();
 var import_react10 = require("react");
 var import_react11 = require("@dnd-kit/react");
 var import_utilities = require("@dnd-kit/dom/utilities");
+var touchDefault = { delay: { value: 200, tolerance: 10 } };
+var otherDefault = {
+  delay: { value: 200, tolerance: 10 },
+  distance: { value: 5 }
+};
 var useSensors = ({
-  other,
+  other = otherDefault,
   mouse,
-  touch
+  touch = touchDefault
 } = {
-  touch: { delay: { value: 200, tolerance: 10 } },
-  other: { delay: { value: 200, tolerance: 10 }, distance: { value: 5 } }
+  touch: touchDefault,
+  other: otherDefault
 }) => {
   const [sensors] = (0, import_react10.useState)(() => [
     import_react11.PointerSensor.configure({
@@ -2951,6 +3020,19 @@ var ArrayField = ({
   );
   const forceReadOnly = !canEdit;
   const valueRef = (0, import_react14.useRef)(value);
+  const uniqifyItem = (0, import_react14.useCallback)(
+    (val) => {
+      if (field.type !== "array" || !field.arrayFields) return;
+      const config = appStore.getState().config;
+      return walkField({
+        value: val,
+        fields: field.arrayFields,
+        map: (content) => content.map((item) => populateIds(item, config, true)),
+        config
+      });
+    },
+    [appStore, field]
+  );
   if (field.type !== "array" || !field.arrayFields) {
     return null;
   }
@@ -3055,11 +3137,10 @@ var ArrayField = ({
                                           onClick: (e) => {
                                             e.stopPropagation();
                                             const existingValue = [...value || []];
-                                            existingValue.splice(
-                                              i,
-                                              0,
+                                            const newItem = uniqifyItem(
                                               existingValue[i]
                                             );
+                                            existingValue.splice(i, 0, newItem);
                                             const newUi = mapArrayStateToUi(
                                               regenerateArrayState(existingValue)
                                             );
@@ -3157,12 +3238,11 @@ var ArrayField = ({
                     type: "button",
                     className: getClassName5("addButton"),
                     onClick: () => {
+                      var _a;
                       if (isDraggingAny) return;
                       const existingValue = value || [];
-                      const newValue = [
-                        ...existingValue,
-                        field.defaultItemProps || {}
-                      ];
+                      const newItem = uniqifyItem((_a = field.defaultItemProps) != null ? _a : {});
+                      const newValue = [...existingValue, newItem];
                       const newArrayState = regenerateArrayState(newValue);
                       setUi(mapArrayStateToUi(newArrayState), false);
                       onChange(newValue);
@@ -4056,6 +4136,10 @@ function AutoFieldInternal(props) {
       });
     }
   }, []);
+  const { visible = true } = props.field;
+  if (!visible) {
+    return null;
+  }
   if (field.type === "slot") {
     return null;
   }
@@ -4891,10 +4975,10 @@ var useContentIdsWithPreview = (contentIds, zoneCompound) => {
     preview
   );
   const updateContent = useRenderedCallback(
-    (contentIds2, preview2) => {
-      var _a;
-      const s = zoneStore.getState();
-      const draggedItemId = (_a = s.draggedItem) == null ? void 0 : _a.id;
+    (contentIds2, preview2, isDragging2, draggedItemId, previewExists) => {
+      if (isDragging2 && !previewExists) {
+        return;
+      }
       if (preview2) {
         if (preview2.type === "insert") {
           setContentIdsWithPreview(
@@ -4915,7 +4999,7 @@ var useContentIdsWithPreview = (contentIds, zoneCompound) => {
         }
       } else {
         setContentIdsWithPreview(
-          contentIds2.filter((id) => id !== draggedItemId)
+          previewExists ? contentIds2.filter((id) => id !== draggedItemId) : contentIds2
         );
       }
       setLocalPreview(preview2);
@@ -4923,7 +5007,17 @@ var useContentIdsWithPreview = (contentIds, zoneCompound) => {
     []
   );
   (0, import_react30.useEffect)(() => {
-    updateContent(contentIds, preview, isDragging);
+    var _a;
+    const s = zoneStore.getState();
+    const draggedItemId = (_a = s.draggedItem) == null ? void 0 : _a.id;
+    const previewExists = Object.keys(s.previewIndex || {}).length > 0;
+    updateContent(
+      contentIds,
+      preview,
+      isDragging,
+      draggedItemId,
+      previewExists
+    );
   }, [contentIds, preview, isDragging]);
   return [contentIdsWithPreview, localPreview];
 };
@@ -4965,7 +5059,7 @@ var useDragAxis = (ref, collisionAxis) => {
 };
 
 // components/DropZone/index.tsx
-var import_shallow3 = require("zustand/react/shallow");
+var import_shallow4 = require("zustand/react/shallow");
 
 // components/Render/index.tsx
 init_react_import();
@@ -4973,32 +5067,30 @@ init_react_import();
 // lib/use-slots.tsx
 init_react_import();
 var import_react32 = require("react");
-function useSlots(config, props, renderSlotEdit, renderSlotRender = renderSlotEdit, readOnly, forceReadOnly) {
+function useSlots(config, item, renderSlotEdit, renderSlotRender = renderSlotEdit, readOnly, forceReadOnly) {
   const slotProps = (0, import_react32.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_react32.useMemo)(
-    () => __spreadValues(__spreadValues({}, props), slotProps),
-    [props, slotProps]
+    () => __spreadValues(__spreadValues({}, item.props), slotProps),
+    [item.props, slotProps]
   );
   return mergedProps;
 }
@@ -5008,6 +5100,7 @@ var import_react34 = __toESM(require("react"));
 
 // components/SlotRender/index.tsx
 init_react_import();
+var import_shallow3 = require("zustand/react/shallow");
 
 // components/SlotRender/server.tsx
 init_react_import();
@@ -5046,12 +5139,15 @@ function DropZoneRender({
             metadata
           }
         ),
-        metadata
+        metadata,
+        dragRef: null,
+        isEditing: false
       }
     });
-    const propsWithSlots = useSlots(Component, props, (props2) => /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, props2), { config, metadata })));
+    const renderItem = __spreadProps(__spreadValues({}, item), { props });
+    const propsWithSlots = useSlots(config, renderItem, (props2) => /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, props2), { config, metadata })));
     if (Component) {
-      return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Component.render, __spreadValues({}, propsWithSlots), item.props.id);
+      return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Component.render, __spreadValues({}, propsWithSlots), renderItem.props.id);
     }
     return null;
   }) });
@@ -5066,7 +5162,7 @@ var Item = ({
   metadata
 }) => {
   const Component = config.components[item.type];
-  const props = useSlots(Component, item.props, (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, slotProps), { config, metadata })));
+  const props = useSlots(config, item, (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, slotProps), { config, metadata })));
   return /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
     Component.render,
     __spreadProps(__spreadValues({}, props), {
@@ -5105,10 +5201,12 @@ var ContextSlotRender = ({
   const config = useAppStore((s) => s.config);
   const metadata = useAppStore((s) => s.metadata);
   const slotContent = useAppStore(
-    (s) => {
+    (0, import_shallow3.useShallow)((s) => {
       var _a, _b;
-      return (_b = (_a = s.state.indexes.nodes[componentId]) == null ? void 0 : _a.data.props[zone]) != null ? _b : null;
-    }
+      const indexes = s.state.indexes;
+      const contentIds = (_b = (_a = indexes.zones[`${componentId}:${zone}`]) == null ? void 0 : _a.contentIds) != null ? _b : [];
+      return contentIds.map((contentId) => indexes.nodes[contentId].flatData);
+    })
   );
   return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
     SlotRenderPure,
@@ -5138,7 +5236,7 @@ function Render({
     root: data.root || {},
     content: data.content || []
   });
-  const rootProps = defaultedData.root.props || defaultedData.root;
+  const rootProps = "props" in defaultedData.root ? defaultedData.root.props : defaultedData.root;
   const title = (rootProps == null ? void 0 : rootProps.title) || "";
   const pageProps = __spreadProps(__spreadValues({}, rootProps), {
     puck: {
@@ -5151,7 +5249,11 @@ function Render({
     editMode: false,
     id: "puck-root"
   });
-  const propsWithSlots = useSlots(config.root, pageProps, (props) => /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(SlotRender, __spreadProps(__spreadValues({}, props), { config, metadata })));
+  const propsWithSlots = useSlots(
+    config,
+    { type: "root", props: pageProps },
+    (props) => /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(SlotRender, __spreadProps(__spreadValues({}, props), { config, metadata }))
+  );
   const nextContextValue = (0, import_react34.useMemo)(
     () => ({
       mode: "render",
@@ -5185,7 +5287,7 @@ var DropZoneChild = ({
   const { depth = 1 } = ctx != null ? ctx : {};
   const zoneStore = (0, import_react35.useContext)(ZoneStoreContext);
   const nodeProps = useAppStore(
-    (0, import_shallow3.useShallow)((s) => {
+    (0, import_shallow4.useShallow)((s) => {
       var _a2;
       return (_a2 = s.state.indexes.nodes[componentId]) == null ? void 0 : _a2.flatData.props;
     })
@@ -5197,14 +5299,19 @@ var DropZoneChild = ({
     }
   );
   const nodeReadOnly = useAppStore(
-    (0, import_shallow3.useShallow)((s) => {
+    (0, import_shallow4.useShallow)((s) => {
       var _a2;
       return (_a2 = s.state.indexes.nodes[componentId]) == null ? void 0 : _a2.data.readOnly;
     })
   );
+  const appStore = useAppStoreApi();
   const item = (0, import_react35.useMemo)(() => {
     if (nodeProps) {
-      return { type: nodeType, props: nodeProps };
+      const expanded = expandNode({
+        type: nodeType,
+        props: nodeProps
+      });
+      return expanded;
     }
     const preview = zoneStore.getState().previewIndex[zoneCompound];
     if (componentId === (preview == null ? void 0 : preview.props.id)) {
@@ -5215,7 +5322,7 @@ var DropZoneChild = ({
       };
     }
     return null;
-  }, [componentId, zoneCompound, nodeType, nodeProps]);
+  }, [appStore, componentId, zoneCompound, nodeType, nodeProps]);
   const componentConfig = useAppStore(
     (s) => (item == null ? void 0 : item.type) ? s.config.components[item.type] : null
   );
@@ -5256,9 +5363,17 @@ var DropZoneChild = ({
     }),
     [componentConfig == null ? void 0 : componentConfig.defaultProps, item == null ? void 0 : item.props, puckProps]
   );
+  const defaultedNode = (0, import_react35.useMemo)(
+    () => {
+      var _a2;
+      return { type: (_a2 = item == null ? void 0 : item.type) != null ? _a2 : nodeType, props: defaultsProps };
+    },
+    [item == null ? void 0 : item.type, nodeType, defaultsProps]
+  );
+  const config = useAppStore((s) => s.config);
   const defaultedPropsWithSlots = useSlots(
-    componentConfig,
-    defaultsProps,
+    config,
+    defaultedNode,
     DropZoneEditPure,
     (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(ContextSlotRender, { componentId, zone: slotProps.zone }),
     nodeReadOnly,
@@ -5270,7 +5385,7 @@ var DropZoneChild = ({
     item.type
   ] });
   let componentType = item.type;
-  const isInserting = item.previewType === "insert";
+  const isInserting = "previewType" in item ? item.previewType === "insert" : false;
   if (isInserting) {
     Render2 = renderPreview;
   }
@@ -5319,7 +5434,7 @@ var DropZoneEdit = (0, import_react35.forwardRef)(
       unregisterLocalZone
     } = ctx != null ? ctx : {};
     const path = useAppStore(
-      (0, import_shallow3.useShallow)((s) => {
+      (0, import_shallow4.useShallow)((s) => {
         var _a;
         return areaId ? (_a = s.state.indexes.nodes[areaId]) == null ? void 0 : _a.path : null;
       })
@@ -5336,13 +5451,13 @@ var DropZoneEdit = (0, import_react35.forwardRef)(
       (s) => s.nextAreaDepthIndex[areaId || ""]
     );
     const zoneContentIds = useAppStore(
-      (0, import_shallow3.useShallow)((s) => {
+      (0, import_shallow4.useShallow)((s) => {
         var _a;
         return (_a = s.state.indexes.zones[zoneCompound]) == null ? void 0 : _a.contentIds;
       })
     );
     const zoneType = useAppStore(
-      (0, import_shallow3.useShallow)((s) => {
+      (0, import_shallow4.useShallow)((s) => {
         var _a;
         return (_a = s.state.indexes.zones[zoneCompound]) == null ? void 0 : _a.type;
       })
@@ -5499,7 +5614,7 @@ var DropZoneRenderItem = ({
   metadata
 }) => {
   const Component = config.components[item.type];
-  const props = useSlots(Component, item.props, (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, slotProps), { config, metadata })));
+  const props = useSlots(config, item, (slotProps) => /* @__PURE__ */ (0, import_jsx_runtime25.jsx)(SlotRenderPure, __spreadProps(__spreadValues({}, slotProps), { config, metadata })));
   const nextContextValue = (0, import_react35.useMemo)(
     () => ({
       areaId: props.id,
@@ -6543,7 +6658,7 @@ var styles_module_default15 = { "PuckFields": "_PuckFields_10bh7_1", "PuckFields
 
 // components/Puck/components/Fields/index.tsx
 var import_react42 = require("react");
-var import_shallow4 = require("zustand/react/shallow");
+var import_shallow5 = require("zustand/react/shallow");
 var import_jsx_runtime29 = require("react/jsx-runtime");
 var getClassName20 = get_class_name_factory_default("PuckFields", styles_module_default15);
 var DefaultFields = ({
@@ -6609,7 +6724,7 @@ var FieldsChild = ({ fieldName }) => {
     return s.selectedItem ? `${s.selectedItem.props.id}_${field.type}_${fieldName}` : `root_${field.type}_${fieldName}`;
   });
   const permissions = useAppStore(
-    (0, import_shallow4.useShallow)((s) => {
+    (0, import_shallow5.useShallow)((s) => {
       const { selectedItem, permissions: permissions2 } = s;
       return selectedItem ? permissions2.getPermissions({ item: selectedItem }) : permissions2.getPermissions({ root: true });
     })
@@ -6618,7 +6733,8 @@ var FieldsChild = ({ fieldName }) => {
   const onChange = (0, import_react42.useCallback)(createOnChange(fieldName, appStore), [
     fieldName
   ]);
-  if (!field || !id) return null;
+  const { visible = true } = field != null ? field : {};
+  if (!field || !id || !visible) return null;
   if (field.type === "slot") return null;
   return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: getClassName20("field"), children: /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
     AutoFieldPrivate,
@@ -6640,7 +6756,7 @@ var FieldsInternal = ({ wrapFields = true }) => {
     const loadingCount = s.selectedItem ? (_a = s.componentState[s.selectedItem.props.id]) == null ? void 0 : _a.loadingCount : (_b = s.componentState["root"]) == null ? void 0 : _b.loadingCount;
     return (loadingCount != null ? loadingCount : 0) > 0;
   });
-  const itemSelector = useAppStore((0, import_shallow4.useShallow)((s) => s.state.ui.itemSelector));
+  const itemSelector = useAppStore((0, import_shallow5.useShallow)((s) => s.state.ui.itemSelector));
   const id = useAppStore((s) => {
     var _a;
     return (_a = s.selectedItem) == null ? void 0 : _a.props.id;
@@ -6649,7 +6765,7 @@ var FieldsInternal = ({ wrapFields = true }) => {
   useRegisterFieldsSlice(appStore, id);
   const fieldsLoading = useAppStore((s) => s.fields.loading);
   const fieldNames = useAppStore(
-    (0, import_shallow4.useShallow)((s) => {
+    (0, import_shallow5.useShallow)((s) => {
       if (s.fields.id === id) {
         return Object.keys(s.fields.fields);
       }
@@ -7172,13 +7288,16 @@ var Preview2 = ({ id = "puck-preview" }) => {
   const Page = (0, import_react46.useCallback)(
     (pageProps) => {
       var _a, _b;
-      const rootConfig = config.root;
-      const propsWithSlots = useSlots(rootConfig, pageProps, DropZoneEditPure);
+      const propsWithSlots = useSlots(
+        config,
+        { type: "root", props: pageProps },
+        DropZoneEditPure
+      );
       return ((_a = config.root) == null ? void 0 : _a.render) ? (_b = config.root) == null ? void 0 : _b.render(__spreadValues({
         id: "puck-root"
       }, propsWithSlots)) : /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(import_jsx_runtime34.Fragment, { children: propsWithSlots.children });
     },
-    [config.root]
+    [config]
   );
   const Frame = (0, import_react46.useMemo)(() => overrides.iframe, [overrides]);
   const rootProps = root.props || root;
@@ -7289,7 +7408,7 @@ var onScrollEnd = (frame, cb) => {
 };
 
 // components/LayerTree/index.tsx
-var import_shallow5 = require("zustand/react/shallow");
+var import_shallow6 = require("zustand/react/shallow");
 var import_jsx_runtime35 = require("react/jsx-runtime");
 var getClassName23 = get_class_name_factory_default("LayerTree", styles_module_default18);
 var getClassNameLayer = get_class_name_factory_default("Layer", styles_module_default18);
@@ -7316,7 +7435,7 @@ var Layer = ({
   const isSelected = selecedItemId === itemId || itemSelector && itemSelector.zone === rootDroppableId && !zoneCompound;
   const nodeData = useAppStore((s) => s.state.indexes.nodes[itemId]);
   const zonesForItem = useAppStore(
-    (0, import_shallow5.useShallow)(
+    (0, import_shallow6.useShallow)(
       (s) => Object.keys(s.state.indexes.zones).filter(
         (z) => z.split(":")[0] === itemId
       )
@@ -7363,7 +7482,10 @@ var Layer = ({
                 `[data-puck-component="${itemId}"]`
               );
               if (!el) {
-                console.error("Scroll failed. No element was found for", itemId);
+                setItemSelector({
+                  index,
+                  zone: zoneCompound
+                });
                 return;
               }
               scrollIntoView(el);
@@ -7409,7 +7531,7 @@ var LayerTree = ({
 }) => {
   const label = _label != null ? _label : zoneCompound.split(":")[1];
   const contentIds = useAppStore(
-    (0, import_shallow5.useShallow)(
+    (0, import_shallow6.useShallow)(
       (s) => {
         var _a, _b;
         return zoneCompound ? (_b = (_a = s.state.indexes.zones[zoneCompound]) == null ? void 0 : _a.contentIds) != null ? _b : [] : [];
@@ -7450,12 +7572,12 @@ var findZonesForArea = (state, area) => {
 };
 
 // components/Puck/components/Outline/index.tsx
-var import_shallow6 = require("zustand/react/shallow");
+var import_shallow7 = require("zustand/react/shallow");
 var import_jsx_runtime36 = require("react/jsx-runtime");
 var Outline = () => {
   const outlineOverride = useAppStore((s) => s.overrides.outline);
   const rootZones = useAppStore(
-    (0, import_shallow6.useShallow)((s) => findZonesForArea(s.state, "root"))
+    (0, import_shallow7.useShallow)((s) => findZonesForArea(s.state, "root"))
   );
   const Wrapper = (0, import_react48.useMemo)(() => outlineOverride || "div", [outlineOverride]);
   return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Wrapper, { children: rootZones.map((zoneCompound) => /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
@@ -7771,7 +7893,7 @@ var getZoomConfig = (uiViewport, frame, zoom) => {
 };
 
 // components/Puck/components/Canvas/index.tsx
-var import_shallow7 = require("zustand/react/shallow");
+var import_shallow8 = require("zustand/react/shallow");
 var import_jsx_runtime38 = require("react/jsx-runtime");
 var getClassName25 = get_class_name_factory_default("PuckCanvas", styles_module_default20);
 var ZOOM_ON_CHANGE = true;
@@ -7785,7 +7907,7 @@ var Canvas = () => {
     status,
     iframe
   } = useAppStore(
-    (0, import_shallow7.useShallow)((s) => ({
+    (0, import_shallow8.useShallow)((s) => ({
       dispatch: s.dispatch,
       overrides: s.overrides,
       setUi: s.setUi,
@@ -7796,7 +7918,7 @@ var Canvas = () => {
     }))
   );
   const { leftSideBarVisible, rightSideBarVisible, viewports } = useAppStore(
-    (0, import_shallow7.useShallow)((s) => ({
+    (0, import_shallow8.useShallow)((s) => ({
       leftSideBarVisible: s.state.ui.leftSideBarVisible,
       rightSideBarVisible: s.state.ui.rightSideBarVisible,
       viewports: s.state.ui.viewports
@@ -8130,7 +8252,7 @@ function useGetPuck() {
 }
 
 // components/Puck/index.tsx
-var import_fast_deep_equal2 = __toESM(require("fast-deep-equal"));
+var import_fast_deep_equal3 = __toESM(require("fast-deep-equal"));
 
 // components/Puck/components/Header/index.tsx
 init_react_import();
@@ -8492,6 +8614,11 @@ function PuckProvider({ children }) {
   const [appStore] = (0, import_react56.useState)(
     () => createAppStore(generateAppStore(initialAppState))
   );
+  (0, import_react56.useEffect)(() => {
+    if (process.env.NODE_ENV !== "production") {
+      window.__PUCK_INTERNAL_DO_NOT_USE = { appStore };
+    }
+  }, [appStore]);
   (0, import_react56.useEffect)(() => {
     const state = appStore.getState().state;
     appStore.setState(__spreadValues({}, generateAppStore(state)));
@@ -8507,7 +8634,7 @@ function PuckProvider({ children }) {
       (s) => s.state.data,
       (data) => {
         if (onChange) {
-          if ((0, import_fast_deep_equal2.default)(data, previousData.current)) return;
+          if ((0, import_fast_deep_equal3.default)(data, previousData.current)) return;
           onChange(data);
           previousData.current = data;
         }
@@ -8763,13 +8890,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;