test/ant-design
1
0
Fork 0
mirror of https://gitee.com/ant-design/ant-design.git synced 2024-12-01 03:29:39 +08:00
Code Issues Actions 69 Packages Projects Releases Wiki Activity

🐛 fix Tree switcherIcon prop not working when showLine

Browse Source 
close #18810
This commit is contained in:
MrHeer 2019-09-16 19:08:46 +08:00 committed by 偏右
parent 02ed4bd6b1
commit 0e52f9a891
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
components/tree/Tree.tsx
View File

@ -194,10 +194,20 @@ 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 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'}
@ -206,16 +216,6 @@ export default class Tree extends React.Component<TreeProps, any> {
/>
);
}
const switcherCls = `${prefixCls}-switcher-icon`;
if (isLeaf) {
return null;
}
if (switcherIcon) {
const switcherOriginCls = switcherIcon.props.className || '';
return React.cloneElement(switcherIcon, {
className: classNames(switcherOriginCls, switcherCls),
});
}
return <Icon type="caret-down" className={switcherCls} theme="filled" />;
};