Only emit global keyboard events when not in editable element

squidfunk · Mar 26, 2020 · c738110 · c738110
1 parent c4820f9
commit c738110
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/assets/javascripts/integrations/keyboard/index.ts b/src/assets/javascripts/integrations/keyboard/index.ts
@@ -92,6 +92,14 @@ export function setupKeyboard(): Observable<Keyboard> {
         mode: getToggle("search") ? "search" : "global",
         ...key
       })),
+      filter(({ mode }) => {
+        if (mode === "global") {
+          const active = getActiveElement()
+          if (typeof active !== "undefined")
+            return !isSusceptibleToKeyboard(active)
+        }
+        return true
+      }),
       share()
     )
 
@@ -150,14 +158,7 @@ export function setupKeyboard(): Observable<Keyboard> {
   /* Setup global keyboard handlers */
   keyboard$
     .pipe(
-      filter(({ mode }) => {
-        if (mode === "global") {
-          const active = getActiveElement()
-          if (typeof active !== "undefined")
-            return !isSusceptibleToKeyboard(active)
-        }
-        return false
-      }),
+      filter(({ mode }) => mode === "global"),
       withLatestFrom(useComponent("search-query"))
     )
       .subscribe(([key, query]) => {