From 9ef3a6e54006258a7b43217a0ac5a8ec0645349c Mon Sep 17 00:00:00 2001
From: Hironsan <light.tree.1.13@gmail.com>
Date: Fri, 15 Jan 2021 11:08:58 +0900
Subject: [PATCH] Update CommentButton.vue to fix bug on press enter

---
 .../containers/annotation/CommentButton.vue   | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/frontend/components/containers/annotation/CommentButton.vue b/frontend/components/containers/annotation/CommentButton.vue
index 074c3744..e08bec27 100644
--- a/frontend/components/containers/annotation/CommentButton.vue
+++ b/frontend/components/containers/annotation/CommentButton.vue
@@ -63,10 +63,10 @@
             </template>
             <template v-slot:item.text="props">
               <v-edit-dialog
-                :return-value.sync="props.item.text"
                 large
                 persistent
-                @save="editItem({ id: props.item.id })"
+                @save="editItem"
+                @open="openEdit(props.item)"
               >
                 <div>{{ props.item.text }}</div>
                 <template v-slot:input>
@@ -74,12 +74,11 @@
                     Update Comment
                   </div>
                   <v-text-field
-                    :value="props.item.text"
+                    v-model="editedComment.text"
                     label="Edit"
                     single-line
                     counter
                     autofocus
-                    @input="setNewComment"
                   />
                 </template>
               </v-edit-dialog>
@@ -104,7 +103,10 @@ export default {
     return {
       dialog: false,
       comment: '',
-      newComment: ''
+      editedComment: {
+        text: '',
+        id: null
+      }
     }
   },
 
@@ -143,15 +145,19 @@ export default {
       }
       this.deleteComment(payload)
     },
-    editItem(payload) {
-      this.updateComment({
-        projectId: this.$route.params.id,
-        commentId: payload.id,
-        text: this.newComment
-      })
+    editItem() {
+      if (this.editedComment.text === '') {
+        this.deleteItem(this.editedComment.id)
+      } else {
+        this.updateComment({
+          projectId: this.$route.params.id,
+          commentId: this.editedComment.id,
+          text: this.editedComment.text
+        })
+      }
     },
-    setNewComment(value) {
-      this.newComment = value
+    openEdit(item) {
+      Object.assign(this.editedComment, item)
     }
   }
 }