Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add option to clear typeahead on select option #245

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@ Type: `Boolean`

Set to `true` to use a `<textarea>` element rather than an `<input>` element

#### props.clearOnSelect

Type: `Boolean`

Set to `true` to use clear the `<input>` or `<textarea>` element after selecting an option

#### props.inputProps

Type: `Object`
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-typeahead",
"version": "2.0.0-alpha.7",
"name": "@brodrickchilds/react-typeahead",
"version": "2.0.14",
"description": "React-based typeahead and typeahead-tokenizer",
"keywords": [
"react",
Expand All @@ -9,9 +9,9 @@
"autocomplete",
"react-component"
],
"homepage": "https://github.com/fmoo/react-typeahead",
"homepage": "https://github.com/BrodrickChilds/react-typeahead",
"bugs": {
"url": "https://github.com/fmoo/react-typeahead/issues",
"url": "https://github.com/BrodrickChilds/react-typeahead/issues",
"email": "ruibalp@gmail.com"
},
"license": "ISC",
Expand All @@ -29,7 +29,7 @@
],
"repository": {
"type": "git",
"url": "https://github.com/fmoo/react-typeahead.git"
"url": "https://github.com/BrodrickChilds/react-typeahead"
},
"dependencies": {
"classnames": "^1.2.0",
Expand Down
4 changes: 3 additions & 1 deletion src/react-typeahead.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
var Typeahead = require('./typeahead');
var Tokenizer = require('./tokenizer');
var TypeaheadSelector = require('./typeahead/selector')

module.exports = {
Typeahead: Typeahead,
Tokenizer: Tokenizer
Tokenizer: Tokenizer,
TypeaheadSelector: TypeaheadSelector
};
17 changes: 11 additions & 6 deletions src/typeahead/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ var Typeahead = createReactClass({
placeholder: PropTypes.string,
disabled: PropTypes.bool,
textarea: PropTypes.bool,
clearOnSelect: PropTypes.bool,
inputProps: PropTypes.object,
onOptionSelected: PropTypes.func,
onChange: PropTypes.func,
Expand Down Expand Up @@ -69,6 +70,7 @@ var Typeahead = createReactClass({
placeholder: "",
disabled: false,
textarea: false,
clearOnSelect: false,
inputProps: {},
onOptionSelected: function(option) {},
onChange: function(event) {},
Expand Down Expand Up @@ -199,11 +201,14 @@ var Typeahead = createReactClass({
var formInputOption = Accessor.generateOptionToStringFor(this.props.formInputOption || displayOption);
var formInputOptionString = formInputOption(option);

nEntry.value = optionString;
this.setState({searchResults: this.getOptionsForValue(optionString, this.props.options),
selection: formInputOptionString,
entryValue: optionString,
showResults: false});
var valueAfterSelect = this.props.clearOnSelect ? '' : optionString;
var selectionAfterSelect = this.props.clearOnSelect ? '' : formInputOptionString;

nEntry.value = valueAfterSelect;
this.setState({searchResults: this.getOptionsForValue(valueAfterSelect, this.props.options),
selection: selectionAfterSelect,
entryValue: valueAfterSelect,
showResults: !!this.props.clearOnSelect});
return this.props.onOptionSelected(option, event);
},

Expand Down Expand Up @@ -310,7 +315,7 @@ var Typeahead = createReactClass({

componentWillReceiveProps: function(nextProps) {
var searchResults = this.getOptionsForValue(this.state.entryValue, nextProps.options);
var showResults = Boolean(searchResults.length) && this.state.isFocused;
var showResults = !!this.props.clearOnSelect || (Boolean(searchResults.length) && this.state.isFocused);
this.setState({
searchResults: searchResults,
showResults: showResults
Expand Down