fixup! fixup! fixup! fixup! TW-1787: Update context menu for pinned s…

…creen
linagora · Jun 4, 2024 · cc55504 · cc55504
1 parent 9c7e2d3
commit cc55504
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
@@ -1468,16 +1468,16 @@ class ChatController extends State<Chat>
       event,
     );
     _handleStateContextMenu();
-    final selectedAction = await showTwakeContextMenu(
+    final selectedActionIndex = await showTwakeContextMenu(
       offset: offset,
       context: context,
       listActions: listContextMenuActions,
       onClose: _handleStateContextMenu,
     );
 
-    if (selectedAction != null) {
+    if (selectedActionIndex != null && selectedActionIndex is int) {
       _handleClickOnContextMenuItem(
-        listPopupMenuActions[selectedAction],
+        listPopupMenuActions[selectedActionIndex],
         event,
       );
     }
@@ -1815,7 +1815,7 @@ class ChatController extends State<Chat>
       listActions: listContextMenuActions,
     );
 
-    if (selectedActionIndex != null) {
+    if (selectedActionIndex != null && selectedActionIndex is int) {
       final selectedAction = listAppBarActions[selectedActionIndex];
       onSelectedAppBarActions(selectedAction);
     }

diff --git a/lib/pages/chat/chat_pinned_events/pinned_messages.dart b/lib/pages/chat/chat_pinned_events/pinned_messages.dart
@@ -426,7 +426,7 @@ class PinnedMessagesController extends State<PinnedMessages>
       listActions: listActions,
       onClose: _handleStateContextMenu,
     );
-    if (selectedActionIndex != null) {
+    if (selectedActionIndex != null && selectedActionIndex is int) {
       _handleClickOnContextMenuItem(
         getPinnedMessagesActionsList(event)[selectedActionIndex],
         event,

diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
@@ -555,7 +555,7 @@ class ChatListController extends State<ChatList>
       context: context,
       listActions: listContextActions,
     );
-    if (selectedActionIndex != null) {
+    if (selectedActionIndex != null && selectedActionIndex is int) {
       _handleClickOnContextMenuItem(
         listPopupActions[selectedActionIndex],
         room,

diff --git a/lib/widgets/context_menu/twake_context_menu.dart b/lib/widgets/context_menu/twake_context_menu.dart
@@ -136,7 +136,7 @@ class TwakeContextMenuState extends State<TwakeContextMenu>
                                         child: action,
                                         closeMenuAction: () {
                                           closeContextMenu(
-                                            indexOfAction: widget.listActions
+                                            popResult: widget.listActions
                                                 .indexOf(action),
                                           );
                                         },
@@ -164,9 +164,9 @@ class TwakeContextMenuState extends State<TwakeContextMenu>
     );
   }
 
-  void closeContextMenu({int? indexOfAction}) {
+  void closeContextMenu({dynamic popResult}) {
     _animationController.reverse().whenComplete(() {
-      Navigator.of(widget.dialogContext).pop<int>(indexOfAction);
+      Navigator.of(widget.dialogContext).pop<dynamic>(popResult);
     });
   }
 

diff --git a/lib/widgets/mixins/twake_context_menu_mixin.dart b/lib/widgets/mixins/twake_context_menu_mixin.dart
@@ -4,15 +4,15 @@ import 'package:flutter/material.dart';
 
 /// Show a [TwakeContextMenu] on the given [BuildContext]. For other parameters, see [TwakeContextMenu].
 mixin TwakeContextMenuMixin {
-  Future<int?> showTwakeContextMenu({
+  Future<dynamic> showTwakeContextMenu({
     required List<ContextMenuAction> listActions,
     required Offset offset,
     required BuildContext context,
     double? verticalPadding,
     VoidCallback? onClose,
   }) async {
-    int? result;
-    await showDialog<int>(
+    dynamic result;
+    await showDialog(
       context: context,
       barrierColor: Colors.transparent,
       barrierDismissible: false,