From 1baa42bef6be403d9c065a7c3ea49871f1fb8a68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AC=A2?= <lh01217311@antgroup.com>
Date: Tue, 15 Jul 2025 10:50:17 +0800
Subject: [PATCH 1/5] feat: Enter keydown Add IME judgment

---
 src/TextArea.tsx     |  4 ++--
 tests/index.spec.tsx | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/src/TextArea.tsx b/src/TextArea.tsx
index 67e189b..1085c84 100644
--- a/src/TextArea.tsx
+++ b/src/TextArea.tsx
@@ -1,9 +1,9 @@
-import clsx from 'classnames';
 import { BaseInput } from '@rc-component/input';
 import { type HolderRef } from '@rc-component/input/lib/BaseInput';
 import useCount from '@rc-component/input/lib/hooks/useCount';
 import { resolveOnChange } from '@rc-component/input/lib/utils/commonUtils';
 import useMergedState from '@rc-component/util/lib/hooks/useMergedState';
+import clsx from 'classnames';
 import type { ReactNode } from 'react';
 import React, { useEffect, useImperativeHandle, useRef } from 'react';
 import ResizableTextArea from './ResizableTextArea';
@@ -154,7 +154,7 @@ const TextArea = React.forwardRef<TextAreaRef, TextAreaProps>(
     };
 
     const handleKeyDown = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
-      if (e.key === 'Enter' && onPressEnter) {
+      if (e.key === 'Enter' && onPressEnter && !e.nativeEvent.isComposing) {
         onPressEnter(e);
       }
       onKeyDown?.(e);
diff --git a/tests/index.spec.tsx b/tests/index.spec.tsx
index ab25053..f06848b 100644
--- a/tests/index.spec.tsx
+++ b/tests/index.spec.tsx
@@ -381,3 +381,45 @@ describe('TextArea', () => {
     });
   });
 });
+
+describe.only('TextArea IME behavior', () => {
+  it('should ignore Enter during composition', () => {
+    const onPressEnter = jest.fn();
+    const { container } = render(<TextArea onPressEnter={onPressEnter} />);
+    const textarea = container.querySelector('textarea')!;
+
+    fireEvent.compositionStart(textarea);
+
+    fireEvent.keyDown(textarea, {
+      key: 'Enter',
+      keyCode: 229,
+      isComposing: true,
+      nativeEvent: { isComposing: true },
+    });
+
+    fireEvent.compositionUpdate(textarea, { data: '开始' });
+
+    expect(onPressEnter).not.toHaveBeenCalled();
+
+    fireEvent.compositionEnd(textarea);
+    fireEvent.keyDown(textarea, {
+      key: 'Enter',
+      nativeEvent: { isComposing: false },
+    });
+    expect(onPressEnter).toHaveBeenCalledTimes(1);
+  });
+
+  it('should trigger Enter for non-composition (normal) input', () => {
+    const onPressEnter = jest.fn();
+    const { container } = render(<TextArea onPressEnter={onPressEnter} />);
+    const textarea = container.querySelector('textarea')!;
+
+    fireEvent.change(textarea, { target: { value: 'test' } });
+
+    fireEvent.keyDown(textarea, {
+      key: 'Enter',
+    });
+    expect(onPressEnter).toHaveBeenCalledTimes(1);
+    expect(textarea.value).toBe('test');
+  });
+});

From d00efd2209377ef7f2b86ced35780232a9ec29d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AC=A2?= <lh01217311@antgroup.com>
Date: Tue, 15 Jul 2025 13:57:59 +0800
Subject: [PATCH 2/5] build: Upgrade  @rc-component/input 1.0.0 to 1.1.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3785dbb..2077cc8 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "classnames": "^2.2.1",
-    "@rc-component/input": "~1.0.0",
+    "@rc-component/input": "~1.1.0",
     "@rc-component/resize-observer": "^1.0.0",
     "@rc-component/util": "^1.2.0"
   },

