rsuite 5.0.2 → 5.2.1

package/cjs/AutoComplete/AutoComplete.d.ts

@@ -18,9 +18,9 @@ export interface AutoCompleteProps<T = ValueType> extends WithAsProps, FormContr
     /** Called when a option is selected */
     onSelect?: (value: any, item: ItemDataType, event: React.SyntheticEvent) => void;
     /** Called on focus */
-    onFocus?: (event: React.SyntheticEvent<HTMLElement>) => void;
+    onFocus?: React.FocusEventHandler;
     /** Called on blur */
-    onBlur?: (event: React.SyntheticEvent<HTMLElement>) => void;
+    onBlur?: React.FocusEventHandler;
     /** Called on menu focus */
     onMenuFocus?: (focusItemValue: any, event: React.KeyboardEvent) => void;
     /** The callback triggered by keyboard events. */

package/cjs/AutoComplete/AutoComplete.js

@@ -74,7 +74,8 @@ var AutoComplete = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
 
   var items = (datalist === null || datalist === void 0 ? void 0 : datalist.filter((0, _utils3.shouldDisplay)(filterBy, value))) || [];
   var hasItems = items.length > 0;
-  var overlayRef = (0, _react.useRef)(null); // Used to hover the focuse item  when trigger `onKeydown`
+  var overlayRef = (0, _react.useRef)(null);
+  var isMounted = (0, _utils.useIsMounted)(); // Used to hover the focuse item  when trigger `onKeydown`
 
   var _useFocusItemValue = (0, _Picker.useFocusItemValue)(value, {
     data: datalist,
@@ -134,9 +135,11 @@ var AutoComplete = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
   };
 
   var handleClose = (0, _react.useCallback)(function () {
-    setFocus(false);
-    onClose === null || onClose === void 0 ? void 0 : onClose();
-  }, [onClose]);
+    if (isMounted()) {
+      setFocus(false);
+      onClose === null || onClose === void 0 ? void 0 : onClose();
+    }
+  }, [isMounted, onClose]);
   var handleOpen = (0, _react.useCallback)(function () {
     setFocus(true);
     onOpen === null || onOpen === void 0 ? void 0 : onOpen();

package/cjs/Calendar/TimeDropdown.js

@@ -17,7 +17,9 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _domLib = require("dom-lib");
+var _getPosition2 = _interopRequireDefault(require("dom-lib/getPosition"));
+
+var _scrollTop = _interopRequireDefault(require("dom-lib/scrollTop"));
 
 var _partial = _interopRequireDefault(require("lodash/partial"));
 
@@ -99,10 +101,10 @@ var scrollTo = function scrollTo(time, row) {
     var node = container === null || container === void 0 ? void 0 : container.querySelector("[data-key=\"" + type + "-" + value + "\"]");
 
     if (node && container) {
-      var _getPosition = (0, _domLib.getPosition)(node, container),
+      var _getPosition = (0, _getPosition2.default)(node, container),
           top = _getPosition.top;
 
-      (0, _utils.scrollTopAnimation)(container, top, (0, _domLib.scrollTop)(container) !== 0);
+      (0, _utils.scrollTopAnimation)(container, top, (0, _scrollTop.default)(container) !== 0);
     }
   });
 };

package/cjs/Cascader/Cascader.d.ts

@@ -25,7 +25,7 @@ export interface CascaderProps<T = ValueType> extends FormControlPickerProps<T,
     /** Called when clean */
     onClean?: (event: React.SyntheticEvent) => void;
     /** Called when searching */
-    onSearch?: (searchKeyword: string, event: React.SyntheticEvent<HTMLElement>) => void;
+    onSearch?: (searchKeyword: string, event: React.SyntheticEvent) => void;
     /** Asynchronously load the children of the tree node. */
     getChildren?: (node: ItemDataType) => ItemDataType[] | Promise<ItemDataType[]>;
 }

