From 1c3dbb1595d590bb6519198815cd84f28367f006 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Fri, 25 Jun 2021 14:18:56 +0200
Subject: [PATCH] move messagewidget in the builder

---
 .../example/lib/tutorial-part-5.dart                   |  1 +
 .../stream_chat_flutter/lib/src/message_list_view.dart | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/stream_chat_flutter/example/lib/tutorial-part-5.dart b/packages/stream_chat_flutter/example/lib/tutorial-part-5.dart
index 7a75c037..8f1118dc 100644
--- a/packages/stream_chat_flutter/example/lib/tutorial-part-5.dart
+++ b/packages/stream_chat_flutter/example/lib/tutorial-part-5.dart
@@ -93,6 +93,7 @@ class ChannelPage extends StatelessWidget {
     BuildContext context,
     MessageDetails details,
     List<Message> messages,
+    MessageWidget _,
   ) {
     final message = details.message;
     final isCurrentUser = StreamChat.of(context).user!.id == message.user!.id;
diff --git a/packages/stream_chat_flutter/lib/src/message_list_view.dart b/packages/stream_chat_flutter/lib/src/message_list_view.dart
index bdc9d069..74942259 100644
--- a/packages/stream_chat_flutter/lib/src/message_list_view.dart
+++ b/packages/stream_chat_flutter/lib/src/message_list_view.dart
@@ -19,10 +19,13 @@ import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart';
 import 'package:visibility_detector/visibility_detector.dart';
 
 /// Widget builder for message
+/// [defaultMessageWidget] is the default [MessageWidget] configuration
+/// Use [defaultMessageWidget.copyWith] to easily customize it
 typedef MessageBuilder = Widget Function(
   BuildContext,
   MessageDetails,
   List<Message>,
+  MessageWidget defaultMessageWidget,
 );
 
 /// Widget builder for parent message
@@ -63,7 +66,6 @@ class MessageDetails {
     this.message,
     List<Message> messages,
     this.index,
-    this.defaultMessageWidget,
   ) {
     isMyMessage = message.user?.id == currentUserId;
     isLastUser = index + 1 < messages.length &&
@@ -72,10 +74,6 @@ class MessageDetails {
         index - 1 >= 0 && message.user!.id == messages[index - 1].user?.id;
   }
 
-  /// Default [MessageWidget] configuration
-  /// use [defaultMessageWidget.copyWith] to easily customize it
-  final MessageWidget defaultMessageWidget;
-
   /// True if the message belongs to the current user
   late final bool isMyMessage;
 
@@ -1082,9 +1080,9 @@ class _MessageListViewState extends State<MessageListView> {
           message,
           messages,
           index,
-          messageWidget as MessageWidget,
         ),
         messages,
+        messageWidget as MessageWidget,
       );
     }