TW-1615: Support auto jump to lastest message when user send an attac…

…hments (#1810) * TW-1615: Support auto jump to lastest message when user send an attachment * TW-1615: Support auto jump to lastest message when use copy/paste
linagora · Jun 18, 2024 · 4dc05e1 · 4dc05e1
1 parent 5b38b91
commit 4dc05e1
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 11 deletions.
diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
@@ -378,7 +378,12 @@ class ChatController extends State<Chat>
 
   void handleDragDone(DropDoneDetails details) async {
     final matrixFiles = await onDragDone(details);
-    sendFileOnWebAction(context, room: room, matrixFilesList: matrixFiles);
+    sendFileOnWebAction(
+      context,
+      room: room,
+      matrixFilesList: matrixFiles,
+      onSendFileCallback: scrollDown,
+    );
   }
 
   void _handleReceivedShareFiles() {
@@ -1292,7 +1297,12 @@ class ChatController extends State<Chat>
       _showMediaPicker(context);
     } else {
       final matrixFiles = await pickFilesFromSystem();
-      sendFileOnWebAction(context, room: room, matrixFilesList: matrixFiles);
+      sendFileOnWebAction(
+        context,
+        room: room,
+        matrixFilesList: matrixFiles,
+        onSendFileCallback: scrollDown,
+      );
     }
   }
 
@@ -1309,16 +1319,21 @@ class ChatController extends State<Chat>
         type: action,
         room: room,
         context: context,
+        onSendFileCallback: scrollDown,
       ),
       onSendTap: () {
         sendMedia(
           imagePickerController,
           room: room,
           caption: _captionsController.text,
         );
+        scrollDown();
         _captionsController.clear();
       },
-      onCameraPicked: (_) => sendMedia(imagePickerController, room: room),
+      onCameraPicked: (_) {
+        sendMedia(imagePickerController, room: room);
+        scrollDown();
+      },
       captionController: _captionsController,
       focusSuggestionController: _focusSuggestionController,
       typeAheadKey: _chatMediaPickerTypeAheadKey,
