rsuite 5.2.3 → 5.4.1

package/esm/CheckTreePicker/CheckTreePicker.js

@@ -12,6 +12,7 @@ import classNames from 'classnames';
 import { List, AutoSizer } from '../Picker/VirtualizedList';
 import CheckTreeNode from './CheckTreeNode';
 import TreeContext from '../Tree/TreeContext';
+import { getTreeNodeIndent } from '../utils/treeUtils';
 import { createChainedFunction, useCustom, useClassNames, useControlled, KEY_VALUES, mergeRefs, shallowEqual } from '../utils';
 import { PickerToggle, onMenuKeyDown as _onMenuKeyDown, PickerOverlay, SearchBar, SelectedElement, PickerToggleTrigger, createConcatChildrenFunction, usePickerClassName, usePublicMethods, pickTriggerPropKeys, omitTriggerPropKeys, listPickerPropTypes, useToggleKeyDownEvent } from '../Picker';
 import { isEveryChildChecked, isSomeNodeHasChildren, isAllSiblingNodeUncheckable, isEveryFirstLevelNodeUncheckable, getFormattedTree, getDisabledState, getCheckTreePickerDefaultValue, getSelectedItems, isNodeUncheckable } from './utils';
@@ -33,6 +34,7 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       searchBy = props.searchBy,
       toggleAs = props.toggleAs,
       searchKeyword = props.searchKeyword,
+      showIndentLine = props.showIndentLine,
       overrideLocale = props.locale,
       _props$cascade = props.cascade,
       cascade = _props$cascade === void 0 ? true : _props$cascade,
@@ -86,17 +88,17 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       renderValue = props.renderValue,
       renderTreeIcon = props.renderTreeIcon,
       renderTreeNode = props.renderTreeNode,
-      rest = _objectWithoutPropertiesLoose(props, ["as", "data", "style", "appearance", "cleanable", "countable", "searchBy", "toggleAs", "searchKeyword", "locale", "cascade", "disabled", "valueKey", "labelKey", "placement", "childrenKey", "placeholder", "value", "defaultValue", "defaultExpandAll", "disabledItemValues", "expandItemValues", "defaultExpandItemValues", "height", "menuStyle", "searchable", "virtualized", "className", "classPrefix", "menuClassName", "menuAutoWidth", "uncheckableItemValues", "id", "listProps", "renderMenu", "getChildren", "renderExtraFooter", "onEntered", "onChange", "onClean", "onClose", "onExited", "onSearch", "onSelect", "onOpen", "onScroll", "onExpand", "renderValue", "renderTreeIcon", "renderTreeNode"]);
+      rest = _objectWithoutPropertiesLoose(props, ["as", "data", "style", "appearance", "cleanable", "countable", "searchBy", "toggleAs", "searchKeyword", "showIndentLine", "locale", "cascade", "disabled", "valueKey", "labelKey", "placement", "childrenKey", "placeholder", "value", "defaultValue", "defaultExpandAll", "disabledItemValues", "expandItemValues", "defaultExpandItemValues", "height", "menuStyle", "searchable", "virtualized", "className", "classPrefix", "menuClassName", "menuAutoWidth", "uncheckableItemValues", "id", "listProps", "renderMenu", "getChildren", "renderExtraFooter", "onEntered", "onChange", "onClean", "onClose", "onExited", "onSearch", "onSelect", "onOpen", "onScroll", "onExpand", "renderValue", "renderTreeIcon", "renderTreeNode"]);
 
   var _useContext = useContext(TreeContext),
       inline = _useContext.inline;
 
-  var triggerRef = useRef();
-  var targetRef = useRef();
-  var listRef = useRef();
-  var overlayRef = useRef();
-  var searchInputRef = useRef();
-  var treeViewRef = useRef();
+  var triggerRef = useRef(null);
+  var targetRef = useRef(null);
+  var listRef = useRef(null);
+  var overlayRef = useRef(null);
+  var searchInputRef = useRef(null);
+  var treeViewRef = useRef(null);
 
   var _useCustom = useCustom('Picker', overrideLocale),
       rtl = _useCustom.rtl,
