fix: hotkeys

hemengke1997 · Sep 24, 2024 · 4690915 · 4690915
1 parent b962188
commit 4690915
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 1.15.3 (2024-09-24)
+
+### Fix
+
+- 修复图片首次触发快捷键时，非聚焦图片触发快捷键的问题
+
 ## 1.15.2 (2024-09-24)
 
 ### Fix

diff --git a/src/webview/image-manager/components/lazy-image/index.tsx b/src/webview/image-manager/components/lazy-image/index.tsx
@@ -186,6 +186,7 @@ function LazyImage(props: LazyImageProps) {
   const setKeybindRef = useHotkeys<HTMLDivElement>(
     [Key.Enter, `mod+${Key.Backspace}`, Key.Delete, `mod+c`],
     (e) => {
+      if (e.target !== keybindRef.current) return
       if (contextMenu?.enable?.fs) {
         switch (e.key) {
           case Key.Enter: {
@@ -225,7 +226,9 @@ function LazyImage(props: LazyImageProps) {
 
   const keybindRef = useRef<HTMLDivElement>(null)
   useEffect(() => {
-    setKeybindRef(keybindRef.current)
+    if (keybindRef.current) {
+      setKeybindRef(keybindRef.current)
+    }
   }, [keybindRef.current])
 
   const sizeWarning = useMemo((): boolean => {