Skip to content

Commit bee98b2

Browse files
natsuozawaNatsu Ozawa
andauthored
Do not toggle edit mode with escape key during IME composition (#7024)
Co-authored-by: Natsu Ozawa <[email protected]>
1 parent 1baee86 commit bee98b2

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

packages/core/src/components/editable-text/editableText.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,14 +350,19 @@ export class EditableText extends AbstractPureComponent<EditableTextProps, Edita
350350
};
351351

352352
private handleKeyEvent = (event: React.KeyboardEvent<HTMLElement>) => {
353+
// During IME composition, Enter and Escape has special meanings that we will not override
354+
if (event.nativeEvent.isComposing) {
355+
return;
356+
}
357+
353358
const { altKey, ctrlKey, metaKey, shiftKey } = event;
354359
if (event.key === "Escape") {
355360
this.cancelEditing();
356361
return;
357362
}
358363

359364
const hasModifierKey = altKey || ctrlKey || metaKey || shiftKey;
360-
if (event.key === "Enter" && !event.nativeEvent.isComposing) {
365+
if (event.key === "Enter") {
361366
// prevent browsers (Edge?) from full screening with alt + enter
362367
// shift + enter adds a newline by default
363368
if (altKey || shiftKey) {

0 commit comments

Comments
 (0)