rsuite 5.20.0 → 5.22.0

package/cjs/CustomProvider/CustomProvider.js

@@ -5,7 +5,7 @@ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWild
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports.default = exports.CustomConsumer = exports.CustomContext = void 0;
+exports.default = exports.CustomContext = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
@@ -24,9 +24,6 @@ var _utils = require("../utils");
 var CustomContext = /*#__PURE__*/_react.default.createContext({});
 
 exports.CustomContext = CustomContext;
-var Consumer = CustomContext.Consumer,
-    Provider = CustomContext.Provider;
-exports.CustomConsumer = Consumer;
 var themes = ['light', 'dark', 'high-contrast'];
 
 var CustomProvider = function CustomProvider(props) {
@@ -64,7 +61,7 @@ var CustomProvider = function CustomProvider(props) {
       });
     }
   }, [classPrefix, theme]);
-  return /*#__PURE__*/_react.default.createElement(Provider, {
+  return /*#__PURE__*/_react.default.createElement(CustomContext.Provider, {
     value: value
   }, children, /*#__PURE__*/_react.default.createElement(Portal, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "rs-toast-provider"

package/cjs/CustomProvider/index.d.ts

@@ -1,5 +1,5 @@
-import CustomProvider, { CustomContext, CustomConsumer } from './CustomProvider';
+import CustomProvider, { CustomContext } from './CustomProvider';
 import FormattedDate from './FormattedDate';
-export { CustomContext, CustomConsumer, FormattedDate };
+export { CustomContext, FormattedDate };
 export type { CustomProviderProps } from './CustomProvider';
 export default CustomProvider;

package/cjs/CustomProvider/index.js

@@ -10,7 +10,6 @@ exports.default = void 0;
 var _CustomProvider = _interopRequireWildcard(require("./CustomProvider"));
 
 exports.CustomContext = _CustomProvider.CustomContext;
-exports.CustomConsumer = _CustomProvider.CustomConsumer;
 
 var _FormattedDate = _interopRequireDefault(require("./FormattedDate"));
 

package/cjs/DatePicker/DatePicker.js

@@ -31,6 +31,10 @@ var _useCalendarDate2 = _interopRequireDefault(require("../Calendar/useCalendarD
 
 var _Toolbar = _interopRequireDefault(require("./Toolbar"));
 
+var _Stack = _interopRequireDefault(require("../Stack"));
+
+var _PredefinedRanges = _interopRequireDefault(require("./PredefinedRanges"));
+
 var _utils = require("../utils");
 
 var _Picker = require("../Picker");
@@ -365,6 +369,13 @@ var DatePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     onToggleMeridian: handleToggleMeridian
   }));
 
+  var sideRanges = (ranges === null || ranges === void 0 ? void 0 : ranges.filter(function (range) {
+    return (range === null || range === void 0 ? void 0 : range.placement) === 'left';
+  })) || [];
+  var bottomRanges = (ranges === null || ranges === void 0 ? void 0 : ranges.filter(function (range) {
+    return (range === null || range === void 0 ? void 0 : range.placement) === 'bottom' || (range === null || range === void 0 ? void 0 : range.placement) === undefined;
+  })) || [];
+
   var renderDropdownMenu = function renderDropdownMenu(positionProps, speakerRef) {
     var left = positionProps.left,
         top = positionProps.top,
@@ -380,16 +391,27 @@ var DatePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       ref: (0, _utils.mergeRefs)(overlayRef, speakerRef),
       style: styles,
       target: triggerRef
-    }, calendar, /*#__PURE__*/_react.default.createElement(_Toolbar.default, {
+    }, /*#__PURE__*/_react.default.createElement(_Stack.default, {
+      alignItems: "flex-start"
+    }, sideRanges.length > 0 && /*#__PURE__*/_react.default.createElement(_PredefinedRanges.default, {
+      direction: "column",
+      spacing: 0,
+      className: prefix('date-predefined'),
+      ranges: sideRanges,
+      calendarDate: calendarDate,
+      locale: locale,
+      disabledShortcut: disabledToolbarHandle,
+      onClickShortcut: handleShortcutPageDate
+    }), /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, calendar, /*#__PURE__*/_react.default.createElement(_Toolbar.default, {
       locale: locale,
-      ranges: ranges,
+      ranges: bottomRanges,
       calendarDate: calendarDate,
       disabledOkBtn: disabledToolbarHandle,
       disabledShortcut: disabledToolbarHandle,
       onClickShortcut: handleShortcutPageDate,
       onOk: handleOK,
       hideOkBtn: oneTap
-    }));
+    }))));
   };
 
   var hasValue = !!value;

