Merge 7230949 into b942002

main.js

@@ -1,4 +1,10 @@
-const { ipcMain: ipc, app, nativeTheme, Menu } = require('electron/main');
+const {
+  ipcMain: ipc,
+  app,
+  nativeTheme,
+  globalShortcut,
+  Menu,
+} = require('electron/main');
 const { menubar } = require('menubar');
 const { autoUpdater } = require('electron-updater');
 const { onFirstRunMaybe } = require('./first-run');
@@ -122,6 +128,27 @@ app.whenReady().then(async () => {
     }
   });
 
+  ipc.on(
+    'gitify:update-keyboard-shortcut',
+    (_, { enabled, keyboardShortcut }) => {
+      console.log('enabled', enabled);
+
+      console.log('keyboardShortcut', keyboardShortcut);
+      if (!enabled) {
+        globalShortcut.unregister(keyboardShortcut);
+        return;
+      }
+
+      globalShortcut.register(keyboardShortcut, () => {
+        if (mb.window.isVisible()) {
+          mb.hideWindow();
+        } else {
+          mb.showWindow();
+        }
+      });
+    },
+  );
+
   ipc.on('gitify:update-auto-launch', (_, settings) => {
     app.setLoginItemSettings(settings);
   });

src/__mocks__/state-mocks.ts

@@ -83,6 +83,7 @@ export const mockSettings: SettingsState = {
   showAccountHostname: false,
   delayNotificationState: false,
   showPills: true,
+  keyboardShortcut: true,
 };
 
 export const mockState: GitifyState = {

src/context/App.test.tsx

@@ -379,6 +379,7 @@ describe('context/App.tsx', () => {
           showAccountHostname: false,
           delayNotificationState: false,
           showPills: true,
+          keyboardShortcut: true,
         } as SettingsState,
       });
     });
@@ -430,6 +431,7 @@ describe('context/App.tsx', () => {
           showAccountHostname: false,
           delayNotificationState: false,
           showPills: true,
+          keyboardShortcut: true,
         } as SettingsState,
       });
     });

src/context/App.tsx

@@ -31,7 +31,11 @@ import {
   getUserData,
   removeAccount,
 } from '../utils/auth/utils';
-import { setAutoLaunch, updateTrayTitle } from '../utils/comms';
+import {
+  setAutoLaunch,
+  setKeyboardShortcut,
+  updateTrayTitle,
+} from '../utils/comms';
 import Constants from '../utils/constants';
 import { getNotificationCount } from '../utils/notifications';
 import { clearState, loadState, saveState } from '../utils/storage';
@@ -57,6 +61,7 @@ export const defaultSettings: SettingsState = {
   showAccountHostname: false,
   delayNotificationState: false,
   showPills: true,
+  keyboardShortcut: true,
 };
 
 interface AppContextState {
@@ -140,6 +145,10 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
     }
   }, [settings.showNotificationsCountInTray, notifications]);
 
+  useEffect(() => {
+    setKeyboardShortcut(settings.keyboardShortcut);
+  }, [settings.keyboardShortcut]);
+
   const updateSetting = useCallback(
     (name: keyof SettingsState, value: boolean | Theme) => {
       if (name === 'openAtStartup') {
@@ -220,6 +229,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
     }
 
     if (existing.settings) {
+      setKeyboardShortcut(existing.settings.keyboardShortcut);
       setSettings({ ...defaultSettings, ...existing.settings });
       return existing.settings;
     }

src/routes/Settings.test.tsx

@@ -378,6 +378,31 @@ describe('routes/Settings.tsx', () => {
   });
 
   describe('System section', () => {
+    it('should toggle the keyboardShortcut checkbox', async () => {
+      await act(async () => {
+        render(
+          <AppContext.Provider
+            value={{
+              auth: mockAuth,
+              settings: mockSettings,
+              updateSetting,
+            }}
+          >
+            <MemoryRouter>
+              <SettingsRoute />
+            </MemoryRouter>
+          </AppContext.Provider>,
+        );
+      });
+
+      fireEvent.click(screen.getByLabelText('Enable keyboard shortcut'), {
+        target: { checked: true },
+      });
+
+      expect(updateSetting).toHaveBeenCalledTimes(1);
+      expect(updateSetting).toHaveBeenCalledWith('keyboardShortcut', false);
+    });
+
     it('should toggle the showNotificationsCountInTray checkbox', async () => {
       await act(async () => {
         render(

src/routes/Settings.tsx

@@ -23,6 +23,7 @@ import { AppContext } from '../context/App';
 import { BUTTON_CLASS_NAME } from '../styles/gitify';
 import { Theme } from '../types';
 import { getAppVersion, quitApp } from '../utils/comms';
+import Constants from '../utils/constants';
 import {
   openGitHubParticipatingDocs,
   openGitifyReleaseNotes,
@@ -211,7 +212,7 @@ export const SettingsRoute: FC = () => {
               <div>
                 Keep the notification within Gitify window upon interaction
                 (click, mark as read, mark as done, etc) until the next refresh
-                window (scheduled or user initiated)
+                window (scheduled or user initiated).
               </div>
             }
           />
@@ -221,6 +222,20 @@ export const SettingsRoute: FC = () => {
           <legend id="system" className="mb-1 mt-2 font-semibold">
             System
           </legend>
+          <Checkbox
+            name="kbdShortcutEnabled"
+            label="Enable keyboard shortcut"
+            checked={!!settings.keyboardShortcut}
+            onChange={(evt) =>
+              updateSetting('keyboardShortcut', evt.target.checked)
+            }
+            tooltip={
+              <div>
+                When enabled you can choose to use the hotkeys{' '}
+                {Constants.DEFAULT_KEYBOARD_SHORTCUT} to show or hide Gitify.
+              </div>
+            }
+          />
           {isMacOS() && (
             <Checkbox
               name="showNotificationsCountInTray"

src/types.ts

@@ -74,6 +74,7 @@ interface SystemSettingsState {
   playSound: boolean;
   openAtStartup: boolean;
   showNotificationsCountInTray: boolean;
+  keyboardShortcut: boolean;
 }
 
 export interface GitifyState {

src/utils/comms.ts

@@ -1,5 +1,6 @@
 import { ipcRenderer, shell } from 'electron';
 import type { Link } from '../types';
+import Constants from './constants';
 
 export function openExternalLink(url: Link): void {
   if (!url.toLowerCase().startsWith('file:///')) {
@@ -30,6 +31,13 @@ export function setAutoLaunch(value: boolean): void {
   });
 }
 
+export function setKeyboardShortcut(keyboardShortcut: boolean): void {
+  ipcRenderer.send('gitify:update-keyboard-shortcut', {
+    enabled: keyboardShortcut,
+    keyboardShortcut: Constants.DEFAULT_KEYBOARD_SHORTCUT,
+  });
+}
+
 export function updateTrayIcon(notificationsLength = 0): void {
   if (notificationsLength > 0) {
     ipcRenderer.send('gitify:icon-active');

src/utils/constants.ts

@@ -23,6 +23,8 @@ export const Constants = {
 
   FETCH_INTERVAL: 60000,
 
+  DEFAULT_KEYBOARD_SHORTCUT: 'CommandOrControl+Shift+G',
+
   // GitHub Docs
   GITHUB_DOCS: {
     OAUTH_URL: