rsuite 5.0.1 → 5.2.0

package/esm/@types/common.d.ts

@@ -80,12 +80,18 @@ export interface PickerBaseProps<LocaleType = any> extends WithAsProps, Animatio
     /** Custom render extra footer */
     renderExtraFooter?: () => React.ReactNode;
 }
-export interface FormControlBaseProps<ValueType = any> {
+export interface FormControlBaseProps<ValueType = React.InputHTMLAttributes<HTMLInputElement>['value']> {
+    /** Name of the form field */
+    name?: string;
     /** Initial value */
     defaultValue?: ValueType;
     /** Current value of the component. Creates a controlled component */
     value?: ValueType;
-    /** Called after the value has been changed */
+    /**
+     * Called after the value has been changed
+     * todo Override event as React.ChangeEvent in components where onChange is delegated
+     *      to an underlying <input> element
+     */
     onChange?: (value: ValueType, event: React.SyntheticEvent) => void;
     /** Set the component to be disabled and cannot be entered */
     disabled?: boolean;

package/esm/Affix/Affix.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
-import { getOffset } from 'dom-lib';
+import getOffset from 'dom-lib/getOffset';
 import { mergeRefs, useClassNames, useElementResize, useEventListener } from '../utils';
 
 /**

package/esm/Animation/Collapse.js

@@ -2,7 +2,8 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
-import { getStyle, addStyle } from 'dom-lib';
+import getStyle from 'dom-lib/getStyle';
+import addStyle from 'dom-lib/addStyle';
 import get from 'lodash/get';
 import capitalize from 'lodash/capitalize';
 import Transition, { transitionPropTypes } from './Transition';

package/esm/Animation/Transition.js

@@ -3,7 +3,8 @@ import _inheritsLoose from "@babel/runtime/helpers/esm/inheritsLoose";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import React from 'react';
 import PropTypes from 'prop-types';
-import { on, transition } from 'dom-lib';
+import getTransitionEnd from 'dom-lib/getTransitionEnd';
+import on from 'dom-lib/on';
 import classNames from 'classnames';
 import isFunction from 'lodash/isFunction';
 import omit from 'lodash/omit';
@@ -136,7 +137,7 @@ var Transition = /*#__PURE__*/function (_React$Component) {
       var _this$props = this.props,
           timeout = _this$props.timeout,
           animation = _this$props.animation;
-      this.animationEventListener = on(node, animation ? getAnimationEnd() : transition().end, this.nextCallback);
+      this.animationEventListener = on(node, animation ? getAnimationEnd() : getTransitionEnd(), this.nextCallback);
 
       if (timeout !== null) {
         setTimeout(this.nextCallback, timeout);

package/esm/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/esm/AutoComplete/AutoComplete.js

@@ -4,7 +4,7 @@ import React, { useState, useRef, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import pick from 'lodash/pick';
 import Input from '../Input';
-import { useClassNames, useControlled, PLACEMENT, mergeRefs } from '../utils';
+import { useClassNames, useControlled, PLACEMENT, mergeRefs, useIsMounted } from '../utils';
 import { animationPropTypes } from '../Animation/utils';
 import { PickerToggleTrigger, onMenuKeyDown, DropdownMenu, DropdownMenuItem, PickerOverlay, useFocusItemValue, usePublicMethods, pickTriggerPropKeys } from '../Picker';
 import { transformData, shouldDisplay } from './utils';
@@ -57,7 +57,8 @@ var AutoComplete = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
   var items = (datalist === null || datalist === void 0 ? void 0 : datalist.filter(shouldDisplay(filterBy, value))) || [];
   var hasItems = items.length > 0;
-  var overlayRef = useRef(null); // Used to hover the focuse item  when trigger `onKeydown`
+  var overlayRef = useRef(null);
+  var isMounted = useIsMounted(); // Used to hover the focuse item  when trigger `onKeydown`
 
   var _useFocusItemValue = useFocusItemValue(value, {
     data: datalist,
@@ -117,9 +118,11 @@ var AutoComplete = /*#__PURE__*/React.forwardRef(function (props, ref) {
   };
 
   var handleClose = 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 = useCallback(function () {
     setFocus(true);
     onOpen === null || onOpen === void 0 ? void 0 : onOpen();

package/esm/Calendar/TimeDropdown.js

@@ -2,7 +2,8 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import React, { useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
-import { getPosition, scrollTop } from 'dom-lib';
+import getPosition from 'dom-lib/getPosition';
+import scrollTop from 'dom-lib/scrollTop';
 import partial from 'lodash/partial';
 import camelCase from 'lodash/camelCase';
 import isNumber from 'lodash/isNumber';

package/esm/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/esm/Cascader/Cascader.js

@@ -451,7 +451,9 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _usePickerClassName = usePickerClassName(_extends({}, props, {
     classPrefix: classPrefix,
     hasValue: hasValue,
-    name: 'cascader'
+    name: 'cascader',
+    appearance: appearance,
+    cleanable: cleanable
   })),
       classes = _usePickerClassName[0],
       usedClassNamePropKeys = _usePickerClassName[1]; // TODO: bad api design

package/esm/Cascader/DropdownMenu.js

@@ -3,13 +3,14 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
 import React, { useCallback, useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
 import SpinnerIcon from '@rsuite/icons/legacy/Spinner';
-import helper from '../DOMHelper';
 import isUndefined from 'lodash/isUndefined';
 import isNil from 'lodash/isNil';
 import { shallowEqual, useClassNames, mergeRefs, useCustom } from '../utils';
 import { DropdownMenuItem } from '../Picker';
 import AngleLeftIcon from '@rsuite/icons/legacy/AngleLeft';
 import AngleRightIcon from '@rsuite/icons/legacy/AngleRight';
+import getPosition from 'dom-lib/getPosition';
+import scrollTop from 'dom-lib/scrollTop';
 var emptyArray = [];
 var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _props$as = props.as,
@@ -61,9 +62,9 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
       }
 
       if (activeItem) {
-        var position = helper.getPosition(activeItem, column); // Let the active option scroll into view.
+        var position = getPosition(activeItem, column); // Let the active option scroll into view.
 
-        helper.scrollTop(column, position.top);
+        scrollTop(column, position.top);
       }
     });
   }, [prefix]);

package/esm/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/esm/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/esm/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/esm/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/esm/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/esm/DOMHelper/index.js

@@ -1,11 +1,10 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as helpers from 'dom-lib';
+import isElement from './isElement';
 export * from 'dom-lib';
 
 var DOMHelper = _extends({}, 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
 });
 
 export default DOMHelper;

package/esm/DOMHelper/isElement.d.ts

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

package/esm/DOMHelper/isElement.js

@@ -0,0 +1,5 @@
+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';
+};
+
+export default isElement;

package/esm/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/esm/DatePicker/DatePicker.js

@@ -301,7 +301,7 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
    * The callback after the enter key is triggered on the input
    */
 
-  var handleInputBlur = useCallback(function (event) {
+  var handleInputPressEnd = useCallback(function (event) {
     if (inputState === 'Typing') {
       updateValue(event, calendarDate);
     }
@@ -387,7 +387,9 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _usePickerClassName = usePickerClassName(_extends({}, props, {
     classPrefix: classPrefix,
     name: 'date',
-    hasValue: hasValue
+    appearance: appearance,
+    hasValue: hasValue,
+    cleanable: cleanable
   })),
       classes = _usePickerClassName[0],
       usedClassNamePropKeys = _usePickerClassName[1];
@@ -428,7 +430,8 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     inputPlaceholder: typeof placeholder === 'string' && placeholder ? placeholder : formatStr,
     inputMask: DateUtils.getDateMask(formatStr),
     onInputChange: handleInputChange,
-    onInputBlur: handleInputBlur,
+    onInputBlur: handleInputPressEnd,
+    onInputPressEnter: handleInputPressEnd,
     onKeyDown: onPickerKeyDown,
     onClean: createChainedFunction(handleClean, onClean),
     cleanable: cleanable && !disabled,

package/esm/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/esm/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/esm/DateRangePicker/DateRangePicker.js

@@ -72,7 +72,8 @@ var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
   var _useCustom = useCustom('DateRangePicker', overrideLocale),
       locale = _useCustom.locale,
-      formatDate = _useCustom.formatDate;
+      formatDate = _useCustom.formatDate,
+      parseDate = _useCustom.parseDate;
 
   var rangeFormatStr = "" + formatStr + character + formatStr;
 
@@ -367,13 +368,17 @@ var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var rangeValue = value.split(character); // isMatch('01/11/2020', 'MM/dd/yyyy') ==> true
     // isMatch('2020-11-01', 'MM/dd/yyyy') ==> false
 
-    if (!DateUtils.isMatch(rangeValue[0], formatStr) || !DateUtils.isMatch(rangeValue[1], formatStr)) {
+    if (!DateUtils.isMatch(rangeValue[0], formatStr, {
+      locale: locale.dateLocale
+    }) || !DateUtils.isMatch(rangeValue[1], formatStr, {
+      locale: locale.dateLocale
+    })) {
       setInputState('Error');
       return;
     }
 
-    var startDate = new Date(rangeValue[0]);
-    var endDate = new Date(rangeValue[1]);
+    var startDate = parseDate(rangeValue[0], formatStr);
+    var endDate = parseDate(rangeValue[1], formatStr);
     var selectValue = [startDate, endDate];
 
     if (!DateUtils.isValid(startDate) || !DateUtils.isValid(endDate)) {
@@ -395,7 +400,7 @@ var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
    * The callback after the enter key is triggered on the input
    */
 
-  var handleInputBlur = useCallback(function (event) {
+  var handleInputPressEnd = useCallback(function (event) {
     if (inputState === 'Typing') {
       handleValueUpdate(event, selectValue);
     }
@@ -545,7 +550,9 @@ var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _usePickerClassName = usePickerClassName(_extends({}, props, {
     classPrefix: classPrefix,
     name: 'daterange',
-    hasValue: hasValue
+    appearance: appearance,
+    hasValue: hasValue,
+    cleanable: cleanable
   })),
       classes = _usePickerClassName[0],
       usedClassNamePropKeys = _usePickerClassName[1];
@@ -571,7 +578,8 @@ var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     inputValue: value ? getDisplayString(value, true) : '',
     inputPlaceholder: typeof placeholder === 'string' && placeholder ? placeholder : rangeFormatStr,
     onInputChange: handleInputChange,
-    onInputBlur: handleInputBlur,
+    onInputBlur: handleInputPressEnd,
+    onInputPressEnter: handleInputPressEnd,
     onKeyDown: onPickerKeyDown,
     onClean: createChainedFunction(handleClean, onClean),
     cleanable: cleanable && !disabled,

package/esm/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/esm/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/esm/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/esm/Dropdown/DropdownItem.js

@@ -29,7 +29,13 @@ var DropdownItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
       eventKey = props.eventKey,
       onSelect = props.onSelect,
       icon = props.icon,
-      rest = _objectWithoutPropertiesLoose(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 = _objectWithoutPropertiesLoose(props, ["classPrefix", "className", "active", "eventKey", "onSelect", "icon", "as", "divider", "panel", "children", "disabled"]);
 
   var internalId = useInternalId('DropdownItem');
   var nav = useContext(NavContext);
@@ -82,6 +88,15 @@ var DropdownItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
       };
     }
   }, [internalId, selected, dispatch]);
+  var renderDropdownItem = useCallback(function (ui) {
+    if (Component === 'li') {
+      return ui;
+    }
+
+    return /*#__PURE__*/React.createElement("li", {
+      role: "none presentation"
+    }, ui);
+  }, [Component]);
 
   if (sidenav !== null && sidenav !== void 0 && sidenav.expanded) {
     return /*#__PURE__*/React.createElement(SidenavDropdownItem, _extends({
@@ -89,28 +104,19 @@ var DropdownItem = /*#__PURE__*/React.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 = _objectWithoutPropertiesLoose(rest, ["as", "divider", "panel", "children", "disabled"]);
-
   if (divider) {
-    return /*#__PURE__*/React.createElement(Component, _extends({
+    return renderDropdownItem( /*#__PURE__*/React.createElement(Component, _extends({
       ref: ref,
       role: "separator",
       className: merge(prefix('divider'), className)
-    }, restProps));
+    }, restProps)));
   }
 
   if (panel) {
-    return /*#__PURE__*/React.createElement(Component, _extends({
+    return renderDropdownItem( /*#__PURE__*/React.createElement(Component, _extends({
       ref: ref,
-      role: "none presentation",
       className: merge(prefix('panel'), className)
-    }, restProps), children);
+    }, restProps), children));
   }
 
   if (navbar) {
@@ -134,6 +140,7 @@ var DropdownItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
       className: classes,
       "aria-current": selected || undefined
     }, dataAttributes, restProps, {
+      as: Component,
       onClick: createChainedFunction(handleClickNavbarDropdownItem, restProps.onClick)
     }), icon && /*#__PURE__*/React.cloneElement(icon, {
       className: prefix('menu-icon')
@@ -165,12 +172,12 @@ var DropdownItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
       dataAttributes['data-event-key-type'] = typeof eventKey;
     }
 
-    return /*#__PURE__*/React.createElement(Component, _extends({
+    return renderDropdownItem( /*#__PURE__*/React.createElement(Component, _extends({
       ref: mergeRefs(ref, menuitemRef),
       className: classes
     }, menuitem, dataAttributes, restProps), icon && /*#__PURE__*/React.cloneElement(icon, {
       className: prefix('menu-icon')
-    }), children);
+    }), children));
   });
 });
 DropdownItem.displayName = 'Dropdown.Item';

package/esm/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/esm/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/esm/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/esm/FormControl/FormControl.js

@@ -123,14 +123,18 @@ var FormControl = /*#__PURE__*/React.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.createElement(Component, {
     className: classes,
     ref: ref
   }, /*#__PURE__*/React.createElement(AccepterComponent, _extends({
     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,