rsuite 5.60.2 → 5.62.0

package/cjs/MultiCascadeTree/SearchView.js

@@ -7,12 +7,11 @@ exports.default = void 0;
 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 _hooks = require("../internals/hooks");
 var _SearchBox = _interopRequireDefault(require("../internals/SearchBox"));
 var _Checkbox = _interopRequireDefault(require("../Checkbox"));
-var _utils2 = require("./utils");
-var _utils3 = require("../CascadeTree/utils");
+var _Highlight = _interopRequireDefault(require("../Highlight"));
+var _utils = require("./utils");
 function SearchView(props) {
   var _props$as = props.as,
     Component = _props$as === void 0 ? 'div' : _props$as,
@@ -31,28 +30,21 @@ function SearchView(props) {
     onSearch = props.onSearch,
     onCheck = props.onCheck,
     rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "classPrefix", "className", "searchKeyword", "childrenKey", "labelKey", "valueKey", "value", "data", "disabledItemValues", "inputRef", "cascade", "onSearch", "onCheck"]);
-  var _useClassNames = (0, _utils.useClassNames)(classPrefix),
+  var _useClassNames = (0, _hooks.useClassNames)(classPrefix),
     merge = _useClassNames.merge,
     prefix = _useClassNames.prefix,
     withClassPrefix = _useClassNames.withClassPrefix,
     rootPrefix = _useClassNames.rootPrefix;
   var classes = merge(className, withClassPrefix());
