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

sbb-design-systems · Oct 23, 2023 · 9827fa1 · 9827fa1
1 parent 8153ad3
commit 9827fa1
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/components/sbb-menu/sbb-menu.tsx b/src/components/sbb-menu/sbb-menu.tsx
@@ -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);
+      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