rsuite 5.2.1 → 5.3.0

package/esm/DatePicker/DatePicker.js

@@ -2,6 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
+import isNil from 'lodash/isNil';
 import mapValues from 'lodash/mapValues';
 import pick from 'lodash/pick';
 import omit from 'lodash/omit';
@@ -92,10 +93,10 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       active = _useState2[0],
       setActive = _useState2[1];
 
-  var triggerRef = useRef();
-  var rootRef = useRef();
-  var targetRef = useRef();
-  var overlayRef = useRef();
+  var triggerRef = useRef(null);
+  var rootRef = useRef(null);
+  var targetRef = useRef(null);
+  var overlayRef = useRef(null);
   usePublicMethods(ref, {
     rootRef: rootRef,
     triggerRef: triggerRef,
@@ -165,7 +166,7 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       closeOverlay = true;
     }
 
-    var nextValue = typeof nextPageDate !== 'undefined' ? nextPageDate : calendarDate;
+    var nextValue = !isNil(nextPageDate) ? nextPageDate : calendarDate;
     setCalendarDate(nextValue || new Date());
     setValue(nextValue);
 
@@ -262,7 +263,9 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }
   }, [formatStr, handleDateChange, oneTap, calendarDate, setCalendarDate, updateValue]);
   var disabledDate = useCallback(function (date) {
-    return disabledDateProp === null || disabledDateProp === void 0 ? void 0 : disabledDateProp(date);
+    var _disabledDateProp;
+
+    return (_disabledDateProp = disabledDateProp === null || disabledDateProp === void 0 ? void 0 : disabledDateProp(date)) !== null && _disabledDateProp !== void 0 ? _disabledDateProp : false;
   }, [disabledDateProp]);
   /**
    * Callback after the input box value is changed.
@@ -319,16 +322,18 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, [onClose, reset]); // Check whether the time is within the time range of the shortcut option in the toolbar.
 
   var disabledToolbarHandle = useCallback(function (date) {
-    var _disabledDateProp;
+    var _disabledDateProp2;
 
-    var allowDate = (_disabledDateProp = disabledDateProp === null || disabledDateProp === void 0 ? void 0 : disabledDateProp(date)) !== null && _disabledDateProp !== void 0 ? _disabledDateProp : false;
+    var allowDate = (_disabledDateProp2 = disabledDateProp === null || disabledDateProp === void 0 ? void 0 : disabledDateProp(date)) !== null && _disabledDateProp2 !== void 0 ? _disabledDateProp2 : false;
     var allowTime = DateUtils.disabledTime(props, date);
     return allowDate || allowTime;
   }, [disabledDateProp, props]);
   var calendarProps = useMemo(function () {
     return mapValues(pick(props, DateUtils.calendarOnlyProps), function (disabledOrHiddenTimeFunc) {
       return function (next, date) {
-        return disabledOrHiddenTimeFunc(next, date);
+        var _disabledOrHiddenTime;
+
+        return (_disabledOrHiddenTime = disabledOrHiddenTimeFunc === null || disabledOrHiddenTimeFunc === void 0 ? void 0 : disabledOrHiddenTimeFunc(next, date)) !== null && _disabledOrHiddenTime !== void 0 ? _disabledOrHiddenTime : false;
       };
     });
   }, [props]);

package/esm/DatePicker/Toolbar.d.ts

@@ -1,20 +1,23 @@
 import React from 'react';
-import { RsRefForwardingComponent, WithAsProps } from '../@types/common';
-import { RangeType, ToolbarValue } from './types';
+import { StandardProps } from '../@types/common';
+import { RangeType } from './types';
 import { CalendarLocale } from '../locales';
 export type { RangeType } from './types';
-export interface ToolbarProps extends WithAsProps {
+export interface ToolbarProps<T = any, Shortcut = T> extends StandardProps {
     hideOkBtn?: boolean;
     locale?: CalendarLocale;
-    calendarDate?: ToolbarValue;
-    ranges: RangeType[];
-    disabledOkBtn?: (value?: ToolbarValue) => boolean;
-    disabledShortcut?: (value?: ToolbarValue) => boolean;
+    calendarDate: T;
+    ranges?: RangeType<Shortcut>[];
+    disabledOkBtn?: (value: T) => boolean;
+    disabledShortcut?: (value: T) => boolean;
     onOk?: (event: React.MouseEvent) => void;
-    onClickShortcut?: (value: ToolbarValue, closeOverlay?: boolean, event?: React.MouseEvent) => void;
+    onClickShortcut?: (value: Shortcut, closeOverlay: boolean, event: React.MouseEvent) => void;
 }
+declare type ToolbarComponent = React.ForwardRefExoticComponent<ToolbarProps> & {
+    <T = any, Shortcut = T>(props: ToolbarProps<T, Shortcut>): React.ReactElement | null;
+};
 /**
  * Toolbar for DatePicker and DateRangePicker
  */