@@ -1876,7 +1891,9 @@ class ChatController extends State<Chat>
   @override
   void initState() {
     _initializePinnedEvents();
-    registerPasteShortcutListeners();
+    registerPasteShortcutListeners(
+      onSendFileCallback: scrollDown,
+    );
     keyboardVisibilitySubscription =
         keyboardVisibilityController.onChange.listen(_keyboardListener);
     scrollController.addListener(_updateScrollController);

diff --git a/lib/presentation/mixins/handle_clipboard_action_mixin.dart b/lib/presentation/mixins/handle_clipboard_action_mixin.dart
@@ -14,23 +14,38 @@ mixin HandleClipboardActionMixin on PasteImageMixin {
 
   TextEditingController get sendController;
 
-  void registerPasteShortcutListeners() {
-    ClipboardEvents.instance?.registerPasteEventListener(_onPasteEvent);
+  void registerPasteShortcutListeners({
+    VoidCallback? onSendFileCallback,
+  }) {
+    ClipboardEvents.instance?.registerPasteEventListener(
+      (event) => _onPasteEvent(
+        event,
+        onSendFileCallback: onSendFileCallback,
+      ),
+    );
   }
 
   void unregisterPasteShortcutListeners() {
     ClipboardEvents.instance?.unregisterPasteEventListener(_onPasteEvent);
   }
 
-  void _onPasteEvent(ClipboardReadEvent event) async {
+  void _onPasteEvent(
+    ClipboardReadEvent event, {
+    VoidCallback? onSendFileCallback,
+  }) async {
     if (chatFocusNode.hasFocus != true) {
       return;
     }
     final clipboardReader = await event.getClipboardReader();
     if (await TwakeClipboard.instance
             .isReadableImageFormat(clipboardReader: clipboardReader) &&
         room != null) {
-      await pasteImage(context, room!, clipboardReader: clipboardReader);
+      await pasteImage(
+        context,
+        room!,
+        clipboardReader: clipboardReader,
+        onSendFileCallback: onSendFileCallback,
+      );
     } else {
       sendController.pasteText(clipboardReader: clipboardReader);
     }

diff --git a/lib/presentation/mixins/paste_image_mixin.dart b/lib/presentation/mixins/paste_image_mixin.dart
@@ -1,4 +1,5 @@
 import 'package:fluffychat/pages/chat/send_file_dialog/send_file_dialog.dart';
+import 'package:fluffychat/presentation/enum/chat/send_media_with_caption_status_enum.dart';
 import 'package:fluffychat/utils/clipboard.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:fluffychat/utils/twake_snackbar.dart';
@@ -12,6 +13,7 @@ mixin PasteImageMixin {
     BuildContext context,
     Room room, {
     ClipboardReader? clipboardReader,
+    VoidCallback? onSendFileCallback,
   }) async {
     if (!(await TwakeClipboard.instance
         .isReadableImageFormat(clipboardReader: clipboardReader))) {
@@ -41,7 +43,7 @@ mixin PasteImageMixin {
         )
         .cast<MatrixImageFile>()
         .toList();
-    await showDialog(
+    final result = await showDialog(
       context: context,
       useRootNavigator: PlatformInfos.isWeb,
       builder: (context) {
@@ -51,5 +53,15 @@ mixin PasteImageMixin {
         );
       },
     );
+    if (result is SendMediaWithCaptionStatus) {
+      switch (result) {
+        case SendMediaWithCaptionStatus.done:
+        case SendMediaWithCaptionStatus.error:
+          onSendFileCallback?.call();
+          break;
+        case SendMediaWithCaptionStatus.cancel:
+          break;
+      }
+    }
   }
 }
diff --git a/lib/presentation/mixins/send_files_mixin.dart b/lib/presentation/mixins/send_files_mixin.dart
@@ -34,6 +34,7 @@ mixin SendFilesMixin {
     BuildContext context, {
     Room? room,
     List<FileInfo>? fileInfos,
+    VoidCallback? onSendFileCallback,
   }) async {
     if (room == null) {}
     final sendFileInteractor = getIt.get<SendFileInteractor>();
@@ -54,7 +55,7 @@ mixin SendFilesMixin {
         .toList();
 
     if (fileInfos == null || fileInfos.isEmpty == true) return;
-
+    onSendFileCallback?.call();
     sendFileInteractor.execute(room: room!, fileInfos: fileInfos);
   }
 
@@ -72,12 +73,17 @@ mixin SendFilesMixin {
     required BuildContext context,
     Room? room,
     required PickerType type,
+    VoidCallback? onSendFileCallback,
   }) async {
     switch (type) {
       case PickerType.gallery:
         break;
       case PickerType.documents:
-        sendFileAction(context, room: room);
+        sendFileAction(
+          context,
+          room: room,
+          onSendFileCallback: onSendFileCallback,
+        );
         break;
       case PickerType.location:
         break;

diff --git a/lib/presentation/mixins/send_files_with_caption_web_mixin.dart b/lib/presentation/mixins/send_files_with_caption_web_mixin.dart
@@ -12,6 +12,7 @@ mixin SendFilesWithCaptionWebMixin {
     BuildContext context, {
     Room? room,
     required List<MatrixFile> matrixFilesList,
+    VoidCallback? onSendFileCallback,
   }) async {
     if (matrixFilesList.length <= AppConfig.maxFilesSendPerDialog &&
         matrixFilesList.isNotEmpty) {
@@ -25,6 +26,7 @@ mixin SendFilesWithCaptionWebMixin {
           );
         },
       );
+      onSendFileCallback?.call();
       if (result is SendMediaWithCaptionStatus) {
         switch (result) {
           case SendMediaWithCaptionStatus.done: