🐛 fix Tree switcherIcon shown in leaf node (#20753)

close #20511
ant-design · Jan 8, 2020 · 041b743 · 041b743
1 parent 539b4cd
commit 041b743
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/components/tree/__tests__/index.test.js b/components/tree/__tests__/index.test.js
@@ -30,4 +30,16 @@ describe('Tree', () => {
     );
     expect(wrapper.render()).toMatchSnapshot();
   });
+
+  it('switcherIcon in Tree should not render at leaf nodes', () => {
+    const wrapper = mount(
+      <Tree switcherIcon={<i className="switcherIcon" />} defaultExpandAll>
+        <TreeNode icon="icon">
+          <TreeNode id="node1" title="node1" icon="icon" key="0-0-2" />
+          <TreeNode id="node2" title="node2" key="0-0-3" />
+        </TreeNode>
+      </Tree>,
+    );
+    expect(wrapper.find('.switcherIcon').length).toBe(1);
+  });
 });
diff --git a/components/tree/utils/iconUtil.tsx b/components/tree/utils/iconUtil.tsx
@@ -19,16 +19,12 @@ export default function renderSwitcherIcon(
     return <LoadingOutlined className={`${prefixCls}-switcher-loading-icon`} />;
   }
   if (isLeaf) {
-    if (showLine) {
-      return <FileOutlined className={`${prefixCls}-switcher-line-icon`} />;
-    }
-    return null;
+    return showLine ? <FileOutlined className={`${prefixCls}-switcher-line-icon`} /> : null;
   }
   const switcherCls = `${prefixCls}-switcher-icon`;
   if (React.isValidElement(switcherIcon)) {
-    const switcherOriginCls = switcherIcon.props.className || '';
     return React.cloneElement(switcherIcon, {
-      className: classNames(switcherOriginCls, switcherCls),
+      className: classNames(switcherIcon.props.className || '', switcherCls),
     });
   }