From 18d5ff85a5bf1994d77e3af3218c1d9e0e14c4be Mon Sep 17 00:00:00 2001
From: JasonEWNL <jasonewnl@qq.com>
Date: Sat, 2 Mar 2024 15:40:33 +0800
Subject: [PATCH 1/5] Add desktop shortcut support

---
 app/components/sidebar.tsx | 45 ++++++++++++++++++++++++++++++++++++++
 package.json               |  3 ++-
 src-tauri/Cargo.toml       |  1 +
 src-tauri/tauri.conf.json  |  3 +++
 yarn.lock                  |  5 +++++
 5 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/app/components/sidebar.tsx b/app/components/sidebar.tsx
index 69b2e71f871..758a54ee793 100644
--- a/app/components/sidebar.tsx
+++ b/app/components/sidebar.tsx
@@ -31,6 +31,8 @@ import { isIOS, useMobileScreen } from "../utils";
 import dynamic from "next/dynamic";
 import { showConfirm, showToast } from "./ui-lib";
 
+import { register } from "@tauri-apps/api/globalShortcut";
+
 const ChatList = dynamic(async () => (await import("./chat-list")).ChatList, {
   loading: () => null,
 });
@@ -128,6 +130,45 @@ function useDragSideBar() {
   };
 }
 
