From 69ec1d8935e56377318380bbd6d38973c986a1e5 Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Fri, 7 Apr 2023 05:56:41 +0530
Subject: [PATCH] fix predicate checks only for keyUp events.

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 .../message_input/stream_message_input.dart   | 40 ++++++++++---------
 .../lib/src/utils/typedefs.dart               |  4 +-
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/message_input/stream_message_input.dart b/packages/stream_chat_flutter/lib/src/message_input/stream_message_input.dart
index 747487c8..b479b5ce 100644
--- a/packages/stream_chat_flutter/lib/src/message_input/stream_message_input.dart
+++ b/packages/stream_chat_flutter/lib/src/message_input/stream_message_input.dart
@@ -117,10 +117,10 @@ class StreamMessageInput extends StatefulWidget {
   });
 
   /// The predicate used to send a message on desktop/web
-  final RawKeyEventPredicate? sendMessageKeyPredicate;
+  final KeyEventPredicate sendMessageKeyPredicate;
 
   /// The predicate used to clear the quoted message on desktop/web
-  final RawKeyEventPredicate? clearQuotedMessageKeyPredicate;
+  final KeyEventPredicate clearQuotedMessageKeyPredicate;
 
   /// If true the message input will animate the actions while you type
   final bool enableActionAnimation;
@@ -264,15 +264,19 @@ class StreamMessageInput extends StatefulWidget {
 
   static bool _defaultSendMessageKeyPredicate(
     FocusNode node,
-    RawKeyEvent event,
-  ) =>
-      event.logicalKey == LogicalKeyboardKey.enter;
+    KeyEvent event,
+  ) {
+    // On desktop/web, send the message when the user presses the enter key.
+    return event is KeyUpEvent && event.logicalKey == LogicalKeyboardKey.enter;
+  }
 
   static bool _defaultClearQuotedMessageKeyPredicate(
     FocusNode node,
-    RawKeyEvent event,
-  ) =>
-      event.logicalKey == LogicalKeyboardKey.escape;
+    KeyEvent event,
+  ) {
+    // On desktop/web, clear the quoted message when the user presses the escape key.
+    return event is KeyUpEvent && event.logicalKey == LogicalKeyboardKey.escape;
+  }
 
   @override
   StreamMessageInputState createState() => StreamMessageInputState();
@@ -773,11 +777,11 @@ class StreamMessageInputState extends State<StreamMessageInput>
                     maxHeight: widget.maxHeight,
                     child: PlatformWidgetBuilder(
                       web: (context, child) => Focus(
-                        onKey: _handleKeyPressed,
+                        onKeyEvent: _handleKeyPressed,
                         child: child!,
                       ),
                       desktop: (context, child) => Focus(
-                        onKey: _handleKeyPressed,
+                        onKeyEvent: _handleKeyPressed,
                         child: child!,
                       ),
                       mobile: (context, child) => child,
@@ -808,22 +812,22 @@ class StreamMessageInputState extends State<StreamMessageInput>
     );
   }
 
-  KeyEventResult _handleKeyPressed(
-    FocusNode node,
-    RawKeyEvent event,
-  ) {
-    if (widget.sendMessageKeyPredicate != null &&
-        widget.sendMessageKeyPredicate!(node, event)) {
+  KeyEventResult _handleKeyPressed(FocusNode node, KeyEvent event) {
+    // Check for send message key.
+    if (widget.sendMessageKeyPredicate(node, event)) {
       sendMessage();
       return KeyEventResult.handled;
-    } else if (widget.clearQuotedMessageKeyPredicate != null &&
-        widget.clearQuotedMessageKeyPredicate!(node, event)) {
+    }
+
+    // Check for clear quoted message key.
+    if (widget.clearQuotedMessageKeyPredicate(node, event)) {
       if (_hasQuotedMessage && _effectiveController.text.isEmpty) {
         widget.onQuotedMessageCleared?.call();
       }
       return KeyEventResult.handled;
     }
 
+    // Return ignored to allow other key events to be handled.
     return KeyEventResult.ignored;
   }
 
diff --git a/packages/stream_chat_flutter/lib/src/utils/typedefs.dart b/packages/stream_chat_flutter/lib/src/utils/typedefs.dart
index fda46b2d..6cc581bf 100644
--- a/packages/stream_chat_flutter/lib/src/utils/typedefs.dart
+++ b/packages/stream_chat_flutter/lib/src/utils/typedefs.dart
@@ -341,9 +341,9 @@ typedef DownloadedPathCallback = void Function(String? path);
 typedef UserTapCallback = void Function(User, Widget?);
 
 /// {@template rawKeyEventPredicate}
-/// Callback called to react to a raw key event
+/// Callback called to react to a key event
 /// {@endtemplate}
-typedef RawKeyEventPredicate = bool Function(FocusNode, RawKeyEvent);
+typedef KeyEventPredicate = bool Function(FocusNode, KeyEvent);
 
 /// {@template userItemBuilder}
 /// Builder used to create a custom [ListUserItem] from a [User]