package/cjs/Cascader/Cascader.js

@@ -474,6 +474,7 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     classPrefix: classPrefix,
     hasValue: hasValue,
     name: 'cascader',
+    appearance: appearance,
     cleanable: cleanable
   })),
       classes = _usePickerClassName[0],

package/cjs/Cascader/DropdownMenu.js

@@ -17,8 +17,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _Spinner = _interopRequireDefault(require("@rsuite/icons/legacy/Spinner"));
 
-var _DOMHelper = _interopRequireDefault(require("../DOMHelper"));
-
 var _isUndefined = _interopRequireDefault(require("lodash/isUndefined"));
 
 var _isNil = _interopRequireDefault(require("lodash/isNil"));
@@ -31,6 +29,10 @@ var _AngleLeft = _interopRequireDefault(require("@rsuite/icons/legacy/AngleLeft"
 
 var _AngleRight = _interopRequireDefault(require("@rsuite/icons/legacy/AngleRight"));
 
+var _getPosition = _interopRequireDefault(require("dom-lib/getPosition"));
+
+var _scrollTop = _interopRequireDefault(require("dom-lib/scrollTop"));
+
 var emptyArray = [];
 
 var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
@@ -83,10 +85,9 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       }
 
       if (activeItem) {
-        var position = _DOMHelper.default.getPosition(activeItem, column); // Let the active option scroll into view.
-
+        var position = (0, _getPosition.default)(activeItem, column); // Let the active option scroll into view.
 
-        _DOMHelper.default.scrollTop(column, position.top);
+        (0, _scrollTop.default)(column, position.top);
       }
     });
   }, [prefix]);

package/cjs/CheckTreePicker/CheckTreeNode.d.ts

@@ -20,7 +20,7 @@ export interface CheckTreeNodeProps extends WithAsProps {
     uncheckable?: boolean;
     allUncheckable?: boolean;
     onExpand?: (nodeData: any) => void;
-    onSelect?: (nodeData: any, event: React.SyntheticEvent<any>) => void;
+    onSelect?: (nodeData: any, event: React.SyntheticEvent) => void;
     onRenderTreeIcon?: (nodeData: any, expandIcon?: React.ReactNode) => React.ReactNode;
     onRenderTreeNode?: (nodeData: any) => React.ReactNode;
 }

package/cjs/CheckTreePicker/CheckTreePicker.d.ts

@@ -14,7 +14,7 @@ export interface CheckTreePickerProps<T = ValueType> extends TreeBaseProps<T, It
     /** Custom render selected items */
     renderValue?: (value: any[], selectedItems: any[], selectedElement: React.ReactNode) => React.ReactNode;
     /** Called when scrolling */
-    onScroll?: (event: React.SyntheticEvent<HTMLElement>) => void;
+    onScroll?: (event: React.SyntheticEvent) => void;
 }
 declare const CheckTreePicker: PickerComponent<CheckTreePickerProps>;
 export default CheckTreePicker;

package/cjs/CheckTreePicker/utils.d.ts

@@ -19,7 +19,7 @@ export interface TreeNodesType {
     [key: string]: TreeNodeType;
 }
 export declare function isEveryChildChecked(nodes: TreeNodesType, parent: TreeNodeType): boolean;
