Merge 521eb4d into 1794a24

ant-design · Apr 13, 2021 · 7032e44 · 7032e44
2 parents 1794a24 + 521eb4d
commit 7032e44
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/components/input/TextArea.tsx b/components/input/TextArea.tsx
@@ -86,7 +86,7 @@ const TextArea = React.forwardRef<TextAreaRef, TextAreaProps>(
       // Patch composition onChange when value changed
       if (triggerValue !== value) {
         handleSetValue(triggerValue);
-        resolveOnChange(innerRef.current as any, e, onChange, triggerValue);
+        resolveOnChange(e.currentTarget, e, onChange, triggerValue);
       }
 
       onCompositionEnd?.(e);
@@ -99,15 +99,15 @@ const TextArea = React.forwardRef<TextAreaRef, TextAreaProps>(
       }
 
       handleSetValue(triggerValue);
-      resolveOnChange(innerRef.current as any, e, onChange, triggerValue);
+      resolveOnChange(e.currentTarget, e, onChange, triggerValue);
     };
 
     // ============================== Reset ===============================
     const handleReset = (e: React.MouseEvent<HTMLElement, MouseEvent>) => {
       handleSetValue('', () => {
         innerRef.current?.focus();
       });
-      resolveOnChange(innerRef.current as any, e, onChange);
+      resolveOnChange(innerRef.current?.resizableTextArea?.textArea!, e, onChange);
     };
 
     const prefixCls = getPrefixCls('input', customizePrefixCls);

diff --git a/components/input/__tests__/textarea.test.js b/components/input/__tests__/textarea.test.js
@@ -379,4 +379,36 @@ describe('TextArea allowClear', () => {
     const wrapper = mount(<Input.TextArea defaultValue="Light" value={undefined} />);
     expect(wrapper.find('textarea').at(0).getDOMNode().value).toBe('Light');
   });
+
+  it('onChange event should return HTMLInputElement', () => {
+    const onChange = jest.fn();
+    const wrapper = mount(<Input.TextArea onChange={onChange} allowClear />);
+
+    function isNativeElement() {
+      expect(onChange).toHaveBeenCalledWith(
+        expect.objectContaining({
+          target: wrapper.find('textarea').instance(),
+        }),
+      );
+
+      onChange.mockReset();
+    }
+
+    // Change
+    wrapper.find('textarea').simulate('change', {
+      target: {
+        value: 'bamboo',
+      },
+    });
+    isNativeElement();
+
+    // Composition End
+    wrapper.find('textarea').instance().value = 'light'; // enzyme not support change `currentTarget`
+    wrapper.find('textarea').simulate('compositionEnd');
+    isNativeElement();
+
+    // Reset
+    wrapper.find('.ant-input-clear-icon').first().simulate('click');
+    isNativeElement();
+  });
 });