disable sending on enter while composing (#1909)

Fixes #1899 #1497
4 years ago · a1f5706fea
parent c92baad736
commit a1f5706fea
1 changed files with 2 additions and 2 deletions
--- a/ts/components/session/conversation/SessionCompositionBox.tsx
+++ b/ts/components/session/conversation/SessionCompositionBox.tsx
@ -796,8 +796,8 @@ class SessionCompositionBoxInner extends React.Component<Props, State> {
  }

  private async onKeyDown(event: any) {
-    if (event.key === 'Enter' && !event.shiftKey) {
-      // If shift, newline. Else send message.
+    if (event.key === 'Enter' && !event.shiftKey && !event.nativeEvent.isComposing) {
+      // If shift, newline. If in IME composing mode, leave it to IME. Else send message.
      event.preventDefault();
      await this.onSendMessage();
    } else if (event.key === 'Escape' && this.state.showEmojiPanel) {