@kdcloudjs/kdesign 1.4.0 → 1.5.1

package/es/carousel/carousel.js

@@ -91,7 +91,7 @@ var InternalCarousel = function InternalCarousel(props, ref) {
       setCurrentIndex(index);
       setNeedAnimation(needAnimation);
     }
-  }, [isFadeEffect, beforeChange, currentIndex, children.length]);
+  }, [isFadeEffect, beforeChange, currentIndex, children === null || children === void 0 ? void 0 : children.length]);
   var next = React.useCallback(function () {
     jumpTo(currentIndex + 1, true);
   }, [currentIndex, jumpTo]);
@@ -181,7 +181,7 @@ var InternalCarousel = function InternalCarousel(props, ref) {
     setNeedAnimation(true);
   }, [beforeChange, currentIndex]);
   var handleTransitionEnd = React.useCallback(function () {
-    if (!autoplay) return;
+    if (!autoplay || !(children === null || children === void 0 ? void 0 : children.length)) return;
     var childrenL = children.length;
     var newCurrentIndex = currentIndex;
 
@@ -198,7 +198,7 @@ var InternalCarousel = function InternalCarousel(props, ref) {
     afterChange && afterChange(currentIndex);
     setCurrentIndex(newCurrentIndex);
     isScrollxEffect && setNeedAnimation(false);
-  }, [currentIndex, children.length, afterChange, isScrollxEffect, autoplay]);
+  }, [currentIndex, children === null || children === void 0 ? void 0 : children.length, afterChange, isScrollxEffect, autoplay]);
   var handleMouseEnter = React.useCallback(function () {
     autoplayRef.current && clearTimeout(autoplayRef.current);
   }, []);
