rsuite 5.49.0 → 5.51.0

package/esm/TreePicker/TreePicker.js

@@ -6,14 +6,14 @@ import _isNil from "lodash/isNil";
 import _isUndefined from "lodash/isUndefined";
 import _omit from "lodash/omit";
 import _pick from "lodash/pick";
-import React, { useState, useRef, useEffect, useCallback, useContext, useMemo } from 'react';
+import React, { useState, useEffect, useContext, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { List, AutoSizer } from '../Windowing';
 import TreeNode from './TreeNode';
 import { createDragPreview, getKeyParentMap, getPathTowardsItem, getTreeNodeIndent, removeDragPreview, stringifyTreeNodeLabel } from '../utils/treeUtils';
-import { createChainedFunction, useClassNames, useCustom, useControlled, TREE_NODE_DROP_POSITION, KEY_VALUES, mergeRefs, shallowEqual } from '../utils';
+import { createChainedFunction, useClassNames, useCustom, useControlled, useEventCallback, TREE_NODE_DROP_POSITION, KEY_VALUES, mergeRefs, shallowEqual } from '../utils';
 import { getExpandWhenSearching, hasVisibleChildren, getDragNodeKeys, calDropNodePosition, createUpdateTreeDataFunction, useTreeDrag, useFlattenTreeData, getTreeActiveNode, getDefaultExpandItemValues, useTreeNodeRefs, useTreeSearch, focusPreviousItem, getFocusableItems, focusNextItem, getActiveItem, toggleExpand, useGetTreeNodeChildren, focusToActiveTreeNode, leftArrowHandler, focusTreeNode, rightArrowHandler, isSearching } from '../utils/treeUtils';
-import { PickerToggle, PickerOverlay, SearchBar, PickerToggleTrigger, createConcatChildrenFunction, usePickerClassName, onMenuKeyDown as _onMenuKeyDown, usePublicMethods, listPickerPropTypes, pickTriggerPropKeys, omitTriggerPropKeys, useToggleKeyDownEvent } from '../Picker';
+import { PickerToggle, PickerPopup, TreeView, SearchBar, PickerToggleTrigger, createConcatChildrenFunction, usePickerClassName, usePickerRef, onMenuKeyDown as _onMenuKeyDown, listPickerPropTypes, pickTriggerPropKeys, omitTriggerPropKeys, useToggleKeyDownEvent } from '../Picker';
 import TreeContext from '../Tree/TreeContext';
 var emptyArray = [];
 var itemSize = function itemSize() {
@@ -101,17 +101,21 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     renderMenu = props.renderMenu,
     renderValue = props.renderValue,
     rest = _objectWithoutPropertiesLoose(props, ["as", "data", "appearance", "style", "showIndentLine", "value", "locale", "height", "menuMaxHeight", "menuStyle", "className", "disabled", "placement", "cleanable", "searchable", "virtualized", "classPrefix", "defaultValue", "placeholder", "searchKeyword", "menuClassName", "menuAutoWidth", "searchBy", "toggleAs", "labelKey", "valueKey", "childrenKey", "draggable", "defaultExpandAll", "disabledItemValues", "expandItemValues", "defaultExpandItemValues", "id", "listProps", "getChildren", "renderTreeIcon", "renderTreeNode", "onExit", "onExited", "onClean", "onOpen", "onSearch", "onSelect", "onSelectItem", "onChange", "onEntered", "onClose", "onDragEnd", "onDragStart", "onDragEnter", "onDragLeave", "onDragOver", "onDrop", "onExpand", "renderExtraFooter", "renderMenu", "renderValue"]);
-  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,
     locale = _useCustom.locale;
   var _useContext = useContext(TreeContext),
     inline = _useContext.inline;
+  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 _useControlled = useControlled(controlledValue, defaultValue),
     value = _useControlled[0],
     setValue = _useControlled[1],
@@ -182,7 +186,7 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     treeNodesRefs = _useTreeNodeRefs.treeNodesRefs,
     saveTreeNodeRef = _useTreeNodeRefs.saveTreeNodeRef;
   var activeNode = getTreeActiveNode(flattenNodes, value, valueKey);
-  var getFormattedNodes = useCallback(function (render) {
+  var getFormattedNodes = function getFormattedNodes(render) {
     if (virtualized) {
       return formatVirtualizedTreeData(flattenNodes, filteredData, expandItemValues, {
         searchKeyword: searchKeywordState
@@ -193,20 +197,20 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     return filteredData.map(function (dataItem, index) {
       return render === null || render === void 0 ? void 0 : render(dataItem, index, 1);
     });
-  }, [searchKeywordState, expandItemValues, filteredData, flattenNodes, formatVirtualizedTreeData, virtualized]);
-  var focusActiveNode = useCallback(function () {
-    if (listRef.current) {
+  };
+  var focusActiveNode = function focusActiveNode() {
+    if (list.current) {
       focusToActiveTreeNode({
-        list: listRef.current,
+        list: list.current,
         valueKey: valueKey,
         selector: "." + treePrefix('node-active'),
         activeNode: activeNode,
         virtualized: virtualized,
-        container: treeViewRef.current,
+        container: treeView.current,
         formattedNodes: getFormattedNodes()
       });
     }
-  }, [treePrefix, activeNode, getFormattedNodes, valueKey, virtualized]);
+  };
   useEffect(function () {
     setFilteredData(data, searchKeywordState);
     setTreeData(data);
@@ -222,7 +226,7 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
   useEffect(function () {
     setSearchKeyword(searchKeyword !== null && searchKeyword !== void 0 ? searchKeyword : '');
   }, [searchKeyword, setSearchKeyword]);
-  var getDropData = useCallback(function (nodeData) {
+  var getDropData = function getDropData(nodeData) {
     var options = {
       valueKey: valueKey,
       childrenKey: childrenKey
@@ -240,7 +244,7 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
         dropNodePosition: dropNodePosition
       }, options)
     };
-  }, [dragNode, valueKey, childrenKey, dropNodePosition]);
+  };
   var getTreeNodeProps = function getTreeNodeProps(node, layer, index) {
     var draggingNode = dragNode !== null && dragNode !== void 0 ? dragNode : {};
     return {
@@ -275,8 +279,8 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       onDragEnd: handleDragEnd,
       onDrop: handleDrop,
       onExpand: handleExpand,
-      onRenderTreeNode: renderTreeNode,
-      onRenderTreeIcon: renderTreeIcon
+      renderTreeNode: renderTreeNode,
+      renderTreeIcon: renderTreeIcon
     };
   };
 
@@ -289,8 +293,8 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       return node[childrenKey];
     });
   }, [childrenKey, data, valueKey]);
-  var handleSelect = useCallback(function (nodeData, event) {
-    var _targetRef$current, _triggerRef$current, _triggerRef$current$c;
+  var handleSelect = useEventCallback(function (nodeData, event) {
+    var _target$current, _trigger$current, _trigger$current$clos;
     if (!nodeData) {
       return;
     }
@@ -304,10 +308,10 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onSelectItem === null || onSelectItem === void 0 ? void 0 : onSelectItem(nodeData, getPathTowardsItem(nodeData, function (item) {
       return itemParentMap.get(item[valueKey]);
     }));
-    (_targetRef$current = targetRef.current) === null || _targetRef$current === void 0 ? void 0 : _targetRef$current.focus();
-    (_triggerRef$current = triggerRef.current) === null || _triggerRef$current === void 0 ? void 0 : (_triggerRef$current$c = _triggerRef$current.close) === null || _triggerRef$current$c === void 0 ? void 0 : _triggerRef$current$c.call(_triggerRef$current);
-  }, [valueKey, isControlled, onChange, onSelect, onSelectItem, setValue, itemParentMap]);
-  var handleExpand = useCallback(function (node) {
+    (_target$current = target.current) === null || _target$current === void 0 ? void 0 : _target$current.focus();
+    (_trigger$current = trigger.current) === null || _trigger$current === void 0 ? void 0 : (_trigger$current$clos = _trigger$current.close) === null || _trigger$current$clos === void 0 ? void 0 : _trigger$current$clos.call(_trigger$current);
+  });
+  var handleExpand = useEventCallback(function (node) {
     var nextExpandItemValues = toggleExpand({
       node: node,
       isExpand: !node.expand,
@@ -322,8 +326,8 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (_isFunction(getChildren) && !node.expand && Array.isArray(node[childrenKey]) && node[childrenKey].length === 0) {
       loadChildren(node, getChildren);
     }
-  }, [valueKey, childrenKey, expandItemValues, getChildren, onExpand, setExpandItemValues, loadChildren]);
-  var handleDragStart = useCallback(function (nodeData, event) {
+  });
+  var handleDragStart = useEventCallback(function (nodeData, event) {
     if (draggable) {
       var _event$dataTransfer;
       var dragMoverNode = createDragPreview(stringifyTreeNodeLabel(nodeData[labelKey]), treePrefix('drag-preview'));
@@ -332,8 +336,8 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       setDragNode(flattenNodes[nodeData.refKey]);
       onDragStart === null || onDragStart === void 0 ? void 0 : onDragStart(nodeData, event);
     }
-  }, [draggable, labelKey, treePrefix, setDragNodeKeys, childrenKey, valueKey, setDragNode, flattenNodes, onDragStart]);
-  var handleDragEnter = useCallback(function (nodeData, event) {
+  });
+  var handleDragEnter = useEventCallback(function (nodeData, event) {
     if (dragNodeKeys.some(function (d) {
       return shallowEqual(d, nodeData[valueKey]);
     })) {
@@ -344,8 +348,8 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       setDropNodePosition(calDropNodePosition(event, treeNodesRefs[nodeData.refKey]));
     }
     onDragEnter === null || onDragEnter === void 0 ? void 0 : onDragEnter(nodeData, event);
-  }, [dragNode, treeNodesRefs, dragNodeKeys, onDragEnter, setDragOverNodeKey, setDropNodePosition, valueKey]);
-  var handleDragOver = useCallback(function (nodeData, event) {
+  });
+  var handleDragOver = useEventCallback(function (nodeData, event) {
     if (dragNodeKeys.some(function (d) {
       return shallowEqual(d, nodeData[valueKey]);
     })) {
@@ -358,18 +362,18 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       setDropNodePosition(lastDropNodePosition);
     }
     onDragOver === null || onDragOver === void 0 ? void 0 : onDragOver(nodeData, event);
-  }, [dragNode, dragNodeKeys, dragOverNodeKey, dropNodePosition, onDragOver, setDropNodePosition, treeNodesRefs, valueKey]);
-  var handleDragLeave = useCallback(function (nodeData, event) {
+  });
+  var handleDragLeave = useEventCallback(function (nodeData, event) {
     onDragLeave === null || onDragLeave === void 0 ? void 0 : onDragLeave(nodeData, event);
-  }, [onDragLeave]);
-  var handleDragEnd = useCallback(function (nodeData, event) {
+  });
+  var handleDragEnd = useEventCallback(function (nodeData, event) {
     removeDragPreview();
     setDragNode(null);
     setDragNodeKeys([]);
     setDragOverNodeKey(null);
     onDragEnd === null || onDragEnd === void 0 ? void 0 : onDragEnd(nodeData, event);
-  }, [setDragNode, setDragNodeKeys, setDragOverNodeKey, onDragEnd]);
-  var handleDrop = useCallback(function (nodeData, event) {
+  });
+  var handleDrop = useEventCallback(function (nodeData, event) {
     if (dragNodeKeys.some(function (d) {
       return shallowEqual(d, nodeData[valueKey]);
     })) {
@@ -382,34 +386,26 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     setDragNode(null);
     setDragNodeKeys([]);
     setDragOverNodeKey(null);
-  }, [dragNodeKeys, setDragNode, setDragOverNodeKey, setDragNodeKeys, onDrop, getDropData, valueKey]);
-  var handleOpen = useCallback(function () {
-    var _triggerRef$current2, _triggerRef$current2$;
-    (_triggerRef$current2 = triggerRef.current) === null || _triggerRef$current2 === void 0 ? void 0 : (_triggerRef$current2$ = _triggerRef$current2.open) === null || _triggerRef$current2$ === void 0 ? void 0 : _triggerRef$current2$.call(_triggerRef$current2);
+  });
+  var handleOpen = useEventCallback(function () {
+    var _trigger$current2, _trigger$current2$ope;
+    (_trigger$current2 = trigger.current) === null || _trigger$current2 === void 0 ? void 0 : (_trigger$current2$ope = _trigger$current2.open) === null || _trigger$current2$ope === void 0 ? void 0 : _trigger$current2$ope.call(_trigger$current2);
     focusActiveNode();
     onOpen === null || onOpen === void 0 ? void 0 : onOpen();
     setActive(true);
-  }, [focusActiveNode, onOpen]);
-  var handleClose = useCallback(function () {
-    var _triggerRef$current3, _triggerRef$current3$, _targetRef$current2;
-    (_triggerRef$current3 = triggerRef.current) === null || _triggerRef$current3 === void 0 ? void 0 : (_triggerRef$current3$ = _triggerRef$current3.close) === null || _triggerRef$current3$ === void 0 ? void 0 : _triggerRef$current3$.call(_triggerRef$current3);
+  });
+  var handleClose = useEventCallback(function () {
+    var _trigger$current3, _trigger$current3$clo, _target$current2;
+    (_trigger$current3 = trigger.current) === null || _trigger$current3 === void 0 ? void 0 : (_trigger$current3$clo = _trigger$current3.close) === null || _trigger$current3$clo === void 0 ? void 0 : _trigger$current3$clo.call(_trigger$current3);
     setSearchKeyword('');
     setActive(false);
     setFocusItemValue(activeNode === null || activeNode === void 0 ? void 0 : activeNode[valueKey]);
     /**
      * when using keyboard toggle picker, should refocus on PickerToggle Component after close picker menu
      */
-    (_targetRef$current2 = targetRef.current) === null || _targetRef$current2 === void 0 ? void 0 : _targetRef$current2.focus();
-  }, [activeNode, setSearchKeyword, valueKey]);
-  usePublicMethods(ref, {
-    rootRef: inline ? treeViewRef : undefined,
-    triggerRef: triggerRef,
-    overlayRef: overlayRef,
-    targetRef: targetRef,
-    listRef: listRef,
-    inline: inline
+    (_target$current2 = target.current) === null || _target$current2 === void 0 ? void 0 : _target$current2.focus();
   });
-  var handleFocusItem = useCallback(function (key) {
+  var handleFocusItem = useEventCallback(function (key) {
     var focusableItems = getFocusableItems(filteredData, {
       disabledItemValues: disabledItemValues,
       valueKey: valueKey,
@@ -434,8 +430,8 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (key === KEY_VALUES.UP) {
       focusPreviousItem(focusProps);
     }
-  }, [searchKeywordState, expandItemValues, filteredData, focusItemValue, treeNodesRefs, treePrefix, valueKey, childrenKey, disabledItemValues]);
-  var handleLeftArrow = useCallback(function () {
+  });
+  var handleLeftArrow = useEventCallback(function () {
     if (_isNil(focusItemValue)) return;
     var focusItem = getActiveItem(focusItemValue, flattenNodes, valueKey);
     leftArrowHandler({
@@ -449,8 +445,8 @@ var TreePicker = /*#__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, "." + treePrefix('node-label'));
       }
     });
-  }, [expandItemValues, flattenNodes, focusItemValue, handleExpand, treeNodesRefs, treePrefix, valueKey, childrenKey]);
-  var handleRightArrow = useCallback(function () {
+  });
+  var handleRightArrow = useEventCallback(function () {
     if (_isNil(focusItemValue)) return;
     var focusItem = getActiveItem(focusItemValue, flattenNodes, valueKey);
     rightArrowHandler({
@@ -462,30 +458,30 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
         handleFocusItem(KEY_VALUES.DOWN);
       }
     });
-  }, [focusItemValue, flattenNodes, valueKey, expandItemValues, childrenKey, handleExpand, handleFocusItem]);
-  var selectActiveItem = useCallback(function (event) {
+  });
+  var selectActiveItem = useEventCallback(function (event) {
     if (_isNil(focusItemValue)) return;
     var activeItem = getActiveItem(focusItemValue, flattenNodes, valueKey);
     handleSelect(activeItem, event);
-  }, [flattenNodes, valueKey, focusItemValue, handleSelect]);
-  var handleClean = useCallback(function (event) {
+  });
+  var handleClean = useEventCallback(function (event) {
     var nullValue = null;
     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;
     }
     if (!isControlled) {
       setValue(null);
     }
     onChange === null || onChange === void 0 ? void 0 : onChange(nullValue, event);
-  }, [cleanable, disabled, onChange, setValue, isControlled]);
+  });
   var onPickerKeydown = useToggleKeyDownEvent(_extends({
     toggle: !activeNode || !active,
-    triggerRef: triggerRef,
-    targetRef: targetRef,
-    overlayRef: overlayRef,
-    searchInputRef: searchInputRef,
+    trigger: trigger,
+    target: target,
+    overlay: overlay,
+    searchInput: searchInput,
     active: active,
     onExit: handleClean,
     onClose: handleClose,
@@ -504,8 +500,8 @@ var TreePicker = /*#__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, {
@@ -519,7 +515,7 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       right: rtl ? handleLeftArrow : handleRightArrow,
       enter: selectActiveItem
     });
-  }, [handleFocusItem, handleLeftArrow, handleRightArrow, rtl, selectActiveItem]);
+  });
   var renderNode = function renderNode(node, index, layer) {
     if (!node.visible) {
       return null;
@@ -546,7 +542,8 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
           return saveTreeNodeRef(_ref, node.refKey);
         }
       })), /*#__PURE__*/React.createElement("div", {
-        className: treePrefix('children')
+        className: treePrefix('group'),
+        role: "group"
       }, nodes.map(function (child, i) {
         return renderNode(child, i, layer);
       }), showIndentLine && /*#__PURE__*/React.createElement("span", {
@@ -588,18 +585,14 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var _withTreeClassPrefix;
     var classes = withTreeClassPrefix((_withTreeClassPrefix = {}, _withTreeClassPrefix[className !== null && className !== void 0 ? className : ''] = inline, _withTreeClassPrefix.virtualized = virtualized, _withTreeClassPrefix));
     var formattedNodes = getFormattedNodes(renderNode);
-    var styles = inline ? _extends({
-      height: height
-    }, style) : {};
-    return /*#__PURE__*/React.createElement("div", {
-      role: "tree",
-      id: id ? id + "-listbox" : undefined,
-      ref: treeViewRef,
+    return /*#__PURE__*/React.createElement(TreeView, {
+      treeRootClassName: treePrefix('root'),
+      ref: inline ? root : treeView,
       className: classes,
-      style: styles,
+      style: inline ? _extends({
+        height: height
+      }, style) : {},
       onKeyDown: inline ? handleTreeKeyDown : undefined
-    }, /*#__PURE__*/React.createElement("div", {
-      className: treePrefix('nodes')
     }, virtualized ? /*#__PURE__*/React.createElement(AutoSizer, {
       defaultHeight: inline ? height : menuMaxHeight,
       style: {
@@ -609,15 +602,15 @@ var TreePicker = /*#__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 renderTreeView = function renderTreeView(positionProps, speakerRef) {
     var left = positionProps.left,
       top = positionProps.top,
       className = positionProps.className;
@@ -626,18 +619,18 @@ var TreePicker = /*#__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(renderTree()) : renderTree(), renderExtraFooter === null || renderExtraFooter === void 0 ? void 0 : renderExtraFooter());
   };
 
@@ -670,20 +663,22 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     return renderTree();
   }
   return /*#__PURE__*/React.createElement(PickerToggleTrigger, {
+    id: id,
+    popupType: "tree",
     pickerProps: _pick(props, pickTriggerPropKeys),
-    ref: triggerRef,
+    ref: trigger,
     placement: placement,
     onEnter: handleOpen,
     onEntered: onEntered,
     onExit: createChainedFunction(onClose, onExit),
     onExited: createChainedFunction(handleClose, onExited),
-    speaker: renderDropdownMenu
+    speaker: renderTreeView
   }, /*#__PURE__*/React.createElement(Component, {
     className: classes,
-    style: style
+    style: style,
+    ref: root
   }, /*#__PURE__*/React.createElement(PickerToggle, _extends({}, _omit(rest, [].concat(omitTriggerPropKeys, usedClassNamePropKeys, ['cascade'])), {
-    id: id,
-    ref: targetRef,
+    ref: target,
     appearance: appearance,
     onKeyDown: onPickerKeydown,
     onClean: createChainedFunction(handleClean, onClean),
@@ -693,7 +688,8 @@ var TreePicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
     hasValue: hasValidValue,
     active: active,
     placement: placement,
-    inputValue: value
+    inputValue: value,
+    focusItemValue: focusItemValue
   }), selectedElement || locale.placeholder)));
 });
 TreePicker.displayName = 'TreePicker';

package/esm/utils/constants.d.ts

@@ -49,5 +49,6 @@ export declare const KEY_VALUES: {
 export declare enum DATERANGE_DISABLED_TARGET {
     CALENDAR = "CALENDAR",
     TOOLBAR_BUTTON_OK = "TOOLBAR_BUTTON_OK",
-    TOOLBAR_SHORTCUT = "TOOLBAR_SHORTCUT"
+    TOOLBAR_SHORTCUT = "TOOLBAR_SHORTCUT",
+    INPUT = "INPUT"
 }

package/esm/utils/constants.js

@@ -60,4 +60,5 @@ export var DATERANGE_DISABLED_TARGET;
   DATERANGE_DISABLED_TARGET["CALENDAR"] = "CALENDAR";
   DATERANGE_DISABLED_TARGET["TOOLBAR_BUTTON_OK"] = "TOOLBAR_BUTTON_OK";
   DATERANGE_DISABLED_TARGET["TOOLBAR_SHORTCUT"] = "TOOLBAR_SHORTCUT";
+  DATERANGE_DISABLED_TARGET["INPUT"] = "INPUT";
 })(DATERANGE_DISABLED_TARGET || (DATERANGE_DISABLED_TARGET = {}));

package/esm/utils/dateUtils.d.ts

@@ -63,7 +63,6 @@ export declare const shouldOnlyRenderTime: (format: string) => boolean;
  * @return date[]
  */
 export declare function getMonthView(monthDate: Date, isoWeek: boolean): Date[];
-export declare function getDateMask(formatStr: string): (string | RegExp)[];
 /**
  * Copy the time of one date to another
  */

package/esm/utils/dateUtils.js

@@ -130,11 +130,6 @@ export function getMonthView(monthDate, isoWeek) {
   }
   return weeks;
 }
-export function getDateMask(formatStr) {
-  return Array.from(formatStr).map(function (i) {
-    return i.match(/[A-Za-z]/) ? /[\d|A-Za-z]/ : i;
-  });
-}
 
 /**
  * Copy the time of one date to another

package/esm/utils/getStringLength.d.ts

@@ -0,0 +1,2 @@
+declare function getStringLength(str: string): number;
+export default getStringLength;

package/esm/utils/getStringLength.js

@@ -0,0 +1,13 @@
+'use client';
+function getStringLength(str) {
+  var length = 0;
+  Array.from(str).forEach(function (char) {
+    if (char.charCodeAt(0) > 255) {
+      length += 2;
+    } else {
+      length++;
+    }
+  });
+  return length;
+}
+export default getStringLength;

package/esm/utils/index.d.ts

@@ -24,6 +24,7 @@ export { default as scrollTopAnimation } from './scrollTopAnimation';
 export { default as appendTooltip } from './appendTooltip';
 export { default as render } from './render';
 export { default as safeSetSelection } from './safeSetSelection';
+export { default as getStringLength } from './getStringLength';
 /** Hooks **/
 export { default as useClassNames } from './useClassNames';
 export { default as useEventListener } from './useEventListener';

package/esm/utils/index.js

@@ -27,6 +27,7 @@ export { default as scrollTopAnimation } from './scrollTopAnimation';
 export { default as appendTooltip } from './appendTooltip';
 export { default as render } from './render';
 export { default as safeSetSelection } from './safeSetSelection';
+export { default as getStringLength } from './getStringLength';
 
 /** Hooks **/
 export { default as useClassNames } from './useClassNames';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsuite",
-  "version": "5.49.0",
+  "version": "5.51.0",
   "description": "A suite of react components",
   "main": "cjs/index.js",
   "module": "esm/index.js",

package/styles/mixins/combobox.less

@@ -0,0 +1,10 @@
+.combobox-indicator-icon(@right:@padding-x) {
+  display: flex;
+  align-items: center;
+  margin-left: 2px;
+  position: absolute;
+  top: @padding-y;
+  right: @right;
+  height: @line-height-computed;
+  font-size: 12px;
+}

package/styles/variables.less

@@ -849,12 +849,10 @@
 @zindex-date-range-picker-calendar-dropdown:  1;
 @zindex-date-range-picker-table-cell-content: 1;
 @zindex-badge-content:                        1;
-@zindex-input:                                2;
-@zindex-input-group-icon:                     4;
 @zindex-dropdown:                             5;
 @zindex-picker-toggle:                        5; // The same with zindex-dropdown
 @zindex-picker-input:                         (@zindex-picker-toggle + 1); // Greater than picker toggle
-@zindex-picker-menu:                          (@zindex-picker-toggle + 2); // Greater than picker toggle and input
+@zindex-picker-popup:                          (@zindex-picker-toggle + 2); // Greater than picker toggle and input
 @zindex-dropdown-a:                           10;
 @zindex-list-helper:                          99;
 @zindex-navbar:                               1000;

package/cjs/Picker/DropdownMenu.d.ts

@@ -1,59 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { ListProps, ListHandle } from '../Windowing';
-import { StandardProps, ItemDataType } from '../@types/common';
-export interface DropdownMenuProps<Multiple = false> extends StandardProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'onSelect'> {
-    classPrefix: string;
-    data?: ItemDataType[];
-    group?: boolean;
-    groupBy?: string;
-    disabledItemValues?: any[];
-    activeItemValues?: any[];
-    focusItemValue?: any;
-    maxHeight?: number;
-    valueKey?: string;
-    labelKey?: string;
-    className?: string;
-    style?: React.CSSProperties;
-    dropdownMenuItemAs: React.ElementType | string;
-    dropdownMenuItemClassPrefix?: string;
-    dropdownMenuItemProps?: any;
-    rowHeight?: number;
-    rowGroupHeight?: number;
-    virtualized?: boolean;
-    listProps?: Partial<ListProps>;
-    listRef?: React.Ref<ListHandle>;
-    /** Custom selected option */
-    renderMenuItem?: (itemLabel: React.ReactNode, item: any) => React.ReactNode;
-    renderMenuGroup?: (title: React.ReactNode, item: any) => React.ReactNode;
-    onSelect?: Multiple extends true ? (value: any, item: any, event: React.MouseEvent, checked: boolean) => void : Multiple extends false ? (value: any, item: any, event: React.MouseEvent) => void : any;
-    onGroupTitleClick?: (event: React.MouseEvent) => void;
-}
-export declare type DropdownMenuComponent = React.ForwardRefExoticComponent<DropdownMenuProps> & {
-    <Multiple = false>(props: DropdownMenuProps<Multiple>): React.ReactElement | null;
-};
-declare const DropdownMenu: DropdownMenuComponent;
-export declare const dropdownMenuPropTypes: {
-    classPrefix: PropTypes.Validator<string>;
-    className: PropTypes.Requireable<string>;
-    dropdownMenuItemAs: PropTypes.Validator<PropTypes.ReactComponentLike>;
-    dropdownMenuItemClassPrefix: PropTypes.Requireable<string>;
-    data: PropTypes.Requireable<any[]>;
-    group: PropTypes.Requireable<boolean>;
-    disabledItemValues: PropTypes.Requireable<any[]>;
-    activeItemValues: PropTypes.Requireable<any[]>;
-    focusItemValue: PropTypes.Requireable<any>;
-    maxHeight: PropTypes.Requireable<number>;
-    valueKey: PropTypes.Requireable<string>;
-    labelKey: PropTypes.Requireable<string>;
-    style: PropTypes.Requireable<object>;
-    renderMenuItem: PropTypes.Requireable<(...args: any[]) => any>;
-    renderMenuGroup: PropTypes.Requireable<(...args: any[]) => any>;
-    onSelect: PropTypes.Requireable<(...args: any[]) => any>;
-    onGroupTitleClick: PropTypes.Requireable<(...args: any[]) => any>;
-    virtualized: PropTypes.Requireable<boolean>;
-    listProps: PropTypes.Requireable<any>;
-    rowHeight: PropTypes.Requireable<number>;
-    rowGroupHeight: PropTypes.Requireable<number>;
-};
-export default DropdownMenu;

package/cjs/Picker/DropdownMenuGroup.d.ts

@@ -1,6 +0,0 @@
-import React from 'react';
-import { WithAsProps } from '../@types/common';
-export interface DropdownMenuGroupProps extends WithAsProps, React.HTMLAttributes<HTMLDivElement> {
-}
-declare const DropdownMenuGroup: React.ForwardRefExoticComponent<DropdownMenuGroupProps & React.RefAttributes<HTMLDivElement>>;
-export default DropdownMenuGroup;