rsuite 5.19.1 → 5.20.0-beta.6

package/esm/Form/Form.js

@@ -1,8 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-import React, { useMemo, useCallback, useState, useImperativeHandle, useRef } from 'react';
+import React, { useMemo, useCallback, useImperativeHandle, useRef } from 'react';
 import PropTypes from 'prop-types';
-import isUndefined from 'lodash/isUndefined';
 import omit from 'lodash/omit';
 import { SchemaModel } from 'schema-typed';
 import FormContext, { FormValueContext } from './FormContext';
@@ -13,6 +12,7 @@ import FormGroup from '../FormGroup';
 import FormHelpText from '../FormHelpText';
 import { useFormClassNames } from './useFormClassNames';
 import useSchemaModel from './useSchemaModel';
+import { useControlled } from '../utils';
 var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _props$checkTrigger = props.checkTrigger,
       checkTrigger = _props$checkTrigger === void 0 ? 'change' : _props$checkTrigger,
@@ -55,20 +55,18 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
     disabled: disabled
   });
 
-  var _useState = useState(formDefaultValue),
-      _formValue = _useState[0],
-      setFormValue = _useState[1];
+  var _useControlled = useControlled(formValue, formDefaultValue),
+      realFormValue = _useControlled[0],
+      setFormValue = _useControlled[1];
 
-  var _useState2 = useState(formError || {}),
-      _formError = _useState2[0],
-      setFormError = _useState2[1];
+  var _useControlled2 = useControlled(formError, {}),
+      realFormError = _useControlled2[0],
+      setFormError = _useControlled2[1];
 
-  var getFormValue = useCallback(function () {
-    return isUndefined(formValue) ? _formValue : formValue;
-  }, [_formValue, formValue]);
-  var getFormError = useCallback(function () {
-    return isUndefined(formError) ? _formError : formError;
-  }, [formError, _formError]);
+  var realFormValueRef = useRef(realFormValue);
+  realFormValueRef.current = realFormValue;
+  var realFormErrorRef = useRef(realFormError);
+  realFormErrorRef.current = realFormError;
   /**
    * Validate the form data and return a boolean.
    * The error message after verification is returned in the callback.
@@ -76,7 +74,7 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
    */
 
   var check = useCallback(function (callback) {
-    var formValue = getFormValue() || {};
+    var formValue = realFormValue || {};
     var formError = {};
     var errorCount = 0;
     var model = getCombinedModel();
@@ -98,7 +96,7 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }
 
     return true;
-  }, [getFormValue, getCombinedModel, onCheck, onError]);
+  }, [realFormValue, getCombinedModel, setFormError, onCheck, onError]);
   /**
    * Check the data field
    * @param fieldName
@@ -108,11 +106,11 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var checkForField = useCallback(function (fieldName, callback) {
     var _extends2;
 
-    var formValue = getFormValue() || {};
+    var formValue = realFormValue || {};
     var model = getCombinedModel();
     var checkResult = model.checkForField(fieldName, formValue);
 
-    var formError = _extends({}, getFormError(), (_extends2 = {}, _extends2[fieldName] = (checkResult === null || checkResult === void 0 ? void 0 : checkResult.errorMessage) || checkResult, _extends2));
+    var formError = _extends({}, realFormError, (_extends2 = {}, _extends2[fieldName] = (checkResult === null || checkResult === void 0 ? void 0 : checkResult.errorMessage) || checkResult, _extends2));
 
     setFormError(formError);
     onCheck === null || onCheck === void 0 ? void 0 : onCheck(formError);
@@ -123,13 +121,13 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }
 
     return !checkResult.hasError;
-  }, [getFormValue, getCombinedModel, getFormError, onCheck, onError]);
+  }, [realFormValue, getCombinedModel, realFormError, setFormError, onCheck, onError]);
   /**
    * Check form data asynchronously and return a Promise
    */
 
   var checkAsync = useCallback(function () {
-    var formValue = getFormValue() || {};
+    var formValue = realFormValue || {};
     var promises = [];
     var keys = [];
     var model = getCombinedModel();
@@ -160,19 +158,19 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
         formError: formError
       };
     });
