Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions src/FilterMixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,17 @@ export default {
if (!input) {
return true;
}
const filterOption = this.props.filterOption;
const { filterOption } = this.props;
if (!filterOption) {
return true;
}
if (child.props.disabled) {
} else if (child.props.disabled) {
return false;
} else if (typeof filterOption === 'function') {
return filterOption.call(this, input, child);
}
return filterOption.call(this, input, child);
return true;
},

renderFilterOptions(inputValue) {
return this.renderFilterOptionsFromChildren(this.props.children, true, inputValue);
},
Expand Down
11 changes: 11 additions & 0 deletions tests/FilterMixin.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,17 @@ describe('FilterMixin', () => {
);
});

it('filterOption could be true as described in default value', () => {
const wrapper = render(
<Select inputValue="3" filterOption>
<Option value="1">1</Option>
<Option value="2">2</Option>
</Select>
);

expect(renderToJson(wrapper)).toMatchSnapshot();
});

describe('tag mode', () => {
it('renders unlisted item in value', () => {
const wrapper = render(
Expand Down
28 changes: 28 additions & 0 deletions tests/__snapshots__/FilterMixin.spec.js.snap
Original file line number Diff line number Diff line change
@@ -1,5 +1,33 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`FilterMixin renderFilterOptionsFromChildren filterOption could be true as described in default value 1`] = `
<ul
aria-activedescendant=""
class="rc-menu rc-menu-vertical rc-menu-root"
role="menu"
tabindex="0"
>
<li
aria-selected="false"
class="rc-menu-item"
role="menuitem"
style="user-select:none;-webkit-user-select:none;"
unselectable="unselectable"
>
1
</li>
<li
aria-selected="false"
class="rc-menu-item"
role="menuitem"
style="user-select:none;-webkit-user-select:none;"
unselectable="unselectable"
>
2
</li>
</ul>
`;

exports[`FilterMixin renderFilterOptionsFromChildren filters children by inputValue 1`] = `
<ul
aria-activedescendant=""
Expand Down