rsuite 5.18.0-beta.3 → 5.18.1-beta.4

package/esm/Calendar/{Header.d.ts → CalendarHeader.d.ts}

@@ -1,20 +1,22 @@
 import React from 'react';
 import { RsRefForwardingComponent, WithAsProps } from '../@types/common';
-export interface HeaderProps extends WithAsProps {
+export interface CalendarHeaderProps {
     disabledBackward?: boolean;
     disabledForward?: boolean;
-    showDate?: boolean;
     showMeridian?: boolean;
+    onToggleMeridian?: (event: React.MouseEvent) => void;
+    renderTitle?: (date: Date) => React.ReactNode;
+    renderToolbar?: (date: Date) => React.ReactNode;
+}
+interface CalendarHeaderPrivateProps extends CalendarHeaderProps, WithAsProps {
+    showDate?: boolean;
     showMonth?: boolean;
     showTime?: boolean;
     disabledTime?: (date: Date) => boolean;
     onMoveBackward?: () => void;
     onMoveForward?: () => void;
-    onToggleMeridian?: (event: React.MouseEvent) => void;
     onToggleMonthDropdown?: (event: React.MouseEvent) => void;
     onToggleTimeDropdown?: (event: React.MouseEvent) => void;
-    renderTitle?: (date: Date) => React.ReactNode;
-    renderToolbar?: (date: Date) => React.ReactNode;
 }
-declare const Header: RsRefForwardingComponent<'div', HeaderProps>;
-export default Header;
+declare const CalendarHeader: RsRefForwardingComponent<'div', CalendarHeaderPrivateProps>;
+export default CalendarHeader;

package/esm/Calendar/{Header.js → CalendarHeader.js}

@@ -9,7 +9,7 @@ import Button from '../Button';
 import { useClassNames } from '../utils';
 import { FormattedDate } from '../CustomProvider';
 import { useCalendarContext } from './CalendarContext';
-var Header = /*#__PURE__*/React.forwardRef(function (props, ref) {
+var CalendarHeader = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _props$as = props.as,
       Component = _props$as === void 0 ? 'div' : _props$as,
       className = props.className,
@@ -134,8 +134,8 @@ var Header = /*#__PURE__*/React.forwardRef(function (props, ref) {
     formatStr: "a"
   }))), renderToolbar === null || renderToolbar === void 0 ? void 0 : renderToolbar(date));
 });
-Header.displayName = 'Header';
-Header.propTypes = {
+CalendarHeader.displayName = 'CalendarHeader';
+CalendarHeader.propTypes = {
   className: PropTypes.string,
   classPrefix: PropTypes.string,
   disabledBackward: PropTypes.bool,
@@ -153,4 +153,4 @@ Header.propTypes = {
   showMonth: PropTypes.bool,
   showTime: PropTypes.bool
 };
-export default Header;
+export default CalendarHeader;

package/esm/Calendar/Table.js

@@ -32,7 +32,7 @@ var Table = /*#__PURE__*/React.forwardRef(function (props, ref) {
     });
   }));
 });
-Table.displayName = 'Table';
+Table.displayName = 'CalendarTable';
 Table.propTypes = {
   rows: PropTypes.array,
   className: PropTypes.string,

package/esm/Calendar/TableHeaderRow.js

@@ -50,7 +50,7 @@ var TableHeaderRow = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }, locale === null || locale === void 0 ? void 0 : locale[key]));
   }));
 });
-TableHeaderRow.displayName = 'TableHeaderRow';
+TableHeaderRow.displayName = 'CalendarTableHeaderRow';
 TableHeaderRow.propTypes = {
   as: PropTypes.elementType,
   className: PropTypes.string,

package/esm/Calendar/TableRow.js

@@ -133,7 +133,7 @@ var TableRow = /*#__PURE__*/React.forwardRef(function (props, ref) {
     role: "rowheader"
   }, DateUtils.format(weekendDate, isoWeek ? 'I' : 'w')), renderDays());
 });