-declare const Toolbar: RsRefForwardingComponent<'div', ToolbarProps>;
+declare const Toolbar: ToolbarComponent;
 export default Toolbar;

package/esm/DatePicker/Toolbar.js

@@ -10,9 +10,7 @@ import { getDefaultRanges, getRanges } from './utils';
  * Toolbar for DatePicker and DateRangePicker
  */
 var Toolbar = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var _props$as = props.as,
-      Component = _props$as === void 0 ? 'div' : _props$as,
-      className = props.className,
+  var className = props.className,
       _props$classPrefix = props.classPrefix,
       classPrefix = _props$classPrefix === void 0 ? 'picker-toolbar' : _props$classPrefix,
       disabledOkBtn = props.disabledOkBtn,
@@ -23,7 +21,7 @@ var Toolbar = /*#__PURE__*/React.forwardRef(function (props, ref) {
       calendarDate = props.calendarDate,
       rangesProp = props.ranges,
       locale = props.locale,
-      rest = _objectWithoutPropertiesLoose(props, ["as", "className", "classPrefix", "disabledOkBtn", "disabledShortcut", "hideOkBtn", "onOk", "onClickShortcut", "calendarDate", "ranges", "locale"]);
+      rest = _objectWithoutPropertiesLoose(props, ["className", "classPrefix", "disabledOkBtn", "disabledShortcut", "hideOkBtn", "onOk", "onClickShortcut", "calendarDate", "ranges", "locale"]);
 
   var _useState = useState(getRanges(props)),
       ranges = _useState[0],
@@ -66,7 +64,7 @@ var Toolbar = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }
 
   var classes = merge(className, withClassPrefix());
-  return /*#__PURE__*/React.createElement(Component, _extends({}, rest, {
+  return /*#__PURE__*/React.createElement("div", _extends({}, rest, {
     ref: ref,
     className: classes
   }), /*#__PURE__*/React.createElement("div", {
@@ -82,7 +80,7 @@ var Toolbar = /*#__PURE__*/React.forwardRef(function (props, ref) {
         return;
       }
 
-      onClickShortcut === null || onClickShortcut === void 0 ? void 0 : onClickShortcut(value, closeOverlay, event);
+      onClickShortcut === null || onClickShortcut === void 0 ? void 0 : onClickShortcut(value, closeOverlay !== null && closeOverlay !== void 0 ? closeOverlay : false, event);
     };
 
     return /*#__PURE__*/React.createElement(Button, {
@@ -99,11 +97,11 @@ Toolbar.propTypes = {
   ranges: PropTypes.array,
   className: PropTypes.string,
   classPrefix: PropTypes.string,
-  calendarDate: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.arrayOf(PropTypes.instanceOf(Date))]),
+  calendarDate: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.arrayOf(PropTypes.instanceOf(Date))]).isRequired,
   onClickShortcut: PropTypes.func,
   onOk: PropTypes.func,
   disabledShortcut: PropTypes.func,
   disabledOkBtn: PropTypes.func,
-  hideOkButton: PropTypes.bool
+  hideOkBtn: PropTypes.bool
 };
 export default Toolbar;

package/esm/DatePicker/types.d.ts

@@ -1,10 +1,10 @@
 import { ReactNode } from 'react';
 export declare type ToolbarValue = Date | [Date?, Date?];
-export interface RangeType {
+export interface RangeType<T> {
     label: ReactNode;
     closeOverlay?: boolean;
-    value: ToolbarValue | ((value: ToolbarValue) => ToolbarValue);
+    value: T | ((value: T) => T);
 }
-export interface InnerRange extends Omit<RangeType, 'value'> {
-    value: ToolbarValue;
+export interface InnerRange<T> extends Omit<RangeType<T>, 'value'> {
+    value: T;
 }

package/esm/DatePicker/utils.d.ts

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

package/esm/DateRangePicker/Calendar.d.ts

@@ -1,25 +1,27 @@
 import React from 'react';
 import { CalendarProps as CalendarCoreProps } from '../Calendar/Calendar';
-import { ValueType } from './types';
+import { DateRange } from './types';
 import { RsRefForwardingComponent, WithAsProps } from '../@types/common';
 import { DatePickerLocale } from '../locales';
-declare type OmitCalendarCoreTypes = 'disabledDate' | 'onSelect' | 'onMouseMove' | 'calendarDate';
+import { DATERANGE_DISABLED_TARGET } from '../utils';
+declare type OmitCalendarCoreTypes = 'disabledDate' | 'onSelect' | 'onMouseMove' | 'calendarDate' | 'format' | 'locale' | 'onToggleMeridian';
 export interface CalendarProps extends WithAsProps, Omit<CalendarCoreProps, OmitCalendarCoreTypes> {
-    calendarDate?: ValueType;
-    disabledDate?: (date: Date, selectValue: ValueType, type: string) => boolean;
+    calendarDate?: DateRange;
+    disabledDate?: (date: Date, selectValue: [] | [Date] | [Date, Date], type: DATERANGE_DISABLED_TARGET) => boolean;
     format?: string;
-    hoverRangeValue?: ValueType;
+    hoverRangeValue?: DateRange;
     index: number;
     isoWeek?: boolean;
     limitEndYear?: number;
     locale?: DatePickerLocale;
     onChangeCalendarDate?: (index: number, date: Date) => void;
     onChangeCalendarTime?: (index: number, date: Date) => void;
+    onToggleMeridian: (index: number, event: React.MouseEvent) => void;
     onMouseMove?: (date: Date) => void;
-    onSelect?: (date: Date, event?: React.SyntheticEvent) => void;
+    onSelect?: (date: Date, event: React.SyntheticEvent) => void;
     showOneCalendar?: boolean;
     showWeekNumbers?: boolean;
-    value?: ValueType;
+    value?: [] | [Date] | [Date, Date];
 }
 declare const Calendar: RsRefForwardingComponent<'div', CalendarProps>;
 export default Calendar;

package/esm/DateRangePicker/Calendar.js

@@ -5,6 +5,15 @@ import React, { useCallback, useState } from 'react';
 import { addMonths, isAfter, isSameMonth, setDate } from '../utils/dateUtils';
 import CalendarCore, { CalendarState } from '../Calendar/Calendar';
 import { DATERANGE_DISABLED_TARGET } from '../utils';
+
+/**
+ * Omit the time in the date, which is used to compare and judge the date.
+ * eg: isAfter/isBefore
+ */
+function omitTime(date) {
+  return new Date(date.getFullYear(), date.getMonth(), date.getDate());
+}
+
 var Calendar = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _props$as = props.as,
       Component = _props$as === void 0 ? CalendarCore : _props$as,
@@ -18,10 +27,11 @@ var Calendar = /*#__PURE__*/React.forwardRef(function (props, ref) {
       limitEndYear = props.limitEndYear,
       onChangeCalendarDate = props.onChangeCalendarDate,
       onChangeCalendarTime = props.onChangeCalendarTime,
+      onToggleMeridian = props.onToggleMeridian,
       showOneCalendar = props.showOneCalendar,
       _props$value = props.value,
       value = _props$value === void 0 ? [] : _props$value,
-      rest = _objectWithoutPropertiesLoose(props, ["as", "calendarDate", "format", "disabledDate", "index", "limitEndYear", "onChangeCalendarDate", "onChangeCalendarTime", "showOneCalendar", "value"]);
+      rest = _objectWithoutPropertiesLoose(props, ["as", "calendarDate", "format", "disabledDate", "index", "limitEndYear", "onChangeCalendarDate", "onChangeCalendarTime", "onToggleMeridian", "showOneCalendar", "value"]);
 
   var _useState = useState(),
       calendarState = _useState[0],
@@ -38,8 +48,11 @@ var Calendar = /*#__PURE__*/React.forwardRef(function (props, ref) {
     setCalendarState(undefined);
   }, [index, onChangeCalendarDate]);
   var handleChangePageTime = useCallback(function (nextPageDate) {
-    onChangeCalendarTime(index, nextPageDate);
+    onChangeCalendarTime === null || onChangeCalendarTime === void 0 ? void 0 : onChangeCalendarTime(index, nextPageDate);
   }, [index, onChangeCalendarTime]);
+  var handleToggleMeridian = useCallback(function (event) {
+    onToggleMeridian(index, event);
+  }, [index, onToggleMeridian]);
   var toggleMonthDropdown = useCallback(function () {
     setCalendarState(calendarState === CalendarState.DROP_MONTH ? undefined : CalendarState.DROP_MONTH);
   }, [calendarState]);
@@ -59,22 +72,30 @@ var Calendar = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onMoveBackward === null || onMoveBackward === void 0 ? void 0 : onMoveBackward(addMonths(getCalendarDate(), -1));
   }, [getCalendarDate, onMoveBackward]);
   var disabledBackward = useCallback(function () {
-    var after = isAfter(setDate(calendarDate[1], 1), setDate(addMonths(calendarDate[0], 1), 1));
-
+    // Do not disable the Backward button on the first calendar.
     if (index === 0) {
       return false;
     }
 
+    var startDate = setDate(addMonths(calendarDate[0], 1), 1);
+    var endDate = setDate(omitTime(calendarDate[1]), 1);
+    var after = isAfter(endDate, startDate);
     return !after;
   }, [calendarDate, index]);
   var disabledForward = useCallback(function () {
-    if (showOneCalendar) return false;
-    var after = isAfter(setDate(calendarDate[1], 1), setDate(addMonths(calendarDate[0], 1), 1));
+    // If only one calendar is displayed, do not disable
+    if (showOneCalendar) {
+      return false;
+    } // Do not disable the Forward button on the second calendar.
+
 
     if (index === 1) {
       return false;
     }
 
+    var startDate = setDate(addMonths(omitTime(calendarDate[0]), 1), 1);
+    var endDate = setDate(omitTime(calendarDate[1]), 1);
+    var after = isAfter(endDate, startDate);
     return !after;
   }, [calendarDate, index, showOneCalendar]);
   var disabledMonth = useCallback(function (date) {
@@ -110,6 +131,7 @@ var Calendar = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onMoveForward: handleMoveForward,
     onToggleMonthDropdown: toggleMonthDropdown,
     onToggleTimeDropdown: toggleTimeDropdown,
+    onToggleMeridian: handleToggleMeridian,
     calendarDate: getCalendarDate(),
     ref: ref
   }));

package/esm/DateRangePicker/DateRangePicker.d.ts

@@ -1,14 +1,14 @@
 import React from 'react';
 import { FormControlBaseProps, PickerBaseProps } from '../@types/common';
 import { PickerComponent } from '../Picker';
-import { DisabledDateFunction, RangeType, ValueType } from './types';
-export interface DateRangePickerProps extends PickerBaseProps, FormControlBaseProps<ValueType> {
+import { DisabledDateFunction, RangeType, DateRange } from './types';
+export interface DateRangePickerProps extends PickerBaseProps, FormControlBaseProps<DateRange | null> {
     /** Configure shortcut options */
     ranges?: RangeType[];
     /** Format date */
     format?: string;
     /** The date range that will be selected when you click on the date */
-    hoverRange?: 'week' | 'month' | ((date: Date) => ValueType);
+    hoverRange?: 'week' | 'month' | ((date: Date) => DateRange);
     /** Whether to click once on selected date range，Can be used with hoverRange */
     oneTap?: boolean;
     /** ISO 8601 standard, each calendar week begins on Monday and Sunday on the seventh day */
@@ -19,8 +19,10 @@ export interface DateRangePickerProps extends PickerBaseProps, FormControlBasePr
     showWeekNumbers?: boolean;
     /** Show only one calendar select */
     showOneCalendar?: boolean;
+    /** Meridian format */
+    showMeridian?: boolean;
     /** Set default date for calendar */
-    defaultCalendarValue?: ValueType;
+    defaultCalendarValue?: DateRange;
     /** The character that separates two dates */
     character?: string;
     /** Disabled date */
@@ -28,11 +30,11 @@ export interface DateRangePickerProps extends PickerBaseProps, FormControlBasePr
     /** Called when the option is selected */
     onSelect?: (date: Date, event?: React.SyntheticEvent) => void;
     /** Called after clicking the OK button */
-    onOk?: (date: ValueType, event: React.SyntheticEvent) => void;
+    onOk?: (date: DateRange, event: React.SyntheticEvent) => void;
     /** Called when clean */
     onClean?: (event: React.MouseEvent) => void;
     /** Custom render value */
-    renderValue?: (value: ValueType, format: string) => React.ReactNode;
+    renderValue?: (value: DateRange, format: string) => React.ReactNode;
 }
 export interface DateRangePicker extends PickerComponent<DateRangePickerProps> {
     /** Allow the maximum number of days specified, other dates are disabled */