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

chore: Bump tree #303

Merged
merged 2 commits into from
Nov 30, 2020
Merged

chore: Bump tree #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d19d2ab
test: Update snapshot
zombieJ Nov 30, 2020
1a5daab
test: Fix select test cae
zombieJ Nov 30, 2020
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"@babel/runtime": "^7.10.1",
"classnames": "2.x",
"rc-select": "^11.1.1",
"rc-tree": "^3.8.0",
"rc-tree": "^4.0.0",
"rc-util": "^5.0.5"
}
}
48 changes: 13 additions & 35 deletions tests/Select.checkable.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,7 @@ describe('TreeSelect.checkable', () => {
onChange={this.handleChange}
disabled={disabled}
/>
<input
type="checkbox"
onChange={e => this.switch(e.target.checked)}
id="checkbox"
/>{' '}
<input type="checkbox" onChange={e => this.switch(e.target.checked)} id="checkbox" />{' '}
禁用
</div>
);
Expand Down Expand Up @@ -335,9 +331,7 @@ describe('TreeSelect.checkable', () => {
],
},
];
const wrapper = mount(
<TreeSelect treeCheckable treeData={treeData} open />,
);
const wrapper = mount(<TreeSelect treeCheckable treeData={treeData} open />);
wrapper.search('58');
wrapper.selectNode(2);
expect(wrapper.getSelection()).toHaveLength(1);
Expand Down Expand Up @@ -402,11 +396,7 @@ describe('TreeSelect.checkable', () => {

wrapper.search('0-0');
wrapper.selectNode(0);
expect(onChange).toHaveBeenCalledWith(
['0-1-0', '0-1-2'],
expect.anything(),
expect.anything(),
);
expect(onChange).toHaveBeenCalledWith(['0-1-0', '0-1-2'], expect.anything(), expect.anything());
});

// https://github.com/ant-design/ant-design/issues/13328
Expand Down Expand Up @@ -443,11 +433,7 @@ describe('TreeSelect.checkable', () => {

wrapper.search('0-0-1');
wrapper.selectNode(1);
expect(onChange).toHaveBeenCalledWith(
['0-0-1'],
expect.anything(),
expect.anything(),
);
expect(onChange).toHaveBeenCalledWith(['0-0-1'], expect.anything(), expect.anything());

expect(
wrapper
Expand Down Expand Up @@ -615,14 +601,10 @@ describe('TreeSelect.checkable', () => {
},
];

const wrapper = mount(
<TreeSelect defaultValue={['0-0']} treeData={treeData} treeCheckable />,
);
const wrapper = mount(<TreeSelect defaultValue={['0-0']} treeData={treeData} treeCheckable />);

expect(wrapper.getSelection().length).toBeTruthy();
expect(
wrapper.find('.rc-tree-select-selection-item-remove').length,
).toBeFalsy();
expect(wrapper.find('.rc-tree-select-selection-item-remove').length).toBeFalsy();
});

it('treeCheckStrictly can set halfChecked', () => {
Expand All @@ -634,26 +616,22 @@ describe('TreeSelect.checkable', () => {
value={[{ value: 'half', halfChecked: true }]}
open
onChange={onChange}
treeData={[
{ value: 'half', title: 'Half Check' },
{ value: 'full', title: 'Full Check' },
]}
treeData={[{ value: 'half', title: 'Half Check' }, { value: 'full', title: 'Full Check' }]}
/>,
);

function getTreeNode(index) {
return wrapper.find('.rc-tree-select-tree-treenode').at(index);
return wrapper
.find('.rc-tree-select-tree-treenode')
.not('[aria-hidden]')
.at(index);
}

expect(
getTreeNode(0).hasClass(
'rc-tree-select-tree-treenode-checkbox-indeterminate',
),
getTreeNode(0).hasClass('rc-tree-select-tree-treenode-checkbox-indeterminate'),
).toBeTruthy();
expect(
getTreeNode(1).hasClass(
'rc-tree-select-tree-treenode-checkbox-indeterminate',
),
getTreeNode(1).hasClass('rc-tree-select-tree-treenode-checkbox-indeterminate'),
).toBeFalsy();

wrapper.selectNode(1);
Expand Down
1 change: 1 addition & 0 deletions tests/Select.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ describe('TreeSelect.basic', () => {
expect(
wrapper
.find('.rc-tree-select-tree-treenode')
.not('[aria-hidden]')
.at(1)
.hasClass('rc-tree-select-tree-treenode-switcher-open'),
).toBeTruthy();
Expand Down
68 changes: 68 additions & 0 deletions tests/__snapshots__/Select.checkable.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,19 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 1
value=""
/>
</div>
<div
aria-hidden="true"
class="rc-tree-select-tree-treenode"
style="position: absolute; pointer-events: none; visibility: hidden; height: 0px; overflow: hidden;"
>
<div
class="rc-tree-select-tree-indent"
>
<div
class="rc-tree-select-tree-indent-unit"
/>
</div>
</div>
<div
class="rc-tree-select-tree-list"
style="height: 200px;"
Expand All @@ -128,6 +141,10 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 1
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked rc-tree-select-tree-treenode-leaf-last"
>
<span
aria-hidden="true"
class="rc-tree-select-tree-indent"
/>
<span
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
/>
Expand Down Expand Up @@ -281,6 +298,19 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 2
value=""
/>
</div>
<div
aria-hidden="true"
class="rc-tree-select-tree-treenode"
style="position: absolute; pointer-events: none; visibility: hidden; height: 0px; overflow: hidden;"
>
<div
class="rc-tree-select-tree-indent"
>
<div
class="rc-tree-select-tree-indent-unit"
/>
</div>
</div>
<div
class="rc-tree-select-tree-list"
style="height: 200px;"
Expand All @@ -293,6 +323,10 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 2
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
>
<span
aria-hidden="true"
class="rc-tree-select-tree-indent"
/>
<span
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
/>
Expand Down Expand Up @@ -506,6 +540,19 @@ exports[`TreeSelect.checkable uncheck remove by tree check 1`] = `
value=""
/>
</div>
<div
aria-hidden="true"
class="rc-tree-select-tree-treenode"
style="position: absolute; pointer-events: none; visibility: hidden; height: 0px; overflow: hidden;"
>
<div
class="rc-tree-select-tree-indent"
>
<div
class="rc-tree-select-tree-indent-unit"
/>
</div>
</div>
<div
class="rc-tree-select-tree-list"
style="height: 200px;"
Expand All @@ -518,6 +565,10 @@ exports[`TreeSelect.checkable uncheck remove by tree check 1`] = `
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked rc-tree-select-tree-treenode-leaf-last filter-node"
>
<span
aria-hidden="true"
class="rc-tree-select-tree-indent"
/>
<span
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
/>
Expand Down Expand Up @@ -668,6 +719,19 @@ exports[`TreeSelect.checkable uncheck remove by tree check 2`] = `
value=""
/>
</div>
<div
aria-hidden="true"
class="rc-tree-select-tree-treenode"
style="position: absolute; pointer-events: none; visibility: hidden; height: 0px; overflow: hidden;"
>
<div
class="rc-tree-select-tree-indent"
>
<div
class="rc-tree-select-tree-indent-unit"
/>
</div>
</div>
<div
class="rc-tree-select-tree-list"
style="height: 200px;"
Expand All @@ -680,6 +744,10 @@ exports[`TreeSelect.checkable uncheck remove by tree check 2`] = `
<div
class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last filter-node"
>
<span
aria-hidden="true"
class="rc-tree-select-tree-indent"
/>
<span
class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
/>
Expand Down
Loading