@douyinfe/semi-ui 2.2.2 → 2.3.0-beta.0

package/lib/cjs/checkbox/checkboxInner.js

@@ -49,7 +49,9 @@ class CheckboxInner extends _react.PureComponent {
       disabled,
       prefixCls,
       name,
-      isPureCardType
+      isPureCardType,
+      addonId,
+      extraId
     } = this.props;
     const prefix = prefixCls || _constants.checkboxClasses.PREFIX;
     const wrapper = (0, _classnames.default)({
@@ -64,10 +66,18 @@ class CheckboxInner extends _react.PureComponent {
     return /*#__PURE__*/_react.default.createElement("span", {
       className: wrapper
     }, /*#__PURE__*/_react.default.createElement("input", {
+      type: "checkbox",
+      "aria-label": this.props['aria-label'],
+      "aria-disabled": disabled,
+      "aria-checked": checked,
+      "aria-labelledby": addonId,
+      "aria-describedby": extraId || this.props['aria-describedby'],
+      "aria-invalid": this.props['aria-invalid'],
+      "aria-errormessage": this.props['aria-errormessage'],
+      "aria-required": this.props['aria-required'],
       ref: ref => {
         this.inputEntity = ref;
       },
-      type: "checkbox",
       className: _constants.checkboxClasses.INPUT,
       onChange: _noop2.default,
       checked: checked,
@@ -82,13 +92,20 @@ class CheckboxInner extends _react.PureComponent {
 
 CheckboxInner.contextType = _context.Context;
 CheckboxInner.propTypes = {
+  'aria-describedby': _propTypes.default.string,
+  'aria-errormessage': _propTypes.default.string,
+  'aria-invalid': _propTypes.default.bool,
+  'aria-labelledby': _propTypes.default.string,
+  'aria-required': _propTypes.default.bool,
   checked: _propTypes.default.bool,
   disabled: _propTypes.default.bool,
   onChange: _propTypes.default.func,
   children: _propTypes.default.node,
   grouped: _propTypes.default.bool,
   value: _propTypes.default.any,
-  isPureCardType: _propTypes.default.bool
+  isPureCardType: _propTypes.default.bool,
+  addonId: _propTypes.default.string,
+  extraId: _propTypes.default.string
 };
 CheckboxInner.defaultProps = {
   onChange: _noop2.default

package/lib/cjs/collapse/index.js

@@ -126,7 +126,8 @@ class Collapse extends _baseComponent.default {
     } = this.state;
     return /*#__PURE__*/_react.default.createElement("div", {
       className: clsPrefix,
-      style: style
+      style: style,
+      "aria-label": "Collapse"
     }, /*#__PURE__*/_react.default.createElement(_collapseContext.default.Provider, {
       value: {
         activeSet,

package/lib/cjs/collapse/item.d.ts

@@ -1,4 +1,4 @@
-import React, { PureComponent, ReactNode, CSSProperties } from 'react';
+import React, { CSSProperties, PureComponent, ReactNode } from 'react';
 import PropTypes from 'prop-types';
 import { CollapseContextType } from './collapse-context';
 export interface CollapsePanelProps {
@@ -18,6 +18,7 @@ export default class CollapsePanel extends PureComponent<CollapsePanelProps> {
         className: PropTypes.Requireable<string>;
         reCalcKey: PropTypes.Requireable<string | number>;
     };
+    private ariaID;
     renderHeader(active: boolean, expandIconEnable?: boolean): JSX.Element;
     render(): JSX.Element;
 }

package/lib/cjs/collapse/item.js

@@ -34,6 +34,8 @@ var _collapseContext = _interopRequireDefault(require("./collapse-context"));
 
 var _semiIcons = require("@douyinfe/semi-icons");
 
+var _uuid = require("@douyinfe/semi-foundation/lib/cjs/utils/uuid");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { _Object$defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -50,6 +52,11 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
 };
 
 class CollapsePanel extends _react.PureComponent {
+  constructor() {
+    super(...arguments);
+    this.ariaID = (0, _uuid.getUuidShort)({});
+  }
+
   renderHeader(active) {
     let expandIconEnable = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     const {
@@ -73,6 +80,7 @@ class CollapsePanel extends _react.PureComponent {
     }
 
     const icon = /*#__PURE__*/_react.default.createElement("span", {
+      "aria-hidden": 'true',
       className: (0, _classnames.default)(["".concat(_constants.cssClasses.PREFIX, "-header-icon"), {
         ["".concat(_constants.cssClasses.PREFIX, "-header-iconDisabled")]: !expandIconEnable
       }])
@@ -83,7 +91,9 @@ class CollapsePanel extends _react.PureComponent {
     if (typeof header === 'string') {
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, iconPosLeft ? icon : null, /*#__PURE__*/_react.default.createElement("span", null, header), /*#__PURE__*/_react.default.createElement("span", {
         className: "".concat(_constants.cssClasses.PREFIX, "-header-right")
-      }, /*#__PURE__*/_react.default.createElement("span", null, extra), iconPosLeft ? null : icon));
+      }, /*#__PURE__*/_react.default.createElement("span", {
+        "aria-label": 'Extra of collapse header'
+      }, extra), iconPosLeft ? null : icon));
     }
 
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, iconPosLeft ? icon : null, header, iconPosLeft ? null : icon);
@@ -118,13 +128,14 @@ class CollapsePanel extends _react.PureComponent {
       ["".concat(_constants.cssClasses.PREFIX, "-content")]: true
     });
     return /*#__PURE__*/_react.default.createElement("div", (0, _assign.default)({
-      role: "Collapse-panel",
+      "aria-label": 'Collapse panel',
       className: itemCls
     }, restProps), /*#__PURE__*/_react.default.createElement("div", {
       role: "button",
       tabIndex: 0,
       className: headerCls,
       "aria-expanded": active ? 'true' : 'false',
+      "aria-owns": this.ariaID,
       onClick: e => onClick(itemKey, e)
     }, this.renderHeader(active, children !== undefined)), children && /*#__PURE__*/_react.default.createElement(_collapsible.default, {
       isOpen: active,
@@ -132,7 +143,10 @@ class CollapsePanel extends _react.PureComponent {
       motion: motion,
       reCalcKey: reCalcKey
     }, /*#__PURE__*/_react.default.createElement("div", {
-      className: contentCls
+      className: contentCls,
+      "aria-label": 'Collapse content',
+      "aria-hidden": !active,
+      id: this.ariaID
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "".concat(_constants.cssClasses.PREFIX, "-content-wrapper")
     }, children))));

package/lib/cjs/collapsible/index.d.ts

@@ -11,6 +11,7 @@ export interface CollapsibleProps {
     style?: React.CSSProperties;
     collapseHeight?: number;
     reCalcKey?: number | string;
+    id?: string;
 }
 declare const Collapsible: {
     (props: CollapsibleProps): JSX.Element;

package/lib/cjs/collapsible/index.js

@@ -45,7 +45,8 @@ const Collapsible = props => {
     collapseHeight,
     style,
     className,
-    reCalcKey
+    reCalcKey,
+    id
   } = props;
   const ref = (0, _react.useRef)(null);
   const [maxHeight, setMaxHeight] = (0, _react.useState)(0);
@@ -113,7 +114,8 @@ const Collapsible = props => {
       ref: setHeight,
       style: {
         overflow: 'hidden'
-      }
+      },
+      id: id
     }, children));
   };
 

package/lib/cjs/datePicker/datePicker.d.ts

@@ -10,9 +10,15 @@ import { Locale } from '../locale/interface';
 import { RangeType } from '@douyinfe/semi-foundation/lib/cjs/datePicker/inputFoundation';
 import { TimePickerProps } from '../timePicker/TimePicker';
 export interface DatePickerProps extends DatePickerFoundationProps {
+    'aria-describedby'?: React.AriaAttributes['aria-describedby'];
+    'aria-errormessage'?: React.AriaAttributes['aria-errormessage'];
+    'aria-invalid'?: React.AriaAttributes['aria-invalid'];
+    'aria-labelledby'?: React.AriaAttributes['aria-labelledby'];
+    'aria-required'?: React.AriaAttributes['aria-required'];
     timePickerOpts?: TimePickerProps;
     bottomSlot?: React.ReactNode;
     insetLabel?: React.ReactNode;
+    insetLabelId?: string;
     prefix?: React.ReactNode;
     topSlot?: React.ReactNode;
     renderDate?: (dayNumber?: number, fullDate?: string) => React.ReactNode;
@@ -29,6 +35,11 @@ export declare type DatePickerState = DatePickerFoundationState;
 export default class DatePicker extends BaseComponent<DatePickerProps, DatePickerState> {
     static contextType: React.Context<import("../configProvider/context").ContextValue>;
     static propTypes: {
+        'aria-describedby': PropTypes.Requireable<string>;
+        'aria-errormessage': PropTypes.Requireable<string>;
+        'aria-invalid': PropTypes.Requireable<boolean>;
+        'aria-labelledby': PropTypes.Requireable<string>;
+        'aria-required': PropTypes.Requireable<boolean>;
         type: PropTypes.Requireable<"dateTime" | "date" | "month" | "dateRange" | "year" | "dateTimeRange">;
         size: PropTypes.Requireable<"default" | "small" | "large">;
         density: PropTypes.Requireable<"default" | "compact">;
@@ -58,6 +69,7 @@ export default class DatePicker extends BaseComponent<DatePickerProps, DatePicke
         prefixCls: PropTypes.Requireable<string>;
         prefix: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         insetLabel: PropTypes.Requireable<PropTypes.ReactNodeLike>;
+        insetLabelId: PropTypes.Requireable<string>;
         zIndex: PropTypes.Requireable<number>;
         position: PropTypes.Requireable<"top" | "topLeft" | "topRight" | "left" | "leftTop" | "leftBottom" | "right" | "rightTop" | "rightBottom" | "bottom" | "bottomLeft" | "bottomRight" | "leftTopOver" | "rightTopOver">;
         getPopupContainer: PropTypes.Requireable<(...args: any[]) => any>;

package/lib/cjs/datePicker/datePicker.js

@@ -541,6 +541,7 @@ class DatePicker extends _baseComponent.default {
       disabled,
       showClear,
       insetLabel,
+      insetLabelId,
       placeholder,
       validateStatus,
       inputStyle,
@@ -581,6 +582,7 @@ class DatePicker extends _baseComponent.default {
       inputStyle,
       showClear,
       insetLabel,
+      insetLabelId,
       type,
       format,
       multiple,
@@ -623,7 +625,12 @@ class DatePicker extends _baseComponent.default {
       className: (0, _classnames.default)(className, {
         [prefixCls]: true
       }),
-      ref: this.setTriggerRef
+      ref: this.setTriggerRef,
+      'aria-invalid': this.props['aria-invalid'],
+      'aria-errormessage': this.props['aria-errormessage'],
+      'aria-labelledby': this.props['aria-labelledby'],
+      'aria-describedby': this.props['aria-describedby'],
+      'aria-required': this.props['aria-required']
     };
     const inner = this.renderInner();
     const wrappedInner = this.wrapPopover(inner);
@@ -635,6 +642,11 @@ class DatePicker extends _baseComponent.default {
 exports.default = DatePicker;
 DatePicker.contextType = _context5.default;
 DatePicker.propTypes = {
+  'aria-describedby': _propTypes.default.string,
+  'aria-errormessage': _propTypes.default.string,
+  'aria-invalid': _propTypes.default.bool,
+  'aria-labelledby': _propTypes.default.string,
+  'aria-required': _propTypes.default.bool,
   type: _propTypes.default.oneOf(_constants.strings.TYPE_SET),
   size: _propTypes.default.oneOf(_constants.strings.SIZE_SET),
   density: _propTypes.default.oneOf(_constants.strings.DENSITY_SET),
@@ -664,6 +676,7 @@ DatePicker.propTypes = {
   prefixCls: _propTypes.default.string,
   prefix: _propTypes.default.node,
   insetLabel: _propTypes.default.node,
+  insetLabelId: _propTypes.default.string,
   zIndex: _propTypes.default.number,
   position: _propTypes.default.oneOf(_constants2.strings.POSITION_SET),
   getPopupContainer: _propTypes.default.func,

package/lib/cjs/dropdown/dropdownItem.js

@@ -96,7 +96,9 @@ class DropdownItem extends _baseComponent.default {
       }, icon);
     }
 
-    return /*#__PURE__*/_react.default.createElement("li", (0, _assign.default)({}, events, {
+    return /*#__PURE__*/_react.default.createElement("li", (0, _assign.default)({
+      role: "menuitem"
+    }, events, {
       ref: ref => forwardRef(ref),
       className: itemclass,
       style: style

package/lib/cjs/dropdown/dropdownMenu.js

@@ -49,7 +49,10 @@ class DropdownMenu extends _baseComponent.default {
     } = _a,
           rest = __rest(_a, ["children", "className", "style"]);
 
-    return /*#__PURE__*/_react.default.createElement("ul", (0, _assign.default)({}, rest, {
+    return /*#__PURE__*/_react.default.createElement("ul", (0, _assign.default)({
+      role: "menu",
+      "aria-orientation": "vertical"
+    }, rest, {
       className: (0, _classnames.default)("".concat(prefixCls, "-menu"), className),
       style: style
     }), children);

package/lib/cjs/empty/index.js

@@ -119,7 +119,8 @@ class Empty extends _baseComponent.default {
     };
     return /*#__PURE__*/_react.default.createElement("div", {
       className: wrapperCls,
-      style: style
+      style: style,
+      "aria-label": "empty placeholder image"
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "".concat(prefixCls, "-image"),
       style: imageStyle

package/lib/cjs/form/baseForm.d.ts

@@ -13,6 +13,7 @@ interface BaseFormState {
 }
 declare class Form extends BaseComponent<BaseFormProps, BaseFormState> {
     static propTypes: {
+        'aria-label': PropTypes.Requireable<string>;
         onSubmit: PropTypes.Requireable<(...args: any[]) => any>;
         onSubmitFail: PropTypes.Requireable<(...args: any[]) => any>;
         onChange: PropTypes.Requireable<(...args: any[]) => any>;
@@ -36,6 +37,7 @@ declare class Form extends BaseComponent<BaseFormProps, BaseFormState> {
         disabled: PropTypes.Requireable<boolean>;
         showValidateIcon: PropTypes.Requireable<boolean>;
         extraTextPosition: PropTypes.Requireable<string>;
+        id: PropTypes.Requireable<string>;
     };
     static defaultProps: {
         onChange: (...args: any[]) => void;
@@ -53,8 +55,14 @@ declare class Form extends BaseComponent<BaseFormProps, BaseFormState> {
     static TextArea: React.ComponentType<import("utility-types").Subtract<Omit<import("../input").TextAreaProps, "forwardRef"> & React.RefAttributes<HTMLTextAreaElement>, import("./interface").CommonexcludeType> & import("./interface").CommonFieldProps>;
     static InputNumber: React.ComponentType<import("utility-types").Subtract<import("../inputNumber").InputNumberProps & React.RefAttributes<HTMLInputElement>, import("./interface").CommonexcludeType> & import("./interface").CommonFieldProps>;
     static Select: React.ComponentType<import("utility-types").Subtract<{
+        'aria-describedby'?: string;
+        'aria-errormessage'?: string;
+        'aria-invalid'?: boolean | "true" | "false" | "grammar" | "spelling";
+        'aria-labelledby'?: string;
+        'aria-required'?: boolean | "true" | "false";
         id?: string;
         autoFocus?: boolean;
+        autoClearSearchValue?: boolean;
         arrowIcon?: React.ReactNode;
         defaultValue?: string | number | any[] | Record<string, any>;
         value?: string | number | any[] | Record<string, any>;
@@ -90,6 +98,7 @@ declare class Form extends BaseComponent<BaseFormProps, BaseFormState> {
         suffix?: React.ReactNode;
         prefix?: React.ReactNode;
         insetLabel?: React.ReactNode;
+        insetLabelId?: string;
         inputProps?: import("utility-types").Subtract<import("../input").InputProps, {
             value?: React.ReactText;
             onFocus?: (e: React.FocusEvent<HTMLInputElement, Element>) => void;

package/lib/cjs/form/baseForm.js

@@ -259,6 +259,7 @@ class Form extends _baseComponent.default {
 }
 
 Form.propTypes = {
+  'aria-label': _propTypes.default.string,
   onSubmit: _propTypes.default.func,
   onSubmitFail: _propTypes.default.func,
 
@@ -284,7 +285,8 @@ Form.propTypes = {
   autoScrollToError: _propTypes.default.oneOfType([_propTypes.default.bool, _propTypes.default.object]),
   disabled: _propTypes.default.bool,
   showValidateIcon: _propTypes.default.bool,
-  extraTextPosition: _propTypes.default.oneOf(_constants.strings.EXTRA_POS)
+  extraTextPosition: _propTypes.default.oneOf(_constants.strings.EXTRA_POS),
+  id: _propTypes.default.string
 };
 Form.defaultProps = {
   onChange: _noop2.default,

package/lib/cjs/form/errorMessage.d.ts

@@ -9,6 +9,8 @@ export interface ErrorMessageProps {
     validateStatus?: string;
     helpText?: React.ReactNode;
     isInInputGroup?: boolean;
+    errorMessageId?: string;
+    helpTextId?: string;
 }
 export default class ErrorMessage extends PureComponent<ErrorMessageProps> {
     static propTypes: {
@@ -19,6 +21,8 @@ export default class ErrorMessage extends PureComponent<ErrorMessageProps> {
         showValidateIcon: PropTypes.Requireable<boolean>;
         helpText: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         isInInputGroup: PropTypes.Requireable<boolean>;
+        errorMessageId: PropTypes.Requireable<string>;
+        helpTextId: PropTypes.Requireable<string>;
     };
     generatorText(error: ReactFieldError): JSX.Element;
     render(): JSX.Element;

package/lib/cjs/form/errorMessage.js

@@ -37,11 +37,26 @@ const prefix = _constants.cssClasses.PREFIX;
 
 class ErrorMessage extends _react.PureComponent {
   generatorText(error) {
+    const {
+      helpTextId,
+      errorMessageId
+    } = this.props;
+    const propsError = this.props.error;
+    let id = errorMessageId;
+
+    if (!propsError) {
+      id = helpTextId;
+    }
+
     if (typeof error === 'string') {
-      return /*#__PURE__*/_react.default.createElement("span", null, error);
+      return /*#__PURE__*/_react.default.createElement("span", {
+        id: id
+      }, error);
     } else if ((0, _isArray.default)(error)) {
       const err = (0, _filter.default)(error).call(error, e => e);
-      return err.length ? /*#__PURE__*/_react.default.createElement("span", null, err.join(', ')) : null;
+      return err.length ? /*#__PURE__*/_react.default.createElement("span", {
+        id: id
+      }, err.join(', ')) : null;
     } else if ( /*#__PURE__*/_react.default.isValidElement(error)) {
       return error;
     }
@@ -104,5 +119,8 @@ ErrorMessage.propTypes = {
   validateStatus: _propTypes.default.string,
   showValidateIcon: _propTypes.default.bool,
   helpText: _propTypes.default.node,
-  isInInputGroup: _propTypes.default.bool
+  isInInputGroup: _propTypes.default.bool,
+  // internal props
+  errorMessageId: _propTypes.default.string,
+  helpTextId: _propTypes.default.string
 };

package/lib/cjs/form/field.d.ts

@@ -3,8 +3,14 @@ declare const FormInput: import("react").ComponentType<import("utility-types").S
 declare const FormInputNumber: import("react").ComponentType<import("utility-types").Subtract<import("../inputNumber/index").InputNumberProps & import("react").RefAttributes<HTMLInputElement>, import("./interface").CommonexcludeType> & import("./interface").CommonFieldProps>;
 declare const FormTextArea: import("react").ComponentType<import("utility-types").Subtract<Omit<import("../input/textarea").TextAreaProps, "forwardRef"> & import("react").RefAttributes<HTMLTextAreaElement>, import("./interface").CommonexcludeType> & import("./interface").CommonFieldProps>;
 declare const FormSelect: import("react").ComponentType<import("utility-types").Subtract<{
+    'aria-describedby'?: string;
+    'aria-errormessage'?: string;
+    'aria-invalid'?: boolean | "true" | "false" | "grammar" | "spelling";
+    'aria-labelledby'?: string;
+    'aria-required'?: boolean | "true" | "false";
     id?: string;
     autoFocus?: boolean;
+    autoClearSearchValue?: boolean;
     arrowIcon?: import("react").ReactNode;
     defaultValue?: string | number | any[] | Record<string, any>;
     value?: string | number | any[] | Record<string, any>;
@@ -40,6 +46,7 @@ declare const FormSelect: import("react").ComponentType<import("utility-types").
     suffix?: import("react").ReactNode;
     prefix?: import("react").ReactNode;
     insetLabel?: import("react").ReactNode;
+    insetLabelId?: string;
     inputProps?: import("utility-types").Subtract<import("../input/index").InputProps, {
         value?: import("react").ReactText;
         onFocus?: (e: import("react").FocusEvent<HTMLInputElement, Element>) => void;

package/lib/cjs/form/hoc/withField.js

@@ -97,6 +97,7 @@ function withField(Component, opts) {
       extraText,
       extraTextPosition,
       pure,
+      id,
       rest
     } = (0, _utils.mergeProps)(props);
     let {
@@ -429,25 +430,61 @@ function withField(Component, opts) {
     let mergeLabelAlign = labelAlign || formProps.labelAlign;
     let mergeLabelCol = labelCol || formProps.labelCol;
     let mergeWrapperCol = wrapperCol || formProps.wrapperCol;
-    let mergeExtraPos = extraTextPosition || formProps.extraTextPosition || 'bottom';
+    let mergeExtraPos = extraTextPosition || formProps.extraTextPosition || 'bottom'; // id attribute to improve a11y
+
+    const a11yId = id ? id : field;
+    const labelId = "".concat(a11yId, "-label");
+    const helpTextId = "".concat(a11yId, "-helpText");
+    const extraTextId = "".concat(a11yId, "-extraText");
+    const errorMessageId = "".concat(a11yId, "-errormessage");
 
     let FieldComponent = (() => {
-      var _context, _context3;
+      var _context3, _context5;
 
       // prefer to use validateStatus which pass by user throught props
       let blockStatus = validateStatus ? validateStatus : status;
+      const extraCls = (0, _classnames.default)("".concat(prefix, "-field-extra"), {
+        ["".concat(prefix, "-field-extra-string")]: typeof extraText === 'string',
+        ["".concat(prefix, "-field-extra-middle")]: mergeExtraPos === 'middle',
+        ["".concat(prefix, "-field-extra-botttom")]: mergeExtraPos === 'bottom'
+      });
+      const extraContent = extraText ? /*#__PURE__*/_react.default.createElement("div", {
+        className: extraCls,
+        id: extraTextId
+      }, extraText) : null;
       let newProps = (0, _assign.default)((0, _assign.default)({
+        id: a11yId,
         disabled: formProps.disabled
       }, rest), {
         ref,
         onBlur: handleBlur,
         [options.onKeyChangeFnName]: handleChange,
         [options.valueKey]: value,
-        validateStatus: blockStatus
+        validateStatus: blockStatus,
+        'aria-required': required,
+        'aria-labelledby': labelId
       });
+
+      if (helpText) {
+        var _context;
+
+        newProps['aria-describedby'] = extraText ? (0, _concat.default)(_context = "".concat(helpTextId, " ")).call(_context, extraTextId) : helpTextId;
+      }
+
+      if (extraText) {
+        var _context2;
+
+        newProps['aria-describedby'] = helpText ? (0, _concat.default)(_context2 = "".concat(helpTextId, " ")).call(_context2, extraTextId) : extraTextId;
+      }
+
+      if (status === 'error') {
+        newProps['aria-errormessage'] = errorMessageId;
+        newProps['aria-invalid'] = true;
+      }
+
       const fieldCls = (0, _classnames.default)({
         ["".concat(prefix, "-field")]: true,
-        [(0, _concat.default)(_context = "".concat(prefix, "-field-")).call(_context, name)]: Boolean(name),
+        [(0, _concat.default)(_context3 = "".concat(prefix, "-field-")).call(_context3, name)]: Boolean(name),
         [fieldClassName]: Boolean(fieldClassName)
       });
       const fieldMaincls = (0, _classnames.default)({
@@ -456,9 +493,11 @@ function withField(Component, opts) {
 
       if (mergeLabelPos === 'inset' && !noLabel) {
         newProps.insetLabel = label || field;
+        newProps.insetLabelId = labelId;
 
         if (typeof label === 'object' && !(0, _reactUtils.isElement)(label)) {
           newProps.insetLabel = label.text;
+          newProps.insetLabelId = labelId;
         }
       }
 
@@ -470,11 +509,11 @@ function withField(Component, opts) {
       }
 
       if (pure) {
-        var _context2;
+        var _context4;
 
         let pureCls = (0, _classnames.default)(rest.className, {
           ["".concat(prefix, "-field-pure")]: true,
-          [(0, _concat.default)(_context2 = "".concat(prefix, "-field-")).call(_context2, name)]: Boolean(name),
+          [(0, _concat.default)(_context4 = "".concat(prefix, "-field-")).call(_context4, name)]: Boolean(name),
           [fieldClassName]: Boolean(fieldClassName)
         });
         newProps.className = pureCls;
@@ -482,7 +521,7 @@ function withField(Component, opts) {
       }
 
       let withCol = mergeLabelCol && mergeWrapperCol;
-      const labelColCls = mergeLabelAlign ? (0, _concat.default)(_context3 = "".concat(prefix, "-col-")).call(_context3, mergeLabelAlign) : ''; // get label
+      const labelColCls = mergeLabelAlign ? (0, _concat.default)(_context5 = "".concat(prefix, "-col-")).call(_context5, mergeLabelAlign) : ''; // get label
 
       let labelContent = null;
 
@@ -490,6 +529,7 @@ function withField(Component, opts) {
         let needSpread = typeof label === 'object' && !(0, _reactUtils.isElement)(label) ? label : {};
         labelContent = /*#__PURE__*/_react.default.createElement(_label.default, (0, _assign.default)({
           text: label || field,
+          id: labelId,
           required: required,
           name: name || field,
           width: mergeLabelWidth,
@@ -497,21 +537,14 @@ function withField(Component, opts) {
         }, needSpread));
       }
 
-      const extraCls = (0, _classnames.default)("".concat(prefix, "-field-extra"), {
-        ["".concat(prefix, "-field-extra-string")]: typeof extraText === 'string',
-        ["".concat(prefix, "-field-extra-middle")]: mergeExtraPos === 'middle',
-        ["".concat(prefix, "-field-extra-botttom")]: mergeExtraPos === 'bottom'
-      });
-      const extraContent = extraText ? /*#__PURE__*/_react.default.createElement("div", {
-        className: extraCls
-      }, extraText) : null;
-
       const fieldMainContent = /*#__PURE__*/_react.default.createElement("div", {
         className: fieldMaincls
       }, mergeExtraPos === 'middle' ? extraContent : null, com, !noErrorMessage ? /*#__PURE__*/_react.default.createElement(_errorMessage.default, {
         error: error,
         validateStatus: blockStatus,
         helpText: helpText,
+        helpTextId: helpTextId,
+        errorMessageId: errorMessageId,
         showValidateIcon: formProps.showValidateIcon
       }) : null, mergeExtraPos === 'bottom' ? extraContent : null);
 

package/lib/cjs/form/index.d.ts

@@ -11,7 +11,6 @@ import { useFormApi, useFormState, useFieldState, useFieldApi } from './hooks/in
 import withField from './hoc/withField';
 import withFormState from './hoc/withFormState';
 import withFormApi from './hoc/withFormApi';
-export * from './interface';
 export { Form, ArrayField, withField, useFormApi, useFormState, useFieldApi, useFieldState, withFormState, withFormApi };
 export * from './interface';
 export { ArrayFieldProps } from './arrayField';

package/lib/cjs/form/interface.d.ts

@@ -82,6 +82,7 @@ export interface FormFCChild<K extends Record<string, any> = any> {
     formApi: FormApi<K>;
 }
 export interface BaseFormProps {
+    'aria-label'?: React.AriaAttributes['aria-label'];
     onSubmit?: (values: Record<string, any>) => void;
     onSubmitFail?: (errors: Record<string, FieldError>, values: any) => void;
     onReset?: () => void;
@@ -90,6 +91,7 @@ export interface BaseFormProps {
     validateFields?: (values: Record<string, any>) => string | Record<string, any>;
     /** Use this if you want to populate the form with initial values. */
     initValues?: Record<string, any>;
+    id?: string;
     /** getFormApi will be call once when Form mounted, u can save formApi reference in your component  */
     getFormApi?: (formApi: FormApi) => void;
     style?: React.CSSProperties;

package/lib/cjs/form/label.d.ts

@@ -1,6 +1,7 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 export interface LabelProps {
+    id?: string;
     /** Whether to display the required * symbol */
     required?: boolean;
     /** Content of label */
@@ -24,6 +25,7 @@ export default class Label extends PureComponent<LabelProps> {
         className: string;
     };
     static propTypes: {
+        id: PropTypes.Requireable<string>;
         children: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         required: PropTypes.Requireable<boolean>;
         text: PropTypes.Requireable<PropTypes.ReactNodeLike>;

package/lib/cjs/form/label.js

@@ -40,7 +40,8 @@ class Label extends _react.PureComponent {
       align,
       style,
       className,
-      extra
+      extra,
+      id
     } = this.props;
     const labelCls = (0, _classnames.default)(className, {
       ["".concat(prefixCls, "-field-label")]: true,
@@ -64,7 +65,8 @@ class Label extends _react.PureComponent {
     return /*#__PURE__*/_react.default.createElement("label", {
       className: labelCls,
       htmlFor: name,
-      style: labelStyle
+      style: labelStyle,
+      id: id
     }, extra ? contentWithExtra : textContent);
   }
 
@@ -78,6 +80,7 @@ Label.defaultProps = {
   className: ''
 };
 Label.propTypes = {
+  id: _propTypes.default.string,
   children: _propTypes.default.node,
   required: _propTypes.default.bool,
   text: _propTypes.default.node,