-export declare function isSomeChildChecked(nodes: TreeNodesType, parent: TreeNodeType): boolean;
+export declare function isSomeChildChecked(nodes: TreeNodesType, parent: TreeNodeType, childrenKey: string): boolean;
 export declare function isSomeNodeHasChildren(data: any[], childrenKey: string): boolean;
 /**
  * is all siblings nodes is uncheckable

package/cjs/CheckTreePicker/utils.js

@@ -41,18 +41,19 @@ function isEveryChildChecked(nodes, parent) {
   });
 }
 
-function isSomeChildChecked(nodes, parent) {
+function isSomeChildChecked(nodes, parent, childrenKey) {
   if ((0, _isNil2.default)(nodes[parent.refKey])) {
     return false;
   }
 
   var children = (0, _treeUtils.getChildrenByFlattenNodes)(nodes, parent);
+  return children.some(function (child) {
+    var _child$childrenKey;
 
-  if (!children.length) {
-    return nodes[parent.refKey].check;
-  }
+    if ((child === null || child === void 0 ? void 0 : (_child$childrenKey = child[childrenKey]) === null || _child$childrenKey === void 0 ? void 0 : _child$childrenKey.length) > 0) {
+      return isSomeChildChecked(nodes, child, childrenKey);
+    }
 
-  return children.some(function (child) {
     return nodes[child.refKey].check;
   });
 }
@@ -215,7 +216,7 @@ function getNodeCheckState(_ref) {
     return _utils.CHECK_STATE.CHECK;
   }
 
-  if (isSomeChildChecked(nodes, node)) {
+  if (isSomeChildChecked(nodes, node, childrenKey)) {
     nodes[node.refKey].checkAll = false;
     return _utils.CHECK_STATE.INDETERMINATE;
   }

package/cjs/Checkbox/Checkbox.d.ts

@@ -31,11 +31,11 @@ export interface CheckboxProps<V = ValueType> extends WithAsProps {
     /** Used for the name of the form */
     name?: string;
     /** Called when the user attempts to change the checked state. */
-    onChange?: (value: V, checked: boolean, event: React.SyntheticEvent<HTMLInputElement>) => void;
+    onChange?: (value: V, checked: boolean, event: React.ChangeEvent<HTMLInputElement>) => void;
     /** Called when the checkbox or label is clicked. */
-    onClick?: (event: React.SyntheticEvent<HTMLElement>) => void;
+    onClick?: (event: React.SyntheticEvent) => void;
     /** Called when the checkbox is clicked. */
-    onCheckboxClick?: (event: React.SyntheticEvent<HTMLElement>) => void;
+    onCheckboxClick?: (event: React.SyntheticEvent) => void;
 }
 declare const Checkbox: RsRefForwardingComponent<'div', CheckboxProps>;
 export default Checkbox;

package/cjs/CheckboxGroup/CheckboxGroupContext.d.ts

@@ -8,6 +8,6 @@ export interface CheckboxGroupContextValue {
     disabled?: boolean;
     readOnly?: boolean;
     plaintext?: boolean;
-    onChange?: (value: any, checked: boolean, event: React.SyntheticEvent<HTMLInputElement>) => void;
+    onChange?: (value: any, checked: boolean, event: React.ChangeEvent<HTMLInputElement>) => void;
 }
 export declare const CheckboxGroupContext: React.Context<CheckboxGroupContextValue>;

package/cjs/DOMHelper/index.d.ts

