From 08c7b281983082c4adec0caf12c13a331166c0a4 Mon Sep 17 00:00:00 2001
From: Deven Joshi <deven9852@gmail.com>
Date: Tue, 8 Dec 2020 17:36:21 +0530
Subject: [PATCH] fix: Fixed command picker

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

diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart
index 1d220eaf..2eb5b706 100644
--- a/lib/src/message_input.dart
+++ b/lib/src/message_input.dart
@@ -1461,16 +1461,31 @@ class MessageInputState extends State<MessageInput> {
         padding:
             const EdgeInsets.only(left: 4.0, right: 8.0, top: 8.0, bottom: 8.0),
         child: StreamSvgIcon.lightning(
-          color: Color(0xFF000000).withAlpha(128),
+          color: _commandsOverlay != null
+              ? StreamChatTheme.of(context).accentColor
+              : Color(0xFF000000).withAlpha(128),
         ),
       ),
-      onTap: () {
+      onTap: () async {
+        if (_openFilePickerSection) {
+          setState(() {
+            _animateContainer = false;
+            _openFilePickerSection = false;
+            _filePickerSize = _kMinMediaPickerSize;
+          });
+          await Future.delayed(Duration(milliseconds: 300));
+        }
+
         if (_commandsOverlay == null) {
-          _commandsOverlay = _buildCommandsOverlayEntry();
-          Overlay.of(context).insert(_commandsOverlay);
+          setState(() {
+            _commandsOverlay = _buildCommandsOverlayEntry();
+            Overlay.of(context).insert(_commandsOverlay);
+          });
         } else {
-          _commandsOverlay?.remove();
-          _commandsOverlay = null;
+          setState(() {
+            _commandsOverlay?.remove();
+            _commandsOverlay = null;
+          });
         }
       },
     );