rsuite 5.49.0 → 5.50.0

package/cjs/CheckPicker/CheckPicker.js

@@ -86,11 +86,13 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     onClose = props.onClose,
     onOpen = props.onOpen,
     rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "appearance", "classPrefix", "countable", "data", "disabledItemValues", "valueKey", "labelKey", "searchable", "virtualized", "cleanable", "placement", "menuAutoWidth", "menuMaxHeight", "menuClassName", "menuStyle", "locale", "placeholder", "disabled", "toggleAs", "style", "sticky", "value", "defaultValue", "groupBy", "listProps", "id", "sort", "searchBy", "renderMenuItem", "renderMenuGroup", "renderValue", "renderExtraFooter", "renderMenu", "onGroupTitleClick", "onSearch", "onEnter", "onEntered", "onExited", "onClean", "onChange", "onSelect", "onClose", "onOpen"]);
-  var triggerRef = (0, _react.useRef)(null);
-  var targetRef = (0, _react.useRef)(null);
-  var overlayRef = (0, _react.useRef)(null);
-  var searchInputRef = (0, _react.useRef)(null);
-  var listRef = (0, _react.useRef)(null);
+  var _usePickerRef = (0, _Picker.usePickerRef)(ref),
+    trigger = _usePickerRef.trigger,
+    root = _usePickerRef.root,
+    target = _usePickerRef.target,
+    overlay = _usePickerRef.overlay,
+    list = _usePickerRef.list,
+    searchInput = _usePickerRef.searchInput;
   var _useCustom = (0, _utils.useCustom)('Picker', overrideLocale),
     locale = _useCustom.locale;
   var _useControlled = (0, _utils.useControlled)(valueProp, defaultValue || []),
@@ -100,18 +102,18 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       data: data,
       valueKey: valueKey,
       target: function target() {
-        return overlayRef.current;
+        return overlay.current;
       }
     }),
     focusItemValue = _useFocusItemValue.focusItemValue,
     setFocusItemValue = _useFocusItemValue.setFocusItemValue,
     onFocusItem = _useFocusItemValue.onKeyDown;
-  var handleSearchCallback = (0, _react.useCallback)(function (searchKeyword, filteredData, event) {
+  var handleSearchCallback = (0, _utils.useEventCallback)(function (searchKeyword, filteredData, event) {
     var _filteredData$;
     // The first option after filtering is the focus.
     setFocusItemValue(filteredData === null || filteredData === void 0 ? void 0 : (_filteredData$ = filteredData[0]) === null || _filteredData$ === void 0 ? void 0 : _filteredData$[valueKey]);
     onSearch === null || onSearch === void 0 ? void 0 : onSearch(searchKeyword, event);
-  }, [setFocusItemValue, onSearch, valueKey]);
+  });
 
   // Use search keywords to filter options.
   var _useSearch = (0, _Picker.useSearch)(data, {
@@ -145,17 +147,17 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     }
     setStickyItems(nextStickyItems);
   };
-  var handleChangeValue = (0, _react.useCallback)(function (value, event) {
+  var handleChangeValue = (0, _utils.useEventCallback)(function (value, event) {
     onChange === null || onChange === void 0 ? void 0 : onChange(value, event);
-  }, [onChange]);
-  var handleClean = (0, _react.useCallback)(function (event) {
+  });
+  var handleClean = (0, _utils.useEventCallback)(function (event) {
     if (disabled || !cleanable) {
       return;
     }
     setValue([]);
     onClean === null || onClean === void 0 ? void 0 : onClean(event);
     handleChangeValue([], event);
-  }, [disabled, cleanable, setValue, onClean, handleChangeValue]);
+  });
   var handleMenuPressEnter = function handleMenuPressEnter(event) {
     var nextValue = (0, _clone.default)(value);
     if (!focusItemValue) {
@@ -179,10 +181,10 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   };
   var onPickerKeyDown = (0, _Picker.useToggleKeyDownEvent)((0, _extends2.default)({
     toggle: !focusItemValue || !active,
-    triggerRef: triggerRef,
-    targetRef: targetRef,
-    overlayRef: overlayRef,
-    searchInputRef: searchInputRef,
+    trigger: trigger,
+    target: target,
+    overlay: overlay,
+    searchInput: searchInput,
     active: active,
     onExit: handleClean,
     onMenuKeyDown: onFocusItem,
@@ -192,10 +194,10 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       setFocusItemValue(null);
     }
   }, rest));
