From 93101f99c4dd665b768584f320c1d3139efb3d84 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Fri, 30 Oct 2020 14:45:47 +0100
Subject: [PATCH] fix reaction picker for messages without text

---
 lib/src/message_actions_modal.dart   | 15 ++++++++++++++-
 lib/src/message_reactions_modal.dart |  3 ++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/lib/src/message_actions_modal.dart b/lib/src/message_actions_modal.dart
index 15210f4b..00354a49 100644
--- a/lib/src/message_actions_modal.dart
+++ b/lib/src/message_actions_modal.dart
@@ -45,6 +45,15 @@ class MessageActionsModal extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    var size = MediaQuery.of(context).size;
+    var user = StreamChat.of(context).user;
+
+    var roughMaxSize = 2 * size.width / 3;
+    var roughSentenceSize =
+        message.text.length * messageTheme.messageText.fontSize * 1.2;
+    var divFactor =
+        roughSentenceSize == 0 ? 1 : (roughSentenceSize / roughMaxSize);
+
     return GestureDetector(
       behavior: HitTestBehavior.translucent,
       onTap: () {
@@ -75,7 +84,11 @@ class MessageActionsModal extends StatelessWidget {
                         (message.status == MessageSendingStatus.SENT ||
                             message.status == null))
                       Align(
-                        alignment: Alignment(-0.3, 0.0),
+                        alignment: Alignment(
+                            user.id == message.user.id
+                                ? (divFactor > 1.0 ? 0.0 : (1.0 - divFactor))
+                                : (divFactor > 1.0 ? 0.0 : -(1.0 - divFactor)),
+                            0.0),
                         child: ReactionPicker(
                           message: message,
                           messageTheme: messageTheme,
diff --git a/lib/src/message_reactions_modal.dart b/lib/src/message_reactions_modal.dart
index 1c3c3e0f..fc3f68a4 100644
--- a/lib/src/message_reactions_modal.dart
+++ b/lib/src/message_reactions_modal.dart
@@ -42,7 +42,8 @@ class MessageReactionsModal extends StatelessWidget {
     var roughMaxSize = 2 * size.width / 3;
     var roughSentenceSize =
         message.text.length * messageTheme.messageText.fontSize * 1.2;
-    var divFactor = roughSentenceSize / roughMaxSize;
+    var divFactor =
+        roughSentenceSize == 0 ? 1 : (roughSentenceSize / roughMaxSize);
 
     return GestureDetector(
       behavior: HitTestBehavior.translucent,