@rjsf/core 5.6.2 → 5.7.0

package/dist/core.esm.js

@@ -1,6 +1,6 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { Component, useState, useCallback, useEffect, useReducer, useMemo, createRef, forwardRef } from 'react';
-import { isFixedItems, allowAdditionalItems, getUiOptions, ITEMS_KEY, getTemplate, TranslatableString, isCustomWidget, getWidget, optionsList, deepEquals, ERRORS_KEY, asNumber, REF_KEY, orderProperties, PROPERTIES_KEY, ADDITIONAL_PROPERTY_FLAG, ANY_OF_KEY, ONE_OF_KEY, mergeObjects, UI_OPTIONS_KEY, getSchemaType, descriptionId, ID_KEY, hasWidget, titleId, getInputProps, examplesId, ariaDescribedByIds, getSubmitButtonOptions, errorId, helpId, canExpand, parseDateString, toDateString, pad, schemaRequiresTrueValue, labelValue, enumOptionsValueForIndex, enumOptionsIsSelected, optionId, enumOptionsSelectValue, enumOptionsDeselectValue, utcToLocal, localToUTC, dataURItoBlob, enumOptionsIndexForValue, englishStringTranslator, createSchemaUtils, validationDataMerge, shouldRender, UI_GLOBAL_OPTIONS_KEY, SUBMIT_BTN_OPTIONS_KEY, isObject as isObject$1, toErrorList, RJSF_ADDITONAL_PROPERTIES_FLAG, NAME_KEY } from '@rjsf/utils';
+import { Component, useState, useCallback, useEffect, useReducer, createRef, forwardRef } from 'react';
+import { isFixedItems, allowAdditionalItems, getUiOptions, ITEMS_KEY, getTemplate, TranslatableString, isCustomWidget, getWidget, optionsList, deepEquals, getDiscriminatorFieldFromSchema, ERRORS_KEY, asNumber, REF_KEY, orderProperties, PROPERTIES_KEY, ADDITIONAL_PROPERTY_FLAG, ANY_OF_KEY, ONE_OF_KEY, mergeObjects, UI_OPTIONS_KEY, getSchemaType, descriptionId, ID_KEY, hasWidget, titleId, getInputProps, examplesId, ariaDescribedByIds, getSubmitButtonOptions, errorId, helpId, canExpand, parseDateString, toDateString, pad, schemaRequiresTrueValue, labelValue, enumOptionsValueForIndex, enumOptionsIsSelected, optionId, enumOptionsSelectValue, enumOptionsDeselectValue, utcToLocal, localToUTC, dataURItoBlob, enumOptionsIndexForValue, englishStringTranslator, createSchemaUtils, validationDataMerge, shouldRender, UI_GLOBAL_OPTIONS_KEY, SUBMIT_BTN_OPTIONS_KEY, isObject as isObject$1, toErrorList, RJSF_ADDITONAL_PROPERTIES_FLAG, NAME_KEY } from '@rjsf/utils';
 import get from 'lodash-es/get';
 import isEmpty from 'lodash-es/isEmpty';
 import _pick from 'lodash-es/pick';
@@ -9,7 +9,6 @@ import cloneDeep from 'lodash-es/cloneDeep';
 import isObject from 'lodash-es/isObject';
 import set from 'lodash-es/set';
 import { nanoid } from 'nanoid';
-import isString from 'lodash-es/isString';
 import omit from 'lodash-es/omit';
 import Markdown from 'markdown-to-jsx';
 import has from 'lodash-es/has';
@@ -1135,13 +1134,7 @@ var AnyOfField = /*#__PURE__*/function (_Component) {
     var _this$props4 = this.props,
       schema = _this$props4.schema,
       schemaUtils = _this$props4.registry.schemaUtils;
-    var discriminator;
-    var maybeString = get(schema, 'discriminator.propertyName', undefined);
-    if (isString(maybeString)) {
-      discriminator = maybeString;
-    } else if (maybeString !== undefined) {
-      console.warn("Expecting discriminator to be a string, got \"" + typeof maybeString + "\" instead");
-    }
+    var discriminator = getDiscriminatorFieldFromSchema(schema);
     var option = schemaUtils.getClosestMatchingOption(formData, options, selectedOption, discriminator);
     if (option > 0) {
       return option;
@@ -3262,28 +3255,29 @@ function FileWidget(props) {
     options = props.options,
     registry = props.registry;
   var BaseInputTemplate = getTemplate('BaseInputTemplate', registry, options);
-  var extractedFilesInfo = useMemo(function () {
-    return Array.isArray(value) ? extractFileInfo(value) : extractFileInfo([value]);
-  }, [value]);
-  var _useState = useState(extractedFilesInfo),
+  var _useState = useState(Array.isArray(value) ? extractFileInfo(value) : extractFileInfo([value])),
     filesInfo = _useState[0],
     setFilesInfo = _useState[1];
   var handleChange = useCallback(function (event) {
     if (!event.target.files) {
       return;
     }
+    // Due to variances in themes, dealing with multiple files for the array case now happens one file at a time.
+    // This is because we don't pass `multiple` into the `BaseInputTemplate` anymore. Instead, we deal with the single
+    // file in each event and concatenate them together ourselves
     processFiles(event.target.files).then(function (filesInfoEvent) {
-      setFilesInfo(filesInfoEvent);
       var newValue = filesInfoEvent.map(function (fileInfo) {
         return fileInfo.dataURL;
       });
       if (multiple) {
-        onChange(newValue);
+        setFilesInfo(filesInfo.concat(filesInfoEvent[0]));
+        onChange(value.concat(newValue[0]));
       } else {
+        setFilesInfo(filesInfoEvent);
         onChange(newValue[0]);
       }
     });
-  }, [multiple, onChange]);
+  }, [multiple, value, filesInfo, onChange]);
   return jsxs("div", {
     children: [jsx(BaseInputTemplate, _extends({}, props, {
       disabled: disabled || readonly,
@@ -3923,9 +3917,10 @@ var Form = /*#__PURE__*/function (_Component) {
     var liveValidate = 'liveValidate' in props ? props.liveValidate : this.props.liveValidate;
     var mustValidate = edit && !props.noValidate && liveValidate;
     var rootSchema = schema;
+    var experimental_defaultFormStateBehavior = 'experimental_defaultFormStateBehavior' in props ? props.experimental_defaultFormStateBehavior : this.props.experimental_defaultFormStateBehavior;
     var schemaUtils = state.schemaUtils;
-    if (!schemaUtils || schemaUtils.doesSchemaUtilsDiffer(props.validator, rootSchema)) {
-      schemaUtils = createSchemaUtils(props.validator, rootSchema);
+    if (!schemaUtils || schemaUtils.doesSchemaUtilsDiffer(props.validator, rootSchema, experimental_defaultFormStateBehavior)) {
+      schemaUtils = createSchemaUtils(props.validator, rootSchema, experimental_defaultFormStateBehavior);
     }
     var formData = schemaUtils.getDefaultFormState(schema, inputFormData);
     var retrievedSchema = schemaUtils.retrieveSchema(schema, formData);