@rjsf/core 5.5.2 → 5.6.2

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/isString'), 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/isString', '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.isString, global.omit, global.Markdown, global.has, global.unset));
+})(this, (function (exports, jsxRuntime, react, utils, get, isEmpty, _pick, _toPath, cloneDeep, isObject, set, nanoid, isString, omit, Markdown, has, unset) { 'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -13,6 +13,7 @@
   var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
   var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
   var set__default = /*#__PURE__*/_interopDefaultLegacy(set);
+  var isString__default = /*#__PURE__*/_interopDefaultLegacy(isString);
   var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
   var Markdown__default = /*#__PURE__*/_interopDefaultLegacy(Markdown);
   var has__default = /*#__PURE__*/_interopDefaultLegacy(has);
@@ -1135,8 +1136,17 @@
      * @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__default["default"](schema, 'discriminator.propertyName', undefined);
+      if (isString__default["default"](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;
       }
@@ -1145,27 +1155,27 @@
       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,
@@ -1757,7 +1767,7 @@
     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-" + utils.getSchemaType(schema)];
     if (!hideError && __errors && __errors.length > 0) {
       classNames.push('field-error has-error has-danger');
     }
@@ -3759,7 +3769,7 @@
           var schemaValidationErrors = errors;
           var schemaValidationErrorSchema = errorSchema;
           if (extraErrors) {
-            var merged = schemaUtils.mergeValidationData(schemaValidation, extraErrors);
+            var merged = utils.validationDataMerge(schemaValidation, extraErrors);
             errorSchema = merged.errorSchema;
             errors = merged.errors;
           }
@@ -3775,7 +3785,7 @@
           state = {
             formData: newFormData,
             errorSchema: _errorSchema,
-            errors: schemaUtils.getValidator().toErrorList(_errorSchema)
+            errors: utils.toErrorList(_errorSchema)
           };
         }
         _this.setState(state, function () {
@@ -3860,7 +3870,7 @@
           // 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 ? utils.toErrorList(extraErrors) : [];
           _this.setState({
             formData: newFormData,
             errors: errors,
@@ -3956,7 +3966,7 @@
         errorSchema = currentErrors.errorSchema;
       }
       if (props.extraErrors) {
-        var merged = schemaUtils.mergeValidationData({
+        var merged = utils.validationDataMerge({
           errorSchema: errorSchema,
           errors: errors
         }, props.extraErrors);
@@ -4110,7 +4120,6 @@
         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;
@@ -4118,12 +4127,16 @@
       var schemaValidationErrorSchema = errorSchema;
       if (errors.length > 0) {
         if (extraErrors) {
-          var merged = schemaUtils.mergeValidationData(schemaValidation, extraErrors);
+          var merged = utils.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,