rsuite 5.60.2 → 5.61.0

package/Uploader/styles/index.css

@@ -51,7 +51,7 @@
   --rs-btn-default-active-bg: var(--rs-gray-300);
   --rs-btn-default-active-text: var(--rs-gray-900);
   --rs-btn-default-disabled-bg: var(--rs-gray-50);
-  --rs-btn-default-disabled-text: var(--rs-gray-400);
+  --rs-btn-default-disabled-text: var(--rs-gray-600);
   --rs-btn-primary-bg: var(--rs-primary-500);
   --rs-btn-primary-text: var(--rs-gray-0);
   --rs-btn-primary-hover-bg: var(--rs-primary-600);
@@ -236,7 +236,8 @@
   --rs-btn-default-active-bg: transparent;
   --rs-btn-default-active-text: var(--rs-primary-200);
   --rs-btn-default-disabled-bg: transparent;
-  --rs-btn-default-disabled-text: var(--rs-primary-500);
+  --rs-btn-default-disabled-text: var(--rs-primary-900);
+  --rs-btn-default-disabled-boreder-color: var(--rs-gray-100);
   --rs-btn-primary-bg: var(--rs-primary-500);
   --rs-btn-primary-text: var(--rs-gray-900);
   --rs-btn-primary-hover-bg: var(--rs-primary-400);
