Skip to content

fix(ui5-combobox): announce ComboBox selected item properly #12300

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(ui5-combobox): announce ComboBox selected item properly #12300

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 27 additions & 1 deletion packages/main/src/ComboBox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,12 @@ class ComboBox extends UI5Element implements IFormInputElement {
const isGroupItem = currentItem && currentItem.isGroupItem;
const nextItem = isForward ? allItems[indexOfItem + 1] : allItems[indexOfItem - 1];

if ((!this.open) && ((isGroupItem && !nextItem) || (!isGroupItem && !currentItem))) {
// do not navigate items while popup is closed
if (!this.open) {
return;
}

if ((isGroupItem && !nextItem) || (!isGroupItem && !currentItem)) {
return;
}

Expand Down Expand Up @@ -930,6 +935,27 @@ class ComboBox extends UI5Element implements IFormInputElement {
this._autocomplete = !(isBackSpace(e) || isDelete(e));
this._isKeyNavigation = false;

// open popover on first ArrowDown/ArrowUp
if ((isDown(e) || isUp(e)) && !this.open && !this.readonly && this._filteredItems.length) {
this._openRespPopover();
if (isDown(e)) {
const firstNonGroupIndex = this._getItems().findIndex(item => item._isVisible && !item.isGroupItem);
if (firstNonGroupIndex > -1) {
this._handleItemNavigation(e, firstNonGroupIndex, true);
}
return;
}
// For ArrowUp: focus last visible non-group item
if (isUp(e)) {
const items = this._getItems().filter(i => i._isVisible && !i.isGroupItem);
if (items.length) {
const lastIndex = this._getItems().indexOf(items[items.length - 1]);
this._handleItemNavigation(e, lastIndex, false);
}
return;
}
}

if (isNavKey && !this.readonly && this._filteredItems.length) {
this.handleNavKeyPress(e);
}
Expand Down
Loading