rsuite 5.16.2 → 5.16.5

package/esm/AutoComplete/AutoComplete.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import { PickerComponent } from '../Picker';
 import { WithAsProps, FormControlPickerProps, TypeAttributes, ItemDataType } from '../@types/common';
 export declare type ValueType = string;
-export interface AutoCompleteProps<T = ValueType> extends WithAsProps, FormControlPickerProps<T, any, ItemDataType> {
+export interface AutoCompleteProps<T = ValueType> extends WithAsProps, FormControlPickerProps<T, any, ItemDataType | string> {
     /** Additional classes for menu */
     menuClassName?: string;
     /** The placement of component */
@@ -13,6 +13,8 @@ export interface AutoCompleteProps<T = ValueType> extends WithAsProps, FormContr
     open?: boolean;
     /** Placeholder text */
     placeholder?: string;
+    /** The width of the menu will automatically follow the width of the input box */
+    menuAutoWidth?: boolean;
     /** Custom filter function to determine whether the item will be displayed */
     filterBy?: (value: string, item: ItemDataType) => boolean;
     /** Called when a option is selected */

package/esm/AutoComplete/AutoComplete.js

@@ -26,6 +26,8 @@ var AutoComplete = /*#__PURE__*/React.forwardRef(function (props, ref) {
       classPrefix = _props$classPrefix === void 0 ? 'auto-complete' : _props$classPrefix,
       _props$defaultValue = props.defaultValue,
       defaultValue = _props$defaultValue === void 0 ? '' : _props$defaultValue,
+      _props$menuAutoWidth = props.menuAutoWidth,
+      menuAutoWidth = _props$menuAutoWidth === void 0 ? true : _props$menuAutoWidth,
       data = props.data,
       valueProp = props.value,
       open = props.open,
@@ -43,7 +45,7 @@ var AutoComplete = /*#__PURE__*/React.forwardRef(function (props, ref) {
       onFocus = props.onFocus,
       onBlur = props.onBlur,
       onMenuFocus = props.onMenuFocus,
-      rest = _objectWithoutPropertiesLoose(props, ["as", "disabled", "className", "placement", "selectOnEnter", "classPrefix", "defaultValue", "data", "value", "open", "style", "menuClassName", "id", "renderMenu", "renderMenuItem", "onSelect", "filterBy", "onKeyDown", "onChange", "onClose", "onOpen", "onFocus", "onBlur", "onMenuFocus"]);
+      rest = _objectWithoutPropertiesLoose(props, ["as", "disabled", "className", "placement", "selectOnEnter", "classPrefix", "defaultValue", "menuAutoWidth", "data", "value", "open", "style", "menuClassName", "id", "renderMenu", "renderMenuItem", "onSelect", "filterBy", "onKeyDown", "onChange", "onClose", "onOpen", "onFocus", "onBlur", "onMenuFocus"]);
 
   var datalist = transformData(data);
 
@@ -184,7 +186,8 @@ var AutoComplete = /*#__PURE__*/React.forwardRef(function (props, ref) {
       style: styles,
       className: className,
       onKeyDown: handleKeyDownEvent,
-      target: triggerRef
+      target: triggerRef,
+      autoWidth: menuAutoWidth
     }, renderMenu ? renderMenu(menu) : menu);
   };
 
@@ -219,6 +222,7 @@ AutoComplete.propTypes = _extends({}, animationPropTypes, {
   defaultValue: PropTypes.string,
   className: PropTypes.string,
   menuClassName: PropTypes.string,
+  menuAutoWidth: PropTypes.bool,
   placement: PropTypes.oneOf(PLACEMENT),
   onFocus: PropTypes.func,
   onMenuFocus: PropTypes.func,

package/esm/AutoComplete/test/AutoComplete.test.d.ts

@@ -0,0 +1 @@
+export {};

package/esm/AutoComplete/test/AutoComplete.test.js

@@ -0,0 +1,18 @@
+import React from 'react';
+import AutoComplete from '../AutoComplete';
+
+/*#__PURE__*/
+React.createElement(AutoComplete, {
+  data: ['item1', 'item2']
+});
+
+/*#__PURE__*/
+React.createElement(AutoComplete, {
+  data: [{
+    label: 'item1',
+    value: 'item1'
+  }, {
+    label: 'item2',
+    value: 'item2'
+  }]
+});

package/esm/Calendar/useCalendarDate.d.ts

@@ -1,5 +1,6 @@
 declare const useCalendarDate: (value: Date | null | undefined, defaultDate: Date | undefined) => {
     calendarDate: Date;
     setCalendarDate: (date: Date | undefined) => void;
+    resetCalendarDate: () => void;
 };
 export default useCalendarDate;

package/esm/Calendar/useCalendarDate.js

@@ -15,6 +15,11 @@ var useCalendarDate = function useCalendarDate(value, defaultDate) {
       setValue(date);
     }
   }, [calendarDate]);
+  var resetCalendarDate = useCallback(function () {
+    var _ref2;
+
+    setValue((_ref2 = value !== null && value !== void 0 ? value : defaultDate) !== null && _ref2 !== void 0 ? _ref2 : new Date());
+  }, [defaultDate, value]);
   useUpdateEffect(function () {
     var _valueRef$current;
 
@@ -25,7 +30,8 @@ var useCalendarDate = function useCalendarDate(value, defaultDate) {
   }, [value]);
   return {
     calendarDate: calendarDate,
-    setCalendarDate: setCalendarDate
+    setCalendarDate: setCalendarDate,
+    resetCalendarDate: resetCalendarDate
   };
 };
 

package/esm/CheckTreePicker/CheckTreePicker.js

@@ -566,6 +566,11 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var visibleChildren = _isUndefined(searchKeywordState) || searchKeywordState.length === 0 ? !!children : hasVisibleChildren(node, childrenKey);
 
     var nodeProps = _extends({}, getTreeNodeProps(_extends({}, node, {
+      /**
+       * spread operator dont copy unenumerable properties
+       * so we need to copy them manually
+       */
+      parent: node.parent,
       expand: expand
     }), layer), {
       hasChildren: visibleChildren

package/esm/DatePicker/DatePicker.d.ts

@@ -5,7 +5,7 @@ import { PickerToggleProps } from '../Picker';
 import { FormControlBaseProps, PickerBaseProps, RsRefForwardingComponent } from '../@types/common';
 export type { RangeType } from './Toolbar';
 export interface DatePickerProps extends PickerBaseProps<DatePickerLocale>, FormControlBaseProps<Date | null>, Pick<PickerToggleProps, 'caretAs' | 'readOnly' | 'plaintext'> {
-    /** Configure shortcut options */
+    /** Predefined date Ranges */
     ranges?: RangeType<Date>[];
     /** Calendar panel default presentation date and time */
     calendarDefaultDate?: Date;

package/esm/DatePicker/DatePicker.js

@@ -77,7 +77,8 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
   var _useCalendarDate = useCalendarDate(valueProp, calendarDefaultDate),
       calendarDate = _useCalendarDate.calendarDate,
-      setCalendarDate = _useCalendarDate.setCalendarDate;
+      setCalendarDate = _useCalendarDate.setCalendarDate,
+      resetCalendarDate = _useCalendarDate.resetCalendarDate;
 
   var _useState = useState(),
       inputState = _useState[0],
@@ -217,9 +218,9 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
    */
 
   var handleClean = useCallback(function (event) {
-    setCalendarDate(new Date());
     updateValue(event, null);
-  }, [setCalendarDate, updateValue]);
+    resetCalendarDate();
+  }, [resetCalendarDate, updateValue]);
   /**
    * Handle keyboard events.
    */
@@ -437,7 +438,7 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     as: toggleAs,
     ref: targetRef,
     appearance: appearance,
-    input: true,
+    editable: true,
     inputValue: value ? formatDate(value, formatStr) : '',
     inputPlaceholder: typeof placeholder === 'string' && placeholder ? placeholder : formatStr,
     inputMask: DateUtils.getDateMask(formatStr),

package/esm/DatePicker/Toolbar.js

@@ -80,7 +80,7 @@ var Toolbar = /*#__PURE__*/React.forwardRef(function (props, ref) {
         return;
       }
 
-      onClickShortcut === null || onClickShortcut === void 0 ? void 0 : onClickShortcut(value, closeOverlay !== null && closeOverlay !== void 0 ? closeOverlay : false, event);
+      onClickShortcut === null || onClickShortcut === void 0 ? void 0 : onClickShortcut(value, closeOverlay !== false ? true : false, event);
     };
 
     return /*#__PURE__*/React.createElement(Button, {

package/esm/DateRangePicker/DateRangePicker.d.ts

@@ -3,7 +3,7 @@ import { FormControlBaseProps, PickerBaseProps } from '../@types/common';
 import { PickerComponent, PickerToggleProps } from '../Picker';
 import { DisabledDateFunction, RangeType, DateRange } from './types';
 export interface DateRangePickerProps extends PickerBaseProps, FormControlBaseProps<DateRange | null>, Pick<PickerToggleProps, 'caretAs' | 'readOnly' | 'plaintext'> {
-    /** Configure shortcut options */
+    /** Predefined date ranges */
     ranges?: RangeType[];
     /** Format date */
     format?: string;

package/esm/DateRangePicker/DateRangePicker.js

@@ -135,11 +135,31 @@ var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
    */
 
   var updateCalendarDateRange = useCallback(function (value, calendarKey) {
+    var nextValue = value;
+    var shouldTime = DateUtils.shouldTime,
+        getHours = DateUtils.getHours,
+        getMinutes = DateUtils.getMinutes,
+        getSeconds = DateUtils.getSeconds,
+        set = DateUtils.set;
+
+    if (shouldTime(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 _endDate = set(addMonths(_startDate, 1), {
+        hours: getHours(calendarEndDate),
+        minutes: getMinutes(calendarEndDate),
+        seconds: getSeconds(calendarEndDate)
+      });
+
+      nextValue = [_startDate, _endDate];
+    }
+
     setCalendarDate(getCalendarDate({
-      value: value,
+      value: nextValue,
       calendarKey: calendarKey
     }));
-  }, []); // if valueProp changed then update selectValue/hoverValue
+  }, [calendarDate, defaultCalendarValue, formatStr]); // if valueProp changed then update selectValue/hoverValue
 
   useEffect(function () {
     setSelectedDates(valueProp !== null && valueProp !== void 0 ? valueProp : []);
@@ -435,10 +455,11 @@ var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var nextCalendarDate;
 
     if (value && value.length) {
-      var _startDate = value[0],
+      var _startDate2 = value[0],
           endData = value[1];
-      nextCalendarDate = [_startDate, isSameMonth(_startDate, endData) ? addMonths(endData, 1) : endData];
+      nextCalendarDate = [_startDate2, isSameMonth(_startDate2, endData) ? addMonths(endData, 1) : endData];
     } else {
+      // Reset the date on the calendar to the default date
       nextCalendarDate = getCalendarDate({
         value: defaultCalendarValue !== null && defaultCalendarValue !== void 0 ? defaultCalendarValue : null
       });
@@ -598,7 +619,7 @@ var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     as: toggleAs,
     ref: targetRef,
     appearance: appearance,
-    input: true,
+    editable: true,
     inputMask: DateUtils.getDateMask(rangeFormatStr),
     inputValue: value ? getDisplayString(value, true) : '',
     inputPlaceholder: typeof placeholder === 'string' && placeholder ? placeholder : rangeFormatStr,

package/esm/Overlay/OverlayTrigger.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _isUndefined from "lodash/isUndefined";
-import React, { useRef, useEffect, useImperativeHandle, useCallback, useContext, useState } from 'react';
+import React, { useRef, useEffect, useImperativeHandle, useCallback, useContext, useState, useMemo } from 'react';
 import get from 'lodash/get';
 import isNil from 'lodash/isNil';
 import contains from 'dom-lib/contains';
@@ -258,56 +258,65 @@ var OverlayTrigger = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var preventDefault = useCallback(function (event) {
     event.preventDefault();
   }, []);
-  var triggerEvents = {
-    onClick: onClick,
-    onContextMenu: onContextMenu,
-    onMouseOver: onMouseOver,
-    onMouseOut: onMouseOut,
-    onFocus: onFocus,
-    onBlur: onBlur,
-    onMouseMove: onMouseMove
-  };
+  var triggerEvents = useMemo(function () {
+    // Pass events by props
+    var events = {
+      onClick: onClick,
+      onContextMenu: onContextMenu,
+      onMouseOver: onMouseOver,
+      onMouseOut: onMouseOut,
+      onFocus: onFocus,
+      onBlur: onBlur,
+      onMouseMove: onMouseMove
+    }; // When trigger is disabled, no predefined event listeners are added.
+
+    if (disabled || readOnly || plaintext || trigger === 'none') {
+      return events;
+    } // Get the cursor position through onMouseMove.
+    // https://rsuitejs.com/components/tooltip/#follow-cursor
+
+
+    if (followCursor) {
+      events.onMouseMove = createChainedFunction(handledMoveOverlay, onMouseMove);
+    } // The `click` event is usually used in `toggle` scenarios.
+    // The first click will open and the second click will close.
+
 
-  if (!disabled && !readOnly && !plaintext) {
     if (isOneOf('click', trigger)) {
-      triggerEvents.onClick = createChainedFunction(handleOpenState, triggerEvents.onClick);
-    }
+      events.onClick = createChainedFunction(handleOpenState, events.onClick);
+      return events;
+    } // The difference between it and the click event is that it does not trigger the close.
 
-    if (isOneOf('contextMenu', trigger)) {
-      triggerEvents.onContextMenu = createChainedFunction(preventDefault, handleOpenState, triggerEvents.onContextMenu);
-    }
 
     if (isOneOf('active', trigger)) {
-      triggerEvents.onClick = createChainedFunction(handleDelayedOpen, triggerEvents.onClick);
+      events.onClick = createChainedFunction(handleDelayedOpen, events.onClick);
+      return events;
     }
 
     if (isOneOf('hover', trigger)) {
-      var onMouseOverListener = null;
-      var onMouseOutListener = null;
-
-      if (trigger !== 'none') {
-        onMouseOverListener = function onMouseOverListener(e) {
-          return onMouseEventHandler(handleDelayedOpen, e);
-        };
+      var onMouseOverListener = function onMouseOverListener(e) {
+        return onMouseEventHandler(handleDelayedOpen, e);
+      };
 
-        onMouseOutListener = function onMouseOutListener(e) {
-          return onMouseEventHandler(handleDelayedClose, e);
-        };
-      }
+      var onMouseOutListener = function onMouseOutListener(e) {
+        return onMouseEventHandler(handleDelayedClose, e);
+      };
 
-      triggerEvents.onMouseOver = createChainedFunction(onMouseOverListener, onMouseOver);
-      triggerEvents.onMouseOut = createChainedFunction(onMouseOutListener, onMouseOut);
+      events.onMouseOver = createChainedFunction(onMouseOverListener, events.onMouseOver);
+      events.onMouseOut = createChainedFunction(onMouseOutListener, events.onMouseOut);
     }
 
     if (isOneOf('focus', trigger)) {
-      triggerEvents.onFocus = createChainedFunction(handleDelayedOpen, onFocus);
-      triggerEvents.onBlur = createChainedFunction(handleDelayedClose, onBlur);
+      events.onFocus = createChainedFunction(handleDelayedOpen, events.onFocus);
+      events.onBlur = createChainedFunction(handleDelayedClose, events.onBlur);
     }
 
-    if (trigger !== 'none' && followCursor) {
-      triggerEvents.onMouseMove = createChainedFunction(handledMoveOverlay, onMouseMove);
+    if (isOneOf('contextMenu', trigger)) {
+      events.onContextMenu = createChainedFunction(preventDefault, handleOpenState, events.onContextMenu);
     }
-  }
+
+    return events;
+  }, [disabled, followCursor, handleDelayedClose, handleDelayedOpen, handleOpenState, handledMoveOverlay, onBlur, onClick, onContextMenu, onFocus, onMouseMove, onMouseOut, onMouseOver, plaintext, preventDefault, readOnly, trigger]);
 
   var renderOverlay = function renderOverlay() {
     var overlayProps = _extends({}, rest, {

package/esm/Picker/DropdownMenu.d.ts

@@ -19,7 +19,7 @@ export interface DropdownMenuProps<Multiple = false> extends StandardProps, Omit
     rowHeight?: number;
     rowGroupHeight?: number;
     virtualized?: boolean;
-    listProps?: ListProps;
+    listProps?: Partial<ListProps>;
     /** Custom selected option */
     renderMenuItem?: (itemLabel: React.ReactNode, item: any) => React.ReactNode;
     renderMenuGroup?: (title: React.ReactNode, item: any) => React.ReactNode;

package/esm/Picker/PickerToggle.d.ts

@@ -15,7 +15,7 @@ export interface PickerToggleProps extends ToggleButtonProps {
     readOnly?: boolean;
     plaintext?: boolean;
     tabIndex?: number;
-    input?: boolean;
+    editable?: boolean;
     inputPlaceholder?: string;
     inputMask?: (string | RegExp)[];
     onInputChange?: (value: string, event: React.ChangeEvent) => void;

package/esm/Picker/PickerToggle.js

@@ -29,12 +29,12 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
       readOnly = props.readOnly,
       plaintext = props.plaintext,
       hasValue = props.hasValue,
+      editable = props.editable,
       cleanableProp = props.cleanable,
       _props$tabIndex = props.tabIndex,
-      tabIndex = _props$tabIndex === void 0 ? 0 : _props$tabIndex,
+      tabIndexProp = _props$tabIndex === void 0 ? editable ? -1 : 0 : _props$tabIndex,
       id = props.id,
       value = props.value,
-      input = props.input,
       inputPlaceholder = props.inputPlaceholder,
       inputValueProp = props.inputValue,
       _props$inputMask = props.inputMask,
@@ -52,9 +52,10 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
       _props$caretAs = props.caretAs,
       caretAs = _props$caretAs === void 0 ? caretComponent : _props$caretAs,
       label = props.label,
-      rest = _objectWithoutPropertiesLoose(props, ["active", "as", "classPrefix", "children", "caret", "className", "disabled", "readOnly", "plaintext", "hasValue", "cleanable", "tabIndex", "id", "value", "input", "inputPlaceholder", "inputValue", "inputMask", "onInputChange", "onInputPressEnter", "onInputBlur", "onInputFocus", "onClean", "onFocus", "onBlur", "placement", "caretComponent", "caretAs", "label"]);
+      rest = _objectWithoutPropertiesLoose(props, ["active", "as", "classPrefix", "children", "caret", "className", "disabled", "readOnly", "plaintext", "hasValue", "editable", "cleanable", "tabIndex", "id", "value", "inputPlaceholder", "inputValue", "inputMask", "onInputChange", "onInputPressEnter", "onInputBlur", "onInputFocus", "onClean", "onFocus", "onBlur", "placement", "caretComponent", "caretAs", "label"]);
 
   var inputRef = useRef(null);
+  var comboboxRef = useRef(null);
 
   var _useState = useState(false),
       activeState = _useState[0],
@@ -74,30 +75,46 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
       setInputValue = _useState2[1];
 
   useEffect(function () {
-    var value = getInputValue();
-    setInputValue(value);
+    if (comboboxRef.current) {
+      var _value = getInputValue();
+
+      setInputValue(_value);
+    }
   }, [getInputValue]);
   var classes = merge(className, withClassPrefix({
     active: activeProp || activeState
   }));
   var handleFocus = useCallback(function (event) {
     setActive(true);
-    onFocus === null || onFocus === void 0 ? void 0 : onFocus(event);
 
-    if (input) {
-      var _inputRef$current;
+    if (editable) {
+      // Avoid firing the onFocus event twice when DatePicker and DateRangePicker allow keyboard input.
+      if (event.target === inputRef.current) {
+        onFocus === null || onFocus === void 0 ? void 0 : onFocus(event);
+      } // Force the input to be focused and editable.
 
-      (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
+
+      if (document.activeElement === comboboxRef.current) {
+        var _inputRef$current;
+
+        (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
+      }
+    } else {
+      onFocus === null || onFocus === void 0 ? void 0 : onFocus(event);
     }
-  }, [input, onFocus]);
+  }, [editable, onFocus]);
   var handleBlur = useCallback(function (event) {
-    if (inputRef.current && document.activeElement !== inputRef.current) {
+    if (inputRef.current && !editable) {
+      setActive(false);
+    } // When activeElement is an input, it remains active.
+
+
+    if (editable && inputRef.current && document.activeElement !== inputRef.current) {
       setActive(false);
-      inputRef.current.blur();
     }
 
     onBlur === null || onBlur === void 0 ? void 0 : onBlur(event);
-  }, [onBlur]);
+  }, [editable, onBlur]);
 
   var handleInputBlur = function handleInputBlur(event) {
     setInputValue(getInputValue());
@@ -105,10 +122,13 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
   };
 
   var handleClean = useCallback(function (event) {
+    var _inputRef$current2, _comboboxRef$current;
+
     event.stopPropagation();
-    onClean === null || onClean === void 0 ? void 0 : onClean(event);
-    setActive(false);
-  }, [onClean]);
+    onClean === null || onClean === void 0 ? void 0 : onClean(event); // When the value is cleared, the current component is still in focus.
+
+    editable ? (_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : _inputRef$current2.focus() : (_comboboxRef$current = comboboxRef.current) === null || _comboboxRef$current === void 0 ? void 0 : _comboboxRef$current.focus();
+  }, [editable, onClean]);
   var handleInputChange = useCallback(function (event) {
     var _event$target;
 
@@ -117,10 +137,18 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onInputChange === null || onInputChange === void 0 ? void 0 : onInputChange(value, event);
   }, [onInputChange]);
   var handleInputKeyDown = useCallback(function (event) {
-    if (input && event.key === KEY_VALUES.ENTER) {
+    if (editable && event.key === KEY_VALUES.ENTER) {
       onInputPressEnter === null || onInputPressEnter === void 0 ? void 0 : onInputPressEnter(event);
     }
-  }, [onInputPressEnter, input]);
+  }, [onInputPressEnter, editable]);
+  var renderInput = useCallback(function (ref, props) {
+    return /*#__PURE__*/React.createElement("input", _extends({
+      ref: mergeRefs(inputRef, ref),
+      style: {
+        pointerEvents: editable ? undefined : 'none'
+      }
+    }, props));
+  }, [editable]);
   var ToggleCaret = useToggleCaret(placement);
   var Caret = caretAs !== null && caretAs !== void 0 ? caretAs : ToggleCaret;
 
@@ -133,7 +161,8 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
   var showCleanButton = cleanableProp && hasValue && !readOnly; // When the component is read-only or disabled, the input is not interactive.
 
-  var inputFocused = readOnly || disabled ? false : input && activeState;
+  var inputFocused = readOnly || disabled ? false : editable && activeState;
+  var tabIndex = disabled ? undefined : tabIndexProp;
   return /*#__PURE__*/React.createElement(Component, _extends({
     role: "combobox",
     "aria-haspopup": "listbox",
@@ -141,9 +170,9 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     "aria-disabled": disabled,
     "aria-owns": id ? id + "-listbox" : undefined
   }, rest, {
-    ref: ref,
+    ref: mergeRefs(comboboxRef, ref),
     disabled: disabled,
-    tabIndex: disabled ? undefined : tabIndex,
+    tabIndex: tabIndex,
     className: classes,
     onFocus: !disabled ? handleFocus : null // The debounce is set to 200 to solve the flicker caused by the switch between input and div.
     ,
@@ -160,16 +189,12 @@ var PickerToggle = /*#__PURE__*/React.forwardRef(function (props, ref) {
     readOnly: !inputFocused,
     disabled: disabled,
     "aria-controls": id ? id + "-listbox" : undefined,
-    tabIndex: -1,
+    tabIndex: editable ? 0 : -1,
     className: prefix('textbox', {
       'read-only': !inputFocused
     }),
     placeholder: inputPlaceholder,
-    render: function render(ref, props) {
-      return /*#__PURE__*/React.createElement("input", _extends({
-        ref: mergeRefs(inputRef, ref)
-      }, props));
-    }
+    render: renderInput
   }), children ? /*#__PURE__*/React.createElement("span", {
     className: prefix(hasValue ? 'value' : 'placeholder'),
     "aria-placeholder": typeof children === 'string' ? children : undefined

package/esm/SelectPicker/SelectPicker.d.ts

@@ -1,8 +1,8 @@
 import React, { Ref } from 'react';
 import { PickerLocale } from '../locales';
 import { PickerInstance, PickerToggleProps } from '../Picker';
+import { ListProps } from '../Picker/VirtualizedList';
 import { FormControlPickerProps, ItemDataType } from '../@types/common';
-import { ListProps } from 'react-virtualized/dist/commonjs/List';
 export interface SelectProps<T> {
     /** Set group condition key in data */
     groupBy?: string;
@@ -14,7 +14,7 @@ export interface SelectProps<T> {
      * List-related properties in `react-virtualized`
      * https://github.com/bvaughn/react-virtualized/blob/master/docs/List.md#prop-types
      */
-    listProps?: ListProps;
+    listProps?: Partial<ListProps>;
     /** Custom search rules. */
     searchBy?: (keyword: string, label: React.ReactNode, item: ItemDataType) => boolean;
     /** Sort options */

package/esm/SelectPicker/test/SelectPicker.test.js

@@ -85,4 +85,13 @@ React.createElement(SelectPicker, {
     return /*#__PURE__*/React.createElement("div", null);
   },
   data: []
+}); // Override the default value of listProps.
+
+/*#__PURE__*/
+React.createElement(SelectPicker, {
+  data: [],
+  virtualized: true,
+  listProps: {
+    rowHeight: 70
+  }
 });

package/esm/Tree/Tree.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { StandardProps, ItemDataType, RsRefForwardingComponent } from '../@types/common';
-import { ListProps } from 'react-virtualized/dist/commonjs/List';
+import { ListProps } from '../Picker/VirtualizedList';
 /**
  * Tree Node Drag Type
  */
@@ -50,7 +50,7 @@ export interface TreeBaseProps<ValueType = string | number, ItemDataType = Recor
      * List-related properties in `react-virtualized`
      * https://github.com/bvaughn/react-virtualized/blob/master/docs/List.md#prop-types
      */
-    listProps?: ListProps;
+    listProps?: Partial<ListProps>;
     /** Expand all nodes By default */
     defaultExpandAll?: boolean;
     /** searchKeyword (Controlled) */

package/esm/Tree/test/Tree.test.d.ts

@@ -0,0 +1 @@
+export {};

package/esm/Tree/test/Tree.test.js

@@ -0,0 +1,11 @@
+import React from 'react';
+import Tree from '../Tree'; // Override the default value of listProps.
+
+/*#__PURE__*/
+React.createElement(Tree, {
+  data: [],
+  virtualized: true,
+  listProps: {
+    rowHeight: 70
+  }
+});

package/esm/utils/dateUtils.d.ts

@@ -35,6 +35,7 @@ export { default as startOfWeek } from 'date-fns/startOfWeek';
 export { default as subDays } from 'date-fns/subDays';
 export { default as isMatch } from 'date-fns/isMatch';
 export { default as isValid } from 'date-fns/isValid';
+export { default as set } from 'date-fns/set';
 export declare type CalendarOnlyPropsType = 'disabledHours' | 'disabledMinutes' | 'disabledSeconds' | 'hideHours' | 'hideMinutes' | 'hideSeconds';
 export declare const calendarOnlyProps: CalendarOnlyPropsType[];
 /**

package/esm/utils/dateUtils.js

@@ -42,6 +42,7 @@ export { default as startOfWeek } from 'date-fns/startOfWeek';
 export { default as subDays } from 'date-fns/subDays';
 export { default as isMatch } from 'date-fns/isMatch';
 export { default as isValid } from 'date-fns/isValid';
+export { default as set } from 'date-fns/set';
 var disabledTimeProps = ['disabledHours', 'disabledMinutes', 'disabledSeconds'];
 var hideTimeProps = ['hideHours', 'hideMinutes', 'hideSeconds'];
 export var calendarOnlyProps = disabledTimeProps.concat(hideTimeProps);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsuite",
-  "version": "5.16.2",
+  "version": "5.16.5",
   "description": "A suite of react components",
   "main": "cjs/index.js",
   "module": "esm/index.js",