Fixed useGlobalShortcut deps

xianyuntang · Jan 13, 2025 · e87895f · e87895f
1 parent 83b7ce5
commit e87895f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/src/components/app-navbar/terminal-shortcuts/terminal-shortcuts.tsx b/src/components/app-navbar/terminal-shortcuts/terminal-shortcuts.tsx
@@ -14,7 +14,7 @@ import { useTerminalStore } from "../../../stores";
 const TerminalShortcuts = () => {
   const activeTerminal = useTerminalStore((state) => state.activeTerminal);
   const setActiveTerminal = useTerminalStore(
-    (state) => state.setActiveTerminal,
+    (state) => state.setActiveTerminal
   );
   const openedTerminals = useTerminalStore((state) => state.openedTerminals);
   const removeTerminal = useTerminalStore((state) => state.removeTerminal);
@@ -52,8 +52,8 @@ const TerminalShortcuts = () => {
               borderRadius: theme.spacing(0.5),
               position: "relative",
               "&:hover .MuiListItemIcon-root": {
-                visibility: "visible", // hover 时显示 CloseIcon
-                opacity: 1, // 配合动画效果
+                visibility: "visible",
+                opacity: 1,
               },
             })}
             onClick={() => handleShortcutClick(terminal)}

diff --git a/src/components/pages/terminals-page/terminal-view/terminal-view.tsx b/src/components/pages/terminals-page/terminal-view/terminal-view.tsx
@@ -64,9 +64,15 @@ export const TerminalView = ({ terminal }: TerminalViewProps) => {
     return activeTerminal === terminal;
   }, [activeTerminal, terminal]);
 
-  useGlobalShortcut("CommandOrControl+I", () => {
-    setAgentOpen((v) => !v);
-  });
+  useGlobalShortcut(
+    "CommandOrControl+I",
+    () => {
+      if (isTerminalActive) {
+        setAgentOpen((v) => !v);
+      }
+    },
+    [isTerminalActive]
+  );
 
   const { refetch, isError } = useQuery({
     queryKey: [terminal, host],

diff --git a/src/hooks/global-shortcut.ts b/src/hooks/global-shortcut.ts
@@ -5,9 +5,13 @@ import {
   ShortcutEvent,
   unregister,
 } from "@tauri-apps/plugin-global-shortcut";
-import { useEffect } from "react";
+import { DependencyList, useEffect } from "react";
 
-export const useGlobalShortcut = (shortcuts: string, onPressed: () => void) => {
+export const useGlobalShortcut = (
+  shortcuts: string,
+  onPressed: () => void,
+  deps?: DependencyList
+) => {
   const handleEvent = useThrottleCallback((event: ShortcutEvent) => {
     if (event.state === "Pressed") {
       onPressed();
@@ -30,5 +34,6 @@ export const useGlobalShortcut = (shortcuts: string, onPressed: () => void) => {
     return () => {
       void unregisterFn();
     };
-  }, [handleEvent, shortcuts]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [handleEvent, shortcuts, ...(deps || [])]);
 };