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

Fix focus on single selection #1965

Merged
merged 8 commits into from
May 30, 2019
Merged

Fix focus on single selection #1965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2ae500d
Fix focus on single selection
sulemanof May 27, 2019
74f5303
Fix focus on single selection; now it just closes the list so that yo…
PhilippBaranovskiy May 29, 2019
3cd0974
update CHANGELOG
PhilippBaranovskiy May 29, 2019
7008a57
Merge branch 'master' into combobox/fix-focus
PhilippBaranovskiy May 29, 2019
4236f49
Return focus to searchInput
maryia-lapata May 29, 2019
a0bb893
Merge branch 'master' into combobox/fix-focus
PhilippBaranovskiy May 30, 2019
d2b2f71
Updated CHANGELOG.md
PhilippBaranovskiy May 30, 2019
cd25826
Merge branch 'combobox/fix-focus' of https://github.com/sulemanof/eui…
PhilippBaranovskiy May 30, 2019
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
**Bug fixes**

- Fixed environment setup for running `test-unit` script on Windows ([#1971](https://github.com/elastic/eui/pull/1971))
- Fixed focus on single selection of EuiComboBox ([#1965](https://github.com/elastic/eui/pull/1965))

## [`11.2.1`](https://github.com/elastic/eui/tree/v11.2.1)

Expand Down
12 changes: 5 additions & 7 deletions src/components/combo_box/combo_box.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,17 +430,15 @@ export class EuiComboBox extends Component {
);

this.clearSearchValue();

if (singleSelection) {
this.closeList();
this.searchInput.blur();
return;
}

this.clearActiveOption();

if (!isContainerBlur) {
this.searchInput.focus();
}

if (singleSelection) {
this.closeList();
}
};

onRemoveOption = removedOption => {
Expand Down