From cfc9c42c8dc2a279fc8fea10ce0a14fefb8fd792 Mon Sep 17 00:00:00 2001
From: luwux <luwux.fun@gmail.com>
Date: Mon, 17 Feb 2025 17:58:38 +0800
Subject: [PATCH] improvement(shortcut): Supports Option + Space on Mac
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Supports the Option (⌥) + Space shortcut, as it's the default shortcut for ChatGPT Desktop app to show popup.
---
 src/renderer/src/i18n/locales/en-us.json             | 2 +-
 src/renderer/src/i18n/locales/ja-jp.json             | 2 +-
 src/renderer/src/i18n/locales/ru-ru.json             | 2 +-
 src/renderer/src/i18n/locales/zh-cn.json             | 2 +-
 src/renderer/src/i18n/locales/zh-tw.json             | 2 +-
 src/renderer/src/pages/settings/ShortcutSettings.tsx | 3 ++-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json
index db23fc9ed7..beee13c600 100644
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -715,7 +715,7 @@
       },
       "shortcuts": {
         "action": "Action",
-        "alt_warning": "Mac does not support Option + letters as shortcuts",
+        "alt_warning": "On Mac, Option key combinations only work with the Space key",
         "clear_shortcut": "Clear Shortcut",
         "clear_topic": "Clear Messages",
         "copy_last_message": "Copy Last Message",
diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json
index 8b51990b28..16f489ba97 100644
--- a/src/renderer/src/i18n/locales/ja-jp.json
+++ b/src/renderer/src/i18n/locales/ja-jp.json
@@ -715,7 +715,7 @@
       },
       "shortcuts": {
         "action": "操作",
-        "alt_warning": "MacではOption + 文字をショートカットとして使用できません",
+        "alt_warning": "MacではOptionキーとの組み合わせは、スペースキーのみ使用可能です",
         "clear_shortcut": "ショートカットをクリア",
         "clear_topic": "メッセージを消去",
         "copy_last_message": "最後のメッセージをコピー",
diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json
index fed2c21b81..35b5cbd5e3 100644
--- a/src/renderer/src/i18n/locales/ru-ru.json
+++ b/src/renderer/src/i18n/locales/ru-ru.json
@@ -714,7 +714,7 @@
       },
       "shortcuts": {
         "action": "Действие",
-        "alt_warning": "Mac не поддерживает Option + буквы как горячие клавиши",
+        "alt_warning": "В Mac сочетания с клавишей Option работают только с пробелом",
         "clear_shortcut": "Очистить сочетание клавиш",
         "clear_topic": "Очистить все сообщения",
         "copy_last_message": "Копировать последнее сообщение",
diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json
index f8e37451c2..a5a051b4e5 100644
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -715,7 +715,7 @@
       },
       "shortcuts": {
         "action": "操作",
-        "alt_warning": "Mac 系统不能使用 Option + 字母作为快捷键",
+        "alt_warning": "Mac 系统中 Option 键只能与空格键组合使用",
         "clear_shortcut": "清除快捷键",
         "clear_topic": "清空消息",
         "copy_last_message": "复制上一条消息",
diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json
index ea5da176f4..da003c51d4 100644
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -714,7 +714,7 @@
       },
       "shortcuts": {
         "action": "操作",
-        "alt_warning": "Mac 不能使用 Option + 字母作為快捷鍵",
+        "alt_warning": "Mac 系統中 Option 鍵只能與空白鍵組合使用",
         "clear_shortcut": "清除快捷鍵",
         "clear_topic": "清除所有訊息",
         "copy_last_message": "複製上一条消息",
diff --git a/src/renderer/src/pages/settings/ShortcutSettings.tsx b/src/renderer/src/pages/settings/ShortcutSettings.tsx
index 7d0a2e41cd..9d8cdb2850 100644
--- a/src/renderer/src/pages/settings/ShortcutSettings.tsx
+++ b/src/renderer/src/pages/settings/ShortcutSettings.tsx
@@ -59,7 +59,8 @@ const ShortcutSettings: FC = () => {
     const hasModifier = keys.some((key) => ['Control', 'Ctrl', 'Command', 'Alt', 'Shift'].includes(key))
     const hasNonModifier = keys.some((key) => !['Control', 'Ctrl', 'Command', 'Alt', 'Shift'].includes(key))
 
-    if (isMac && keys.includes('Alt')) {
+    // only allows option + space
+    if (isMac && keys[0] === 'Alt' && !['Space', undefined].includes(keys[1])) {
       window.message.warning({
         content: t('settings.shortcuts.alt_warning'),
         key: 'shortcut-alt-warning'