@rjsf/core 5.16.1 → 5.17.0

package/dist/core.umd.js

@@ -986,12 +986,33 @@
         const { required } = schema;
         optionSchema = required ? utils.mergeSchemas({ required }, option) : option;
       }
+      let optionsUiSchema = [];
+      if (utils.ONE_OF_KEY in schema && uiSchema && utils.ONE_OF_KEY in uiSchema) {
+        if (Array.isArray(uiSchema[utils.ONE_OF_KEY])) {
+          optionsUiSchema = uiSchema[utils.ONE_OF_KEY];
+        } else {
+          console.warn(`uiSchema.oneOf is not an array for "${title || name}"`);
+        }
+      } else if (utils.ANY_OF_KEY in schema && uiSchema && utils.ANY_OF_KEY in uiSchema) {
+        if (Array.isArray(uiSchema[utils.ANY_OF_KEY])) {
+          optionsUiSchema = uiSchema[utils.ANY_OF_KEY];
+        } else {
+          console.warn(`uiSchema.anyOf is not an array for "${title || name}"`);
+        }
+      }
+      let optionUiSchema = uiSchema;
+      if (selectedOption >= 0 && optionsUiSchema.length > selectedOption) {
+        optionUiSchema = optionsUiSchema[selectedOption];
+      }
       const translateEnum = title ? utils.TranslatableString.TitleOptionPrefix : utils.TranslatableString.OptionPrefix;
       const translateParams = title ? [title] : [];
-      const enumOptions = retrievedOptions.map((opt, index) => ({
-        label: opt.title || translateString(translateEnum, translateParams.concat(String(index + 1))),
-        value: index
-      }));
+      const enumOptions = retrievedOptions.map((opt, index) => {
+        const { title: uiTitle = opt.title } = utils.getUiOptions(optionsUiSchema[index]);
+        return {
+          label: uiTitle || translateString(translateEnum, translateParams.concat(String(index + 1))),
+          value: index
+        };
+      });
       return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "panel panel-default panel-body", children: [
         /* @__PURE__ */ jsxRuntime.jsx("div", { className: "form-group", children: /* @__PURE__ */ jsxRuntime.jsx(
           Widget,
@@ -1017,7 +1038,7 @@
             hideLabel: !displayLabel
           }
         ) }),
-        option !== null && /* @__PURE__ */ jsxRuntime.jsx(_SchemaField, { ...this.props, schema: optionSchema })
+        optionSchema && /* @__PURE__ */ jsxRuntime.jsx(_SchemaField, { ...this.props, schema: optionSchema, uiSchema: optionUiSchema })
       ] });
     }
   };
@@ -2588,7 +2609,7 @@
     if (!dataURL) {
       return null;
     }
