Merge branch 'release/3.75.4'

purocean · Aug 6, 2024 · 4b4b54c · 4b4b54c
2 parents cfbf127 + 06b810d
commit 4b4b54c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -76,11 +76,12 @@ For more information on how to use the following functions, please see [characte
 
 ## Changelogs
 
-### [v3.75.3](https://github.com/purocean/yn/releases/tag/v3.75.3) 2024-08-05
+### [v3.75.4](https://github.com/purocean/yn/releases/tag/v3.75.4) 2024-08-06
 
-[Windows](https://github.com/purocean/yn/releases/download/v3.75.3/Yank-Note-win-x64-3.75.3.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.75.3/Yank-Note-mac-arm64-3.75.3.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.75.3/Yank-Note-mac-x64-3.75.3.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.75.3/Yank-Note-linux-x86_64-3.75.3.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/
+[Windows](https://github.com/purocean/yn/releases/download/v3.75.4/Yank-Note-win-x64-3.75.4.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.75.4/Yank-Note-mac-arm64-3.75.4.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.75.4/Yank-Note-mac-x64-3.75.4.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.75.4/Yank-Note-linux-x86_64-3.75.4.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.75.4/Yank-Note-linux-amd64-3.75.4.deb)
 
-1. feat: support disabling AI Copilot lightbulb suggestions in the editor
+1. fix: Correct the error in detecting supported file types.
+2. fix: Resolve the issue where the shortcut key triggers an accent key and inserts additional characters in the editor on macOS.
 
 [More release notes](https://github.com/purocean/yn/releases)
 

diff --git a/README_ZH-CN.md b/README_ZH-CN.md
@@ -76,11 +76,12 @@
 
 ## 更新日志
 
-### [v3.75.3](https://github.com/purocean/yn/releases/tag/v3.75.3) 2024-08-05
+### [v3.75.4](https://github.com/purocean/yn/releases/tag/v3.75.4) 2024-08-06
 
-[Windows](https://github.com/purocean/yn/releases/download/v3.75.3/Yank-Note-win-x64-3.75.3.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.75.3/Yank-Note-mac-arm64-3.75.3.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.75.3/Yank-Note-mac-x64-3.75.3.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.75.3/Yank-Note-linux-x86_64-3.75.3.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.75.3/Yank-Note-linux-amd64-3.75.3.deb)
+[Windows](https://github.com/purocean/yn/releases/download/v3.75.4/Yank-Note-win-x64-3.75.4.exe) | [macOS arm64](https://github.com/purocean/yn/releases/download/v3.75.4/Yank-Note-mac-arm64-3.75.4.dmg) | [macOS x64](https://github.com/purocean/yn/releases/download/v3.75.4/Yank-Note-mac-x64-3.75.4.dmg) | [Linux AppImage](https://github.com/purocean/yn/releases/download/v3.75.4/Yank-Note-linux-x86_64-3.75.4.AppImage) | [Linux deb](https://github.com/purocean/yn/releases/download/v3.75.4/Yank-Note-linux-amd64-3.75.4.deb)
 
-1. feat: 支持关闭编辑器的 AI Copilot 灯泡提示
+1. fix: 修复支持的文件类型检测错误
+2. fix: 修复 macOS 上快捷键触发重音键会在编辑器插入额外字符问题
 
 [更多发布说明](https://github.com/purocean/yn/releases)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yank.note",
-  "version": "3.75.3",
+  "version": "3.75.4",
   "description": "Yank Note: A highly extensible Markdown editor, designed for productivity.",
   "main": "dist/main/app.js",
   "license": "AGPL-3.0",

diff --git a/src/renderer/core/keybinding.ts b/src/renderer/core/keybinding.ts
@@ -216,6 +216,14 @@ export function keydownHandler (e: KeyboardEvent) {
         continue
       }
 
+      // if user press `Option + E` in macOS, the `Dead` key will be triggered and insert `´`. so we need to blur and focus the input element to prevent this.s
+      if (isMacOS && e.key === 'Dead' && e.target && 'focus' in e.target && 'blur' in e.target) {
+        (e.target as any).blur()
+        setTimeout(() => {
+          (e.target as any).focus()
+        }, 0)
+      }
+
       e.stopPropagation()
       e.preventDefault()
       getActionHandler(item.name)()

diff --git a/src/renderer/others/file-extensions.ts b/src/renderer/others/file-extensions.ts
@@ -155,7 +155,7 @@ const extensions = [
 
 const supported = (name: string) => {
   name = name.toLowerCase()
-  const ext = extname(name) || name.startsWith('.') ? name : ''
+  const ext = extname(name) || (name.startsWith('.') ? name : '')
   return ext ? extensions.includes(ext) : false
 }