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

More tests #321

Merged
merged 23 commits into from
Jul 28, 2015
Merged

More tests #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f56c644
Add tests for changing props
bruderstein Jul 16, 2015
cb04c30
Add failing test for late-arriving options
bruderstein Jul 16, 2015
b4f6025
Move helper functions for tests
bruderstein Jul 24, 2015
1282cb9
Bug fix + tests for pressing escape
bruderstein Jul 24, 2015
e7a373e
Tests for allowCreate=true
bruderstein Jul 24, 2015
314fa55
Make "node" the runner for wallaby
bruderstein Jul 24, 2015
9e3efff
Tests for asyncOptions
bruderstein Jul 24, 2015
d6fcb79
Tests for multi-select
bruderstein Jul 24, 2015
30e20f0
Test for className prop
bruderstein Jul 27, 2015
240c8a0
Bug fix and tests for clearable prop
bruderstein Jul 27, 2015
89dfdd5
Tests for clearAllText and clearValueText
bruderstein Jul 27, 2015
b47d788
Tests for delimiter
bruderstein Jul 27, 2015
43e24f8
Fix + tests for disabled control
bruderstein Jul 27, 2015
af3fc53
Tests for filterOption
bruderstein Jul 27, 2015
f7e67c1
Tests for filterOptions prop
bruderstein Jul 27, 2015
31f0537
Tests for ignoreCase=false
bruderstein Jul 27, 2015
39b2afa
Fix and tests for inputProps prop
bruderstein Jul 27, 2015
1c07e33
inputProps tests for not searchable or disabled
bruderstein Jul 27, 2015
db29633
Tests for matchPos and matchProp
bruderstein Jul 27, 2015
dc2c5b5
Test for closing the menu if clicking outside the control
bruderstein Jul 27, 2015
2173636
Tests for clicking arrow
bruderstein Jul 27, 2015
6c1a327
Tests for onBlur and onFocus
bruderstein Jul 27, 2015
61ab9a8
Fix lint errors with tests
bruderstein Jul 27, 2015
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
8 changes: 4 additions & 4 deletions src/Select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ var Select = React.createClass({
},

handleKeyDown: function(event) {
if (this.state.disabled) return;
if (this.props.disabled) return;

switch (event.keyCode) {

Expand All @@ -407,7 +407,7 @@ var Select = React.createClass({
case 27: // escape
if (this.state.isOpen) {
this.resetValue();
} else {
} else if (this.props.clearable) {
this.clearValue(event);
}
break;
Expand Down Expand Up @@ -754,13 +754,13 @@ var Select = React.createClass({
var input;
var inputProps = {
ref: 'input',
className: 'Select-input',
className: 'Select-input ' + (this.props.inputProps.className || ''),
tabIndex: this.props.tabIndex || 0,
onFocus: this.handleInputFocus,
onBlur: this.handleInputBlur
};
for (var key in this.props.inputProps) {
if (this.props.inputProps.hasOwnProperty(key)) {
if (this.props.inputProps.hasOwnProperty(key) && key !== 'className') {
inputProps[key] = this.props.inputProps[key];
}
}
Expand Down
Loading