🐛 fix Tree switcherIcon prop not working when showLine

close #18810
ant-design · Sep 16, 2019 · 7b38632 · 7b38632
1 parent 9ea143b
commit 7b38632
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/components/tree/Tree.tsx b/components/tree/Tree.tsx
@@ -194,28 +194,28 @@ export default class Tree extends React.Component<TreeProps, any> {
     if (loading) {
       return <Icon type="loading" className={`${prefixCls}-switcher-loading-icon`} />;
     }
-    if (showLine) {
-      if (isLeaf) {
+    if (isLeaf) {
+      if (showLine) {
         return <Icon type="file" className={`${prefixCls}-switcher-line-icon`} />;
       }
-      return (
-        <Icon
-          type={expanded ? 'minus-square' : 'plus-square'}
-          className={`${prefixCls}-switcher-line-icon`}
-          theme="outlined"
-        />
-      );
-    }
-    const switcherCls = `${prefixCls}-switcher-icon`;
-    if (isLeaf) {
       return null;
     }
+    const switcherCls = `${prefixCls}-switcher-icon`;
     if (switcherIcon) {
       const switcherOriginCls = switcherIcon.props.className || '';
       return React.cloneElement(switcherIcon, {
         className: classNames(switcherOriginCls, switcherCls),
       });
     }
+    if (showLine) {
+      return (
+        <Icon
+          type={expanded ? 'minus-square' : 'plus-square'}
+          className={`${prefixCls}-switcher-line-icon`}
+          theme="outlined"
+        />
+      );
+    }
     return <Icon type="caret-down" className={switcherCls} theme="filled" />;
   };