From 1f04c732a0a4356fe3e2ac60ce6eba5f0abd8630 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Wed, 14 Nov 2018 13:36:21 +1030
Subject: [PATCH] Fix cursor not being placed correctly after mention insertion

---
 extensions/mentions/js/src/forum/addComposerAutocomplete.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extensions/mentions/js/src/forum/addComposerAutocomplete.js b/extensions/mentions/js/src/forum/addComposerAutocomplete.js
index 0cde89a99..25ecdde7f 100644
--- a/extensions/mentions/js/src/forum/addComposerAutocomplete.js
+++ b/extensions/mentions/js/src/forum/addComposerAutocomplete.js
@@ -28,10 +28,12 @@ export default function addComposerAutocomplete() {
     const applySuggestion = function(replacement) {
       const insert = replacement + ' ';
 
+      // When calling setValue(), mentionStart will be set back to 0 so we need to compute this beforehand
+      const index = mentionStart - 1 + insert.length;
+
       const content = composer.content();
       composer.editor.setValue(content.substring(0, mentionStart - 1) + insert + content.substr($textarea[0].selectionStart));
 
-      const index = mentionStart - 1 + insert.length;
       composer.editor.setSelectionRange(index, index);
 
       dropdown.hide();