Merge branch 'hotfix/issues-in-autocomplete' into 'develop'

#355 hotfix/issues in autocomplete

Closes #355

See merge request pleroma/pleroma-fe!574

1 files changed, 5 insertions, 7 deletions

diff --git a/src/components/autocomplete_input/autocomplete_input.js b/src/components/autocomplete_input/autocomplete_input.js
index 404a8cdb..1544e7bb 100644
--- a/src/components/autocomplete_input/autocomplete_input.js
+++ b/src/components/autocomplete_input/autocomplete_input.js
@@ -24,8 +24,7 @@ const AutoCompleteInput = {
   data () {
     return {
       caret: 0,
-      highlighted: 0,
-      text: this.value
+      highlighted: 0
     }
   },
   computed: {
@@ -42,7 +41,7 @@ const AutoCompleteInput = {
       return (this.wordAtCaret || {}).word || ''
     },
     wordAtCaret () {
-      const word = Completion.wordAtPosition(this.text, this.caret - 1) || {}
+      const word = Completion.wordAtPosition(this.value, this.caret - 1) || {}
       return word
     },
     candidates () {
@@ -113,8 +112,8 @@ const AutoCompleteInput = {
       }
     },
     replace (replacement) {
-      this.text = Completion.replaceWord(this.text, this.wordAtCaret, replacement)
-      const el = this.$el.querySelector('textarea')
+      this.$emit('input', Completion.replaceWord(this.value, this.wordAtCaret, replacement))
+      const el = this.$el.querySelector('textarea') || this.$el.querySelector('input')
       el.focus()
       this.caret = 0
     },
@@ -125,8 +124,7 @@ const AutoCompleteInput = {
         e.preventDefault()
         const candidate = this.candidates[this.highlighted]
         const replacement = candidate.utf || (candidate.screen_name + ' ')
-        this.text = Completion.replaceWord(this.text, this.wordAtCaret, replacement)
-        this.$emit('input', this.text)
+        this.$emit('input', Completion.replaceWord(this.value, this.wordAtCaret, replacement))
         const el = this.$el.querySelector('textarea') || this.$el.querySelector('input')
         el.focus()
         this.caret = 0