rsuite 5.2.4 → 5.4.2

package/esm/CheckTreePicker/utils.d.ts

@@ -14,6 +14,8 @@ export interface TreeNodeType {
     value?: string | number;
     groupBy?: string;
     children?: TreeNodeType[];
+    hasChildren?: boolean;
+    checkState?: CheckStateType;
 }
 export interface TreeNodesType {
     [key: string]: TreeNodeType;
@@ -38,5 +40,5 @@ export declare function isNodeUncheckable(node: any, props: Partial<CheckTreePic
 export declare function getFormattedTree(data: any[], nodes: TreeNodesType, props: Partial<CheckTreePickerProps>): any[];
 export declare function getDisabledState(nodes: TreeNodesType, node: TreeNodeType, props: Partial<CheckTreePickerProps>): boolean;
 export declare function getCheckTreePickerDefaultValue(value: any[], uncheckableItemValues: any[]): any[];
-export declare function getSelectedItems(nodes: TreeNodesType, value: (string | number)[], valueKey: string): any[];
+export declare function getSelectedItems(nodes: TreeNodesType, value: (string | number)[], valueKey: string): TreeNodeType[];
 export declare function getNodeCheckState({ nodes, node, cascade, childrenKey }: any): CheckStateType;

package/esm/CheckTreePicker/utils.js

@@ -4,22 +4,24 @@ import _isNil from "lodash/isNil";
 import { shallowEqual, CHECK_STATE } from '../utils';
 import { getChildrenByFlattenNodes } from '../utils/treeUtils';
 export function isEveryChildChecked(nodes, parent) {
-  if (_isNil(nodes[parent.refKey])) {
+  if (_isNil(parent.refKey) || _isNil(nodes[parent.refKey])) {
     return false;
   }
 
   var children = getChildrenByFlattenNodes(nodes, parent);
 
   if (!children.length) {
-    return nodes[parent.refKey].check;
+    var _nodes$parent$refKey$;
+
+    return (_nodes$parent$refKey$ = nodes[parent.refKey].check) !== null && _nodes$parent$refKey$ !== void 0 ? _nodes$parent$refKey$ : false;
   }
 
   return children.every(function (child) {
-    return nodes[child.refKey].check;
+    return !_isNil(child.refKey) && nodes[child.refKey].check;
   });
 }
 export function isSomeChildChecked(nodes, parent, childrenKey) {
-  if (_isNil(nodes[parent.refKey])) {
+  if (!_isNil(parent.refKey) && _isNil(nodes[parent.refKey])) {
     return false;
   }
 
@@ -31,7 +33,7 @@ export function isSomeChildChecked(nodes, parent, childrenKey) {
       return isSomeChildChecked(nodes, child, childrenKey);
     }
 
-    return nodes[child.refKey].check;
+    return !_isNil(child.refKey) && nodes[child.refKey].check;
   });
 }
 export function isSomeNodeHasChildren(data, childrenKey) {
@@ -46,7 +48,7 @@ export function isSomeNodeHasChildren(data, childrenKey) {
 
 export function isAllSiblingNodeUncheckable(node, nodes, uncheckableItemValues, valueKey) {
   var list = [];
-  var parentNodeRefkey = node.parent ? node.parent.refKey : '';
+  var parentNodeRefKey = node.parent ? node.parent.refKey : '';
   Object.keys(nodes).forEach(function (refKey) {
     var _curNode$parent;
 
@@ -54,7 +56,7 @@ export function isAllSiblingNodeUncheckable(node, nodes, uncheckableItemValues,
 
     if (_isNil(node.parent) && _isNil(curNode.parent)) {
       list.push(curNode);
-    } else if (((_curNode$parent = curNode.parent) === null || _curNode$parent === void 0 ? void 0 : _curNode$parent.refKey) === parentNodeRefkey) {
+    } else if (((_curNode$parent = curNode.parent) === null || _curNode$parent === void 0 ? void 0 : _curNode$parent.refKey) === parentNodeRefKey) {
       list.push(curNode);
     }
   });
@@ -107,7 +109,7 @@ export function getFormattedTree(data, nodes, props) {
     var curNode = nodes[node.refKey];
 
     if (curNode) {
-      var _node$childrenKey;
+      var _node;
 
       var checkState = !_isUndefined(cascade) ? getNodeCheckState({
         node: curNode,
@@ -121,7 +123,7 @@ export function getFormattedTree(data, nodes, props) {
       formatted.parent = curNode.parent;
       formatted.checkState = checkState;
 
-      if (((_node$childrenKey = node[childrenKey]) === null || _node$childrenKey === void 0 ? void 0 : _node$childrenKey.length) > 0) {
+      if (((_node = node[childrenKey]) === null || _node === void 0 ? void 0 : _node.length) > 0) {
         formatted[childrenKey] = getFormattedTree(formatted[childrenKey], nodes, props);
       }
     }
@@ -134,7 +136,7 @@ export function getDisabledState(nodes, node, props) {
       disabledItemValues = _props$disabledItemVa === void 0 ? [] : _props$disabledItemVa,
       valueKey = props.valueKey;
 
-  if (_isNil(nodes[node.refKey])) {
+  if (!_isNil(node.refKey) && _isNil(nodes[node.refKey])) {
     return false;
   }
 

package/esm/Checkbox/Checkbox.d.ts

@@ -31,7 +31,7 @@ export interface CheckboxProps<V = ValueType> extends WithAsProps {
     /** Used for the name of the form */
     name?: string;
     /** Called when the user attempts to change the checked state. */
-    onChange?: (value: V, checked: boolean, event: React.ChangeEvent<HTMLInputElement>) => void;
+    onChange?: (value: V | undefined, checked: boolean, event: React.ChangeEvent<HTMLInputElement>) => void;
     /** Called when the checkbox or label is clicked. */
     onClick?: (event: React.SyntheticEvent) => void;
     /** Called when the checkbox is clicked. */

package/esm/Container/Container.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-import React, { useState } from 'react';
+import React, { useState, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { useClassNames } from '../utils';
 export var ContainerContext = /*#__PURE__*/React.createContext({});
@@ -24,10 +24,13 @@ var Container = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var classes = merge(className, withClassPrefix({
     'has-sidebar': hasSidebar
   }));
-  return /*#__PURE__*/React.createElement(ContainerContext.Provider, {
-    value: {
+  var contextValue = useMemo(function () {
+    return {
       setHasSidebar: setHasSidebar
-    }
+    };
+  }, [setHasSidebar]);
+  return /*#__PURE__*/React.createElement(ContainerContext.Provider, {
+    value: contextValue
   }, /*#__PURE__*/React.createElement(Component, _extends({}, rest, {
     ref: ref,
     className: classes

package/esm/CustomProvider/CustomProvider.d.ts

@@ -2,9 +2,9 @@ import React from 'react';
 import { Locale } from '../locales';
 export interface CustomValue<T = Locale> {
     /** Language configuration */
-    locale?: T;
+    locale: T;
     /** Support right-to-left */
-    rtl?: boolean;
+    rtl: boolean;
     /**
      * Return the formatted date string in the given format. The result may vary by locale.
      *
@@ -18,7 +18,7 @@ export interface CustomValue<T = Locale> {
      *  }
      *
      * */
-    formatDate?: (date: Date | string | number, format?: string) => string;
+    formatDate: (date: Date | number, format: string) => string;
     /**
      * Return the date parsed from string using the given format string.
      *
@@ -32,9 +32,9 @@ export interface CustomValue<T = Locale> {
      *  }
      *
      * */
-    parseDate?: (dateString: string, formatString: string) => Date;
+    parseDate: (dateString: string, formatString: string) => Date;
 }
-export interface CustomProviderProps<T = Locale> extends CustomValue<T> {
+export interface CustomProviderProps<T = Locale> extends Partial<CustomValue<T>> {
     /** Supported themes */
     theme?: 'light' | 'dark' | 'high-contrast';
     /** The prefix of the component CSS class */
@@ -46,25 +46,12 @@ declare const CustomContext: React.Context<CustomProviderProps<{
     common?: {
         loading: string;
         emptyMessage: string;
-    };
+    } | undefined;
     Plaintext?: {
         unfilled: string;
         notSelected: string;
-        /**
-         * Return the date parsed from string using the given format string.
-         *
-         * Example:
-         *
-         *  import parse from 'date-fns/parse';
-         *  import eo from 'date-fns/locale/eo'
-         *
-         *  function parseDate(date, formatStr) {
-         *    return parse(date, formatStr, new Date(), { locale: eo });
-         *  }
-         *
-         * */
         notUploaded: string;
-    };
+    } | undefined;
     Pagination?: {
         more: string;
         prev: string;
@@ -74,7 +61,7 @@ declare const CustomContext: React.Context<CustomProviderProps<{
         limit: string;
         total: string;
         skip: string;
-    };
+    } | undefined;
     Calendar?: {
         sunday: string;
         monday: string;
@@ -92,7 +79,7 @@ declare const CustomContext: React.Context<CustomProviderProps<{
         formattedMonthPattern: string;
         formattedDayPattern: string;
         dateLocale: any;
-    };
+    } | undefined;
     DatePicker?: {
         sunday: string;
         monday: string;
@@ -110,7 +97,7 @@ declare const CustomContext: React.Context<CustomProviderProps<{
         formattedMonthPattern: string;
         formattedDayPattern: string;
         dateLocale: any;
-    };
+    } | undefined;
     DateRangePicker?: {
         last7Days: string;
         sunday: string;
@@ -129,17 +116,17 @@ declare const CustomContext: React.Context<CustomProviderProps<{
         formattedMonthPattern: string;
         formattedDayPattern: string;
         dateLocale: any;
-    };
+    } | undefined;
     Picker?: {
         noResultsText: string;
         placeholder: string;
-        searchPlaceholder: string;
+        searchPlaceholder: string; /** Supported themes */
         checkAll: string;
-    };
+    } | undefined;
     InputPicker?: {
         newItem: string;
         createOption: string;
-    };
+    } | undefined;
     Uploader?: {
         inited: string;
         progress: string;
@@ -147,41 +134,28 @@ declare const CustomContext: React.Context<CustomProviderProps<{
         complete: string;
         emptyFile: string;
         upload: string;
-    };
+    } | undefined;
     CloseButton?: {
         closeLabel: string;
-    };
+    } | undefined;
     Breadcrumb?: {
         expandText: string;
-    };
+    } | undefined;
     Toggle?: {
         on: string;
         off: string;
-    };
+    } | undefined;
 }>>;
 declare const Consumer: React.Consumer<CustomProviderProps<{
     common?: {
         loading: string;
         emptyMessage: string;
-    };
+    } | undefined;
     Plaintext?: {
         unfilled: string;
         notSelected: string;
-        /**
-         * Return the date parsed from string using the given format string.
-         *
-         * Example:
-         *
-         *  import parse from 'date-fns/parse';
-         *  import eo from 'date-fns/locale/eo'
-         *
-         *  function parseDate(date, formatStr) {
-         *    return parse(date, formatStr, new Date(), { locale: eo });
-         *  }
-         *
-         * */
         notUploaded: string;
-    };
+    } | undefined;
     Pagination?: {
         more: string;
         prev: string;
@@ -191,7 +165,7 @@ declare const Consumer: React.Consumer<CustomProviderProps<{
         limit: string;
         total: string;
         skip: string;
-    };
+    } | undefined;
     Calendar?: {
         sunday: string;
         monday: string;
@@ -209,7 +183,7 @@ declare const Consumer: React.Consumer<CustomProviderProps<{
         formattedMonthPattern: string;
         formattedDayPattern: string;
         dateLocale: any;
-    };
+    } | undefined;
     DatePicker?: {
         sunday: string;
         monday: string;
@@ -227,7 +201,7 @@ declare const Consumer: React.Consumer<CustomProviderProps<{
         formattedMonthPattern: string;
         formattedDayPattern: string;
         dateLocale: any;
-    };
+    } | undefined;
     DateRangePicker?: {
         last7Days: string;
         sunday: string;
@@ -246,17 +220,17 @@ declare const Consumer: React.Consumer<CustomProviderProps<{
         formattedMonthPattern: string;
         formattedDayPattern: string;
         dateLocale: any;
-    };
+    } | undefined;
     Picker?: {
         noResultsText: string;
         placeholder: string;
-        searchPlaceholder: string;
+        searchPlaceholder: string; /** Supported themes */
         checkAll: string;
-    };
+    } | undefined;
     InputPicker?: {
         newItem: string;
         createOption: string;
-    };
+    } | undefined;
     Uploader?: {
         inited: string;
         progress: string;
@@ -264,17 +238,17 @@ declare const Consumer: React.Consumer<CustomProviderProps<{
         complete: string;
         emptyFile: string;
         upload: string;
-    };
+    } | undefined;
     CloseButton?: {
         closeLabel: string;
-    };
+    } | undefined;
     Breadcrumb?: {
         expandText: string;
-    };
+    } | undefined;
     Toggle?: {
         on: string;
         off: string;
-    };
+    } | undefined;
 }>>;
 declare const CustomProvider: (props: CustomProviderProps) => JSX.Element;
 export { CustomContext, Consumer as CustomConsumer };

package/esm/DOMHelper/index.d.ts

@@ -16,33 +16,33 @@ declare const DOMHelper: {
     ownerDocument: (node: Element) => Document;
     ownerWindow: (componentOrElement: Element) => Window;
     getWindow: (node: any) => Window;
-    getContainer: (container: Element | (() => Element), defaultContainer?: Element) => Element;
+    getContainer: (container: Element | (() => Element), defaultContainer?: Element | undefined) => Element;
     canUseDOM: boolean;
     contains: (context: Element, node: Node & ParentNode) => boolean;
-    scrollTop: (node: Element, val?: number) => number;
-    scrollLeft: (node: Element, val?: number) => number;
+    scrollTop: (node: Element, val?: number | undefined) => number;
+    scrollLeft: (node: Element, val?: number | undefined) => number;
     getOffset: (node: Element) => {
         top: number;
         left: number;
         height: number;
         width: number;
-    } | DOMRect;
+    } | DOMRect | null;
     nodeName: (node: Element) => string;
     getOffsetParent: (node: Element) => Element;
-    getPosition: (node: Element, offsetParent?: Element, calcMargin?: boolean) => DOMRect | {
+    getPosition: (node: Element, offsetParent?: Element | undefined, calcMargin?: boolean | undefined) => DOMRect | {
         top: number;
         left: number;
         height: number;
         width: number;
-    };
+    } | null;
     isOverflowing: (container: Element) => boolean;
-    getScrollbarSize: (recalc?: boolean) => number | void;
-    getHeight: (node: Element | Window, client?: Element) => number;
-    getWidth: (node: Element | Window, client?: Element) => number;
+    getScrollbarSize: (recalc?: boolean | undefined) => number | void;
+    getHeight: (node: Element | Window, client?: Element | undefined) => number;
+    getWidth: (node: Element | Window, client?: Element | undefined) => number;
     isFocusable: typeof helpers.isFocusable;
-    getStyle: (node: Element, property?: string) => string | CSSStyleDeclaration;
+    getStyle: (node: Element, property?: string | undefined) => string | CSSStyleDeclaration;
     removeStyle: (node: Element, keys: string | string[]) => void;
-    addStyle: (node: Element, property: string | import("dom-lib/esm/addStyle").CSSProperty, value?: string | number) => void;
-    translateDOMPositionXY: (style: CSSStyleDeclaration, x?: number, y?: number) => CSSStyleDeclaration;
+    addStyle: (node: Element, property: string | import("dom-lib/esm/addStyle").CSSProperty, value?: string | number | undefined) => void;
+    translateDOMPositionXY: (style: CSSStyleDeclaration, x?: number | undefined, y?: number | undefined) => CSSStyleDeclaration;
 };
 export default DOMHelper;

package/esm/DatePicker/DatePicker.d.ts

@@ -5,7 +5,7 @@ import { FormControlBaseProps, PickerBaseProps, RsRefForwardingComponent } from
 export type { RangeType } from './Toolbar';
 export interface DatePickerProps extends PickerBaseProps<DatePickerLocale>, FormControlBaseProps<Date> {
     /** Configure shortcut options */
-    ranges?: RangeType[];
+    ranges?: RangeType<Date>[];
     /** Calendar panel default presentation date and time */
     calendarDefaultDate?: Date;
     /** Format date */

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]);
@@ -366,6 +371,7 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       top: top
     };
     return /*#__PURE__*/React.createElement(PickerOverlay, {
+      role: "dialog",
       className: classes,
       ref: mergeRefs(overlayRef, speakerRef),
       style: styles,
@@ -403,7 +409,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 caretComponent = useMemo(function () {
+  var caretAs = useMemo(function () {
     return DateUtils.shouldOnlyTime(formatStr) ? IconClockO : IconCalendar;
   }, [formatStr]);
   return /*#__PURE__*/React.createElement(PickerToggleTrigger, {
@@ -439,7 +445,8 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     active: active,
     placement: placement,
     disabled: disabled,
-    caretComponent: caretComponent
+    caretAs: caretAs,
+    "aria-haspopup": "dialog"
   }), renderDate())));
 });
 DatePicker.displayName = 'DatePicker';

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,14 +1,15 @@
 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' | 'onToggleMeridian';
+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;
@@ -17,10 +18,10 @@ export interface CalendarProps extends WithAsProps, Omit<CalendarCoreProps, Omit
     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;