From 60f0d798eee3ddb062348b4992af854695f905b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AC=A2?= <lh01217311@antgroup.com>
Date: Tue, 15 Jul 2025 14:02:34 +0800
Subject: [PATCH 3/5] style: Restore Formatting

---
 src/TextArea.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TextArea.tsx b/src/TextArea.tsx
index 1085c84..20038ce 100644
--- a/src/TextArea.tsx
+++ b/src/TextArea.tsx
@@ -1,9 +1,9 @@
+import clsx from 'classnames';
 import { BaseInput } from '@rc-component/input';
 import { type HolderRef } from '@rc-component/input/lib/BaseInput';
 import useCount from '@rc-component/input/lib/hooks/useCount';
 import { resolveOnChange } from '@rc-component/input/lib/utils/commonUtils';
 import useMergedState from '@rc-component/util/lib/hooks/useMergedState';
-import clsx from 'classnames';
 import type { ReactNode } from 'react';
 import React, { useEffect, useImperativeHandle, useRef } from 'react';
 import ResizableTextArea from './ResizableTextArea';

From 45cdc790e8457070f90fb705dfc3f307f93b4c5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AC=A2?= <lh01217311@antgroup.com>
Date: Tue, 15 Jul 2025 14:19:31 +0800
Subject: [PATCH 4/5] test: remove only

---
 tests/index.spec.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/index.spec.tsx b/tests/index.spec.tsx
index f06848b..3703230 100644
--- a/tests/index.spec.tsx
+++ b/tests/index.spec.tsx
@@ -382,7 +382,7 @@ describe('TextArea', () => {
   });
 });
 
-describe.only('TextArea IME behavior', () => {
+describe('TextArea IME behavior', () => {
   it('should ignore Enter during composition', () => {
     const onPressEnter = jest.fn();
     const { container } = render(<TextArea onPressEnter={onPressEnter} />);

From 0ed37416fc203187e3ceeb414da56dc0a0bbdf2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AC=A2?= <lh01217311@antgroup.com>
Date: Tue, 15 Jul 2025 14:24:59 +0800
Subject: [PATCH 5/5] test: update snap

---
 tests/__snapshots__/allowClear.test.tsx.snap | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/__snapshots__/allowClear.test.tsx.snap b/tests/__snapshots__/allowClear.test.tsx.snap
index db1093c..a9783b9 100644
--- a/tests/__snapshots__/allowClear.test.tsx.snap
+++ b/tests/__snapshots__/allowClear.test.tsx.snap
@@ -12,6 +12,7 @@ exports[`should support allowClear should not show icon if defaultValue is undef
   >
     <button
       class="rc-textarea-clear-icon rc-textarea-clear-icon-hidden"
+      tabindex="-1"
       type="button"
     >
       ✖
@@ -32,6 +33,7 @@ exports[`should support allowClear should not show icon if defaultValue is undef
   >
     <button
       class="rc-textarea-clear-icon rc-textarea-clear-icon-hidden"
+      tabindex="-1"
       type="button"
     >
       ✖
@@ -52,6 +54,7 @@ exports[`should support allowClear should not show icon if defaultValue is undef
   >
     <button
       class="rc-textarea-clear-icon rc-textarea-clear-icon-hidden"
+      tabindex="-1"
       type="button"
     >
       ✖
@@ -72,6 +75,7 @@ exports[`should support allowClear should not show icon if value is undefined, n
   >
     <button
       class="rc-textarea-clear-icon rc-textarea-clear-icon-hidden"
+      tabindex="-1"
       type="button"
     >
       ✖
@@ -92,6 +96,7 @@ exports[`should support allowClear should not show icon if value is undefined, n
   >
     <button
       class="rc-textarea-clear-icon rc-textarea-clear-icon-hidden"
+      tabindex="-1"
       type="button"
     >
       ✖
@@ -112,6 +117,7 @@ exports[`should support allowClear should not show icon if value is undefined, n
   >
     <button
       class="rc-textarea-clear-icon rc-textarea-clear-icon-hidden"
+      tabindex="-1"
       type="button"
     >
       ✖