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

package/dist/core.umd.development.js

@@ -1,20 +1,20 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react'), require('@rjsf/utils'), require('lodash-es/get'), require('lodash-es/isEmpty'), require('lodash-es/pick'), require('lodash-es/isObject'), require('lodash-es/set'), require('nanoid'), require('lodash-es/has'), require('lodash-es/unset'), require('lodash-es/omit')) :
-  typeof define === 'function' && define.amd ? define(['exports', 'react', '@rjsf/utils', 'lodash-es/get', 'lodash-es/isEmpty', 'lodash-es/pick', 'lodash-es/isObject', 'lodash-es/set', 'nanoid', 'lodash-es/has', 'lodash-es/unset', 'lodash-es/omit'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.JSONSchemaForm = {}, global.React, global.utils, global.get, global._isEmpty, global._pick, global.isObject, global.set, global.nanoid, global.has, global.unset, global.omit));
-})(this, (function (exports, React, utils, get, _isEmpty, _pick, isObject, set, nanoid, has, unset, omit) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react'), require('@rjsf/utils'), require('lodash-es/get'), require('lodash-es/isEmpty'), require('lodash-es/pick'), require('lodash-es/isObject'), require('lodash-es/set'), require('nanoid'), require('lodash-es/omit'), require('lodash-es/has'), require('lodash-es/unset')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'react', '@rjsf/utils', 'lodash-es/get', 'lodash-es/isEmpty', 'lodash-es/pick', 'lodash-es/isObject', 'lodash-es/set', 'nanoid', 'lodash-es/omit', 'lodash-es/has', 'lodash-es/unset'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.JSONSchemaForm = {}, global.React, global.utils, global.get, global.isEmpty, global._pick, global.isObject, global.set, global.nanoid, global.omit, global.has, global.unset));
+})(this, (function (exports, React, utils, get, isEmpty, _pick, isObject, set, nanoid, omit, has, unset) { 'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
   var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
   var get__default = /*#__PURE__*/_interopDefaultLegacy(get);
-  var _isEmpty__default = /*#__PURE__*/_interopDefaultLegacy(_isEmpty);
+  var isEmpty__default = /*#__PURE__*/_interopDefaultLegacy(isEmpty);
   var _pick__default = /*#__PURE__*/_interopDefaultLegacy(_pick);
   var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
   var set__default = /*#__PURE__*/_interopDefaultLegacy(set);
+  var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
   var has__default = /*#__PURE__*/_interopDefaultLegacy(has);
   var unset__default = /*#__PURE__*/_interopDefaultLegacy(unset);
-  var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
 
   function _defineProperties(target, props) {
     for (var i = 0; i < props.length; i++) {
@@ -71,37 +71,6 @@
     }
     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];
@@ -961,7 +930,7 @@
     });
   }
 
-  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`.
    *
@@ -977,38 +946,28 @@
       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 (utils.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__default["default"](newFormData, key)) {
-                  unset__default["default"](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,
@@ -1050,8 +1009,8 @@
      */;
     _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
@@ -1074,23 +1033,13 @@
      */;
     _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,
@@ -1102,10 +1051,15 @@
       var _getUiOptions = utils.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 = utils.getWidget({
         type: "number"
       }, widget, widgets);
+      var rawErrors = get__default["default"](errorSchema, utils.ERRORS_KEY, []);
+      var fieldErrorSchema = omit__default["default"](errorSchema, [utils.ERRORS_KEY]);
       var option = options[selectedOption] || null;
       var optionSchema;
       if (option) {
@@ -1125,7 +1079,7 @@
         className: "panel panel-default panel-body"
       }, /*#__PURE__*/React__default["default"].createElement("div", {
         className: "form-group"
-      }, /*#__PURE__*/React__default["default"].createElement(Widget, _extends({
+      }, /*#__PURE__*/React__default["default"].createElement(Widget, {
         id: this.getFieldId(),
         schema: {
           type: "number",
@@ -1134,32 +1088,23 @@
         onChange: this.onOptionChange,
         onBlur: onBlur,
         onFocus: onFocus,
+        disabled: disabled || isEmpty__default["default"](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__default["default"].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__default["default"].createElement(_SchemaField, _extends({}, this.props, {
+        schema: optionSchema
+      })));
     };
     return AnyOfField;
   }(React.Component);
@@ -1338,12 +1283,16 @@
           var type = undefined;
           if (isObject__default["default"](schema.additionalProperties)) {
             type = schema.additionalProperties.type;
-            if (utils.REF_KEY in schema.additionalProperties) {
+            var apSchema = schema.additionalProperties;
+            if (utils.REF_KEY in apSchema) {
               var schemaUtils = registry.schemaUtils;
-              var refSchema = schemaUtils.retrieveSchema({
-                $ref: schema.additionalProperties[utils.REF_KEY]
+              apSchema = schemaUtils.retrieveSchema({
+                $ref: apSchema[utils.REF_KEY]
               }, formData);
-              type = refSchema.type;
+              type = apSchema.type;
+            }
+            if (!type && (utils.ANY_OF_KEY in apSchema || utils.ONE_OF_KEY in apSchema)) {
+              type = "object";
             }
           }
           var newKey = _this.getAvailableKey("newKey", newFormData);
@@ -3355,7 +3304,7 @@
                 var formValue = get__default["default"](formData, path);
                 // adds path to fieldNames if it points to a value
                 // or an empty object/array
-                if (typeof formValue !== "object" || _isEmpty__default["default"](formValue)) {
+                if (typeof formValue !== "object" || isEmpty__default["default"](formValue)) {
                   acc.push(path);
                 }
               });
@@ -3791,9 +3740,9 @@
         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__default["default"].createElement(Form, _extends({}, themeProps, directProps, {