ctrl-arrow keybind mac only fixes #101 + macos tray fix

ctrl+arrow mac only
jackschedel · Jan 14, 2024 · 65b36fa · 65b36fa
1 parent 7618060
commit 65b36fa
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 21 deletions.
diff --git a/electron/index.cjs b/electron/index.cjs
@@ -37,14 +37,16 @@ contextMenu({
 function handleSetCloseToTray(event, setting) {
   closeToTray = setting;
 
-  if (closeToTray && trayExists) {
-    winTray.destroy();
-    trayExists = false;
-  }
+  if (process.platform !== 'darwin') {
+    if (closeToTray && trayExists) {
+      winTray.destroy();
+      trayExists = false;
+    }
 
-  if (closeToTray && !trayExists) {
-    createTray(win);
-    trayExists = true;
+    if (closeToTray && !trayExists) {
+      createTray(win);
+      trayExists = true;
+    }
   }
 }
 
@@ -126,10 +128,8 @@ const createTray = (window) => {
 
   winTray.on('click', () => {
     if (win) {
-      if (!win.isVisible()) win.show();
-
       if (win.isMinimized()) win.restore();
-
+      if (!win.isVisible()) win.show();
       win.focus();
     }
   });
@@ -139,8 +139,14 @@ const createTray = (window) => {
   return winTray;
 };
 
+app.on('activate', () => {
+  if (win) {
+    win.show();
+  }
+});
+
 app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
+  if (!(process.platform === 'darwin' && closeToTray)) {
     app.quit();
   }
 });

diff --git a/src/App.tsx b/src/App.tsx
@@ -15,7 +15,7 @@ import { ChatInterface } from '@type/chat';
 import { Theme } from '@type/theme';
 import ApiPopup from '@components/ApiPopup';
 import Toast from '@components/Toast';
-import isElectron from '@utils/electron';
+import isElectron, { isMac } from '@utils/electron';
 
 function App() {
   const setChats = useStore((state) => state.setChats);
@@ -121,16 +121,18 @@ function App() {
       pasteSubmit();
     }
 
-    // ctrl+left - Previous chat
-    if (e.ctrlKey && e.key === 'ArrowLeft') {
-      e.preventDefault();
-      goBack();
-    }
+    if (isMac()) {
+      // ctrl+left - Previous chat
+      if (e.ctrlKey && e.key === 'ArrowLeft') {
+        e.preventDefault();
+        goBack();
+      }
 
-    // ctrl+right - Next chat
-    if (e.ctrlKey && e.key === 'ArrowRight') {
-      e.preventDefault();
-      goForward();
+      // ctrl+right - Next chat
+      if (e.ctrlKey && e.key === 'ArrowRight') {
+        e.preventDefault();
+        goForward();
+      }
     }
   };
 

diff --git a/src/utils/electron.ts b/src/utils/electron.ts
@@ -26,6 +26,13 @@ export default function isElectron() {
   return false;
 }
 
+export function isMac(): boolean {
+  if (typeof navigator !== 'undefined') {
+    return /Mac|iMac|Macintosh/.test(navigator.platform);
+  }
+  return false;
+}
+
 declare global {
   interface Window {
     electronAPI: {