Default bubbled message to the bubbleBuilder (#553)

* Update message.dart Changes to the bubbleBuilder. It now creates the default message, and sends it to the bubbleBuilder(). This way people can just spit back message as they see fit or wrap the message with their own widgets. * Update chat.dart Changed the definition for the bubbleBuilder. It now has a defaultBubbleMessage which is the original message.
flyerhq · Feb 4, 2024 · a34e062 · a34e062
1 parent 3e0656d
commit a34e062
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 22 deletions.
diff --git a/lib/src/widgets/chat.dart b/lib/src/widgets/chat.dart
@@ -116,6 +116,7 @@ class Chat extends StatefulWidget {
     Widget child, {
     required types.Message message,
     required bool nextMessageInGroup,
+    required Widget defaultBubbleMessage,
   })? bubbleBuilder;
 
   /// See [Message.bubbleRtlAlignment].

diff --git a/lib/src/widgets/message/message.dart b/lib/src/widgets/message/message.dart
@@ -74,6 +74,7 @@ class Message extends StatelessWidget {
     Widget child, {
     required types.Message message,
     required bool nextMessageInGroup,
+    required Widget defaultBubbleMessage,
   })? bubbleBuilder;
 
   /// Determine the alignment of the bubble for RTL languages. Has no effect
@@ -205,28 +206,28 @@ class Message extends StatelessWidget {
     BorderRadius borderRadius,
     bool currentUserIsAuthor,
     bool enlargeEmojis,
-  ) =>
-      bubbleBuilder != null
-          ? bubbleBuilder!(
-              _messageBuilder(),
-              message: message,
-              nextMessageInGroup: roundBorder,
-            )
-          : enlargeEmojis && hideBackgroundOnEmojiMessages
-              ? _messageBuilder()
-              : Container(
-                  decoration: BoxDecoration(
-                    borderRadius: borderRadius,
-                    color: !currentUserIsAuthor ||
-                            message.type == types.MessageType.image
-                        ? InheritedChatTheme.of(context).theme.secondaryColor
-                        : InheritedChatTheme.of(context).theme.primaryColor,
-                  ),
-                  child: ClipRRect(
-                    borderRadius: borderRadius,
-                    child: _messageBuilder(),
-                  ),
-                );
+  ) {
+    Widget defaultMessage = (enlargeEmojis && hideBackgroundOnEmojiMessages)
+        ? _messageBuilder()
+        : Container(
+            decoration: BoxDecoration(
+              borderRadius: borderRadius,
+              color: !currentUserIsAuthor || message.type == types.MessageType.image ? InheritedChatTheme.of(context).theme.secondaryColor : InheritedChatTheme.of(context).theme.primaryColor,
+            ),
+            child: ClipRRect(
+              borderRadius: borderRadius,
+              child: _messageBuilder(),
+            ),
+          );
+    return bubbleBuilder != null
+        ? bubbleBuilder!(
+            _messageBuilder(),
+            message: message,
+            nextMessageInGroup: roundBorder,
+            defaultBubbleMessage: defaultMessage,
+          )
+        : defaultMessage;
+  }
 
   Widget _messageBuilder() {
     switch (message.type) {