@rjsf/core 5.0.0-beta.17 → 5.0.0-beta.18

package/dist/core.esm.js

@@ -1,14 +1,14 @@
 import React, { Component, useState, useCallback, useEffect, useReducer, useMemo, forwardRef } from 'react';
-import { isFixedItems, allowAdditionalItems, getUiOptions, ITEMS_KEY, getTemplate, isCustomWidget, getWidget, optionsList, guessType, deepEquals, asNumber, REF_KEY, orderProperties, PROPERTIES_KEY, ADDITIONAL_PROPERTY_FLAG, mergeObjects, UI_OPTIONS_KEY, descriptionId, getSchemaType, ID_KEY, hasWidget, titleId, getInputProps, examplesId, ariaDescribedByIds, getSubmitButtonOptions, errorId, helpId, canExpand, parseDateString, toDateString, pad, schemaRequiresTrueValue, optionId, enumOptionsSelectValue, enumOptionsDeselectValue, utcToLocal, localToUTC, dataURItoBlob, processSelectValue, createSchemaUtils, shouldRender, isObject as isObject$1, RJSF_ADDITONAL_PROPERTIES_FLAG, NAME_KEY } from '@rjsf/utils';
+import { isFixedItems, allowAdditionalItems, getUiOptions, ITEMS_KEY, getTemplate, 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, descriptionId, getSchemaType, ID_KEY, hasWidget, titleId, getInputProps, examplesId, ariaDescribedByIds, getSubmitButtonOptions, errorId, helpId, canExpand, parseDateString, toDateString, pad, schemaRequiresTrueValue, optionId, enumOptionsSelectValue, enumOptionsDeselectValue, utcToLocal, localToUTC, dataURItoBlob, processSelectValue, createSchemaUtils, shouldRender, isObject as isObject$1, RJSF_ADDITONAL_PROPERTIES_FLAG, NAME_KEY } from '@rjsf/utils';
 import get from 'lodash-es/get';
-import _isEmpty from 'lodash-es/isEmpty';
+import isEmpty from 'lodash-es/isEmpty';
 import _pick from 'lodash-es/pick';
 import isObject from 'lodash-es/isObject';
 import set from 'lodash-es/set';
 import { nanoid } from 'nanoid';
+import omit from 'lodash-es/omit';
 import has from 'lodash-es/has';
 import unset from 'lodash-es/unset';
-import omit from 'lodash-es/omit';
 
 function _defineProperties(target, props) {
   for (var i = 0; i < props.length; i++) {
@@ -65,37 +65,6 @@ function _objectWithoutPropertiesLoose(source, excluded) {
   }
   return target;
 }
-function _unsupportedIterableToArray(o, minLen) {
-  if (!o) return;
-  if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-  var n = Object.prototype.toString.call(o).slice(8, -1);
-  if (n === "Object" && o.constructor) n = o.constructor.name;
-  if (n === "Map" || n === "Set") return Array.from(o);
-  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-}
-function _arrayLikeToArray(arr, len) {
-  if (len == null || len > arr.length) len = arr.length;
-  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-  return arr2;
-}
-function _createForOfIteratorHelperLoose(o, allowArrayLike) {
-  var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
-  if (it) return (it = it.call(o)).next.bind(it);
-  if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
-    if (it) o = it;
-    var i = 0;
-    return function () {
-      if (i >= o.length) return {
-        done: true
-      };
-      return {
-        done: false,
-        value: o[i++]
-      };
-    };
-  }
-  throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
 function _toPrimitive(input, hint) {
   if (typeof input !== "object" || input === null) return input;
   var prim = input[Symbol.toPrimitive];
@@ -955,7 +924,7 @@ function BooleanField(props) {
   });
 }
 
