rsuite 5.49.0 → 5.51.0

package/esm/CheckTreePicker/CheckTreePicker.js

@@ -7,15 +7,15 @@ import _omit from "lodash/omit";
 import _isFunction from "lodash/isFunction";
 import _pick from "lodash/pick";
 import _isNil from "lodash/isNil";
-import React, { useState, useRef, useEffect, useCallback, useContext, useMemo } from 'react';
+import React, { useState, useEffect, useContext, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { List, AutoSizer } from '../Windowing';
 import CheckTreeNode from './CheckTreeNode';
 import TreeContext from '../Tree/TreeContext';
 import { getKeyParentMap, getPathTowardsItem, getTreeNodeIndent } from '../utils/treeUtils';
-import { createChainedFunction, useCustom, useClassNames, useControlled, KEY_VALUES, mergeRefs } from '../utils';
-import { PickerToggle, onMenuKeyDown as _onMenuKeyDown, PickerOverlay, SearchBar, SelectedElement, PickerToggleTrigger, createConcatChildrenFunction, usePickerClassName, usePublicMethods, pickTriggerPropKeys, omitTriggerPropKeys, listPickerPropTypes, useToggleKeyDownEvent } from '../Picker';
+import { createChainedFunction, useCustom, useClassNames, useControlled, useEventCallback, KEY_VALUES, mergeRefs } from '../utils';
+import { PickerToggle, TreeView, onMenuKeyDown as _onMenuKeyDown, PickerPopup, SearchBar, SelectedElement, PickerToggleTrigger, createConcatChildrenFunction, usePickerClassName, useToggleKeyDownEvent, usePickerRef, pickTriggerPropKeys, omitTriggerPropKeys, listPickerPropTypes } from '../Picker';
 import { isEveryChildChecked, isSomeNodeHasChildren, isAllSiblingNodeUncheckable, isEveryFirstLevelNodeUncheckable, getFormattedTree, getDisabledState, getCheckTreePickerDefaultValue, getSelectedItems, isNodeUncheckable } from './utils';
 import { hasVisibleChildren, getExpandWhenSearching, useTreeSearch, useTreeNodeRefs, getDefaultExpandItemValues, useFlattenTreeData, focusNextItem, getFocusableItems, focusPreviousItem, toggleExpand, getActiveItem, useGetTreeNodeChildren, focusToActiveTreeNode, focusTreeNode, leftArrowHandler, rightArrowHandler, isSearching } from '../utils/treeUtils';
 var emptyArray = [];
@@ -106,12 +106,16 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     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", "menuMaxHeight", "menuStyle", "searchable", "virtualized", "className", "classPrefix", "menuClassName", "menuAutoWidth", "uncheckableItemValues", "id", "listProps", "renderMenu", "getChildren", "renderExtraFooter", "onEntered", "onChange", "onClean", "onClose", "onExited", "onSearch", "onSelect", "onSelectItem", "onOpen", "onScroll", "onExpand", "renderValue", "renderTreeIcon", "renderTreeNode"]);
   var _useContext = useContext(TreeContext),
     inline = _useContext.inline;
-  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 _usePickerRef = usePickerRef(ref, {
+      inline: inline
+    }),
+    trigger = _usePickerRef.trigger,
+    root = _usePickerRef.root,
+    target = _usePickerRef.target,
+    overlay = _usePickerRef.overlay,
+    list = _usePickerRef.list,
+    searchInput = _usePickerRef.searchInput,
+    treeView = _usePickerRef.treeView;
   var _useCustom = useCustom('Picker', overrideLocale),
     rtl = _useCustom.rtl,
     locale = _useCustom.locale;
@@ -192,7 +196,7 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
    * get formatted nodes for render tree
    * @params render - renderNode function. only used when virtualized setting false
    */
-  var getFormattedNodes = useCallback(function (render) {
+  var getFormattedNodes = function getFormattedNodes(render) {
     if (virtualized) {
       return formatVirtualizedTreeData(flattenNodes, filteredData, expandItemValues, {
         cascade: cascade,
@@ -207,7 +211,7 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }).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) {
     return {
       as: Component,
@@ -234,23 +238,23 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       allUncheckable: isAllSiblingNodeUncheckable(node, flattenNodes, uncheckableItemValues, valueKey),
       onSelect: handleSelect,
       onExpand: handleExpand,
-      onRenderTreeNode: renderTreeNode,
-      onRenderTreeIcon: renderTreeIcon
+      renderTreeNode: renderTreeNode,
+      renderTreeIcon: renderTreeIcon
     };
   };
-  var focusActiveNode = useCallback(function () {
-    if (listRef.current) {
+  var focusActiveNode = function focusActiveNode() {
+    if (list.current) {
       focusToActiveTreeNode({
-        list: listRef.current,
+        list: list.current,
         valueKey: valueKey,
         selector: "." + checkTreePrefix('node-active'),
         activeNode: activeNode,
         virtualized: virtualized,
-        container: treeViewRef.current,
+        container: treeView.current,
         formattedNodes: getFormattedNodes()
       });
     }
-  }, [checkTreePrefix, activeNode, getFormattedNodes, valueKey, virtualized]);
+  };
   useEffect(function () {
     setValue(getCheckTreePickerDefaultValue(value, uncheckableItemValues));
   }, []); // eslint-disable-line react-hooks/exhaustive-deps
@@ -280,7 +284,7 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     });
     forceUpdate();
   }, [cascade, value, uncheckableItemValues, unSerializeList, flattenNodes, forceUpdate]);
-  var toggleUpChecked = useCallback(function (nodes, node, checked) {
+  var toggleUpChecked = useEventCallback(function (nodes, node, checked) {
     var currentNode = node.refKey ? nodes[node.refKey] : null;
     if (cascade && currentNode) {
       if (!checked) {
@@ -299,8 +303,8 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
         toggleUpChecked(nodes, currentNode.parent, checked);
       }
     }
-  }, [cascade]);
-  var toggleDownChecked = useCallback(function (nodes, node, isChecked) {
+  });
+  var toggleDownChecked = useEventCallback(function (nodes, node, isChecked) {
     var currentNode = node.refKey ? nodes[node.refKey] : null;
     if (!currentNode) {
       return;
@@ -314,8 +318,8 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
         toggleDownChecked(nodes, child, isChecked);
       });
     }
-  }, [cascade, childrenKey]);
-  var toggleChecked = useCallback(function (node, isChecked) {
+  });
+  var toggleChecked = useEventCallback(function (node, isChecked) {
     var nodes = _cloneDeep(flattenNodes);
     toggleDownChecked(nodes, node, isChecked);
     node.parent && toggleUpChecked(nodes, node.parent, isChecked);
@@ -324,7 +328,7 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     return values.filter(function (v) {
       return !uncheckableItemValues.includes(v);
     });
-  }, [flattenNodes, uncheckableItemValues, serializeListOnlyParent, toggleDownChecked, toggleUpChecked]);
+  });
 
   // TODO-Doma
   // Replace `getKeyParentMap` with `getParentMap`
