Skip to content

Commit

Permalink
Merge bd1d8b4 into 024caaf
Browse files Browse the repository at this point in the history
  • Loading branch information
adamsas committed May 1, 2019
2 parents 024caaf + bd1d8b4 commit 6c09735
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ This module is designed to be used with webpack. Below are is a sample of how to
2. `npm test`

## History
* 1.0.8 - Disable filtering when results are fetched from server
* 1.0.7 - Fixes search results with short filterText
* 1.0.6 - Fixes the behavior of the enter key
* 1.0.5 - Prevent tabbing to the toggle switch
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ship-components-tag-input",
"version": "1.0.7",
"version": "1.0.8",
"description": "Material Design Input and Typeahead for Tags (or \"Chips\" in Material Design speak)",
"main": "src/index.js",
"scripts": {
Expand Down
4 changes: 3 additions & 1 deletion src/TagContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ export default class TagContainer extends React.Component {
let options = this.props.options;

// show filtered results
if (filterText !== '') {
if (filterText !== '' && !this.props.autoComplete) {
options = this.getFilterResults(filterText);
}

Expand Down Expand Up @@ -538,6 +538,8 @@ TagContainer.propTypes = {
togglePosition: PropTypes.string.isRequired,
noOptionsMessage: PropTypes.string.isRequired,
toggleSwitchStyle: PropTypes.string.isRequired,
fetchUrl: PropTypes.string.isRequired,
fetchOptions: PropTypes.func.isRequired,

options: PropTypes.array.isRequired,
selection: PropTypes.instanceOf(List).isRequired,
Expand Down

0 comments on commit 6c09735

Please sign in to comment.