From 643fe1a5e5f315d0f78cfafb0f3427edcb391c65 Mon Sep 17 00:00:00 2001
From: Jorge Martin Espinosa <jorgem@element.io>
Date: Thu, 19 Oct 2023 10:49:11 +0200
Subject: [PATCH] Hide keyboard when exiting the room screen (#1593)

---
 changelog.d/1375.bugfix                                  | 1 +
 .../android/features/messages/impl/MessagesView.kt       | 9 +++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 changelog.d/1375.bugfix

diff --git a/changelog.d/1375.bugfix b/changelog.d/1375.bugfix
new file mode 100644
index 0000000000..d80ff3543c
--- /dev/null
+++ b/changelog.d/1375.bugfix
@@ -0,0 +1 @@
+Hide keyboard when exiting the chat room screen.
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
index 971df06053..b79e84a2e0 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
@@ -35,6 +35,7 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -222,6 +223,14 @@ fun MessagesView(
     ReinviteDialog(
         state = state
     )
+
+    // Since the textfield is now based on an Android view, this is no longer done automatically.
+    // We need to hide the keyboard automatically when navigating out of this screen.
+    DisposableEffect(Unit) {
+        onDispose {
+            localView.hideKeyboard()
+        }
+    }
 }
 
 @Composable