@rjsf/core 5.5.2 → 5.6.0

package/dist/core.cjs.development.js

@@ -13,6 +13,7 @@ var cloneDeep = require('lodash/cloneDeep');
 var isObject = require('lodash/isObject');
 var set = require('lodash/set');
 var nanoid = require('nanoid');
+var isString = require('lodash/isString');
 var omit = require('lodash/omit');
 var Markdown = require('markdown-to-jsx');
 var has = require('lodash/has');
@@ -27,6 +28,7 @@ var _toPath__default = /*#__PURE__*/_interopDefaultLegacy(_toPath);
 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);
@@ -1149,8 +1151,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__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;
     }
@@ -1159,27 +1170,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,
@@ -1771,7 +1782,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-" + utils.getSchemaType(schema)];
   if (!hideError && __errors && __errors.length > 0) {
     classNames.push('field-error has-error has-danger');
   }
@@ -3773,7 +3784,7 @@ var Form = /*#__PURE__*/function (_Component) {
         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;
         }
@@ -3789,7 +3800,7 @@ var Form = /*#__PURE__*/function (_Component) {
         state = {
           formData: newFormData,
           errorSchema: _errorSchema,
-          errors: schemaUtils.getValidator().toErrorList(_errorSchema)
+          errors: utils.toErrorList(_errorSchema)
         };
       }
       _this.setState(state, function () {
@@ -3874,7 +3885,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 ? utils.toErrorList(extraErrors) : [];
         _this.setState({
           formData: newFormData,
           errors: errors,
@@ -3970,7 +3981,7 @@ var Form = /*#__PURE__*/function (_Component) {
       errorSchema = currentErrors.errorSchema;
     }
     if (props.extraErrors) {
-      var merged = schemaUtils.mergeValidationData({
+      var merged = utils.validationDataMerge({
         errorSchema: errorSchema,
         errors: errors
       }, props.extraErrors);
@@ -4124,7 +4135,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;
@@ -4132,12 +4142,16 @@ var Form = /*#__PURE__*/function (_Component) {
     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,