rsuite 5.16.4 → 5.16.5

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [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

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

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
       });

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);