From 81119acaf231c0c09cede15072a4a87e07021186 Mon Sep 17 00:00:00 2001
From: "Alex \"mcmonkey\" Goodwin"
 <4000772+mcmonkey4eva@users.noreply.github.com>
Date: Fri, 27 Sep 2024 08:25:56 +0900
Subject: [PATCH] add a hotkey for settings (#991)

* add a hotkey for settings

for #942

* playwright test for settings menu hotkey

* make hotkey intercompatible with both old and new UI
---
 browser_tests/interaction.spec.ts                    | 12 ++++++++++++
 src/components/sidebar/SidebarSettingsToggleIcon.vue |  1 +
 src/extensions/core/keybinds.ts                      |  3 ++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/browser_tests/interaction.spec.ts b/browser_tests/interaction.spec.ts
index 1863c73f0..977c5c143 100644
--- a/browser_tests/interaction.spec.ts
+++ b/browser_tests/interaction.spec.ts
@@ -422,3 +422,15 @@ test.describe('Load duplicate workflow', () => {
     expect(await comfyPage.getGraphNodesCount()).toBe(1)
   })
 })
+
+test.describe('Menu interactions', () => {
+  test('Can open settings with hotkey', async ({ comfyPage }) => {
+    await comfyPage.page.keyboard.down('ControlOrMeta')
+    await comfyPage.page.keyboard.press(',')
+    await comfyPage.page.keyboard.up('ControlOrMeta')
+    const settingsLocator = comfyPage.page.locator('.settings-container')
+    await expect(settingsLocator).toBeVisible()
+    await comfyPage.page.keyboard.press('Escape')
+    await expect(settingsLocator).not.toBeVisible()
+  })
+})
diff --git a/src/components/sidebar/SidebarSettingsToggleIcon.vue b/src/components/sidebar/SidebarSettingsToggleIcon.vue
index 7e513cb90..6dd93797d 100644
--- a/src/components/sidebar/SidebarSettingsToggleIcon.vue
+++ b/src/components/sidebar/SidebarSettingsToggleIcon.vue
@@ -1,6 +1,7 @@
 <template>
   <SidebarIcon
     icon="pi pi-cog"
+    class="comfy-settings-btn"
     @click="showSetting"
     :tooltip="$t('settings')"
   />
diff --git a/src/extensions/core/keybinds.ts b/src/extensions/core/keybinds.ts
index 4804819b9..d1f4ffd3c 100644
--- a/src/extensions/core/keybinds.ts
+++ b/src/extensions/core/keybinds.ts
@@ -41,7 +41,8 @@ app.registerExtension({
         o: '#comfy-file-input',
         Backspace: '#comfy-clear-button',
         d: '#comfy-load-default-button',
-        g: '#comfy-group-selected-nodes-button'
+        g: '#comfy-group-selected-nodes-button',
+        ',': '.comfy-settings-btn'
       }
 
       const modifierKeybindId = modifierKeyIdMap[event.key]