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

Add or clear current input value on blur and allow auto select on tab (for new values) #416

Closed
wants to merge 2 commits into from
Closed

Add or clear current input value on blur and allow auto select on tab (for new values) #416

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
4ca6218
Add or clear current input value on blur and allow auto select on tab…
akum32 Aug 27, 2015
3fbd189
Does not show add option if entered value exists #421
akum32 Aug 28, 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
25 changes: 23 additions & 2 deletions src/Select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,19 @@ var Select = React.createClass({
this.setValue(this.state.values.concat(value));
},

addOrClearInputValue: function() {
var inputValue = this.state.inputValue;
if((inputValue || '').length === 0) {
return;
}
if (this.props.allowCreate) {
this.setValue(this.state.values.concat(inputValue), false);
}
else {
this.setState({ inputValue: null });
}
},

popValue: function() {
this.setValue(this.state.values.slice(0, this.state.values.length - 1));
},
Expand Down Expand Up @@ -412,6 +425,7 @@ var Select = React.createClass({
},

handleInputBlur: function(event) {
this.addOrClearInputValue();
this._blurTimeout = setTimeout(() => {
if (this._focusAfterUpdate) return;
this.setState({
Expand All @@ -433,7 +447,7 @@ var Select = React.createClass({
}
return;
case 9: // tab
if (event.shiftKey || !this.state.isOpen || !this.state.focusedOption) {
if (!this.state.isOpen) {
return;
}
this.selectFocusedOption();
Expand Down Expand Up @@ -661,6 +675,13 @@ var Select = React.createClass({
}
},

inputValueExists : function() {
var matches = this.state.filteredOptions.filter(function(option) {
return String(option.value) === this.state.inputValue;
}, this);
return matches.length > 0;
},

buildMenu: function() {
var focusedValue = this.state.focusedOption ? this.state.focusedOption.value : null;
var renderLabel = this.props.optionRenderer || function(op) {
Expand All @@ -671,7 +692,7 @@ var Select = React.createClass({
}
// Add the current value to the filtered options in last resort
var options = this.state.filteredOptions;
if (this.props.allowCreate && this.state.inputValue.trim()) {
if (this.props.allowCreate && this.state.inputValue.trim() && !this.inputValueExists()) {
var inputValue = this.state.inputValue;
options = options.slice();
var newOption = this.props.newOptionCreator ? this.props.newOptionCreator(inputValue) : {
Expand Down
10 changes: 5 additions & 5 deletions test/Select-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,7 @@ describe('Select', function() {
pressEnterToAccept();
expect(onChange, 'was not called');
// And the menu is still open
expect(React.findDOMNode(instance), 'to contain no elements matching', DISPLAYED_SELECTION_SELECTOR)
expect(React.findDOMNode(instance), 'to contain no elements matching', DISPLAYED_SELECTION_SELECTOR);
expect(React.findDOMNode(instance), 'queried for' , '.Select-option',
'to satisfy', [
expect.it('to have text', 'Two')
Expand All @@ -915,7 +915,7 @@ describe('Select', function() {
pressEnterToAccept();
expect(onChange, 'was not called');
// And the menu is still open
expect(React.findDOMNode(instance), 'to contain no elements matching', DISPLAYED_SELECTION_SELECTOR)
expect(React.findDOMNode(instance), 'to contain no elements matching', DISPLAYED_SELECTION_SELECTOR);
expect(React.findDOMNode(instance), 'queried for' , '.Select-option',
'to satisfy', [
expect.it('to have text', 'Two')
Expand All @@ -928,7 +928,7 @@ describe('Select', function() {
pressEnterToAccept();
expect(onChange, 'was not called');
// And the menu is still open
expect(React.findDOMNode(instance), 'to contain no elements matching', DISPLAYED_SELECTION_SELECTOR)
expect(React.findDOMNode(instance), 'to contain no elements matching', DISPLAYED_SELECTION_SELECTOR);
expect(React.findDOMNode(instance), 'queried for' , '.Select-option',
'to satisfy', [
expect.it('to have text', 'Two')
Expand Down Expand Up @@ -1157,14 +1157,14 @@ describe('Select', function() {
'to have text', 'Add test to values?');
});

it('does not display the option label when an existing value is entered', function () {
it('does not display add option when an existing value is entered', function () {

typeSearchText('zzzzz');

expect(React.findDOMNode(instance).querySelectorAll('.Select-menu .Select-option'),
'to have length', 1);
expect(React.findDOMNode(instance), 'queried for first', '.Select-menu .Select-option',
'to have text', 'Add zzzzz to values?');
'to have text', 'test value');
});

it('renders the existing option and an add option when an existing display label is entered', function () {
Expand Down