-TableRow.displayName = 'TableRow';
+TableRow.displayName = 'CalendarTableRow';
 TableRow.propTypes = {
   weekendDate: PropTypes.instanceOf(Date),
   className: PropTypes.string,

package/esm/Calendar/index.d.ts

@@ -1,8 +1,9 @@
-import CalendarPanel from './CalendarPanel';
-import Calendar, { CalendarState } from './Calendar';
+import Calendar from './Calendar';
+import CalendarContainer from './CalendarContainer';
+import { CalendarState } from './useCalendarState';
 import CalendarContext from './CalendarContext';
 import { CalendarContextValue } from './types';
-export { Calendar, CalendarContext, CalendarState };
+export { CalendarContainer, CalendarContext, CalendarState };
 export type { CalendarContextValue };
-export type { CalendarPanelProps } from './CalendarPanel';
-export default CalendarPanel;
+export type { CalendarProps } from './Calendar';
+export default Calendar;

package/esm/Calendar/index.js

@@ -1,5 +1,6 @@
-import CalendarPanel from './CalendarPanel';
-import Calendar, { CalendarState } from './Calendar';
+import Calendar from './Calendar';
+import CalendarContainer from './CalendarContainer';
+import { CalendarState } from './useCalendarState';
 import CalendarContext from './CalendarContext';
-export { Calendar, CalendarContext, CalendarState };
-export default CalendarPanel;
+export { CalendarContainer, CalendarContext, CalendarState };
+export default Calendar;

package/esm/Calendar/useCalendarState.d.ts

@@ -0,0 +1,11 @@
+export declare enum CalendarState {
+    'TIME' = "TIME",
+    'MONTH' = "MONTH"
+}
+declare const useCalendarState: (defaultState?: CalendarState) => {
+    calendarState: CalendarState | undefined;
+    reset: () => void;
+    openMonth: () => void;
+    openTime: () => void;
+};
+export default useCalendarState;

package/esm/Calendar/useCalendarState.js

@@ -0,0 +1,31 @@
+import { useCallback, useState } from 'react';
+export var CalendarState;
+
+(function (CalendarState) {
+  CalendarState["TIME"] = "TIME";
+  CalendarState["MONTH"] = "MONTH";
+})(CalendarState || (CalendarState = {}));
+
+var useCalendarState = function useCalendarState(defaultState) {
+  var _useState = useState(defaultState),
+      calendarState = _useState[0],
+      setCalendarState = _useState[1];
+
+  var reset = useCallback(function () {
+    setCalendarState(undefined);
+  }, []);
+  var openMonth = useCallback(function () {
+    setCalendarState(CalendarState.MONTH);
+  }, []);
+  var openTime = useCallback(function () {
+    setCalendarState(CalendarState.TIME);
+  }, []);
+  return {
+    calendarState: calendarState,
+    reset: reset,
+    openMonth: openMonth,
+    openTime: openTime
+  };
+};
+
+export default useCalendarState;

package/esm/DatePicker/DatePicker.js

@@ -7,12 +7,11 @@ import pick from 'lodash/pick';
 import omit from 'lodash/omit';
 import IconCalendar from '@rsuite/icons/legacy/Calendar';
 import IconClockO from '@rsuite/icons/legacy/ClockO';
-import { Calendar, CalendarState } from '../Calendar';
+import CalendarContainer from '../Calendar/CalendarContainer';
 import useCalendarDate from '../Calendar/useCalendarDate';
 import Toolbar from './Toolbar';
 import { composeFunctions, createChainedFunction, DateUtils, mergeRefs, useClassNames, useControlled, useCustom } from '../utils';
 import { PickerOverlay, pickerPropTypes, PickerToggle, PickerToggleTrigger, pickTriggerPropKeys, omitTriggerPropKeys, usePickerClassName, usePublicMethods, useToggleKeyDownEvent } from '../Picker';
-import { useCalendarState } from './utils';
 var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _props$as = props.as,
       Component = _props$as === void 0 ? 'div' : _props$as,
@@ -86,12 +85,6 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       inputState = _useState[0],
       setInputState = _useState[1];
 
-  var _useCalendarState = useCalendarState(),
-      calendarState = _useCalendarState.calendarState,
-      reset = _useCalendarState.reset,
-      openMonth = _useCalendarState.openMonth,
-      openTime = _useCalendarState.openTime;
-
   var _useState2 = useState(false),
       active = _useState2[0],
       setActive = _useState2[1];
@@ -189,32 +182,6 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     updateValue(event);
     onOk === null || onOk === void 0 ? void 0 : onOk(calendarDate, event);
   }, [updateValue, onOk, calendarDate]);
