close
Skip to content

feat: Add classname to distinguish between leaf nodes or parent nodes #912

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

Merged
zombieJ merged 11 commits into from
Jan 7, 2025
Merged

feat: Add classname to distinguish between leaf nodes or parent nodes #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
06fd390
feat：给tree的叶子节点增加一个class，供使用者识别选中
Jan 3, 2025
7d8015b
feat:增加节点标识
Jan 3, 2025
071b8c5
feat：取消parent节点标记
Jan 3, 2025
ee76020
feat：添加测试文件，更新快照
Jan 3, 2025
fe22c13
feat:let -> const
Jan 3, 2025
f4a80f0
feat：判断变量使用已有的
Jan 3, 2025
b3c9ee4
feat:变量修改
Jan 3, 2025
f0d0189
feat:修改快照
Jan 3, 2025
a1586fd
feat:rc-tree-leaf改为rc-tree-treenode-leaf
Jan 6, 2025
adfa72d
feat:修改单测
Jan 7, 2025
db0c614
feat:修改单测
Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/TreeNode.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@ const TreeNode: React.FC<Readonly<TreeNodeProps>> = props => {
'drag-over-gap-top': !isDisabled && dragOverGapTop,
'drag-over-gap-bottom': !isDisabled && dragOverGapBottom,
'filter-node': context.filterTreeNode?.(convertNodePropsToEventData(props)),
[`${context.prefixCls}-treenode-leaf`]: memoizedIsLeaf,
})}
style={style}
// Draggable config
Expand Down
23 changes: 23 additions & 0 deletions tests/Tree.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1312,4 +1312,27 @@ describe('Tree Basic', () => {
expect(getByRole('treeitem', { name: 'leaf 2' })).toHaveClass('rc-tree-treenode-disabled');
});
});
it('leaf className', () => {
const data = [
{
title: '0-0',
key: '0-0',
children: [
{ title: '0-0-0', key: '0-0-0' },
{
title: '0-0-1',
key: '0-0-1',
children: [
{ title: '0-0-1-0', key: '0-0-1-0' },
{ title: '0-0-1-1', key: '0-0-1-1' },
],
},
],
},
{ title: '0-1', key: '0-1' },
];
const { container } = render(<Tree treeData={data} expandedKeys={['0-0', '0-0-1']} />);
const treeNodes = container.querySelectorAll('.rc-tree-treenode-leaf');
expect(treeNodes.length).toBe(4);
});
});
42 changes: 21 additions & 21 deletions tests/__snapshots__/Tree.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ exports[`Tree Basic check basic render 1`] = `
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-disabled rc-tree-treenode-switcher-close"
class="rc-tree-treenode rc-tree-treenode-disabled rc-tree-treenode-switcher-close rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down Expand Up @@ -111,7 +111,7 @@ exports[`Tree Basic check basic render 1`] = `
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down Expand Up @@ -226,7 +226,7 @@ exports[`Tree Basic check check after data ready works 1`] = `
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-checkbox-checked rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-checkbox-checked rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down Expand Up @@ -308,7 +308,7 @@ exports[`Tree Basic check check update when Tree trigger componentWillReceivePro
>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-checkbox-checked rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-checkbox-checked rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down Expand Up @@ -386,7 +386,7 @@ exports[`Tree Basic ignore illegal node as Tree children Direct TreeNode 1`] = `
>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand All @@ -413,7 +413,7 @@ exports[`Tree Basic ignore illegal node as Tree children Direct TreeNode 1`] = `
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down Expand Up @@ -485,7 +485,7 @@ exports[`Tree Basic ignore illegal node as Tree children Sub TreeNode 1`] = `
>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down Expand Up @@ -539,7 +539,7 @@ exports[`Tree Basic ignore illegal node as Tree children Sub TreeNode 1`] = `
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down Expand Up @@ -570,7 +570,7 @@ exports[`Tree Basic ignore illegal node as Tree children Sub TreeNode 1`] = `
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down Expand Up @@ -717,7 +717,7 @@ exports[`Tree Basic renders correctly 1`] = `
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down Expand Up @@ -757,7 +757,7 @@ exports[`Tree Basic renders correctly 1`] = `
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down Expand Up @@ -797,7 +797,7 @@ exports[`Tree Basic renders correctly 1`] = `
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down Expand Up @@ -953,7 +953,7 @@ exports[`Tree Basic should support rootStyle and rootClassName 1`] = `
>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand All @@ -980,7 +980,7 @@ exports[`Tree Basic should support rootStyle and rootClassName 1`] = `
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand All @@ -1007,7 +1007,7 @@ exports[`Tree Basic should support rootStyle and rootClassName 1`] = `
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand All @@ -1034,7 +1034,7 @@ exports[`Tree Basic should support rootStyle and rootClassName 1`] = `
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand All @@ -1061,7 +1061,7 @@ exports[`Tree Basic should support rootStyle and rootClassName 1`] = `
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand All @@ -1088,7 +1088,7 @@ exports[`Tree Basic should support rootStyle and rootClassName 1`] = `
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand All @@ -1115,7 +1115,7 @@ exports[`Tree Basic should support rootStyle and rootClassName 1`] = `
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand All @@ -1142,7 +1142,7 @@ exports[`Tree Basic should support rootStyle and rootClassName 1`] = `
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand All @@ -1169,7 +1169,7 @@ exports[`Tree Basic should support rootStyle and rootClassName 1`] = `
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down
32 changes: 16 additions & 16 deletions tests/__snapshots__/TreeNodeProps.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ exports[`TreeNode Props className 1`] = `
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down Expand Up @@ -132,7 +132,7 @@ exports[`TreeNode Props className 1`] = `
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down Expand Up @@ -163,7 +163,7 @@ exports[`TreeNode Props className 1`] = `
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down Expand Up @@ -235,7 +235,7 @@ exports[`TreeNode Props customize icon component 1`] = `
>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down Expand Up @@ -311,7 +311,7 @@ exports[`TreeNode Props customize icon element 1`] = `
>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down Expand Up @@ -387,7 +387,7 @@ exports[`TreeNode Props customize icon hide icon 1`] = `
>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down Expand Up @@ -517,7 +517,7 @@ exports[`TreeNode Props data and aria props renders aria attributes on li 1`] =
<div
aria-expanded="false"
aria-label="0-0-0-0"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down Expand Up @@ -552,7 +552,7 @@ exports[`TreeNode Props data and aria props renders aria attributes on li 1`] =
<div
aria-expanded="false"
aria-label="0-0-1"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down Expand Up @@ -584,7 +584,7 @@ exports[`TreeNode Props data and aria props renders aria attributes on li 1`] =
<div
aria-expanded="false"
aria-label="0-1"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down Expand Up @@ -716,7 +716,7 @@ exports[`TreeNode Props data and aria props renders data attributes on li 1`] =
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
data-test="0-0-0-0"
draggable="false"
role="treeitem"
Expand Down Expand Up @@ -751,7 +751,7 @@ exports[`TreeNode Props data and aria props renders data attributes on li 1`] =
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
data-test="0-0-1"
draggable="false"
role="treeitem"
Expand Down Expand Up @@ -783,7 +783,7 @@ exports[`TreeNode Props data and aria props renders data attributes on li 1`] =
</div>
<div
aria-expanded="false"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-switcher-close rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
data-test="0-1"
draggable="false"
role="treeitem"
Expand Down Expand Up @@ -855,7 +855,7 @@ exports[`TreeNode Props isLeaf 1`] = `
style="display: flex; flex-direction: column;"
>
<div
class="rc-tree-treenode rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand All @@ -878,7 +878,7 @@ exports[`TreeNode Props isLeaf 1`] = `
</span>
</div>
<div
class="rc-tree-treenode rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down Expand Up @@ -950,7 +950,7 @@ exports[`TreeNode Props isLeaf 2`] = `
style="display: flex; flex-direction: column;"
>
<div
class="rc-tree-treenode rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand All @@ -976,7 +976,7 @@ exports[`TreeNode Props isLeaf 2`] = `
</span>
</div>
<div
class="rc-tree-treenode rc-tree-treenode-leaf-last"
class="rc-tree-treenode rc-tree-treenode-leaf-last rc-tree-treenode-leaf"
draggable="false"
role="treeitem"
>
Expand Down
Loading