From 8c5a23f377c454134585ecc365ddc11d87f03a8f Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Tue, 17 Aug 2021 22:52:28 +0800
Subject: [PATCH] refactor: tree

---
 components/tree/Tree.tsx           |  5 +++--
 components/vc-tree/Tree.tsx        |  3 ++-
 components/vc-tree/TreeNode.tsx    | 24 +++++++++++++++++++-----
 components/vc-tree/contextTypes.ts |  1 +
 components/vc-tree/interface.tsx   |  1 +
 5 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/components/tree/Tree.tsx b/components/tree/Tree.tsx
index aa0f9a54b..850e0f386 100644
--- a/components/tree/Tree.tsx
+++ b/components/tree/Tree.tsx
@@ -1,4 +1,4 @@
-import type { VNode, PropType, DefineComponent, ExtractPropTypes } from 'vue';
+import type { VNode, PropType, DefineComponent, ExtractPropTypes, CSSProperties } from 'vue';
 import { ref } from 'vue';
 import { defineComponent } from 'vue';
 import classNames from '../_util/classNames';
@@ -16,7 +16,7 @@ import dropIndicatorRender from './utils/dropIndicator';
 export interface AntdTreeNodeAttribute {
   eventKey: string;
   prefixCls: string;
-  className: string;
+  class: string;
   expanded: boolean;
   selected: boolean;
   checked: boolean;
@@ -239,6 +239,7 @@ export default defineComponent({
           onExpand={handleExpand}
           onSelect={handleSelect}
           v-slots={{
+            ...slots,
             checkable: () => <span class={`${prefixCls.value}-checkbox-inner`} />,
           }}
           children={filterEmpty(slots.default?.())}
diff --git a/components/vc-tree/Tree.tsx b/components/vc-tree/Tree.tsx
index 182ed78fd..3f71b860c 100644
--- a/components/vc-tree/Tree.tsx
+++ b/components/vc-tree/Tree.tsx
@@ -1046,13 +1046,14 @@ export default defineComponent({
             onNodeDragLeave,
             onNodeDragEnd,
             onNodeDrop,
+            slots: slots,
           }}
         >
           <div
             role="tree"
             class={classNames(prefixCls, className, {
               [`${prefixCls}-show-line`]: showLine,
-              [`${prefixCls}-focused`]: focused,
+              [`${prefixCls}-focused`]: focused.value,
               [`${prefixCls}-active-focused`]: activeKey.value !== null,
             })}
           >
diff --git a/components/vc-tree/TreeNode.tsx b/components/vc-tree/TreeNode.tsx
index 1a03081c3..83a70d556 100644
--- a/components/vc-tree/TreeNode.tsx
+++ b/components/vc-tree/TreeNode.tsx
@@ -5,6 +5,7 @@ import { convertNodePropsToEventData } from './utils/treeUtil';
 import { computed, defineComponent, getCurrentInstance, onMounted, onUpdated, ref } from 'vue';
 import { treeNodeProps } from './props';
 import classNames from '../_util/classNames';
+import { warning } from '../vc-util/warning';
 
 const ICON_OPEN = 'open';
 const ICON_CLOSE = 'close';
@@ -17,7 +18,11 @@ export default defineComponent({
   props: treeNodeProps,
   isTreeNode: 1,
   slots: ['title', 'icon', 'switcherIcon', 'checkable'],
-  setup(props, { attrs, expose, slots }) {
+  setup(props, { attrs, slots }) {
+    warning(
+      !('slots' in props.data),
+      'treeData slots is deprecated, please use `v-slot:icon` or `v-slot:title`, `v-slot:switcherIcon` instead',
+    );
     const dragNodeHighlight = ref(false);
     const context = useInjectTreeContext();
     const instance = getCurrentInstance();
@@ -198,7 +203,10 @@ export default defineComponent({
     };
 
     const renderSwitcherIconDom = (isLeaf: boolean) => {
-      const { switcherIcon: switcherIconFromProps = slots.switcherIcon } = props;
+      const {
+        switcherIcon: switcherIconFromProps = slots.switcherIcon ||
+          context.value.slots?.[props.data?.slots?.switcherIcon],
+      } = props;
       const { switcherIcon: switcherIconFromCtx } = context.value;
 
       const switcherIcon = switcherIconFromProps || switcherIconFromCtx;
@@ -327,7 +335,13 @@ export default defineComponent({
 
     // Icon + Title
     const renderSelector = () => {
-      const { title = slots.title, selected, icon = slots.icon, loading, data } = props;
+      const {
+        title = slots.title || context.value.slots?.[props.data?.slots?.title],
+        selected,
+        icon = slots.icon,
+        loading,
+        data,
+      } = props;
       const {
         prefixCls,
         showIcon,
@@ -345,7 +359,7 @@ export default defineComponent({
       let $icon;
 
       if (showIcon) {
-        const currentIcon = icon || treeIcon;
+        const currentIcon = icon || context.value.slots?.[data?.slots?.icon] || treeIcon;
 
         $icon = currentIcon ? (
           <span class={classNames(`${prefixCls}-iconEle`, `${prefixCls}-icon__customize`)}>
@@ -377,7 +391,7 @@ export default defineComponent({
           class={classNames(
             `${wrapClass}`,
             `${wrapClass}-${nodeState.value || 'normal'}`,
-            !disabled && (selected || dragNodeHighlight) && `${prefixCls}-node-selected`,
+            !disabled && (selected || dragNodeHighlight.value) && `${prefixCls}-node-selected`,
             !disabled && mergedDraggable && 'draggable',
           )}
           draggable={(!disabled && mergedDraggable) || undefined}
diff --git a/components/vc-tree/contextTypes.ts b/components/vc-tree/contextTypes.ts
index 995bf16c8..0ec4d032f 100644
--- a/components/vc-tree/contextTypes.ts
+++ b/components/vc-tree/contextTypes.ts
@@ -80,6 +80,7 @@ export interface TreeContextProps {
   onNodeDragLeave: NodeDragEventHandler;
   onNodeDragEnd: NodeDragEventHandler;
   onNodeDrop: NodeDragEventHandler;
+  slots: Record<string, any>;
 }
 const TreeContextKey: InjectionKey<ComputedRef<TreeContextProps>> = Symbol('TreeContextKey');
 
diff --git a/components/vc-tree/interface.tsx b/components/vc-tree/interface.tsx
index 6685424b0..89fbb8904 100644
--- a/components/vc-tree/interface.tsx
+++ b/components/vc-tree/interface.tsx
@@ -16,6 +16,7 @@ export interface DataNode {
   /** Set style of TreeNode. This is not recommend if you don't have any force requirement */
   class?: string;
   style?: CSSProperties;
+  slots?: Record<string, string>;
 }
 
 export interface EventDataNode extends DataNode {