@@ -2,34 +2,17 @@ import * as helpers from 'dom-lib';
 export * from 'dom-lib';
 declare const DOMHelper: {
     isElement: (node: HTMLElement) => boolean;
-    animation: typeof helpers.animation;
-    transition: () => {
-        end: any;
-        backfaceVisibility: string;
-        transform: string;
-        property: string;
-        timing: string;
-        delay: string;
-        duration: string;
-    };
-    translateDOMPositionXY: (style: CSSStyleDeclaration, x?: number, y?: number) => CSSStyleDeclaration;
-    getVendorPrefixedName: typeof helpers.getVendorPrefixedName;
-    BrowserSupportCore: {
-        hasCSSAnimations: () => boolean;
-        hasCSSTransforms: () => boolean;
-        hasCSS3DTransforms: () => boolean;
-        hasCSSTransitions: () => boolean;
-    };
-    DOMMouseMoveTracker: typeof helpers.DOMMouseMoveTracker;
+    on: typeof helpers.on;
+    off: typeof helpers.off;
     WheelHandler: typeof helpers.WheelHandler;
+    DOMMouseMoveTracker: typeof helpers.DOMMouseMoveTracker;
     addClass: (target: Element, className: string) => Element;
-    hasClass: (target: Element, className: string) => boolean;
     removeClass: (target: Element, className: string) => Element;
+    hasClass: (target: Element, className: string) => boolean;
     toggleClass: (target: Element, className: string) => Element;
-    getStyle: (node: Element, property?: string) => string | CSSStyleDeclaration;
-    removeStyle: (node: Element, keys: string | string[]) => void;
-    addStyle: (node: Element, property: string | import("dom-lib/lib/style/addStyle").CSSProperty, value?: string | number) => void;
-    getComputedStyle: (node: Element) => CSSStyleDeclaration;
+    cancelAnimationFramePolyfill: typeof clearTimeout;
+    requestAnimationFramePolyfill: typeof requestAnimationFrame;
+    getAnimationEnd: typeof helpers.getAnimationEnd;
     ownerDocument: (node: Element) => Document;
     ownerWindow: (componentOrElement: Element) => Window;
     getWindow: (node: any) => Window;
@@ -46,18 +29,20 @@ declare const DOMHelper: {
     } | DOMRect;
     nodeName: (node: Element) => string;
     getOffsetParent: (node: Element) => Element;
-    getPosition: (node: Element, offsetParent?: Element) => DOMRect | {
+    getPosition: (node: Element, offsetParent?: Element, calcMargin?: boolean) => DOMRect | {
         top: number;
         left: number;
         height: number;
         width: number;
     };
     isOverflowing: (container: Element) => boolean;
-    activeElement: (doc?: Document) => Element;
     getScrollbarSize: (recalc?: boolean) => number | void;
     getHeight: (node: Element | Window, client?: Element) => number;
     getWidth: (node: Element | Window, client?: Element) => number;
-    on: typeof helpers.on;
-    off: typeof helpers.off;
+    isFocusable: typeof helpers.isFocusable;
+    getStyle: (node: Element, property?: string) => string | CSSStyleDeclaration;
+    removeStyle: (node: Element, keys: string | string[]) => void;
+    addStyle: (node: Element, property: string | import("dom-lib/esm/addStyle").CSSProperty, value?: string | number) => void;
+    translateDOMPositionXY: (style: CSSStyleDeclaration, x?: number, y?: number) => CSSStyleDeclaration;
 };
 export default DOMHelper;

package/cjs/DOMHelper/index.js

@@ -18,10 +18,11 @@ Object.keys(helpers).forEach(function (key) {
   if (key in exports && exports[key] === helpers[key]) return;
   exports[key] = helpers[key];
 });
+
+var _isElement = _interopRequireDefault(require("./isElement"));
+
 var DOMHelper = (0, _extends2.default)({}, helpers, {
-  isElement: function isElement(node) {
-    return (node === null || node === void 0 ? void 0 : node.nodeType) && typeof (node === null || node === void 0 ? void 0 : node.nodeName) === 'string';
-  }
+  isElement: _isElement.default
 });
 var _default = DOMHelper;
 exports.default = _default;

package/cjs/DOMHelper/isElement.d.ts

@@ -0,0 +1,2 @@
+declare const isElement: (node: HTMLElement) => boolean;
+export default isElement;

package/cjs/DOMHelper/isElement.js

@@ -0,0 +1,11 @@
+"use strict";
+
+exports.__esModule = true;
+exports.default = void 0;
+
+var isElement = function isElement(node) {
+  return (node === null || node === void 0 ? void 0 : node.nodeType) === 1 && typeof (node === null || node === void 0 ? void 0 : node.nodeName) === 'string';
+};
+
+var _default = isElement;
+exports.default = _default;

package/cjs/DatePicker/DatePicker.d.ts

@@ -41,19 +41,19 @@ export interface DatePickerProps extends PickerBaseProps<DatePickerLocale>, Form
     /** Hidden seconds */
     hideSeconds?: (second: number, date: Date) => boolean;
     /** Called when the calendar panel date changes */
-    onChangeCalendarDate?: (date: Date, event?: React.SyntheticEvent<HTMLElement>) => void;
+    onChangeCalendarDate?: (date: Date, event?: React.SyntheticEvent) => void;
     /** Called when opening the month view */
     onToggleMonthDropdown?: (toggle: boolean) => void;
     /** Called when opening the time view */
     onToggleTimeDropdown?: (toggle: boolean) => void;
     /** Called when the option is selected */
-    onSelect?: (date: Date, event?: React.SyntheticEvent<HTMLElement>) => void;
+    onSelect?: (date: Date, event?: React.SyntheticEvent) => void;
     /** Called after the prev month */
     onPrevMonth?: (date: Date) => void;
     /** Called after the next month */
     onNextMonth?: (date: Date) => void;
     /** Called after clicking the OK button */
-    onOk?: (date: Date, event: React.SyntheticEvent<HTMLElement>) => void;
+    onOk?: (date: Date, event: React.SyntheticEvent) => void;
     /** Called when clean */
     onClean?: (event: React.MouseEvent) => void;
     /** Custom render value */

package/cjs/DatePicker/DatePicker.js

@@ -328,7 +328,7 @@ var DatePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
    * The callback after the enter key is triggered on the input
    */
 
-  var handleInputBlur = (0, _react.useCallback)(function (event) {
+  var handleInputPressEnd = (0, _react.useCallback)(function (event) {
     if (inputState === 'Typing') {
       updateValue(event, calendarDate);
     }
@@ -417,6 +417,7 @@ var DatePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _usePickerClassName = (0, _Picker.usePickerClassName)((0, _extends2.default)({}, props, {
     classPrefix: classPrefix,
     name: 'date',
+    appearance: appearance,
     hasValue: hasValue,
     cleanable: cleanable
   })),
@@ -459,7 +460,8 @@ var DatePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     inputPlaceholder: typeof placeholder === 'string' && placeholder ? placeholder : formatStr,
     inputMask: _utils.DateUtils.getDateMask(formatStr),
     onInputChange: handleInputChange,
-    onInputBlur: handleInputBlur,
+    onInputBlur: handleInputPressEnd,
+    onInputPressEnter: handleInputPressEnd,
     onKeyDown: onPickerKeyDown,
     onClean: (0, _utils.createChainedFunction)(handleClean, onClean),
     cleanable: cleanable && !disabled,

package/cjs/DateRangePicker/Calendar.d.ts

@@ -16,7 +16,7 @@ export interface CalendarProps extends WithAsProps, Omit<CalendarCoreProps, Omit
     onChangeCalendarDate?: (index: number, date: Date) => void;
     onChangeCalendarTime?: (index: number, date: Date) => void;
     onMouseMove?: (date: Date) => void;
-    onSelect?: (date: Date, event?: React.SyntheticEvent<any>) => void;
+    onSelect?: (date: Date, event?: React.SyntheticEvent) => void;
     showOneCalendar?: boolean;
     showWeekNumbers?: boolean;
     value?: ValueType;

package/cjs/DateRangePicker/DateRangePicker.d.ts

@@ -26,9 +26,9 @@ export interface DateRangePickerProps extends PickerBaseProps, FormControlBasePr
     /** Disabled date */
     disabledDate?: DisabledDateFunction;
     /** Called when the option is selected */
-    onSelect?: (date: Date, event?: React.SyntheticEvent<HTMLElement>) => void;
+    onSelect?: (date: Date, event?: React.SyntheticEvent) => void;
     /** Called after clicking the OK button */
-    onOk?: (date: ValueType, event: React.SyntheticEvent<HTMLElement>) => void;
+    onOk?: (date: ValueType, event: React.SyntheticEvent) => void;
     /** Called when clean */
     onClean?: (event: React.MouseEvent) => void;
     /** Custom render value */

package/cjs/DateRangePicker/DateRangePicker.js

@@ -426,7 +426,7 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
    * The callback after the enter key is triggered on the input
    */
 
-  var handleInputBlur = (0, _react.useCallback)(function (event) {
+  var handleInputPressEnd = (0, _react.useCallback)(function (event) {
     if (inputState === 'Typing') {
       handleValueUpdate(event, selectValue);
     }
@@ -574,6 +574,7 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
   var _usePickerClassName = (0, _Picker.usePickerClassName)((0, _extends2.default)({}, props, {
     classPrefix: classPrefix,
     name: 'daterange',
+    appearance: appearance,
     hasValue: hasValue,
     cleanable: cleanable
   })),
@@ -601,7 +602,8 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     inputValue: value ? getDisplayString(value, true) : '',
     inputPlaceholder: typeof placeholder === 'string' && placeholder ? placeholder : rangeFormatStr,
     onInputChange: handleInputChange,
-    onInputBlur: handleInputBlur,
+    onInputBlur: handleInputPressEnd,
+    onInputPressEnter: handleInputPressEnd,
     onKeyDown: onPickerKeyDown,
     onClean: (0, _utils.createChainedFunction)(handleClean, onClean),
     cleanable: cleanable && !disabled,

package/cjs/Disclosure/Disclosure.d.ts

@@ -12,7 +12,7 @@ export interface DisclosureProps {
     defaultOpen?: boolean;
     hideOnClickOutside?: boolean;
     /** Callback when disclosure button is being activated to update the open state */
-    onToggle?: (open: boolean, event: React.SyntheticEvent<HTMLElement>) => void;
+    onToggle?: (open: boolean, event: React.SyntheticEvent) => void;
 }
 declare function Disclosure(props: DisclosureProps): JSX.Element;
 declare namespace Disclosure {

package/cjs/Disclosure/DisclosureContext.d.ts

@@ -13,7 +13,7 @@ export declare type DisclosureContextProps = [
     DisclosureState,
     Dispatch<DisclosureAction>,
     {
-        onToggle: (open: boolean, event?: React.SyntheticEvent<HTMLElement>) => void;
+        onToggle: (open: boolean, event?: React.SyntheticEvent) => void;
     }
 ];
 declare const DisclosureContext: React.Context<DisclosureContextProps>;

package/cjs/Dropdown/DropdownItem.d.ts

@@ -32,7 +32,7 @@ export interface DropdownMenuItemProps<T = any> extends WithAsProps, Omit<React.
      */
     open?: boolean;
     /** Select the callback function for the current option  */
-    onSelect?: (eventKey: T, event: React.SyntheticEvent<HTMLElement>) => void;
+    onSelect?: (eventKey: T, event: React.SyntheticEvent) => void;
 }
 /**
  * The <Dropdown.Item> API

package/cjs/Dropdown/DropdownItem.js

@@ -41,6 +41,8 @@ var _useInternalId = _interopRequireDefault(require("../utils/useInternalId"));
 
 var _DropdownState = require("./DropdownState");
 
+var _useRenderDropdownItem = require("./useRenderDropdownItem");
+
 /**
  * The <Dropdown.Item> API
  * When used inside <Sidenav>, renders a <TreeviewItem>
@@ -54,7 +56,13 @@ var DropdownItem = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       eventKey = props.eventKey,
       onSelect = props.onSelect,
       icon = props.icon,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["classPrefix", "className", "active", "eventKey", "onSelect", "icon"]);
+      _props$as = props.as,
+      Component = _props$as === void 0 ? 'li' : _props$as,
+      divider = props.divider,
+      panel = props.panel,
+      children = props.children,
+      disabled = props.disabled,
+      restProps = (0, _objectWithoutPropertiesLoose2.default)(props, ["classPrefix", "className", "active", "eventKey", "onSelect", "icon", "as", "divider", "panel", "children", "disabled"]);
   var internalId = (0, _useInternalId.default)('DropdownItem');
   var nav = (0, _react.useContext)(_NavContext.default);
   var dropdown = (0, _react.useContext)(_DropdownContext.default);
@@ -106,6 +114,7 @@ var DropdownItem = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       };
     }
   }, [internalId, selected, dispatch]);
+  var renderDropdownItem = (0, _useRenderDropdownItem.useRenderDropdownItem)(Component);
 
   if (sidenav !== null && sidenav !== void 0 && sidenav.expanded) {
     return /*#__PURE__*/_react.default.createElement(_SidenavDropdownItem.default, (0, _extends2.default)({
@@ -113,28 +122,19 @@ var DropdownItem = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     }, props));
   }
 
-  var _rest$as = rest.as,
-      Component = _rest$as === void 0 ? 'li' : _rest$as,
-      divider = rest.divider,
-      panel = rest.panel,
-      children = rest.children,
-      disabled = rest.disabled,
-      restProps = (0, _objectWithoutPropertiesLoose2.default)(rest, ["as", "divider", "panel", "children", "disabled"]);
-
   if (divider) {
-    return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
+    return renderDropdownItem((0, _extends2.default)({
       ref: ref,
-      role: "separator",
+      role: 'separator',
       className: merge(prefix('divider'), className)
     }, restProps));
   }
 
   if (panel) {
-    return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
+    return renderDropdownItem((0, _extends2.default)({
       ref: ref,
-      role: "none presentation",
       className: merge(prefix('panel'), className)
-    }, restProps), children);
+    }, restProps));
   }
 
   if (navbar) {
@@ -158,6 +158,7 @@ var DropdownItem = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       className: classes,
       "aria-current": selected || undefined
     }, dataAttributes, restProps, {
+      as: Component,
       onClick: (0, _utils.createChainedFunction)(handleClickNavbarDropdownItem, restProps.onClick)
     }), icon && /*#__PURE__*/_react.default.cloneElement(icon, {
       className: prefix('menu-icon')
@@ -188,12 +189,14 @@ var DropdownItem = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       dataAttributes['data-event-key-type'] = typeof eventKey;
     }
 
-    return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
+    return renderDropdownItem((0, _extends2.default)({
       ref: (0, _utils.mergeRefs)(ref, menuitemRef),
       className: classes
-    }, menuitem, dataAttributes, restProps), icon && /*#__PURE__*/_react.default.cloneElement(icon, {
-      className: prefix('menu-icon')
-    }), children);
+    }, menuitem, dataAttributes, restProps, {
+      children: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, icon && /*#__PURE__*/_react.default.cloneElement(icon, {
+        className: prefix('menu-icon')
+      }), children)
+    }));
   });
 });
 

