From 0c31fe53b4b6b2aa16a105dcb65f4711e4b2a9f6 Mon Sep 17 00:00:00 2001
From: lijianan <574980606@qq.com>
Date: Thu, 18 Jul 2024 16:54:23 +0800
Subject: [PATCH] fix: rm onPressEnter (#62)

* fix: rm onPressEnter

* fix: fix

* fix: fix
---
 src/ResizableTextArea.tsx        |  2 +-
 src/TextArea.tsx                 |  7 +++++--
 tests/ResizableTextArea.test.tsx | 23 +++++++++++++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 tests/ResizableTextArea.test.tsx

diff --git a/src/ResizableTextArea.tsx b/src/ResizableTextArea.tsx
index 148348c..80b1725 100644
--- a/src/ResizableTextArea.tsx
+++ b/src/ResizableTextArea.tsx
@@ -160,7 +160,7 @@ const ResizableTextArea = React.forwardRef<ResizableTextAreaRef, TextAreaProps>(
     // =============================== Render ===============================
     const mergedAutoSizeStyle = needAutoSize ? autoSizeStyle : null;
 
-    const mergedStyle = {
+    const mergedStyle: React.CSSProperties = {
       ...style,
       ...mergedAutoSizeStyle,
     };
diff --git a/src/TextArea.tsx b/src/TextArea.tsx
index 7e98df8..4ce43b9 100644
--- a/src/TextArea.tsx
+++ b/src/TextArea.tsx
@@ -37,7 +37,10 @@ const TextArea = React.forwardRef<TextAreaRef, TextAreaProps>(
       styles,
       onResize,
       onClear,
+      onPressEnter,
       readOnly,
+      autoSize,
+      onKeyDown,
       ...rest
     },
     ref,
@@ -151,7 +154,6 @@ const TextArea = React.forwardRef<TextAreaRef, TextAreaProps>(
     };
 
     const handleKeyDown = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
-      const { onPressEnter, onKeyDown } = rest;
       if (e.key === 'Enter' && onPressEnter) {
         onPressEnter(e);
       }
@@ -208,7 +210,7 @@ const TextArea = React.forwardRef<TextAreaRef, TextAreaProps>(
       }
     };
 
-    const isPureTextArea = !rest.autoSize && !showCount && !allowClear;
+    const isPureTextArea = !autoSize && !showCount && !allowClear;
 
     return (
       <BaseInput
@@ -243,6 +245,7 @@ const TextArea = React.forwardRef<TextAreaRef, TextAreaProps>(
       >
         <ResizableTextArea
           {...rest}
+          autoSize={autoSize}
           maxLength={maxLength}
           onKeyDown={handleKeyDown}
           onChange={onInternalChange}
diff --git a/tests/ResizableTextArea.test.tsx b/tests/ResizableTextArea.test.tsx
new file mode 100644
index 0000000..60b462d
--- /dev/null
+++ b/tests/ResizableTextArea.test.tsx
@@ -0,0 +1,23 @@
+import { render } from '@testing-library/react';
+import React from 'react';
+import type { ResizableTextAreaRef, TextAreaProps } from '../src';
+import { ResizableTextArea } from '../src';
+
+const resizableTextAreaProps = () => (global as any).textAreaProps;
+
+jest.mock('../src/ResizableTextArea', () => {
+  const ReactReal: typeof React = jest.requireActual('react');
+  const Resizable = jest.requireActual('../src/ResizableTextArea');
+  const ResizableComponent = Resizable.default;
+  return ReactReal.forwardRef<ResizableTextAreaRef, TextAreaProps>(
+    (props, ref) => {
+      (global as any).textAreaProps = props;
+      return <ResizableComponent {...props} ref={ref} />;
+    },
+  );
+});
+
+it('should have no onPressEnter prop', () => {
+  render(<ResizableTextArea defaultValue="test" />);
+  expect(resizableTextAreaProps().onPressEnter).toBeUndefined();
+});