From d776a8fae8025d4935a6508960f780b16d778eb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= <git@mkljczk.pl>
Date: Fri, 27 Feb 2026 00:07:56 +0100
Subject: [PATCH] nicolium: merge upstream hotkeys fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
---
 .../pl-fe/src/features/ui/components/hotkeys.tsx  | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/pl-fe/src/features/ui/components/hotkeys.tsx b/packages/pl-fe/src/features/ui/components/hotkeys.tsx
index 00930b43a..7be8f4720 100644
--- a/packages/pl-fe/src/features/ui/components/hotkeys.tsx
+++ b/packages/pl-fe/src/features/ui/components/hotkeys.tsx
@@ -198,21 +198,20 @@ function useHotkeys<T extends HTMLElement>(handlers: HandlerMap) {
 
       if (shouldHandleEvent) {
         const matchCandidates: {
-          handler: (event: KeyboardEvent) => void;
+          // A candidate will be have an undefined handler if it's matched,
+          // but handled in a parent component rather than this one.
+          handler: ((event: KeyboardEvent) => void) | undefined;
           priority: number;
         }[] = [];
 
         (Object.keys(hotkeyMatcherMap) as HotkeyName[]).forEach((handlerName) => {
           const handler = handlersRef.current[handlerName];
+          const hotkeyMatcher = hotkeyMatcherMap[handlerName];
 
-          if (handler) {
-            const hotkeyMatcher = hotkeyMatcherMap[handlerName];
+          const { isMatch, priority } = hotkeyMatcher(event, bufferedKeys.current);
 
-            const { isMatch, priority } = hotkeyMatcher(event, bufferedKeys.current);
-
-            if (isMatch) {
-              matchCandidates.push({ handler, priority });
-            }
+          if (isMatch) {
+            matchCandidates.push({ handler, priority });
           }
         });