From 939e26eb43f7a4d062cae4dfdbc1608956e1dcda Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Tue, 1 Feb 2022 14:33:03 +0100
Subject: [PATCH] popupMenu: Ensure to let focus manager handle key events

Since the grab no longer lets events bubble up to the stage unstopped,
we should be forwarding the key events that bubbled up to the dialog
to maybe cycle focus.

Fixes broken keyboard navigation in several context menus around the
shell, other than the panel ones.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2140>
---
 js/ui/popupMenu.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index a0c00067d..b46467362 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -154,6 +154,9 @@ var PopupBaseMenuItem = GObject.registerClass({
     }
 
     vfunc_key_press_event(keyEvent) {
+        if (global.focus_manager.navigate_from_event(Clutter.get_current_event()))
+            return Clutter.EVENT_STOP;
+
         if (!this._activatable)
             return super.vfunc_key_press_event(keyEvent);