fix: 🐛 Search for shortcut key conflicts

electron/events/shortcuts/index.js

@@ -1,13 +1,12 @@
-import { globalShortcut } from 'electron'
+// import { globalShortcut } from 'electron'
 
 export default (mainWindow) => {
-  mainWindow.on('focus', () => {
-    globalShortcut.register('CommandOrControl+F', (event) => {
-      mainWindow.webContents.send('focus-on-search')
-    })
-  })
-
-  mainWindow.on('blur', () => {
-    globalShortcut.unregister('CommandOrControl+F')
-  })
+  // mainWindow.on('focus', () => {
+  //   globalShortcut.register('CommandOrControl+F', (event) => {
+  //     mainWindow.webContents.send('focus-on-search')
+  //   })
+  // })
+  // mainWindow.on('blur', () => {
+  //   globalShortcut.unregister('CommandOrControl+F')
+  // })
 }

package.json

@@ -36,6 +36,7 @@
     "@unocss/transformer-directives": "^0.59.4",
     "@viarotel-org/unocss-preset-shades": "^0.8.2",
     "@vitejs/plugin-vue": "^5.0.4",
+    "@vueuse/core": "^10.9.0",
     "dayjs": "^1.11.11",
     "electron": "^30.0.3",
     "electron-builder": "^24.13.3",

src/components/AppSearch/index.vue

@@ -15,31 +15,33 @@
 </template>
 
 <script setup>
+import { useMagicKeys, whenever } from '@vueuse/core'
+
 import { useThemeStore } from '$/store/theme/index.js'
 
 const themeStore = useThemeStore()
 
 const activeTab = inject('activeTab')
 
-const shortcutTip = `${
-  window.electron.process.platform === 'darwin' ? 'Command' : 'Ctrl'
-} + F`
+const shortcutTip = 'Ctrl + F'
 
 watch([() => themeStore.value, () => activeTab.value], () => {
   closeSearchModal()
 })
 
-window.electron.ipcRenderer.on('focus-on-search', (event, ret) => {
-  openSearchModal()
-})
-
 function openSearchModal() {
   window.findInPageModal.open({ isDark: themeStore.isDark })
 }
 
 function closeSearchModal() {
   window.findInPageModal.close()
 }
+
+const { ctrl_f } = useMagicKeys()
+
+whenever(ctrl_f, () => {
+  openSearchModal()
+})
 </script>
 
 <style lang="postcss"></style>