-    if (type.indexOf("image") !== -1) {
+    if (["image/jpeg", "image/png"].includes(type)) {
       return /* @__PURE__ */ jsxRuntime.jsx("img", { src: dataURL, style: { maxWidth: "100%" }, className: "file-preview" });
     }
     return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
@@ -2619,15 +2640,25 @@
     }) });
   }
   function extractFileInfo(dataURLs) {
-    return dataURLs.filter((dataURL) => dataURL).map((dataURL) => {
-      const { blob, name } = utils.dataURItoBlob(dataURL);
-      return {
-        dataURL,
-        name,
-        size: blob.size,
-        type: blob.type
-      };
-    });
+    return dataURLs.reduce((acc, dataURL) => {
+      if (!dataURL) {
+        return acc;
+      }
+      try {
+        const { blob, name } = utils.dataURItoBlob(dataURL);
+        return [
+          ...acc,
+          {
+            dataURL,
+            name,
+            size: blob.size,
+            type: blob.type
+          }
+        ];
+      } catch (e) {
+        return acc;
+      }
+    }, []);
   }
   function FileWidget(props) {
     const { disabled, readonly, required, multiple, onChange, value, options, registry } = props;

package/dist/index.esm.js

@@ -918,12 +918,14 @@ import get2 from "lodash/get";
 import isEmpty from "lodash/isEmpty";
 import omit from "lodash/omit";
 import {
+  ANY_OF_KEY,
   deepEquals,
   ERRORS_KEY,
   getDiscriminatorFieldFromSchema,
   getUiOptions as getUiOptions3,
   getWidget as getWidget3,
   mergeSchemas,
+  ONE_OF_KEY,
   TranslatableString as TranslatableString3
 } from "@rjsf/utils";
 import { jsx as jsx3, jsxs } from "react/jsx-runtime";
@@ -1050,12 +1052,33 @@ var AnyOfField = class extends Component2 {
       const { required } = schema;
       optionSchema = required ? mergeSchemas({ required }, option) : option;
     }
+    let optionsUiSchema = [];
+    if (ONE_OF_KEY in schema && uiSchema && ONE_OF_KEY in uiSchema) {
+      if (Array.isArray(uiSchema[ONE_OF_KEY])) {
+        optionsUiSchema = uiSchema[ONE_OF_KEY];
+      } else {
+        console.warn(`uiSchema.oneOf is not an array for "${title || name}"`);
+      }
+    } else if (ANY_OF_KEY in schema && uiSchema && ANY_OF_KEY in uiSchema) {
+      if (Array.isArray(uiSchema[ANY_OF_KEY])) {
+        optionsUiSchema = uiSchema[ANY_OF_KEY];
+      } else {
+        console.warn(`uiSchema.anyOf is not an array for "${title || name}"`);
+      }
+    }
+    let optionUiSchema = uiSchema;
+    if (selectedOption >= 0 && optionsUiSchema.length > selectedOption) {
+      optionUiSchema = optionsUiSchema[selectedOption];
+    }
     const translateEnum = title ? TranslatableString3.TitleOptionPrefix : TranslatableString3.OptionPrefix;
     const translateParams = title ? [title] : [];
-    const enumOptions = retrievedOptions.map((opt, index) => ({
-      label: opt.title || translateString(translateEnum, translateParams.concat(String(index + 1))),
-      value: index
-    }));
+    const enumOptions = retrievedOptions.map((opt, index) => {
+      const { title: uiTitle = opt.title } = getUiOptions3(optionsUiSchema[index]);
+      return {
+        label: uiTitle || translateString(translateEnum, translateParams.concat(String(index + 1))),
+        value: index
+      };
+    });
     return /* @__PURE__ */ jsxs("div", { className: "panel panel-default panel-body", children: [
       /* @__PURE__ */ jsx3("div", { className: "form-group", children: /* @__PURE__ */ jsx3(
         Widget,
@@ -1081,7 +1104,7 @@ var AnyOfField = class extends Component2 {
           hideLabel: !displayLabel
         }
       ) }),
-      option !== null && /* @__PURE__ */ jsx3(_SchemaField, { ...this.props, schema: optionSchema })
+      optionSchema && /* @__PURE__ */ jsx3(_SchemaField, { ...this.props, schema: optionSchema, uiSchema: optionUiSchema })
     ] });
   }
 };
@@ -1129,8 +1152,8 @@ import {
   ADDITIONAL_PROPERTY_FLAG,
   PROPERTIES_KEY,
   REF_KEY,
-  ANY_OF_KEY,
-  ONE_OF_KEY
+  ANY_OF_KEY as ANY_OF_KEY2,
+  ONE_OF_KEY as ONE_OF_KEY2
 } from "@rjsf/utils";
 import Markdown from "markdown-to-jsx";
 import get3 from "lodash/get";
@@ -1256,7 +1279,7 @@ var ObjectField = class extends Component3 {
           apSchema = schemaUtils.retrieveSchema({ $ref: apSchema[REF_KEY] }, formData);
           type = apSchema.type;
         }
-        if (!type && (ANY_OF_KEY in apSchema || ONE_OF_KEY in apSchema)) {
+        if (!type && (ANY_OF_KEY2 in apSchema || ONE_OF_KEY2 in apSchema)) {
           type = "object";
         }
       }
@@ -2881,7 +2904,7 @@ function FileInfoPreview({
   if (!dataURL) {
     return null;
   }
-  if (type.indexOf("image") !== -1) {
+  if (["image/jpeg", "image/png"].includes(type)) {
     return /* @__PURE__ */ jsx34("img", { src: dataURL, style: { maxWidth: "100%" }, className: "file-preview" });
   }
   return /* @__PURE__ */ jsxs17(Fragment3, { children: [
@@ -2912,15 +2935,25 @@ function FilesInfo({
   }) });
 }
 function extractFileInfo(dataURLs) {
-  return dataURLs.filter((dataURL) => dataURL).map((dataURL) => {
-    const { blob, name } = dataURItoBlob(dataURL);
-    return {
-      dataURL,
-      name,
-      size: blob.size,
-      type: blob.type
-    };
-  });
+  return dataURLs.reduce((acc, dataURL) => {
+    if (!dataURL) {
+      return acc;
+    }
+    try {
+      const { blob, name } = dataURItoBlob(dataURL);
+      return [
+        ...acc,
+        {
+          dataURL,
+          name,
+          size: blob.size,
+          type: blob.type
+        }
+      ];
+    } catch (e) {
+      return acc;
+    }
+  }, []);
 }
 function FileWidget(props) {
   const { disabled, readonly, required, multiple, onChange, value, options, registry } = props;