Merge pull request #1707 from GetStream/feat/attachment-picker-onError

packages/stream_chat_flutter/CHANGELOG.md

@@ -5,6 +5,10 @@
 - [[#1702]](https://github.com/GetStream/stream-chat-flutter/issues/1702)
   Fixed `Message.replaceMentions` not treating `@usernames` as mentions.
 
+✅ Added
+
+- Added support for listening error events in AttachmentPickerBottomSheet.
+
 ## 6.8.1
 
 🐞 Fixed

packages/stream_chat_flutter/lib/src/message_input/attachment_picker/stream_attachment_picker.dart

@@ -698,6 +698,7 @@ Widget mobileAttachmentPickerBuilder({
   ThumbnailFormat attachmentThumbnailFormat = ThumbnailFormat.jpeg,
   int attachmentThumbnailQuality = 100,
   double attachmentThumbnailScale = 1,
+  ErrorListener? onError,
 }) {
   return StreamMobileAttachmentPickerBottomSheet(
     controller: controller,
@@ -721,10 +722,15 @@ Widget mobileAttachmentPickerBuilder({
               mediaThumbnailQuality: attachmentThumbnailQuality,
               mediaThumbnailScale: attachmentThumbnailScale,
               onMediaItemSelected: (media) async {
-                if (selectedIds.contains(media.id)) {
-                  return controller.removeAssetAttachment(media);
+                try {
+                  if (selectedIds.contains(media.id)) {
+                    return await controller.removeAssetAttachment(media);
+                  }
+                  return await controller.addAssetAttachment(media);
+                } catch (e, stk) {
+                  if (onError != null) return onError.call(e, stk);
+                  rethrow;
                 }
-                return controller.addAssetAttachment(media);
               },
             );
           },
@@ -736,8 +742,15 @@ Widget mobileAttachmentPickerBuilder({
           optionViewBuilder: (context, controller) {
             return StreamFilePicker(
               onFilePicked: (file) async {
-                if (file != null) await controller.addAttachment(file);
-                return Navigator.pop(context, controller.value);
+                try {
+                  if (file != null) await controller.addAttachment(file);
+                  return Navigator.pop(context, controller.value);
+                } catch (e, stk) {
+                  Navigator.pop(context, controller.value);
+                  if (onError != null) return onError.call(e, stk);
+
+                  rethrow;
+                }
               },
             );
           },
@@ -749,10 +762,17 @@ Widget mobileAttachmentPickerBuilder({
           optionViewBuilder: (context, controller) {
             return StreamImagePicker(
               onImagePicked: (image) async {
-                if (image != null) {
-                  await controller.addAttachment(image);
+                try {
+                  if (image != null) {
+                    await controller.addAttachment(image);
+                  }
+                  return Navigator.pop(context, controller.value);
+                } catch (e, stk) {
+                  Navigator.pop(context, controller.value);
+                  if (onError != null) return onError.call(e, stk);
+
+                  rethrow;
                 }
-                return Navigator.pop(context, controller.value);
               },
             );
           },
@@ -764,10 +784,17 @@ Widget mobileAttachmentPickerBuilder({
           optionViewBuilder: (context, controller) {
             return StreamVideoPicker(
               onVideoPicked: (video) async {
-                if (video != null) {
-                  await controller.addAttachment(video);
+                try {
+                  if (video != null) {
+                    await controller.addAttachment(video);
+                  }
+                  return Navigator.pop(context, controller.value);
+                } catch (e, stk) {
+                  Navigator.pop(context, controller.value);
+                  if (onError != null) return onError.call(e, stk);
+
+                  rethrow;
                 }
-                return Navigator.pop(context, controller.value);
               },
             );
           },
@@ -787,6 +814,7 @@ Widget webOrDesktopAttachmentPickerBuilder({
   ThumbnailFormat attachmentThumbnailFormat = ThumbnailFormat.jpeg,
   int attachmentThumbnailQuality = 100,
   double attachmentThumbnailScale = 1,
+  ErrorListener? onError,
 }) {
   return StreamWebOrDesktopAttachmentPickerBottomSheet(
     controller: controller,
@@ -814,13 +842,20 @@ Widget webOrDesktopAttachmentPickerBuilder({
       }.where((option) => option.supportedTypes.every(allowedTypes.contains)),
     },
     onOptionTap: (context, controller, option) async {
-      final attachment = await StreamAttachmentHandler.instance.pickFile(
-        type: option.type.fileType,
-      );
-      if (attachment != null) {
-        await controller.addAttachment(attachment);
+      try {
+        final attachment = await StreamAttachmentHandler.instance.pickFile(
+          type: option.type.fileType,
+        );
+        if (attachment != null) {
+          await controller.addAttachment(attachment);
+        }
+        return Navigator.pop(context, controller.value);
+      } catch (e, stk) {
+        Navigator.pop(context, controller.value);
+        if (onError != null) return onError.call(e, stk);
+
+        rethrow;
       }
-      return Navigator.pop(context, controller.value);
     },
   );
 }

packages/stream_chat_flutter/lib/src/message_input/attachment_picker/stream_attachment_picker_bottom_sheet.dart

@@ -69,6 +69,7 @@ Future<T?> showStreamAttachmentPickerModalBottomSheet<T>({
   List<AttachmentPickerType> allowedTypes = AttachmentPickerType.values,
   List<Attachment>? initialAttachments,
   StreamAttachmentPickerController? controller,
+  ErrorListener? onError,
   Color? backgroundColor,
   double? elevation,
   BoxConstraints? constraints,
@@ -117,6 +118,7 @@ Future<T?> showStreamAttachmentPickerModalBottomSheet<T>({
           if (isWebOrDesktop) {
             return webOrDesktopAttachmentPickerBuilder.call(
               context: context,
+              onError: onError,
               controller: controller,
               allowedTypes: allowedTypes,
               customOptions: customOptions?.map(
@@ -131,6 +133,7 @@ Future<T?> showStreamAttachmentPickerModalBottomSheet<T>({
 
           return mobileAttachmentPickerBuilder.call(
             context: context,
+            onError: onError,
             controller: controller,
             allowedTypes: allowedTypes,
             customOptions: customOptions,

packages/stream_chat_flutter/lib/src/message_input/stream_message_input.dart

@@ -815,6 +815,7 @@ class StreamMessageInputState extends State<StreamMessageInput>
   Future<void> _onAttachmentButtonPressed() async {
     final attachments = await showStreamAttachmentPickerModalBottomSheet(
       context: context,
+      onError: widget.onError,
       allowedTypes: widget.allowedAttachmentPickerTypes,
       initialAttachments: _effectiveController.attachments,
     );