@rjsf/core 5.5.2 → 5.6.2

package/dist/core.esm.js

@@ -1,6 +1,6 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { Component, useState, useCallback, useEffect, useReducer, useMemo, createRef, forwardRef } from 'react';
-import { isFixedItems, allowAdditionalItems, getUiOptions, ITEMS_KEY, getTemplate, TranslatableString, 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, labelValue, enumOptionsValueForIndex, enumOptionsIsSelected, optionId, enumOptionsSelectValue, enumOptionsDeselectValue, utcToLocal, localToUTC, dataURItoBlob, enumOptionsIndexForValue, englishStringTranslator, createSchemaUtils, shouldRender, UI_GLOBAL_OPTIONS_KEY, SUBMIT_BTN_OPTIONS_KEY, isObject as isObject$1, RJSF_ADDITONAL_PROPERTIES_FLAG, NAME_KEY } from '@rjsf/utils';
+import { isFixedItems, allowAdditionalItems, getUiOptions, ITEMS_KEY, getTemplate, TranslatableString, 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, 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';
@@ -9,6 +9,7 @@ import cloneDeep from 'lodash-es/cloneDeep';
 import isObject from 'lodash-es/isObject';
 import set from 'lodash-es/set';
 import { nanoid } from 'nanoid';
+import isString from 'lodash-es/isString';
 import omit from 'lodash-es/omit';
 import Markdown from 'markdown-to-jsx';
 import has from 'lodash-es/has';
@@ -1131,8 +1132,17 @@ var AnyOfField = /*#__PURE__*/function (_Component) {
    * @return - The index of the `option` that best matches the `formData`
    */;
   _proto.getMatchingOption = function getMatchingOption(selectedOption, formData, options) {
-    var schemaUtils = this.props.registry.schemaUtils;
-    var option = schemaUtils.getClosestMatchingOption(formData, options, selectedOption);
+    var _this$props4 = this.props,
+      schema = _this$props4.schema,
+      schemaUtils = _this$props4.registry.schemaUtils;
+    var discriminator;
+    var maybeString = get(schema, 'discriminator.propertyName', undefined);
+    if (isString(maybeString)) {
+      discriminator = maybeString;
+    } else if (maybeString !== undefined) {
+      console.warn("Expecting discriminator to be a string, got \"" + typeof maybeString + "\" instead");
+    }
+    var option = schemaUtils.getClosestMatchingOption(formData, options, selectedOption, discriminator);
     if (option > 0) {
       return option;
     }
@@ -1141,27 +1151,27 @@ var AnyOfField = /*#__PURE__*/function (_Component) {
     return selectedOption || 0;
   };
   _proto.getFieldId = function getFieldId() {
-    var _this$props4 = this.props,
-      idSchema = _this$props4.idSchema,
-      schema = _this$props4.schema;
+    var _this$props5 = this.props,
+      idSchema = _this$props5.idSchema,
+      schema = _this$props5.schema;
     return "" + idSchema.$id + (schema.oneOf ? '__oneof_select' : '__anyof_select');
   }
   /** Renders the `AnyOfField` selector along with a `SchemaField` for the value of the `formData`
    */;
   _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$errorSch = _this$props5.errorSchema,
-      errorSchema = _this$props5$errorSch === void 0 ? {} : _this$props5$errorSch,
-      formContext = _this$props5.formContext,
-      onBlur = _this$props5.onBlur,
-      onFocus = _this$props5.onFocus,
-      registry = _this$props5.registry,
-      schema = _this$props5.schema,
-      uiSchema = _this$props5.uiSchema;
+    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,
+      errorSchema = _this$props6$errorSch === void 0 ? {} : _this$props6$errorSch,
+      formContext = _this$props6.formContext,
+      onBlur = _this$props6.onBlur,
+      onFocus = _this$props6.onFocus,
+      registry = _this$props6.registry,
+      schema = _this$props6.schema,
+      uiSchema = _this$props6.uiSchema;
     var widgets = registry.widgets,
       fields = registry.fields,
       translateString = registry.translateString,
@@ -1753,7 +1763,7 @@ function SchemaFieldRender(props) {
   var description = uiOptions.description || props.schema.description || schema.description || '';
   var help = uiOptions.help;
   var hidden = uiOptions.widget === 'hidden';
-  var classNames = ['form-group', 'field', "field-" + schema.type];
+  var classNames = ['form-group', 'field', "field-" + getSchemaType(schema)];
   if (!hideError && __errors && __errors.length > 0) {
     classNames.push('field-error has-error has-danger');
   }
@@ -3755,7 +3765,7 @@ var Form = /*#__PURE__*/function (_Component) {
         var schemaValidationErrors = errors;
         var schemaValidationErrorSchema = errorSchema;
         if (extraErrors) {
-          var merged = schemaUtils.mergeValidationData(schemaValidation, extraErrors);
+          var merged = validationDataMerge(schemaValidation, extraErrors);
           errorSchema = merged.errorSchema;
           errors = merged.errors;
         }
@@ -3771,7 +3781,7 @@ var Form = /*#__PURE__*/function (_Component) {
         state = {
           formData: newFormData,
           errorSchema: _errorSchema,
-          errors: schemaUtils.getValidator().toErrorList(_errorSchema)
+          errors: toErrorList(_errorSchema)
         };
       }
       _this.setState(state, function () {
@@ -3856,7 +3866,7 @@ var Form = /*#__PURE__*/function (_Component) {
         // There are no errors generated through schema validation.
         // Check for user provided errors and update state accordingly.
         var errorSchema = extraErrors || {};
-        var errors = extraErrors ? schemaUtils.getValidator().toErrorList(extraErrors) : [];
+        var errors = extraErrors ? toErrorList(extraErrors) : [];
         _this.setState({
           formData: newFormData,
           errors: errors,
@@ -3952,7 +3962,7 @@ var Form = /*#__PURE__*/function (_Component) {
       errorSchema = currentErrors.errorSchema;
     }
     if (props.extraErrors) {
-      var merged = schemaUtils.mergeValidationData({
+      var merged = validationDataMerge({
         errorSchema: errorSchema,
         errors: errors
       }, props.extraErrors);
@@ -4106,7 +4116,6 @@ var Form = /*#__PURE__*/function (_Component) {
       focusOnFirstError = _this$props6.focusOnFirstError,
       onError = _this$props6.onError;
     var formData = this.state.formData;
-    var schemaUtils = this.state.schemaUtils;
     var schemaValidation = this.validate(formData);
     var errors = schemaValidation.errors;
     var errorSchema = schemaValidation.errorSchema;
@@ -4114,12 +4123,16 @@ var Form = /*#__PURE__*/function (_Component) {
     var schemaValidationErrorSchema = errorSchema;
     if (errors.length > 0) {
       if (extraErrors) {
-        var merged = schemaUtils.mergeValidationData(schemaValidation, extraErrors);
+        var merged = validationDataMerge(schemaValidation, extraErrors);
         errorSchema = merged.errorSchema;
         errors = merged.errors;
       }
       if (focusOnFirstError) {
-        this.focusOnError(schemaValidation.errors[0]);
+        if (typeof focusOnFirstError === 'function') {
+          focusOnFirstError(schemaValidation.errors[0]);
+        } else {
+          this.focusOnError(schemaValidation.errors[0]);
+        }
       }
       this.setState({
         errors: errors,