From 7bfc12d49d866932c6ae626ed927e1850fabe9dd Mon Sep 17 00:00:00 2001
From: ayntgl <ayntgl@gmail.com>
Date: Tue, 25 Jan 2022 00:26:37 +0400
Subject: [PATCH] fix: return event key if message input field has focus

---
 config/mod.go  | 10 +++++-----
 ui/handlers.go |  4 ++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/config/mod.go b/config/mod.go
index 57fd04c..13bd65a 100644
--- a/config/mod.go
+++ b/config/mod.go
@@ -74,11 +74,11 @@ func newDefaultConfig() Config {
 			Timestamps:         false,
 		},
 		Keybindings: KeybindingsConfig{
-			ToggleGuildsList:         "g",
-			ToggleChannelsTreeView:   "c",
-			ToggleMessagesTextView:   "m",
-			ToggleMessageInputField:  "i",
-			ToggleMessageActionsList: "a",
+			ToggleGuildsList:         "Rune[g]",
+			ToggleChannelsTreeView:   "Rune[c]",
+			ToggleMessagesTextView:   "Rune[m]",
+			ToggleMessageInputField:  "Rune[i]",
+			ToggleMessageActionsList: "Rune[a]",
 			ToggleExternalEditor:     "Ctrl-E",
 
 			SelectPreviousMessage: "Up",
diff --git a/ui/handlers.go b/ui/handlers.go
index 9cb3fd4..0b8542d 100644
--- a/ui/handlers.go
+++ b/ui/handlers.go
@@ -15,6 +15,10 @@ import (
 )
 
 func onAppInputCapture(app *App, e *tcell.EventKey) *tcell.EventKey {
+	if app.MessageInputField.HasFocus() {
+		return e
+	}
+
 	switch e.Name() {
 	case app.Config.Keybindings.ToggleGuildsList:
 		app.SetFocus(app.GuildsList)