Skip to content

Feature/hide show results #203

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
fmoo merged 2 commits into from
Jun 1, 2016
Merged

Feature/hide show results #203

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53760e1
removed strange global variable.
export-mike Jun 1, 2016
6cc4422
only show results when focused
export-mike Jun 1, 2016
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
12 changes: 8 additions & 4 deletions src/typeahead/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ var Typeahead = React.createClass({
// Keep track of the focus state of the input element, to determine
// whether to show options when empty (if showOptionsWhenEmpty is true)
isFocused: false,

// true when focused, false onOptionSelected
showResults: false
};
},

Expand All @@ -118,7 +121,7 @@ var Typeahead = React.createClass({
if (this._shouldSkipSearch(value)) { return []; }

var searchOptions = this._generateSearchFunction();
return result = searchOptions(value, options);
return searchOptions(value, options);
},

setEntryText: function(value) {
Expand Down Expand Up @@ -197,7 +200,8 @@ var Typeahead = React.createClass({
nEntry.value = optionString;
this.setState({searchResults: this.getOptionsForValue(optionString, this.props.options),
selection: formInputOptionString,
entryValue: optionString});
entryValue: optionString,
showResults: false});
return this.props.onOptionSelected(option, event);
},

Expand Down Expand Up @@ -336,13 +340,13 @@ var Typeahead = React.createClass({
onFocus={this._onFocus}
onBlur={this._onBlur}
/>
{ this._renderIncrementalSearchResults() }
{ this.state.showResults && this._renderIncrementalSearchResults() }
</div>
);
},

_onFocus: function(event) {
this.setState({isFocused: true}, function () {
this.setState({isFocused: true, showResults: true}, function () {
this._onTextEntryUpdated();
}.bind(this));
if ( this.props.onFocus ) {
Expand Down