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

package/dist/form/useClearRestoreValue.d.ts

@@ -1,4 +1,4 @@
-import { CMSType, ResolvedProperty } from "../types";
+import { CMSType, Property, ResolvedProperty } from "../types";
 /**
  * Hook we use to restore a value after it has been cleared
  * @param property
@@ -7,7 +7,7 @@ import { CMSType, ResolvedProperty } from "../types";
  * @ignore
  */
 export declare function useClearRestoreValue<T extends CMSType>({ property, value, setValue }: {
-    property: ResolvedProperty<T>;
+    property: Property<T> | ResolvedProperty<T>;
     value: T;
     setValue: (value: T | null, shouldValidate?: boolean) => void;
 }): void;

package/dist/index.es.js

@@ -6603,6 +6603,10 @@ function useStorageUploadController({
       setInternalValue(internalInitialValue);
     }
   }, [internalInitialValue, value, initialValue]);
+  const resolvedProperty = resolveProperty({
+    propertyOrBuilder: property,
+    values: entityValues
+  });
   const fileNameBuilder = useCallback(async (file) => {
     if (storage.fileName) {
       const fileName = await resolveStorageFilenameString({
@@ -6611,7 +6615,7 @@ function useStorageUploadController({
         values: entityValues,
         entityId,
         path,
-        property,
+        property: resolvedProperty,
         file,
         propertyKey
       });
@@ -6621,7 +6625,7 @@ function useStorageUploadController({
       return fileName;
     }
     return randomString() + "_" + file.name;
-  }, [entityId, entityValues, path, property, propertyKey, storage]);
+  }, [entityId, entityValues, path, resolvedProperty, propertyKey, storage]);
   const storagePathBuilder = useCallback((file) => {
     return resolveStoragePathString({
       input: storage.storagePath,
@@ -6629,11 +6633,11 @@ function useStorageUploadController({
       values: entityValues,
       entityId,
       path,
-      property,
+      property: resolvedProperty,
       file,
       propertyKey
     }) ?? "/";
-  }, [entityId, entityValues, path, property, propertyKey, storage]);
+  }, [entityId, entityValues, path, resolvedProperty, propertyKey, storage]);
   const onFileUploadComplete = useCallback(async (uploadedPath, entry, metadata2) => {
     console.debug("onFileUploadComplete", uploadedPath, entry);
     let uploadPathOrDownloadUrl = uploadedPath;
@@ -13892,7 +13896,7 @@ function SelectFieldBinding({
   includeDescription,
   size = "medium"
 }) {
-  const enumValues = property.enumValues;
+  const enumValues = resolveEnumValues(property.enumValues ?? []);
   useClearRestoreValue({
     property,
     value,
@@ -14331,6 +14335,9 @@ function StorageUploadFieldBinding({
     value,
     setValue
   });
+  const resolvedProperty = resolveProperty({
+    propertyOrBuilder: property
+  });
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     !minimalistView && /* @__PURE__ */ jsx(
       LabelWithIconAndTooltip,
@@ -14349,7 +14356,7 @@ function StorageUploadFieldBinding({
         name: propertyKey,
         disabled: disabled ?? false,
         autoFocus: autoFocus ?? false,
-        property,
+        property: resolvedProperty,
         onChange: setValue,
         setInternalValue,
         onFilesAdded,
@@ -15968,7 +15975,7 @@ function RepeatFieldBinding({
 }) {
   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,
@@ -16282,6 +16289,10 @@ function MarkdownEditorFieldBinding({
       setFieldVersion(fieldVersion + 1);
     }
   }, [value]);
+  const resolvedProperty = resolveProperty({
+    propertyOrBuilder: property,
+    values: entityValues
+  });
   const fileNameBuilder = useCallback(async (file) => {
     if (storage?.fileName) {
       const fileName = await resolveStorageFilenameString({
@@ -16290,7 +16301,7 @@ function MarkdownEditorFieldBinding({
         values: entityValues,
         entityId,
         path,
-        property,
+        property: resolvedProperty,
         file,
         propertyKey
       });
@@ -16300,16 +16311,20 @@ function MarkdownEditorFieldBinding({
       return fileName;
     }
     return randomString() + "_" + file.name;
-  }, [entityId, entityValues, path, property, propertyKey, storage]);
+  }, [entityId, entityValues, path, resolvedProperty, propertyKey, storage]);
   const storagePathBuilder = 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
     }) ?? "/";
@@ -16378,8 +16393,15 @@ function ArrayCustomShapedFieldBinding({
   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,
@@ -16403,7 +16425,7 @@ function ArrayCustomShapedFieldBinding({
       ")"
     ] })
   ] });
-  const body = property.resolvedProperties.map((childProperty, index) => {
+  const body = resolvedProperties.map((childProperty, index) => {
     const fieldProps = {
       propertyKey: `${propertyKey}[${index}]`,
       disabled,