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

Fix #1394 #1395

Merged
merged 4 commits into from
May 17, 2017
Merged

Fix #1394 #1395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
117f81e
Fix #1394
Nov 29, 2016
919c952
Updates following review
Dec 8, 2016
98e11d0
Merge branch 'master' into master
sgaestel Feb 1, 2017
0b2f208
Updates following review by @JedWatson
Feb 2, 2017
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
3 changes: 2 additions & 1 deletion src/Select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,8 @@ const Select = React.createClass({
},

renderClear () {
if (!this.props.clearable || (!this.props.value || this.props.value === 0) || (this.props.multi && !this.props.value.length) || this.props.disabled || this.props.isLoading) return;

if (!this.props.clearable || this.props.value === undefined || this.props.value === null || this.props.multi && !this.props.value.length || this.props.disabled || this.props.isLoading) return;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One small tweak: You could write this.props.value == null instead of this.props.value === undefined || this.props.value === null.

> undefined == null
true

const clear = this.props.clearRenderer();

return (
Expand Down
10 changes: 10 additions & 0 deletions test/Select-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,11 @@ describe('Select', () => {
expect(onChange, 'was called with', 0);
});

it('displays the X button for 0 value', () => {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for also adding tests for this 😁

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're welcome 😉

wrapper.setPropsForChild({ value: 0 });
expect(ReactDOM.findDOMNode(instance).querySelector('.Select-clear'), 'not to equal', undefined);
});

describe('with multi=true', () => {

beforeEach(() => {
Expand Down Expand Up @@ -962,6 +967,11 @@ describe('Select', () => {
'to have text', 'No');
});

it('displays the X button for false value', () => {
wrapper.setPropsForChild({ value: false });
expect(ReactDOM.findDOMNode(instance).querySelector('.Select-clear'), 'not to equal', undefined);
});

describe('with multi=true', () => {

beforeEach(() => {
Expand Down