Fix/invalid shortcut events (#488)

Fix #486 .
Future-Scholars · Apr 8, 2024 · 7800f0a · 7800f0a
1 parent 8c8a608
commit 7800f0a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/app/common/utils.ts b/app/common/utils.ts
@@ -12,9 +12,17 @@ export interface ShortcutEvent {
   preventDefault?: () => void;
   stopPropagation?: () => void;
   isInput?: boolean;
+  target?: {
+    blur?: () => void;
+  };
 }
 
-export const formatShortcut = (event: ShortcutEvent): string[] => {
+export const formatShortcut = (
+  event: Pick<
+    ShortcutEvent,
+    "ctrlKey" | "metaKey" | "altKey" | "shiftKey" | "key" | "code"
+  >
+): string[] => {
   let shortcutKeys: string[] = [];
 
   if (event.ctrlKey) {
@@ -56,6 +64,9 @@ export const formatKeycode = (code: string): string => {
 };
 
 export const convertKeyboardEvent = (e: KeyboardEvent): ShortcutEvent => {
+  const isInput =
+    e.target instanceof HTMLInputElement ||
+    e.target instanceof HTMLTextAreaElement;
   return {
     ctrlKey: e.ctrlKey,
     metaKey: e.metaKey,
@@ -69,8 +80,13 @@ export const convertKeyboardEvent = (e: KeyboardEvent): ShortcutEvent => {
     stopPropagation: () => {
       e.stopPropagation();
     },
-    isInput:
-      e.target instanceof HTMLInputElement ||
-      e.target instanceof HTMLTextAreaElement,
+    isInput,
+    target: {
+      blur: () => {
+        if (isInput && e.target) {
+          (e.target as HTMLInputElement | HTMLTextAreaElement).blur();
+        }
+      },
+    },
   };
 };
diff --git a/app/renderer/ui/main-view/menubar-view/components/command-bar.vue b/app/renderer/ui/main-view/menubar-view/components/command-bar.vue
@@ -6,6 +6,7 @@ import { disposable } from "@/base/dispose";
 import { debounce } from "@/base/misc";
 import { ICommand } from "@/renderer/services/command-service";
 import { PaperFilterOptions } from "@/renderer/services/paper-service";
+import { ShortcutEvent } from "@/common/utils.ts";
 
 // ================================
 // State
@@ -88,7 +89,7 @@ const isFocused = ref(false);
 const isMouseOver = ref(false);
 const isSelectingCommand = ref(false);
 
-const onRunCommand = (e: Event) => {
+const onRunCommand = () => {
   if (isCommandPanelShown.value && selectedCommandIndex.value >= 0) {
     const commandComponents = commandText.value.split(" ").filter((x) => x);
     const commandStr = commandComponents[0].trim();
@@ -182,8 +183,8 @@ const onFocus = async (payload: Event) => {
 
   enterDisposeHandler = shortcutService.register(
     "Enter",
-    (e: Event) => {
-      onRunCommand(e);
+    () => {
+      onRunCommand();
     },
     true,
     true,
@@ -192,9 +193,8 @@ const onFocus = async (payload: Event) => {
 
   escapeDisposeHandler = shortcutService.register(
     "Escape",
-    (e: Event) => {
-      //@ts-ignore
-      e.target?.blur();
+    (e: ShortcutEvent) => {
+      e.target?.blur?.();
       uiState.commandBarText = "";
       uiState.commandBarSearchMode = "general";
       uiState.querySentenceCommandbar = "";
@@ -206,7 +206,7 @@ const onFocus = async (payload: Event) => {
 
   backDisposeHandler = shortcutService.register(
     "Backspace",
-    (e: Event) => {
+    () => {
       if (commandText.value === "") {
         uiState.commandBarText = "";
         uiState.commandBarSearchMode = "general";