@rjsf/core 5.0.0-beta.15 → 5.0.0-beta.17

package/dist/core.esm.js

@@ -1,13 +1,13 @@
 import React, { Component, useState, useCallback, useEffect, useReducer, useMemo, forwardRef } from 'react';
-import { isFixedItems, allowAdditionalItems, getUiOptions, ITEMS_KEY, getTemplate, isCustomWidget, getWidget, optionsList, guessType, deepEquals, asNumber, REF_KEY, orderProperties, PROPERTIES_KEY, ADDITIONAL_PROPERTY_FLAG, mergeObjects, getSchemaType, ID_KEY, hasWidget, getInputProps, getSubmitButtonOptions, canExpand, parseDateString, toDateString, pad, schemaRequiresTrueValue, utcToLocal, localToUTC, dataURItoBlob, processSelectValue, createSchemaUtils, shouldRender, isObject as isObject$1, RJSF_ADDITONAL_PROPERTIES_FLAG, NAME_KEY } from '@rjsf/utils';
+import { isFixedItems, allowAdditionalItems, getUiOptions, ITEMS_KEY, getTemplate, isCustomWidget, getWidget, optionsList, guessType, deepEquals, asNumber, REF_KEY, orderProperties, PROPERTIES_KEY, ADDITIONAL_PROPERTY_FLAG, mergeObjects, UI_OPTIONS_KEY, descriptionId, getSchemaType, ID_KEY, hasWidget, titleId, getInputProps, examplesId, ariaDescribedByIds, getSubmitButtonOptions, errorId, helpId, canExpand, parseDateString, toDateString, pad, schemaRequiresTrueValue, optionId, enumOptionsSelectValue, enumOptionsDeselectValue, utcToLocal, localToUTC, dataURItoBlob, processSelectValue, createSchemaUtils, shouldRender, isObject as isObject$1, 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';
 import isObject from 'lodash-es/isObject';
 import set from 'lodash-es/set';
 import { nanoid } from 'nanoid';
-import unset from 'lodash-es/unset';
 import has from 'lodash-es/has';
+import unset from 'lodash-es/unset';
 import omit from 'lodash-es/omit';
 
 function _defineProperties(target, props) {
@@ -16,7 +16,7 @@ function _defineProperties(target, props) {
     descriptor.enumerable = descriptor.enumerable || false;
     descriptor.configurable = true;
     if ("value" in descriptor) descriptor.writable = true;
-    Object.defineProperty(target, descriptor.key, descriptor);
+    Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor);
   }
 }
 function _createClass(Constructor, protoProps, staticProps) {
@@ -96,6 +96,20 @@ function _createForOfIteratorHelperLoose(o, allowArrayLike) {
   }
   throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
+function _toPrimitive(input, hint) {
+  if (typeof input !== "object" || input === null) return input;
+  var prim = input[Symbol.toPrimitive];
+  if (prim !== undefined) {
+    var res = prim.call(input, hint || "default");
+    if (typeof res !== "object") return res;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return (hint === "string" ? String : Number)(input);
+}
+function _toPropertyKey(arg) {
+  var key = _toPrimitive(arg, "string");
+  return typeof key === "symbol" ? key : String(key);
+}
 
 var _excluded$9 = ["widget"],
   _excluded2 = ["widget"],
@@ -155,42 +169,11 @@ var ArrayField = /*#__PURE__*/function (_Component) {
       return schemaUtils.getDefaultFormState(itemSchema);
     };
     _this.onAddClick = function (event) {
-      if (event) {
-        event.preventDefault();
-      }
-      var onChange = _this.props.onChange;
-      var keyedFormData = _this.state.keyedFormData;
-      var newKeyedFormDataRow = {
-        key: generateRowId(),
-        item: _this._getNewFormDataRow()
-      };
-      var newKeyedFormData = [].concat(keyedFormData, [newKeyedFormDataRow]);
-      _this.setState({
-        keyedFormData: newKeyedFormData,
-        updatedKeyedFormData: true
-      }, function () {
-        return onChange(keyedToPlainFormData(newKeyedFormData));
-      });
+      _this._handleAddClick(event);
     };
     _this.onAddIndexClick = function (index) {
       return function (event) {
-        if (event) {
-          event.preventDefault();
-        }
-        var onChange = _this.props.onChange;
-        var keyedFormData = _this.state.keyedFormData;
-        var newKeyedFormDataRow = {
-          key: generateRowId(),
-          item: _this._getNewFormDataRow()
-        };
-        var newKeyedFormData = [].concat(keyedFormData);
-        newKeyedFormData.splice(index, 0, newKeyedFormDataRow);
-        _this.setState({
-          keyedFormData: newKeyedFormData,
-          updatedKeyedFormData: true
-        }, function () {
-          return onChange(keyedToPlainFormData(newKeyedFormData));
-        });
+        _this._handleAddClick(event, index);
       };
     };
     _this.onDropIndexClick = function (index) {
@@ -369,6 +352,42 @@ var ArrayField = /*#__PURE__*/function (_Component) {
   /** Returns the default form information for an item based on the schema for that item. Deals with the possibility
    * that the schema is fixed and allows additional items.
    */;
+  /** Callback handler for when the user clicks on the add or add at index buttons. Creates a new row of keyed form data
+   * either at the end of the list (when index is not specified) or inserted at the `index` when it is, adding it into
+   * the state, and then returning `onChange()` with the plain form data converted from the keyed data
+   *
+   * @param event - The event for the click
+   * @param [index] - The optional index at which to add the new data
+   */
+  _proto._handleAddClick = function _handleAddClick(event, index) {
+    if (event) {
+      event.preventDefault();
+    }
+    var onChange = this.props.onChange;
+    var keyedFormData = this.state.keyedFormData;
+    var newKeyedFormDataRow = {
+      key: generateRowId(),
+      item: this._getNewFormDataRow()
+    };
+    var newKeyedFormData = [].concat(keyedFormData);
+    if (index !== undefined) {
+      newKeyedFormData.splice(index, 0, newKeyedFormDataRow);
+    } else {
+      newKeyedFormData.push(newKeyedFormDataRow);
+    }
+    this.setState({
+      keyedFormData: newKeyedFormData,
+      updatedKeyedFormData: true
+    }, function () {
+      return onChange(keyedToPlainFormData(newKeyedFormData));
+    });
+  }
+  /** Callback handler for when the user clicks on the add button. Creates a new row of keyed form data at the end of
+   * the list, adding it into the state, and then returning `onChange()` with the plain form data converted from the
+   * keyed data
+   *
+   * @param event - The event for the click
+   */;
   /** Renders the `ArrayField` depending on the specific needs of the schema and uischema elements
    */
   _proto.render = function render() {
@@ -437,8 +456,9 @@ var ArrayField = /*#__PURE__*/function (_Component) {
     var _schemaItems = isObject(schema.items) ? schema.items : {};
     var itemsSchema = schemaUtils.retrieveSchema(_schemaItems);
     var formData = keyedToPlainFormData(this.state.keyedFormData);
+    var canAdd = this.canAddItem(formData);
     var arrayProps = {
-      canAdd: this.canAddItem(formData),
+      canAdd: canAdd,
       items: keyedFormData.map(function (keyedItem, index) {
         var key = keyedItem.key,
           item = keyedItem.item;
@@ -452,6 +472,7 @@ var ArrayField = /*#__PURE__*/function (_Component) {
           key: key,
           index: index,
           name: name && name + "-" + index,
+          canAdd: canAdd,
           canMoveUp: index > 0,
           canMoveDown: index < formData.length - 1,
           itemSchema: itemSchema,
@@ -462,7 +483,8 @@ var ArrayField = /*#__PURE__*/function (_Component) {
           autofocus: autofocus && index === 0,
           onBlur: onBlur,
           onFocus: onFocus,
-          rawErrors: rawErrors
+          rawErrors: rawErrors,
+          totalItems: keyedFormData.length
         });
       }),
       className: "field field-array field-array-of-" + itemsSchema.type,
@@ -514,7 +536,7 @@ var ArrayField = /*#__PURE__*/function (_Component) {
       options = _objectWithoutPropertiesLoose(_getUiOptions2, _excluded$9);
     var Widget = getWidget(schema, widget, widgets);
     return /*#__PURE__*/React.createElement(Widget, {
-      id: idSchema && idSchema.$id,
+      id: idSchema.$id,
       multiple: true,
       onChange: this.onSelectChange,
       onBlur: onBlur,
@@ -570,7 +592,7 @@ var ArrayField = /*#__PURE__*/function (_Component) {
       options = _objectWithoutPropertiesLoose(_getUiOptions3, _excluded2);
     var Widget = getWidget(schema, widget, widgets);
     return /*#__PURE__*/React.createElement(Widget, {
-      id: idSchema && idSchema.$id,
+      id: idSchema.$id,
       multiple: true,
       onChange: this.onSelectChange,
       onBlur: onBlur,
@@ -624,7 +646,7 @@ var ArrayField = /*#__PURE__*/function (_Component) {
     var Widget = getWidget(schema, widget, widgets);
     return /*#__PURE__*/React.createElement(Widget, {
       options: options,
-      id: idSchema && idSchema.$id,
+      id: idSchema.$id,
       multiple: true,
       onChange: this.onSelectChange,
       onBlur: onBlur,
@@ -689,8 +711,9 @@ var ArrayField = /*#__PURE__*/function (_Component) {
       items = items.concat(new Array(itemSchemas.length - items.length));
     }
     // These are the props passed into the render function
+    var canAdd = this.canAddItem(items) && !!additionalSchema;
     var arrayProps = {
-      canAdd: this.canAddItem(items) && !!additionalSchema,
+      canAdd: canAdd,
       className: "field field-array field-array-fixed-items",
       disabled: disabled,
       idSchema: idSchema,
@@ -710,6 +733,7 @@ var ArrayField = /*#__PURE__*/function (_Component) {
           key: key,
           index: index,
           name: name && name + "-" + index,
+          canAdd: canAdd,
           canRemove: additional,
           canMoveUp: index >= itemSchemas.length + 1,
           canMoveDown: additional && index < items.length - 1,
@@ -721,7 +745,8 @@ var ArrayField = /*#__PURE__*/function (_Component) {
           autofocus: autofocus && index === 0,
           onBlur: onBlur,
           onFocus: onFocus,
-          rawErrors: rawErrors
+          rawErrors: rawErrors,
+          totalItems: keyedFormData.length
         });
       }),
       onAddClick: this.onAddClick,
@@ -746,6 +771,7 @@ var ArrayField = /*#__PURE__*/function (_Component) {
     var key = props.key,
       index = props.index,
       name = props.name,
+      canAdd = props.canAdd,
       _props$canRemove = props.canRemove,
       canRemove = _props$canRemove === void 0 ? true : _props$canRemove,
       _props$canMoveUp = props.canMoveUp,
@@ -760,7 +786,8 @@ var ArrayField = /*#__PURE__*/function (_Component) {
       autofocus = props.autofocus,
       onBlur = props.onBlur,
       onFocus = props.onFocus,
-      rawErrors = props.rawErrors;
+      rawErrors = props.rawErrors,
+      totalItems = props.totalItems;
     var _this$props13 = this.props,
       disabled = _this$props13.disabled,
       hideError = _this$props13.hideError,
@@ -813,11 +840,13 @@ var ArrayField = /*#__PURE__*/function (_Component) {
       }),
       className: "array-item",
       disabled: disabled,
+      canAdd: canAdd,
       hasToolbar: has.toolbar,
       hasMoveUp: has.moveUp,
       hasMoveDown: has.moveDown,
       hasRemove: has.remove,
       index: index,
+      totalItems: totalItems,
       key: key,
       onAddIndexClick: this.onAddIndexClick,
       onDropIndexClick: this.onDropIndexClick,
@@ -910,7 +939,7 @@ function BooleanField(props) {
     }),
     schema: schema,
     uiSchema: uiSchema,
-    id: idSchema && idSchema.$id,
+    id: idSchema.$id,
     onChange: onChange,
     onFocus: onFocus,
     onBlur: onBlur,
@@ -962,7 +991,7 @@ var AnyOfField = /*#__PURE__*/function (_Component) {
           var _option = _step.value;
           if (_option.properties) {
             for (var key in _option.properties) {
-              if (key in newFormData) {
+              if (has(newFormData, key)) {
                 unset(newFormData, key);
               }
             }
@@ -1260,7 +1289,7 @@ var ObjectField = /*#__PURE__*/function (_Component) {
         duplicateKeySuffixSeparator = _getUiOptions$duplica === void 0 ? "-" : _getUiOptions$duplica;
       var index = 0;
       var newKey = preferredKey;
-      while (newKey in formData) {
+      while (has(formData, newKey)) {
         newKey = "" + preferredKey + duplicateKeySuffixSeparator + ++index;
       }
       return newKey;
@@ -1571,10 +1600,10 @@ function SchemaFieldRender(props) {
   var _ref = errorSchema || {},
     __errors = _ref.__errors,
     fieldErrorSchema = _objectWithoutPropertiesLoose(_ref, _excluded$6);
-  // See #439: uiSchema: Don't pass consumed class names to child components
-  var fieldUiSchema = omit(uiSchema, ["ui:classNames", "classNames"]);
-  if ("ui:options" in fieldUiSchema) {
-    fieldUiSchema["ui:options"] = omit(fieldUiSchema["ui:options"], ["classNames"]);
+  // See #439: uiSchema: Don't pass consumed class names or style to child components
+  var fieldUiSchema = omit(uiSchema, ["ui:classNames", "classNames", "ui:style"]);
+  if (UI_OPTIONS_KEY in fieldUiSchema) {
+    fieldUiSchema[UI_OPTIONS_KEY] = omit(fieldUiSchema[UI_OPTIONS_KEY], ["classNames", "style"]);
   }
   var field = /*#__PURE__*/React.createElement(FieldComponent, _extends({}, props, {
     onChange: handleFieldComponentChange,
@@ -1631,7 +1660,7 @@ function SchemaFieldRender(props) {
   });
   var fieldProps = {
     description: /*#__PURE__*/React.createElement(DescriptionFieldTemplate, {
-      id: id + "__description",
+      id: descriptionId(id),
       description: description,
       schema: schema,
       uiSchema: uiSchema,
@@ -1654,6 +1683,7 @@ function SchemaFieldRender(props) {
     hideError: hideError,
     displayLabel: displayLabel,
     classNames: classNames.join(" ").trim(),
+    style: uiOptions.style,
     formContext: formContext,
     formData: formData,
     schema: schema,
@@ -1770,7 +1800,7 @@ function StringField(props) {
     }),
     schema: schema,
     uiSchema: uiSchema,
-    id: idSchema && idSchema.$id,
+    id: idSchema.$id,
     label: title === undefined ? name : title,
     value: formData,
     onChange: onChange,
@@ -1836,9 +1866,8 @@ function ArrayFieldDescriptionTemplate(props) {
     return null;
   }
   var DescriptionFieldTemplate = getTemplate("DescriptionFieldTemplate", registry, options);
-  var id = idSchema.$id + "__description";
   return /*#__PURE__*/React.createElement(DescriptionFieldTemplate, {
-    id: id,
+    id: descriptionId(idSchema),
     description: description,
     schema: schema,
     uiSchema: uiSchema,
@@ -1890,17 +1919,20 @@ function ArrayFieldItemTemplate(props) {
     style: btnStyle,
     disabled: disabled || readonly || !hasMoveUp,
     onClick: onReorderClick(index, index - 1),
-    uiSchema: uiSchema
+    uiSchema: uiSchema,
+    registry: registry
   }), (hasMoveUp || hasMoveDown) && /*#__PURE__*/React.createElement(MoveDownButton, {
     style: btnStyle,
     disabled: disabled || readonly || !hasMoveDown,
     onClick: onReorderClick(index, index + 1),
-    uiSchema: uiSchema
+    uiSchema: uiSchema,
+    registry: registry
   }), hasRemove && /*#__PURE__*/React.createElement(RemoveButton, {
     style: btnStyle,
     disabled: disabled || readonly,
     onClick: onDropIndexClick(index),
-    uiSchema: uiSchema
+    uiSchema: uiSchema,
+    registry: registry
   }))));
 }
 
@@ -1956,7 +1988,8 @@ function ArrayFieldTemplate(props) {
     className: "array-item-add",
     onClick: onAddClick,
     disabled: disabled || readonly,
-    uiSchema: uiSchema
+    uiSchema: uiSchema,
+    registry: registry
   }));
 }
 
@@ -1979,9 +2012,8 @@ function ArrayFieldTitleTemplate(props) {
     return null;
   }
   var TitleFieldTemplate = getTemplate("TitleFieldTemplate", registry, options);
-  var id = idSchema.$id + "__title";
   return /*#__PURE__*/React.createElement(TitleFieldTemplate, {
-    id: id,
+    id: titleId(idSchema),
     title: title,
     required: required,
     schema: schema,
@@ -2044,13 +2076,14 @@ function BaseInputTemplate(props) {
     autoFocus: autofocus,
     value: inputValue
   }, inputProps, {
-    list: schema.examples ? "examples_" + id : undefined,
+    list: schema.examples ? examplesId(id) : undefined,
     onChange: _onChange,
     onBlur: _onBlur,
-    onFocus: _onFocus
+    onFocus: _onFocus,
+    "aria-describedby": ariaDescribedByIds(id, !!schema.examples)
   })), Array.isArray(schema.examples) && /*#__PURE__*/React.createElement("datalist", {
     key: "datalist_" + id,
-    id: "examples_" + id
+    id: examplesId(id)
   }, [].concat(new Set(schema.examples.concat(schema["default"] ? [schema["default"]] : []))).map(function (example) {
     return /*#__PURE__*/React.createElement("option", {
       key: example,
@@ -2078,7 +2111,7 @@ function SubmitButton(_ref) {
   }), submitText));
 }
 
-var _excluded$2 = ["iconType", "icon", "className", "uiSchema"];
+var _excluded$2 = ["iconType", "icon", "className", "uiSchema", "registry"];
 function IconButton(props) {
   var _props$iconType = props.iconType,
     iconType = _props$iconType === void 0 ? "default" : _props$iconType,
@@ -2123,7 +2156,8 @@ function RemoveButton(props) {
 function AddButton(_ref) {
   var className = _ref.className,
     onClick = _ref.onClick,
-    disabled = _ref.disabled;
+    disabled = _ref.disabled,
+    registry = _ref.registry;
   return /*#__PURE__*/React.createElement("div", {
     className: "row"
   }, /*#__PURE__*/React.createElement("p", {
@@ -2134,7 +2168,8 @@ function AddButton(_ref) {
     className: "btn-add col-xs-12",
     title: "Add",
     onClick: onClick,
-    disabled: disabled
+    disabled: disabled,
+    registry: registry
   })));
 }
 
@@ -2255,7 +2290,7 @@ function FieldErrorTemplate(props) {
   if (errors.length === 0) {
     return null;
   }
-  var id = idSchema.$id + "__error";
+  var id = errorId(idSchema);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("ul", {
     id: id,
     className: "error-detail bs-callout bs-callout-info"
@@ -2279,7 +2314,7 @@ function FieldHelpTemplate(props) {
   if (!help) {
     return null;
   }
-  var id = idSchema.$id + "__help";
+  var id = helpId(idSchema);
   if (typeof help === "string") {
     return /*#__PURE__*/React.createElement("p", {
       id: id,
@@ -2319,14 +2354,14 @@ function ObjectFieldTemplate(props) {
   return /*#__PURE__*/React.createElement("fieldset", {
     id: idSchema.$id
   }, (options.title || title) && /*#__PURE__*/React.createElement(TitleFieldTemplate, {
-    id: idSchema.$id + "__title",
+    id: titleId(idSchema),
     title: options.title || title,
     required: required,
     schema: schema,
     uiSchema: uiSchema,
     registry: registry
   }), (options.description || description) && /*#__PURE__*/React.createElement(DescriptionFieldTemplate, {
-    id: idSchema.$id + "__description",
+    id: descriptionId(idSchema),
     description: options.description || description,
     schema: schema,
     uiSchema: uiSchema,
@@ -2337,7 +2372,8 @@ function ObjectFieldTemplate(props) {
     className: "object-property-expand",
     onClick: onAddClick(schema),
     disabled: disabled || readonly,
-    uiSchema: uiSchema
+    uiSchema: uiSchema,
+    registry: registry
   }));
 }
 
@@ -2379,6 +2415,7 @@ function UnsupportedField(props) {
 function WrapIfAdditionalTemplate(props) {
   var id = props.id,
     classNames = props.classNames,
+    style = props.style,
     disabled = props.disabled,
     label = props.label,
     onKeyChange = props.onKeyChange,
@@ -2395,11 +2432,13 @@ function WrapIfAdditionalTemplate(props) {
   var additional = (ADDITIONAL_PROPERTY_FLAG in schema);
   if (!additional) {
     return /*#__PURE__*/React.createElement("div", {
-      className: classNames
+      className: classNames,
+      style: style
     }, children);
   }
   return /*#__PURE__*/React.createElement("div", {
-    className: classNames
+    className: classNames,
+    style: style
   }, /*#__PURE__*/React.createElement("div", {
     className: "row"
   }, /*#__PURE__*/React.createElement("div", {
@@ -2429,7 +2468,8 @@ function WrapIfAdditionalTemplate(props) {
     },
     disabled: disabled || readonly,
     onClick: onDropPropertyClick(label),
-    uiSchema: uiSchema
+    uiSchema: uiSchema,
+    registry: registry
   }))));
 }
 
@@ -2542,7 +2582,8 @@ function DateElement(_ref) {
     onBlur: onBlur,
     onFocus: onFocus,
     registry: registry,
-    label: ""
+    label: "",
+    "aria-describedby": ariaDescribedByIds(rootId)
   });
 }
 /** The `AltDateWidget` is an alternative widget for rendering date properties.
@@ -2680,7 +2721,7 @@ function CheckboxWidget(_ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: "checkbox " + (disabled || readonly ? "disabled" : "")
   }, schema.description && /*#__PURE__*/React.createElement(DescriptionFieldTemplate, {
-    id: id + "__description",
+    id: descriptionId(id),
     description: schema.description,
     schema: schema,
     uiSchema: uiSchema,
@@ -2695,24 +2736,11 @@ function CheckboxWidget(_ref) {
     autoFocus: autofocus,
     onChange: handleChange,
     onBlur: handleBlur,
-    onFocus: handleFocus
+    onFocus: handleFocus,
+    "aria-describedby": ariaDescribedByIds(id)
   }), /*#__PURE__*/React.createElement("span", null, label)));
 }
 
-function selectValue(value, selected, all) {
-  var at = all.indexOf(value);
-  var updated = selected.slice(0, at).concat(value, selected.slice(at));
-  // As inserting values at predefined index positions doesn't work with empty
-  // arrays, we need to reorder the updated selection to match the initial order
-  return updated.sort(function (a, b) {
-    return Number(all.indexOf(a) > all.indexOf(b));
-  });
-}
-function deselectValue(value, selected) {
-  return selected.filter(function (v) {
-    return v !== value;
-  });
-}
 /** The `CheckboxesWidget` is a widget for rendering checkbox groups.
  *  It is typically used to represent an array of enums.
  *
@@ -2731,32 +2759,30 @@ function CheckboxesWidget(_ref) {
     autofocus = _ref$autofocus === void 0 ? false : _ref$autofocus,
     readonly = _ref.readonly,
     onChange = _ref.onChange;
+  var checkboxesValues = Array.isArray(value) ? value : [value];
   return /*#__PURE__*/React.createElement("div", {
     className: "checkboxes",
     id: id
   }, Array.isArray(enumOptions) && enumOptions.map(function (option, index) {
-    var checked = value.indexOf(option.value) !== -1;
+    var checked = checkboxesValues.includes(option.value);
     var itemDisabled = Array.isArray(enumDisabled) && enumDisabled.indexOf(option.value) != -1;
     var disabledCls = disabled || itemDisabled || readonly ? "disabled" : "";
     var handleChange = function handleChange(event) {
-      var all = enumOptions.map(function (_ref2) {
-        var value = _ref2.value;
-        return value;
-      });
       if (event.target.checked) {
-        onChange(selectValue(option.value, value, all));
+        onChange(enumOptionsSelectValue(option.value, checkboxesValues, enumOptions));
       } else {
-        onChange(deselectValue(option.value, value));
+        onChange(enumOptionsDeselectValue(option.value, checkboxesValues));
       }
     };
     var checkbox = /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("input", {
       type: "checkbox",
-      id: id + "-" + option.value,
+      id: optionId(id, option),
       name: id,
       checked: checked,
       disabled: disabled || itemDisabled || readonly,
       autoFocus: autofocus && index === 0,
-      onChange: handleChange
+      onChange: handleChange,
+      "aria-describedby": ariaDescribedByIds(id)
     }), /*#__PURE__*/React.createElement("span", null, option.label));
     return inline ? /*#__PURE__*/React.createElement("label", {
       key: option.value,
@@ -2952,7 +2978,8 @@ function FileWidget(_ref2) {
     defaultValue: "",
     autoFocus: autofocus,
     multiple: multiple,
-    accept: options.accept ? String(options.accept) : undefined
+    accept: options.accept ? String(options.accept) : undefined,
+    "aria-describedby": ariaDescribedByIds(id)
   })), /*#__PURE__*/React.createElement(FilesInfo, {
     filesInfo: filesInfo
   }));
@@ -3029,7 +3056,7 @@ function RadioWidget(_ref) {
     };
     var radio = /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("input", {
       type: "radio",
-      id: id + "-" + option.value,
+      id: optionId(id, option),
       checked: checked,
       name: name,
       required: required,
@@ -3038,7 +3065,8 @@ function RadioWidget(_ref) {
       autoFocus: autofocus && i === 0,
       onChange: handleChange,
       onBlur: handleBlur,
-      onFocus: handleFocus
+      onFocus: handleFocus,
+      "aria-describedby": ariaDescribedByIds(id)
     }), /*#__PURE__*/React.createElement("span", null, option.label));
     return inline ? /*#__PURE__*/React.createElement("label", {
       key: option.value,
@@ -3124,7 +3152,8 @@ function SelectWidget(_ref) {
     autoFocus: autofocus,
     onBlur: handleBlur,
     onFocus: handleFocus,
-    onChange: handleChange
+    onChange: handleChange,
+    "aria-describedby": ariaDescribedByIds(id)
   }, !multiple && schema["default"] === undefined && /*#__PURE__*/React.createElement("option", {
     value: ""
   }, placeholder), Array.isArray(enumOptions) && enumOptions.map(function (_ref2, i) {
@@ -3182,7 +3211,8 @@ function TextareaWidget(_ref) {
     rows: options.rows,
     onBlur: handleBlur,
     onFocus: handleFocus,
-    onChange: handleChange
+    onChange: handleChange,
+    "aria-describedby": ariaDescribedByIds(id)
   });
 }
 TextareaWidget.defaultProps = {
@@ -3567,9 +3597,10 @@ var Form = /*#__PURE__*/function (_Component) {
     var schemaUtils = altSchemaUtils ? altSchemaUtils : this.state.schemaUtils;
     var _this$props3 = this.props,
       customValidate = _this$props3.customValidate,
-      transformErrors = _this$props3.transformErrors;
+      transformErrors = _this$props3.transformErrors,
+      uiSchema = _this$props3.uiSchema;
     var resolvedSchema = schemaUtils.retrieveSchema(schema, formData);
-    return schemaUtils.getValidator().validateFormData(formData, resolvedSchema, customValidate, transformErrors);
+    return schemaUtils.getValidator().validateFormData(formData, resolvedSchema, customValidate, transformErrors, uiSchema);
   }
   /** Renders any errors contained in the `state` in using the `ErrorList`, if not disabled by `showErrorList`. */;
   _proto.renderErrors = function renderErrors(registry) {
@@ -3738,7 +3769,8 @@ var Form = /*#__PURE__*/function (_Component) {
       disabled: disabled,
       readonly: readonly
     }), children ? children : /*#__PURE__*/React.createElement(SubmitButton, {
-      uiSchema: uiSchema
+      uiSchema: uiSchema,
+      registry: registry
     }), showErrorList === "bottom" && this.renderErrors(registry));
   };
   return Form;