From 58e66ee28ff4ae3920cc08215df4087212739dfc Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Mon, 9 Nov 2020 13:33:29 +0100
Subject: [PATCH] fix overlay issues

---
 lib/src/message_input.dart | 44 ++++++--------------------------------
 1 file changed, 6 insertions(+), 38 deletions(-)

diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart
index 38ae6eb6..de5f9c6a 100644
--- a/lib/src/message_input.dart
+++ b/lib/src/message_input.dart
@@ -377,7 +377,7 @@ class MessageInputState extends State<MessageInput> {
                     _emojiOverlay?.remove();
                     _emojiOverlay = null;
 
-                    _checkCommands(s.trimLeft(), context);
+                    _checkCommands(s, context);
 
                     _checkMentions(s, context);
 
@@ -829,7 +829,8 @@ class MessageInputState extends State<MessageInput> {
 
   void _getAllMedia() async {
     var allAlbums = await PhotoGallery.listAlbums(mediumType: MediumType.image);
-    var allVideoAlbums = await PhotoGallery.listAlbums(mediumType: MediumType.video);
+    var allVideoAlbums =
+        await PhotoGallery.listAlbums(mediumType: MediumType.video);
     List<Medium> resultList = [];
     List<List<dynamic>> resultThumbnailList = [];
 
@@ -1659,42 +1660,9 @@ class MessageInputState extends State<MessageInput> {
     if (!kIsWeb) {
       _keyboardListener = KeyboardVisibility.onChange.listen((visible) {
         if (visible) {
-          if (_commandsOverlay != null) {
-            if (textEditingController.text.trimLeft().startsWith('/')) {
-              WidgetsBinding.instance.addPostFrameCallback((_) {
-                _commandsOverlay = _buildCommandsOverlayEntry();
-                Overlay.of(context).insert(_commandsOverlay);
-              });
-            }
-          }
-
-          if (_mentionsOverlay != null) {
-            if (textEditingController.text.contains('@')) {
-              WidgetsBinding.instance.addPostFrameCallback((_) {
-                _mentionsOverlay = _buildCommandsOverlayEntry();
-                Overlay.of(context).insert(_mentionsOverlay);
-              });
-            }
-          }
-
-          if (_emojiOverlay != null) {
-            if (textEditingController.text.contains(':')) {
-              WidgetsBinding.instance.addPostFrameCallback((_) {
-                _emojiOverlay = _buildEmojiOverlay();
-                Overlay.of(context).insert(_emojiOverlay);
-              });
-            }
-          }
-        } else {
-          if (_commandsOverlay != null) {
-            _commandsOverlay.remove();
-          }
-          if (_mentionsOverlay != null) {
-            _mentionsOverlay.remove();
-          }
-          if (_emojiOverlay != null) {
-            _emojiOverlay.remove();
-          }
+          _checkCommands(textEditingController.text, context);
+          _checkMentions(textEditingController.text, context);
+          _checkEmoji(textEditingController.text, context);
         }
       });
     }