Merge pull request #3762 from RSSNext/hotfix/input-element

chore(desktop): Release v0.4.7 for hotfix

Author: Innei

apps/desktop/layer/renderer/src/modules/command/hooks/use-register-hotkey.ts

@@ -6,18 +6,26 @@ import { getCommand } from "./use-command"
 import type { BindingCommandId } from "./use-command-shortcut"
 import { useCommandShortcut } from "./use-command-shortcut"
 
+export interface HotkeyOptions {
+  forceInputElement?: true
+}
 interface RegisterHotkeyOptions<T extends FollowCommandId> {
   shortcut: string
   commandId: T
   args?: Parameters<Extract<FollowCommand, { id: T }>["run"]>
   when?: boolean
+
+  options?: HotkeyOptions
 }
 
+const IGNORE_INPUT_ELEMENT = [HTMLInputElement, HTMLTextAreaElement]
+
 export const useCommandHotkey = <T extends FollowCommandId>({
   shortcut,
   commandId,
   when,
   args,
+  options,
 }: RegisterHotkeyOptions<T>) => {
   useEffect(() => {
     if (!when) {
@@ -35,6 +43,15 @@ export const useCommandHotkey = <T extends FollowCommandId>({
     // Create a handler for each shortcut
     shortcuts.forEach((key) => {
       keyMap[key] = (event) => {
+        const { target } = event
+        if (
+          !options?.forceInputElement &&
+          (IGNORE_INPUT_ELEMENT.some((el) => target instanceof el) ||
+            (target as HTMLElement).getAttribute("contenteditable") === "true")
+        ) {
+          return
+        }
+
         event.preventDefault()
         event.stopPropagation()
 

apps/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "Folo",
   "type": "module",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "private": true,
   "description": "Follow everything in one place",
   "author": "Folo Team",
@@ -28,6 +28,7 @@
     "dev:electron": "electron-vite dev",
     "dev:server": "pnpm run --filter=ssr dev",
     "dev:web": "cross-env WEB_BUILD=1 vite",
+    "hotfix": "vv -c bump.hotfix.config.js",
     "publish": "electron-vite build && electron-forge publish",
     "start": "electron-vite preview",
     "update:main-hash": "tsx plugins/vite/generate-main-hash.ts"

package.json

@@ -19,7 +19,6 @@
     "format": "prettier --write .",
     "format:check": "prettier --check .",
     "generator:i18n-template": "tsx scripts/generate-i18n-locale.ts",
-    "hotfix": "vv -c bump.hotfix.config.js",
     "icons:sync": "tsx scripts/svg-to-rn.ts && prettier --write apps/mobile/src/icons/**/*.tsx && eslint --fix apps/mobile/src/icons/**/*.tsx",
     "icons:update": "tsx scripts/update-icon.ts",
     "lint": "pnpm run lint:tsl && eslint",