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(ui5-list): focus list on non-focusable child click #10124

Merged
merged 7 commits into from
Dec 16, 2024
Merged

fix(ui5-list): focus list on non-focusable child click #10124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d0ee43b
fix(ui5-list-item): focus list item on non-focusable child click
NakataCode Oct 31, 2024
ec7a069
Merge branch 'main' into list-item-focus-on-click
NakataCode Nov 29, 2024
aa25d51
Merge branch 'main' into list-item-focus-on-click
NakataCode Dec 12, 2024
87eda2a
fix: return the tabindex to undefined for the avatar
NakataCode Dec 12, 2024
a05ae3c
fix: check if the item is already focused
NakataCode Dec 12, 2024
19562ca
Merge branch 'main' into list-item-focus-on-click
NakataCode Dec 13, 2024
5cfeeda
refactor: replace getActiveElement with document.activeElement
NakataCode Dec 13, 2024
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
2 changes: 1 addition & 1 deletion packages/main/src/Avatar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ class Avatar extends UI5Element implements ITabbable, IAvatarGroupItem {
if (this.forcedTabIndex) {
return parseInt(this.forcedTabIndex);
}
return this._interactive ? 0 : -1;
return this._interactive ? 0 : undefined;
}

/**
Expand Down
3 changes: 3 additions & 0 deletions packages/main/src/ListItem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,9 @@ abstract class ListItem extends ListItemBase {
return;
}
super.fireItemPress(e);
if (document.activeElement !== this) {
this.focus();
}
}

get isInactive() {
Expand Down
1 change: 0 additions & 1 deletion packages/main/src/ListItemBase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@ class ListItemBase extends UI5Element implements ITabbable {
if (this.getFocusDomRef()!.matches(":has(:focus-within)")) {
return;
}

this.fireItemPress(e);
}

Expand Down
Loading