From bc1fc507804d5ba105f961192c64e4813c518f45 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Tue, 25 Oct 2022 17:13:07 +0200
Subject: [PATCH] Prevent comments from submitting after input as composition
 ends

---
 .../features/answerbox/comment/index.ts       |  6 ++++--
 .../features/answerbox/comment/new.ts         | 19 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/javascript/retrospring/features/answerbox/comment/index.ts b/app/javascript/retrospring/features/answerbox/comment/index.ts
index 29604203..b9644012 100644
--- a/app/javascript/retrospring/features/answerbox/comment/index.ts
+++ b/app/javascript/retrospring/features/answerbox/comment/index.ts
@@ -1,7 +1,7 @@
 import registerEvents from "retrospring/utilities/registerEvents"
 import { commentCharacterCountHandler } from "./count";
 import { commentDestroyHandler } from "./destroy";
-import { commentCreateHandler } from "./new";
+import {commentComposeEnd, commentComposeStart, commentCreateHandler} from "./new";
 import { commentReportHandler } from "./report";
 import { commentSmileHandler } from "./smile";
 import { commentToggleHandler } from "./toggle";
@@ -12,7 +12,9 @@ export default (): void => {
     { type: 'click', target: '[name=ab-smile-comment]', handler: commentSmileHandler, global: true },
     { type: 'click', target: '[data-action=ab-comment-report]', handler: commentReportHandler, global: true },
     { type: 'click', target: '[data-action=ab-comment-destroy]', handler: commentDestroyHandler, global: true },
+    { type: 'compositionstart', target: '[name=ab-comment-new]', handler: commentComposeStart, global: true },
+    { type: 'compositionend', target: '[name=ab-comment-new]', handler: commentComposeEnd, global: true },
     { type: 'keyup', target: '[name=ab-comment-new]', handler: commentCreateHandler, global: true },
     { type: 'input', target: '[name=ab-comment-new]', handler: commentCharacterCountHandler, global: true }
   ]);
-}
\ No newline at end of file
+}
diff --git a/app/javascript/retrospring/features/answerbox/comment/new.ts b/app/javascript/retrospring/features/answerbox/comment/new.ts
index 6f729165..e97c497b 100644
--- a/app/javascript/retrospring/features/answerbox/comment/new.ts
+++ b/app/javascript/retrospring/features/answerbox/comment/new.ts
@@ -3,7 +3,14 @@ import { post } from '@rails/request.js';
 import I18n from 'retrospring/i18n';
 import { showNotification, showErrorNotification } from 'utilities/notifications';
 
+let compositionJustEnded = false;
+
 export function commentCreateHandler(event: KeyboardEvent): boolean {
+  if (compositionJustEnded && event.which == 13) {
+    compositionJustEnded = false;
+    return;
+  }
+
   const input = event.target as HTMLInputElement;
   const id = input.dataset.aId;
   const counter = document.querySelector(`#ab-comment-charcount-${id}`);
@@ -50,4 +57,14 @@ export function commentCreateHandler(event: KeyboardEvent): boolean {
         input.disabled = false;
       });
   }
-}
\ No newline at end of file
+}
+
+export function commentComposeStart(): boolean {
+  compositionJustEnded = false;
+  return true;
+}
+
+export function commentComposeEnd(): boolean {
+  compositionJustEnded = true;
+  return true;
+}