From a11939e50d32f856edbf8c73f41dc667fe39dcfd Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 25 Apr 2019 09:22:05 -0300
Subject: [PATCH] Regression: Cursor position set to beginning when editing a
 message (#14245)

* Regression: Cursor position set to begining when editing a message

* Prevent keydown event on switch editing message
---
 app/ui/client/lib/chatMessages.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/ui/client/lib/chatMessages.js b/app/ui/client/lib/chatMessages.js
index 4c7df34f3d6..e7378893202 100644
--- a/app/ui/client/lib/chatMessages.js
+++ b/app/ui/client/lib/chatMessages.js
@@ -226,8 +226,8 @@ export class ChatMessages {
 		}
 
 		const cursorPosition = editingNext ? 0 : -1;
-		this.$input.setCursorPosition(cursorPosition);
 		this.input.focus();
+		this.$input.setCursorPosition(cursorPosition);
 	}
 
 	clearEditing() {
@@ -521,12 +521,12 @@ export class ChatMessages {
 
 			event.preventDefault();
 			event.stopPropagation();
-			return true;
+			return;
 		}
 
 		if (keyCode === keyCodes.ARROW_UP || keyCode === keyCodes.ARROW_DOWN) {
 			if (event.shiftKey) {
-				return true;
+				return;
 			}
 
 			const cursorPosition = input.selectionEnd;
@@ -535,7 +535,7 @@ export class ChatMessages {
 				if (cursorPosition === 0) {
 					this.toPrevMessage();
 				} else if (!event.altKey) {
-					return true;
+					return;
 				}
 
 				if (event.altKey) {
@@ -545,7 +545,7 @@ export class ChatMessages {
 				if (cursorPosition === input.value.length) {
 					this.toNextMessage();
 				} else if (!event.altKey) {
-					return true;
+					return;
 				}
 
 				if (event.altKey) {
@@ -553,7 +553,9 @@ export class ChatMessages {
 				}
 			}
 
-			return false;
+			event.preventDefault();
+			event.stopPropagation();
+			return;
 		}
 	}