From 039b99cb4534b2095b55e00385f9704dfc67ccce Mon Sep 17 00:00:00 2001
From: joey <3114306330@qq.com>
Date: Mon, 20 Apr 2026 16:14:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(comments):=20=E4=BF=AE=E5=A4=8D=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=B3=95=E7=BB=84=E5=90=88=E8=BE=93=E5=85=A5=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E9=94=AE=E7=9B=98=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在评论创建组件中添加输入法组合状态检测
- 在评论编辑表单中添加输入法组合状态检测
- 在编辑器扩展中添加组合输入状态检查
- 新增 isComposingKeyboardEvent 辅助函数处理输入法事件
---
 apps/web/core/components/comments/card/edit-form.tsx | 3 +++
 apps/web/core/components/comments/comment-create.tsx | 3 +++
 apps/web/core/helpers/keyboard.ts                    | 2 ++
 packages/editor/src/core/extensions/enter-key.ts     | 4 ++++
 4 files changed, 12 insertions(+)
 create mode 100644 apps/web/core/helpers/keyboard.ts

diff --git a/apps/web/core/components/comments/card/edit-form.tsx b/apps/web/core/components/comments/card/edit-form.tsx
index 9be8b135521..6ad23271c6a 100644
--- a/apps/web/core/components/comments/card/edit-form.tsx
+++ b/apps/web/core/components/comments/card/edit-form.tsx
@@ -14,6 +14,7 @@ import type { TCommentsOperations, TIssueComment } from "@plane/types";
 import { cn, isCommentEmpty } from "@plane/utils";
 // components
 import { LiteTextEditor } from "@/components/editor/lite-text";
+import { isComposingKeyboardEvent } from "@/helpers/keyboard";
 
 type Props = {
   activityOperations: TCommentsOperations;
@@ -77,6 +78,8 @@ export const CommentCardEditForm = observer(function CommentCardEditForm(props:
     <form className="flex flex-col gap-2">
       <div
         onKeyDown={(e) => {
+          if (isComposingKeyboardEvent(e.nativeEvent)) return;
+
           if (e.key === "Enter" && !e.shiftKey && !e.ctrlKey && !e.metaKey && !isEmpty) handleSubmit(onEnter)(e);
         }}
       >
diff --git a/apps/web/core/components/comments/comment-create.tsx b/apps/web/core/components/comments/comment-create.tsx
index d230a5be93e..44681286398 100644
--- a/apps/web/core/components/comments/comment-create.tsx
+++ b/apps/web/core/components/comments/comment-create.tsx
@@ -14,6 +14,7 @@ import type { TIssueComment, TCommentsOperations } from "@plane/types";
 import { cn, isCommentEmpty } from "@plane/utils";
 // components
 import { LiteTextEditor } from "@/components/editor/lite-text";
+import { isComposingKeyboardEvent } from "@/helpers/keyboard";
 // hooks
 import { useWorkspace } from "@/hooks/store/use-workspace";
 // services
@@ -94,6 +95,8 @@ export const CommentCreate = observer(function CommentCreate(props: TCommentCrea
     <div
       className={cn("sticky bottom-0 z-[4] bg-surface-1 sm:static")}
       onKeyDown={(e) => {
+        if (isComposingKeyboardEvent(e.nativeEvent)) return;
+
         if (
           e.key === "Enter" &&
           !e.shiftKey &&
diff --git a/apps/web/core/helpers/keyboard.ts b/apps/web/core/helpers/keyboard.ts
new file mode 100644
index 00000000000..5320c0e2a84
--- /dev/null
+++ b/apps/web/core/helpers/keyboard.ts
@@ -0,0 +1,2 @@
+export const isComposingKeyboardEvent = (event: Pick<KeyboardEvent, "isComposing" | "keyCode">) =>
+  event.isComposing || event.keyCode === 229;
diff --git a/packages/editor/src/core/extensions/enter-key.ts b/packages/editor/src/core/extensions/enter-key.ts
index bfe86b1de98..107fd82ebb0 100644
--- a/packages/editor/src/core/extensions/enter-key.ts
+++ b/packages/editor/src/core/extensions/enter-key.ts
@@ -15,6 +15,10 @@ export const EnterKeyExtension = (onEnterKeyPress?: () => void) =>
     addKeyboardShortcuts(this) {
       return {
         Enter: () => {
+          if (this.editor.view.composing) {
+            return false;
+          }
+
           const { activeDropbarExtensions } = this.editor.storage.utility;
 
           if (activeDropbarExtensions.length === 0) {