rsuite 5.16.3 → 5.16.6

package/Button/styles/index.less

@@ -44,7 +44,7 @@
   });
 
   .button-disabled({
-    cursor: not-allowed;
+    cursor: @cursor-disabled;
     color: var(--rs-btn-default-disabled-text);
     background-color: var(--rs-btn-default-disabled-bg);
   });

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [5.16.6](https://github.com/rsuite/rsuite/compare/v5.16.5...v5.16.6) (2022-08-18)
+
+### Bug Fixes
+
+- **Button:** use [@cursor-disabled](https://github.com/cursor-disabled) intead of hardcoded cursor ([#2658](https://github.com/rsuite/rsuite/issues/2658)) ([5731762](https://github.com/rsuite/rsuite/commit/57317622eb2d65e94e0a8bb962512232cc4dfd3d))
+- **DatePicker,DateRangePicker:** display month name as title of month calendar view ([#2660](https://github.com/rsuite/rsuite/issues/2660)) ([1e812ef](https://github.com/rsuite/rsuite/commit/1e812ef7510ea7b82beda7c058bd07080db198f5))
+- **Form.Control:** apply className to accepter component ([#2662](https://github.com/rsuite/rsuite/issues/2662)) ([a164d28](https://github.com/rsuite/rsuite/commit/a164d287acfe8be2f98080e3b7eb15971f47809f))
+
+## [5.16.5](https://github.com/rsuite/rsuite/compare/v5.16.4...v5.16.5) (2022-08-11)
+
+### Bug Fixes
+
+- **AutoComplete:** fix `listbox` not keeping the same width as `input` ([#2645](https://github.com/rsuite/rsuite/issues/2645)) ([ad09288](https://github.com/rsuite/rsuite/commit/ad09288e0fc38f964524466a79ca25532dc221f8))
+- **AutoComplete:** fix missing definition of string in datatype ([#2644](https://github.com/rsuite/rsuite/issues/2644)) ([528e291](https://github.com/rsuite/rsuite/commit/528e29154d188d928e3d93853f5ed0673b932b4a))
+- **DateRangePicker:** fix default time not working ([#2642](https://github.com/rsuite/rsuite/issues/2642)) ([915de28](https://github.com/rsuite/rsuite/commit/915de2820af418195e7f9a6ed228c1b05362d633))
+
+## [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/Calendar/Header.js

@@ -90,14 +90,12 @@ var Header = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     return timeFormat.join(':');
   }, [format, showMeridian]);
   var getDateFormat = (0, _react.useCallback)(function () {
-    if (showDate) {
-      return (locale === null || locale === void 0 ? void 0 : locale.formattedDayPattern) || 'yyyy-MM-dd';
-    } else if (showMonth) {
+    if (showMonth) {
       return (locale === null || locale === void 0 ? void 0 : locale.formattedMonthPattern) || 'yyyy-MM';
     }
 
     return 'yyyy';
-  }, [locale, showDate, showMonth]);
+  }, [locale, showMonth]);
   var renderTitle = (0, _react.useCallback)(function () {
     var _renderTitleProp;
 

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

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

package/cjs/DatePicker/DatePicker.js

@@ -101,7 +101,8 @@ var DatePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
 
   var _useCalendarDate = (0, _useCalendarDate2.default)(valueProp, calendarDefaultDate),
       calendarDate = _useCalendarDate.calendarDate,
-      setCalendarDate = _useCalendarDate.setCalendarDate;
+      setCalendarDate = _useCalendarDate.setCalendarDate,
+      resetCalendarDate = _useCalendarDate.resetCalendarDate;
 
   var _useState = (0, _react.useState)(),
       inputState = _useState[0],
@@ -244,9 +245,9 @@ var DatePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
    */
 
   var handleClean = (0, _react.useCallback)(function (event) {
-    setCalendarDate(new Date());
     updateValue(event, null);
-  }, [setCalendarDate, updateValue]);
+    resetCalendarDate();
+  }, [resetCalendarDate, updateValue]);
   /**
    * Handle keyboard events.
    */
@@ -467,7 +468,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

@@ -161,11 +161,31 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
    */
 
   var updateCalendarDateRange = (0, _react.useCallback)(function (value, calendarKey) {
+    var nextValue = value;
+    var shouldTime = _utils.DateUtils.shouldTime,
+        getHours = _utils.DateUtils.getHours,
+        getMinutes = _utils.DateUtils.getMinutes,
+        getSeconds = _utils.DateUtils.getSeconds,
+        set = _utils.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((0, _dateUtils.addMonths)(_startDate, 1), {
+        hours: getHours(calendarEndDate),
+        minutes: getMinutes(calendarEndDate),
+        seconds: getSeconds(calendarEndDate)
+      });
+
+      nextValue = [_startDate, _endDate];
+    }
+
     setCalendarDate((0, _utils2.getCalendarDate)({
-      value: value,
+      value: nextValue,
       calendarKey: calendarKey
     }));
-  }, []); // if valueProp changed then update selectValue/hoverValue
+  }, [calendarDate, defaultCalendarValue, formatStr]); // if valueProp changed then update selectValue/hoverValue
 
   (0, _react.useEffect)(function () {
     setSelectedDates(valueProp !== null && valueProp !== void 0 ? valueProp : []);
@@ -463,10 +483,11 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     var nextCalendarDate;
 
     if (value && value.length) {
-      var _startDate = value[0],
+      var _startDate2 = value[0],
           endData = value[1];
-      nextCalendarDate = [_startDate, (0, _dateUtils.isSameMonth)(_startDate, endData) ? (0, _dateUtils.addMonths)(endData, 1) : endData];
+      nextCalendarDate = [_startDate2, (0, _dateUtils.isSameMonth)(_startDate2, endData) ? (0, _dateUtils.addMonths)(endData, 1) : endData];
     } else {
+      // Reset the date on the calendar to the default date
       nextCalendarDate = (0, _utils2.getCalendarDate)({
         value: defaultCalendarValue !== null && defaultCalendarValue !== void 0 ? defaultCalendarValue : null
       });
@@ -624,7 +645,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/FormControl/FormControl.js

@@ -58,7 +58,6 @@ var FormControl = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       AccepterComponent = _props$accepter === void 0 ? _Input.default : _props$accepter,
       _props$classPrefix = props.classPrefix,
       classPrefix = _props$classPrefix === void 0 ? 'form-control' : _props$classPrefix,
-      className = props.className,
       checkAsync = props.checkAsync,
       checkTrigger = props.checkTrigger,
       _props$errorPlacement = props.errorPlacement,
@@ -78,7 +77,7 @@ var FormControl = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       _props$shouldResetWit = props.shouldResetWithUnmount,
       shouldResetWithUnmount = _props$shouldResetWit === void 0 ? false : _props$shouldResetWit,
       rule = props.rule,
-      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "accepter", "classPrefix", "className", "checkAsync", "checkTrigger", "errorPlacement", "errorMessage", "name", "value", "readOnly", "plaintext", "disabled", "onChange", "onBlur", "defaultValue", "shouldResetWithUnmount", "rule"]);
+      rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "accepter", "classPrefix", "checkAsync", "checkTrigger", "errorPlacement", "errorMessage", "name", "value", "readOnly", "plaintext", "disabled", "onChange", "onBlur", "defaultValue", "shouldResetWithUnmount", "rule"]);
 
   var _useContext2 = (0, _react.useContext)(_FormGroup.FormGroupContext),
       controlId = _useContext2.controlId;
@@ -100,10 +99,9 @@ var FormControl = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
 
   var _useClassNames = (0, _utils.useClassNames)(classPrefix),
       withClassPrefix = _useClassNames.withClassPrefix,
-      prefix = _useClassNames.prefix,
-      merge = _useClassNames.merge;
+      prefix = _useClassNames.prefix;
 
-  var classes = merge(className, withClassPrefix('wrapper'));
+  var classes = withClassPrefix('wrapper');
 
   var handleFieldChange = function handleFieldChange(value, event) {
     handleFieldCheck(value, trigger === 'change');

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/cjs/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/cjs/utils/dateUtils.js

@@ -6,7 +6,7 @@ exports.__esModule = true;
 exports.disabledTime = disabledTime;
 exports.getMonthView = getMonthView;
 exports.getDateMask = getDateMask;
-exports.shouldOnlyTime = exports.shouldDate = exports.shouldMonth = exports.shouldTime = exports.omitHideDisabledProps = exports.calendarOnlyProps = exports.isValid = exports.isMatch = exports.subDays = exports.startOfWeek = exports.startOfMonth = exports.startOfISOWeek = exports.startOfDay = exports.setYear = exports.setSeconds = exports.setMonth = exports.setMinutes = exports.setHours = exports.setDate = exports.parseISO = exports.parse = exports.isSameSecond = exports.isSameMonth = exports.isSameDay = exports.isEqual = exports.isBefore = exports.isAfter = exports.getYear = exports.getSeconds = exports.getMonth = exports.getMinutes = exports.getHours = exports.getDaysInMonth = exports.getDay = exports.getDate = exports.format = exports.endOfWeek = exports.endOfMonth = exports.endOfISOWeek = exports.endOfDay = exports.compareAsc = exports.addMonths = exports.addDays = void 0;
+exports.shouldOnlyTime = exports.shouldDate = exports.shouldMonth = exports.shouldTime = exports.omitHideDisabledProps = exports.calendarOnlyProps = exports.set = exports.isValid = exports.isMatch = exports.subDays = exports.startOfWeek = exports.startOfMonth = exports.startOfISOWeek = exports.startOfDay = exports.setYear = exports.setSeconds = exports.setMonth = exports.setMinutes = exports.setHours = exports.setDate = exports.parseISO = exports.parse = exports.isSameSecond = exports.isSameMonth = exports.isSameDay = exports.isEqual = exports.isBefore = exports.isAfter = exports.getYear = exports.getSeconds = exports.getMonth = exports.getMinutes = exports.getHours = exports.getDaysInMonth = exports.getDay = exports.getDate = exports.format = exports.endOfWeek = exports.endOfMonth = exports.endOfISOWeek = exports.endOfDay = exports.compareAsc = exports.addMonths = exports.addDays = void 0;
 
 var _pick = _interopRequireDefault(require("lodash/pick"));
 
@@ -159,6 +159,10 @@ exports.isMatch = _isMatch.default;
 var _isValid = _interopRequireDefault(require("date-fns/isValid"));
 
 exports.isValid = _isValid.default;
+
+var _set = _interopRequireDefault(require("date-fns/set"));
+
+exports.set = _set.default;
 var disabledTimeProps = ['disabledHours', 'disabledMinutes', 'disabledSeconds'];
 var hideTimeProps = ['hideHours', 'hideMinutes', 'hideSeconds'];
 var calendarOnlyProps = disabledTimeProps.concat(hideTimeProps);

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 {