package/cjs/DatePicker/types.d.ts

@@ -4,6 +4,7 @@ export interface RangeType<T> {
     label: ReactNode;
     closeOverlay?: boolean;
     value: T | ((value: T) => T);
+    placement?: 'bottom' | 'left';
 }
 export interface InnerRange<T> extends Omit<RangeType<T>, 'value'> {
     value: T;

package/cjs/DateRangePicker/DateRangePicker.js

@@ -162,27 +162,34 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
 
   var selectRangeValueRef = (0, _react.useRef)(null);
   /**
-   * Call this function to update the calendar panel rendering benchmark value.
-   * If params `value` is not passed, it defaults to [new Date(), addMonth(new Date(), 1)].
+   * Get the time on the second calendar as the end of the date range.
    */
 
-  var updateCalendarDateRange = (0, _react.useCallback)(function (value, calendarKey) {
-    var nextValue = value;
-    var shouldRenderTime = _utils.DateUtils.shouldRenderTime,
-        getHours = _utils.DateUtils.getHours,
+  var getCalendarEndDatetime = (0, _react.useCallback)(function (date) {
+    var getHours = _utils.DateUtils.getHours,
         getMinutes = _utils.DateUtils.getMinutes,
         getSeconds = _utils.DateUtils.getSeconds,
         set = _utils.DateUtils.set;
+    var calendarEndDate = (calendarDate === null || calendarDate === void 0 ? void 0 : calendarDate[1]) || (defaultCalendarValue === null || defaultCalendarValue === void 0 ? void 0 : defaultCalendarValue[1]);
+    return set(date, {
+      hours: getHours(calendarEndDate),
+      minutes: getMinutes(calendarEndDate),
+      seconds: getSeconds(calendarEndDate)
+    });
+  }, [calendarDate, defaultCalendarValue]);
+  /**
+   * Call this function to update the calendar panel rendering benchmark value.
+   * If params `value` is not passed, it defaults to [new Date(), addMonth(new Date(), 1)].
+   */
 
-    if (shouldRenderTime(formatStr) && calendarKey === undefined && (value === null || value === void 0 ? void 0 : value.length) === 1 && (defaultCalendarValue === null || defaultCalendarValue === void 0 ? void 0 : defaultCalendarValue.length) === 2) {
-      var calendarEndDate = (calendarDate === null || calendarDate === void 0 ? void 0 : calendarDate[1]) || defaultCalendarValue[1];
-      var _startDate = value[0]; // When updating the start date, the time of the end date should keep the time set by the user by default.
+  var updateCalendarDateRange = (0, _react.useCallback)(function (selectedDate, calendarKey) {
+    var nextValue = selectedDate;
+    var shouldRenderTime = _utils.DateUtils.shouldRenderTime;
 
-      var _endDate = set((0, _dateUtils.addMonths)(_startDate, 1), {
-        hours: getHours(calendarEndDate),
-        minutes: getMinutes(calendarEndDate),
-        seconds: getSeconds(calendarEndDate)
-      });
+    if (shouldRenderTime(formatStr) && calendarKey === undefined && selectedDate !== null && selectedDate !== void 0 && selectedDate.length) {
+      var _startDate = selectedDate[0];
+
+      var _endDate = getCalendarEndDatetime((0, _dateUtils.addMonths)(_startDate, 1));
 
       nextValue = [_startDate, _endDate];
     }
@@ -191,7 +198,7 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
       value: nextValue,
       calendarKey: calendarKey
     }));
-  }, [calendarDate, defaultCalendarValue, formatStr]); // if valueProp changed then update selectValue/hoverValue
+  }, [getCalendarEndDatetime, formatStr]); // if valueProp changed then update selectValue/hoverValue
 
   (0, _react.useEffect)(function () {
     setSelectedDates(valueProp !== null && valueProp !== void 0 ? valueProp : []);
@@ -355,19 +362,31 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
         nextSelectDates = hoverRangeValue;
         selectRangeValueRef.current = hoverRangeValue;
       }
-    } // If user have completed the selection, then sort
+    }
+
+    var shouldRenderTime = _utils.DateUtils.shouldRenderTime,
+        isAfter = _utils.DateUtils.isAfter;
+
+    if (nextSelectDates.length === 2) {
+      // If user have completed the selection, then sort the selected dates.
+      if (isAfter(nextSelectDates[0], nextSelectDates[1])) {
+        nextSelectDates.reverse();
+      }
 
+      if (shouldRenderTime(formatStr)) {
+        nextSelectDates[1] = getCalendarEndDatetime(nextSelectDates[1]);
+      }
 
-    if (nextSelectDates.length === 2 && _utils.DateUtils.isAfter(nextSelectDates[0], nextSelectDates[1])) {
-      nextSelectDates.reverse();
+      setHoverDateRange(nextSelectDates);
+    } else {
+      setHoverDateRange([nextSelectDates[0], nextSelectDates[0]]);
     }
 
-    setHoverDateRange(nextSelectDates.length === 2 ? nextSelectDates : [nextSelectDates[0], nextSelectDates[0]]);
     setSelectedDates(nextSelectDates);
     updateCalendarDateRange(nextSelectDates);
     onSelect === null || onSelect === void 0 ? void 0 : onSelect(date, event);
     hasDoneSelect.current = !hasDoneSelect.current;
-  }, [getHoverRangeValue, handleValueUpdate, hoverDateRange, onSelect, oneTap, selectedDates, updateCalendarDateRange]);
+  }, [formatStr, getCalendarEndDatetime, getHoverRangeValue, handleValueUpdate, hoverDateRange, onSelect, oneTap, selectedDates, updateCalendarDateRange]);
   /**
    * If `selectValue` changed, there will be the following effects.
    * 1. Check if the selection is completed.

package/cjs/Disclosure/Disclosure.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
 import DisclosureButton from './DisclosureButton';
 import DisclosureContent from './DisclosureContent';
-export declare type DisclosureTrigger = 'click' | 'mouseover';
-export interface DisclosureRenderProps extends Pick<React.HTMLAttributes<HTMLElement>, 'onMouseOver' | 'onMouseOut'> {
+export declare type DisclosureTrigger = 'click' | 'hover';
+export interface DisclosureRenderProps extends Pick<React.HTMLAttributes<HTMLElement>, 'onMouseEnter' | 'onMouseLeave'> {
     open: boolean;
 }
 export interface DisclosureProps {

package/cjs/Disclosure/Disclosure.js

@@ -74,7 +74,7 @@ var Disclosure = /*#__PURE__*/_react.default.memo(function (props) {
       });
     }
   });