@@ -192,25 +194,21 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
 
   var getFormattedNodes = useCallback(function (render) {
-    var formattedNodes = [];
-
     if (virtualized) {
-      formattedNodes = formatVirtualizedTreeData(flattenNodes, filteredData, expandItemValues, {
+      return formatVirtualizedTreeData(flattenNodes, filteredData, expandItemValues, {
         cascade: cascade,
         searchKeyword: searchKeywordState
       }).filter(function (item) {
         return item.visible;
       });
-    } else {
-      formattedNodes = getFormattedTree(filteredData, flattenNodes, {
-        childrenKey: childrenKey,
-        cascade: cascade
-      }).map(function (node) {
-        return render === null || render === void 0 ? void 0 : render(node, 1);
-      });
     }
 
-    return formattedNodes;
+    return getFormattedTree(filteredData, flattenNodes, {
+      childrenKey: childrenKey,
+      cascade: cascade
+    }).map(function (node) {
+      return render === null || render === void 0 ? void 0 : render(node, 1);
+    });
   }, [searchKeywordState, expandItemValues, filteredData, flattenNodes, formatVirtualizedTreeData, virtualized, childrenKey, cascade]);
 
   var getTreeNodeProps = function getTreeNodeProps(node, layer) {
@@ -406,10 +404,13 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }
   }, [childrenKey, expandItemValues, getChildren, loadChildren, onExpand, setExpandItemValues, valueKey]);
   usePublicMethods(ref, {
+    rootRef: inline ? treeViewRef : undefined,
     triggerRef: triggerRef,
     overlayRef: overlayRef,
-    targetRef: targetRef
-  }, inline);
+    targetRef: targetRef,
+    listRef: listRef,
+    inline: inline
+  });
   var handleClean = useCallback(function (event) {
     var target = event.target; // exclude searchBar
 
@@ -458,11 +459,13 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }
   }, [searchKeywordState, checkTreePrefix, expandItemValues, filteredData, focusItemValue, treeNodesRefs, childrenKey, valueKey, disabledItemValues]);
   var handleLeftArrow = useCallback(function () {
+    if (_isNil(focusItemValue)) return;
     var focusItem = getActiveItem(focusItemValue, flattenNodes, valueKey);
     leftArrowHandler({
       focusItem: focusItem,
       expand: expandItemValues.includes(focusItem === null || focusItem === void 0 ? void 0 : focusItem[valueKey]),
       onExpand: handleExpand,
+      childrenKey: childrenKey,
       onFocusItem: function onFocusItem() {
         var _focusItem$parent, _focusItem$parent2;
 
@@ -470,8 +473,9 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
         focusTreeNode(focusItem === null || focusItem === void 0 ? void 0 : (_focusItem$parent2 = focusItem.parent) === null || _focusItem$parent2 === void 0 ? void 0 : _focusItem$parent2.refKey, treeNodesRefs, "." + checkTreePrefix('node-label'));
       }
     });
-  }, [checkTreePrefix, expandItemValues, flattenNodes, focusItemValue, handleExpand, treeNodesRefs, valueKey]);
+  }, [checkTreePrefix, expandItemValues, flattenNodes, focusItemValue, handleExpand, treeNodesRefs, valueKey, childrenKey]);
   var handleRightArrow = useCallback(function () {
+    if (_isNil(focusItemValue)) return;
     var focusItem = getActiveItem(focusItemValue, flattenNodes, valueKey);
     rightArrowHandler({
       focusItem: focusItem,
@@ -484,6 +488,7 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     });
   }, [focusItemValue, flattenNodes, valueKey, expandItemValues, childrenKey, handleExpand, handleFocusItem]);
   var selectActiveItem = useCallback(function (event) {
+    if (_isNil(focusItemValue)) return;
     var activeItem = getActiveItem(focusItemValue, flattenNodes, valueKey);
 
     if (!isNodeUncheckable(activeItem, {
@@ -566,19 +571,22 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
         key: node[valueKey]
       }, /*#__PURE__*/React.createElement(CheckTreeNode, _extends({}, nodeProps, {
         ref: function ref(_ref) {
-          return saveTreeNodeRef(refKey, _ref);
+          return saveTreeNodeRef(_ref, refKey);
         }
       })), /*#__PURE__*/React.createElement("div", {
         className: checkTreePrefix('children')
       }, nodes.map(function (child) {
         return renderNode(child, layer);
+      }), showIndentLine && /*#__PURE__*/React.createElement("span", {
+        className: checkTreePrefix('indent-line'),
+        style: getTreeNodeIndent(rtl, layer - 1, true)
       })));
     }
 
     return /*#__PURE__*/React.createElement(CheckTreeNode, _extends({
       key: node[valueKey],
       ref: function ref(_ref2) {
-        return saveTreeNodeRef(refKey, _ref2);
+        return saveTreeNodeRef(_ref2, refKey);
       }
     }, nodeProps));
   };
@@ -604,7 +612,7 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
         style: style,
         key: key,
         ref: function ref(_ref4) {
-          return saveTreeNodeRef(refKey, _ref4);
+          return saveTreeNodeRef(_ref4, refKey);
         }
       }, nodeProps));
     };
@@ -630,7 +638,7 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }, style) : {};
     return /*#__PURE__*/React.createElement("div", {
       id: id ? id + "-listbox" : undefined,
-      ref: inline ? mergeRefs(treeViewRef, ref) : treeViewRef,
+      ref: treeViewRef,
       role: "tree",
       "aria-multiselectable": true,
       className: classes,

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