+function useGlobalShortcut() {
+  const chatStore = useChatStore();
+  const navigate = useNavigate();
+  const config = useAppConfig();
+
+  const handleMasks = async () => {
+    await register("CommandOrControl+Shift+M", () => {
+      if (config.dontShowMaskSplashScreen !== true) {
+        navigate(Path.NewChat, { state: { fromHome: true } });
+      } else {
+        navigate(Path.Masks, { state: { fromHome: true } });
+      }
+    });
+  };
+
+  const handleSettings = async () => {
+    await register("CommandOrControl+,", () => {
+      navigate(Path.Settings);
+    });
+  };
+
+  const handleNewChat = async () => {
+    await register("CommandOrControl+N", () => {
+      if (config.dontShowMaskSplashScreen) {
+        chatStore.newSession();
+        navigate(Path.Chat);
+      } else {
+        navigate(Path.NewChat);
+      }
+    });
+  };
+
+  useEffect(() => {
+    handleMasks();
+    handleSettings();
+    handleNewChat();
+  }, []);
+}
+
 export function SideBar(props: { className?: string }) {
   const chatStore = useChatStore();
 
@@ -143,6 +184,10 @@ export function SideBar(props: { className?: string }) {
 
   useHotKey();
 
+  if (window.__TAURI__) {
+    useGlobalShortcut();
+  }
+
   return (
     <div
       className={`${styles.sidebar} ${props.className} ${
diff --git a/package.json b/package.json
index b31d6a901a0..4520db33aaa 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "@hello-pangea/dnd": "^16.5.0",
     "@next/third-parties": "^14.1.0",
     "@svgr/webpack": "^6.5.1",
+    "@tauri-apps/api": "^1.5.3",
     "@vercel/analytics": "^0.1.11",
     "@vercel/speed-insights": "^1.0.2",
     "emoji-picker-react": "^4.5.15",
@@ -64,4 +65,4 @@
   "resolutions": {
     "lint-staged/yaml": "^2.2.2"
   }
-}
\ No newline at end of file
+}
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index e0892590223..615ccbfa991 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -35,6 +35,7 @@ tauri = { version = "1.5.4", features = [
     "window-start-dragging",
     "window-unmaximize",
     "window-unminimize",
+    "global-shortcut-all",
 ] }
 tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 405d267ff65..35c588dd406 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -50,6 +50,9 @@
       },
       "notification": {
         "all": true
+      },
+      "globalShortcut": {
+        "all": true
       }
     },
     "bundle": {
diff --git a/yarn.lock b/yarn.lock
index db6da708b8b..255e968ab33 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1438,6 +1438,11 @@
   dependencies:
     tslib "^2.4.0"
 
+"@tauri-apps/api@^1.5.3":
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-1.5.3.tgz#f7b362b1f30aadb0a8bbeb7ae111755c0ed33d73"
+  integrity sha512-zxnDjHHKjOsrIzZm6nO5Xapb/BxqUq1tc7cGkFXsFkGTsSWgCPH1D8mm0XS9weJY2OaR73I3k3S+b7eSzJDfqA==
+
 "@tauri-apps/cli-darwin-arm64@1.5.7":
   version "1.5.7"
   resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.5.7.tgz#3435f1b6c4b431e0283f94c3a0bd486be66b24ee"

From 3b2bc8629d67309ea5ebd6a4599a75f84708d73d Mon Sep 17 00:00:00 2001
From: JasonEWNL <32767591+JasonEWNL@users.noreply.github.com>
Date: Sat, 2 Mar 2024 16:21:23 +0800
Subject: [PATCH 2/5] Bypass eslint warning

---
 app/components/sidebar.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/components/sidebar.tsx b/app/components/sidebar.tsx
index 758a54ee793..51b829b6074 100644
--- a/app/components/sidebar.tsx
+++ b/app/components/sidebar.tsx
@@ -166,6 +166,7 @@ function useGlobalShortcut() {
     handleMasks();
     handleSettings();
     handleNewChat();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 }
 

From 96f7db1e92bfec42cf1678a80e4182aca6520777 Mon Sep 17 00:00:00 2001
From: JasonEWNL <32767591+JasonEWNL@users.noreply.github.com>
Date: Sat, 2 Mar 2024 17:03:21 +0800
Subject: [PATCH 3/5] Fix conditionally hook

---
 app/components/sidebar.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/components/sidebar.tsx b/app/components/sidebar.tsx
index 51b829b6074..8322e2d24f3 100644
--- a/app/components/sidebar.tsx
+++ b/app/components/sidebar.tsx
@@ -131,6 +131,10 @@ function useDragSideBar() {
 }
 
 function useGlobalShortcut() {
+  if (!window.__TAURI__) {
+    return;
+  }
+  
   const chatStore = useChatStore();
   const navigate = useNavigate();
   const config = useAppConfig();
@@ -185,9 +189,7 @@ export function SideBar(props: { className?: string }) {
 
   useHotKey();
 
-  if (window.__TAURI__) {
-    useGlobalShortcut();
-  }
+  useGlobalShortcut();
 
   return (
     <div

From 75c5812af259b3dd261f33a45b8b68f24be3a3de Mon Sep 17 00:00:00 2001
From: JasonEWNL <32767591+JasonEWNL@users.noreply.github.com>
Date: Sat, 2 Mar 2024 17:24:09 +0800
Subject: [PATCH 4/5] Move tauri env check inside effect

---
 app/components/sidebar.tsx | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/components/sidebar.tsx b/app/components/sidebar.tsx
index 8322e2d24f3..ca06fb3e0cb 100644
--- a/app/components/sidebar.tsx
+++ b/app/components/sidebar.tsx
@@ -131,10 +131,6 @@ function useDragSideBar() {
 }
 
 function useGlobalShortcut() {
-  if (!window.__TAURI__) {
-    return;
-  }
-  
   const chatStore = useChatStore();
   const navigate = useNavigate();
   const config = useAppConfig();
@@ -167,10 +163,11 @@ function useGlobalShortcut() {
   };
 
   useEffect(() => {
-    handleMasks();
-    handleSettings();
-    handleNewChat();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+    if (window.__TAURI__) {
+      handleMasks();
+      handleSettings();
+      handleNewChat();
+    }
   }, []);
 }
 

From 80ef6a7c96bff001a54530b07d7c04a46da32592 Mon Sep 17 00:00:00 2001
From: JasonEWNL <32767591+JasonEWNL@users.noreply.github.com>
Date: Sat, 2 Mar 2024 17:39:14 +0800
Subject: [PATCH 5/5] Refactor: Add dependencies and ignore eslint warning

---
 app/components/sidebar.tsx | 67 ++++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/app/components/sidebar.tsx b/app/components/sidebar.tsx
index ca06fb3e0cb..6cb71790f52 100644
--- a/app/components/sidebar.tsx
+++ b/app/components/sidebar.tsx
@@ -135,40 +135,45 @@ function useGlobalShortcut() {
   const navigate = useNavigate();
   const config = useAppConfig();
 
-  const handleMasks = async () => {
-    await register("CommandOrControl+Shift+M", () => {
-      if (config.dontShowMaskSplashScreen !== true) {
-        navigate(Path.NewChat, { state: { fromHome: true } });
-      } else {
-        navigate(Path.Masks, { state: { fromHome: true } });
-      }
-    });
-  };
+  useEffect(() => {
+    // Early return if not in a Tauri environment
+    if (!window.__TAURI__) {
+      return;
+    }
 
-  const handleSettings = async () => {
-    await register("CommandOrControl+,", () => {
-      navigate(Path.Settings);
-    });
-  };
+    const handleMasks = async () => {
+      await register("CommandOrControl+Shift+M", () => {
+        if (config.dontShowMaskSplashScreen !== true) {
+          navigate(Path.NewChat, { state: { fromHome: true } });
+        } else {
+          navigate(Path.Masks, { state: { fromHome: true } });
+        }
+      });
+    };
 
-  const handleNewChat = async () => {
-    await register("CommandOrControl+N", () => {
-      if (config.dontShowMaskSplashScreen) {
-        chatStore.newSession();
-        navigate(Path.Chat);
-      } else {
-        navigate(Path.NewChat);
-      }
-    });
-  };
+    const handleSettings = async () => {
+      await register("CommandOrControl+,", () => {
+        navigate(Path.Settings);
+      });
+    };
 
-  useEffect(() => {
-    if (window.__TAURI__) {
-      handleMasks();
-      handleSettings();
-      handleNewChat();
-    }
-  }, []);
+    const handleNewChat = async () => {
+      await register("CommandOrControl+N", () => {
+        if (config.dontShowMaskSplashScreen) {
+          chatStore.newSession();
+          navigate(Path.Chat);
+        } else {
+          navigate(Path.NewChat);
+        }
+      });
+    };
+
+    // Shortcut registration
+    handleMasks();
+    handleSettings();
+    handleNewChat();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [chatStore, navigate, config]);
 }
 
 export function SideBar(props: { className?: string }) {