From cff8b2fe39fcb9fc229b25ccd86ac9ac98716b55 Mon Sep 17 00:00:00 2001
From: Gabe Yuan <gabe@zq.com>
Date: Wed, 3 Jan 2024 11:59:41 +0800
Subject: [PATCH] feat: move open_tranbox shortcurt to browser commands

---
 public/manifest.firefox.json | 10 +++++++---
 public/manifest.json         | 10 +++++++---
 src/background.js            |  3 +++
 src/config/index.js          |  2 --
 src/views/Options/Tranbox.js | 16 ----------------
 src/views/Selection/index.js | 14 +-------------
 6 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/public/manifest.firefox.json b/public/manifest.firefox.json
index 5db31d8..6f715d0 100644
--- a/public/manifest.firefox.json
+++ b/public/manifest.firefox.json
@@ -28,11 +28,15 @@
       },
       "description": "__MSG_toggle_translate__"
     },
-    "toggleStyle": {
+    "openTranbox": {
       "suggested_key": {
-        "default": "Alt+C"
+        "default": "Alt+S"
       },
-      "description": "__MSG_toggle_style__"
+      "description": "__MSG_open_tranbox__"
+    },
+    "toggleStyle": {
+      "description": "__MSG_toggle_style__",
+      "global": false
     },
     "openOptions": {
       "suggested_key": {
diff --git a/public/manifest.json b/public/manifest.json
index cac9d15..0e5ba81 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -29,11 +29,15 @@
       },
       "description": "__MSG_toggle_translate__"
     },
-    "toggleStyle": {
+    "openTranbox": {
       "suggested_key": {
-        "default": "Alt+C"
+        "default": "Alt+S"
       },
-      "description": "__MSG_toggle_style__"
+      "description": "__MSG_open_tranbox__"
+    },
+    "toggleStyle": {
+      "description": "__MSG_toggle_style__",
+      "global": false
     },
     "openOptions": {
       "suggested_key": {
diff --git a/src/background.js b/src/background.js
index 8e3a0c4..7a71f62 100644
--- a/src/background.js
+++ b/src/background.js
@@ -154,6 +154,9 @@ browser.commands.onCommand.addListener((command) => {
     case CMD_TOGGLE_TRANSLATE:
       sendTabMsg(MSG_TRANS_TOGGLE);
       break;
+    case CMD_OPEN_TRANBOX:
+      sendTabMsg(MSG_OPEN_TRANBOX);
+      break;
     case CMD_TOGGLE_STYLE:
       sendTabMsg(MSG_TRANS_TOGGLE_STYLE);
       break;
diff --git a/src/config/index.js b/src/config/index.js
index 303bada..9cb0c1a 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -347,14 +347,12 @@ export const DEFAULT_INPUT_RULE = {
 };
 
 // 划词翻译
-export const DEFAULT_TRANBOX_SHORTCUT = ["AltLeft", "KeyS"];
 export const DEFAULT_TRANBOX_SETTING = {
   transOpen: true,
   translator: OPT_TRANS_MICROSOFT,
   fromLang: "auto",
   toLang: "zh-CN",
   toLang2: "en",
-  tranboxShortcut: DEFAULT_TRANBOX_SHORTCUT,
   btnOffsetX: 10,
   btnOffsetY: 10,
   hideTranBtn: false,
diff --git a/src/views/Options/Tranbox.js b/src/views/Options/Tranbox.js
index 1b41a51..153e5bf 100644
--- a/src/views/Options/Tranbox.js
+++ b/src/views/Options/Tranbox.js
@@ -4,10 +4,8 @@ import TextField from "@mui/material/TextField";
 import MenuItem from "@mui/material/MenuItem";
 import { useI18n } from "../../hooks/I18n";
 import { OPT_TRANS_ALL, OPT_LANGS_FROM, OPT_LANGS_TO } from "../../config";
-import ShortcutInput from "./ShortcutInput";
 import FormControlLabel from "@mui/material/FormControlLabel";
 import Switch from "@mui/material/Switch";
-import { useCallback } from "react";
 import { limitNumber } from "../../libs/utils";
 import { useTranbox } from "../../hooks/Tranbox";
 
@@ -32,20 +30,12 @@ export default function Tranbox() {
     });
   };
 
-  const handleShortcutInput = useCallback(
-    (val) => {
-      updateTranbox({ tranboxShortcut: val });
-    },
-    [updateTranbox]
-  );
-
   const {
     transOpen,
     translator,
     fromLang,
     toLang,
     toLang2 = "en",
-    tranboxShortcut,
     btnOffsetX,
     btnOffsetY,
     hideTranBtn = false,
@@ -158,12 +148,6 @@ export default function Tranbox() {
           <MenuItem value={false}>{i18n("show")}</MenuItem>
           <MenuItem value={true}>{i18n("hide")}</MenuItem>
         </TextField>
-
-        <ShortcutInput
-          value={tranboxShortcut}
-          onChange={handleShortcutInput}
-          label={i18n("trigger_tranbox_shortcut")}
-        />
       </Stack>
     </Box>
   );
diff --git a/src/views/Selection/index.js b/src/views/Selection/index.js
index 5ada382..2cd864a 100644
--- a/src/views/Selection/index.js
+++ b/src/views/Selection/index.js
@@ -1,10 +1,9 @@
 import { useState, useEffect, useCallback } from "react";
 import TranBtn from "./TranBtn";
 import TranBox from "./TranBox";
-import { shortcutRegister } from "../../libs/shortcut";
 import { sleep, limitNumber } from "../../libs/utils";
 import { isGm } from "../../libs/client";
-import { MSG_OPEN_TRANBOX, DEFAULT_TRANBOX_SHORTCUT } from "../../config";
+import { MSG_OPEN_TRANBOX } from "../../config";
 import { isMobile } from "../../libs/mobile";
 
 export default function Slection({ contextMenus, tranboxSetting, transApis }) {
@@ -76,17 +75,6 @@ export default function Slection({ contextMenus, tranboxSetting, transApis }) {
     };
   }, [tranboxSetting.hideTranBtn]);
 
-  useEffect(() => {
-    const clearShortcut = shortcutRegister(
-      tranboxSetting.tranboxShortcut || DEFAULT_TRANBOX_SHORTCUT,
-      handleTranbox
-    );
-
-    return () => {
-      clearShortcut();
-    };
-  }, [tranboxSetting.tranboxShortcut, handleTranbox]);
-
   useEffect(() => {
     window.addEventListener(MSG_OPEN_TRANBOX, handleTranbox);
     return () => {