package/cjs/Dropdown/DropdownMenu.d.ts

@@ -19,8 +19,8 @@ export interface DropdownMenuProps<T = string> extends StandardProps {
     disabled?: boolean;
     activeKey?: T;
     trigger?: 'hover' | 'click';
-    onSelect?: (eventKey: T, event: React.SyntheticEvent<Element>) => void;
-    onToggle?: (eventKey: T, event: React.SyntheticEvent<Element>) => void;
+    onSelect?: (eventKey: T, event: React.SyntheticEvent) => void;
+    onToggle?: (eventKey: T, event: React.SyntheticEvent) => void;
 }
 /**
  * The <Dropdown.Menu> API

package/cjs/Dropdown/useRenderDropdownItem.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare function useRenderDropdownItem(Component: React.ElementType): (props: any, OverrideComponent?: React.ElementType) => JSX.Element;

package/cjs/Dropdown/useRenderDropdownItem.js

@@ -0,0 +1,26 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+exports.__esModule = true;
+exports.useRenderDropdownItem = useRenderDropdownItem;
+
+var _react = _interopRequireWildcard(require("react"));
+
+function useRenderDropdownItem(Component) {
+  return (0, _react.useCallback)(function (props, OverrideComponent) {
+    if (Component === 'li') {
+      if (OverrideComponent) {
+        return /*#__PURE__*/_react.default.createElement("li", {
+          role: "none presentation"
+        }, /*#__PURE__*/_react.default.createElement(OverrideComponent, props));
+      }
+
+      return /*#__PURE__*/_react.default.createElement(Component, props);
+    }
+
+    return /*#__PURE__*/_react.default.createElement("li", {
+      role: "none presentation"
+    }, /*#__PURE__*/_react.default.createElement(Component, props));
+  }, [Component]);
+}