@@ -335,7 +339,7 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       return node[childrenKey];
     });
   }, [childrenKey, data, valueKey]);
-  var handleSelect = useCallback(function (node, event) {
+  var handleSelect = useEventCallback(function (node, event) {
     var currentNode = node.refKey ? flattenNodes[node.refKey] : null;
     if (!node || !currentNode) {
       return;
@@ -358,18 +362,18 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onSelectItem === null || onSelectItem === void 0 ? void 0 : onSelectItem(node, getPathTowardsItem(node, function (item) {
       return itemParentMap.get(item[valueKey]);
     }));
-  }, [flattenNodes, toggleChecked, isControlled, valueKey, onChange, onSelect, onSelectItem, unSerializeList, cascade, uncheckableItemValues, setValue, itemParentMap]);
-  var handleOpen = useCallback(function () {
-    var _triggerRef$current, _triggerRef$current$o;
-    (_triggerRef$current = triggerRef.current) === null || _triggerRef$current === void 0 ? void 0 : (_triggerRef$current$o = _triggerRef$current.open) === null || _triggerRef$current$o === void 0 ? void 0 : _triggerRef$current$o.call(_triggerRef$current);
+  });
+  var handleOpen = useEventCallback(function () {
+    var _trigger$current, _trigger$current$open;
+    (_trigger$current = trigger.current) === null || _trigger$current === void 0 ? void 0 : (_trigger$current$open = _trigger$current.open) === null || _trigger$current$open === void 0 ? void 0 : _trigger$current$open.call(_trigger$current);
     setFocusItemValue(activeNode === null || activeNode === void 0 ? void 0 : activeNode[valueKey]);
     focusActiveNode();
     onOpen === null || onOpen === void 0 ? void 0 : onOpen();
     setActive(true);
-  }, [activeNode, focusActiveNode, onOpen, valueKey]);
-  var handleClose = useCallback(function () {
-    var _triggerRef$current2, _triggerRef$current2$, _targetRef$current;
-    (_triggerRef$current2 = triggerRef.current) === null || _triggerRef$current2 === void 0 ? void 0 : (_triggerRef$current2$ = _triggerRef$current2.close) === null || _triggerRef$current2$ === void 0 ? void 0 : _triggerRef$current2$.call(_triggerRef$current2);
+  });
+  var handleClose = useEventCallback(function () {
+    var _trigger$current2, _trigger$current2$clo, _target$current;
+    (_trigger$current2 = trigger.current) === null || _trigger$current2 === void 0 ? void 0 : (_trigger$current2$clo = _trigger$current2.close) === null || _trigger$current2$clo === void 0 ? void 0 : _trigger$current2$clo.call(_trigger$current2);
     setSearchKeyword('');
     onClose === null || onClose === void 0 ? void 0 : onClose();
     setFocusItemValue(null);
@@ -378,9 +382,9 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     /**
      * when using keyboard toggle picker, should refocus on PickerToggle Component after close picker menu
      */
-    (_targetRef$current = targetRef.current) === null || _targetRef$current === void 0 ? void 0 : _targetRef$current.focus();
-  }, [onClose, setSearchKeyword]);
-  var handleExpand = useCallback(function (node) {
+    (_target$current = target.current) === null || _target$current === void 0 ? void 0 : _target$current.focus();
+  });
+  var handleExpand = useEventCallback(function (node) {
     var nextExpandItemValues = toggleExpand({
       node: node,
       isExpand: !node.expand,
@@ -395,19 +399,11 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (_isFunction(getChildren) && !node.expand && Array.isArray(node[childrenKey]) && node[childrenKey].length === 0) {
       loadChildren(node, getChildren);
     }
-  }, [childrenKey, expandItemValues, getChildren, loadChildren, onExpand, setExpandItemValues, valueKey]);
-  usePublicMethods(ref, {
-    rootRef: inline ? treeViewRef : undefined,
-    triggerRef: triggerRef,
-    overlayRef: overlayRef,
-    targetRef: targetRef,
-    listRef: listRef,
-    inline: inline
   });
-  var handleClean = useCallback(function (event) {
+  var handleClean = useEventCallback(function (event) {
     var target = event.target;
-    // exclude searchBar
-    if (target.matches('div[role="searchbox"] > input') || disabled || !cleanable) {
+    // exclude searchbox
+    if (target.matches('input[role="searchbox"]') || disabled || !cleanable) {
       return;
     }
     setActiveNode(null);
@@ -423,8 +419,8 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       });
     }
     onChange === null || onChange === void 0 ? void 0 : onChange([], event);
-  }, [cascade, cleanable, disabled, flattenNodes, onChange, setValue, unSerializeList, uncheckableItemValues, isControlled]);
-  var handleFocusItem = useCallback(function (key) {
+  });
+  var handleFocusItem = useEventCallback(function (key) {
     var focusableItems = getFocusableItems(filteredData, {
       disabledItemValues: disabledItemValues,
       valueKey: valueKey,
@@ -449,8 +445,8 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (key === KEY_VALUES.UP) {
       focusPreviousItem(focusProps);
     }
-  }, [searchKeywordState, checkTreePrefix, expandItemValues, filteredData, focusItemValue, treeNodesRefs, childrenKey, valueKey, disabledItemValues]);
-  var handleLeftArrow = useCallback(function () {
+  });
+  var handleLeftArrow = useEventCallback(function () {
     if (_isNil(focusItemValue)) return;
     var focusItem = getActiveItem(focusItemValue, flattenNodes, valueKey);
     leftArrowHandler({
@@ -464,8 +460,8 @@ 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, childrenKey]);
-  var handleRightArrow = useCallback(function () {
+  });
+  var handleRightArrow = useEventCallback(function () {
     if (_isNil(focusItemValue)) return;
     var focusItem = getActiveItem(focusItemValue, flattenNodes, valueKey);
     rightArrowHandler({
@@ -477,8 +473,8 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
         handleFocusItem(KEY_VALUES.DOWN);
       }
     });
-  }, [focusItemValue, flattenNodes, valueKey, expandItemValues, childrenKey, handleExpand, handleFocusItem]);
-  var selectActiveItem = useCallback(function (event) {
+  });
+  var selectActiveItem = function selectActiveItem(event) {
     if (_isNil(focusItemValue)) return;
     var activeItem = getActiveItem(focusItemValue, flattenNodes, valueKey);
     if (!isNodeUncheckable(activeItem, {
@@ -487,13 +483,13 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }) && activeItem !== null) {
       handleSelect(activeItem, event);
     }
-  }, [flattenNodes, focusItemValue, handleSelect, uncheckableItemValues, valueKey]);
+  };
   var onPickerKeydown = useToggleKeyDownEvent(_extends({
     toggle: !focusItemValue || !active,
-    triggerRef: triggerRef,
-    targetRef: targetRef,
-    overlayRef: overlayRef,
-    searchInputRef: searchInputRef,
+    trigger: trigger,
+    target: target,
+    overlay: overlay,
+    searchInput: searchInput,
     active: active,
     onExit: handleClean,
     onClose: handleClose,
@@ -512,8 +508,8 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       });
     }
   }, rest));
-  var handleTreeKeydown = useCallback(function (event) {
-    if (!treeViewRef.current) {
+  var handleTreeKeydown = useEventCallback(function (event) {
+    if (!treeView.current) {
       return;
     }
     _onMenuKeyDown(event, {
@@ -527,7 +523,7 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       right: rtl ? handleLeftArrow : handleRightArrow,
       enter: selectActiveItem
     });
-  }, [handleFocusItem, handleLeftArrow, handleRightArrow, rtl, selectActiveItem]);
+  });
   var renderNode = function renderNode(node, layer) {
     var visible = node.visible,
       refKey = node.refKey; // when searching, all nodes should be expand
@@ -561,7 +557,8 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
           return saveTreeNodeRef(_ref, refKey);
         }
       })), /*#__PURE__*/React.createElement("div", {
-        className: checkTreePrefix('children')
+        className: checkTreePrefix('group'),
+        role: "group"
       }, nodes.map(function (child) {
         return renderNode(child, layer);
       }), showIndentLine && /*#__PURE__*/React.createElement("span", {
@@ -613,21 +610,17 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
         className: prefix('none')
       }, locale.noResultsText);
     }
-    var treeNodesClass = merge(checkTreePrefix('nodes'), (_merge2 = {}, _merge2[checkTreePrefix('all-uncheckable')] = isEveryFirstLevelNodeUncheckable(flattenNodes, uncheckableItemValues, valueKey), _merge2));
-    var styles = inline ? _extends({
-      height: height
-    }, style) : {};
-    return /*#__PURE__*/React.createElement("div", {
-      id: id ? id + "-listbox" : undefined,
-      ref: treeViewRef,
-      role: "tree",
-      "aria-multiselectable": true,
+    var treeNodesClass = merge(checkTreePrefix('root'), (_merge2 = {}, _merge2[checkTreePrefix('all-uncheckable')] = isEveryFirstLevelNodeUncheckable(flattenNodes, uncheckableItemValues, valueKey), _merge2));
+    return /*#__PURE__*/React.createElement(TreeView, {
+      ref: inline ? root : treeView,
+      multiselectable: true,
+      treeRootClassName: treeNodesClass,
       className: classes,
-      style: styles,
+      style: inline ? _extends({
+        height: height
+      }, style) : {},
       onScroll: onScroll,
       onKeyDown: inline ? handleTreeKeydown : undefined
-    }, /*#__PURE__*/React.createElement("div", {
-      className: treeNodesClass
     }, virtualized ? /*#__PURE__*/React.createElement(AutoSizer, {
       defaultHeight: inline ? height : menuMaxHeight,
       style: {
@@ -637,13 +630,13 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }, function (_ref5) {
       var height = _ref5.height;
       return /*#__PURE__*/React.createElement(List, _extends({
-        ref: listRef,
+        ref: list,
         height: height,
         itemSize: itemSize,
         itemCount: formattedNodes.length,
         itemData: formattedNodes
       }, listProps), renderVirtualListNode);
-    }) : formattedNodes));
+    }) : formattedNodes);
   };
   var renderDropdownMenu = function renderDropdownMenu(positionProps, speakerRef) {
     var left = positionProps.left,
@@ -654,18 +647,18 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       left: left,
       top: top
     });
