From d668244f9bedc03f12cd50aa79847145e03aff36 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Tue, 6 Feb 2024 23:44:10 -0800
Subject: [PATCH] Change hotkey handling to capture phase

---
 src-web/components/GrpcEditor.tsx         | 3 +--
 src-web/components/GrpcProtoSelection.tsx | 4 ++--
 src-web/hooks/useHotKey.ts                | 8 ++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src-web/components/GrpcEditor.tsx b/src-web/components/GrpcEditor.tsx
index c6f45788..12964bf5 100644
--- a/src-web/components/GrpcEditor.tsx
+++ b/src-web/components/GrpcEditor.tsx
@@ -91,7 +91,6 @@ export function GrpcEditor({
   }, [alert, services, request.method, request.service]);
 
   const reflectionUnavailable = reflectionError?.match(/unimplemented/i);
-  const reflectionSuccess = !reflectionError && services != null && request.protoFiles.length === 0;
   reflectionError = reflectionUnavailable ? undefined : reflectionError;
 
   return (
@@ -105,7 +104,7 @@ export function GrpcEditor({
         placeholder="..."
         ref={editorViewRef}
         actions={[
-          <div key="reflection" className={classNames(!reflectionSuccess && '!opacity-100')}>
+          <div key="reflection" className={classNames(services == null && '!opacity-100')}>
             <Button
               size="xs"
               color={
diff --git a/src-web/components/GrpcProtoSelection.tsx b/src-web/components/GrpcProtoSelection.tsx
index bf8703f2..e6c8dba9 100644
--- a/src-web/components/GrpcProtoSelection.tsx
+++ b/src-web/components/GrpcProtoSelection.tsx
@@ -52,7 +52,7 @@ export function GrpcProtoSelection({ requestId }: Props) {
             await grpc.reflect.refetch();
           }}
         >
-          Add Files
+          Add File
         </Button>
         <Button
           isLoading={grpc.reflect.isFetching}
@@ -139,7 +139,7 @@ export function GrpcProtoSelection({ requestId }: Props) {
             <Link href="https://github.com/grpc/grpc/blob/9aa3c5835a4ed6afae9455b63ed45c761d695bca/doc/server-reflection.md">
               Server Reflection
             </Link>{' '}
-            . Please manually add the <InlineCode>.proto</InlineCode> files to get started.
+            . Please manually add the <InlineCode>.proto</InlineCode> file to get started.
           </Banner>
         )}
       </VStack>
diff --git a/src-web/hooks/useHotKey.ts b/src-web/hooks/useHotKey.ts
index e7de7261..b38aa303 100644
--- a/src-web/hooks/useHotKey.ts
+++ b/src-web/hooks/useHotKey.ts
@@ -112,11 +112,11 @@ export function useAnyHotkey(
       }
       currentKeys.current.delete(normalizeKey(e.key, os));
     };
-    document.addEventListener('keydown', down);
-    document.addEventListener('keyup', up);
+    document.addEventListener('keydown', down, { capture: true });
+    document.addEventListener('keyup', up, { capture: true });
     return () => {
-      document.removeEventListener('keydown', down);
-      document.removeEventListener('keyup', up);
+      document.removeEventListener('keydown', down, { capture: true });
+      document.removeEventListener('keyup', up, { capture: true });
     };
   }, [options.enable, os]);
 }