Skip to content

fix: options show when children is empty #155

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
merged 3 commits into from
May 25, 2021
Merged

fix: options show when children is empty #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3eaae1b
fix: options show when children is empty
xrkffgg May 25, 2021
cbd7db3
fix
xrkffgg May 25, 2021
c2d86e0
add test
xrkffgg May 25, 2021
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 src/Menus.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class Menus extends React.Component<MenusProps> {
const { options } = this.props;
const result = this.getActiveOptions()
.map((activeOption) => activeOption[this.getFieldName('children')])
.filter((activeOption) => !!activeOption);
.filter((activeOption) => !!activeOption && activeOption.length > 0);
result.unshift(options);
return result;
}
Expand Down
39 changes: 25 additions & 14 deletions tests/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,7 @@ describe('Cascader', () => {
expect(selectedValue).toBeFalsy();
menu1Items.at(0).simulate('click');
expect(
wrapper
.find('.rc-cascader-menu-item')
.first()
.hasClass('rc-cascader-menu-item-active'),
wrapper.find('.rc-cascader-menu-item').first().hasClass('rc-cascader-menu-item-active'),
).toBe(true);
menus = wrapper.find('.rc-cascader-menu');
expect(menus.length).toBe(2);
Expand Down Expand Up @@ -284,6 +281,26 @@ describe('Cascader', () => {
expect(menus.length).toBe(0);
});

it('should not display when children is empty', () => {
const wrapper = mount(
<Cascader
options={[
{
label: '福建',
value: 'fj',
children: [],
},
]}
onChange={onChange}
>
<input readOnly />
</Cascader>,
);
wrapper.find('input').simulate('click');
const menus = wrapper.find('.rc-cascader-menu');
expect(menus.length).toBe(1);
});

it('should be unselectable when option is disabled', () => {
const newAddressOptions = [...addressOptions];
newAddressOptions[0] = {
Expand All @@ -304,10 +321,7 @@ describe('Cascader', () => {

menu1Items.at(0).simulate('click');
expect(
wrapper
.find('.rc-cascader-menu-item')
.first()
.hasClass('rc-cascader-menu-item-disabled'),
wrapper.find('.rc-cascader-menu-item').first().hasClass('rc-cascader-menu-item-disabled'),
).toBe(true);
menus = wrapper.find('.rc-cascader-menu');
expect(menus.length).toBe(1);
Expand Down Expand Up @@ -357,7 +371,7 @@ describe('Cascader', () => {
<Cascader
options={addressOptions}
value={this.state.value}
ref={node => {
ref={(node) => {
this.cascader = node;
}}
>
Expand Down Expand Up @@ -509,10 +523,7 @@ describe('Cascader', () => {
expect(wrapper.state().popupVisible).toBeFalsy();
wrapper.find('input').simulate('click');
expect(wrapper.state().popupVisible).toBeTruthy();
wrapper
.find('li')
.at(0)
.simulate('doubleClick');
wrapper.find('li').at(0).simulate('doubleClick');
expect(wrapper.state().popupVisible).toBeFalsy();
});

Expand Down Expand Up @@ -601,7 +612,7 @@ describe('Cascader', () => {
<Cascader
options={addressOptions}
popupVisible
dropdownRender={menus => (
dropdownRender={(menus) => (
<div className="custom-dropdown">
{menus}
<hr />
Expand Down