-    return /*#__PURE__*/React.createElement(PickerOverlay, {
+    return /*#__PURE__*/React.createElement(PickerPopup, {
       autoWidth: menuAutoWidth,
       className: classes,
       style: mergedMenuStyle,
-      ref: mergeRefs(overlayRef, speakerRef),
+      ref: mergeRefs(overlay, speakerRef),
       onKeyDown: onPickerKeydown,
-      target: triggerRef
+      target: trigger
     }, searchable ? /*#__PURE__*/React.createElement(SearchBar, {
       placeholder: locale.searchPlaceholder,
       onChange: handleSearch,
       value: searchKeywordState,
-      inputRef: searchInputRef
+      inputRef: searchInput
     }) : null, renderMenu ? renderMenu(renderCheckTree()) : renderCheckTree(), renderExtraFooter === null || renderExtraFooter === void 0 ? void 0 : renderExtraFooter());
   };
   var selectedItems = useMemo(function () {
@@ -710,8 +703,11 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     return renderCheckTree();
   }
   return /*#__PURE__*/React.createElement(PickerToggleTrigger, {
+    id: id,
+    popupType: "tree",
+    multiple: true,
     pickerProps: _pick(props, pickTriggerPropKeys),
-    ref: triggerRef,
+    ref: trigger,
     placement: placement,
     onEnter: handleOpen,
     onEntered: onEntered,
@@ -719,10 +715,10 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     speaker: renderDropdownMenu
   }, /*#__PURE__*/React.createElement(Component, {
     className: classes,
-    style: style
+    style: style,
+    ref: root
   }, /*#__PURE__*/React.createElement(PickerToggle, _extends({}, _omit(rest, [].concat(omitTriggerPropKeys, usedClassNamePropKeys)), {
-    id: id,
-    ref: targetRef,
+    ref: target,
     appearance: appearance,
     onKeyDown: onPickerKeydown,
     onClean: createChainedFunction(handleClean, onClean),
@@ -732,7 +728,8 @@ var CheckTreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     hasValue: hasValidValue,
     active: active,
     placement: placement,
-    inputValue: value
+    inputValue: value,
+    focusItemValue: focusItemValue
   }), selectedElement || locale.placeholder)));
 });
 CheckTreePicker.displayName = 'CheckTreePicker';

