@firecms/core 3.0.0-canary.119 → 3.0.0-canary.120

package/dist/index.umd.js

@@ -6607,6 +6607,10 @@
         setInternalValue(internalInitialValue);
       }
     }, [internalInitialValue, value, initialValue]);
+    const resolvedProperty = resolveProperty({
+      propertyOrBuilder: property,
+      values: entityValues
+    });
     const fileNameBuilder = React.useCallback(async (file) => {
       if (storage.fileName) {
         const fileName = await resolveStorageFilenameString({
@@ -6615,7 +6619,7 @@
           values: entityValues,
           entityId,
           path,
-          property,
+          property: resolvedProperty,
           file,
           propertyKey
         });
@@ -6625,7 +6629,7 @@
         return fileName;
       }
       return randomString() + "_" + file.name;
-    }, [entityId, entityValues, path, property, propertyKey, storage]);
+    }, [entityId, entityValues, path, resolvedProperty, propertyKey, storage]);
     const storagePathBuilder = React.useCallback((file) => {
       return resolveStoragePathString({
         input: storage.storagePath,
@@ -6633,11 +6637,11 @@
         values: entityValues,
         entityId,
         path,
-        property,
+        property: resolvedProperty,
         file,
         propertyKey
       }) ?? "/";
-    }, [entityId, entityValues, path, property, propertyKey, storage]);
+    }, [entityId, entityValues, path, resolvedProperty, propertyKey, storage]);
     const onFileUploadComplete = React.useCallback(async (uploadedPath, entry, metadata2) => {
       console.debug("onFileUploadComplete", uploadedPath, entry);
       let uploadPathOrDownloadUrl = uploadedPath;
@@ -13896,7 +13900,7 @@
     includeDescription,
     size = "medium"
   }) {
-    const enumValues = property.enumValues;
+    const enumValues = resolveEnumValues(property.enumValues ?? []);
     useClearRestoreValue({
       property,
       value,
@@ -14335,6 +14339,9 @@
       value,
       setValue
     });
+    const resolvedProperty = resolveProperty({
+      propertyOrBuilder: property
+    });
     return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
       !minimalistView && /* @__PURE__ */ jsxRuntime.jsx(
         LabelWithIconAndTooltip,
@@ -14353,7 +14360,7 @@
           name: propertyKey,
           disabled: disabled ?? false,
           autoFocus: autoFocus ?? false,
-          property,
+          property: resolvedProperty,
           onChange: setValue,
           setInternalValue,
           onFilesAdded,
@@ -15972,7 +15979,7 @@
   }) {
     if (!property.of)
       throw Error("RepeatFieldBinding misconfiguration. Property `of` not set");
-    let resolvedProperties = property.resolvedProperties;
+    let resolvedProperties = "resolvedProperties" in property ? property.resolvedProperties : void 0;
     if (!resolvedProperties) {
       resolvedProperties = getArrayResolvedProperties({
         propertyValue: value,
@@ -16286,6 +16293,10 @@
         setFieldVersion(fieldVersion + 1);
       }
     }, [value]);
+    const resolvedProperty = resolveProperty({
+      propertyOrBuilder: property,
+      values: entityValues
+    });
     const fileNameBuilder = React.useCallback(async (file) => {
       if (storage?.fileName) {
         const fileName = await resolveStorageFilenameString({
@@ -16294,7 +16305,7 @@
           values: entityValues,
           entityId,
           path,
-          property,
+          property: resolvedProperty,
           file,
           propertyKey
         });
@@ -16304,16 +16315,20 @@
         return fileName;
       }
       return randomString() + "_" + file.name;
-    }, [entityId, entityValues, path, property, propertyKey, storage]);
+    }, [entityId, entityValues, path, resolvedProperty, propertyKey, storage]);
     const storagePathBuilder = React.useCallback((file) => {
       if (!storage) return "/";
+      const resolvedProperty2 = resolveProperty({
+        propertyOrBuilder: property,
+        values: entityValues
+      });
       return resolveStoragePathString({
         input: storage.storagePath,
         storage,
         values: entityValues,
         entityId,
         path,
-        property,
+        property: resolvedProperty2,
         file,
         propertyKey
       }) ?? "/";
@@ -16382,8 +16397,15 @@
     context,
     disabled
   }) {
-    if (!Array.isArray(property.resolvedProperties))
-      throw Error("ArrayCustomShapedFieldBinding misconfiguration. Property `of` not set");
+    let resolvedProperties = "resolvedProperties" in property ? property.resolvedProperties : void 0;
+    if (!resolvedProperties) {
+      resolvedProperties = getArrayResolvedProperties({
+        propertyValue: value,
+        propertyKey,
+        property,
+        ignoreMissingFields: false
+      });
+    }
     const expanded = property.expanded === void 0 ? true : property.expanded;
     useClearRestoreValue({
       property,
@@ -16407,7 +16429,7 @@
         ")"
       ] })
     ] });
-    const body = property.resolvedProperties.map((childProperty, index) => {
+    const body = resolvedProperties.map((childProperty, index) => {
       const fieldProps = {
         propertyKey: `${propertyKey}[${index}]`,
         disabled,