@kdcloudjs/kdesign 1.3.9 → 1.5.0

package/es/menu/style/index.less

@@ -135,55 +135,55 @@
   }
 
   .@{menuitem-prefix-cls} {
-    &:hover {
-      .hover();
+    &:not(.@{menuitem-prefix-cls}-disabled):not(.@{menuitem-prefix-cls}-active):hover {
+      .menu-dark-hover();
     }
 
     &-active {
-      .active()
+      .menu-dark-active()
     }
   }
 
   .@{menuitem-prefix-cls}-active, .@{submenu-prefix-cls}-active {
-    .active()
+    .menu-dark-active()
   }
 
   .@{menuitem-prefix-cls}-hover, .@{submenu-prefix-cls}-hover {
-    .hover()
+    .menu-dark-hover()
   }
 }
 
 .@{menu-inline-prefix-cls}.@{menu-dark-prefix-cls} {
   .@{menuitem-prefix-cls}-active, .@{submenu-prefix-cls}-active {
     .@{submenu-prefix-cls}-title {
-      .active-inline-title()
+      .menu-dark-active-inline-title()
     }
   }
 
-  .@{submenu-prefix-cls}:not(.@{submenu-prefix-cls}-disabled) {
+  .@{submenu-prefix-cls}:not(.@{submenu-prefix-cls}-disabled):not(.@{submenu-prefix-cls}-active) {
     > .@{submenu-prefix-cls}-title:hover {
-      .active-inline-title()
+      .menu-dark-active-inline-title()
     }
   }
 }
 
 // light
 .@{menu-light-prefix-cls} {
-  .light();
+  .menu-light-base();
 }
 
 .@{menu-inline-prefix-cls}.@{menu-light-prefix-cls} {
   .@{menuitem-prefix-cls}-active, .@{submenu-prefix-cls}-active {
     .@{submenu-prefix-cls}-title {
-      .light-active-inline-title()
+      .menu-light-active-inline-title()
     }
   }
 }
 
 .@{menu-popper-prefix-cls} {
-  .@{submenu-prefix-cls}:hover,
+  .@{submenu-prefix-cls}:not(.@{submenu-prefix-cls}-disabled):not(.@{submenu-prefix-cls}-active):hover,
   .@{submenu-prefix-cls}-hover {
-    .hover();
+    .menu-dark-hover();
   }
 
   &.hidden {
@@ -206,9 +206,9 @@
       0 9px 28px 8px rgba(0, 0, 0, 0.05);
 
       .@{menuitem-prefix-cls} {
-        &:hover,
+        &:not(.@{menuitem-prefix-cls}-disabled):not(.@{menuitem-prefix-cls}-active):hover,
         &-active {
-          .hover()
+          .menu-dark-hover()
         }
       }
 
@@ -234,7 +234,7 @@
   }
 
   &.light {
-    .light();
+    .menu-light-base();
   }
 }
 

package/es/menu/style/mixin.less

@@ -24,6 +24,7 @@
     align-items: center;
     height: 50px;
     .ellipsis();
+
     & > span {
       .ellipsis();
       opacity: 1;
@@ -57,8 +58,8 @@
 
   &-disabled {
     cursor: not-allowed;
-    color: @menu-color-disabled !important;
-    background-color: @menu-color-background !important;
+    color: @menu-color-disabled;
+    background-color: @menu-color-background;
   }
 
   &-arrow {
@@ -78,68 +79,67 @@
 }
 
 
-.hover {
+.menu-dark-hover {
   background-color: @menu-sub-color-background;
   color: @menu-sub-color-hover;
 }
 
-.active {
+.menu-dark-active {
   background-color: @menu-sub-color-background;
   color: @menu-sub-color-hover;
 }
 
-.active-inline-title {
-  color: @menu-sub-color-hover !important;
-  background: @menu-color-background !important;
+.menu-dark-active-inline-title {
+  color: @menu-sub-color-hover;
+  background: @menu-color-background;
   border: none;
 }
 
-
-.light {
-  .light-default();
+.menu-light-base {
+  .menu-light-default();
 
   .@{menuitem-prefix-cls}-disabled, .@{submenu-prefix-cls}-disabled {
-    background-color: #fff !important;
+    background-color: #fff;
   }
 
   .@{submenu-prefix-cls}-sub {
     color: @menu-light-color;
-    background: #FAFAFA;
+    background: #fafafa;
   }
 
-  .@{menuitem-prefix-cls}:hover {
-    .light-hover();
+  .@{menuitem-prefix-cls}:not(.@{menuitem-prefix-cls}-disabled):not(.@{menuitem-prefix-cls}-active):hover {
+    .menu-light-hover();
   }
 
   .@{menuitem-prefix-cls}-hover, .@{submenu-prefix-cls}-hover {
-    .light-hover();
+    .menu-light-hover();
   }
 
   .@{menuitem-prefix-cls}-active, .@{submenu-prefix-cls}-active {
-    .light-active();
+    .menu-light-active();
   }
 }
 
-.light-default {
+.menu-light-default {
   color: @menu-light-color;
   background: #ffffff;
 }
 
-.light-hover {
+.menu-light-hover {
   background-color: @menu-light-color-background-hover;
   color: @menu-light-color-hover;
   border: none;
 }
 
-.light-active {
-  background-color: @menu-light-color-background-active !important;
-  color: @menu-light-color-active !important;
+.menu-light-active {
+  background-color: @menu-light-color-background-active;
+  color: @menu-light-color-active;
   border: none;
 }
 
-.light-active-inline-title {
-  color: @menu-light-color-active !important;
-  background: #ffffff !important;
+.menu-light-active-inline-title {
+  color: @menu-light-color-active;
+  background: #ffffff;
   border: none;
 }
 

package/es/menu/subMenu.js

@@ -1,8 +1,9 @@
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
+import _toConsumableArray from "@babel/runtime-corejs3/helpers/toConsumableArray";
 import _Object$getOwnPropertySymbols from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols";
-import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
+import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 
 var __rest = this && this.__rest || function (s, e) {
@@ -51,6 +52,7 @@ var SubMenu = function SubMenu(props) {
       keyValue = _a.keyValue,
       selectedKey = _a.selectedKey,
       selectedKeyPath = _a.selectedKeyPath,
+      setSelectedKeyPath = _a.setSelectedKeyPath,
       openKeys = _a.openKeys,
       triggerSubMenuAction = _a.triggerSubMenuAction,
       forceSubMenuRender = _a.forceSubMenuRender,
@@ -60,7 +62,7 @@ var SubMenu = function SubMenu(props) {
       handleOnOpenChange = _a.handleOnOpenChange,
       _a$paddingLeft = _a.paddingLeft,
       paddingLeft = _a$paddingLeft === void 0 ? 0 : _a$paddingLeft,
-      restProps = __rest(_a, ["prefixCls", "theme", "mode", "title", "icon", "disabled", "children", "collapsed", "keyValue", "selectedKey", "selectedKeyPath", "openKeys", "triggerSubMenuAction", "forceSubMenuRender", "inlineIndent", "className", "style", "handleOnOpenChange", "paddingLeft"]);
+      restProps = __rest(_a, ["prefixCls", "theme", "mode", "title", "icon", "disabled", "children", "collapsed", "keyValue", "selectedKey", "selectedKeyPath", "setSelectedKeyPath", "openKeys", "triggerSubMenuAction", "forceSubMenuRender", "inlineIndent", "className", "style", "handleOnOpenChange", "paddingLeft"]);
 
   var isVertical = mode === 'vertical'; // 初始化level
 
@@ -68,6 +70,14 @@ var SubMenu = function SubMenu(props) {
     restProps.level = 1;
   }
 
+  if (Array.isArray(restProps.parentPath)) {
+    var _context;
+
+    restProps.parentPath = _concatInstanceProperty(_context = []).call(_context, _toConsumableArray(restProps.parentPath), [keyValue]);
+  } else {
+    restProps.parentPath = [keyValue];
+  }
+
   if (mode === 'inline') {
     restProps.subMenuMode = 'vertical';
     restProps.popupOffset = [];
@@ -189,10 +199,7 @@ var SubMenu = function SubMenu(props) {
     if (!_includesInstanceProperty(className).call(className, MENU_ITEM_CONTAINER_NAME)) {
       closeSubMenu();
     }
-  }); // // 缩略模式自动关闭子菜单
-  // if (triggerSubMenuAction === 'click' && mode === 'vertical' && collapsed) {
-  //   closeSubMenu()
-  // }
+  });
 
   var handleMouseEvent = function handleMouseEvent(status) {
     if (disabled || triggerSubMenuAction === 'click') return;
@@ -208,11 +215,6 @@ var SubMenu = function SubMenu(props) {
   };
 
   var handleOnClick = function handleOnClick(info) {
-    var _context;
-
-    // 保存路径
-    info.keyPath = _concatInstanceProperty(_context = info.keyPath).call(_context, [keyValue]);
-
     if (triggerSubMenuAction === 'click' && isVertical) {
       closeSubMenu();
     }
@@ -321,13 +323,15 @@ var SubMenu = function SubMenu(props) {
       mode: mode,
       theme: theme,
       selectedKey: selectedKey,
+      setSelectedKeyPath: setSelectedKeyPath,
       openKeys: openKeys,
       forceSubMenuRender: forceSubMenuRender,
       triggerSubMenuAction: triggerSubMenuAction,
       handleOnOpenChange: handleOnOpenChange,
       handleOnClick: handleOnClick,
       inlineIndent: inlineIndent,
-      paddingLeft: curPaddingLeft
+      paddingLeft: curPaddingLeft,
+      parentPath: restProps.parentPath
     });
   }))), {
     arrow: false,
@@ -369,13 +373,15 @@ var SubMenu = function SubMenu(props) {
         collapsed: collapsed,
         mode: mode,
         selectedKey: selectedKey,
+        setSelectedKeyPath: setSelectedKeyPath,
         openKeys: openKeys,
         forceSubMenuRender: forceSubMenuRender,
         triggerSubMenuAction: triggerSubMenuAction,
         handleOnOpenChange: handleOnOpenChange,
         handleOnClick: handleOnClick,
         inlineIndent: inlineIndent,
-        paddingLeft: curPaddingLeft
+        paddingLeft: curPaddingLeft,
+        parentPath: restProps.parentPath
       });
     }))));
   }

package/es/radio/radio.js

@@ -18,6 +18,7 @@ var __rest = this && this.__rest || function (s, e) {
 
 import React, { useEffect } from 'react';
 import classNames from 'classnames';
+import isBoolean from 'lodash/isBoolean';
 import ConfigContext from '../config-provider/ConfigContext';
 import { getCompProps } from '../_utils';
 import RadioGroupContext from './context';
@@ -46,13 +47,17 @@ var InternalRadio = function InternalRadio(props, ref) {
       restProps = __rest(_a, ["style", "checked", "children", "className", "radioType", "defaultChecked", "prefixCls"]); // 属性需要合并一遍用户定义的默认属性
 
 
+  var getChecked = function getChecked() {
+    return isBoolean(checked) ? checked : defaultChecked;
+  };
+
   var getPrefix = function getPrefix(radioType) {
     return "radio".concat(radioType === 'square' ? "-".concat(radioType) : '');
   };
 
   var radioPrefixCls = getPrefixCls === null || getPrefixCls === void 0 ? void 0 : getPrefixCls(prefixCls, getPrefix(radioType), customPrefixcls); // 样式前缀
 
-  var _React$useState = React.useState(checked || defaultChecked),
+  var _React$useState = React.useState(getChecked()),
       _React$useState2 = _slicedToArray(_React$useState, 2),
       isChecked = _React$useState2[0],
       setIsChecked = _React$useState2[1];

package/es/tree/style/index.css

@@ -221,6 +221,19 @@
 .kd-tree-node-title-disabled {
   color: var(--kd-c-tree-node-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
 }
+.kd-tree-node-title-wrap {
+  -webkit-box-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+  position: relative;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+  height: 100%;
+}
 .kd-tree-node-title {
   white-space: nowrap;
   margin-left: 6px;
@@ -248,12 +261,28 @@
   width: 100%;
   height: 100%;
 }
+.kd-tree-node-drag-over {
+  background-color: var(--kd-c-tree-node-drag-over-color-background, #E3EBFF);
+  border: 2px solid var(--kd-c-tree-node-drag-over-color-border, #5582f3);
+}
 .kd-tree-node-drag-line {
   position: absolute;
   left: 0;
   top: 100%;
   width: 100%;
-  border-top: 1px solid #fc8555;
+  border-top: 2px solid var(--kd-c-tree-node-drag-line-color-background, #276FF5);
+}
+.kd-tree-node-drag-line::before {
+  content: '';
+  width: 4px;
+  height: 4px;
+  background-color: #fff;
+  border-radius: 50%;
+  border: 2px solid var(--kd-c-tree-node-drag-line-color-background, #276FF5);
+  position: absolute;
+  top: -1px;
+  -webkit-transform: translateY(-50%);
+          transform: translateY(-50%);
 }
 .kd-tree-node-leaf-icon {
   height: var(--kd-c-tree-node-icon-sizing-height, 20px);

package/es/tree/style/index.less

@@ -93,6 +93,13 @@
   &-title-disabled {
     color: @tree-node-disabled-color;
   }
+  &-title-wrap {
+    flex: 1;
+    position: relative;
+    display: flex;
+    align-items: center;
+    height: 100%;
+  }
   &-title {
     white-space: nowrap;
     margin-left: 6px;
@@ -118,12 +125,29 @@
     height: 100%;
   }
 
+  &-drag-over {
+    background-color: @tree-node-drag-over-color-background;
+    border: 2px solid @tree-node-drag-over-border-color;
+  }
+
   &-drag-line {
     position: absolute;
     left: 0;
     top: 100%;
     width: 100%;
-    border-top: 1px solid #fc8555;
+    border-top: 2px solid @tree-node-drag-line-border-color;
+
+    &::before {
+      content: '';
+      width: 4px;
+      height: 4px;
+      background-color: #fff;
+      border-radius: 50%;
+      border: 2px solid @tree-node-drag-line-border-color;
+      position: absolute;
+      top: -1px;
+      transform: translateY(-50%);
+    }
   }
   &-leaf-icon {
     height: @tree-node-icon-height;

package/es/tree/style/token.less

@@ -11,6 +11,9 @@
 @tree-node-checked-text-color: var(~'@{tree-prefix}-node-color-text-checked', @color-theme);
 @tree-node-hover-bg-color: var(~'@{tree-prefix}-node-color-backgroung-hover', @color-hover);
 @tree-node-icon-color-text: var(~'@{tree-prefix}-node-icon-color-text', #666666);
+@tree-node-drag-over-border-color: var(~'@{tree-prefix}-node-drag-over-color-border', #5582f3);
+@tree-node-drag-over-color-background: var(~'@{tree-prefix}-node-drag-over-color-background', #E3EBFF);
+@tree-node-drag-line-border-color: var(~'@{tree-prefix}-node-drag-line-color-background', #276FF5);
 
 // sizing
 @tree-expand-icon-height: var(~'@{tree-prefix}-expand-icon-sizing-height', 22px);

package/es/tree/tree.d.ts

@@ -12,6 +12,8 @@ export interface TreeProps {
     disabled?: boolean;
     draggable?: boolean;
     expandedKeys?: string[];
+    filterValue?: string;
+    filterTreeNode?: () => boolean;
     height?: number;
     icon?: ReactNode | ((props: any) => ReactNode);
     switcherIcon?: ReactNode | ((props: any) => ReactNode) | [ReactNode | ((props: any) => ReactNode)];

package/es/tree/tree.js

@@ -1,6 +1,8 @@
 import _extends from "@babel/runtime-corejs3/helpers/extends";
+import _toConsumableArray from "@babel/runtime-corejs3/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
+import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import React, { useContext, useCallback, useEffect } from 'react';
@@ -8,7 +10,7 @@ import classNames from 'classnames';
 import ConfigContext from '../config-provider/ConfigContext';
 import { getCompProps } from '../_utils';
 import TreeNode from './treeNode';
-import { getChecked, getHalfChecked, addKeys, flattenAll, delKey, getFilterData, getSpreadAttrData, getDataCheckededState, getDataCheckededStateStrictly, getMaxLevel, getAllChildKeys, getPos, getSelected } from './utils/treeUtils';
+import { getChecked, getHalfChecked, addKeys, flattenAll, delKey, getFilterData, getSpreadAttrData, getDataCheckededState, getDataCheckededStateStrictly, getMaxLevel, getAllChildKeys, getPos, getSelected, calcDropPosition } from './utils/treeUtils';
 import { useChecked, useExpand, usePlantomHeightEffect, useViewportHeight, useVisibleDataMemo, useScrollToKey, useSelect } from './treeHooks';
 import isBoolean from 'lodash/isBoolean';
 var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
@@ -58,7 +60,9 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
     return '';
   } : _TreeProps$setTreeNod2,
       innerEstimatedItemSize = TreeProps.estimatedItemSize,
-      style = TreeProps.style;
+      style = TreeProps.style,
+      filterTreeNode = TreeProps.filterTreeNode,
+      filterValue = TreeProps.filterValue;
   var treePrefixCls = getPrefixCls(prefixCls, 'tree', customPrefixcls); // 树样式前缀
 
   var treeNodePrefixCls = getPrefixCls(prefixCls, 'tree-node', customPrefixcls); // 树节点样式前缀
@@ -102,22 +106,34 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var scrollRef = ref || rootRef;
   var treeNodeRef = React.useRef(null);
   var dragNodeRef = React.useRef(null);
+  var delayedDragEnterRef = React.useRef(null);
 
   var _React$useState5 = React.useState(true),
       _React$useState6 = _slicedToArray(_React$useState5, 2),
       isInit = _React$useState6[0],
       setIsInit = _React$useState6[1];
 
-  var _useExpand = useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit),
-      _useExpand2 = _slicedToArray(_useExpand, 1),
-      expandedKeys = _useExpand2[0];
+  var _React$useState7 = React.useState(null),
+      _React$useState8 = _slicedToArray(_React$useState7, 2),
+      dropPosition = _React$useState8[0],
+      setDropPosition = _React$useState8[1];
+
+  var _React$useState9 = React.useState(null),
+      _React$useState10 = _slicedToArray(_React$useState9, 2),
+      dragOverNodeKey = _React$useState10[0],
+      setDragOverNodeKey = _React$useState10[1];
+
+  var _useExpand = useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, filterValue),
+      _useExpand2 = _slicedToArray(_useExpand, 2),
+      expandedKeys = _useExpand2[0],
+      setExpandedKeys = _useExpand2[1];
 
   var spreadAttrData = React.useMemo(function () {
     return getSpreadAttrData(flattenAllData, expandedKeys);
   }, [flattenAllData, expandedKeys]);
   var filterData = React.useMemo(function () {
-    return getFilterData(spreadAttrData);
-  }, [spreadAttrData]);
+    return getFilterData(spreadAttrData, filterTreeNode, filterValue);
+  }, [spreadAttrData, filterTreeNode, filterValue]);
 
   var _useViewportHeight = useViewportHeight(height, listRef),
       _useViewportHeight2 = _slicedToArray(_useViewportHeight, 1),
@@ -176,7 +192,15 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
       node: node
     });
   }, [onDragStart]);
-  var handleDragOver = React.useCallback(function (event, node) {
+  var handleDragOver = React.useCallback(function (event, node, dropTarget) {
+    var dropPos = calcDropPosition(event, dropTarget);
+    setDropPosition(dropPos);
+    var dragNode = getDragNode();
+
+    if (dragNode.key === node.key) {
+      setDropPosition(null);
+    }
+
     onDragOver && onDragOver({
       event: event,
       node: node
@@ -188,13 +212,52 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
       node: node
     });
   }, [onDragLeave]);
-  var handleDragEnter = React.useCallback(function (event, node) {
+  var handleDragEnter = React.useCallback(function (event, node, dropTarget) {
+    var key = node.key,
+        pos = node.pos;
+    var dragNode = getDragNode();
+
+    if (!dragNode) {
+      return;
+    }
+
+    if (!delayedDragEnterRef.current) {
+      delayedDragEnterRef.current = {};
+    }
+
+    _Object$keys(delayedDragEnterRef.current).forEach(function (key) {
+      clearTimeout(delayedDragEnterRef.current[key]);
+    });
+
+    if ((dragNode === null || dragNode === void 0 ? void 0 : dragNode.key) !== key) {
+      var dragPos = calcDropPosition(event, dropTarget);
+      setDragOverNodeKey(key);
+      setDropPosition(dragPos);
+      delayedDragEnterRef.current[pos] = setTimeout(function () {
+        var newExpandedKeys = _toConsumableArray(expandedKeys);
+
+        if (!node.expand) {
+          newExpandedKeys = addKeys(expandedKeys, [key]);
+        }
+
+        if (!('expandedKeys' in TreeProps)) {
+          setExpandedKeys(newExpandedKeys);
+        }
+
+        onExpand === null || onExpand === void 0 ? void 0 : onExpand(newExpandedKeys, {
+          node: node,
+          expanded: true
+        });
+      }, 800);
+    }
+
     onDragEnter && onDragEnter({
       event: event,
       node: node
     });
-  }, [onDragEnter]);
+  }, [TreeProps, expandedKeys, onDragEnter, onExpand, setExpandedKeys]);
   var handleDragEnd = React.useCallback(function (event, node) {
+    setDragOverNodeKey('');
     onDragEnd && onDragEnd({
       event: event,
       node: node
@@ -211,9 +274,10 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
       event: event,
       node: node,
       dragNode: dragNode,
-      keys: keys
+      dragNodesKeys: keys,
+      dropPosition: dropPosition
     });
-  }, [onDrop, flattenAllData]);
+  }, [flattenAllData, onDrop, dropPosition]);
   var handleSelect = React.useCallback(function (event, node, key) {
     var checked = getChecked(checkedKeys, key);
     onSelect && onSelect([key], {
@@ -300,6 +364,7 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
     item.style = setTreeNodeStyle(_extends({}, item));
     item.getDragNode = getDragNode;
     item.setDragNode = setDragNode;
+    item.dragOver = dragOverNodeKey === item.key && dropPosition === 0;
     return /*#__PURE__*/React.createElement(TreeNode, _extends({}, item, {
       key: item.key,
       ref: treeNodeRef

package/es/tree/treeHooks.d.ts

@@ -4,6 +4,6 @@ export declare const useViewportHeight: (height: number, listRef: React.RefObjec
 export declare const useVisibleDataMemo: (virtual: boolean, filterData: TreeNodeData[], viewportHeight: number, estimatedItemSize: number, start: number) => TreeNodeData[][];
 export declare const usePlantomHeightEffect: (plantomRef: React.RefObject<HTMLElement>, filterData: TreeNodeData[], estimatedItemSize: number) => void;
 export declare const useChecked: (checkStrictly: boolean, checkedKeysProps: string[], defaultCheckedKeys: string[], flattenAllData: any[], maxLevel: number, checkable: boolean) => readonly [string[], string[], React.Dispatch<React.SetStateAction<string[]>>, React.Dispatch<React.SetStateAction<string[]>>];
-export declare const useExpand: (flattenAllData: any[], expandedKeysProps: string[], defaultExpandedKeys: string[], defaultExpandAll: boolean, defaultExpandRoot: boolean, defaultExpandParent: boolean, scrollKey: string, isInit: boolean) => readonly [string[], React.Dispatch<React.SetStateAction<string[]>>];
+export declare const useExpand: (flattenAllData: any[], expandedKeysProps: string[], defaultExpandedKeys: string[], defaultExpandAll: boolean, defaultExpandRoot: boolean, defaultExpandParent: boolean, scrollKey: string, isInit: boolean, filterTreeNode: FunctionConstructor, filterValue: string) => readonly [string[], React.Dispatch<React.SetStateAction<string[]>>];
 export declare const useScrollToKey: (scrollKey: string, index: number, estimatedItemSize: number, scrollRef: any, viewportHeight: number, treeNodePrefixCls: string) => void;
 export declare const useSelect: (selectedKeysProps: string[], defaultSelectedKeys: string[]) => readonly [string[], React.Dispatch<React.SetStateAction<string[]>>];

package/es/tree/treeHooks.js

@@ -64,7 +64,7 @@ export var useChecked = function useChecked(checkStrictly, checkedKeysProps, def
   }, [nextHalfCheckedKeys]);
   return [checkedKeys, halfCheckedKeys, setCheckedKeys, setHalfCheckedKeys];
 };
-export var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit) {
+export var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, filterValue) {
   var expandScrollkeys = [];
 
   if (scrollKey) {
@@ -73,8 +73,8 @@ export var useExpand = function useExpand(flattenAllData, expandedKeysProps, def
   }
 
   var initialExpandedKeys = React.useMemo(function () {
-    return getInitExpandedKeys(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys);
-  }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey]);
+    return getInitExpandedKeys(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, filterValue);
+  }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, filterValue]);
   var newExpandedKeys = React.useMemo(function () {
     return getExpandedKeys(expandedKeysProps, expandScrollkeys);
   }, [expandedKeysProps]);

package/es/tree/treeNode.d.ts

@@ -24,6 +24,7 @@ export interface TreeNodeProps {
     checked?: boolean;
     pos?: string;
     estimatedItemSize?: number;
+    dragOver?: boolean;
     onCheck?: (key: string, value: boolean, node: React.ReactNode, event: React.MouseEvent<MouseEvent>, pos: string) => void;
     onSelect?: (event: React.MouseEvent<MouseEvent>, node: React.ReactNode, key: string) => void;
     onExpand?: (value: boolean, node: React.ReactNode) => void;