rsuite 5.17.0-beta → 5.17.0-beta.1

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [5.16.4](https://github.com/rsuite/rsuite/compare/v5.16.3...v5.16.4) (2022-08-04)
+
+### Bug Fixes
+
+- **DatePicker:** fix issues with focus event ([#2636](https://github.com/rsuite/rsuite/issues/2636)) ([76b68aa](https://github.com/rsuite/rsuite/commit/76b68aa79dd129a210238517c279fe41b0da89ac))
+
 ## [5.16.3](https://github.com/rsuite/rsuite/compare/v5.16.2...v5.16.3) (2022-07-29)
 
 ### Bug Fixes

package/Picker/styles/index.less

@@ -104,6 +104,7 @@
     padding-right: 32px;
     color: var(--rs-text-primary);
     background-color: var(--rs-input-bg);
+    outline: none;
   }
 
   &.rs-btn-lg &-textbox {
@@ -120,7 +121,6 @@
 
   &-read-only {
     opacity: 0;
-    pointer-events: none;
   }
 }
 

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

@@ -44,6 +44,8 @@ var AutoComplete = /*#__PURE__*/_react.default.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,
@@ -61,7 +63,7 @@ var AutoComplete = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       onFocus = props.onFocus,
       onBlur = props.onBlur,
       onMenuFocus = props.onMenuFocus,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(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 = (0, _objectWithoutPropertiesLoose2.default)(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 = (0, _utils3.transformData)(data);
 
   var _useControlled = (0, _utils.useControlled)(valueProp, defaultValue),
@@ -203,7 +205,8 @@ var AutoComplete = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       style: styles,
       className: className,
       onKeyDown: handleKeyDownEvent,
-      target: triggerRef
+      target: triggerRef,
+      autoWidth: menuAutoWidth
     }, renderMenu ? renderMenu(menu) : menu);
   };
 
@@ -239,6 +242,7 @@ AutoComplete.propTypes = (0, _extends2.default)({}, _utils2.animationPropTypes,
   defaultValue: _propTypes.default.string,
   className: _propTypes.default.string,
   menuClassName: _propTypes.default.string,
+  menuAutoWidth: _propTypes.default.bool,
   placement: _propTypes.default.oneOf(_utils.PLACEMENT),
   onFocus: _propTypes.default.func,
   onMenuFocus: _propTypes.default.func,

package/cjs/AutoComplete/test/AutoComplete.test.d.ts

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

package/cjs/AutoComplete/test/AutoComplete.test.js

@@ -0,0 +1,23 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _AutoComplete = _interopRequireDefault(require("../AutoComplete"));
+
+/*#__PURE__*/
+_react.default.createElement(_AutoComplete.default, {
+  data: ['item1', 'item2']
+});
+
+/*#__PURE__*/
+_react.default.createElement(_AutoComplete.default, {
+  data: [{
+    label: 'item1',
+    value: 'item1'
+  }, {
+    label: 'item2',
+    value: 'item2'
+  }]
+});

package/cjs/DatePicker/DatePicker.js

@@ -467,7 +467,7 @@ var DatePicker = /*#__PURE__*/_react.default.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: _utils.DateUtils.getDateMask(formatStr),

package/cjs/DateRangePicker/DateRangePicker.js

@@ -624,7 +624,7 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     as: toggleAs,
     ref: targetRef,
     appearance: appearance,
-    input: true,
+    editable: true,
     inputMask: _utils.DateUtils.getDateMask(rangeFormatStr),
     inputValue: value ? getDisplayString(value, true) : '',
     inputPlaceholder: typeof placeholder === 'string' && placeholder ? placeholder : rangeFormatStr,

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/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.js

@@ -278,56 +278,65 @@ var OverlayTrigger = /*#__PURE__*/_react.default.forwardRef(function (props, ref
   var preventDefault = (0, _react.useCallback)(function (event) {
     event.preventDefault();
   }, []);
-  var triggerEvents = {
-    onClick: onClick,
-    onContextMenu: onContextMenu,
-    onMouseOver: onMouseOver,
-    onMouseOut: onMouseOut,
-    onFocus: onFocus,
-    onBlur: onBlur,
-    onMouseMove: onMouseMove
-  };
+  var triggerEvents = (0, _react.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 = (0, _utils.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 ((0, _isOneOf.default)('click', trigger)) {
-      triggerEvents.onClick = (0, _utils.createChainedFunction)(handleOpenState, triggerEvents.onClick);
-    }
+      events.onClick = (0, _utils.createChainedFunction)(handleOpenState, events.onClick);
+      return events;
+    } // The difference between it and the click event is that it does not trigger the close.
 
-    if ((0, _isOneOf.default)('contextMenu', trigger)) {
-      triggerEvents.onContextMenu = (0, _utils.createChainedFunction)(preventDefault, handleOpenState, triggerEvents.onContextMenu);
-    }
 
     if ((0, _isOneOf.default)('active', trigger)) {
-      triggerEvents.onClick = (0, _utils.createChainedFunction)(handleDelayedOpen, triggerEvents.onClick);
+      events.onClick = (0, _utils.createChainedFunction)(handleDelayedOpen, events.onClick);
+      return events;
     }
 
     if ((0, _isOneOf.default)('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 = (0, _utils.createChainedFunction)(onMouseOverListener, onMouseOver);
-      triggerEvents.onMouseOut = (0, _utils.createChainedFunction)(onMouseOutListener, onMouseOut);
+      events.onMouseOver = (0, _utils.createChainedFunction)(onMouseOverListener, events.onMouseOver);
+      events.onMouseOut = (0, _utils.createChainedFunction)(onMouseOutListener, events.onMouseOut);
     }
 
     if ((0, _isOneOf.default)('focus', trigger)) {
-      triggerEvents.onFocus = (0, _utils.createChainedFunction)(handleDelayedOpen, onFocus);
-      triggerEvents.onBlur = (0, _utils.createChainedFunction)(handleDelayedClose, onBlur);
+      events.onFocus = (0, _utils.createChainedFunction)(handleDelayedOpen, events.onFocus);
+      events.onBlur = (0, _utils.createChainedFunction)(handleDelayedClose, events.onBlur);
     }
 
-    if (trigger !== 'none' && followCursor) {
-      triggerEvents.onMouseMove = (0, _utils.createChainedFunction)(handledMoveOverlay, onMouseMove);
+    if ((0, _isOneOf.default)('contextMenu', trigger)) {
+      events.onContextMenu = (0, _utils.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 = (0, _extends2.default)({}, rest, {

package/cjs/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/cjs/Picker/PickerToggle.js

@@ -51,12 +51,12 @@ var PickerToggle = /*#__PURE__*/_react.default.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,
@@ -74,8 +74,9 @@ var PickerToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       _props$caretAs = props.caretAs,
       caretAs = _props$caretAs === void 0 ? caretComponent : _props$caretAs,
       label = props.label,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(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 = (0, _objectWithoutPropertiesLoose2.default)(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 = (0, _react.useRef)(null);
+  var comboboxRef = (0, _react.useRef)(null);
 
   var _useState = (0, _react.useState)(false),
       activeState = _useState[0],
@@ -95,30 +96,46 @@ var PickerToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       setInputValue = _useState2[1];
 
   (0, _react.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 = (0, _react.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 = (0, _react.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());
@@ -126,10 +143,13 @@ var PickerToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
   };
 
   var handleClean = (0, _react.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 = (0, _react.useCallback)(function (event) {
     var _event$target;
 
@@ -138,10 +158,18 @@ var PickerToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     onInputChange === null || onInputChange === void 0 ? void 0 : onInputChange(value, event);
   }, [onInputChange]);
   var handleInputKeyDown = (0, _react.useCallback)(function (event) {
-    if (input && event.key === _utils.KEY_VALUES.ENTER) {
+    if (editable && event.key === _utils.KEY_VALUES.ENTER) {
       onInputPressEnter === null || onInputPressEnter === void 0 ? void 0 : onInputPressEnter(event);
     }
-  }, [onInputPressEnter, input]);
+  }, [onInputPressEnter, editable]);
+  var renderInput = (0, _react.useCallback)(function (ref, props) {
+    return /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({
+      ref: (0, _utils.mergeRefs)(inputRef, ref),
+      style: {
+        pointerEvents: editable ? undefined : 'none'
+      }
+    }, props));
+  }, [editable]);
   var ToggleCaret = (0, _useToggleCaret.default)(placement);
   var Caret = caretAs !== null && caretAs !== void 0 ? caretAs : ToggleCaret;
 
@@ -154,7 +182,8 @@ var PickerToggle = /*#__PURE__*/_react.default.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.default.createElement(Component, (0, _extends2.default)({
     role: "combobox",
     "aria-haspopup": "listbox",
@@ -162,9 +191,9 @@ var PickerToggle = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     "aria-disabled": disabled,
     "aria-owns": id ? id + "-listbox" : undefined
   }, rest, {
-    ref: ref,
+    ref: (0, _utils.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.
     ,
@@ -181,16 +210,12 @@ var PickerToggle = /*#__PURE__*/_react.default.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.default.createElement("input", (0, _extends2.default)({
-        ref: (0, _utils.mergeRefs)(inputRef, ref)
-      }, props));
-    }
+    render: renderInput
   }), children ? /*#__PURE__*/_react.default.createElement("span", {
     className: prefix(hasValue ? 'value' : 'placeholder'),
     "aria-placeholder": typeof children === 'string' ? children : undefined

package/dist/rsuite-rtl.css

@@ -10939,6 +10939,7 @@ textarea.rs-picker-search-input {
   color: var(--rs-text-primary);
   background-color: #fff;
   background-color: var(--rs-input-bg);
+  outline: none;
 }
 .rs-picker-toggle.rs-btn-lg .rs-picker-toggle-textbox {
   padding-right: 14px;
@@ -10951,7 +10952,6 @@ textarea.rs-picker-search-input {
 }
 .rs-picker-toggle-read-only {
   opacity: 0;
-  pointer-events: none;
 }
 .rs-picker-default .rs-btn,
 .rs-picker-default .rs-picker-toggle {