-  var onMouseOver = (0, _react.useCallback)(function (event) {
+  var onMouseEnter = (0, _react.useCallback)(function (event) {
     if (!open) {
       dispatch({
         type: _DisclosureContext.DisclosureActionTypes.Show
@@ -82,7 +82,7 @@ var Disclosure = /*#__PURE__*/_react.default.memo(function (props) {
       onToggle === null || onToggle === void 0 ? void 0 : onToggle(true, event);
     }
   }, [open, dispatch, onToggle]);
-  var onMouseOut = (0, _react.useCallback)(function (event) {
+  var onMouseLeave = (0, _react.useCallback)(function (event) {
     if (open) {
       dispatch({
         type: _DisclosureContext.DisclosureActionTypes.Hide
@@ -113,13 +113,13 @@ var Disclosure = /*#__PURE__*/_react.default.memo(function (props) {
       open: open
     };
 
-    if (trigger.includes('mouseover')) {
-      renderProps.onMouseOver = onMouseOver;
-      renderProps.onMouseOut = onMouseOut;
+    if (trigger.includes('hover')) {
+      renderProps.onMouseEnter = onMouseEnter;
+      renderProps.onMouseLeave = onMouseLeave;
     }
 
     return renderProps;
-  }, [open, trigger, onMouseOver, onMouseOut]);
+  }, [open, trigger, onMouseEnter, onMouseLeave]);
   return /*#__PURE__*/_react.default.createElement(_DisclosureContext.default.Provider, {
     value: contextValue
   }, children(renderProps, containerElementRef));

package/cjs/InputPicker/InputPicker.js

@@ -145,6 +145,7 @@ var InputPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var targetRef = (0, _react.useRef)(null);
   var triggerRef = (0, _react.useRef)(null);
   var inputRef = (0, _react.useRef)();
+  var listRef = (0, _react.useRef)(null);
 
   var _useCustom = (0, _utils.useCustom)(['Picker', 'InputPicker'], overrideLocale),
       locale = _useCustom.locale;
@@ -436,7 +437,8 @@ var InputPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   (0, _Picker.usePublicMethods)(ref, {
     triggerRef: triggerRef,
     overlayRef: overlayRef,
-    targetRef: targetRef
+    targetRef: targetRef,
+    listRef: listRef
   });
   /**
    * Remove the last item, after pressing the back key on the keyboard.
@@ -635,6 +637,7 @@ var InputPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     var menu = items.length ? /*#__PURE__*/_react.default.createElement(_Picker.DropdownMenu, {
       id: id ? id + "-listbox" : undefined,
       listProps: listProps,
+      listRef: listRef,
       disabledItemValues: disabledItemValues,
       valueKey: valueKey,
       labelKey: labelKey,

package/cjs/Modal/ModalBody.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
@@ -9,7 +11,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
@@ -22,6 +24,8 @@ var _IconButton = _interopRequireDefault(require("../IconButton"));
 var _Close = _interopRequireDefault(require("@rsuite/icons/Close"));
 
 var ModalBody = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+  var _context$getBodyStyle;
+
   var _props$as = props.as,
       Component = _props$as === void 0 ? 'div' : _props$as,
       _props$classPrefix = props.classPrefix,
@@ -37,22 +41,19 @@ var ModalBody = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       prefix = _useClassNames.prefix;
 
   var classes = merge(className, withClassPrefix());
-  return /*#__PURE__*/_react.default.createElement(_ModalContext.ModalContext.Consumer, null, function (context) {
-    var _context$getBodyStyle;
-
-    var bodyStyles = context === null || context === void 0 ? void 0 : (_context$getBodyStyle = context.getBodyStyles) === null || _context$getBodyStyle === void 0 ? void 0 : _context$getBodyStyle.call(context);
-    return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, rest, {
-      ref: ref,
-      style: (0, _extends2.default)({}, bodyStyles, style),
-      className: classes
-    }), (context === null || context === void 0 ? void 0 : context.isDrawer) && /*#__PURE__*/_react.default.createElement(_IconButton.default, {
-      icon: /*#__PURE__*/_react.default.createElement(_Close.default, null),
-      appearance: "subtle",
-      size: "sm",
-      className: prefix('close'),
-      onClick: context === null || context === void 0 ? void 0 : context.onModalClose
-    }), children);
-  });
+  var context = (0, _react.useContext)(_ModalContext.ModalContext);
+  var bodyStyles = context === null || context === void 0 ? void 0 : (_context$getBodyStyle = context.getBodyStyles) === null || _context$getBodyStyle === void 0 ? void 0 : _context$getBodyStyle.call(context);
+  return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, rest, {
+    ref: ref,
+    style: (0, _extends2.default)({}, bodyStyles, style),
+    className: classes
+  }), (context === null || context === void 0 ? void 0 : context.isDrawer) && /*#__PURE__*/_react.default.createElement(_IconButton.default, {
+    icon: /*#__PURE__*/_react.default.createElement(_Close.default, null),
+    appearance: "subtle",
+    size: "sm",
+    className: prefix('close'),
+    onClick: context === null || context === void 0 ? void 0 : context.onModalClose
+  }), children);
 });
 
 ModalBody.displayName = 'ModalBody';

package/cjs/MultiCascader/DropdownMenu.js

@@ -69,7 +69,10 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       prefix = _useClassNames.prefix;
 
   var classes = merge(className, prefix('items'));
-  var rtl = (0, _utils.useCustom)('DropdownMenu');
+
+  var _useCustom = (0, _utils.useCustom)('DropdownMenu'),
+      rtl = _useCustom.rtl;
+
   var getCascadePaths = (0, _react.useCallback)(function (layer, node) {
     var paths = [];
 
@@ -96,7 +99,7 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     }); // Use `value` in keys when If `value` is string or number
 
     var onlyKey = typeof value === 'number' || typeof value === 'string' ? value : index;
-    var Icon = node.loading ? _Spinner.default : rtl ? _AngleRight.default : _AngleLeft.default;
+    var Icon = node.loading ? _Spinner.default : rtl ? _AngleLeft.default : _AngleRight.default;
     var active = value.some(function (v) {
       return v === nodeValue;
     });

package/cjs/Navbar/NavbarDropdownMenu.js

@@ -15,17 +15,17 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _omit2 = _interopRequireDefault(require("lodash/omit"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _utils = require("../utils");
+var _omit2 = _interopRequireDefault(require("lodash/omit"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
+var _isNil = _interopRequireDefault(require("lodash/isNil"));
 
 var _AngleLeft = _interopRequireDefault(require("@rsuite/icons/legacy/AngleLeft"));
 
 var _AngleRight = _interopRequireDefault(require("@rsuite/icons/legacy/AngleRight"));
 
-var _useCustom2 = _interopRequireDefault(require("../utils/useCustom"));
+var _utils = require("../utils");
 
 var _ = require(".");
 
@@ -68,7 +68,7 @@ var NavbarDropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props,
       openDirection = _props$openDirection === void 0 ? 'end' : _props$openDirection,
       rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["onToggle", "eventKey", "title", "classPrefix", "children", "openDirection"]);
 
-  var _useCustom = (0, _useCustom2.default)('DropdownMenu'),
+  var _useCustom = (0, _utils.useCustom)('DropdownMenu'),
       rtl = _useCustom.rtl;
 
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
@@ -94,7 +94,7 @@ var NavbarDropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props,
   var Icon = rtl ? _AngleLeft.default : _AngleRight.default;
   return /*#__PURE__*/_react.default.createElement(_Disclosure.default, {
     hideOnClickOutside: true,
-    trigger: ['click', 'mouseover'],
+    trigger: ['click', 'hover'],
     onToggle: function onToggle(open, event) {
       return _onToggle === null || _onToggle === void 0 ? void 0 : _onToggle(open, undefined, event);
     }
@@ -117,12 +117,18 @@ var NavbarDropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props,
         open: open,
         disabled: disabled
       }));
+      var dataAttributes = {
+        'data-event-key': eventKey
+      };
+
+      if (!(0, _isNil.default)(eventKey) && typeof eventKey !== 'string') {
+        dataAttributes['data-event-key-type'] = typeof eventKey;
+      }
+
       return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
         ref: (0, _utils.mergeRefs)(buttonRef, buttonRef),
-        className: classes,
-        "data-event-key": eventKey,
-        "data-event-key-type": typeof eventKey
-      }, buttonProps), icon && /*#__PURE__*/_react.default.cloneElement(icon, {
+        className: classes
+      }, dataAttributes, buttonProps), icon && /*#__PURE__*/_react.default.cloneElement(icon, {
         className: prefix('menu-icon')
       }), title, /*#__PURE__*/_react.default.createElement(Icon, {
         className: prefix(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["toggle-icon"])))

package/cjs/Overlay/OverlayTrigger.d.ts

@@ -72,11 +72,11 @@ export declare enum OverlayCloseCause {
     ClickOutside = 0,
     ImperativeHandle = 1
 }
-export interface OverlayTriggerInstance {
+export interface OverlayTriggerHandle {
     root: HTMLElement | undefined;
     updatePosition: () => void;
     open: (delay?: number) => void;
     close: (delay?: number) => void;
 }
-declare const OverlayTrigger: React.ForwardRefExoticComponent<OverlayTriggerProps & React.RefAttributes<OverlayTriggerInstance>>;
+declare const OverlayTrigger: React.ForwardRefExoticComponent<OverlayTriggerProps & React.RefAttributes<OverlayTriggerHandle>>;
 export default OverlayTrigger;

package/cjs/Picker/DropdownMenu.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { ListProps } from './VirtualizedList';
+import { ListProps, ListHandle } from '../Windowing';
 import { StandardProps, ItemDataType } from '../@types/common';
 export interface DropdownMenuProps<Multiple = false> extends StandardProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'onSelect'> {
     classPrefix: string;
@@ -20,6 +20,7 @@ export interface DropdownMenuProps<Multiple = false> extends StandardProps, Omit
     rowGroupHeight?: number;
     virtualized?: boolean;
     listProps?: Partial<ListProps>;
+    listRef?: React.Ref<ListHandle>;
     /** Custom selected option */
     renderMenuItem?: (itemLabel: React.ReactNode, item: any) => React.ReactNode;
     renderMenuGroup?: (title: React.ReactNode, item: any) => React.ReactNode;

package/cjs/Picker/DropdownMenu.js

@@ -31,7 +31,7 @@ var _getHeight = _interopRequireDefault(require("dom-lib/getHeight"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _VirtualizedList = require("./VirtualizedList");
+var _Windowing = require("../Windowing");
 
 var _shallowEqual = _interopRequireDefault(require("../utils/shallowEqual"));
 
@@ -61,6 +61,7 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       labelKey = _props$labelKey === void 0 ? 'label' : _props$labelKey,
       virtualized = props.virtualized,
       listProps = props.listProps,
+      virtualizedListRef = props.listRef,
       className = props.className,
       style = props.style,
       focusItemValue = props.focusItemValue,
@@ -74,7 +75,7 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       renderMenuItem = props.renderMenuItem,
       onGroupTitleClick = props.onGroupTitleClick,
       onSelect = props.onSelect,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["data", "group", "maxHeight", "activeItemValues", "disabledItemValues", "classPrefix", "valueKey", "labelKey", "virtualized", "listProps", "className", "style", "focusItemValue", "dropdownMenuItemClassPrefix", "dropdownMenuItemAs", "rowHeight", "rowGroupHeight", "renderMenuGroup", "renderMenuItem", "onGroupTitleClick", "onSelect"]);
+      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["data", "group", "maxHeight", "activeItemValues", "disabledItemValues", "classPrefix", "valueKey", "labelKey", "virtualized", "listProps", "listRef", "className", "style", "focusItemValue", "dropdownMenuItemClassPrefix", "dropdownMenuItemAs", "rowHeight", "rowGroupHeight", "renderMenuGroup", "renderMenuItem", "onGroupTitleClick", "onSelect"]);
 
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
       withClassPrefix = _useClassNames.withClassPrefix,
@@ -84,10 +85,8 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
   var classes = merge(className, withClassPrefix('items', {
     grouped: group
   }));
-  var styles = (0, _extends2.default)({}, style, {
-    maxHeight: maxHeight
-  });
   var menuBodyContainerRef = (0, _react.useRef)(null);
+  var listRef = (0, _react.useRef)(null);
 
   var _useState = (0, _react.useState)([]),
       foldedGroupKeys = _useState[0],
@@ -109,8 +108,7 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     onSelect === null || onSelect === void 0 ? void 0 : onSelect(value, item, event, checked);
   }, [onSelect]);
 
-  var getRowHeight = function getRowHeight(list, _ref) {
-    var index = _ref.index;
+  var getRowHeight = function getRowHeight(list, index) {
     var item = list[index];
 
     if (group && item[_getDataGroupBy.KEY_GROUP] && index !== 0) {
@@ -148,10 +146,13 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     }
   }, [focusItemValue, menuBodyContainerRef, prefix]);
 
-  var renderItem = function renderItem(list, _ref2) {
-    var index = _ref2.index,
-        style = _ref2.style;
-    var item = list[index];
+  var renderItem = function renderItem(_ref) {
+    var _ref$index = _ref.index,
+        index = _ref$index === void 0 ? 0 : _ref$index,
+        style = _ref.style,
+        data = _ref.data,
+        itemData = _ref.item;
+    var item = itemData || data[index];
     var value = item[valueKey];
     var label = item[labelKey];
 
@@ -210,40 +211,43 @@ var DropdownMenu = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       return key === ((_item$parent = item.parent) === null || _item$parent === void 0 ? void 0 : _item$parent[_getDataGroupBy.KEY_GROUP_TITLE]);
     }));
   }) : data;
-  var rowCount = filteredItems.length; // Check whether the height of the data exceeds the height of the container.
+  var rowCount = filteredItems.length;
+  (0, _utils.useMount)(function () {
+    var _listRef$current, _listRef$current$scro;
 
-  var useVirtualized = virtualized && rowCount * rowHeight > maxHeight;
+    var itemIndex = (0, _findIndex.default)(filteredItems, function (item) {
+      return item[valueKey] === (activeItemValues === null || activeItemValues === void 0 ? void 0 : activeItemValues[0]);
+    });
+    (_listRef$current = listRef.current) === null || _listRef$current === void 0 ? void 0 : (_listRef$current$scro = _listRef$current.scrollToItem) === null || _listRef$current$scro === void 0 ? void 0 : _listRef$current$scro.call(_listRef$current, itemIndex);
+  });
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
-    role: !useVirtualized ? 'listbox' : undefined
+    role: "listbox"
   }, rest, {
     className: classes,
     ref: (0, _utils.mergeRefs)(menuBodyContainerRef, ref),
-    style: styles
-  }), useVirtualized ? /*#__PURE__*/_react.default.createElement(_VirtualizedList.AutoSizer, {
+    style: (0, _extends2.default)({}, style, {
+      maxHeight: maxHeight
+    })
+  }), virtualized ? /*#__PURE__*/_react.default.createElement(_Windowing.AutoSizer, {
     defaultHeight: maxHeight,
     style: {
       width: 'auto',
       height: 'auto'
     }
-  }, function (_ref3) {
-    var height = _ref3.height,
-        width = _ref3.width;
-    return /*#__PURE__*/_react.default.createElement(_VirtualizedList.List, (0, _extends2.default)({
-      role: "listbox",
-      containerRole: '',
-      "aria-readonly": undefined,
-      width: width,
+  }, function (_ref2) {
+    var height = _ref2.height;
+    return /*#__PURE__*/_react.default.createElement(_Windowing.List, (0, _extends2.default)({
+      as: _Windowing.VariableSizeList,
+      ref: (0, _utils.mergeRefs)(listRef, virtualizedListRef),
       height: height || maxHeight,
-      scrollToIndex: (0, _findIndex.default)(data, function (item) {
-        return item[valueKey] === (activeItemValues === null || activeItemValues === void 0 ? void 0 : activeItemValues[0]);
-      }),
-      rowCount: rowCount,
-      rowHeight: getRowHeight.bind(_this, filteredItems),
-      rowRenderer: renderItem.bind(null, filteredItems)
-    }, listProps));
-  }) : filteredItems.map(function (_item, index) {
-    return renderItem(filteredItems, {
-      index: index
+      itemCount: rowCount,
+      itemData: filteredItems,
+      itemSize: getRowHeight.bind(_this, filteredItems)
+    }, listProps), renderItem);
+  }) : filteredItems.map(function (item, index) {
+    return renderItem({
+      index: index,
+      item: item
     });
   }));
 });

package/cjs/Picker/PickerOverlay.d.ts

@@ -1,11 +1,11 @@
 import React from 'react';
 import { WithAsProps, RsRefForwardingComponent } from '../@types/common';
-import { OverlayTriggerInstance } from '../Picker';
+import { OverlayTriggerHandle } from '../Picker';
 export interface PickerOverlayProps extends WithAsProps {
     placement?: string;
     autoWidth?: boolean;
     children?: React.ReactNode;
-    target?: React.RefObject<OverlayTriggerInstance>;
+    target?: React.RefObject<OverlayTriggerHandle>;
     onKeyDown?: (event: React.KeyboardEvent) => void;
 }
 declare const PickerOverlay: RsRefForwardingComponent<'div', PickerOverlayProps>;

package/cjs/Picker/PickerToggle.js

@@ -209,7 +209,10 @@ var PickerToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
   }), /*#__PURE__*/_react.default.createElement(_Stack.default, null, label && /*#__PURE__*/_react.default.createElement(_Stack.default.Item, null, /*#__PURE__*/_react.default.createElement("span", {
     className: prefix('label')
   }, label)), /*#__PURE__*/_react.default.createElement(_Stack.default.Item, {
-    grow: 1
+    grow: 1,
+    style: {
+      overflow: 'hidden'
+    }
   }, loading ? /*#__PURE__*/_react.default.createElement(_Loader.default, {
     style: {
       display: 'block',

package/cjs/Picker/PickerToggleTrigger.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
-import { OverlayTriggerInstance, OverlayTriggerProps, OverlayTriggerType } from '../Overlay/OverlayTrigger';
+import { OverlayTriggerHandle, OverlayTriggerProps, OverlayTriggerType } from '../Overlay/OverlayTrigger';
 import { PositionChildProps } from '../Overlay/Position';
 import { TypeAttributes, AnimationEventProps } from '../@types/common';
-export type { OverlayTriggerInstance, PositionChildProps };
+export type { OverlayTriggerHandle, PositionChildProps };
 export interface PickerToggleTriggerProps extends Omit<AnimationEventProps, 'onEntering' | 'onExiting'>, Pick<OverlayTriggerProps, 'speaker' | 'onClose'> {
     placement?: TypeAttributes.Placement;
     pickerProps: any;