Skip to content
This repository was archived by the owner on Jul 19, 2019. It is now read-only.

[changed] Prevent Return in menu from submitting surrounding form #92

Merged
Merged
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
1 change: 1 addition & 0 deletions lib/Autocomplete.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ let Autocomplete = React.createClass({
}
else {
// text entered + menu item has been highlighted + enter is hit -> update value to that of selected menu item, close the menu
event.preventDefault()
var item = this.getFilteredItems()[this.state.highlightedIndex]
var value = this.props.getItemValue(item)
this.setState({
Expand Down
4 changes: 3 additions & 1 deletion lib/__tests__/Autocomplete-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ describe('Autocomplete kewDown->Enter event handlers', () => {

it('should invoke `onSelect` with the selected menu item and close the menu', () => {
let value = 'Ar';
let defaultPrevented = false;
autocompleteWrapper.setState({'isOpen': true});
autocompleteInputWrapper.simulate('focus');
autocompleteWrapper.setProps({ value, onSelect(v) { value = v; } });
Expand All @@ -219,9 +220,10 @@ describe('Autocomplete kewDown->Enter event handlers', () => {
autocompleteInputWrapper.simulate('keyUp', { key : 'r', keyCode: 82, which: 82 });

// Hit enter, updating state.value with the selected Autocomplete suggestion
autocompleteInputWrapper.simulate('keyDown', { key : 'Enter', keyCode: 13, which: 13 });
autocompleteInputWrapper.simulate('keyDown', { key : 'Enter', keyCode: 13, which: 13, preventDefault() { defaultPrevented = true; } });
expect(value).to.equal('Arizona');
expect(autocompleteWrapper.state('isOpen')).to.be.false;
expect(defaultPrevented).to.be.true;

});

Expand Down