@rjsf/core 5.8.2 → 5.10.0

package/dist/core.esm.js

@@ -1,6 +1,6 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { Component, useState, useCallback, useEffect, useReducer, createRef, forwardRef } from 'react';
-import { isFixedItems, allowAdditionalItems, getUiOptions, ITEMS_KEY, getTemplate, TranslatableString, isCustomWidget, getWidget, optionsList, deepEquals, getDiscriminatorFieldFromSchema, ERRORS_KEY, asNumber, REF_KEY, orderProperties, PROPERTIES_KEY, ADDITIONAL_PROPERTY_FLAG, ANY_OF_KEY, ONE_OF_KEY, mergeObjects, UI_OPTIONS_KEY, getSchemaType, descriptionId, ID_KEY, hasWidget, titleId, getInputProps, examplesId, ariaDescribedByIds, getSubmitButtonOptions, errorId, helpId, canExpand, parseDateString, toDateString, pad, schemaRequiresTrueValue, labelValue, enumOptionsValueForIndex, enumOptionsIsSelected, optionId, enumOptionsSelectValue, enumOptionsDeselectValue, utcToLocal, localToUTC, dataURItoBlob, enumOptionsIndexForValue, englishStringTranslator, createSchemaUtils, validationDataMerge, shouldRender, UI_GLOBAL_OPTIONS_KEY, SUBMIT_BTN_OPTIONS_KEY, isObject as isObject$1, toErrorList, RJSF_ADDITONAL_PROPERTIES_FLAG, NAME_KEY } from '@rjsf/utils';
+import { isFixedItems, allowAdditionalItems, getUiOptions, ITEMS_KEY, getTemplate, TranslatableString, isCustomWidget, getWidget, optionsList, deepEquals, getDiscriminatorFieldFromSchema, ERRORS_KEY, ADDITIONAL_PROPERTY_FLAG, asNumber, REF_KEY, orderProperties, PROPERTIES_KEY, ANY_OF_KEY, ONE_OF_KEY, mergeObjects, UI_OPTIONS_KEY, getSchemaType, descriptionId, ID_KEY, hasWidget, titleId, getInputProps, examplesId, ariaDescribedByIds, getSubmitButtonOptions, errorId, helpId, canExpand, parseDateString, toDateString, pad, schemaRequiresTrueValue, labelValue, enumOptionsValueForIndex, enumOptionsIsSelected, optionId, enumOptionsSelectValue, enumOptionsDeselectValue, utcToLocal, localToUTC, dataURItoBlob, enumOptionsIndexForValue, englishStringTranslator, createSchemaUtils, validationDataMerge, shouldRender, UI_GLOBAL_OPTIONS_KEY, SUBMIT_BTN_OPTIONS_KEY, isObject as isObject$1, toErrorList, RJSF_ADDITONAL_PROPERTIES_FLAG, NAME_KEY } from '@rjsf/utils';
 import get from 'lodash-es/get';
 import isEmpty from 'lodash-es/isEmpty';
 import _pick from 'lodash-es/pick';
@@ -10,9 +10,9 @@ import isObject from 'lodash-es/isObject';
 import set from 'lodash-es/set';
 import { nanoid } from 'nanoid';
 import omit from 'lodash-es/omit';
+import unset from 'lodash-es/unset';
 import Markdown from 'markdown-to-jsx';
 import has from 'lodash-es/has';
-import unset from 'lodash-es/unset';
 
 function _defineProperties(target, props) {
   for (var i = 0; i < props.length; i++) {
@@ -85,7 +85,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() {
@@ -629,7 +629,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 = getWidget(schema, widget, widgets);
     var label = (_ref2 = uiTitle != null ? uiTitle : schema.title) != null ? _ref2 : name;
     var displayLabel = schemaUtils.getDisplayLabel(schema, uiSchema, globalUiOptions);
@@ -1023,7 +1023,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`.
  *
@@ -1149,7 +1150,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,
@@ -1187,11 +1187,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(remaining, ADDITIONAL_PROPERTY_FLAG);
+      optionSchema = !isEmpty(remaining) ? _extends({}, remaining, option) : option;
     }
     var translateEnum = title ? TranslatableString.TitleOptionPrefix : TranslatableString.OptionPrefix;
     var translateParams = title ? [title] : [];
@@ -1650,7 +1649,11 @@ function getFieldComponent(schema, uiOptions, idSchema, registry) {
   }
   var schemaType = 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)) {
@@ -1837,7 +1840,6 @@ function SchemaFieldRender(props) {
         options: schema.anyOf.map(function (_schema) {
           return schemaUtils.retrieveSchema(isObject(_schema) ? _schema : {}, formData);
         }),
-        baseType: schema.type,
         registry: registry,
         schema: schema,
         uiSchema: uiSchema
@@ -1858,7 +1860,6 @@ function SchemaFieldRender(props) {
         options: schema.oneOf.map(function (_schema) {
           return schemaUtils.retrieveSchema(isObject(_schema) ? _schema : {}, formData);
         }),
-        baseType: schema.type,
         registry: registry,
         schema: schema,
         uiSchema: uiSchema