From 39ee894d773fcfb9eaabf0697c748cff47606ff2 Mon Sep 17 00:00:00 2001
From: Jannis Braun <151788261+TheZwiss@users.noreply.github.com>
Date: Sun, 22 Mar 2026 21:36:05 +0100
Subject: [PATCH] fix: fall back to web keybind listeners when Electron lacks
 keybind APIs

When running in Electron but the desktop app hasn't been rebuilt with
keybind support (no syncKeybinds/onKeybindAction in preload), the hook
now falls through to the web capture-phase listener instead of silently
doing nothing. This ensures keybinds work immediately on the web-served
UI regardless of the desktop app version.
---
 packages/web/src/hooks/useKeybinds.ts | 43 ++++++++++++++-------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/packages/web/src/hooks/useKeybinds.ts b/packages/web/src/hooks/useKeybinds.ts
index 2f5a2663..7d4fc527 100644
--- a/packages/web/src/hooks/useKeybinds.ts
+++ b/packages/web/src/hooks/useKeybinds.ts
@@ -198,30 +198,31 @@ export function useKeybinds(): void {
     }
   }, [keybinds, currentVoiceChannelId]);
 
-  // --- Electron: IPC bridge ---
+  // --- Keybind listeners (Electron IPC or web capture-phase fallback) ---
   useEffect(() => {
-    if (!isElectron()) return;
-    const api = window.backspace;
-    if (!api?.syncKeybinds || !api?.onKeybindAction) return;
-
-    api.syncKeybinds(keybinds.map((kb) => ({
-      actionId: kb.actionId,
-      keys: kb.keys,
-      mouseButton: kb.mouseButton,
-    })));
-
-    const cleanup = api.onKeybindAction((action) => {
-      dispatchKeybindAction(action.actionId, action.pressed);
-    });
-
-    return cleanup;
-  }, [keybinds]);
-
-  // --- Web fallback: capture-phase listeners ---
-  useEffect(() => {
-    if (isElectron()) return;
     if (keybinds.length === 0) return;
 
+    // Try Electron IPC bridge first (requires rebuilt desktop app with keybind support)
+    if (isElectron()) {
+      const api = window.backspace;
+      if (api?.syncKeybinds && api?.onKeybindAction) {
+        // Desktop app has keybind support — use OS-level global shortcuts
+        api.syncKeybinds(keybinds.map((kb) => ({
+          actionId: kb.actionId,
+          keys: kb.keys,
+          mouseButton: kb.mouseButton,
+        })));
+
+        const cleanup = api.onKeybindAction((action) => {
+          dispatchKeybindAction(action.actionId, action.pressed);
+        });
+
+        return cleanup;
+      }
+      // Desktop app lacks keybind APIs (old build) — fall through to web fallback
+    }
+
+    // Web fallback: capture-phase listeners (works when tab/window is focused)
     const cleanup = setupWebFallback(keybindsRef);
     return cleanup ?? undefined;
   }, [keybinds]);