package/cjs/Form/Form.d.ts

@@ -33,7 +33,7 @@ export interface FormProps<T = Record<string, any>, errorMsgType = any, E = {
     /** The error message comes from context */
     errorFromContext?: boolean;
     /** Callback fired when data changing */
-    onChange?: (formValue: T, event: React.SyntheticEvent<HTMLElement>) => void;
+    onChange?: (formValue: T, event: React.SyntheticEvent) => void;
     /** Callback fired when error checking */
     onError?: (formError: E) => void;
     /** Callback fired when data cheking */

package/cjs/FormControl/FormControl.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
-import { TypeAttributes, FormControlBaseProps, WithAsProps, RsRefForwardingComponent } from '../@types/common';
+import Input from '../Input';
+import { TypeAttributes, FormControlBaseProps, WithAsProps } from '../@types/common';
 /**
  * Props that FormControl passes to its accepter
  */
@@ -12,7 +13,7 @@ export interface FormControlProps<P = any, ValueType = any> extends WithAsProps,
     /** Value */
     value?: ValueType;
     /** Callback fired when data changing */
-    onChange?(value: ValueType, event: React.SyntheticEvent<HTMLElement>): void;
+    onChange?(value: ValueType, event: React.SyntheticEvent): void;
     /** The data validation trigger type, and it wiill overrides the setting on <Form> */
     checkTrigger?: TypeAttributes.CheckTrigger;
     /** Show error messages */
@@ -28,5 +29,10 @@ export interface FormControlProps<P = any, ValueType = any> extends WithAsProps,
     /** Asynchronous check value */
     checkAsync?: boolean;
 }
