From 5f2f319e5b1d8049de69efeeded0ee4c83804a9d Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Fri, 13 Dec 2019 23:11:13 -0500
Subject: [PATCH] Sidebar toggle hotkey now configurable (Closes #1715)

---
 packages/insomnia-app/app/common/hotkeys.js                | 7 +++++++
 packages/insomnia-app/app/main/window-utils.js             | 1 -
 .../insomnia-app/app/ui/components/settings/shortcuts.js   | 1 +
 packages/insomnia-app/app/ui/containers/app.js             | 6 ++++++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/insomnia-app/app/common/hotkeys.js b/packages/insomnia-app/app/common/hotkeys.js
index efaf5142c3..c919c267ca 100644
--- a/packages/insomnia-app/app/common/hotkeys.js
+++ b/packages/insomnia-app/app/common/hotkeys.js
@@ -135,6 +135,8 @@ export const hotKeyRefs = {
 
   SIDEBAR_FOCUS_FILTER: defineHotKey('sidebar_focusFilter', 'Filter Sidebar'),
 
+  SIDEBAR_TOGGLE: defineHotKey('sidebar_toggle', 'Toggle Sidebar'),
+
   RESPONSE_FOCUS: defineHotKey('response_focus', 'Focus Response'),
 
   SHOW_COOKIES_EDITOR: defineHotKey('showCookiesEditor', 'Edit Cookies'),
@@ -265,6 +267,11 @@ const defaultRegistry: HotKeyRegistry = {
     keyComb(true, false, true, false, keyboardKeys.f.keyCode),
   ),
 
+  [hotKeyRefs.SIDEBAR_TOGGLE.id]: keyBinds(
+    keyComb(false, false, false, true, keyboardKeys.backslash.keyCode),
+    keyComb(true, false, false, false, keyboardKeys.backslash.keyCode),
+  ),
+
   [hotKeyRefs.RESPONSE_FOCUS.id]: keyBinds(
     keyComb(false, false, false, true, keyboardKeys.singlequote.keyCode),
     keyComb(true, false, false, false, keyboardKeys.singlequote.keyCode),
diff --git a/packages/insomnia-app/app/main/window-utils.js b/packages/insomnia-app/app/main/window-utils.js
index 83544c5b18..89e595a6ac 100644
--- a/packages/insomnia-app/app/main/window-utils.js
+++ b/packages/insomnia-app/app/main/window-utils.js
@@ -207,7 +207,6 @@ export function createWindow() {
       },
       {
         label: 'Toggle Sidebar',
-        accelerator: 'CmdOrCtrl+\\',
         click: () => {
           const w = BrowserWindow.getFocusedWindow();
           if (!w || !w.webContents) {
diff --git a/packages/insomnia-app/app/ui/components/settings/shortcuts.js b/packages/insomnia-app/app/ui/components/settings/shortcuts.js
index 738afcd65e..bf3ca9cec3 100644
--- a/packages/insomnia-app/app/ui/components/settings/shortcuts.js
+++ b/packages/insomnia-app/app/ui/components/settings/shortcuts.js
@@ -42,6 +42,7 @@ const HOT_KEY_DEFS: Array<HotKeyDefinition> = [
   hotKeyRefs.RESPONSE_FOCUS,
   hotKeyRefs.REQUEST_TOGGLE_HTTP_METHOD_MENU,
   hotKeyRefs.SIDEBAR_FOCUS_FILTER,
+  hotKeyRefs.SIDEBAR_TOGGLE,
   hotKeyRefs.REQUEST_TOGGLE_HISTORY,
   hotKeyRefs.SHOW_AUTOCOMPLETE,
   hotKeyRefs.PREFERENCES_SHOW_GENERAL,
diff --git a/packages/insomnia-app/app/ui/containers/app.js b/packages/insomnia-app/app/ui/containers/app.js
index 908f661ad5..c7600bf586 100644
--- a/packages/insomnia-app/app/ui/containers/app.js
+++ b/packages/insomnia-app/app/ui/containers/app.js
@@ -252,6 +252,12 @@ class App extends PureComponent {
           await this._updateIsVariableUncovered();
         },
       ],
+      [
+        hotKeyRefs.SIDEBAR_TOGGLE,
+        () => {
+          this._handleToggleSidebar();
+        },
+      ],
     ];
   }