@rjsf/core 5.8.2 → 5.10.0

package/dist/core.umd.development.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react/jsx-runtime'), require('react'), require('@rjsf/utils'), require('lodash-es/get'), require('lodash-es/isEmpty'), require('lodash-es/pick'), require('lodash-es/toPath'), require('lodash-es/cloneDeep'), require('lodash-es/isObject'), require('lodash-es/set'), require('nanoid'), require('lodash-es/omit'), require('markdown-to-jsx'), require('lodash-es/has'), require('lodash-es/unset')) :
-  typeof define === 'function' && define.amd ? define(['exports', 'react/jsx-runtime', 'react', '@rjsf/utils', 'lodash-es/get', 'lodash-es/isEmpty', 'lodash-es/pick', 'lodash-es/toPath', 'lodash-es/cloneDeep', 'lodash-es/isObject', 'lodash-es/set', 'nanoid', 'lodash-es/omit', 'markdown-to-jsx', 'lodash-es/has', 'lodash-es/unset'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.JSONSchemaForm = {}, global.jsxRuntime, global.React, global.utils, global.get, global.isEmpty, global._pick, global._toPath, global.cloneDeep, global.isObject, global.set, global.nanoid, global.omit, global.Markdown, global.has, global.unset));
-})(this, (function (exports, jsxRuntime, react, utils, get, isEmpty, _pick, _toPath, cloneDeep, isObject, set, nanoid, omit, Markdown, has, unset) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react/jsx-runtime'), require('react'), require('@rjsf/utils'), require('lodash-es/get'), require('lodash-es/isEmpty'), require('lodash-es/pick'), require('lodash-es/toPath'), require('lodash-es/cloneDeep'), require('lodash-es/isObject'), require('lodash-es/set'), require('nanoid'), require('lodash-es/omit'), require('lodash-es/unset'), require('markdown-to-jsx'), require('lodash-es/has')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'react/jsx-runtime', 'react', '@rjsf/utils', 'lodash-es/get', 'lodash-es/isEmpty', 'lodash-es/pick', 'lodash-es/toPath', 'lodash-es/cloneDeep', 'lodash-es/isObject', 'lodash-es/set', 'nanoid', 'lodash-es/omit', 'lodash-es/unset', 'markdown-to-jsx', 'lodash-es/has'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.JSONSchemaForm = {}, global.jsxRuntime, global.React, global.utils, global.get, global.isEmpty, global._pick, global._toPath, global.cloneDeep, global.isObject, global.set, global.nanoid, global.omit, global.unset, global.Markdown, global.has));
+})(this, (function (exports, jsxRuntime, react, utils, get, isEmpty, _pick, _toPath, cloneDeep, isObject, set, nanoid, omit, unset, Markdown, has) { 'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -14,9 +14,9 @@
   var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
   var set__default = /*#__PURE__*/_interopDefaultLegacy(set);
   var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
+  var unset__default = /*#__PURE__*/_interopDefaultLegacy(unset);
   var Markdown__default = /*#__PURE__*/_interopDefaultLegacy(Markdown);
   var has__default = /*#__PURE__*/_interopDefaultLegacy(has);
-  var unset__default = /*#__PURE__*/_interopDefaultLegacy(unset);
 
   function _defineProperties(target, props) {
     for (var i = 0; i < props.length; i++) {
@@ -89,7 +89,7 @@
   }
 
   var _excluded$9 = ["widget", "title"],
-    _excluded2 = ["widget", "title"],
+    _excluded2$1 = ["widget", "title"],
     _excluded3 = ["widget", "title"];
   /** Used to generate a unique ID for an element in a row */
   function generateRowId() {
@@ -633,7 +633,7 @@
         _getUiOptions3$widget = _getUiOptions3.widget,
         widget = _getUiOptions3$widget === void 0 ? 'select' : _getUiOptions3$widget,
         uiTitle = _getUiOptions3.title,
-        options = _objectWithoutPropertiesLoose(_getUiOptions3, _excluded2);
+        options = _objectWithoutPropertiesLoose(_getUiOptions3, _excluded2$1);
       var Widget = utils.getWidget(schema, widget, widgets);
       var label = (_ref2 = uiTitle != null ? uiTitle : schema.title) != null ? _ref2 : name;
       var displayLabel = schemaUtils.getDisplayLabel(schema, uiSchema, globalUiOptions);
@@ -1027,7 +1027,8 @@
     });
   }
 
-  var _excluded$7 = ["widget", "placeholder", "autofocus", "autocomplete", "title"];
+  var _excluded$7 = ["widget", "placeholder", "autofocus", "autocomplete", "title"],
+    _excluded2 = ["oneOf", "anyOf"];
   /** 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`.
    *
@@ -1153,7 +1154,6 @@
     _proto.render = function render() {
       var _this$props6 = this.props,
         name = _this$props6.name,
-        baseType = _this$props6.baseType,
         _this$props6$disabled = _this$props6.disabled,
         disabled = _this$props6$disabled === void 0 ? false : _this$props6$disabled,
         _this$props6$errorSch = _this$props6.errorSchema,
@@ -1191,11 +1191,10 @@
       var option = selectedOption >= 0 ? retrievedOptions[selectedOption] || null : null;
       var optionSchema;
       if (option) {
-        // If the subschema doesn't declare a type, infer the type from the
-        // parent schema
-        optionSchema = option.type ? option : Object.assign({}, option, {
-          type: baseType
-        });
+        var remaining = _objectWithoutPropertiesLoose(schema, _excluded2);
+        // Merge in all the non-oneOf/anyOf properties and also skip the special ADDITIONAL_PROPERTY_FLAG property
+        unset__default["default"](remaining, utils.ADDITIONAL_PROPERTY_FLAG);
+        optionSchema = !isEmpty__default["default"](remaining) ? _extends({}, remaining, option) : option;
       }
       var translateEnum = title ? utils.TranslatableString.TitleOptionPrefix : utils.TranslatableString.OptionPrefix;
       var translateParams = title ? [title] : [];
@@ -1654,7 +1653,11 @@
     }
     var schemaType = utils.getSchemaType(schema);
     var type = Array.isArray(schemaType) ? schemaType[0] : schemaType || '';
+    var schemaId = schema.$id;
     var componentName = COMPONENT_TYPES[type];
+    if (schemaId && schemaId in fields) {
+      componentName = schemaId;
+    }
     // If the type is not defined and the schema uses 'anyOf' or 'oneOf', don't
     // render a field and let the MultiSchemaField component handle the form display
     if (!componentName && (schema.anyOf || schema.oneOf)) {
@@ -1841,7 +1844,6 @@
           options: schema.anyOf.map(function (_schema) {
             return schemaUtils.retrieveSchema(isObject__default["default"](_schema) ? _schema : {}, formData);
           }),
-          baseType: schema.type,
           registry: registry,
           schema: schema,
           uiSchema: uiSchema
@@ -1862,7 +1864,6 @@
           options: schema.oneOf.map(function (_schema) {
             return schemaUtils.retrieveSchema(isObject__default["default"](_schema) ? _schema : {}, formData);
           }),
-          baseType: schema.type,
           registry: registry,
           schema: schema,
           uiSchema: uiSchema