@firecms/collection_editor 3.0.0-canary.140 → 3.0.0-canary.141

package/dist/index.umd.js

@@ -507,7 +507,10 @@
     const [inferring, setInferring] = React.useState(false);
     const inferredValuesRef = React.useRef(/* @__PURE__ */ new Set());
     const inferredValues = inferredValuesRef.current;
-    const buildEntry = (index, internalId) => {
+    const buildEntry = ({
+      index,
+      internalId
+    }) => {
       const justAdded = lastInternalIdAdded === internalId;
       const entryError = errors?.enumValues && errors?.enumValues[index];
       return /* @__PURE__ */ jsxRuntime.jsx(
@@ -1759,7 +1762,7 @@
             value: values.spreadChildren ?? false
           }
         ),
-        /* @__PURE__ */ jsxRuntime.jsx(core.FieldCaption, { children: "Set this flag to true if you want to display the children of this group as individual columns." })
+        /* @__PURE__ */ jsxRuntime.jsx(core.FieldCaption, { children: "Set this flag to true if you want to display the children of this group as individual columns. This will only work for top level groups." })
       ] }),
       /* @__PURE__ */ jsxRuntime.jsx(
         PropertyFormDialog,
@@ -2130,7 +2133,7 @@
               onPropertyMove: disabled ? void 0 : onPropertyMove
             }
           ),
-          !disabled && !values.oneOf?.propertiesOrder?.length && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-full flex items-center justify-center p-4", children: "Add the first property to this block" })
+          !disabled && values.oneOf?.propertiesOrder?.length === 0 && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-full flex items-center justify-center p-4", children: "Add the first property to this block" })
         ] })
       ] }),
       !disabled && /* @__PURE__ */ jsxRuntime.jsx(
@@ -3262,7 +3265,7 @@
       }
     }, [deferredValues, includeIdAndTitle, propertyNamespace]);
     React.useEffect(() => {
-      if (values?.id && onError) {
+      if (values?.id && onError && !core.isEmptyObject(errors)) {
         onError(values?.id, propertyNamespace, errors);
       }
     }, [errors, propertyNamespace, values?.id]);
@@ -3782,21 +3785,34 @@
     );
   }
   function collectionToCode(collection) {
-    const propertyCleanup = (property) => {
-      const updatedProperty = {
-        ...property
-      };
-      delete updatedProperty.fromBuilder;
-      delete updatedProperty.resolved;
-      delete updatedProperty.propertiesOrder;
-      delete updatedProperty.editable;
-      if (updatedProperty.type === "map") {
-        return {
-          ...updatedProperty,
-          properties: updatedProperty.properties.map(propertyCleanup)
-        };
+    const propertyCleanup = (value) => {
+      if (typeof value === "function") {
+        return value;
+      }
+      if (Array.isArray(value)) {
+        return value.map((v) => propertyCleanup(v));
+      }
+      if (typeof value === "object") {
+        if (value === null)
+          return value;
+        Object.keys(value).forEach((key) => {
+          if (!core.isEmptyObject(value)) {
+            const childRes = propertyCleanup(value[key]);
+            if (childRes !== null && childRes !== void 0 && childRes !== false && !core.isEmptyObject(childRes)) {
+              value[key] = childRes;
+            } else {
+              delete value[key];
+            }
+          }
+        });
       }
-      return updatedProperty;
+      delete value.fromBuilder;
+      delete value.resolved;
+      delete value.propertiesOrder;
+      delete value.propertyConfig;
+      delete value.resolvedProperties;
+      delete value.editable;
+      return value;
     };
     return {
       id: collection.id,
@@ -3811,7 +3827,9 @@
       customId: collection.customId,
       initialFilter: collection.initialFilter,
       initialSort: collection.initialSort,
-      properties: Object.entries(collection.properties ?? {}).map(([key, value]) => ({
+      properties: Object.entries({
+        ...collection.properties ?? {}
+      }).map(([key, value]) => ({
         [key]: propertyCleanup(value)
       })).reduce((a, b) => ({ ...a, ...b }), {}),
       subcollections: (collection.subcollections ?? []).map(collectionToCode)