Merge branch 'develop' into chore/bump-lottie-to-v2

packages/stream_chat_flutter/CHANGELOG.md

@@ -4,6 +4,10 @@
 
 - Updated `lottie` dependency to `^2.0.0`
 
+🐞 Fixed
+- [[#1379]](https://github.com/GetStream/stream-chat-flutter/issues/1379) Fixed "Issues with photo attachments on web", where the cached image attachment would not render while uploading.
+- Fix render overflow issue with `MessageSearchListTileTitle`. It now uses `Text.rich` instead of `Row`. Better default behaviour and allows `TextOverflow`.
+
 ## 5.1.0
 
 🐞 Fixed

packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart

@@ -56,22 +56,33 @@ class StreamImageAttachment extends StreamAttachmentWidget {
   Widget build(BuildContext context) {
     return source.when(
       local: () {
-        if (attachment.localUri == null || attachment.file?.bytes == null) {
-          return AttachmentError(constraints: constraints);
-        }
-        return _buildImageAttachment(
-          context,
-          Image.memory(
-            attachment.file!.bytes!,
-            height: constraints?.maxHeight,
-            width: constraints?.maxWidth,
-            fit: BoxFit.cover,
-            errorBuilder: (context, _, __) => Image.asset(
-              'images/placeholder.png',
-              package: 'stream_chat_flutter',
+        if (attachment.file?.bytes != null) {
+          return _buildImageAttachment(
+            context,
+            Image.memory(
+              attachment.file!.bytes!,
+              height: constraints?.maxHeight,
+              width: constraints?.maxWidth,
+              fit: BoxFit.cover,
+              errorBuilder: _imageErrorBuilder,
             ),
-          ),
-        );
+          );
+        } else if (attachment.localUri != null) {
+          return _buildImageAttachment(
+            context,
+            Image.asset(
+              attachment.localUri!.path,
+              height: constraints?.maxHeight,
+              width: constraints?.maxWidth,
+              fit: BoxFit.cover,
+              errorBuilder: _imageErrorBuilder,
+            ),
+          );
+        } else {
+          return AttachmentError(
+            constraints: constraints,
+          );
+        }
       },
       network: () {
         var imageUrl =
@@ -116,6 +127,12 @@ class StreamImageAttachment extends StreamAttachmentWidget {
     );
   }
 
+  Widget _imageErrorBuilder(BuildContext _, Object __, StackTrace? ___) =>
+      Image.asset(
+        'images/placeholder.png',
+        package: 'stream_chat_flutter',
+      );
+
   Widget _buildImageAttachment(BuildContext context, Widget imageWidget) {
     return Container(
       constraints: constraints,

packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart

@@ -122,7 +122,8 @@ class StreamMessageSearchListTile extends StatelessWidget {
     final title = this.title ??
         MessageSearchListTileTitle(
           messageResponse: messageResponse,
-          textStyle: channelPreviewTheme.titleStyle,
+          textStyle: channelPreviewTheme.titleStyle
+              ?.copyWith(overflow: TextOverflow.ellipsis),
         );
 
     final subtitle = this.subtitle ??
@@ -177,27 +178,28 @@ class MessageSearchListTileTitle extends StatelessWidget {
     final channel = messageResponse.channel;
     final channelName = channel?.extraData['name'];
 
-    return Row(
-      children: [
-        Text(
-          user.id == StreamChat.of(context).currentUser?.id
-              ? context.translations.youText
-              : user.name,
-          style: textStyle,
-        ),
-        if (channelName != null) ...[
-          Text(
-            ' ${context.translations.inText} ',
-            style: textStyle?.copyWith(
-              fontWeight: FontWeight.normal,
+    return Text.rich(
+      TextSpan(
+        children: [
+          TextSpan(
+            text: user.id == StreamChat.of(context).currentUser?.id
+                ? context.translations.youText
+                : user.name,
+          ),
+          if (channelName != null) ...[
+            TextSpan(
+              text: ' ${context.translations.inText} ',
+              style: textStyle?.copyWith(
+                fontWeight: FontWeight.normal,
+              ),
             ),
-          ),
-          Text(
-            channelName as String,
-            style: textStyle,
-          ),
+            TextSpan(
+              text: channelName as String,
+            ),
+          ],
         ],
-      ],
+      ),
+      style: textStyle,
     );
   }
 }