-var _excluded$7 = ["widget"];
+var _excluded$7 = ["widget", "placeholder", "autofocus", "autocomplete"];
 /** The `AnyOfField` component is used to render a field in the schema that is an `anyOf`, `allOf` or `oneOf`. It tracks
  * the currently selected option and cleans up any irrelevant data in `formData`.
  *
@@ -971,38 +940,28 @@ var AnyOfField = /*#__PURE__*/function (_Component) {
     var _this;
     _this = _Component.call(this, props) || this;
     _this.onOptionChange = function (option) {
-      var selectedOption = parseInt(option, 10);
+      var selectedOption = _this.state.selectedOption;
       var _this$props = _this.props,
         formData = _this$props.formData,
         onChange = _this$props.onChange,
         options = _this$props.options,
         registry = _this$props.registry;
       var schemaUtils = registry.schemaUtils;
-      var newOption = schemaUtils.retrieveSchema(options[selectedOption], formData);
-      // If the new option is of type object and the current data is an object,
-      // discard properties added using the old option.
-      var newFormData = undefined;
-      if (guessType(formData) === "object" && (newOption.type === "object" || newOption.properties)) {
-        newFormData = Object.assign({}, formData);
-        var optionsToDiscard = options.slice();
-        optionsToDiscard.splice(selectedOption, 1);
-        // Discard any data added using other options
-        for (var _iterator = _createForOfIteratorHelperLoose(optionsToDiscard), _step; !(_step = _iterator()).done;) {
-          var _option = _step.value;
-          if (_option.properties) {
-            for (var key in _option.properties) {
-              if (has(newFormData, key)) {
-                unset(newFormData, key);
-              }
-            }
-          }
-        }
+      var intOption = option !== undefined ? parseInt(option, 10) : -1;
+      if (intOption === selectedOption) {
+        return;
       }
-      // Call getDefaultFormState to make sure defaults are populated on change. Pass "excludeObjectChildren"
-      // so that only the root objects themselves are created without adding undefined children properties
-      onChange(schemaUtils.getDefaultFormState(options[selectedOption], newFormData, "excludeObjectChildren"), undefined, _this.getFieldId());
+      var newOption = intOption >= 0 ? schemaUtils.retrieveSchema(options[intOption], formData) : undefined;
+      var oldOption = selectedOption >= 0 ? schemaUtils.retrieveSchema(options[selectedOption], formData) : undefined;
+      var newFormData = schemaUtils.sanitizeDataForNewSchema(newOption, oldOption, formData);
+      if (newFormData && newOption) {
+        // Call getDefaultFormState to make sure defaults are populated on change. Pass "excludeObjectChildren"
+        // so that only the root objects themselves are created without adding undefined children properties
+        newFormData = schemaUtils.getDefaultFormState(newOption, newFormData, "excludeObjectChildren");
+      }
+      onChange(newFormData, undefined, _this.getFieldId());
       _this.setState({
-        selectedOption: parseInt(option, 10)
+        selectedOption: intOption
       });
     };
     var _this$props2 = _this.props,
@@ -1044,8 +1003,8 @@ var AnyOfField = /*#__PURE__*/function (_Component) {
    */;
   _proto.getMatchingOption = function getMatchingOption(selectedOption, formData, options) {
     var schemaUtils = this.props.registry.schemaUtils;
-    var option = schemaUtils.getMatchingOption(formData, options);
-    if (option !== 0) {
+    var option = schemaUtils.getClosestMatchingOption(formData, options, selectedOption);
+    if (option > 0) {
       return option;
     }
     // If the form data matches none of the options, use the currently selected
@@ -1068,23 +1027,13 @@ var AnyOfField = /*#__PURE__*/function (_Component) {
    */;
   _proto.render = function render() {
     var _this$props5 = this.props,
-      name = _this$props5.name,
       baseType = _this$props5.baseType,
       _this$props5$disabled = _this$props5.disabled,
       disabled = _this$props5$disabled === void 0 ? false : _this$props5$disabled,
-      _this$props5$readonly = _this$props5.readonly,
-      readonly = _this$props5$readonly === void 0 ? false : _this$props5$readonly,
-      _this$props5$hideErro = _this$props5.hideError,
-      hideError = _this$props5$hideErro === void 0 ? false : _this$props5$hideErro,
       _this$props5$errorSch = _this$props5.errorSchema,
       errorSchema = _this$props5$errorSch === void 0 ? {} : _this$props5$errorSch,
-      formData = _this$props5.formData,
       formContext = _this$props5.formContext,
-      idPrefix = _this$props5.idPrefix,
-      idSeparator = _this$props5.idSeparator,
-      idSchema = _this$props5.idSchema,
       onBlur = _this$props5.onBlur,
-      onChange = _this$props5.onChange,
       onFocus = _this$props5.onFocus,
       options = _this$props5.options,
       registry = _this$props5.registry,
@@ -1096,10 +1045,15 @@ var AnyOfField = /*#__PURE__*/function (_Component) {
     var _getUiOptions = getUiOptions(uiSchema),
       _getUiOptions$widget = _getUiOptions.widget,
       widget = _getUiOptions$widget === void 0 ? "select" : _getUiOptions$widget,
+      placeholder = _getUiOptions.placeholder,
+      autofocus = _getUiOptions.autofocus,
+      autocomplete = _getUiOptions.autocomplete,
       uiOptions = _objectWithoutPropertiesLoose(_getUiOptions, _excluded$7);
     var Widget = getWidget({
       type: "number"
     }, widget, widgets);
+    var rawErrors = get(errorSchema, ERRORS_KEY, []);
+    var fieldErrorSchema = omit(errorSchema, [ERRORS_KEY]);
     var option = options[selectedOption] || null;
     var optionSchema;
     if (option) {
@@ -1119,7 +1073,7 @@ var AnyOfField = /*#__PURE__*/function (_Component) {
       className: "panel panel-default panel-body"
     }, /*#__PURE__*/React.createElement("div", {
       className: "form-group"
-    }, /*#__PURE__*/React.createElement(Widget, _extends({
+    }, /*#__PURE__*/React.createElement(Widget, {
       id: this.getFieldId(),
       schema: {
         type: "number",
@@ -1128,32 +1082,23 @@ var AnyOfField = /*#__PURE__*/function (_Component) {
       onChange: this.onOptionChange,
       onBlur: onBlur,
       onFocus: onFocus,
+      disabled: disabled || isEmpty(enumOptions),
+      multiple: false,
+      rawErrors: rawErrors,
+      errorSchema: fieldErrorSchema,
       value: selectedOption,
-      options: {
+      options: _extends({
         enumOptions: enumOptions
-      },
+      }, uiOptions),
       registry: registry,
-      formContext: formContext
-    }, uiOptions, {
-      label: ""
-    }))), option !== null && /*#__PURE__*/React.createElement(_SchemaField, {
-      name: name,
-      schema: optionSchema,
-      uiSchema: uiSchema,
-      errorSchema: errorSchema,
-      idSchema: idSchema,
-      idPrefix: idPrefix,
-      idSeparator: idSeparator,
-      formData: formData,
       formContext: formContext,
-      onChange: onChange,
-      onBlur: onBlur,
-      onFocus: onFocus,
-      registry: registry,
-      disabled: disabled,
-      readonly: readonly,
-      hideError: hideError
-    }));
+      placeholder: placeholder,
+      autocomplete: autocomplete,
+      autofocus: autofocus,
+      label: ""
+    })), option !== null && /*#__PURE__*/React.createElement(_SchemaField, _extends({}, this.props, {
+      schema: optionSchema
+    })));
   };
   return AnyOfField;
 }(Component);
@@ -1332,12 +1277,16 @@ var ObjectField = /*#__PURE__*/function (_Component) {
         var type = undefined;
         if (isObject(schema.additionalProperties)) {
           type = schema.additionalProperties.type;
-          if (REF_KEY in schema.additionalProperties) {
+          var apSchema = schema.additionalProperties;
+          if (REF_KEY in apSchema) {
             var schemaUtils = registry.schemaUtils;
-            var refSchema = schemaUtils.retrieveSchema({
-              $ref: schema.additionalProperties[REF_KEY]
+            apSchema = schemaUtils.retrieveSchema({
+              $ref: apSchema[REF_KEY]
             }, formData);
-            type = refSchema.type;
+            type = apSchema.type;
+          }
+          if (!type && (ANY_OF_KEY in apSchema || ONE_OF_KEY in apSchema)) {
+            type = "object";
           }
         }
         var newKey = _this.getAvailableKey("newKey", newFormData);
@@ -3349,7 +3298,7 @@ var Form = /*#__PURE__*/function (_Component) {
               var formValue = get(formData, path);
               // adds path to fieldNames if it points to a value
               // or an empty object/array
-              if (typeof formValue !== "object" || _isEmpty(formValue)) {
+              if (typeof formValue !== "object" || isEmpty(formValue)) {
                 acc.push(path);
               }
             });
@@ -3785,9 +3734,9 @@ function withTheme(themeProps) {
       widgets = _ref.widgets,
       templates = _ref.templates,
       directProps = _objectWithoutPropertiesLoose(_ref, _excluded);
-    fields = _extends({}, themeProps.fields, fields);
-    widgets = _extends({}, themeProps.widgets, widgets);
-    templates = _extends({}, themeProps.templates, templates, {
+    fields = _extends({}, themeProps === null || themeProps === void 0 ? void 0 : themeProps.fields, fields);
+    widgets = _extends({}, themeProps === null || themeProps === void 0 ? void 0 : themeProps.widgets, widgets);
+    templates = _extends({}, themeProps === null || themeProps === void 0 ? void 0 : themeProps.templates, templates, {
       ButtonTemplates: _extends({}, themeProps === null || themeProps === void 0 ? void 0 : (_themeProps$templates = themeProps.templates) === null || _themeProps$templates === void 0 ? void 0 : _themeProps$templates.ButtonTemplates, (_templates = templates) === null || _templates === void 0 ? void 0 : _templates.ButtonTemplates)
     });
     return /*#__PURE__*/React.createElement(Form, _extends({}, themeProps, directProps, {