Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: expand prop showLeafIcon for showLine in Tree Component #25067

Merged
merged 9 commits into from
Jun 28, 2020
Merged

feat: expand prop showLeafIcon for showLine in Tree Component #25067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d4384c4
feat: add type
fireairforce Jun 16, 2020
3044ed1
feat: adjust
fireairforce Jun 23, 2020
b7e506d
add css
fireairforce Jun 24, 2020
e900f40
update
fireairforce Jun 24, 2020
9faaf64
update snapshot
fireairforce Jun 25, 2020
cfc0804
adjust css
fireairforce Jun 25, 2020
b7cda21
resolve confilct
fireairforce Jun 28, 2020
c47712f
update rc-tree-select
fireairforce Jun 28, 2020
d211d8a
update
fireairforce Jun 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 12 additions & 12 deletions components/config-provider/__tests__/__snapshots__/components.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36299,7 +36299,7 @@ exports[`ConfigProvider components Tree configProvider 1`] = `
style="display:flex;flex-direction:column"
>
<div
class="config-tree-treenode config-tree-treenode-switcher-close"
class="config-tree-treenode config-tree-treenode-switcher-close config-tree-treenode-leaf-last"
>
<span
class="config-tree-switcher config-tree-switcher-noop"
Expand Down Expand Up @@ -36340,7 +36340,7 @@ exports[`ConfigProvider components Tree configProvider 1`] = `
style="display:flex;flex-direction:column"
>
<div
class="config-tree-treenode config-tree-treenode-switcher-close"
class="config-tree-treenode config-tree-treenode-switcher-close config-tree-treenode-leaf-last"
>
<span
class="config-tree-switcher config-tree-switcher-noop"
Expand Down Expand Up @@ -36410,7 +36410,7 @@ exports[`ConfigProvider components Tree configProvider componentSize large 1`] =
style="display:flex;flex-direction:column"
>
<div
class="config-tree-treenode config-tree-treenode-switcher-close"
class="config-tree-treenode config-tree-treenode-switcher-close config-tree-treenode-leaf-last"
>
<span
class="config-tree-switcher config-tree-switcher-noop"
Expand Down Expand Up @@ -36451,7 +36451,7 @@ exports[`ConfigProvider components Tree configProvider componentSize large 1`] =
style="display:flex;flex-direction:column"
>
<div
class="config-tree-treenode config-tree-treenode-switcher-close"
class="config-tree-treenode config-tree-treenode-switcher-close config-tree-treenode-leaf-last"
>
<span
class="config-tree-switcher config-tree-switcher-noop"
Expand Down Expand Up @@ -36521,7 +36521,7 @@ exports[`ConfigProvider components Tree configProvider componentSize middle 1`]
style="display:flex;flex-direction:column"
>
<div
class="config-tree-treenode config-tree-treenode-switcher-close"
class="config-tree-treenode config-tree-treenode-switcher-close config-tree-treenode-leaf-last"
>
<span
class="config-tree-switcher config-tree-switcher-noop"
Expand Down Expand Up @@ -36562,7 +36562,7 @@ exports[`ConfigProvider components Tree configProvider componentSize middle 1`]
style="display:flex;flex-direction:column"
>
<div
class="config-tree-treenode config-tree-treenode-switcher-close"
class="config-tree-treenode config-tree-treenode-switcher-close config-tree-treenode-leaf-last"
>
<span
class="config-tree-switcher config-tree-switcher-noop"
Expand Down Expand Up @@ -36632,7 +36632,7 @@ exports[`ConfigProvider components Tree configProvider virtual and dropdownMatch
style="display:flex;flex-direction:column"
>
<div
class="ant-tree-treenode ant-tree-treenode-switcher-close"
class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
>
<span
class="ant-tree-switcher ant-tree-switcher-noop"
Expand Down Expand Up @@ -36673,7 +36673,7 @@ exports[`ConfigProvider components Tree configProvider virtual and dropdownMatch
style="display:flex;flex-direction:column"
>
<div
class="ant-tree-treenode ant-tree-treenode-switcher-close"
class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
>
<span
class="ant-tree-switcher ant-tree-switcher-noop"
Expand Down Expand Up @@ -36743,7 +36743,7 @@ exports[`ConfigProvider components Tree normal 1`] = `
style="display:flex;flex-direction:column"
>
<div
class="ant-tree-treenode ant-tree-treenode-switcher-close"
class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
>
<span
class="ant-tree-switcher ant-tree-switcher-noop"
Expand Down Expand Up @@ -36784,7 +36784,7 @@ exports[`ConfigProvider components Tree normal 1`] = `
style="display:flex;flex-direction:column"
>
<div
class="ant-tree-treenode ant-tree-treenode-switcher-close"
class="ant-tree-treenode ant-tree-treenode-switcher-close ant-tree-treenode-leaf-last"
>
<span
class="ant-tree-switcher ant-tree-switcher-noop"
Expand Down Expand Up @@ -36854,7 +36854,7 @@ exports[`ConfigProvider components Tree prefixCls 1`] = `
style="display:flex;flex-direction:column"
>
<div
class="prefix-Tree-treenode prefix-Tree-treenode-switcher-close"
class="prefix-Tree-treenode prefix-Tree-treenode-switcher-close prefix-Tree-treenode-leaf-last"
>
<span
class="prefix-Tree-switcher prefix-Tree-switcher-noop"
Expand Down Expand Up @@ -36895,7 +36895,7 @@ exports[`ConfigProvider components Tree prefixCls 1`] = `
style="display:flex;flex-direction:column"
>
<div
class="prefix-Tree-treenode prefix-Tree-treenode-switcher-close"
class="prefix-Tree-treenode prefix-Tree-treenode-switcher-close prefix-Tree-treenode-leaf-last"
>
<span
class="prefix-Tree-switcher prefix-Tree-switcher-noop"
Expand Down
51 changes: 30 additions & 21 deletions components/tabs/__tests__/__snapshots__/demo.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,33 +405,42 @@ exports[`renders ./components/tabs/demo/centered.md correctly 1`] = `
class="ant-tabs-nav-list"
style="transform:translate(0px, 0px)"
>
<button
aria-selected="true"
<div
class="ant-tabs-tab ant-tabs-tab-active"
role="tab"
tabindex="0"
type="button"
>
Tab 1
</button>
<button
aria-selected="false"
<div
aria-selected="true"
class="ant-tabs-tab-btn"
role="tab"
tabindex="0"
>
Tab 1
</div>
</div>
<div
class="ant-tabs-tab"
role="tab"
tabindex="0"
type="button"
>
Tab 2
</button>
<button
aria-selected="false"
<div
aria-selected="false"
class="ant-tabs-tab-btn"
role="tab"
tabindex="0"
>
Tab 2
</div>
</div>
<div
class="ant-tabs-tab"
role="tab"
tabindex="0"
type="button"
>
Tab 3
</button>
<div
aria-selected="false"
class="ant-tabs-tab-btn"
role="tab"
tabindex="0"
>
Tab 3
</div>
</div>
<div
class="ant-tabs-ink-bar ant-tabs-ink-bar-animated"
/>
Expand Down
4 changes: 2 additions & 2 deletions components/transfer/__tests__/__snapshots__/demo.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4446,7 +4446,7 @@ exports[`renders ./components/transfer/demo/tree-transfer.md correctly 1`] = `
</span>
</div>
<div
class="ant-tree-treenode ant-tree-treenode-switcher-open"
class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
>
<span
aria-hidden="true"
Expand Down Expand Up @@ -4478,7 +4478,7 @@ exports[`renders ./components/transfer/demo/tree-transfer.md correctly 1`] = `
</span>
</div>
<div
class="ant-tree-treenode ant-tree-treenode-switcher-open"
class="ant-tree-treenode ant-tree-treenode-switcher-open ant-tree-treenode-leaf-last"
>
<span
class="ant-tree-switcher ant-tree-switcher-noop"
Expand Down
10 changes: 7 additions & 3 deletions components/tree/Tree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ export interface AntTreeNodeDropEvent {
// [Legacy] Compatible for v3
export type TreeNodeNormal = DataNode;

export interface TreeProps extends Omit<RcTreeProps, 'prefixCls'> {
showLine?: boolean;
export interface TreeProps extends Omit<RcTreeProps, 'prefixCls' | 'showLine'> {
showLine?: boolean | { showLeafIcon: boolean };
className?: string;
/** 是否支持多选 */
multiple?: boolean;
Expand Down Expand Up @@ -153,13 +153,17 @@ const Tree = React.forwardRef<RcTree, TreeProps>((props, ref) => {
children,
checkable,
} = props;
const newProps = {
...props,
showLine: Boolean(showLine),
};
const prefixCls = getPrefixCls('tree', customizePrefixCls);
return (
<RcTree
itemHeight={20}
ref={ref}
virtual={virtual}
{...props}
{...newProps}
prefixCls={prefixCls}
className={classNames(className, {
[`${prefixCls}-icon-hide`]: !showIcon,
Expand Down