-declare const FormControl: RsRefForwardingComponent<'div', FormControlProps>;
+interface FormControlComponent extends React.FC<FormControlProps> {
+    <Accepter extends React.ElementType = typeof Input>(props: FormControlProps & {
+        accepter?: Accepter;
+    } & React.ComponentPropsWithRef<Accepter>): React.ReactElement;
+}
+declare const FormControl: FormControlComponent;
 export default FormControl;

package/cjs/FormControl/FormControl.js

@@ -138,14 +138,18 @@ var FormControl = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     }
   }
 
-  var ariaDescribedby = controlId ? controlId + "-" + (messageNode ? 'error-message' : 'help-text') : null;
+  var ariaDescribedby = controlId ? controlId + "-help-text" : null;
+  var fieldHasError = Boolean(messageNode);
+  var ariaErrormessage = fieldHasError && controlId ? controlId + "-error-message" : undefined;
   return /*#__PURE__*/_react.default.createElement(Component, {
     className: classes,
     ref: ref
   }, /*#__PURE__*/_react.default.createElement(AccepterComponent, (0, _extends3.default)({
     id: controlId,
     "aria-labelledby": controlId ? controlId + "-control-label" : null,
-    "aria-describedby": ariaDescribedby
+    "aria-describedby": ariaDescribedby,
+    "aria-invalid": fieldHasError || undefined,
+    "aria-errormessage": ariaErrormessage
   }, rest, {
     readOnly: readOnly,
     plaintext: plaintext,