-  }, [getFormValue, getCombinedModel, onCheck, onError]);
+  }, [realFormValue, getCombinedModel, onCheck, setFormError, onError]);
   /**
    * Asynchronously check form fields and return Promise
    * @param fieldName
    */
 
   var checkForFieldAsync = useCallback(function (fieldName) {
-    var formValue = getFormValue() || {};
+    var formValue = realFormValue || {};
     var model = getCombinedModel();
     return model.checkForFieldAsync(fieldName, formValue).then(function (checkResult) {
       var _extends3;
 
-      var formError = _extends({}, getFormError(), (_extends3 = {}, _extends3[fieldName] = checkResult.errorMessage, _extends3));
+      var formError = _extends({}, realFormError, (_extends3 = {}, _extends3[fieldName] = checkResult.errorMessage, _extends3));
 
       onCheck === null || onCheck === void 0 ? void 0 : onCheck(formError);
       setFormError(formError);
@@ -183,20 +181,20 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
       return checkResult;
     });
-  }, [getFormValue, getCombinedModel, getFormError, onCheck, onError]);
+  }, [realFormValue, getCombinedModel, realFormError, onCheck, setFormError, onError]);
   var cleanErrors = useCallback(function () {
     setFormError({});
-  }, []);
+  }, [setFormError]);
   var cleanErrorForField = useCallback(function (fieldName) {
-    setFormError(omit(_formError, [fieldName]));
-  }, [_formError]);
+    setFormError(omit(realFormError, [fieldName]));
+  }, [realFormError, setFormError]);
   var resetErrors = useCallback(function (formError) {
     if (formError === void 0) {
       formError = {};
     }
 
     setFormError(formError);
-  }, []);
+  }, [setFormError]);
   useImperativeHandle(ref, function () {
     return {
       root: rootRef.current,
@@ -210,15 +208,23 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
     };
   });
   var removeFieldError = useCallback(function (name) {
-    var formError = omit(getFormError(), [name]);
+    /**
+     * when this function is called when the children component is unmount, it's an old render frame
+     * so use Ref to get future error
+     */
+    var formError = omit(realFormErrorRef.current, [name]);
     setFormError(formError);
     onCheck === null || onCheck === void 0 ? void 0 : onCheck(formError);
-  }, [getFormError, onCheck]);
+  }, [onCheck, setFormError]);
   var removeFieldValue = useCallback(function (name) {
-    var formValue = omit(getFormValue(), [name]);
+    /**
+     * when this function is called when the children component is unmount, it's an old render frame
+     * so use Ref to get future value
+     */
+    var formValue = omit(realFormValueRef.current, [name]);
     setFormValue(formValue);
     onChange === null || onChange === void 0 ? void 0 : onChange(formValue);
-  }, [getFormValue, onChange]);
+  }, [onChange, setFormValue]);
   var handleSubmit = useCallback(function (event) {
     if (disabled || readOnly || plaintext) {
       return;
@@ -232,25 +238,25 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var handleFieldError = useCallback(function (name, errorMessage) {
     var _extends4;
 
-    var formError = _extends({}, getFormError(), (_extends4 = {}, _extends4[name] = errorMessage, _extends4));
+    var formError = _extends({}, realFormError, (_extends4 = {}, _extends4[name] = errorMessage, _extends4));
 
     setFormError(formError);
     onError === null || onError === void 0 ? void 0 : onError(formError);
     onCheck === null || onCheck === void 0 ? void 0 : onCheck(formError);
-  }, [onError, onCheck, getFormError]);
+  }, [realFormError, setFormError, onError, onCheck]);
   var handleFieldSuccess = useCallback(function (name) {
     removeFieldError(name);
   }, [removeFieldError]);
   var handleFieldChange = useCallback(function (name, value, event) {
     var _extends5;
 
-    var formValue = getFormValue();
+    var formValue = realFormValue;
 
     var nextFormValue = _extends({}, formValue, (_extends5 = {}, _extends5[name] = value, _extends5));
 
     setFormValue(nextFormValue);
     onChange === null || onChange === void 0 ? void 0 : onChange(nextFormValue, event);
-  }, [onChange, getFormValue]);
+  }, [realFormValue, setFormValue, onChange]);
   var rootRef = useRef(null);
   var formContextValue = useMemo(function () {
     return {
@@ -261,7 +267,7 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
       readOnly: readOnly,
       plaintext: plaintext,
       disabled: disabled,
-      formError: getFormError(),
+      formError: realFormError,
       removeFieldValue: removeFieldValue,
       removeFieldError: removeFieldError,
       pushFieldRule: pushFieldRule,
@@ -270,7 +276,7 @@ var Form = /*#__PURE__*/React.forwardRef(function (props, ref) {
       onFieldError: handleFieldError,
       onFieldSuccess: handleFieldSuccess
     };
-  }, [getCombinedModel, checkTrigger, formDefaultValue, errorFromContext, readOnly, plaintext, disabled, getFormError, removeFieldValue, removeFieldError, pushFieldRule, removeFieldRule, handleFieldChange, handleFieldError, handleFieldSuccess]);
+  }, [getCombinedModel, checkTrigger, formDefaultValue, errorFromContext, readOnly, plaintext, disabled, realFormError, removeFieldValue, removeFieldError, pushFieldRule, removeFieldRule, handleFieldChange, handleFieldError, handleFieldSuccess]);
   return /*#__PURE__*/React.createElement("form", _extends({}, rest, {
     ref: rootRef,
     onSubmit: handleSubmit,

package/esm/InputPicker/InputPicker.js

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

package/esm/MultiCascader/DropdownMenu.js

@@ -50,7 +50,10 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
       prefix = _useClassNames.prefix;
 
   var classes = merge(className, prefix('items'));
-  var rtl = useCustom('DropdownMenu');
+
+  var _useCustom = useCustom('DropdownMenu'),
+      rtl = _useCustom.rtl;
+
   var getCascadePaths = useCallback(function (layer, node) {
     var paths = [];
 
@@ -77,7 +80,7 @@ var DropdownMenu = /*#__PURE__*/React.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 ? SpinnerIcon : rtl ? AngleRightIcon : AngleLeftIcon;
+    var Icon = node.loading ? SpinnerIcon : rtl ? AngleLeftIcon : AngleRightIcon;
     var active = value.some(function (v) {
       return v === nodeValue;
     });

package/esm/Navbar/NavbarDropdownMenu.js

@@ -5,12 +5,12 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
 var _templateObject, _templateObject2;
 
 import React, { useContext } from 'react';
-import omit from 'lodash/omit';
-import { mergeRefs, useClassNames } from '../utils';
 import PropTypes from 'prop-types';
+import omit from 'lodash/omit';
+import isNil from 'lodash/isNil';
 import AngleLeft from '@rsuite/icons/legacy/AngleLeft';
 import AngleRight from '@rsuite/icons/legacy/AngleRight';
-import useCustom from '../utils/useCustom';
+import { mergeRefs, useClassNames, useCustom } from '../utils';
 import { NavbarContext } from '.';
 import Disclosure from '../Disclosure';
 import NavContext from '../Nav/NavContext';
@@ -73,7 +73,7 @@ var NavbarDropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var Icon = rtl ? AngleLeft : AngleRight;
   return /*#__PURE__*/React.createElement(Disclosure, {
     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);
     }
@@ -98,12 +98,18 @@ var NavbarDropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
         open: open,
         disabled: disabled
       }));
+      var dataAttributes = {
+        'data-event-key': eventKey
+      };
+
+      if (!isNil(eventKey) && typeof eventKey !== 'string') {
+        dataAttributes['data-event-key-type'] = typeof eventKey;
+      }
+
       return /*#__PURE__*/React.createElement("div", _extends({
         ref: mergeRefs(buttonRef, buttonRef),
-        className: classes,
-        "data-event-key": eventKey,
-        "data-event-key-type": typeof eventKey
-      }, buttonProps), icon && /*#__PURE__*/React.cloneElement(icon, {
+        className: classes
+      }, dataAttributes, buttonProps), icon && /*#__PURE__*/React.cloneElement(icon, {
         className: prefix('menu-icon')
       }), title, /*#__PURE__*/React.createElement(Icon, {
         className: prefix(_templateObject2 || (_templateObject2 = _taggedTemplateLiteralLoose(["toggle-icon"])))

package/esm/Overlay/OverlayTrigger.d.ts

@@ -59,15 +59,24 @@ export interface OverlayTriggerProps extends StandardProps, AnimationEventProps
     /** Callback fired when open component */
     onOpen?: () => void;
     /** Callback fired when close component */
-    onClose?: () => void;
+    onClose?: (cause?: OverlayCloseCause) => void;
     /** Whether speaker to follow the cursor */
     followCursor?: boolean;
 }
-export interface OverlayTriggerInstance {
+/**
+ * The reason that triggers closing of an overlay
+ * - Clicking outside of the overlay
+ * - Direct invocation of triggerRef.current.close()
+ */
+export declare enum OverlayCloseCause {
+    ClickOutside = 0,
+    ImperativeHandle = 1
+}
+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/esm/Overlay/OverlayTrigger.js

@@ -30,6 +30,12 @@ function mergeEvents(events, props) {
   return nextEvents;
 }
 
+/**
+ * The reason that triggers closing of an overlay
+ * - Clicking outside of the overlay
+ * - Direct invocation of triggerRef.current.close()
+ */
+export var OverlayCloseCause;
 /**
  * Useful for mouseover and mouseout.
  * In order to resolve the node entering the mouseover element, a mouseout event and a mouseover event will be triggered.
@@ -37,6 +43,12 @@ function mergeEvents(events, props) {
  * @param handler
  * @param event
  */
+
+(function (OverlayCloseCause) {
+  OverlayCloseCause[OverlayCloseCause["ClickOutside"] = 0] = "ClickOutside";
+  OverlayCloseCause[OverlayCloseCause["ImperativeHandle"] = 1] = "ImperativeHandle";
+})(OverlayCloseCause || (OverlayCloseCause = {}));
+
 function onMouseEventHandler(handler, event, delay) {
   var target = event.currentTarget;
   var related = event.relatedTarget || get(event, ['nativeEvent', 'toElement']);
@@ -133,17 +145,19 @@ var OverlayTrigger = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
     setOpen(true);
   }, [delayOpen, setOpen]);
-  var handleClose = useCallback(function (delay) {
+  var handleClose = useCallback(function (delay, callback) {
     var ms = _isUndefined(delay) ? delayClose : delay;
 
     if (ms && typeof ms === 'number') {
       return delayCloseTimer.current = setTimeout(function () {
         delayCloseTimer.current = null;
         setOpen(false);
+        callback === null || callback === void 0 ? void 0 : callback();
       }, ms);
     }
 
     setOpen(false);
+    callback === null || callback === void 0 ? void 0 : callback();
   }, [delayClose, setOpen]);
   var handleExited = useCallback(function () {
     setCursorPosition(null);
@@ -161,7 +175,11 @@ var OverlayTrigger = /*#__PURE__*/React.forwardRef(function (props, ref) {
       },
 
       open: handleOpen,
-      close: handleClose,
+      close: function close(delay) {
+        return handleClose(delay, function () {
+          return onClose === null || onClose === void 0 ? void 0 : onClose(OverlayCloseCause.ImperativeHandle);
+        });
+      },
       updatePosition: function updatePosition() {
         var _overlayRef$current2, _overlayRef$current2$;
 
@@ -322,7 +340,9 @@ var OverlayTrigger = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var overlayProps = _extends({}, rest, {
       rootClose: rootClose,
       triggerTarget: triggerRef,
-      onClose: trigger !== 'none' ? createChainedFunction(handleClose, onClose) : undefined,
+      onClose: trigger !== 'none' ? createChainedFunction(handleClose, function () {
+        return onClose === null || onClose === void 0 ? void 0 : onClose(OverlayCloseCause.ClickOutside);
+      }) : undefined,
       onExited: createChainedFunction(followCursor ? handleExited : undefined, onExited),
       placement: placement,
       container: container,

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

@@ -13,9 +13,9 @@ import getPosition from 'dom-lib/getPosition';
 import scrollTop from 'dom-lib/scrollTop';
 import getHeight from 'dom-lib/getHeight';
 import classNames from 'classnames';
-import { List, AutoSizer } from './VirtualizedList';
+import { List, AutoSizer, VariableSizeList } from '../Windowing';
 import shallowEqual from '../utils/shallowEqual';
-import { mergeRefs, useClassNames } from '../utils';
+import { mergeRefs, useClassNames, useMount } from '../utils';
 import DropdownMenuGroup from './DropdownMenuGroup';
 import { KEY_GROUP, KEY_GROUP_TITLE } from '../utils/getDataGroupBy';
 var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
@@ -36,6 +36,7 @@ var DropdownMenu = /*#__PURE__*/React.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,
@@ -49,7 +50,7 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
       renderMenuItem = props.renderMenuItem,
       onGroupTitleClick = props.onGroupTitleClick,
       onSelect = props.onSelect,
-      rest = _objectWithoutPropertiesLoose(props, ["data", "group", "maxHeight", "activeItemValues", "disabledItemValues", "classPrefix", "valueKey", "labelKey", "virtualized", "listProps", "className", "style", "focusItemValue", "dropdownMenuItemClassPrefix", "dropdownMenuItemAs", "rowHeight", "rowGroupHeight", "renderMenuGroup", "renderMenuItem", "onGroupTitleClick", "onSelect"]);
+      rest = _objectWithoutPropertiesLoose(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 = useClassNames(classPrefix),
       withClassPrefix = _useClassNames.withClassPrefix,
@@ -59,12 +60,8 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var classes = merge(className, withClassPrefix('items', {
     grouped: group
   }));
-
-  var styles = _extends({}, style, {
-    maxHeight: maxHeight
-  });
-
   var menuBodyContainerRef = useRef(null);
+  var listRef = useRef(null);
 
   var _useState = useState([]),
       foldedGroupKeys = _useState[0],
@@ -86,8 +83,7 @@ var DropdownMenu = /*#__PURE__*/React.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[KEY_GROUP] && index !== 0) {
@@ -125,10 +121,13 @@ var DropdownMenu = /*#__PURE__*/React.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];
 
@@ -187,40 +186,45 @@ var DropdownMenu = /*#__PURE__*/React.forwardRef(function (props, ref) {
       return key === ((_item$parent = item.parent) === null || _item$parent === void 0 ? void 0 : _item$parent[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;
+  useMount(function () {
+    var _listRef$current, _listRef$current$scro;
 
-  var useVirtualized = virtualized && rowCount * rowHeight > maxHeight;
+    var itemIndex = findIndex(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.createElement("div", _extends({
-    role: !useVirtualized ? 'listbox' : undefined
+    role: "listbox"
   }, rest, {
     className: classes,
     ref: mergeRefs(menuBodyContainerRef, ref),
-    style: styles
-  }), useVirtualized ? /*#__PURE__*/React.createElement(AutoSizer, {
+    style: _extends({}, style, {
+      maxHeight: maxHeight
+    })
+  }), virtualized ? /*#__PURE__*/React.createElement(AutoSizer, {
     defaultHeight: maxHeight,
     style: {
       width: 'auto',
       height: 'auto'
     }
-  }, function (_ref3) {
-    var height = _ref3.height,
-        width = _ref3.width;
+  }, function (_ref2) {
+    var height = _ref2.height,
+        width = _ref2.width;
     return /*#__PURE__*/React.createElement(List, _extends({
-      role: "listbox",
-      containerRole: '',
-      "aria-readonly": undefined,
+      as: VariableSizeList,
+      ref: mergeRefs(listRef, virtualizedListRef),
       width: width,
       height: height || maxHeight,
-      scrollToIndex: findIndex(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
     });
   }));
 });