-  var _useCustom = (0, _utils.useCustom)('Picker'),
+  var _useCustom = (0, _hooks.useCustom)('Picker'),
     locale = _useCustom.locale;
   var renderSearchRow = function renderSearchRow(item, key) {
     var _extends2;
-    var nodes = (0, _treeUtils.getNodeParents)(item);
-    var label = (0, _utils3.highlightLabel)({
-      item: item,
-      labelKey: labelKey,
-      searchKeyword: searchKeyword,
-      render: function render(patch, index) {
-        return /*#__PURE__*/_react.default.createElement("span", {
-          key: index,
-          className: prefix('match')
-        }, patch);
-      }
-    });
+    var nodes = (0, _utils.getNodeParents)(item);
+    var label = /*#__PURE__*/_react.default.createElement(_Highlight.default, {
+      as: "span",
+      query: searchKeyword
+    }, item[labelKey]);
     nodes.push((0, _extends3.default)({}, item, (_extends2 = {}, _extends2[labelKey] = label, _extends2)));
     var active = value.some(function (value) {
       if (cascade) {
@@ -70,7 +62,7 @@ function SearchView(props) {
     var rowClasses = prefix('row', {
       'row-disabled': disabled
     });
-    var indeterminate = cascade && !active && (0, _utils2.isSomeChildChecked)(item, value, {
+    var indeterminate = cascade && !active && (0, _utils.isSomeChildChecked)(item, value, {
       valueKey: valueKey,
       childrenKey: childrenKey
     });

package/cjs/MultiCascadeTree/TreeView.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ItemDataType, WithAsProps, RsRefForwardingComponent } from '../@types/common';
+import { ItemDataType, WithAsProps, RsRefForwardingComponent } from '@/internals/types';
 import type { CascadeColumn } from '../CascadeTree/types';
 export interface TreeViewProps<T = any> extends WithAsProps {
     disabledItemValues?: T[];

package/cjs/MultiCascadeTree/TreeView.js

@@ -10,7 +10,8 @@ var _react = _interopRequireDefault(require("react"));
 var _Spinner = _interopRequireDefault(require("@rsuite/icons/legacy/Spinner"));
 var _AngleLeft = _interopRequireDefault(require("@rsuite/icons/legacy/AngleLeft"));
 var _AngleRight = _interopRequireDefault(require("@rsuite/icons/legacy/AngleRight"));
-var _utils = require("../utils");
+var _hooks = require("../internals/hooks");
+var _utils = require("../internals/utils");
 var _Picker = require("../internals/Picker");
 var _utils2 = require("./utils");
 var emptyArray = [];
@@ -46,11 +47,11 @@ var TreeView = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     _onCheck = props.onCheck,
     onSelect = props.onSelect,
     rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "classPrefix", "className", "cascade", "cascadeData", "cascadePaths", "childrenKey", "disabledItemValues", "columnWidth", "columnHeight", "uncheckableItemValues", "value", "valueKey", "labelKey", "style", "renderTreeNode", "renderColumn", "onCheck", "onSelect"]);
-  var _useClassNames = (0, _utils.useClassNames)(classPrefix),
+  var _useClassNames = (0, _hooks.useClassNames)(classPrefix),
     merge = _useClassNames.merge,
     prefix = _useClassNames.prefix;
   var classes = merge(className, prefix('items'));
-  var _useCustom = (0, _utils.useCustom)(),
+  var _useCustom = (0, _hooks.useCustom)(),
     rtl = _useCustom.rtl;
   var _useCombobox = (0, _Picker.useCombobox)(),
     id = _useCombobox.id,
@@ -67,7 +68,7 @@ var TreeView = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     paths.push(node);
     return paths;
   };
-  var handleSelect = (0, _utils.useEventCallback)(function (layer, node, event) {
+  var handleSelect = (0, _hooks.useEventCallback)(function (layer, node, event) {
     var cascadePaths = getCascadePaths(layer + 1, node);
     onSelect === null || onSelect === void 0 ? void 0 : onSelect(node, cascadePaths, event);
   });

package/cjs/MultiCascadeTree/hooks/useCascadeValue.js

@@ -7,8 +7,22 @@ exports.default = void 0;
 var _react = require("react");
 var _uniq = _interopRequireDefault(require("lodash/uniq"));
 var _remove = _interopRequireDefault(require("lodash/remove"));
-var _utils = require("../../utils");
-var _utils2 = require("../utils");
+var _hooks = require("../../internals/hooks");
+var _utils = require("../utils");
+/**
+ * Get all parents of a node
+ * @param node
+ */
+var getParents = function getParents(node) {
+  var parents = [];
+  if (!node.parent) {
+    return parents;
+  }
+  parents.push(node.parent);
+  parents = parents.concat(getParents(node.parent));
+  return parents;
+};
+
 /**
  * A hook that converts the value into a cascading value
  * @param props
@@ -43,14 +57,14 @@ function useCascadeValue(props, flattenData) {
   var splitValue = (0, _react.useCallback)(function (item, checked, value) {
     var itemValue = item[valueKey];
     var childrenValue = getChildrenValue(item);
-    var parents = (0, _utils2.getParents)(item);
+    var parents = getParents(item);
     var nextValue = [].concat(value);
     var removedValue = [];
     if (checked) {
       nextValue.push(itemValue);
 
       // Delete all values under the current node
-      removedValue = removedValue.concat((0, _utils2.removeAllChildrenValue)(nextValue, item, {
+      removedValue = removedValue.concat((0, _utils.removeAllChildrenValue)(nextValue, item, {
         valueKey: valueKey,
         childrenKey: childrenKey
       }) || []);
@@ -81,7 +95,7 @@ function useCascadeValue(props, flattenData) {
             nextValue.push(parents[i][valueKey]);
 
             // Delete all values under the parent node
-            removedValue = removedValue.concat((0, _utils2.removeAllChildrenValue)(nextValue, parents[i], {
+            removedValue = removedValue.concat((0, _utils.removeAllChildrenValue)(nextValue, parents[i], {
               valueKey: valueKey,
               childrenKey: childrenKey
             }) || []);
@@ -95,7 +109,7 @@ function useCascadeValue(props, flattenData) {
       var tempValue = childrenValue.concat(parents.map(function (item) {
         return item[valueKey];
       }));
-      nextValue = nextValue.concat((0, _utils2.getOtherItemValuesByUnselectChild)(item, nextValue, {
+      nextValue = nextValue.concat((0, _utils.getOtherItemValuesByUnselectChild)(item, nextValue, {
         valueKey: valueKey,
         childrenKey: childrenKey
       }));
@@ -172,7 +186,7 @@ function useCascadeValue(props, flattenData) {
     // Update value when valueProp is updated.
     setValue(transformValue(valueProp) || []);
   }, [transformValue, valueProp]);
-  var handleCheck = (0, _utils.useEventCallback)(function (node, event, checked) {
+  var handleCheck = (0, _hooks.useEventCallback)(function (node, event, checked) {
     var nodeValue = node[valueKey];
     var nextValue = [];
     if (cascade) {

package/cjs/MultiCascadeTree/hooks/useColumnData.js

@@ -6,7 +6,7 @@ exports.__esModule = true;
 exports.default = void 0;
 var _react = require("react");
 var _slice = _interopRequireDefault(require("lodash/slice"));
-var _treeUtils = require("../../utils/treeUtils");
+var _utils = require("../../Tree/utils");
 /**
  * A hook for column data
  * @param flattenData
@@ -35,7 +35,7 @@ function useColumnData(flattenData) {
     setColumnData([].concat((0, _slice.default)(columnData, 0, index)));
   }
   function enforceUpdateColumnData(nextData) {
-    var nextFlattenData = (0, _treeUtils.UNSAFE_flattenTree)(nextData);
+    var nextFlattenData = (0, _utils.UNSAFE_flattenTree)(nextData);
     setColumnData([nextFlattenData.filter(function (item) {
       return !item.parent;
     })]);

package/cjs/MultiCascadeTree/hooks/useFlattenData.js

@@ -4,25 +4,25 @@
 exports.__esModule = true;
 exports.default = void 0;
 var _react = require("react");
-var _treeUtils = require("../../utils/treeUtils");
-var _attachParent = require("../../utils/attachParent");
+var _utils = require("../../Tree/utils");
+var _utils2 = require("../../internals/utils");
 /**
  * A hook to flatten tree structure data
  */
 function useFlattenData(data, itemKeys) {
   var childrenKey = itemKeys.childrenKey;
-  var _useState = (0, _react.useState)((0, _treeUtils.UNSAFE_flattenTree)(data, itemKeys.childrenKey)),
+  var _useState = (0, _react.useState)((0, _utils.UNSAFE_flattenTree)(data, itemKeys.childrenKey)),
     flattenData = _useState[0],
     setFlattenData = _useState[1];
   var addFlattenData = (0, _react.useCallback)(function (children, parent) {
     var nodes = children.map(function (child) {
-      return (0, _attachParent.attachParent)(child, parent);
+      return (0, _utils2.attachParent)(child, parent);
     });
     parent[childrenKey] = nodes;
     setFlattenData([].concat(flattenData, nodes));
   }, [childrenKey, flattenData]);
   (0, _react.useEffect)(function () {
-    setFlattenData((0, _treeUtils.UNSAFE_flattenTree)(data, itemKeys.childrenKey));
+    setFlattenData((0, _utils.UNSAFE_flattenTree)(data, itemKeys.childrenKey));
   }, [data, itemKeys.childrenKey]);
   return {
     addFlattenData: addFlattenData,

package/cjs/MultiCascadeTree/hooks/useSearch.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { ItemDataType } from '../../@types/common';
+import { ItemDataType } from '@/internals/types';
 interface SearchPanelProps<T> {
     labelKey: string;
     valueKey: string;

package/cjs/MultiCascadeTree/hooks/useSearch.js

@@ -4,7 +4,8 @@
 exports.__esModule = true;
 exports.default = void 0;
 var _react = require("react");
-var _utils = require("../../utils");
+var _hooks = require("../../internals/hooks");
+var _utils = require("../../internals/utils");
 function useSearch(props) {
   var _useState = (0, _react.useState)(''),
     searchKeyword = _useState[0],
@@ -37,7 +38,7 @@ function useSearch(props) {
     }
     return items;
   };
-  var handleSearch = (0, _utils.useEventCallback)(function (value, event) {
+  var handleSearch = (0, _hooks.useEventCallback)(function (value, event) {
     setSearchKeyword(value);
     onSearch === null || onSearch === void 0 ? void 0 : onSearch(value, event);
   });

package/cjs/MultiCascadeTree/hooks/useSelect.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { type ItemDataType } from '../../@types/common';
+import { type ItemDataType } from '@/internals/types';
 export interface UseSelectProps<T> {
     data: ItemDataType<T>[];
     childrenKey: string;

package/cjs/MultiCascadeTree/hooks/useSelect.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.default = void 0;
 var _react = require("react");
-var _utils = require("../../utils");
+var _hooks = require("../../internals/hooks");
 var _useFlattenData2 = _interopRequireDefault(require("./useFlattenData"));
 var _useColumnData2 = _interopRequireDefault(require("./useColumnData"));
 var useSelect = function useSelect(props) {
@@ -29,16 +29,16 @@ var useSelect = function useSelect(props) {
     setColumnData = _useColumnData.setColumnData,
     removeColumnByIndex = _useColumnData.removeColumnByIndex,
     enforceUpdateColumnData = _useColumnData.enforceUpdateColumnData;
-  (0, _utils.useUpdateEffect)(function () {
+  (0, _hooks.useUpdateEffect)(function () {
     enforceUpdateColumnData(data);
   }, [data]);
-  var isMounted = (0, _utils.useIsMounted)();
+  var isMounted = (0, _hooks.useIsMounted)();
 
   // The path after cascading data selection.
   var _useState = (0, _react.useState)(),
     selectedPaths = _useState[0],
     setSelectedPaths = _useState[1];
-  var handleSelect = (0, _utils.useEventCallback)(function (node, cascadePaths, event) {
+  var handleSelect = (0, _hooks.useEventCallback)(function (node, cascadePaths, event) {
     var _node$childrenKey, _node$childrenKey2;
     setSelectedPaths(cascadePaths);
     var columnIndex = cascadePaths.length;

package/cjs/MultiCascadeTree/index.d.ts

@@ -1,4 +1,4 @@
 import MultiCascadeTree from './MultiCascadeTree';
-export type { ItemDataType } from '../@types/common';
+export type { ItemDataType } from '@/internals/types';
 export type { MultiCascadeTreeProps } from './types';
 export default MultiCascadeTree;

package/cjs/MultiCascadeTree/types.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import type { CascadeTreeProps } from '../CascadeTree/types';
-import type { ItemDataType, ToArray, WithAsProps } from '../@types/common';
+import type { ItemDataType, ToArray, WithAsProps } from '@/internals/types';
 export interface ItemKeys {
     valueKey: string;
     labelKey: string;

package/cjs/MultiCascadeTree/utils.d.ts

@@ -1,4 +1,4 @@
-import { ItemDataType } from '../@types/common';
+import { ItemDataType } from '@/internals/types';
 export interface ItemType<T = any> extends ItemDataType<T> {
     parent?: ItemType<T>;
 }
@@ -7,14 +7,14 @@ interface ItemKeys {
     labelKey: string;
     childrenKey: string;
 }
-declare type MayHasParent<T extends Record<string, unknown>> = T & {
+export declare type MayHasParent<T extends Record<string, unknown>> = T & {
     parent?: MayHasParent<T>;
 };
 /**
- * Get all parents of a node
- * @param node
+ * get all ancestor nodes of given node
+ * @param {*} node
  */
-export declare const getParents: <T extends Record<string, unknown>>(node: MayHasParent<T>) => MayHasParent<T>[];
+export declare function getNodeParents(node: any, parentKey?: string, valueKey?: string): any[];
 /**
  * Check if any child nodes are selected.
  * @param node

package/cjs/MultiCascadeTree/utils.js

@@ -3,21 +3,31 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
-exports.removeAllChildrenValue = exports.getOtherItemValuesByUnselectChild = exports.isSomeParentChecked = exports.isSomeChildChecked = exports.getParents = void 0;
+exports.getNodeParents = getNodeParents;
+exports.removeAllChildrenValue = exports.getOtherItemValuesByUnselectChild = exports.isSomeParentChecked = exports.isSomeChildChecked = void 0;
 var _remove = _interopRequireDefault(require("lodash/remove"));
 /**
- * Get all parents of a node
- * @param node
+ * get all ancestor nodes of given node
+ * @param {*} node
  */
-var getParents = function getParents(node) {
-  var parents = [];
-  if (!node.parent) {
-    return parents;
+function getNodeParents(node, parentKey, valueKey) {
+  if (parentKey === void 0) {
+    parentKey = 'parent';
   }
-  parents.push(node.parent);
-  parents = parents.concat(getParents(node.parent));
+  var parents = [];
+  var traverse = function traverse(node) {
+    if (node !== null && node !== void 0 && node[parentKey]) {
+      traverse(node[parentKey]);
+      if (valueKey) {
+        parents.push(node[parentKey][valueKey]);
+      } else {
+        parents.push(node[parentKey]);
+      }
+    }
+  };
+  traverse(node);
   return parents;
-};
+}
 
 /**
  * Check if any child nodes are selected.
@@ -25,7 +35,6 @@ var getParents = function getParents(node) {
  * @param value
  * @param itemKeys
  */
-exports.getParents = getParents;
 var isSomeChildChecked = function isSomeChildChecked(node, value, itemKeys) {
   var childrenKey = itemKeys.childrenKey,
     valueKey = itemKeys.valueKey;

package/cjs/MultiCascader/MultiCascader.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { PickerLocale } from '../locales';
-import { PickerComponent, PickerToggleProps } from '../internals/Picker';
-import { FormControlPickerProps, ItemDataType, DataItemValue } from '../@types/common';
+import { PickerComponent, PickerToggleProps } from '@/internals/Picker';
+import { FormControlPickerProps, ItemDataType, DataItemValue } from '@/internals/types';
 import type { MultiCascadeTreeProps } from '../MultiCascadeTree';
 export interface MultiCascaderProps<T extends DataItemValue> extends FormControlPickerProps<T[], PickerLocale, ItemDataType<T>, T>, MultiCascadeTreeProps<T, T[]>, Pick<PickerToggleProps, 'loading'> {
     /**

package/cjs/MultiCascader/MultiCascader.js

@@ -13,12 +13,13 @@ var _pick = _interopRequireDefault(require("lodash/pick"));
 var _omit = _interopRequireDefault(require("lodash/omit"));
 var _isFunction = _interopRequireDefault(require("lodash/isFunction"));
 var _isNil = _interopRequireDefault(require("lodash/isNil"));
-var _treeUtils = require("../utils/treeUtils");
-var _utils = require("../CascadeTree/utils");
-var _utils2 = require("../utils");
+var _utils = require("../internals/Tree/utils");
+var _hooks = require("../internals/hooks");
+var _utils2 = require("../CascadeTree/utils");
+var _utils3 = require("../internals/utils");
 var _Picker = require("../internals/Picker");
 var _propTypes2 = require("../internals/propTypes");
-var _hooks = require("../MultiCascadeTree/hooks");
+var _hooks2 = require("../MultiCascadeTree/hooks");
 var _TreeView = _interopRequireDefault(require("../MultiCascadeTree/TreeView"));
 var _SearchView = _interopRequireDefault(require("../MultiCascadeTree/SearchView"));
 var _useActive2 = _interopRequireDefault(require("../Cascader/useActive"));
@@ -95,10 +96,10 @@ var MultiCascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     target = _usePickerRef.target,
     overlay = _usePickerRef.overlay,
     searchInput = _usePickerRef.searchInput;
-  var _useCustom = (0, _utils2.useCustom)('Picker', overrideLocale),
+  var _useCustom = (0, _hooks.useCustom)('Picker', overrideLocale),
     locale = _useCustom.locale,
     rtl = _useCustom.rtl;
-  var _useClassNames = (0, _utils2.useClassNames)(classPrefix),
+  var _useClassNames = (0, _hooks.useClassNames)(classPrefix),
     prefix = _useClassNames.prefix,
     merge = _useClassNames.merge;
   var onSelectCallback = (0, _react.useCallback)(function (node, cascadePaths, event) {
@@ -106,7 +107,7 @@ var MultiCascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     onSelect === null || onSelect === void 0 ? void 0 : onSelect(node, cascadePaths, event);
     (_trigger$current = trigger.current) === null || _trigger$current === void 0 ? void 0 : (_trigger$current$upda = _trigger$current.updatePosition) === null || _trigger$current$upda === void 0 ? void 0 : _trigger$current$upda.call(_trigger$current);
   }, [onSelect, trigger]);
-  var _useSelect = (0, _hooks.useSelect)({
+  var _useSelect = (0, _hooks2.useSelect)({
       data: data,
       childrenKey: childrenKey,
       labelKey: labelKey,
@@ -120,7 +121,7 @@ var MultiCascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     setColumnData = _useSelect.setColumnData,
     setSelectedPaths = _useSelect.setSelectedPaths,
     handleSelect = _useSelect.handleSelect;
-  var _useControlled = (0, _utils2.useControlled)(valueProp, defaultValue),
+  var _useControlled = (0, _hooks.useControlled)(valueProp, defaultValue),
     controlledValue = _useControlled[0];
   var itemKeys = {
     childrenKey: childrenKey,
@@ -134,7 +135,7 @@ var MultiCascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     onCheck: onCheck,
     onChange: onChange
   });
-  var _useCascadeValue = (0, _hooks.useCascadeValue)(cascadeValueProps, flattenData),
+  var _useCascadeValue = (0, _hooks2.useCascadeValue)(cascadeValueProps, flattenData),
     value = _useCascadeValue.value,
     setValue = _useCascadeValue.setValue,
     handleCheck = _useCascadeValue.handleCheck;
@@ -144,7 +145,7 @@ var MultiCascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     });
   }) || [];
   var onFocusItemCallback = (0, _react.useCallback)(function (value) {
-    var _getColumnsAndPaths = (0, _utils.getColumnsAndPaths)(data, flattenData.find(function (item) {
+    var _getColumnsAndPaths = (0, _utils2.getColumnsAndPaths)(data, flattenData.find(function (item) {
         return item[valueKey] === value;
       }), {
         getParent: function getParent() {
@@ -184,7 +185,7 @@ var MultiCascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     setKeys([]);
     onSearch === null || onSearch === void 0 ? void 0 : onSearch(value, event);
   };
-  var _useSearch = (0, _hooks.useSearch)({
+  var _useSearch = (0, _hooks2.useSearch)({
       labelKey: labelKey,
       valueKey: valueKey,
       childrenKey: childrenKey,
@@ -205,7 +206,7 @@ var MultiCascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     active = _useActive.active,
     handleEntered = _useActive.handleEntered,
     handleExited = _useActive.handleExited;
-  var handleClean = (0, _utils2.useEventCallback)(function (event) {
+  var handleClean = (0, _hooks.useEventCallback)(function (event) {
     if (disabled || !target.current) {
       return;
     }
@@ -214,9 +215,9 @@ var MultiCascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     setColumnData([data]);
     onChange === null || onChange === void 0 ? void 0 : onChange([], event);
   });
-  var handleMenuPressEnter = (0, _utils2.useEventCallback)(function (event) {
+  var handleMenuPressEnter = (0, _hooks.useEventCallback)(function (event) {
     var _overlay$current;
-    var focusItem = (0, _treeUtils.findNodeOfTree)(data, function (item) {
+    var focusItem = (0, _utils.findNodeOfTree)(data, function (item) {
       return item[valueKey] === focusItemValue;
     });
     var checkbox = (_overlay$current = overlay.current) === null || _overlay$current === void 0 ? void 0 : _overlay$current.querySelector("[data-key=\"" + focusItemValue + "\"] [type=\"checkbox\"]");
@@ -264,7 +265,7 @@ var MultiCascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     });
     var classes = merge(className, DEPRECATED_menuClassName, popupClassName, prefix('popup-multi-cascader'));
     return /*#__PURE__*/_react.default.createElement(_Picker.PickerPopup, {
-      ref: (0, _utils2.mergeRefs)(overlay, speakerRef),
+      ref: (0, _utils3.mergeRefs)(overlay, speakerRef),
       className: classes,
       style: styles,
       target: trigger,
@@ -353,7 +354,7 @@ var MultiCascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     appearance: appearance,
     disabled: disabled,
     ref: target,
-    onClean: (0, _utils2.createChainedFunction)(handleClean, onClean),
+    onClean: (0, _utils3.createChainedFunction)(handleClean, onClean),
     onKeyDown: onPickerKeyDown,
     cleanable: cleanable && !disabled,
     hasValue: hasValue,

package/cjs/Nav/Nav.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import NavItem from './NavItem';
-import { WithAsProps, RsRefForwardingComponent } from '../@types/common';
+import { WithAsProps, RsRefForwardingComponent } from '@/internals/types';
 import NavDropdown from './NavDropdown';
 import NavMenu from './NavMenu';
 export interface NavProps<T = any> extends WithAsProps, Omit<React.HTMLAttributes<HTMLElement>, 'onSelect'> {

package/cjs/Nav/Nav.js

@@ -10,15 +10,15 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _NavItem = _interopRequireDefault(require("./NavItem"));
-var _utils = require("../utils");
+var _hooks = require("../internals/hooks");
 var _Navbar = require("../Navbar/Navbar");
 var _Sidenav = require("../Sidenav/Sidenav");
 var _NavContext = _interopRequireDefault(require("./NavContext"));
 var _Menubar = _interopRequireDefault(require("../internals/Menu/Menubar"));
 var _propTypes2 = require("../internals/propTypes");
+var _utils = require("../internals/utils");
 var _NavDropdown = _interopRequireDefault(require("./NavDropdown"));
 var _NavMenu = _interopRequireWildcard(require("./NavMenu"));
-var _deprecateComponent = _interopRequireDefault(require("../utils/deprecateComponent"));
 var _NavDropdownItem = _interopRequireDefault(require("./NavDropdownItem"));
 var _NavDropdownMenu = _interopRequireDefault(require("./NavDropdownMenu"));
 var _NavbarDropdownItem = _interopRequireDefault(require("../Navbar/NavbarDropdownItem"));
@@ -50,8 +50,8 @@ var Nav = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
 
   // Whether inside a <Navbar>
   var navbar = (0, _react.useContext)(_Navbar.NavbarContext);
-  var menubarRef = (0, _utils.useEnsuredRef)(ref);
-  var _useClassNames = (0, _utils.useClassNames)(classPrefix),
+  var menubarRef = (0, _hooks.useEnsuredRef)(ref);
+  var _useClassNames = (0, _hooks.useClassNames)(classPrefix),
     withClassPrefix = _useClassNames.withClassPrefix,
     merge = _useClassNames.merge,
     rootPrefix = _useClassNames.rootPrefix,
@@ -69,7 +69,7 @@ var Nav = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _ref = sidenav || {},
     activeKeyFromSidenav = _ref.activeKey,
     onSelectFromSidenav = _ref.onSelect;
-  var _useControlled = (0, _utils.useControlled)(activeKeyProp !== null && activeKeyProp !== void 0 ? activeKeyProp : activeKeyFromSidenav, defaultActiveKey),
+  var _useControlled = (0, _hooks.useControlled)(activeKeyProp !== null && activeKeyProp !== void 0 ? activeKeyProp : activeKeyFromSidenav, defaultActiveKey),
     activeKey = _useControlled[0],
     setActiveKey = _useControlled[1];
   var contextValue = (0, _react.useMemo)(function () {
@@ -115,9 +115,9 @@ var Nav = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     className: prefix('bar')
   })));
 });
-var DeprecatedNavDropdown = (0, _deprecateComponent.default)(_NavDropdown.default, '<Nav.Dropdown> is deprecated, use <Nav.Menu> instead.');
-DeprecatedNavDropdown.Menu = (0, _deprecateComponent.default)(_NavDropdownMenu.default, '<Nav.Dropdown.Menu> is deprecated, use <Nav.Menu> instead');
-DeprecatedNavDropdown.Item = (0, _deprecateComponent.default)(_NavDropdownItem.default, '<Nav.Dropdown.Item> is deprecated, use <Nav.Item> instead');
+var DeprecatedNavDropdown = (0, _utils.deprecateComponent)(_NavDropdown.default, '<Nav.Dropdown> is deprecated, use <Nav.Menu> instead.');
+DeprecatedNavDropdown.Menu = (0, _utils.deprecateComponent)(_NavDropdownMenu.default, '<Nav.Dropdown.Menu> is deprecated, use <Nav.Menu> instead');
+DeprecatedNavDropdown.Item = (0, _utils.deprecateComponent)(_NavDropdownItem.default, '<Nav.Dropdown.Item> is deprecated, use <Nav.Item> instead');
 Nav.Dropdown = DeprecatedNavDropdown;
 /**
  * The <Nav.Item> API
@@ -134,7 +134,7 @@ Nav.Item = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var sidenav = (0, _react.useContext)(_Sidenav.SidenavContext);
   var _ref2 = parentNavMenu !== null && parentNavMenu !== void 0 ? parentNavMenu : [],
     dispatch = _ref2[1];
-  var _id = (0, _utils.useInternalId)('Nav.Item');
+  var _id = (0, _hooks.useInternalId)('Nav.Item');
   (0, _react.useEffect)(function () {
     if (dispatch) {
       var _props$active;

package/cjs/Nav/NavDropdown.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { TypeAttributes, WithAsProps, RsRefForwardingComponent } from '../@types/common';
+import { TypeAttributes, WithAsProps, RsRefForwardingComponent } from '@/internals/types';
 import Button from '../Button';
 import NavDropdownItem from './NavDropdownItem';
 import NavDropdownMenu from './NavDropdownMenu';

package/cjs/Nav/NavDropdown.js

@@ -11,7 +11,9 @@ var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _omit = _interopRequireDefault(require("lodash/omit"));
 var _pick = _interopRequireDefault(require("lodash/pick"));
-var _utils = require("../utils");
+var _constants = require("../internals/constants");
+var _hooks = require("../internals/hooks");
+var _utils = require("../internals/utils");
 var _propTypes2 = require("../internals/propTypes");
 var _DropdownState = require("../Dropdown/DropdownState");
 var _Menu = _interopRequireDefault(require("../internals/Menu/Menu"));
@@ -56,10 +58,10 @@ var NavDropdown = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     menuStyle = props.menuStyle,
     style = props.style,
     toggleProps = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "title", "onClose", "onOpen", "onToggle", "eventKey", "trigger", "placement", "toggleAs", "toggleClassName", "classPrefix", "className", "disabled", "children", "menuStyle", "style"]);
-  var _useClassNames = (0, _utils.useClassNames)(classPrefix),
+  var _useClassNames = (0, _hooks.useClassNames)(classPrefix),
     merge = _useClassNames.merge,
     withClassPrefix = _useClassNames.withClassPrefix;
-  var _useClassNames2 = (0, _utils.useClassNames)('dropdown-menu'),
+  var _useClassNames2 = (0, _hooks.useClassNames)('dropdown-menu'),
     withMenuClassPrefix = _useClassNames2.withClassPrefix,
     mergeMenuClassName = _useClassNames2.merge;
   var menuButtonTriggers = (0, _react.useMemo)(function () {
@@ -135,7 +137,7 @@ NavDropdown.displayName = 'Nav.Dropdown';
 NavDropdown.propTypes = {
   classPrefix: _propTypes.default.string,
   trigger: _propTypes.default.oneOfType([_propTypes.default.array, (0, _propTypes2.oneOf)(['click', 'hover', 'contextMenu'])]),
-  placement: (0, _propTypes2.oneOf)(_utils.PLACEMENT_8),
+  placement: (0, _propTypes2.oneOf)(_constants.PLACEMENT_8),
   title: _propTypes.default.node,
   disabled: _propTypes.default.bool,
   icon: _propTypes.default.node,

package/cjs/Nav/NavDropdownItem.d.ts

@@ -1,4 +1,4 @@
-import { RsRefForwardingComponent, WithAsProps } from '../@types/common';
+import { RsRefForwardingComponent, WithAsProps } from '@/internals/types';
 import React from 'react';
 import { IconProps } from '@rsuite/icons/lib/Icon';
 export interface NavDropdownItemProps<T = any> extends WithAsProps, Omit<React.HTMLAttributes<HTMLElement>, 'onSelect'> {