@@ -383,14 +384,14 @@
 .rs-btn:disabled,
 .rs-btn.rs-btn-disabled {
   cursor: not-allowed;
-  color: #c5c6c7;
+  color: #8e8e93;
   color: var(--rs-btn-default-disabled-text);
   background-color: #f7f7fa;
   background-color: var(--rs-btn-default-disabled-bg);
 }
 .rs-theme-high-contrast .rs-btn:disabled,
 .rs-theme-high-contrast .rs-btn.rs-btn-disabled {
-  opacity: 0.5;
+  border-color: var(--rs-btn-default-disabled-boreder-color);
 }
 @media not all and (min-resolution: 0.001dpcm) {
   .rs-btn {
@@ -438,7 +439,7 @@
 }
 .rs-theme-high-contrast .rs-btn-primary:disabled,
 .rs-theme-high-contrast .rs-btn-primary.rs-btn-disabled {
-  opacity: 0.5;
+  border-color: var(--rs-btn-default-disabled-boreder-color);
 }
 .rs-btn-subtle {
   color: #575757;
@@ -468,7 +469,7 @@
 }
 .rs-theme-high-contrast .rs-btn-subtle:disabled,
 .rs-theme-high-contrast .rs-btn-subtle.rs-btn-disabled {
-  opacity: 0.5;
+  border-color: var(--rs-btn-default-disabled-boreder-color);
 }
 .rs-btn-link {
   color: #1675e0;
@@ -499,7 +500,7 @@
 }
 .rs-theme-high-contrast .rs-btn-link:disabled,
 .rs-theme-high-contrast .rs-btn-link.rs-btn-disabled {
-  opacity: 0.5;
+  border-color: var(--rs-btn-default-disabled-boreder-color);
 }
 .rs-btn-ghost {
   color: #1675e0;
@@ -541,7 +542,7 @@
 }
 .rs-theme-high-contrast .rs-btn-ghost:disabled,
 .rs-theme-high-contrast .rs-btn-ghost.rs-btn-disabled {
-  opacity: 0.5;
+  border-color: var(--rs-btn-default-disabled-boreder-color);
 }
 .rs-btn-red {
   --rs-btn-primary-bg: var(--rs-red-500);
@@ -1439,14 +1440,14 @@
 .rs-uploader-picture .rs-uploader-trigger-btn:disabled,
 .rs-uploader-picture .rs-uploader-trigger-btn.rs-btn-disabled {
   cursor: not-allowed;
-  color: #c5c6c7;
+  color: #8e8e93;
   color: var(--rs-btn-default-disabled-text);
   background-color: #f7f7fa;
   background-color: var(--rs-btn-default-disabled-bg);
 }
 .rs-theme-high-contrast .rs-uploader-picture .rs-uploader-trigger-btn:disabled,
 .rs-theme-high-contrast .rs-uploader-picture .rs-uploader-trigger-btn.rs-btn-disabled {
-  opacity: 0.5;
+  border-color: var(--rs-btn-default-disabled-boreder-color);
 }
 @media not all and (min-resolution: 0.001dpcm) {
   .rs-uploader-picture .rs-uploader-trigger-btn {
@@ -1477,7 +1478,7 @@
 }
 .rs-theme-high-contrast .rs-uploader-picture .rs-uploader-trigger-btn:disabled,
 .rs-theme-high-contrast .rs-uploader-picture .rs-uploader-trigger-btn.rs-btn-disabled {
-  opacity: 0.5;
+  border-color: var(--rs-btn-default-disabled-boreder-color);
 }
 .rs-uploader-picture .rs-uploader-trigger.rs-uploader-trigger-disabled .rs-uploader-trigger-btn {
   color: #575757 !important;

package/cjs/@types/common.d.ts

@@ -88,6 +88,29 @@ export interface PickerBaseProps<L = any> extends WithAsProps, AnimationEventPro
     /** Custom render extra footer */
     renderExtraFooter?: () => React.ReactNode;
 }
+export interface DeprecatedPickerProps {
+    /**
+     * Custom menu class name
+     * @deprecated Use `popupClassName` instead
+     */
+    menuClassName?: string;
+    /**
+     * Custom menu style
+     * @deprecated Use `popupStyle` instead
+     */
+    menuStyle?: React.CSSProperties;
+    /**
+     * Picker menu auto width
+     *
+     * @deprecated Use `popupAutoWidth` instead
+     */
+    menuAutoWidth?: boolean;
+    /**
+     * Custom render tree
+     * @deprecated Use `renderTree` instead
+     */
+    renderMenu?: (menu: React.ReactNode) => React.ReactNode;
+}
 export interface FormControlBaseProps<ValueType = React.InputHTMLAttributes<HTMLInputElement>['value']> {
     /** Name of the form field */
     name?: string;
@@ -109,14 +132,28 @@ export interface FormControlBaseProps<ValueType = React.InputHTMLAttributes<HTML
     readOnly?: boolean;
 }
 export declare type ToArray<V> = V extends any[] ? V : V[];
+/**
+ * Represents the data properties for a component.
+ */
 export interface DataProps<TData> {
-    /** The data of component */
+    /**
+     * The data of the component.
+     */
     data: TData[];
-    /** Set option value 'key' in 'data' */
+    /**
+     * The key to use for setting the option value in the data.
+     * @default value
+     */
     valueKey?: string;
-    /** Set options to display the 'key' in 'data' */
+    /**
+     * The key to use for displaying the options in the data.
+     * @default label
+     */
     labelKey?: string;
-    /** Set children key in data */
+    /**
+     * The key to use for setting the children in the data.
+     * @default children
+     */
     childrenKey?: string;
 }
 export interface FormControlPickerProps<T = any, L = any, D = Record<string, any>, I = T> extends PickerBaseProps<L>, FormControlBaseProps<T>, DataProps<D> {

package/cjs/AutoComplete/AutoComplete.js

@@ -178,7 +178,8 @@ var AutoComplete = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       onSelect: handleItemSelect,
       renderMenuItem: renderMenuItem,
       data: items,
-      className: menuClassName
+      className: menuClassName,
+      query: value
     });
     return /*#__PURE__*/_react.default.createElement(_Picker.PickerPopup, {
       ref: (0, _utils.mergeRefs)(overlay, speakerRef),

package/cjs/CascadeTree/CascadeTree.js

@@ -8,8 +8,9 @@ exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _react = _interopRequireWildcard(require("react"));
-var _treeUtils = require("../utils/treeUtils");
-var _utils = require("../utils");
+var _utils = require("../internals/Tree/utils");
+var _utils2 = require("../Tree/utils");
+var _utils3 = require("../utils");
 var _useMap = require("../utils/useMap");
 var _TreeView = _interopRequireDefault(require("./TreeView"));
 var _SearchView = _interopRequireDefault(require("./SearchView"));
@@ -47,14 +48,14 @@ var CascadeTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     onChange = props.onChange,
     getChildren = props.getChildren,
     rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "data", "defaultValue", "className", "classPrefix", "childrenKey", "valueKey", "labelKey", "value", "disabledItemValues", "columnWidth", "columnHeight", "searchable", "renderTreeNode", "renderColumn", "onSelect", "onSearch", "onChange", "getChildren"]);
-  var _ref = (0, _utils.useControlled)(valueProp, defaultValue),
+  var _ref = (0, _utils3.useControlled)(valueProp, defaultValue),
     value = _ref[0],
     setValue = _ref[1]; // Store the children of each node
   var childrenMap = (0, _useMap.useMap)();
 
   // Store the parent of each node
   var parentMap = (0, _react.useMemo)(function () {
-    return (0, _treeUtils.getParentMap)(data, function (item) {
+    return (0, _utils.getParentMap)(data, function (item) {
       var _childrenMap$get;
       return (_childrenMap$get = childrenMap.get(item)) !== null && _childrenMap$get !== void 0 ? _childrenMap$get : item[childrenKey];
     });
@@ -62,7 +63,7 @@ var CascadeTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
 
   // Flatten the tree data
   var flattenedData = (0, _react.useMemo)(function () {
-    return (0, _treeUtils.flattenTree)(data, function (item) {
+    return (0, _utils2.flattenTree)(data, function (item) {
       var _childrenMap$get2;
       return (_childrenMap$get2 = childrenMap.get(item)) !== null && _childrenMap$get2 !== void 0 ? _childrenMap$get2 : item[childrenKey];
     });
@@ -111,7 +112,7 @@ var CascadeTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     }),
     columns = _usePaths.columns,
     pathTowardsActiveItem = _usePaths.pathTowardsActiveItem;
-  var _useClassNames = (0, _utils.useClassNames)(classPrefix),
+  var _useClassNames = (0, _utils3.useClassNames)(classPrefix),
     withClassPrefix = _useClassNames.withClassPrefix,
     merge = _useClassNames.merge;
   var classes = merge(className, withClassPrefix());
@@ -129,7 +130,7 @@ var CascadeTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     searchKeyword = _useSearch.searchKeyword,
     setSearchKeyword = _useSearch.setSearchKeyword,
     handleSearch = _useSearch.handleSearch;
-  var handleSearchRowSelect = (0, _utils.useEventCallback)(function (item, items, event) {
+  var handleSearchRowSelect = (0, _utils3.useEventCallback)(function (item, items, event) {
     var _item$childrenKey;
     var node = {
       itemData: item,

package/cjs/CascadeTree/SearchView.js

@@ -8,8 +8,8 @@ var _extends3 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _react = _interopRequireDefault(require("react"));
 var _utils = require("../utils");
-var _treeUtils = require("../utils/treeUtils");
-var _utils2 = require("./utils");
+var _utils2 = require("../internals/Tree/utils");
+var _Highlight = _interopRequireDefault(require("../Highlight"));
 var _SearchBox = _interopRequireDefault(require("../internals/SearchBox"));
 function SearchView(props) {
   var _props$as = props.as,
@@ -38,22 +38,15 @@ function SearchView(props) {
   var _useCustom = (0, _utils.useCustom)('Picker'),
     locale = _useCustom.locale;
   var renderSearchRow = function renderSearchRow(item, key) {
-    var items = (0, _treeUtils.getPathTowardsItem)(item, function (item) {
+    var items = (0, _utils2.getPathTowardsItem)(item, function (item) {
       return parentMap.get(item);
     });
     var formattedNodes = items.map(function (itemData) {
       var _extends2;
-      var label = (0, _utils2.highlightLabel)({
-        item: itemData,
-        labelKey: labelKey,
-        searchKeyword: searchKeyword,
-        render: function render(patch, index) {
-          return /*#__PURE__*/_react.default.createElement("span", {
-            key: index,
-            className: prefix('match')
-          }, patch);
-        }
-      });
+      var label = /*#__PURE__*/_react.default.createElement(_Highlight.default, {
+        as: "span",
+        query: searchKeyword
+      }, itemData[labelKey]);
       return (0, _extends3.default)({}, itemData, (_extends2 = {}, _extends2[labelKey] = label, _extends2));
     });
     var disabled = disabledItemValues.some(function (value) {

package/cjs/CascadeTree/hooks/usePaths.js

@@ -5,8 +5,8 @@ exports.__esModule = true;
 exports.usePaths = usePaths;
 exports.default = void 0;
 var _react = require("react");
-var _treeUtils = require("../../utils/treeUtils");
-var _utils = require("../utils");
+var _utils = require("../../internals/Tree/utils");
+var _utils2 = require("../utils");
 /**
  * A Hook to get the selected path of Tree.
  *
@@ -22,10 +22,10 @@ function usePaths(_ref) {
     getParent = _ref.getParent,
     getChildren = _ref.getChildren;
   var pathTowardsSelectedItem = (0, _react.useMemo)(function () {
-    return (0, _treeUtils.getPathTowardsItem)(selectedItem, getParent);
+    return (0, _utils.getPathTowardsItem)(selectedItem, getParent);
   }, [getParent, selectedItem]);
   var _useMemo = (0, _react.useMemo)(function () {
-      return (0, _utils.getColumnsAndPaths)(data, activeItem, {
+      return (0, _utils2.getColumnsAndPaths)(data, activeItem, {
         getParent: getParent,
         getChildren: getChildren
       });

package/cjs/CascadeTree/hooks/useSearch.js

@@ -5,6 +5,7 @@ exports.__esModule = true;
 exports.default = void 0;
 var _react = require("react");
 var _utils = require("../../utils");
+var _utils2 = require("../../internals/utils");
 function useSearch(props) {
   var _useState = (0, _react.useState)(''),
     searchKeyword = _useState[0],
@@ -16,7 +17,7 @@ function useSearch(props) {
     parentSelectable = props.parentSelectable,
     onSearch = props.onSearch;
   var someKeyword = function someKeyword(item, keyword) {
-    if (item[labelKey].match(new RegExp((0, _utils.getSafeRegExpString)(keyword || searchKeyword), 'i'))) {
+    if (item[labelKey].match(new RegExp((0, _utils2.getSafeRegExpString)(keyword || searchKeyword), 'i'))) {
       return true;
     }
     var parent = parentMap.get(item);

package/cjs/CascadeTree/utils.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="react" />
-import { ItemDataType } from '../@types/common';
 declare type GetColumnsAndPathsOptions<T> = {
     getParent: (item: T) => T | undefined;
     getChildren: (item: T) => readonly T[] | undefined;
@@ -20,13 +18,4 @@ export declare function getColumnsAndPaths<T extends Record<string, unknown>>(it
     columns: (readonly T[])[];
     path: T[];
 };
-/**
- * Highlight the search keyword in the label
- */
-export declare function highlightLabel<T>(props: {
-    item: ItemDataType<T>;
-    labelKey: string;
-    searchKeyword: string;
-    render: (patch: React.ReactNode, index: number) => React.ReactNode;
-}): import("react").ReactNode[];
 export {};

package/cjs/CascadeTree/utils.js

@@ -3,8 +3,6 @@
 
 exports.__esModule = true;
 exports.getColumnsAndPaths = getColumnsAndPaths;
-exports.highlightLabel = highlightLabel;
-var _utils = require("../utils");
 /**
  * Calculate columns to be displayed:
  *
@@ -42,25 +40,4 @@ function getColumnsAndPaths(items, pathTarget, options) {
     columns: columns,
     path: path
   };
-}
-
-/**
- * Highlight the search keyword in the label
- */
-function highlightLabel(props) {
-  var item = props.item,
-    searchKeyword = props.searchKeyword,
-    labelKey = props.labelKey,
-    render = props.render;
-  var regx = new RegExp((0, _utils.getSafeRegExpString)(searchKeyword), 'ig');
-  var labelElements = [];
-  var strArr = item[labelKey].split(regx);
-  var highStrArr = item[labelKey].match(regx);
-  for (var i = 0; i < strArr.length; i++) {
-    labelElements.push(strArr[i]);
-    if (highStrArr !== null && highStrArr !== void 0 && highStrArr[i]) {
-      labelElements.push(render(highStrArr[i], i));
-    }
-  }
-  return labelElements;
 }

package/cjs/Cascader/Cascader.js

@@ -16,9 +16,10 @@ var _isFunction = _interopRequireDefault(require("lodash/isFunction"));
 var _TreeView = _interopRequireDefault(require("../CascadeTree/TreeView"));
 var _SearchView = _interopRequireDefault(require("../CascadeTree/SearchView"));
 var _hooks = require("../CascadeTree/hooks");
-var _treeUtils = require("../utils/treeUtils");
+var _utils = require("../Tree/utils");
+var _utils2 = require("../internals/Tree/utils");
 var _propTypes2 = require("../internals/propTypes");
-var _utils = require("../utils");
+var _utils3 = require("../utils");
 var _Picker = require("../internals/Picker");
 var _useMap = require("../utils/useMap");
 var _useActive2 = _interopRequireDefault(require("./useActive"));
@@ -89,14 +90,14 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     target = _usePickerRef.target,
     overlay = _usePickerRef.overlay,
     searchInput = _usePickerRef.searchInput;
-  var _ref = (0, _utils.useControlled)(valueProp, defaultValue),
+  var _ref = (0, _utils3.useControlled)(valueProp, defaultValue),
     value = _ref[0],
     setValue = _ref[1]; // Store the children of each node
   var childrenMap = (0, _useMap.useMap)();
 
   // Store the parent of each node
   var parentMap = (0, _react.useMemo)(function () {
-    return (0, _treeUtils.getParentMap)(data, function (item) {
+    return (0, _utils2.getParentMap)(data, function (item) {
       var _childrenMap$get;
       return (_childrenMap$get = childrenMap.get(item)) !== null && _childrenMap$get !== void 0 ? _childrenMap$get : item[childrenKey];
     });
@@ -104,7 +105,7 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
 
   // Flatten the tree data
   var flattenedData = (0, _react.useMemo)(function () {
-    return (0, _treeUtils.flattenTree)(data, function (item) {
+    return (0, _utils.flattenTree)(data, function (item) {
       var _childrenMap$get2;
       return (_childrenMap$get2 = childrenMap.get(item)) !== null && _childrenMap$get2 !== void 0 ? _childrenMap$get2 : item[childrenKey];
     });
@@ -131,7 +132,7 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     }
 
     //  When the parent is optional, the value and the displayed path are updated.
-    if (parentSelectable && !(0, _utils.shallowEqual)(value, nextValue)) {
+    if (parentSelectable && !(0, _utils3.shallowEqual)(value, nextValue)) {
       setValue(nextValue);
       onChange === null || onChange === void 0 ? void 0 : onChange(nextValue, event);
     }
@@ -168,7 +169,7 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     columns = _usePaths.columns,
     pathTowardsActiveItem = _usePaths.pathTowardsActiveItem,
     pathTowardsSelectedItem = _usePaths.pathTowardsSelectedItem;
-  var _useCustom = (0, _utils.useCustom)('Picker', overrideLocale),
+  var _useCustom = (0, _utils3.useCustom)('Picker', overrideLocale),
     locale = _useCustom.locale,
     rtl = _useCustom.rtl;
   /**
@@ -176,7 +177,7 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
    * 2.Regardless of whether the value is valid, as long as renderValue is set, it is judged to have a value.
    */
   var hasValue = pathTowardsSelectedItem.length > 0 || !(0, _isNil.default)(value) && (0, _isFunction.default)(renderValue);
-  var _useClassNames = (0, _utils.useClassNames)(classPrefix),
+  var _useClassNames = (0, _utils3.useClassNames)(classPrefix),
     prefix = _useClassNames.prefix,
     merge = _useClassNames.merge;
   var onFocusItemCallback = (0, _react.useCallback)(function (value) {
@@ -237,22 +238,22 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     active = _useActive.active,
     handleEntered = _useActive.handleEntered,
     handleExited = _useActive.handleExited;
-  var handleClose = (0, _utils.useEventCallback)(function () {
+  var handleClose = (0, _utils3.useEventCallback)(function () {
     var _trigger$current2, _target$current, _target$current$focus;
     (_trigger$current2 = trigger.current) === null || _trigger$current2 === void 0 ? void 0 : _trigger$current2.close();
 
     // The focus is on the trigger button after closing
     (_target$current = target.current) === null || _target$current === void 0 ? void 0 : (_target$current$focus = _target$current.focus) === null || _target$current$focus === void 0 ? void 0 : _target$current$focus.call(_target$current);
   });
-  var handleClean = (0, _utils.useEventCallback)(function (event) {
+  var handleClean = (0, _utils3.useEventCallback)(function (event) {
     if (disabled || !target.current) {
       return;
     }
     setValue(null);
     onChange === null || onChange === void 0 ? void 0 : onChange(null, event);
   });
-  var handleMenuPressEnter = (0, _utils.useEventCallback)(function (event) {
-    var focusItem = (0, _treeUtils.findNodeOfTree)(data, function (item) {
+  var handleMenuPressEnter = (0, _utils3.useEventCallback)(function (event) {
+    var focusItem = (0, _utils2.findNodeOfTree)(data, function (item) {
       return item[valueKey] === focusItemValue;
     });
     var isLeafNode = focusItem && !focusItem[childrenKey];
@@ -261,7 +262,7 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       if (pathTowardsActiveItem.length) {
         setLayer(pathTowardsActiveItem.length - 1);
       }
-      if (!(0, _utils.shallowEqual)(value, focusItemValue)) {
+      if (!(0, _utils3.shallowEqual)(value, focusItemValue)) {
         onSelect === null || onSelect === void 0 ? void 0 : onSelect(focusItem, pathTowardsActiveItem, event);
         onChange === null || onChange === void 0 ? void 0 : onChange(focusItemValue !== null && focusItemValue !== void 0 ? focusItemValue : null, event);
       }
@@ -283,7 +284,7 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   /**
    * The search structure option is processed after being selected.
    */
-  var handleSearchRowSelect = (0, _utils.useEventCallback)(function (itemData, nodes, event) {
+  var handleSearchRowSelect = (0, _utils3.useEventCallback)(function (itemData, nodes, event) {
     var nextValue = itemData[valueKey];
     handleClose();
     setSearchKeyword('');
@@ -320,7 +321,7 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     });
     var classes = merge(className, DEPRECATED_menuClassName, popupClassName, prefix('popup-cascader'));
     return /*#__PURE__*/_react.default.createElement(_Picker.PickerPopup, {
-      ref: (0, _utils.mergeRefs)(overlay, speakerRef),
+      ref: (0, _utils3.mergeRefs)(overlay, speakerRef),
       className: classes,
       style: styles,
       target: trigger,
@@ -404,7 +405,7 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     as: toggleAs,
     appearance: appearance,
     disabled: disabled,
-    onClean: (0, _utils.createChainedFunction)(handleClean, onClean),
+    onClean: (0, _utils3.createChainedFunction)(handleClean, onClean),
     onKeyDown: onPickerKeyDown,
     cleanable: cleanable && !disabled,
     hasValue: hasValue,

package/cjs/CheckPicker/CheckPicker.js

@@ -11,14 +11,13 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _clone = _interopRequireDefault(require("lodash/clone"));
-var _isUndefined = _interopRequireDefault(require("lodash/isUndefined"));
 var _isFunction = _interopRequireDefault(require("lodash/isFunction"));
 var _remove = _interopRequireDefault(require("lodash/remove"));
 var _omit = _interopRequireDefault(require("lodash/omit"));
 var _pick = _interopRequireDefault(require("lodash/pick"));
 var _isNil = _interopRequireDefault(require("lodash/isNil"));
-var _treeUtils = require("../utils/treeUtils");
-var _utils = require("../utils");
+var _utils = require("../internals/Tree/utils");
+var _utils2 = require("../utils");
 var _getDataGroupBy = require("../utils/getDataGroupBy");
 var _Picker = require("../internals/Picker");
 var _SearchBox = _interopRequireDefault(require("../internals/SearchBox"));
@@ -93,9 +92,9 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     overlay = _usePickerRef.overlay,
     list = _usePickerRef.list,
     searchInput = _usePickerRef.searchInput;
-  var _useCustom = (0, _utils.useCustom)('Picker', overrideLocale),
+  var _useCustom = (0, _utils2.useCustom)('Picker', overrideLocale),
     locale = _useCustom.locale;
-  var _useControlled = (0, _utils.useControlled)(valueProp, defaultValue || []),
+  var _useControlled = (0, _utils2.useControlled)(valueProp, defaultValue || []),
     value = _useControlled[0],
     setValue = _useControlled[1]; // Used to hover the focuse item  when trigger `onKeydown`
   var _useFocusItemValue = (0, _Picker.useFocusItemValue)(value === null || value === void 0 ? void 0 : value[0], {
@@ -108,7 +107,7 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     focusItemValue = _useFocusItemValue.focusItemValue,
     setFocusItemValue = _useFocusItemValue.setFocusItemValue,
     onFocusItem = _useFocusItemValue.onKeyDown;
-  var handleSearchCallback = (0, _utils.useEventCallback)(function (searchKeyword, filteredData, event) {
+  var handleSearchCallback = (0, _utils2.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]);
@@ -147,10 +146,10 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     }
     setStickyItems(nextStickyItems);
   };
-  var handleChangeValue = (0, _utils.useEventCallback)(function (value, event) {
+  var handleChangeValue = (0, _utils2.useEventCallback)(function (value, event) {
     onChange === null || onChange === void 0 ? void 0 : onChange(value, event);
   });
-  var handleClean = (0, _utils.useEventCallback)(function (event) {
+  var handleClean = (0, _utils2.useEventCallback)(function (event) {
     if (disabled || !cleanable) {
       return;
     }
@@ -164,16 +163,16 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       return;
     }
     if (!nextValue.some(function (v) {
-      return (0, _utils.shallowEqual)(v, focusItemValue);
+      return (0, _utils2.shallowEqual)(v, focusItemValue);
     })) {
       nextValue.push(focusItemValue);
     } else {
       (0, _remove.default)(nextValue, function (itemVal) {
-        return (0, _utils.shallowEqual)(itemVal, focusItemValue);
+        return (0, _utils2.shallowEqual)(itemVal, focusItemValue);
       });
     }
     var focusItem = data.find(function (item) {
-      return (0, _utils.shallowEqual)(item === null || item === void 0 ? void 0 : item[valueKey], focusItemValue);
+      return (0, _utils2.shallowEqual)(item === null || item === void 0 ? void 0 : item[valueKey], focusItemValue);
     });
     setValue(nextValue);
     handleSelect(nextValue, focusItem, event);
@@ -191,16 +190,16 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     onMenuPressEnter: handleMenuPressEnter,
     onMenuPressBackspace: handleClean
   }, rest));
-  var handleSelect = (0, _utils.useEventCallback)(function (nextItemValue, item, event) {
+  var handleSelect = (0, _utils2.useEventCallback)(function (nextItemValue, item, event) {
     onSelect === null || onSelect === void 0 ? void 0 : onSelect(nextItemValue, item, event);
   });
-  var handleItemSelect = (0, _utils.useEventCallback)(function (nextItemValue, item, event, checked) {
+  var handleItemSelect = (0, _utils2.useEventCallback)(function (nextItemValue, item, event, checked) {
     var nextValue = (0, _clone.default)(value);
     if (checked) {
       nextValue.push(nextItemValue);
     } else {
       (0, _remove.default)(nextValue, function (itemVal) {
-        return (0, _utils.shallowEqual)(itemVal, nextItemValue);
+        return (0, _utils2.shallowEqual)(itemVal, nextItemValue);
       });
     }
     setValue(nextValue);
@@ -208,17 +207,17 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     handleSelect(nextValue, item, event);
     handleChangeValue(nextValue, event);
   });
-  var handleEntered = (0, _utils.useEventCallback)(function () {
+  var handleEntered = (0, _utils2.useEventCallback)(function () {
     setActive(true);
   });
-  var handleExited = (0, _utils.useEventCallback)(function () {
+  var handleExited = (0, _utils2.useEventCallback)(function () {
     resetSearch();
     setFocusItemValue(null);
     setActive(false);
   });
   var selectedItems = data.filter(function (item) {
     return value === null || value === void 0 ? void 0 : value.some(function (val) {
-      return (0, _utils.shallowEqual)(item[valueKey], val);
+      return (0, _utils2.shallowEqual)(item[valueKey], val);
     });
   }) || [];
 
@@ -227,7 +226,7 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
    * 2.Regardless of whether the value is valid, as long as renderValue is set, it is judged to have a value.
    */
   var hasValue = selectedItems.length > 0 || (value === null || value === void 0 ? void 0 : value.length) > 0 && (0, _isFunction.default)(renderValue);
-  var _useClassNames = (0, _utils.useClassNames)(classPrefix),
+  var _useClassNames = (0, _utils2.useClassNames)(classPrefix),
     prefix = _useClassNames.prefix,
     merge = _useClassNames.merge;
   var selectedElement = placeholder;
@@ -259,10 +258,10 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     var items = filteredData;
     var filteredStickyItems = [];
     if (stickyItems) {
-      filteredStickyItems = (0, _treeUtils.filterNodesOfTree)(stickyItems, function (item) {
+      filteredStickyItems = (0, _utils.filterNodesOfTree)(stickyItems, function (item) {
         return checkShouldDisplay(item);
       });
-      items = (0, _treeUtils.filterNodesOfTree)(data, function (item) {
+      items = (0, _utils.filterNodesOfTree)(data, function (item) {
         return checkShouldDisplay(item) && !stickyItems.some(function (v) {
           return v[valueKey] === item[valueKey];
         });
@@ -288,19 +287,17 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       listItemAs: _Picker.ListCheckItem,
       activeItemValues: value,
       focusItemValue: focusItemValue,
-      data: [].concat(filteredStickyItems, items)
-      // `group` is redundant so long as `groupBy` exists
-      ,
-      group: !(0, _isUndefined.default)(groupBy),
+      data: [].concat(filteredStickyItems, items),
       groupBy: groupBy,
       onSelect: handleItemSelect,
       onGroupTitleClick: onGroupTitleClick,
-      virtualized: virtualized
+      virtualized: virtualized,
+      query: searchKeyword
     }) : /*#__PURE__*/_react.default.createElement("div", {
       className: prefix(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["none"])))
     }, locale === null || locale === void 0 ? void 0 : locale.noResultsText);
     return /*#__PURE__*/_react.default.createElement(_Picker.PickerPopup, {
-      ref: (0, _utils.mergeRefs)(overlay, speakerRef),
+      ref: (0, _utils2.mergeRefs)(overlay, speakerRef),
       autoWidth: menuAutoWidth,
       className: classes,
       style: styles,
@@ -329,9 +326,9 @@ var CheckPicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     pickerProps: (0, _pick.default)(props, _Picker.pickTriggerPropKeys),
     ref: trigger,
     placement: placement,
-    onEnter: (0, _utils.createChainedFunction)(initStickyItems, onEnter),
-    onEntered: (0, _utils.createChainedFunction)(handleEntered, onEntered),
-    onExited: (0, _utils.createChainedFunction)(handleExited, onExited),
+    onEnter: (0, _utils2.createChainedFunction)(initStickyItems, onEnter),
+    onEntered: (0, _utils2.createChainedFunction)(handleEntered, onEntered),
+    onExited: (0, _utils2.createChainedFunction)(handleExited, onExited),
     speaker: renderPopup
   }, /*#__PURE__*/_react.default.createElement(Component, {
     className: classes,