@rjsf/core 5.6.2 → 5.7.1

package/dist/core.cjs.development.js

@@ -13,7 +13,6 @@ var cloneDeep = require('lodash/cloneDeep');
 var isObject = require('lodash/isObject');
 var set = require('lodash/set');
 var nanoid = require('nanoid');
-var isString = require('lodash/isString');
 var omit = require('lodash/omit');
 var Markdown = require('markdown-to-jsx');
 var has = require('lodash/has');
@@ -28,7 +27,6 @@ var _toPath__default = /*#__PURE__*/_interopDefaultLegacy(_toPath);
 var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
 var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
 var set__default = /*#__PURE__*/_interopDefaultLegacy(set);
-var isString__default = /*#__PURE__*/_interopDefaultLegacy(isString);
 var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
 var Markdown__default = /*#__PURE__*/_interopDefaultLegacy(Markdown);
 var has__default = /*#__PURE__*/_interopDefaultLegacy(has);
@@ -1154,13 +1152,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__default["default"](schema, 'discriminator.propertyName', undefined);
-    if (isString__default["default"](maybeString)) {
-      discriminator = maybeString;
-    } else if (maybeString !== undefined) {
-      console.warn("Expecting discriminator to be a string, got \"" + typeof maybeString + "\" instead");
-    }
+    var discriminator = utils.getDiscriminatorFieldFromSchema(schema);
     var option = schemaUtils.getClosestMatchingOption(formData, options, selectedOption, discriminator);
     if (option > 0) {
       return option;
@@ -3281,28 +3273,29 @@ function FileWidget(props) {
     options = props.options,
     registry = props.registry;
   var BaseInputTemplate = utils.getTemplate('BaseInputTemplate', registry, options);
-  var extractedFilesInfo = react.useMemo(function () {
-    return Array.isArray(value) ? extractFileInfo(value) : extractFileInfo([value]);
-  }, [value]);
-  var _useState = react.useState(extractedFilesInfo),
+  var _useState = react.useState(Array.isArray(value) ? extractFileInfo(value) : extractFileInfo([value])),
     filesInfo = _useState[0],
     setFilesInfo = _useState[1];
   var handleChange = react.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 jsxRuntime.jsxs("div", {
     children: [jsxRuntime.jsx(BaseInputTemplate, _extends({}, props, {
       disabled: disabled || readonly,
@@ -3942,9 +3935,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 = utils.createSchemaUtils(props.validator, rootSchema);
+    if (!schemaUtils || schemaUtils.doesSchemaUtilsDiffer(props.validator, rootSchema, experimental_defaultFormStateBehavior)) {
+      schemaUtils = utils.createSchemaUtils(props.validator, rootSchema, experimental_defaultFormStateBehavior);
     }
     var formData = schemaUtils.getDefaultFormState(schema, inputFormData);
     var retrievedSchema = schemaUtils.retrieveSchema(schema, formData);
@@ -4116,7 +4110,7 @@ var Form = /*#__PURE__*/function (_Component) {
       // if not an exact match, try finding an input starting with the element id (like radio buttons or checkboxes)
       field = this.formElement.current.querySelector("input[id^=" + elementId);
     }
-    if (field.length) {
+    if (field && field.length) {
       // If we got a list with length > 0
       field = field[0];
     }