package/esm/DatePicker/DatePicker.d.ts

@@ -20,7 +20,11 @@ export interface DatePickerProps extends PickerBaseProps<DatePickerLocale>, Form
      * @deprecated use <Calendar> instead
      **/
     inline?: boolean;
-    /** ISO 8601 standard, each calendar week begins on Monday and Sunday on the seventh day */
+    /**
+     * ISO 8601 standard, each calendar week begins on Monday and Sunday on the seventh day
+     *
+     * @see https://en.wikipedia.org/wiki/ISO_week_date
+     */
     isoWeek?: boolean;
     /** A label displayed at the beginning of toggle button */
     label?: React.ReactNode;

package/esm/DatePicker/DatePicker.js

@@ -19,12 +19,9 @@ import Stack from '../Stack';
 import PredefinedRanges from './PredefinedRanges';
 import { createChainedFunction, mergeRefs, useClassNames, useControlled, useCustom, useUniqueId, useEventCallback, partitionHTMLProps } from '../utils';
 import { shouldRenderMonth, shouldRenderDate, shouldRenderTime, shouldOnlyRenderTime, setHours, getHours, addMonths, addDays, isValid, disabledTime, copyTime, calendarOnlyProps } from '../utils/dateUtils';
-import { PickerOverlay, pickerPropTypes, PickerToggleTrigger, pickTriggerPropKeys, omitTriggerPropKeys, usePickerClassName, onMenuKeyDown } from '../Picker';
-import usePickerRef from '../Picker/usePickerRef';
+import { PickerPopup, PickerLabel, PickerIndicator, PickerToggleTrigger, pickerPropTypes, pickTriggerPropKeys, omitTriggerPropKeys, usePickerClassName, usePickerRef, onMenuKeyDown } from '../Picker';
 import DateInput from '../DateInput';
 import InputGroup from '../InputGroup';