-  var handleSelect = (0, _react.useCallback)(function (nextItemValue, item, event) {
+  var handleSelect = (0, _utils.useEventCallback)(function (nextItemValue, item, event) {
     onSelect === null || onSelect === void 0 ? void 0 : onSelect(nextItemValue, item, event);
-  }, [onSelect]);
-  var handleItemSelect = (0, _react.useCallback)(function (nextItemValue, item, event, checked) {
+  });
+  var handleItemSelect = (0, _utils.useEventCallback)(function (nextItemValue, item, event, checked) {
     var nextValue = (0, _clone.default)(value);
     if (checked) {
       nextValue.push(nextItemValue);
@@ -208,22 +210,16 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     setFocusItemValue(nextItemValue);
     handleSelect(nextValue, item, event);
     handleChangeValue(nextValue, event);
-  }, [value, setValue, handleSelect, handleChangeValue, setFocusItemValue]);
-  var handleEntered = (0, _react.useCallback)(function () {
+  });
+  var handleEntered = (0, _utils.useEventCallback)(function () {
     setActive(true);
     onOpen === null || onOpen === void 0 ? void 0 : onOpen();
-  }, [onOpen]);
-  var handleExited = (0, _react.useCallback)(function () {
+  });
+  var handleExited = (0, _utils.useEventCallback)(function () {
     resetSearch();
     setFocusItemValue(null);
     setActive(false);
     onClose === null || onClose === void 0 ? void 0 : onClose();
-  }, [onClose, setFocusItemValue, resetSearch]);
-  (0, _Picker.usePublicMethods)(ref, {
-    triggerRef: triggerRef,
-    overlayRef: overlayRef,
-    targetRef: targetRef,
-    listRef: listRef
   });
   var selectedItems = data.filter(function (item) {
     return value === null || value === void 0 ? void 0 : value.some(function (val) {
@@ -287,7 +283,7 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     var menu = items.length || filteredStickyItems.length ? /*#__PURE__*/_react.default.createElement(_Picker.DropdownMenu, {
       id: id ? id + "-listbox" : undefined,
       listProps: listProps,
-      listRef: listRef,
+      listRef: list,
       disabledItemValues: disabledItemValues,
       valueKey: valueKey,
       labelKey: labelKey,
@@ -310,17 +306,17 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       className: prefix(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["none"])))
     }, locale === null || locale === void 0 ? void 0 : locale.noResultsText);
     return /*#__PURE__*/_react.default.createElement(_Picker.PickerOverlay, {
-      ref: (0, _utils.mergeRefs)(overlayRef, speakerRef),
+      ref: (0, _utils.mergeRefs)(overlay, speakerRef),
       autoWidth: menuAutoWidth,
       className: classes,
       style: styles,
       onKeyDown: onPickerKeyDown,
-      target: triggerRef
+      target: trigger
     }, searchable && /*#__PURE__*/_react.default.createElement(_Picker.SearchBar, {
       placeholder: locale === null || locale === void 0 ? void 0 : locale.searchPlaceholder,
       onChange: handleSearch,
       value: searchKeyword,
-      inputRef: searchInputRef
+      inputRef: searchInput
     }), renderMenu ? renderMenu(menu) : menu, renderExtraFooter === null || renderExtraFooter === void 0 ? void 0 : renderExtraFooter());
   };
   var _usePickerClassName = (0, _Picker.usePickerClassName)((0, _extends2.default)({}, props, {
@@ -335,7 +331,7 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     usedClassNamePropKeys = _usePickerClassName[1];
   return /*#__PURE__*/_react.default.createElement(_Picker.PickerToggleTrigger, {
     pickerProps: (0, _pick.default)(props, _Picker.pickTriggerPropKeys),
-    ref: triggerRef,
+    ref: trigger,
     placement: placement,
     onEnter: (0, _utils.createChainedFunction)(initStickyItems, onEnter),
     onEntered: (0, _utils.createChainedFunction)(handleEntered, onEntered),
@@ -343,10 +339,11 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     speaker: renderDropdownMenu
   }, /*#__PURE__*/_react.default.createElement(Component, {
     className: classes,
-    style: style
+    style: style,
+    ref: root
   }, /*#__PURE__*/_react.default.createElement(_Picker.PickerToggle, (0, _extends2.default)({}, (0, _omit.default)(rest, [].concat(_Picker.omitTriggerPropKeys, usedClassNamePropKeys)), {
     id: id,
-    ref: targetRef,
+    ref: target,
     appearance: appearance,
     disabled: disabled,
     onClean: handleClean,

package/cjs/CheckTreePicker/CheckTreePicker.js

@@ -111,12 +111,16 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     rest = (0, _objectWithoutPropertiesLoose2.default)(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 = (0, _react.useContext)(_TreeContext.default),
     inline = _useContext.inline;
-  var triggerRef = (0, _react.useRef)(null);
-  var targetRef = (0, _react.useRef)(null);
-  var listRef = (0, _react.useRef)(null);
-  var overlayRef = (0, _react.useRef)(null);
-  var searchInputRef = (0, _react.useRef)(null);
-  var treeViewRef = (0, _react.useRef)(null);
+  var _usePickerRef = (0, _Picker.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 = (0, _utils.useCustom)('Picker', overrideLocale),
     rtl = _useCustom.rtl,
     locale = _useCustom.locale;
@@ -197,7 +201,7 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
    * get formatted nodes for render tree
    * @params render - renderNode function. only used when virtualized setting false
    */
-  var getFormattedNodes = (0, _react.useCallback)(function (render) {
+  var getFormattedNodes = function getFormattedNodes(render) {
     if (virtualized) {
       return formatVirtualizedTreeData(flattenNodes, filteredData, expandItemValues, {
         cascade: cascade,
@@ -212,7 +216,7 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     }).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,
@@ -243,19 +247,19 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
       onRenderTreeIcon: renderTreeIcon
     };
   };
-  var focusActiveNode = (0, _react.useCallback)(function () {
-    if (listRef.current) {
+  var focusActiveNode = function focusActiveNode() {
+    if (list.current) {
       (0, _treeUtils.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]);
+  };
   (0, _react.useEffect)(function () {
     setValue((0, _utils2.getCheckTreePickerDefaultValue)(value, uncheckableItemValues));
   }, []); // eslint-disable-line react-hooks/exhaustive-deps
@@ -285,7 +289,7 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     });
     forceUpdate();
   }, [cascade, value, uncheckableItemValues, unSerializeList, flattenNodes, forceUpdate]);
-  var toggleUpChecked = (0, _react.useCallback)(function (nodes, node, checked) {
+  var toggleUpChecked = (0, _utils.useEventCallback)(function (nodes, node, checked) {
     var currentNode = node.refKey ? nodes[node.refKey] : null;
     if (cascade && currentNode) {
       if (!checked) {
@@ -304,8 +308,8 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
         toggleUpChecked(nodes, currentNode.parent, checked);
       }
     }
-  }, [cascade]);
-  var toggleDownChecked = (0, _react.useCallback)(function (nodes, node, isChecked) {
+  });
+  var toggleDownChecked = (0, _utils.useEventCallback)(function (nodes, node, isChecked) {
     var currentNode = node.refKey ? nodes[node.refKey] : null;
     if (!currentNode) {
       return;
@@ -319,8 +323,8 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
         toggleDownChecked(nodes, child, isChecked);
       });
     }
-  }, [cascade, childrenKey]);
-  var toggleChecked = (0, _react.useCallback)(function (node, isChecked) {
+  });
+  var toggleChecked = (0, _utils.useEventCallback)(function (node, isChecked) {
     var nodes = (0, _cloneDeep2.default)(flattenNodes);
     toggleDownChecked(nodes, node, isChecked);
     node.parent && toggleUpChecked(nodes, node.parent, isChecked);
@@ -329,7 +333,7 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     return values.filter(function (v) {
       return !uncheckableItemValues.includes(v);
     });
-  }, [flattenNodes, uncheckableItemValues, serializeListOnlyParent, toggleDownChecked, toggleUpChecked]);
+  });
 
   // TODO-Doma
   // Replace `getKeyParentMap` with `getParentMap`
@@ -340,7 +344,7 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
       return node[childrenKey];
     });
   }, [childrenKey, data, valueKey]);
-  var handleSelect = (0, _react.useCallback)(function (node, event) {
+  var handleSelect = (0, _utils.useEventCallback)(function (node, event) {
     var currentNode = node.refKey ? flattenNodes[node.refKey] : null;
     if (!node || !currentNode) {
       return;
@@ -363,18 +367,18 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     onSelectItem === null || onSelectItem === void 0 ? void 0 : onSelectItem(node, (0, _treeUtils.getPathTowardsItem)(node, function (item) {
       return itemParentMap.get(item[valueKey]);
     }));
-  }, [flattenNodes, toggleChecked, isControlled, valueKey, onChange, onSelect, onSelectItem, unSerializeList, cascade, uncheckableItemValues, setValue, itemParentMap]);
-  var handleOpen = (0, _react.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 = (0, _utils.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 = (0, _react.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 = (0, _utils.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);
@@ -383,9 +387,9 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     /**
      * 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 = (0, _react.useCallback)(function (node) {
+    (_target$current = target.current) === null || _target$current === void 0 ? void 0 : _target$current.focus();
+  });
+  var handleExpand = (0, _utils.useEventCallback)(function (node) {
     var nextExpandItemValues = (0, _treeUtils.toggleExpand)({
       node: node,
       isExpand: !node.expand,
@@ -400,16 +404,8 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     if ((0, _isFunction2.default)(getChildren) && !node.expand && Array.isArray(node[childrenKey]) && node[childrenKey].length === 0) {
       loadChildren(node, getChildren);
     }
-  }, [childrenKey, expandItemValues, getChildren, loadChildren, onExpand, setExpandItemValues, valueKey]);
-  (0, _Picker.usePublicMethods)(ref, {
-    rootRef: inline ? treeViewRef : undefined,
-    triggerRef: triggerRef,
-    overlayRef: overlayRef,
-    targetRef: targetRef,
-    listRef: listRef,
-    inline: inline
   });
-  var handleClean = (0, _react.useCallback)(function (event) {
+  var handleClean = (0, _utils.useEventCallback)(function (event) {
     var target = event.target;
     // exclude searchBar
     if (target.matches('div[role="searchbox"] > input') || disabled || !cleanable) {
@@ -428,8 +424,8 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
       });
     }
     onChange === null || onChange === void 0 ? void 0 : onChange([], event);
-  }, [cascade, cleanable, disabled, flattenNodes, onChange, setValue, unSerializeList, uncheckableItemValues, isControlled]);
-  var handleFocusItem = (0, _react.useCallback)(function (key) {
+  });
+  var handleFocusItem = (0, _utils.useEventCallback)(function (key) {
     var focusableItems = (0, _treeUtils.getFocusableItems)(filteredData, {
       disabledItemValues: disabledItemValues,
       valueKey: valueKey,
@@ -454,8 +450,8 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     if (key === _utils.KEY_VALUES.UP) {
       (0, _treeUtils.focusPreviousItem)(focusProps);
     }
-  }, [searchKeywordState, checkTreePrefix, expandItemValues, filteredData, focusItemValue, treeNodesRefs, childrenKey, valueKey, disabledItemValues]);
-  var handleLeftArrow = (0, _react.useCallback)(function () {
+  });
+  var handleLeftArrow = (0, _utils.useEventCallback)(function () {
     if ((0, _isNil2.default)(focusItemValue)) return;
     var focusItem = (0, _treeUtils.getActiveItem)(focusItemValue, flattenNodes, valueKey);
     (0, _treeUtils.leftArrowHandler)({
@@ -469,8 +465,8 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
         (0, _treeUtils.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 = (0, _react.useCallback)(function () {
+  });
+  var handleRightArrow = (0, _utils.useEventCallback)(function () {
     if ((0, _isNil2.default)(focusItemValue)) return;
     var focusItem = (0, _treeUtils.getActiveItem)(focusItemValue, flattenNodes, valueKey);
     (0, _treeUtils.rightArrowHandler)({
@@ -482,8 +478,8 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
         handleFocusItem(_utils.KEY_VALUES.DOWN);
       }
     });
-  }, [focusItemValue, flattenNodes, valueKey, expandItemValues, childrenKey, handleExpand, handleFocusItem]);
-  var selectActiveItem = (0, _react.useCallback)(function (event) {
+  });
+  var selectActiveItem = function selectActiveItem(event) {
     if ((0, _isNil2.default)(focusItemValue)) return;
     var activeItem = (0, _treeUtils.getActiveItem)(focusItemValue, flattenNodes, valueKey);
     if (!(0, _utils2.isNodeUncheckable)(activeItem, {
@@ -492,13 +488,13 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     }) && activeItem !== null) {
       handleSelect(activeItem, event);
     }
-  }, [flattenNodes, focusItemValue, handleSelect, uncheckableItemValues, valueKey]);
+  };
   var onPickerKeydown = (0, _Picker.useToggleKeyDownEvent)((0, _extends2.default)({
     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,
@@ -517,8 +513,8 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
       });
     }
   }, rest));
-  var handleTreeKeydown = (0, _react.useCallback)(function (event) {
-    if (!treeViewRef.current) {
+  var handleTreeKeydown = (0, _utils.useEventCallback)(function (event) {
+    if (!treeView.current) {
       return;
     }
     (0, _Picker.onMenuKeyDown)(event, {
@@ -532,7 +528,7 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
       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
@@ -624,7 +620,7 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     }, style) : {};
     return /*#__PURE__*/_react.default.createElement("div", {
       id: id ? id + "-listbox" : undefined,
-      ref: treeViewRef,
+      ref: inline ? root : treeView,
       role: "tree",
       "aria-multiselectable": true,
       className: classes,
@@ -642,7 +638,7 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     }, function (_ref5) {
       var height = _ref5.height;
       return /*#__PURE__*/_react.default.createElement(_Windowing.List, (0, _extends2.default)({
-        ref: listRef,
+        ref: list,
         height: height,
         itemSize: itemSize,
         itemCount: formattedNodes.length,
@@ -663,14 +659,14 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
       autoWidth: menuAutoWidth,
       className: classes,
       style: mergedMenuStyle,
-      ref: (0, _utils.mergeRefs)(overlayRef, speakerRef),
+      ref: (0, _utils.mergeRefs)(overlay, speakerRef),
       onKeyDown: onPickerKeydown,
-      target: triggerRef
+      target: trigger
     }, searchable ? /*#__PURE__*/_react.default.createElement(_Picker.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 = (0, _react.useMemo)(function () {
@@ -716,7 +712,7 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
   }
   return /*#__PURE__*/_react.default.createElement(_Picker.PickerToggleTrigger, {
     pickerProps: (0, _pick2.default)(props, _Picker.pickTriggerPropKeys),
-    ref: triggerRef,
+    ref: trigger,
     placement: placement,
     onEnter: handleOpen,
     onEntered: onEntered,
@@ -724,10 +720,11 @@ var CheckTreePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
     speaker: renderDropdownMenu
   }, /*#__PURE__*/_react.default.createElement(Component, {
     className: classes,
-    style: style
+    style: style,
+    ref: root
   }, /*#__PURE__*/_react.default.createElement(_Picker.PickerToggle, (0, _extends2.default)({}, (0, _omit2.default)(rest, [].concat(_Picker.omitTriggerPropKeys, usedClassNamePropKeys)), {
     id: id,
-    ref: targetRef,
+    ref: target,
     appearance: appearance,
     onKeyDown: onPickerKeydown,
     onClean: (0, _utils.createChainedFunction)(handleClean, onClean),

package/cjs/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/cjs/DatePicker/DatePicker.js

@@ -28,8 +28,6 @@ var _Picker = require("../Picker");
 var _usePickerRef2 = _interopRequireDefault(require("../Picker/usePickerRef"));
 var _DateInput = _interopRequireDefault(require("../DateInput"));
 var _InputGroup = _interopRequireDefault(require("../InputGroup"));
-var _PickerLabel = _interopRequireDefault(require("./PickerLabel"));
-var _PickerIndicator = _interopRequireDefault(require("./PickerIndicator"));
 var _OverlayTrigger = require("../Overlay/OverlayTrigger");
 var _deprecatePropType = require("../utils/deprecatePropType");
 var _utils2 = require("../Calendar/utils");
@@ -532,7 +530,7 @@ var DatePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     inside: true,
     size: size,
     onClick: handleClick
-  }), /*#__PURE__*/_react.default.createElement(_PickerLabel.default, {
+  }), /*#__PURE__*/_react.default.createElement(_Picker.PickerLabel, {
     className: prefix(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["label"]))),
     id: id + "-label"
   }, label), /*#__PURE__*/_react.default.createElement(_DateInput.default, (0, _extends2.default)({
@@ -550,7 +548,7 @@ var DatePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     readOnly: readOnly || !editable || loading,
     plaintext: plaintext,
     onKeyDown: handleInputKeyDown
-  })), /*#__PURE__*/_react.default.createElement(_PickerIndicator.default, {
+  })), /*#__PURE__*/_react.default.createElement(_Picker.PickerIndicator, {
     loading: loading,
     caretAs: caretAs,
     onClose: handleClean,

package/cjs/DatePicker/Toolbar.js

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

package/cjs/DateRangeInput/DateRangeInput.js

@@ -64,10 +64,10 @@ var DateRangeInput = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     isControlledDate: isControlled
   };
   var startDateState = (0, _DateInput.useDateInputState)((0, _extends2.default)({}, dateInputOptions, {
-    date: value === null || value === void 0 ? void 0 : value[0]
+    date: (value === null || value === void 0 ? void 0 : value[0]) || null
   }));
   var endDateState = (0, _DateInput.useDateInputState)((0, _extends2.default)({}, 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/cjs/DateRangePicker/Calendar.js

@@ -1,14 +1,13 @@
 'use client';
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _react = _interopRequireWildcard(require("react"));
 var _dateUtils = require("../utils/dateUtils");
 var _CalendarContainer = _interopRequireDefault(require("../Calendar/CalendarContainer"));
 var _utils = require("../utils");
@@ -31,37 +30,39 @@ var Calendar = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "calendarDate", "format", "disabledDate", "index", "limitEndYear", "limitStartYear", "onChangeCalendarMonth", "onChangeCalendarTime", "onToggleMeridian", "onSelect", "value"]);
-  var onMoveForward = (0, _react.useCallback)(function (nextPageDate) {
+  var onMoveForward = (0, _utils.useEventCallback)(function (nextPageDate) {
     onChangeCalendarMonth === null || onChangeCalendarMonth === void 0 ? void 0 : onChangeCalendarMonth(index, nextPageDate);
-  }, [index, onChangeCalendarMonth]);
-  var onMoveBackward = (0, _react.useCallback)(function (nextPageDate) {
+  });
+  var onMoveBackward = (0, _utils.useEventCallback)(function (nextPageDate) {
     onChangeCalendarMonth === null || onChangeCalendarMonth === void 0 ? void 0 : onChangeCalendarMonth(index, nextPageDate);
-  }, [index, onChangeCalendarMonth]);
-  var handleSelect = (0, _react.useCallback)(function (date, event) {
+  });
+  var handleSelect = (0, _utils.useEventCallback)(function (date, event) {
     onSelect === null || onSelect === void 0 ? void 0 : onSelect(index, date, event);
-  }, [index, onSelect]);
-  var handleChangeMonth = (0, _react.useCallback)(function (nextPageDate) {
+  });
+  var handleChangeMonth = (0, _utils.useEventCallback)(function (nextPageDate) {
     onChangeCalendarMonth === null || onChangeCalendarMonth === void 0 ? void 0 : onChangeCalendarMonth(index, nextPageDate);
-  }, [index, onChangeCalendarMonth]);
-  var handleChangeTime = (0, _react.useCallback)(function (nextPageDate) {
+  });
+  var handleChangeTime = (0, _utils.useEventCallback)(function (nextPageDate) {
     onChangeCalendarTime === null || onChangeCalendarTime === void 0 ? void 0 : onChangeCalendarTime(index, nextPageDate);
-  }, [index, onChangeCalendarTime]);
-  var handleToggleMeridian = (0, _react.useCallback)(function (event) {
+  });
+  var handleToggleMeridian = (0, _utils.useEventCallback)(function (event) {
     onToggleMeridian(index, event);
-  }, [index, onToggleMeridian]);
-  var getCalendarDate = (0, _react.useCallback)(function () {
+  });
+  var getCalendarDate = function getCalendarDate() {
     return calendarDate[index];
-  }, [calendarDate, index]);
-  var handleMoveForward = (0, _react.useCallback)(function () {
+  };
+  var handleMoveForward = (0, _utils.useEventCallback)(function () {
     onMoveForward === null || onMoveForward === void 0 ? void 0 : onMoveForward((0, _dateUtils.addMonths)(getCalendarDate(), 1));
-  }, [getCalendarDate, onMoveForward]);
-  var handleMoveBackward = (0, _react.useCallback)(function () {
+  });
+  var handleMoveBackward = (0, _utils.useEventCallback)(function () {
     onMoveBackward === null || onMoveBackward === void 0 ? void 0 : onMoveBackward((0, _dateUtils.addMonths)(getCalendarDate(), -1));
-  }, [getCalendarDate, onMoveBackward]);
-  var disabledMonth = (0, _react.useCallback)(function (date) {
+  });
+  var disabledMonth = function disabledMonth(date) {
     return disabledDate === null || disabledDate === void 0 ? void 0 : disabledDate(date, value, _utils.DATERANGE_DISABLED_TARGET.CALENDAR);
-  }, [disabledDate, value]);
-  return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, rest, {
+  };
+  return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
+    "data-testid": "calendar-" + (index === 0 ? 'start' : 'end')
+  }, rest, {
     format: format,
     dateRange: value,
     disabledDate: disabledMonth,