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( // =============================== 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( styles, onResize, onClear, + onPressEnter, readOnly, + autoSize, + onKeyDown, ...rest }, ref, @@ -151,7 +154,6 @@ const TextArea = React.forwardRef( }; const handleKeyDown = (e: React.KeyboardEvent) => { - const { onPressEnter, onKeyDown } = rest; if (e.key === 'Enter' && onPressEnter) { onPressEnter(e); } @@ -208,7 +210,7 @@ const TextArea = React.forwardRef( } }; - const isPureTextArea = !rest.autoSize && !showCount && !allowClear; + const isPureTextArea = !autoSize && !showCount && !allowClear; return ( ( > (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( + (props, ref) => { + (global as any).textAreaProps = props; + return ; + }, + ); +}); + +it('should have no onPressEnter prop', () => { + render(); + expect(resizableTextAreaProps().onPressEnter).toBeUndefined(); +});