d

lib/pages/chat/chat.dart

@@ -270,11 +270,10 @@ class ChatController extends State<ChatPageWithRoom>
     showAdaptiveDialog(
       context: context,
       builder: (c) => SendFileDialog(
-        files: files,
-        room: room,
-        outerContext: context,
-        replyEvent: replyEvent
-      ),
+          files: files,
+          room: room,
+          outerContext: context,
+          replyEvent: replyEvent),
     );
   }
 
@@ -501,6 +500,10 @@ class ChatController extends State<ChatPageWithRoom>
 
   Future<void> send() async {
     if (sendController.text.trim().isEmpty) return;
+    if (inputFocus.hasFocus) {
+      inputFocus.unfocus();
+    }
+    FocusScope.of(context).requestFocus(inputFocus);
     _storeInputTimeoutTimer?.cancel();
     final prefs = await SharedPreferences.getInstance();
     prefs.remove('draft_$roomId');
@@ -558,7 +561,7 @@ class ChatController extends State<ChatPageWithRoom>
         replyEvent: replyEvent,
       ),
     );
-	replyEvent = null;
+    replyEvent = null;
   }
 
   void sendImageFromClipBoard(Uint8List? image) async {
@@ -742,11 +745,11 @@ class ChatController extends State<ChatPageWithRoom>
     }
 
     Navigator.of(context).push(new MaterialPageRoute(
-      builder: (BuildContext ctx) {
-        return RecoveredEventDialog(event: recoveredEvent!, timeline: timeline!);
-      },
-      fullscreenDialog: true
-    ));
+        builder: (BuildContext ctx) {
+          return RecoveredEventDialog(
+              event: recoveredEvent!, timeline: timeline!);
+        },
+        fullscreenDialog: true));
   }
 
   void reportEventAction() async {
@@ -1155,8 +1158,6 @@ class ChatController extends State<ChatPageWithRoom>
 
   void onInputBarSubmitted(_) {
     send();
-    FocusScope.of(context).unfocus();
-    FocusScope.of(context).requestFocus(inputFocus);
   }
 
   void onAddPopupMenuButtonSelected(String choice) {