Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,12 @@ const Input = forwardRef<InputRef, InputProps>((props, ref) => {
};

const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
if (onPressEnter && e.key === 'Enter' && !keyLockRef.current) {
if (
onPressEnter &&
e.key === 'Enter' &&
!keyLockRef.current &&
!e.nativeEvent.isComposing
) {
keyLockRef.current = true;
onPressEnter(e);
}
Expand Down
39 changes: 38 additions & 1 deletion tests/index.test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { fireEvent, render } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook';
import React from 'react';
import React, { ElementType } from 'react';
import Input from '../src';
import type { InputRef } from '../src/interface';
import { resolveOnChange } from '../src/utils/commonUtils';
Expand Down Expand Up @@ -504,3 +504,40 @@ describe('resolveChange should work', () => {
fireEvent.compositionEnd(container.querySelector('textarea')!);
expect(onChange).toHaveBeenCalled();
});

describe('Input IME behavior', () => {
it('should ignore Enter during composition', () => {
const onPressEnter = jest.fn();
const { container } = render(<Input onPressEnter={onPressEnter} />);
const input = container.querySelector('input')!;

fireEvent.compositionStart(input);

fireEvent.keyDown(input, {
key: 'Enter',
keyCode: 229,
isComposing: true,
nativeEvent: { isComposing: true },
});

fireEvent.compositionUpdate(input, { data: '开始' });

expect(onPressEnter).not.toHaveBeenCalled();

fireEvent.compositionEnd(input);
fireEvent.keyDown(input, {
key: 'Enter',
nativeEvent: { isComposing: false },
});
expect(onPressEnter).toHaveBeenCalledTimes(1);
});

it('should work with actual IME input', async () => {
const user = userEvent.setup();
const onPressEnter = jest.fn();
const { container } = render(<Input onPressEnter={onPressEnter} />);

await user.type(container.querySelector('input')!, 'abc{enter}');
expect(onPressEnter).toHaveBeenCalled();
});
});