-import PickerLabel from './PickerLabel';
-import PickerIndicator from './PickerIndicator';
 import { OverlayCloseCause } from '../Overlay/OverlayTrigger';
 import { deprecatePropTypeNew } from '../utils/deprecatePropType';
 import { getAriaLabel } from '../Calendar/utils';
@@ -99,7 +96,7 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onToggleTimeDropdown = props.onToggleTimeDropdown,
     onShortcutClick = props.onShortcutClick,
     restProps = _objectWithoutPropertiesLoose(props, ["as", "className", "classPrefix", "calendarDefaultDate", "cleanable", "editable", "defaultValue", "disabled", "readOnly", "plaintext", "format", "id", "isoWeek", "limitEndYear", "limitStartYear", "locale", "loading", "label", "menuClassName", "menuStyle", "appearance", "placement", "oneTap", "placeholder", "ranges", "value", "showMeridian", "showWeekNumbers", "style", "size", "caretAs", "disabledDate", "disabledHours", "disabledMinutes", "disabledSeconds", "shouldDisableDate", "shouldDisableHour", "shouldDisableMinute", "shouldDisableSecond", "onChange", "onChangeCalendarDate", "onClean", "onClose", "onEntered", "onExited", "onNextMonth", "onOk", "onOpen", "onPrevMonth", "onSelect", "onToggleMonthDropdown", "onToggleTimeDropdown", "onShortcutClick"]);
