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(sbb-menu): menu action focus on mobile #2103

Merged
merged 2 commits into from
Oct 23, 2023
Merged

fix(sbb-menu): menu action focus on mobile #2103

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
855cc4b
fix: menu focus on mobile
dauriamarco Oct 23, 2023
68c0bb3
fix: review
dauriamarco Oct 23, 2023
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
11 changes: 8 additions & 3 deletions src/components/sbb-menu/sbb-menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,12 +344,17 @@ export class SbbMenu implements ComponentInterface {

// Set focus on the first focusable element.
private _setDialogFocus(): void {
if (sbbInputModalityDetector.mostRecentModality === 'keyboard') {
getFirstFocusableElement(
if (
sbbInputModalityDetector.mostRecentModality === 'keyboard' ||
sbbInputModalityDetector.mostRecentModality === 'touch'
) {
const firstFocusable = getFirstFocusableElement(
Array.from(this._element.children).filter(
(e): e is HTMLElement => e instanceof window.HTMLElement,
),
)?.focus();
);
setModalityOnNextFocus(firstFocusable);
dauriamarco marked this conversation as resolved.
Show resolved Hide resolved
firstFocusable?.focus();
} else {
// Focusing sbb-menu__content in order to provide a consistent behavior in Safari where else
// the focus-visible styles would be incorrectly applied
Expand Down