@@ -246,7 +246,7 @@ var InternalCarousel = function InternalCarousel(props, ref) {
     style: style,
     onMouseEnter: handleMouseEnter,
     onMouseLeave: handleMouseLeave
-  }, renderDisplayList(), showDot() && /*#__PURE__*/React.createElement(Slidebar, {
+  }, (children === null || children === void 0 ? void 0 : children.length) && renderDisplayList(), (children === null || children === void 0 ? void 0 : children.length) && showDot() && /*#__PURE__*/React.createElement(Slidebar, {
     number: children.length,
     currentIndex: currentIndex,
     dotsClassName: dots,

package/es/config-provider/compDefaultProps.d.ts

@@ -210,7 +210,6 @@ declare const compDefaultProps: {
         strokeWidth: number;
     };
     Radio: {
-        checked: boolean;
         defaultChecked: boolean;
         disabled: boolean;
     };

package/es/config-provider/compDefaultProps.js

@@ -217,7 +217,6 @@ var compDefaultProps = {
     strokeWidth: 4
   },
   Radio: {
-    checked: false,
     defaultChecked: false,
     disabled: false
   },

package/es/date-picker/range-picker.d.ts

@@ -17,6 +17,7 @@ export interface RangePickerSharedProps {
     ranges?: Record<string, DateType[] | (() => DateType[])>;
     separator?: React.ReactNode;
     allowEmpty?: [boolean, boolean];
+    suffixIcon?: React.ReactNode;
     mode?: [PanelMode, PanelMode];
     onChange?: (values: RangeValue, formatString: [string | null, string | null]) => void;
     onCalendarChange?: (values: RangeValue, formatString: [string | null, string | null], info: RangeInfo) => void;

package/es/date-picker/range-picker.js

@@ -104,6 +104,7 @@ function DatePicker(props) {
       minuteStep = _datePickerProps$minu === void 0 ? 1 : _datePickerProps$minu,
       _datePickerProps$seco = datePickerProps.secondStep,
       secondStep = _datePickerProps$seco === void 0 ? 1 : _datePickerProps$seco,
+      suffixIcon = datePickerProps.suffixIcon,
       renderExtraFooter = datePickerProps.renderExtraFooter,
       disabledHours = datePickerProps.disabledHours,
       disabledMinutes = datePickerProps.disabledMinutes,
@@ -675,6 +676,7 @@ function DatePicker(props) {
     startOpen: startOpen,
     endOpen: endOpen,
     needConfirmButton: needConfirmButton,
+    suffixIcon: suffixIcon,
     format: _format,
     open: mergedOpen,
     readOnly: inputReadOnly,

package/es/date-picker/style/index.css

@@ -128,7 +128,7 @@
   right: calc(var(--kd-c-date-picker-small-font-size, var(--kd-g-font-size-small, 12px)) + 1px);
 }
 .kd-date-picker-small.kd-date-picker-range .kd-date-picker-clear {
-  right: calc(var(--kd-c-date-picker-small-font-size, var(--kd-g-font-size-small, 12px)) + 9px);
+  right: calc(var(--kd-c-date-picker-small-font-size, var(--kd-g-font-size-small, 12px)) + 12px);
 }
 .kd-date-picker-large {
   height: var(--kd-c-date-picker-large-sizing-height, 36px);
@@ -158,7 +158,7 @@
   right: calc(var(--kd-c-date-picker-middle-font-size, var(--kd-g-font-size-middle, 14px)) + 1px);
 }
 .kd-date-picker-middle.kd-date-picker-range .kd-date-picker-clear {
-  right: calc(var(--kd-c-date-picker-middle-font-size, var(--kd-g-font-size-middle, 14px)) + 9px);
+  right: calc(var(--kd-c-date-picker-middle-font-size, var(--kd-g-font-size-middle, 14px)) + 11px);
 }
 .kd-date-picker-borderless {
   border: 0;
@@ -276,7 +276,7 @@
   -ms-flex-item-align: center;
       align-self: center;
   margin-left: var(--kd-c-date-picker-suffix-spacing-margin-left, 10px);
-  color: var(--kd-c-date-picker-icon-color, var(--kd-g-color-disabled, #b2b2b2));
+  color: var(--kd-c-date-picker-input-color, var(--kd-g-color-text-secondary, #666));
   line-height: 1;
   pointer-events: none;
 }
@@ -286,6 +286,9 @@
 .kd-date-picker:hover .kd-date-picker-clear {
   opacity: 1;
 }
+.kd-date-picker:hover .kd-date-picker-suffix {
+  color: var(--kd-c-date-picker-color-background-checked, var(--kd-g-color-theme, #5582f3));
+}
 .kd-date-picker-clear {
   position: absolute;
   top: 50%;

package/es/date-picker/style/index.less

@@ -27,7 +27,7 @@
     }
 
     &.@{datePicker-prefix-cls}-range .@{datePicker-prefix-cls}-clear {
-      right: calc(@date-small-font-size + 9px);
+      right: calc(@date-small-font-size + 12px);
     }
   }
 
@@ -59,7 +59,7 @@
     }
 
     &.@{datePicker-prefix-cls}-range .@{datePicker-prefix-cls}-clear {
-      right: calc(@date-middle-font-size + 9px);
+      right: calc(@date-middle-font-size + 11px);
     }
   }
 
@@ -131,7 +131,7 @@
   &-suffix {
     align-self: center;
     margin-left: @date-suffix-spacing-margin-left;
-    color: @date-icon-color;
+    color: @date-input-color;
     line-height: 1;
     pointer-events: none;
 
@@ -144,6 +144,10 @@
     .@{datePicker-prefix-cls}-clear {
       opacity: 1;
     }
+
+    .@{datePicker-prefix-cls}-suffix {
+      color: @date-color-background-checked;
+    }
   }
 
   &-clear {

package/es/dropdown/style/index.css

@@ -229,6 +229,9 @@
 .kd-dropdown-menu-item:not(.disabled):hover {
   background-color: var(--kd-c-dropdown-item-color-background-hover, var(--kd-g-color-hover, #f5f5f5));
 }
+.kd-dropdown-menu-item:not(.disabled):hover > a {
+  color: var(--kd-c-dropdown-item-color-text-hover, var(--kd-g-color-text-primary, #212121));
+}
 .kd-dropdown-menu-item:not(.disabled):active,
 .kd-dropdown-menu-item:not(.disabled).selected {
   color: var(--kd-g-color-theme, #5582f3);

package/es/dropdown/style/index.less

@@ -72,6 +72,10 @@
       transition: background-color @duration-promptly;
       &:not(.disabled):hover {
         background-color: @dropdown-item-hover-bg-color;
+
+        > a {
+          color: @dropdown-item-hover-color-text;
+        }
       }
 
       &:not(.disabled):active,

package/es/dropdown/style/token.less

@@ -8,6 +8,7 @@
 @dropdown-item-color-disabled: var(~'@{dropdown-custom-prefix}-item-color-text-disabled', @color-disabled);
 @dropdown-item-color-text-danger: var(~'@{dropdown-custom-prefix}-item-color-text-danger', @color-error);
 @dropdown-item-color-background-danger-hover: var(~'@{dropdown-custom-prefix}-item-color-background-danger-hover', @color-error);
+@dropdown-item-hover-color-text: var(~'@{dropdown-custom-prefix}-item-color-text-hover', @color-text-primary);
 @dropdown-divided-color-bg: var(~'@{dropdown-custom-prefix}-divided-color-background', @color-border-weak);
 @dropdown-color: var(~'@{dropdown-custom-prefix}-menu-item-color-text', @color-text-primary);
 

package/es/input/style/index.css

@@ -356,6 +356,10 @@ textarea {
 .kd-input-wrapper-focused {
   border-color: var(--kd-c-input-color-border-focused, var(--kd-g-color-theme, #5582f3));
 }
+.kd-input-wrapper-focused .kd-input-clear-icon,
+.kd-input-wrapper-focused .kd-input-textarea-clear-icon {
+  color: var(--kd-c-input-color-border-focused, var(--kd-g-color-theme, #5582f3));
+}
 .kd-input-wrapper-textarea {
   width: 100%;
   min-width: 0;
@@ -404,6 +408,10 @@ textarea {
 .kd-input-clear-icon,
 .kd-input-textarea-clear-icon {
   cursor: pointer;
+  color: var(--kd-c-input-color-border, #999);
+}
+.kd-input-clear-icon:hover,
+.kd-input-textarea-clear-icon:hover {
   color: var(--kd-c-input-color-border-focused, var(--kd-g-color-theme, #5582f3));
 }
 .kd-input-clear-icon i,

package/es/input/style/index.less

@@ -121,6 +121,10 @@ textarea {
 
 		&-focused {
 			border-color: @input-border-color-focused;
+
+      .@{input-prefix-cls}-clear-icon, .@{input-prefix-cls}-textarea-clear-icon {
+        color: @input-border-color-focused;
+      }
 		}
 	}
 	&-wrapper-textarea {

package/es/input/style/mixin.less

@@ -47,7 +47,12 @@
 
 .input-clear-icon() {
   cursor: pointer;
-  color: @input-border-color-focused;
+  color: @input-color-border;
+
+  &:hover {
+    color: @input-border-color-focused;
+  }
+
   i {
     vertical-align: middle;
     font-size: 12px !important;

package/es/menu/menu.d.ts

@@ -15,6 +15,7 @@ export interface MenuProps extends React.HTMLAttributes<HTMLElement> {
     additionalTools?: React.ReactNode;
     onOpenChange?: SubMenuChangeEventHandler;
     theme?: MenuTheme;
+    accordion?: boolean;
 }
 interface MenuType extends React.FC<MenuProps> {
     Item: typeof MenuItem;

package/es/menu/menu.js

@@ -60,10 +60,12 @@ var Menu = function Menu(props) {
       className = _b.className,
       theme = _b.theme,
       collapsed = _b.collapsed,
-      restProps = __rest(_b, ["prefixCls", "mode", "inlineIndent", "forceSubMenuRender", "additionalTools", "onClick", "onOpenChange", "children", "className", "theme", "collapsed"]);
+      accordion = _b.accordion,
+      restProps = __rest(_b, ["prefixCls", "mode", "inlineIndent", "forceSubMenuRender", "additionalTools", "onClick", "onOpenChange", "children", "className", "theme", "collapsed", "accordion"]);
 
   var prefixCls = getPrefixCls(pkgPrefixCls, 'menu', customPrefixcls);
   devWarning(['inline', 'vertical', undefined].indexOf(mode) === -1, 'menu', "cannot found menu mode '".concat(mode, "'"));
+  devWarning(mode !== 'inline' && accordion !== undefined, 'menu', "'accordion' is valid only in mode='inline'");
 
   var _React$useState = React.useState(''),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -98,17 +100,12 @@ var Menu = function Menu(props) {
   useEffect(function () {
     if (userOpenKeys !== undefined && Array.isArray(userOpenKeys)) {
       setOpenKeys(userOpenKeys);
-    }
-  }, [userOpenKeys]);
-  useEffect(function () {
-    if (userSelectedKey !== undefined && userOpenKeys !== undefined && Array.isArray(userOpenKeys)) {
-      setTimeout(function () {
-        userOpenKeys.forEach(function (d) {
-          openSubMenuSet.add(d);
-        });
+      openSubMenuSet.clear();
+      userOpenKeys.forEach(function (d) {
+        openSubMenuSet.add(d);
       });
     }
-  }, []);
+  }, [userOpenKeys]);
 
   var handleOnClick = function handleOnClick(info) {
     if (userSelectedKey === undefined) {
@@ -142,6 +139,10 @@ var Menu = function Menu(props) {
     if (clean) {
       openSubMenuSet.clear();
     } else {
+      if (mode === 'inline' && accordion) {
+        openSubMenuSet.clear();
+      }
+
       if (isAdd) {
         openSubMenuSet.add(openKey);
       } else {

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/table/table.js

@@ -48,7 +48,10 @@ function Table(props) {
       getTableProps = props.getTableProps,
       contextMenu = props.contextMenu,
       rangeSelection = props.rangeSelection,
-      cssVariables = props.cssVariables;
+      cssVariables = props.cssVariables,
+      stickyScrollHeight = props.stickyScrollHeight,
+      scrollbarWidth = props.scrollbarWidth,
+      scrollLoad = props.scrollLoad;
 
   var _useContext = useContext(ConfigContext),
       getPrefixCls = _useContext.getPrefixCls,
@@ -127,7 +130,10 @@ function Table(props) {
     hasHeader: hasHeader,
     useOuterBorder: useOuterBorder,
     defaultColumnWidth: defaultColumnWidth,
-    cssVariables: cssVariables
+    cssVariables: cssVariables,
+    stickyScrollHeight: stickyScrollHeight,
+    scrollbarWidth: scrollbarWidth,
+    scrollLoad: scrollLoad
   }));
 }
 

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;