@rjsf/core 5.8.2 → 5.10.0

package/dist/core.cjs.development.js

@@ -14,9 +14,9 @@ var isObject = require('lodash/isObject');
 var set = require('lodash/set');
 var nanoid = require('nanoid');
 var omit = require('lodash/omit');
+var unset = require('lodash/unset');
 var Markdown = require('markdown-to-jsx');
 var has = require('lodash/has');
-var unset = require('lodash/unset');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -28,9 +28,9 @@ var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
 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++) {
@@ -103,7 +103,7 @@ function _toPropertyKey(arg) {
 }
 
 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() {
@@ -647,7 +647,7 @@ var ArrayField = /*#__PURE__*/function (_Component) {
       _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);
@@ -1041,7 +1041,8 @@ function BooleanField(props) {
   });
 }
 
-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`.
  *
@@ -1167,7 +1168,6 @@ var AnyOfField = /*#__PURE__*/function (_Component) {
   _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,
@@ -1205,11 +1205,10 @@ var AnyOfField = /*#__PURE__*/function (_Component) {
     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] : [];
@@ -1668,7 +1667,11 @@ function getFieldComponent(schema, uiOptions, idSchema, registry) {
   }
   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)) {
@@ -1855,7 +1858,6 @@ function SchemaFieldRender(props) {
         options: schema.anyOf.map(function (_schema) {
           return schemaUtils.retrieveSchema(isObject__default["default"](_schema) ? _schema : {}, formData);
         }),
-        baseType: schema.type,
         registry: registry,
         schema: schema,
         uiSchema: uiSchema
@@ -1876,7 +1878,6 @@ function SchemaFieldRender(props) {
         options: schema.oneOf.map(function (_schema) {
           return schemaUtils.retrieveSchema(isObject__default["default"](_schema) ? _schema : {}, formData);
         }),
-        baseType: schema.type,
         registry: registry,
         schema: schema,
         uiSchema: uiSchema