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

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

@@ -9,6 +9,12 @@ export declare type InputSize = 'small' | 'large' | 'default';
 export declare type InputMode = 'password';
 export declare type ValidateStatus = "default" | "error" | "warning" | "success";
 export interface InputProps extends Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'prefix' | 'size' | 'autoFocus' | 'placeholder' | 'onFocus' | 'onBlur'> {
+    'aria-label'?: React.AriaAttributes['aria-label'];
+    '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'];
     addonBefore?: React.ReactNode;
     addonAfter?: React.ReactNode;
     prefix?: React.ReactNode;
@@ -24,6 +30,7 @@ export interface InputProps extends Omit<React.InputHTMLAttributes<HTMLInputElem
     hideSuffix?: boolean;
     placeholder?: React.ReactText;
     insetLabel?: React.ReactNode;
+    insetLabelId?: string;
     size?: InputSize;
     className?: string;
     style?: React.CSSProperties;
@@ -54,6 +61,12 @@ export interface InputState {
 }
 declare class Input extends BaseComponent<InputProps, InputState> {
     static propTypes: {
+        'aria-label': PropTypes.Requireable<string>;
+        'aria-labelledby': PropTypes.Requireable<string>;
+        'aria-invalid': PropTypes.Requireable<boolean>;
+        'aria-errormessage': PropTypes.Requireable<string>;
+        'aria-describedby': PropTypes.Requireable<string>;
+        'aria-required': PropTypes.Requireable<boolean>;
         addonBefore: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         addonAfter: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         prefix: PropTypes.Requireable<PropTypes.ReactNodeLike>;
@@ -82,6 +95,7 @@ declare class Input extends BaseComponent<InputProps, InputState> {
         onKeyPress: PropTypes.Requireable<(...args: any[]) => any>;
         onEnterPress: PropTypes.Requireable<(...args: any[]) => any>;
         insetLabel: PropTypes.Requireable<PropTypes.ReactNodeLike>;
+        insetLabelId: PropTypes.Requireable<string>;
         inputStyle: PropTypes.Requireable<object>;
         getValueLength: PropTypes.Requireable<(...args: any[]) => any>;
     };
@@ -147,6 +161,7 @@ declare class Input extends BaseComponent<InputProps, InputState> {
     static getDerivedStateFromProps(props: InputProps, state: InputState): Partial<InputState>;
     componentDidUpdate(prevProps: InputProps): void;
     handleClear: (e: React.MouseEvent<HTMLInputElement>) => void;
+    handleClearEnterPress: (e: React.KeyboardEvent<HTMLDivElement>) => void;
     handleClick: (e: React.MouseEvent<HTMLDivElement>) => void;
     handleMouseOver: (e: React.MouseEvent<HTMLDivElement>) => void;
     handleMouseLeave: (e: React.MouseEvent<HTMLDivElement>) => void;
@@ -154,6 +169,7 @@ declare class Input extends BaseComponent<InputProps, InputState> {
     handleClickEye: (e: React.MouseEvent<HTMLInputElement>) => void;
     handleMouseDown: (e: React.MouseEvent<HTMLInputElement>) => void;
     handleMouseUp: (e: React.MouseEvent<HTMLInputElement>) => void;
+    handleModeEnterPress: (e: React.KeyboardEvent<HTMLDivElement>) => void;
     handleClickPrefixOrSuffix: (e: React.MouseEvent<HTMLInputElement>) => void;
     handlePreventMouseDown: (e: React.MouseEvent<HTMLInputElement>) => void;
     renderPrepend(): JSX.Element;

package/lib/cjs/input/index.js

@@ -68,6 +68,10 @@ class Input extends _baseComponent.default {
       this.foundation.handleClear(e);
     };
 
+    this.handleClearEnterPress = e => {
+      this.foundation.handleClearEnterPress(e);
+    };
+
     this.handleClick = e => {
       this.foundation.handleClick(e);
     };
@@ -100,6 +104,10 @@ class Input extends _baseComponent.default {
       this.foundation.handleMouseUp(e);
     };
 
+    this.handleModeEnterPress = e => {
+      this.foundation.handleModeEnterPress(e);
+    };
+
     this.handleClickPrefixOrSuffix = e => {
       this.foundation.handleClickPrefixOrSuffix(e);
     };
@@ -234,8 +242,12 @@ class Input extends _baseComponent.default {
 
     if (allowClear) {
       return /*#__PURE__*/_react.default.createElement("div", {
+        role: "button",
+        tabIndex: 0,
+        "aria-label": "Clear input value",
         className: clearCls,
-        onMouseDown: this.handleClear
+        onMouseDown: this.handleClear,
+        onKeyPress: this.handleClearEnterPress
       }, /*#__PURE__*/_react.default.createElement(_semiIcons.IconClear, null));
     }
 
@@ -256,13 +268,18 @@ class Input extends _baseComponent.default {
     const modeCls = (0, _classnames.default)("".concat(prefixCls, "-modebtn"));
     const modeIcon = eyeClosed ? /*#__PURE__*/_react.default.createElement(_semiIcons.IconEyeClosedSolid, null) : /*#__PURE__*/_react.default.createElement(_semiIcons.IconEyeOpened, null);
     const showModeBtn = mode === 'password' && value && !disabled && (isFocus || isHovering);
+    const ariaLabel = eyeClosed ? 'Show password' : 'Hidden password';
 
     if (showModeBtn) {
       return /*#__PURE__*/_react.default.createElement("div", {
+        role: "button",
+        tabIndex: 0,
+        "aria-label": ariaLabel,
         className: modeCls,
         onClick: this.handleClickEye,
         onMouseDown: this.handleMouseDown,
-        onMouseUp: this.handleMouseUp
+        onMouseUp: this.handleMouseUp,
+        onKeyPress: this.handleModeEnterPress
       }, modeIcon);
     }
 
@@ -272,7 +289,8 @@ class Input extends _baseComponent.default {
   renderPrefix() {
     const {
       prefix,
-      insetLabel
+      insetLabel,
+      insetLabelId
     } = this.props;
     const labelNode = prefix || insetLabel;
 
@@ -285,11 +303,13 @@ class Input extends _baseComponent.default {
       ["".concat(prefixCls, "-inset-label")]: insetLabel,
       ["".concat(prefixCls, "-prefix-text")]: labelNode && (0, _isString2.default)(labelNode),
       ["".concat(prefixCls, "-prefix-icon")]: (0, _utils.isSemiIcon)(labelNode)
-    });
+    }); // eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions
+
     return /*#__PURE__*/_react.default.createElement("div", {
       className: prefixWrapperCls,
       onMouseDown: this.handlePreventMouseDown,
-      onClick: this.handleClickPrefixOrSuffix
+      onClick: this.handleClickPrefixOrSuffix,
+      id: insetLabelId
     }, labelNode);
   }
 
@@ -321,7 +341,8 @@ class Input extends _baseComponent.default {
       ["".concat(prefixCls, "-suffix-text")]: suffix && (0, _isString2.default)(suffix),
       ["".concat(prefixCls, "-suffix-icon")]: (0, _utils.isSemiIcon)(suffix),
       ["".concat(prefixCls, "-suffix-hidden")]: suffixAllowClear && Boolean(hideSuffix)
-    });
+    }); // eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions
+
     return /*#__PURE__*/_react.default.createElement("div", {
       className: suffixWrapperCls,
       onMouseDown: this.handlePreventMouseDown,
@@ -424,21 +445,35 @@ class Input extends _baseComponent.default {
       inputProps.minLength = stateMinLength;
     }
 
-    return /*#__PURE__*/_react.default.createElement("div", {
-      className: wrapperCls,
-      style: style,
-      onMouseEnter: e => this.handleMouseOver(e),
-      onMouseLeave: e => this.handleMouseLeave(e),
-      onClick: e => this.handleClick(e)
-    }, this.renderPrepend(), this.renderPrefix(), /*#__PURE__*/_react.default.createElement("input", (0, _assign.default)({}, inputProps, {
-      ref: ref
-    })), this.renderClearBtn(), this.renderSuffix(suffixAllowClear), this.renderModeBtn(), this.renderAppend());
+    if (validateStatus === 'error') {
+      inputProps['aria-invalid'] = "true";
+    }
+
+    return (
+      /*#__PURE__*/
+      // eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions
+      _react.default.createElement("div", {
+        className: wrapperCls,
+        style: style,
+        onMouseEnter: e => this.handleMouseOver(e),
+        onMouseLeave: e => this.handleMouseLeave(e),
+        onClick: e => this.handleClick(e)
+      }, this.renderPrepend(), this.renderPrefix(), /*#__PURE__*/_react.default.createElement("input", (0, _assign.default)({}, inputProps, {
+        ref: ref
+      })), this.renderClearBtn(), this.renderSuffix(suffixAllowClear), this.renderModeBtn(), this.renderAppend())
+    );
   }
 
 }
 
 exports.Input = Input;
 Input.propTypes = {
+  'aria-label': _propTypes.default.string,
+  'aria-labelledby': _propTypes.default.string,
+  'aria-invalid': _propTypes.default.bool,
+  'aria-errormessage': _propTypes.default.string,
+  'aria-describedby': _propTypes.default.string,
+  'aria-required': _propTypes.default.bool,
   addonBefore: _propTypes.default.node,
   addonAfter: _propTypes.default.node,
   prefix: _propTypes.default.node,
@@ -467,6 +502,7 @@ Input.propTypes = {
   onKeyPress: _propTypes.default.func,
   onEnterPress: _propTypes.default.func,
   insetLabel: _propTypes.default.node,
+  insetLabelId: _propTypes.default.string,
   inputStyle: _propTypes.default.object,
   getValueLength: _propTypes.default.func
 };

package/lib/cjs/input/inputGroup.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import BaseComponent from '../_base/baseComponent';
+import { LabelProps } from '../form/label';
 import { noop } from '@douyinfe/semi-foundation/lib/cjs/utils/function';
 export declare type InputSize = 'small' | 'large' | 'default';
 export interface InputGroupProps {
@@ -10,7 +11,7 @@ export interface InputGroupProps {
     style?: Record<string, any>;
     onBlur?: (e: React.FocusEvent<HTMLSpanElement>) => void;
     onFocus?: (e: React.FocusEvent<HTMLSpanElement>) => void;
-    label?: Record<string, any>;
+    label?: LabelProps;
     labelPosition?: string;
     disabled?: boolean;
 }

package/lib/cjs/input/inputGroup.js

@@ -77,9 +77,16 @@ class inputGroup extends _baseComponent.default {
       [(0, _concat.default)(_context = "".concat(prefixCls, "-")).call(_context, size)]: size !== 'default'
     }); // const labelCls = cls(label.className, '');
 
+    const defaultName = 'input-group';
     return /*#__PURE__*/_react.default.createElement("div", {
+      role: "group",
+      "aria-label": "Input group",
+      "aria-disabled": this.props.disabled,
       className: groupWrapperCls
-    }, label && label.text ? /*#__PURE__*/_react.default.createElement(_label.default, (0, _assign.default)({}, label)) : null, /*#__PURE__*/_react.default.createElement("span", {
+    }, label && label.text ? /*#__PURE__*/_react.default.createElement(_label.default, (0, _assign.default)({
+      name: defaultName
+    }, label)) : null, /*#__PURE__*/_react.default.createElement("span", {
+      id: label && label.name || defaultName,
       className: groupCls,
       style: this.props.style,
       onFocus: this.props.onFocus,
@@ -135,6 +142,9 @@ class inputGroup extends _baseComponent.default {
     }
 
     return /*#__PURE__*/_react.default.createElement("span", {
+      role: "group",
+      "aria-label": "Input group",
+      "aria-disabled": this.props.disabled,
       className: groupCls,
       style: style,
       onFocus: this.props.onFocus,

package/lib/cjs/input/textarea.js

@@ -63,6 +63,10 @@ class TextArea extends _baseComponent.default {
       this.foundation.handleClear(e);
     };
 
+    this.handleClearEnterPress = e => {
+      this.foundation.handleClearEnterPress(e);
+    };
+
     this.setRef = node => {
       this.libRef.current = node;
       const {
@@ -188,8 +192,12 @@ class TextArea extends _baseComponent.default {
 
     if (showClear) {
       return /*#__PURE__*/_react.default.createElement("div", {
+        role: "button",
+        tabIndex: 0,
+        "aria-label": "Clear textarea value",
         className: clearCls,
-        onClick: this.handleClear
+        onClick: this.handleClear,
+        onKeyPress: this.handleClearEnterPress
       }, /*#__PURE__*/_react.default.createElement(_semiIcons.IconClear, null));
     }
 
@@ -215,6 +223,9 @@ class TextArea extends _baseComponent.default {
         ["".concat(prefixCls, "-textarea-counter-exceed")]: current > total
       });
       counter = /*#__PURE__*/_react.default.createElement("div", {
+        "aria-label": "Textarea value length counter",
+        "aria-valuemax": maxCount,
+        "aria-valuenow": current,
         className: countCls
       }, current, total ? '/' : null, total);
     } else {

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

@@ -16,6 +16,7 @@ export interface InputNumberProps extends InputProps {
     hideButtons?: boolean;
     innerButtons?: boolean;
     insetLabel?: React.ReactNode;
+    insetLabelId?: string;
     keepFocus?: boolean;
     max?: number;
     min?: number;
@@ -47,6 +48,12 @@ export interface InputNumberState {
 }
 declare class InputNumber extends BaseComponent<InputNumberProps, InputNumberState> {
     static propTypes: {
+        'aria-label': PropTypes.Requireable<string>;
+        'aria-labelledby': PropTypes.Requireable<string>;
+        'aria-invalid': PropTypes.Requireable<boolean>;
+        'aria-errormessage': PropTypes.Requireable<string>;
+        'aria-describedby': PropTypes.Requireable<string>;
+        'aria-required': PropTypes.Requireable<boolean>;
         autofocus: PropTypes.Requireable<boolean>;
         className: PropTypes.Requireable<string>;
         defaultValue: PropTypes.Requireable<string | number>;
@@ -56,6 +63,7 @@ declare class InputNumber extends BaseComponent<InputNumberProps, InputNumberSta
         hideButtons: PropTypes.Requireable<boolean>;
         innerButtons: PropTypes.Requireable<boolean>;
         insetLabel: PropTypes.Requireable<PropTypes.ReactNodeLike>;
+        insetLabelId: PropTypes.Requireable<string>;
         keepFocus: PropTypes.Requireable<boolean>;
         max: PropTypes.Requireable<number>;
         min: PropTypes.Requireable<number>;

package/lib/cjs/inputNumber/index.js

@@ -140,6 +140,8 @@ class InputNumber extends _baseComponent.default {
       return /*#__PURE__*/_react.default.createElement("div", {
         className: suffixChildrenCls
       }, /*#__PURE__*/_react.default.createElement("span", {
+        role: "button",
+        tabIndex: -1,
         className: upClassName,
         onMouseDown: notAllowedUp ? _noop2.default : this.handleUpClick,
         onMouseUp: this.handleMouseUp,
@@ -147,6 +149,8 @@ class InputNumber extends _baseComponent.default {
       }, /*#__PURE__*/_react.default.createElement(_semiIcons.IconChevronUp, {
         size: "extra-small"
       })), /*#__PURE__*/_react.default.createElement("span", {
+        role: "button",
+        tabIndex: -1,
         className: downClassName,
         onMouseDown: notAllowedDown ? _noop2.default : this.handleDownClick,
         onMouseUp: this.handleMouseUp,
@@ -442,12 +446,29 @@ class InputNumber extends _baseComponent.default {
           rest = __rest(_a, ["disabled", "className", "prefixCls", "min", "max", "step", "shiftStep", "precision", "formatter", "parser", "forwardedRef", "onUpClick", "onDownClick", "pressInterval", "pressTimeout", "suffix", "size", "hideButtons", "innerButtons", "style", "onNumberChange", "keepFocus"]);
 
     const {
-      value
+      value,
+      number
     } = this.state;
     const inputNumberCls = (0, _classnames.default)(className, "".concat(prefixCls, "-number"), {
       [(0, _concat.default)(_context = "".concat(prefixCls, "-number-size-")).call(_context, size)]: size
     });
     const buttons = this.renderButtons();
+    const ariaProps = {
+      'aria-disabled': disabled,
+      step
+    };
+
+    if (number) {
+      ariaProps['aria-valuenow'] = number;
+    }
+
+    if (max !== Infinity) {
+      ariaProps['aria-valuemax'] = max;
+    }
+
+    if (min !== -Infinity) {
+      ariaProps['aria-valuemin'] = min;
+    }
 
     const input = /*#__PURE__*/_react.default.createElement("div", {
       className: inputNumberCls,
@@ -455,7 +476,9 @@ class InputNumber extends _baseComponent.default {
       onMouseMove: e => this.handleInputMouseMove(e),
       onMouseEnter: e => this.handleInputMouseEnter(e),
       onMouseLeave: e => this.handleInputMouseLeave(e)
-    }, /*#__PURE__*/_react.default.createElement(_input.default, (0, _assign.default)({}, rest, {
+    }, /*#__PURE__*/_react.default.createElement(_input.default, (0, _assign.default)({
+      role: "spinbutton"
+    }, ariaProps, rest, {
       size: size,
       disabled: disabled,
       ref: this.setInputRef,
@@ -474,6 +497,12 @@ class InputNumber extends _baseComponent.default {
 
 exports.InputNumber = InputNumber;
 InputNumber.propTypes = {
+  'aria-label': _propTypes.default.string,
+  'aria-labelledby': _propTypes.default.string,
+  'aria-invalid': _propTypes.default.bool,
+  'aria-errormessage': _propTypes.default.string,
+  'aria-describedby': _propTypes.default.string,
+  'aria-required': _propTypes.default.bool,
   autofocus: _propTypes.default.bool,
   className: _propTypes.default.string,
   defaultValue: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
@@ -483,6 +512,7 @@ InputNumber.propTypes = {
   hideButtons: _propTypes.default.bool,
   innerButtons: _propTypes.default.bool,
   insetLabel: _propTypes.default.node,
+  insetLabelId: _propTypes.default.string,
   keepFocus: _propTypes.default.bool,
   max: _propTypes.default.number,
   min: _propTypes.default.number,

package/lib/cjs/layout/Sider.d.ts

@@ -14,6 +14,8 @@ export interface SiderProps {
     className?: string;
     breakpoint?: Array<keyof ResponsiveMap>;
     onBreakpoint?: (screen: keyof ResponsiveMap, match: boolean) => void;
+    'aria-label'?: React.AriaAttributes['aria-label'];
+    'role'?: React.AriaRole;
 }
 declare class Sider extends React.PureComponent<SiderProps> {
     static propTypes: {
@@ -22,6 +24,8 @@ declare class Sider extends React.PureComponent<SiderProps> {
         className: PropTypes.Requireable<string>;
         breakpoint: PropTypes.Requireable<string[]>;
         onBreakpoint: PropTypes.Requireable<(...args: any[]) => any>;
+        'aria-label': PropTypes.Requireable<string>;
+        role: PropTypes.Requireable<string>;
     };
     static defaultProps: {
         prefixCls: string;

package/lib/cjs/layout/Sider.js

@@ -137,6 +137,7 @@ class Sider extends _react.default.PureComponent {
     });
     return /*#__PURE__*/_react.default.createElement("aside", (0, _assign.default)({
       className: classString,
+      "aria-label": this.props['aria-label'],
       style: style
     }, (0, _getDataAttr.default)(others)), /*#__PURE__*/_react.default.createElement("div", {
       className: "".concat(prefixCls, "-sider-children")
@@ -150,7 +151,9 @@ Sider.propTypes = {
   style: _propTypes.default.object,
   className: _propTypes.default.string,
   breakpoint: _propTypes.default.arrayOf(_propTypes.default.oneOf(bpt)),
-  onBreakpoint: _propTypes.default.func
+  onBreakpoint: _propTypes.default.func,
+  'aria-label': _propTypes.default.string,
+  role: _propTypes.default.string
 };
 Sider.defaultProps = {
   prefixCls: _constants.cssClasses.PREFIX

package/lib/cjs/layout/index.js

@@ -58,6 +58,8 @@ function generator(type) {
   return BasicComponent => class Adapter extends _react.default.PureComponent {
     render() {
       return /*#__PURE__*/_react.default.createElement(BasicComponent, (0, _assign.default)({
+        role: this.props.role,
+        "aria-label": this.props['aria-label'],
         type: typeName,
         tagName: tagName
       }, this.props));

package/lib/cjs/list/item.js

@@ -110,7 +110,6 @@ class ListItem extends _react.PureComponent {
     }
 
     let content = /*#__PURE__*/_react.default.createElement("li", {
-      role: "list-item",
       className: itemCls,
       style: style,
       onClick: handleClick,

package/lib/cjs/modal/Modal.js

@@ -114,6 +114,7 @@ class Modal extends _baseComponent.default {
           return null;
         } else {
           return /*#__PURE__*/_react.default.createElement(_button.default, (0, _assign.default)({
+            "aria-label": "cancel",
             onClick: this.handleCancel,
             loading: cancelLoading,
             type: "tertiary"
@@ -124,6 +125,7 @@ class Modal extends _baseComponent.default {
       return /*#__PURE__*/_react.default.createElement(_localeConsumer.default, {
         componentName: "Modal"
       }, (locale, localeCode) => /*#__PURE__*/_react.default.createElement("div", null, getCancelButton(locale), /*#__PURE__*/_react.default.createElement(_button.default, (0, _assign.default)({
+        "aria-label": "confirm",
         type: okType,
         theme: "solid",
         loading: confirmLoading,

package/lib/cjs/modal/ModalContent.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import BaseComponent from '../_base/baseComponent';
-import { ModalContentAdapter, ModalContentProps, ModalContentState } from '@douyinfe/semi-foundation/lib/cjs/modal/modalContentFoundation';
+import ModalContentFoundation, { ModalContentAdapter, ModalContentProps, ModalContentState } from '@douyinfe/semi-foundation/lib/cjs/modal/modalContentFoundation';
 export default class ModalContent extends BaseComponent<ModalContentProps, ModalContentState> {
     static contextType: React.Context<import("../configProvider/context").ContextValue>;
     static propTypes: {
@@ -19,6 +19,8 @@ export default class ModalContent extends BaseComponent<ModalContentProps, Modal
     };
     dialogId: string;
     private timeoutId;
+    modalDialogRef: React.MutableRefObject<HTMLDivElement>;
+    foundation: ModalContentFoundation;
     constructor(props: ModalContentProps);
     get adapter(): ModalContentAdapter;
     componentDidMount(): void;

package/lib/cjs/modal/ModalContent.js

@@ -22,6 +22,10 @@ var _setTimeout2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-j
 
 var _bind = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/bind"));
 
+var _get2 = _interopRequireDefault(require("lodash/get"));
+
+var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
+
 var _noop2 = _interopRequireDefault(require("lodash/noop"));
 
 var _react = _interopRequireDefault(require("react"));
@@ -44,6 +48,8 @@ var _modalContentFoundation = _interopRequireDefault(require("@douyinfe/semi-fou
 
 var _semiIcons = require("@douyinfe/semi-icons");
 
+var _utils = require("../_utils");
+
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
 
@@ -118,6 +124,7 @@ class ModalContent extends _baseComponent.default {
         const iconType = closeIcon || /*#__PURE__*/_react.default.createElement(_semiIcons.IconClose, null);
 
         closer = /*#__PURE__*/_react.default.createElement(_iconButton.default, {
+          "aria-label": "close",
           className: "".concat(_constants.cssClasses.DIALOG, "-close"),
           key: "close-btn",
           onClick: this.close,
@@ -154,7 +161,8 @@ class ModalContent extends _baseComponent.default {
         className: "".concat(_constants.cssClasses.DIALOG, "-header")
       }, icon, /*#__PURE__*/_react.default.createElement(_typography.default.Title, {
         heading: 5,
-        className: "".concat(_constants.cssClasses.DIALOG, "-title")
+        className: "".concat(_constants.cssClasses.DIALOG, "-title"),
+        id: "".concat(_constants.cssClasses.DIALOG, "-title")
       }, title), closer);
     };
 
@@ -172,6 +180,7 @@ class ModalContent extends _baseComponent.default {
       const hasHeader = title !== null && title !== undefined || 'header' in this.props;
       return hasHeader ? /*#__PURE__*/_react.default.createElement("div", {
         className: bodyCls,
+        id: "".concat(_constants.cssClasses.DIALOG, "-body"),
         style: bodyStyle
       }, children) : /*#__PURE__*/_react.default.createElement("div", {
         className: "".concat(_constants.cssClasses.DIALOG, "-body-wrapper")
@@ -212,13 +221,21 @@ class ModalContent extends _baseComponent.default {
         className: "".concat(_constants.cssClasses.DIALOG, "-footer")
       }, props.footer) : null;
 
-      const dialogElement = /*#__PURE__*/_react.default.createElement("div", {
+      const dialogElement =
+      /*#__PURE__*/
+      // eslint-disable-next-line jsx-a11y/no-static-element-interactions
+      _react.default.createElement("div", {
         key: "dialog-element",
         className: digCls,
         onMouseDown: this.onDialogMouseDown,
         style: (0, _assign.default)((0, _assign.default)({}, props.style), style),
         id: this.dialogId
       }, /*#__PURE__*/_react.default.createElement("div", {
+        role: "dialog",
+        ref: this.modalDialogRef,
+        "aria-modal": "true",
+        "aria-labelledby": "".concat(_constants.cssClasses.DIALOG, "-title"),
+        "aria-describedby": "".concat(_constants.cssClasses.DIALOG, "-body"),
         onAnimationEnd: props.onAnimationEnd,
         className: (0, _classnames.default)(["".concat(_constants.cssClasses.DIALOG, "-content"), props.contentClassName, {
           ["".concat(_constants.cssClasses.DIALOG, "-content-fullScreen")]: props.isFullScreen
@@ -230,10 +247,12 @@ class ModalContent extends _baseComponent.default {
     };
 
     this.state = {
-      dialogMouseDown: false
+      dialogMouseDown: false,
+      prevFocusElement: (0, _utils.getActiveElement)()
     };
     this.foundation = new _modalContentFoundation.default(this.adapter);
     this.dialogId = "dialog-".concat(uuid++);
+    this.modalDialogRef = /*#__PURE__*/_react.default.createRef();
   }
 
   get adapter() {
@@ -270,12 +289,35 @@ class ModalContent extends _baseComponent.default {
           document.removeEventListener('keydown', (0, _bind.default)(_context3 = this.foundation.handleKeyDown).call(_context3, this.foundation));
         }
       },
-      getMouseState: () => this.state.dialogMouseDown
+      getMouseState: () => this.state.dialogMouseDown,
+      modalDialogFocus: () => {
+        let activeElementInDialog;
+
+        if (this.modalDialogRef) {
+          const activeElement = (0, _utils.getActiveElement)();
+          activeElementInDialog = this.modalDialogRef.current.contains(activeElement);
+        }
+
+        if (!activeElementInDialog) {
+          this.modalDialogRef && this.modalDialogRef.current.focus();
+        }
+      },
+      modalDialogBlur: () => {
+        this.modalDialogRef && this.modalDialogRef.current.blur();
+      },
+      prevFocusElementReFocus: () => {
+        const {
+          prevFocusElement
+        } = this.state;
+        const focus = (0, _get2.default)(prevFocusElement, 'focus');
+        (0, _isFunction2.default)(focus) && prevFocusElement.focus();
+      }
     });
   }
 
   componentDidMount() {
     this.foundation.handleKeyDownEventListenerMount();
+    this.foundation.modalDialogFocus();
   }
 
   componentWillUnmount() {
@@ -304,7 +346,7 @@ class ModalContent extends _baseComponent.default {
     const elem = /*#__PURE__*/_react.default.createElement("div", {
       className: classList
     }, this.getMaskElement(), /*#__PURE__*/_react.default.createElement("div", {
-      role: "modal",
+      role: "none",
       tabIndex: -1,
       className: "".concat(_constants.cssClasses.DIALOG, "-wrap"),
       onClick: maskClosable ? this.onMaskClick : null,

package/lib/cjs/navigation/Item.d.ts

@@ -1,7 +1,7 @@
 import BaseComponent, { BaseProps } from '../_base/baseComponent';
 import React from 'react';
 import PropTypes from 'prop-types';
-import { ItemProps, SelectedItemProps, ItemAdapter } from '@douyinfe/semi-foundation/lib/cjs/navigation/itemFoundation';
+import ItemFoundation, { ItemProps, SelectedItemProps, ItemAdapter } from '@douyinfe/semi-foundation/lib/cjs/navigation/itemFoundation';
 export interface NavItemProps extends ItemProps, BaseProps {
     children?: React.ReactNode;
     disabled?: boolean;
@@ -59,12 +59,14 @@ export default class NavItem extends BaseComponent<NavItemProps, NavItemState> {
         onMouseLeave: (...args: any[]) => void;
         disabled: boolean;
     };
+    foundation: ItemFoundation;
     constructor(props: NavItemProps);
     _invokeContextFunc(funcName: string, ...args: any[]): any;
     get adapter(): ItemAdapter<NavItemProps, NavItemState>;
     renderIcon(icon: React.ReactNode, pos: string, isToggleIcon?: boolean): JSX.Element;
     setItemRef: (ref: HTMLLIElement) => void;
     wrapTooltip: (node: React.ReactNode) => JSX.Element;
-    handleClick: (e: React.MouseEvent) => any;
+    handleClick: (e: React.MouseEvent) => void;
+    handleKeyPress: (e: React.KeyboardEvent) => void;
     render(): {} | React.ReactElement<any, string | React.JSXElementConstructor<any>>;
 }