-  /**
-   * Toggle month selection panel
-   */
-
-  var handleMonthDropdown = useCallback(function () {
-    if (calendarState === CalendarState.DROP_MONTH) {
-      reset();
-    } else {
-      openMonth();
-    }
-
-    onToggleMonthDropdown === null || onToggleMonthDropdown === void 0 ? void 0 : onToggleMonthDropdown(calendarState !== CalendarState.DROP_MONTH);
-  }, [calendarState, onToggleMonthDropdown, openMonth, reset]);
-  /**
-   * Switch time selection panel
-   */
-
-  var handleTimeDropdown = useCallback(function () {
-    if (calendarState === CalendarState.DROP_TIME) {
-      reset();
-    } else {
-      openTime();
-    }
-
-    onToggleTimeDropdown === null || onToggleTimeDropdown === void 0 ? void 0 : onToggleTimeDropdown(calendarState !== CalendarState.DROP_TIME);
-  }, [calendarState, onToggleTimeDropdown, openTime, reset]);
   /**
    * Callback after clicking the clear button.
    */
@@ -243,7 +210,7 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }
 
     setCalendarDate( // Determine whether the current value contains time, if not, use calendarDate.
-    DateUtils.shouldTime(formatStr) ? nextValue : composeFunctions(function (d) {
+    DateUtils.shouldRenderTime(formatStr) ? nextValue : composeFunctions(function (d) {
       return DateUtils.setHours(d, DateUtils.getHours(calendarDate));
     }, function (d) {
       return DateUtils.setMinutes(d, DateUtils.getMinutes(calendarDate));
@@ -262,15 +229,14 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
   var handleChangePageDate = useCallback(function (nextPageDate, event) {
     setCalendarDate(nextPageDate);
-    reset();
     handleDateChange(nextPageDate); // Show only the calendar month panel. formatStr = 'yyyy-MM'
 
-    var onlyShowMonth = DateUtils.shouldMonth(formatStr) && !DateUtils.shouldDate(formatStr);
+    var onlyShowMonth = DateUtils.shouldRenderMonth(formatStr) && !DateUtils.shouldRenderDate(formatStr);
 
     if (oneTap && onlyShowMonth) {
       updateValue(event, nextPageDate);
     }
-  }, [formatStr, handleDateChange, oneTap, reset, setCalendarDate, updateValue]);
+  }, [formatStr, handleDateChange, oneTap, setCalendarDate, updateValue]);
   var disabledDate = useCallback(function (date) {
     var _disabledDateProp;
 
@@ -293,7 +259,7 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
     var date = parseDate(value, formatStr); // If only the time is included in the characters, it will default to today.
 
-    if (DateUtils.shouldOnlyTime(formatStr)) {
+    if (DateUtils.shouldOnlyRenderTime(formatStr)) {
       date = new Date(DateUtils.format(new Date(), 'yyyy-MM-dd') + " " + value);
     }
 
@@ -326,9 +292,8 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, [onOpen]);
   var handleExited = useCallback(function () {
     onClose === null || onClose === void 0 ? void 0 : onClose();
-    reset();
     setActive(false);
-  }, [onClose, reset]); // Check whether the time is within the time range of the shortcut option in the toolbar.
+  }, [onClose]); // Check whether the time is within the time range of the shortcut option in the toolbar.
 
   var disabledToolbarHandle = useCallback(function (date) {
     var _disabledDateProp2;
@@ -349,7 +314,7 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var inSameMonth = useCallback(function (date) {
     return DateUtils.isSameMonth(date, calendarDate);
   }, [calendarDate]);
-  var calendar = /*#__PURE__*/React.createElement(Calendar, _extends({}, calendarProps, {
+  var calendar = /*#__PURE__*/React.createElement(CalendarContainer, _extends({}, calendarProps, {
     locale: locale,
     showWeekNumbers: showWeekNumbers,
     showMeridian: showMeridian,
@@ -358,13 +323,12 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     format: formatStr,
     isoWeek: isoWeek,
     inSameMonth: inSameMonth,
-    calendarState: calendarState,
     calendarDate: calendarDate,
     onMoveForward: handleMoveForward,
     onMoveBackward: handleMoveBackward,
     onSelect: handleSelect,
-    onToggleMonthDropdown: handleMonthDropdown,
-    onToggleTimeDropdown: handleTimeDropdown,
+    onToggleMonthDropdown: onToggleMonthDropdown,
+    onToggleTimeDropdown: onToggleTimeDropdown,
     onChangePageDate: handleChangePageDate,
     onChangePageTime: handleChangePageTime,
     onToggleMeridian: handleToggleMeridian
@@ -419,7 +383,7 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     return (_renderValue = renderValue === null || renderValue === void 0 ? void 0 : renderValue(value, formatStr)) !== null && _renderValue !== void 0 ? _renderValue : formatDate(value, formatStr);
   }, [formatStr, formatDate, placeholder, renderValue, value]);
   var caretAs = useMemo(function () {
-    return caretAsProp || (DateUtils.shouldOnlyTime(formatStr) ? IconClockO : IconCalendar);
+    return caretAsProp || (DateUtils.shouldOnlyRenderTime(formatStr) ? IconClockO : IconCalendar);
   }, [caretAsProp, formatStr]);
   return /*#__PURE__*/React.createElement(PickerToggleTrigger, {
     trigger: "active",

package/esm/DatePicker/utils.d.ts

@@ -1,17 +1,10 @@
 import { ToolbarProps } from './Toolbar';
 import { InnerRange } from './types';
-import { CalendarState } from '../Calendar';
 import { DateRange } from '../DateRangePicker/types';
-export declare function getDefaultRanges<T extends Date | DateRange>(date: T): InnerRange<T>[];
+export declare function getDefaultRanges<T extends Date | DateRange>(value: T): InnerRange<T>[];
 /**
  * get Toolbar ranges from Toolbar props
  * @param ranges
  * @param calendarDate
  */
 export declare const getRanges: <T extends Date | DateRange>({ ranges, calendarDate }: Pick<ToolbarProps<T, T>, "calendarDate" | "ranges">) => InnerRange<T>[];
-export declare const useCalendarState: () => {
-    calendarState: CalendarState | undefined;
-    reset: () => void;
-    openMonth: () => void;
-    openTime: () => void;
-};

package/esm/DatePicker/utils.js

@@ -1,45 +1,33 @@
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/esm/extends";
-import { useCallback, useState } from 'react';
-import { setTimingMargin } from '../DateRangePicker/utils';
-import { subDays } from '../utils/dateUtils';
-import { CalendarState } from '../Calendar';
-export function getDefaultRanges(date) {
-  var todayDate = new Date();
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+import { subDays, startOfDay, endOfDay } from '../utils/dateUtils';
+export function getDefaultRanges(value) {
+  var today = new Date();
   /**
-   * Is Date[] type
    * If it is an array type, it returns the default shortcut key suitable for DateRangePicker Toolbar,
    * otherwise it returns the default shortcut key suitable for DatePicker Toolbar
    */
 
-  var isRange = date instanceof Array;
-  var rangeKeys = ['today', 'yesterday'];
-
-  function rangeIterator(label) {
-    var defaultRange = {
-      today: isRange ? {
-        value: [setTimingMargin(todayDate), setTimingMargin(todayDate, 'right')]
-      } : {
-        closeOverlay: true,
-        value: todayDate
-      },
-      yesterday: isRange ? {
-        value: [setTimingMargin(subDays(todayDate, 1)), setTimingMargin(subDays(todayDate, 1), 'right')]
-      } : {
-        closeOverlay: true,
-        value: subDays(todayDate, 1)
-      },
-      last7Days: {
-        value: [setTimingMargin(subDays(todayDate, 6)), setTimingMargin(todayDate, 'right')]
-      }
-    };
-    return _extends({
-      label: label
-    }, defaultRange[label]);
+  if (value instanceof Array) {
+    return [{
+      label: 'today',
+      value: [startOfDay(today), endOfDay(today)]
+    }, {
+      label: 'yesterday',
+      value: [startOfDay(subDays(today, 1)), endOfDay(subDays(today, 1))]
+    }, {
+      label: 'last7Days',
+      value: [startOfDay(subDays(today, 6)), endOfDay(today)]
+    }];
   }
 
-  isRange && rangeKeys.push('last7Days');
-  return rangeKeys.map(rangeIterator);
+  return [{
+    label: 'today',
+    value: today
+  }, {
+    label: 'yesterday',
+    value: subDays(today, 1)
+  }];
 }
 
 var generateRangesIterator = function generateRangesIterator(_ref) {
@@ -48,9 +36,8 @@ var generateRangesIterator = function generateRangesIterator(_ref) {
     var value = _ref2.value,
         rest = _objectWithoutPropertiesLoose(_ref2, ["value"]);
 
-    value = typeof value === 'function' ? value(calendarDate) : value;
     return _extends({
-      value: value
+      value: typeof value === 'function' ? value(calendarDate) : value
     }, rest);
   };
 };
@@ -67,25 +54,4 @@ export var getRanges = function getRanges(_ref3) {
   return typeof ranges === 'undefined' ? getDefaultRanges(calendarDate) : ranges.map(generateRangesIterator({
     calendarDate: calendarDate
   }));
-};
-export var useCalendarState = function useCalendarState() {
-  var _useState = useState(),
-      calendarState = _useState[0],
-      setCalendarState = _useState[1];
-
-  var reset = useCallback(function () {
-    setCalendarState(undefined);
-  }, []);
-  var openMonth = useCallback(function () {
-    setCalendarState(CalendarState.DROP_MONTH);
-  }, []);
-  var openTime = useCallback(function () {
-    setCalendarState(CalendarState.DROP_TIME);
-  }, []);
-  return {
-    calendarState: calendarState,
-    reset: reset,
-    openMonth: openMonth,
-    openTime: openTime
-  };
 };

package/esm/DateRangePicker/Calendar.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { CalendarProps as CalendarCoreProps } from '../Calendar/Calendar';
+import { CalendarProps as CalendarCoreProps } from '../Calendar/CalendarContainer';
 import { DateRange } from './types';
 import { RsRefForwardingComponent, WithAsProps } from '../@types/common';
 import { DatePickerLocale } from '../locales';

package/esm/DateRangePicker/Calendar.js

@@ -1,9 +1,9 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import PropTypes from 'prop-types';
-import React, { useCallback, useState } from 'react';
+import React, { useCallback } from 'react';
 import { addMonths, isSameMonth } from '../utils/dateUtils';
-import CalendarCore, { CalendarState } from '../Calendar/Calendar';
+import CalendarCore from '../Calendar/CalendarContainer';
 import { DATERANGE_DISABLED_TARGET } from '../utils';
 var Calendar = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _props$as = props.as,
@@ -23,10 +23,6 @@ var Calendar = /*#__PURE__*/React.forwardRef(function (props, ref) {
       value = _props$value === void 0 ? [] : _props$value,
       rest = _objectWithoutPropertiesLoose(props, ["as", "calendarDate", "format", "disabledDate", "index", "limitEndYear", "onChangeCalendarDate", "onChangeCalendarTime", "onToggleMeridian", "value"]);
 
-  var _useState = useState(),
-      calendarState = _useState[0],
-      setCalendarState = _useState[1];
-
   var onMoveForward = useCallback(function (nextPageDate) {
     onChangeCalendarDate === null || onChangeCalendarDate === void 0 ? void 0 : onChangeCalendarDate(index, nextPageDate);
   }, [index, onChangeCalendarDate]);
@@ -35,7 +31,6 @@ var Calendar = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, [index, onChangeCalendarDate]);
   var handleChangePageDate = useCallback(function (nextPageDate) {
     onChangeCalendarDate === null || onChangeCalendarDate === void 0 ? void 0 : onChangeCalendarDate(index, nextPageDate);
-    setCalendarState(undefined);
   }, [index, onChangeCalendarDate]);
   var handleChangePageTime = useCallback(function (nextPageDate) {
     onChangeCalendarTime === null || onChangeCalendarTime === void 0 ? void 0 : onChangeCalendarTime(index, nextPageDate);
@@ -43,12 +38,6 @@ var Calendar = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var handleToggleMeridian = useCallback(function (event) {
     onToggleMeridian(index, event);
   }, [index, onToggleMeridian]);
-  var toggleMonthDropdown = useCallback(function () {
-    setCalendarState(calendarState === CalendarState.DROP_MONTH ? undefined : CalendarState.DROP_MONTH);
-  }, [calendarState]);
-  var toggleTimeDropdown = useCallback(function () {
-    setCalendarState(calendarState === CalendarState.DROP_TIME ? undefined : CalendarState.DROP_TIME);
-  }, [calendarState]);
   var inSameMonth = useCallback(function (date) {
     return isSameMonth(date, calendarDate[index]);
   }, [calendarDate, index]);
@@ -66,7 +55,6 @@ var Calendar = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, [disabledDate, value]);
   return /*#__PURE__*/React.createElement(Component, _extends({}, rest, {
     format: format,
-    calendarState: calendarState,
     dateRange: value,
     disabledDate: disabledMonth,
     inSameMonth: inSameMonth,
@@ -76,8 +64,6 @@ var Calendar = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onChangePageTime: handleChangePageTime,
     onMoveBackward: handleMoveBackward,
     onMoveForward: handleMoveForward,
-    onToggleMonthDropdown: toggleMonthDropdown,
-    onToggleTimeDropdown: toggleTimeDropdown,
     onToggleMeridian: handleToggleMeridian,
     calendarDate: getCalendarDate(),
     ref: ref

package/esm/DateRangePicker/DateRangePicker.js

@@ -13,10 +13,10 @@ import PredefinedRanges from '../DatePicker/PredefinedRanges';
 import Stack from '../Stack';
 import { omitTriggerPropKeys, PickerOverlay, pickerPropTypes, PickerToggle, PickerToggleTrigger, pickTriggerPropKeys, usePickerClassName, usePublicMethods, useToggleKeyDownEvent } from '../Picker';
 import { createChainedFunction, DATERANGE_DISABLED_TARGET, DateUtils, mergeRefs, useClassNames, useControlled, useCustom } from '../utils';
-import { addMonths, compareAsc, isSameMonth } from '../utils/dateUtils';
+import { addMonths, compareAsc, isSameMonth, startOfDay, endOfDay } from '../utils/dateUtils';
 import Calendar from './Calendar';
 import * as disabledDateUtils from './disabledDateUtils';
-import { getCalendarDate, getMonthHoverRange, getWeekHoverRange, isSameRange, setTimingMargin } from './utils';
+import { getCalendarDate, getMonthHoverRange, getWeekHoverRange, isSameRange } from './utils';
 var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _ref, _ref2, _merge;
 
@@ -140,13 +140,13 @@ var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
   var updateCalendarDateRange = useCallback(function (value, calendarKey) {
     var nextValue = value;
-    var shouldTime = DateUtils.shouldTime,
+    var shouldRenderTime = DateUtils.shouldRenderTime,
         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) {
+    if (shouldRenderTime(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.
 
@@ -305,7 +305,7 @@ var DateRangePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var noHoverRangeValid = isNil(hoverRangeValue); // in `oneTap` mode
 
     if (hasDoneSelect.current && oneTap) {
-      handleValueUpdate(event, noHoverRangeValid ? [setTimingMargin(date), setTimingMargin(date, 'right')] : hoverRangeValue);
+      handleValueUpdate(event, noHoverRangeValid ? [startOfDay(date), endOfDay(date)] : hoverRangeValue);
       hasDoneSelect.current = false;
       return;
     } // no preset hover range can use

package/esm/DateRangePicker/utils.d.ts

@@ -1,10 +1,8 @@
-import { DateRange, RangeType } from './types';
-export declare const setTimingMargin: (date: any, way?: string) => Date;
+import { DateRange } from './types';
 export declare function getCalendarDate({ value, calendarKey }: {
     value: [] | [Date] | [Date, Date] | null;
     calendarKey?: 'start' | 'end';
 }): DateRange;
-export declare const getDefaultRanges: () => RangeType[];
 export declare const isSameRange: (source: DateRange | null, dest: DateRange | null, format: string) => boolean;
 export declare const getMonthHoverRange: (date: Date) => DateRange;
 export declare const getWeekHoverRange: (isoWeek: boolean, date: Date) => DateRange;

package/esm/DateRangePicker/utils.js

@@ -1,11 +1,4 @@
-import { DateUtils } from '../utils';
-export var setTimingMargin = function setTimingMargin(date, way) {
-  if (way === void 0) {
-    way = 'left';
-  }
-
-  return way === 'right' ? DateUtils.endOfDay(date) : DateUtils.startOfDay(date);
-};
+import { addMonths, getMonth, isSameDay, shouldRenderTime, isSameSecond, startOfMonth, endOfMonth, startOfISOWeek, endOfISOWeek, startOfWeek, endOfWeek } from '../utils/dateUtils';
 export function getCalendarDate(_ref) {
   var _value;
 
@@ -16,56 +9,43 @@ export function getCalendarDate(_ref) {
   value = (_value = value) !== null && _value !== void 0 ? _value : [];
 
   if (value[0] && value[1]) {
-    var startMonth = DateUtils.getMonth(value[0]);
-    var endMonth = DateUtils.getMonth(value[1]);
+    var startMonth = getMonth(value[0]);
+    var endMonth = getMonth(value[1]);
 
     if (calendarKey === 'start') {
-      return [value[0], startMonth >= endMonth ? DateUtils.addMonths(value[0], 1) : value[1]];
+      return [value[0], startMonth >= endMonth ? addMonths(value[0], 1) : value[1]];
     } else if (calendarKey === 'end') {
-      return [startMonth >= endMonth ? DateUtils.addMonths(value[1], -1) : value[0], value[1]];
+      return [startMonth >= endMonth ? addMonths(value[1], -1) : value[0], value[1]];
     } // If only the start date
 
   } else if (value[0]) {
-    return [value[0], DateUtils.addMonths(value[0], 1)];
+    return [value[0], addMonths(value[0], 1)];
   }
 
   var todayDate = new Date();
-  return [todayDate, DateUtils.addMonths(todayDate, 1)];
+  return [todayDate, addMonths(todayDate, 1)];
 }
-export var getDefaultRanges = function getDefaultRanges() {
-  var todayDate = new Date();
-  return [{
-    label: 'today',
-    value: [setTimingMargin(todayDate), setTimingMargin(todayDate, 'right')]
-  }, {
-    label: 'yesterday',
-    value: [setTimingMargin(DateUtils.addDays(todayDate, -1)), setTimingMargin(DateUtils.addDays(todayDate, -1), 'right')]
-  }, {
-    label: 'last7Days',
-    value: [setTimingMargin(DateUtils.subDays(todayDate, 6)), setTimingMargin(todayDate, 'right')]
-  }];
-};
 export var isSameRange = function isSameRange(source, dest, format) {
   // If both are null, reguard as same
   if (null === source && null === dest) return true; // If only one is null, regard as different
 
   if (null === source || null === dest) return false;
-  var result = DateUtils.isSameDay(source[0], dest[0]) && DateUtils.isSameDay(source[1], dest[1]);
+  var result = isSameDay(source[0], dest[0]) && isSameDay(source[1], dest[1]);
 
-  if (DateUtils.shouldTime(format)) {
-    result && (result = DateUtils.isSameSecond(source[0], dest[0]) && DateUtils.isSameSecond(source[1], dest[1]));
+  if (shouldRenderTime(format)) {
+    result && (result = isSameSecond(source[0], dest[0]) && isSameSecond(source[1], dest[1]));
   }
 
   return result;
 };
 export var getMonthHoverRange = function getMonthHoverRange(date) {
-  return [DateUtils.startOfMonth(date), DateUtils.endOfMonth(date)];
+  return [startOfMonth(date), endOfMonth(date)];
 };
 export var getWeekHoverRange = function getWeekHoverRange(isoWeek, date) {
   if (isoWeek) {
     // set to the first day of this week according to ISO 8601, 12:00 am
-    return [DateUtils.startOfISOWeek(date), DateUtils.endOfISOWeek(date)];
+    return [startOfISOWeek(date), endOfISOWeek(date)];
   }
 
-  return [DateUtils.startOfWeek(date), DateUtils.endOfWeek(date)];
+  return [startOfWeek(date), endOfWeek(date)];
 };

package/esm/List/ListItem.d.ts

@@ -5,6 +5,7 @@ export interface ListItemProps extends WithAsProps, React.HTMLAttributes<HTMLEle
     index?: number;
     collection?: Collection;
     disabled?: boolean;
+    size?: 'lg' | 'md' | 'sm';
 }
 declare const ListItem: React.ForwardRefExoticComponent<ListItemProps & React.RefAttributes<HTMLDivElement>>;
 export default ListItem;

package/esm/List/ListItem.js

@@ -16,12 +16,15 @@ var ListItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
       collection = _props$collection === void 0 ? 0 : _props$collection,
       disabled = props.disabled,
       index = props.index,
-      rest = _objectWithoutPropertiesLoose(props, ["as", "children", "className", "classPrefix", "collection", "disabled", "index"]);
+      sizeProp = props.size,
+      rest = _objectWithoutPropertiesLoose(props, ["as", "children", "className", "classPrefix", "collection", "disabled", "index", "size"]);
 
   var _useContext = useContext(ListContext),
       bordered = _useContext.bordered,
       register = _useContext.register,
-      size = _useContext.size;
+      parentSize = _useContext.size;
+
+  var size = sizeProp || parentSize;
 
   var _useClassNames = useClassNames(classPrefix),
       withClassPrefix = _useClassNames.withClassPrefix,