-  var id = useUniqueId(classPrefix + "-", idProp);
+  var id = useUniqueId('rs-', idProp);
   var _usePickerRef = usePickerRef(ref),
     trigger = _usePickerRef.trigger,
     root = _usePickerRef.root,
@@ -276,7 +273,7 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onClean === null || onClean === void 0 ? void 0 : onClean(event);
     event.stopPropagation();
   });
-  var handlePickerOverlayKeyDown = useEventCallback(function (event) {
+  var handlePickerPopupKeyDown = useEventCallback(function (event) {
     var delta = 0;
     var step = showMonth ? 6 : 7;
     var changeDateFunc = showMonth ? addMonths : addDays;
@@ -420,7 +417,7 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       left: left,
       top: top
     });
-    return /*#__PURE__*/React.createElement(PickerOverlay, {
+    return /*#__PURE__*/React.createElement(PickerPopup, {
       role: "dialog",
       "aria-labelledby": label ? id + "-label" : undefined,
       tabIndex: -1,
@@ -428,7 +425,7 @@ var DatePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       ref: mergeRefs(overlay, speakerRef),
       style: styles,
       target: trigger,
-      onKeyDown: handlePickerOverlayKeyDown
+      onKeyDown: handlePickerPopupKeyDown
     }, /*#__PURE__*/React.createElement(Stack, {
       alignItems: "flex-start"
     }, sideRanges.length > 0 && /*#__PURE__*/React.createElement(PredefinedRanges, {

package/esm/DatePicker/Toolbar.js

@@ -56,7 +56,8 @@ var Toolbar = /*#__PURE__*/React.forwardRef(function Toolbar(props, ref) {
     calendarDate: calendarDate,
     locale: locale,
     disabledShortcut: disabledShortcut,
-    onShortcutClick: onShortcutClick
+    onShortcutClick: onShortcutClick,
+    "data-testid": "daterange-predefined-bottom"
   }), /*#__PURE__*/React.createElement("div", {
     className: prefix('right')
   }, !hideOkBtn && /*#__PURE__*/React.createElement(SubmitButton, {

package/esm/DateRangeInput/DateRangeInput.js

@@ -58,10 +58,10 @@ var DateRangeInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
     isControlledDate: isControlled
   };
   var startDateState = useDateInputState(_extends({}, dateInputOptions, {
-    date: value === null || value === void 0 ? void 0 : value[0]
+    date: (value === null || value === void 0 ? void 0 : value[0]) || null
   }));
   var endDateState = useDateInputState(_extends({}, dateInputOptions, {
-    date: value === null || value === void 0 ? void 0 : value[1]
+    date: (value === null || value === void 0 ? void 0 : value[1]) || null
   }));
   var getActiveState = function getActiveState(type) {
     if (type === void 0) {

package/esm/DateRangePicker/Calendar.js

@@ -1,11 +1,11 @@
 'use client';
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+import React from 'react';
 import PropTypes from 'prop-types';
-import React, { useCallback } from 'react';
 import { addMonths } from '../utils/dateUtils';
 import CalendarCore from '../Calendar/CalendarContainer';
-import { DATERANGE_DISABLED_TARGET } from '../utils';
+import { DATERANGE_DISABLED_TARGET, useEventCallback } from '../utils';
 var Calendar = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _props$as = props.as,
     Component = _props$as === void 0 ? CalendarCore : _props$as,
@@ -25,37 +25,39 @@ var Calendar = /*#__PURE__*/React.forwardRef(function (props, ref) {
     _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     rest = _objectWithoutPropertiesLoose(props, ["as", "calendarDate", "format", "disabledDate", "index", "limitEndYear", "limitStartYear", "onChangeCalendarMonth", "onChangeCalendarTime", "onToggleMeridian", "onSelect", "value"]);
-  var onMoveForward = useCallback(function (nextPageDate) {
+  var onMoveForward = useEventCallback(function (nextPageDate) {
     onChangeCalendarMonth === null || onChangeCalendarMonth === void 0 ? void 0 : onChangeCalendarMonth(index, nextPageDate);
-  }, [index, onChangeCalendarMonth]);
-  var onMoveBackward = useCallback(function (nextPageDate) {
+  });
+  var onMoveBackward = useEventCallback(function (nextPageDate) {
     onChangeCalendarMonth === null || onChangeCalendarMonth === void 0 ? void 0 : onChangeCalendarMonth(index, nextPageDate);
-  }, [index, onChangeCalendarMonth]);
-  var handleSelect = useCallback(function (date, event) {
+  });
+  var handleSelect = useEventCallback(function (date, event) {
     onSelect === null || onSelect === void 0 ? void 0 : onSelect(index, date, event);
-  }, [index, onSelect]);
-  var handleChangeMonth = useCallback(function (nextPageDate) {
+  });
+  var handleChangeMonth = useEventCallback(function (nextPageDate) {
     onChangeCalendarMonth === null || onChangeCalendarMonth === void 0 ? void 0 : onChangeCalendarMonth(index, nextPageDate);
-  }, [index, onChangeCalendarMonth]);
-  var handleChangeTime = useCallback(function (nextPageDate) {
+  });
+  var handleChangeTime = useEventCallback(function (nextPageDate) {
     onChangeCalendarTime === null || onChangeCalendarTime === void 0 ? void 0 : onChangeCalendarTime(index, nextPageDate);
-  }, [index, onChangeCalendarTime]);
-  var handleToggleMeridian = useCallback(function (event) {
+  });
+  var handleToggleMeridian = useEventCallback(function (event) {
     onToggleMeridian(index, event);
-  }, [index, onToggleMeridian]);
-  var getCalendarDate = useCallback(function () {
+  });
+  var getCalendarDate = function getCalendarDate() {
     return calendarDate[index];
-  }, [calendarDate, index]);
-  var handleMoveForward = useCallback(function () {
+  };
+  var handleMoveForward = useEventCallback(function () {
     onMoveForward === null || onMoveForward === void 0 ? void 0 : onMoveForward(addMonths(getCalendarDate(), 1));
-  }, [getCalendarDate, onMoveForward]);
-  var handleMoveBackward = useCallback(function () {
+  });
+  var handleMoveBackward = useEventCallback(function () {
     onMoveBackward === null || onMoveBackward === void 0 ? void 0 : onMoveBackward(addMonths(getCalendarDate(), -1));
-  }, [getCalendarDate, onMoveBackward]);
-  var disabledMonth = useCallback(function (date) {
+  });
+  var disabledMonth = function disabledMonth(date) {
     return disabledDate === null || disabledDate === void 0 ? void 0 : disabledDate(date, value, DATERANGE_DISABLED_TARGET.CALENDAR);
-  }, [disabledDate, value]);
-  return /*#__PURE__*/React.createElement(Component, _extends({}, rest, {
+  };
+  return /*#__PURE__*/React.createElement(Component, _extends({
+    "data-testid": "calendar-" + (index === 0 ? 'start' : 'end')
+  }, rest, {
     format: format,
     dateRange: value,
     disabledDate: disabledMonth,

package/esm/DateRangePicker/DateRangePicker.d.ts

@@ -1,8 +1,11 @@
 import React from 'react';
 import { FormControlBaseProps, PickerBaseProps } from '../@types/common';
-import { PickerComponent, PickerToggleProps } from '../Picker';
+import { DateRangePickerLocale } from '../locales';
+import { PickerComponent } from '../Picker';
 import { DisabledDateFunction, RangeType, DateRange } from './types';
-export interface DateRangePickerProps extends PickerBaseProps, FormControlBaseProps<DateRange | null>, Pick<PickerToggleProps, 'caretAs' | 'readOnly' | 'plaintext' | 'loading'> {
+export interface DateRangePickerProps extends PickerBaseProps<DateRangePickerLocale>, FormControlBaseProps<DateRange | null> {
+    /** Custom caret component */
+    caretAs?: React.ElementType | null;
     /** Predefined date ranges */
     ranges?: RangeType[];
     /** Format date */
@@ -13,12 +16,20 @@ export interface DateRangePickerProps extends PickerBaseProps, FormControlBasePr
     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 */
+    /**
+     * ISO 8601 standard, each calendar week begins on Monday and Sunday on the seventh day
+     *
+     * @see https://en.wikipedia.org/wiki/ISO_week_date
+     */
     isoWeek?: boolean;
+    /** A label displayed at the beginning of toggle button */
+    label?: React.ReactNode;
     /** Set the upper limit of the available year relative to the current selection date */
     limitEndYear?: number;
     /** Set the lower limit of the available year relative to the current selection date */
     limitStartYear?: number;
+    /** Whether to display a loading state indicator */
+    loading?: boolean;
     /** Whether to show week numbers */
     showWeekNumbers?: boolean;
     /** Show only one calendar select */
@@ -47,7 +58,10 @@ export interface DateRangePickerProps extends PickerBaseProps, FormControlBasePr
     onShortcutClick?: (range: RangeType, event: React.MouseEvent) => void;
     /** Called when clean */
     onClean?: (event: React.MouseEvent) => void;
-    /** Custom render value */
+    /**
+     * Custom render value
+     * @deprecated
+     */
     renderValue?: (value: DateRange, format: string) => React.ReactNode;
     /** Custom render for calendar title */
     renderTitle?: (date: Date) => React.ReactNode;