eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

TF-3766 Remove MailboxDashboardController dependency in PopupContextMenuActionMixin

Browse Source 
Signed-off-by: dab246 <tdvu@linagora.com>
This commit is contained in:
dab246
2025-06-17 11:16:12 +07:00
committed by Dat H. Pham
parent ff2a8250a5
commit 7e22f5ddee
8 changed files with 86 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/base/mixin/popup_context_menu_action_mixin.dart
+4 -19
View File
@@ -7,7 +7,6 @@ import 'package:flutter/material.dart';
import 'package:pointer_interceptor/pointer_interceptor.dart';
import 'package:tmail_ui_user/features/base/widget/context_menu/context_menu_dialog_view.dart';
import 'package:tmail_ui_user/features/base/widget/context_menu/context_menu_item_action.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
import 'package:tmail_ui_user/main/routes/route_navigation.dart';
@@ -28,9 +27,6 @@ mixin PopupContextMenuActionMixin {
required OnContextMenuActionClick onContextMenuActionClick,
Key? key,
}) async {
if (PlatformInfo.isWeb) {
getBinding<MailboxDashBoardController>()?.isContextMenuOpened.value = true;
}
return await showModalBottomSheet(
context: context,
showDragHandle: true,
@@ -57,24 +53,17 @@ mixin PopupContextMenuActionMixin {
),
);
},
).whenComplete(() {
if (PlatformInfo.isWeb) {
getBinding<MailboxDashBoardController>()?.isContextMenuOpened.value = false;
}
});
);
}
Future<void> openPopupMenuAction(
BuildContext context,
RelativeRect? position,
RelativeRect position,
List<PopupMenuEntry> popupMenuItems,
) async {
if (PlatformInfo.isWeb) {
getBinding<MailboxDashBoardController>()?.isPopupMenuOpened.value = true;
}
return await showMenu(
context: context,
position: position ?? const RelativeRect.fromLTRB(16, 40, 16, 16),
position: position,
color: Colors.white,
surfaceTintColor: Colors.white,
menuPadding: const EdgeInsets.symmetric(vertical: 8),
@@ -84,11 +73,7 @@ mixin PopupContextMenuActionMixin {
),
constraints: const BoxConstraints(maxWidth: 300, minWidth: 178),
items: popupMenuItems,
).whenComplete(() {
if (PlatformInfo.isWeb) {
getBinding<MailboxDashBoardController>()?.isPopupMenuOpened.value = false;
}
});
);
}
Widget buildCancelButton(BuildContext context) {
lib/features/email/presentation/email_view.dart
+7 -2
View File
@@ -33,6 +33,7 @@ import 'package:tmail_ui_user/features/email/presentation/widgets/email_view_loa
import 'package:tmail_ui_user/features/email/presentation/widgets/information_sender_and_receiver_builder.dart';
import 'package:tmail_ui_user/features/email/presentation/widgets/mail_unsubscribed_banner.dart';
import 'package:tmail_ui_user/features/email/presentation/widgets/view_entire_message_with_message_clipped_widget.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_open_context_menu_extension.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/verify_display_overlay_view_on_iframe_extension.dart';
import 'package:tmail_ui_user/features/manage_account/presentation/extensions/vacation_response_extension.dart';
import 'package:tmail_ui_user/features/manage_account/presentation/vacation/widgets/vacation_notification_message_widget.dart';
@@ -561,7 +562,7 @@ class EmailView extends GetWidget<SingleEmailController> {
))
.toList();
controller.openBottomSheetContextMenuAction(
controller.mailboxDashBoardController.openBottomSheetContextMenu(
context: context,
itemActions: contextMenuActions,
onContextMenuActionClick: (menuAction) {
@@ -595,7 +596,11 @@ class EmailView extends GetWidget<SingleEmailController> {
);
}).toList();
controller.openPopupMenuAction(context, position, popupMenuItems);
controller.mailboxDashBoardController.openPopupMenu(
context,
position,
popupMenuItems,
);
}
}
}
lib/features/mailbox/presentation/extensions/handle_mailbox_action_extension.dart
+6 -1
View File
@@ -8,6 +8,7 @@ import 'package:tmail_ui_user/features/base/widget/popup_menu/popup_menu_item_ac
import 'package:tmail_ui_user/features/home/domain/extensions/session_extensions.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/mailbox_controller.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/utils/mailbox_utils.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_open_context_menu_extension.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
import 'package:tmail_ui_user/main/routes/route_navigation.dart';
@@ -102,6 +103,10 @@ extension HandleMailboxActionExtension on MailboxController {
);
}).toList();
return openPopupMenuAction(context, position, popupMenuItems);
return mailboxDashBoardController.openPopupMenu(
context,
position,
popupMenuItems,
);
}
}
lib/features/mailbox_dashboard/presentation/extensions/handle_open_context_menu_extension.dart
+46
View File
@@ -0,0 +1,46 @@
import 'package:core/utils/platform_info.dart';
import 'package:flutter/material.dart';
import 'package:tmail_ui_user/features/base/widget/context_menu/context_menu_item_action.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
extension HandleOpenContextMenuExtension on MailboxDashBoardController {
Future<void> openBottomSheetContextMenu({
required BuildContext context,
required List<ContextMenuItemAction> itemActions,
required OnContextMenuActionClick onContextMenuActionClick,
Key? key,
}) {
if (PlatformInfo.isWeb) {
isContextMenuOpened.value = true;
}
return openBottomSheetContextMenuAction(
context: context,
itemActions: itemActions,
onContextMenuActionClick: onContextMenuActionClick,
key: key,
).whenComplete(() {
if (PlatformInfo.isWeb) {
isContextMenuOpened.value = false;
}
});
}
Future<void> openPopupMenu(
BuildContext context,
RelativeRect position,
List<PopupMenuEntry> popupMenuItems,
) {
if (PlatformInfo.isWeb) {
isPopupMenuOpened.value = true;
}
return openPopupMenuAction(
context,
position,
popupMenuItems,
).whenComplete(() {
if (PlatformInfo.isWeb) {
isPopupMenuOpened.value = false;
}
});
}
}
lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
+4 -3
View File
@@ -17,6 +17,7 @@ import 'package:tmail_ui_user/features/mailbox/presentation/mailbox_view_web.dar
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/dashboard_action.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/base_mailbox_dashboard_view.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_drawer_changed_extension.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_open_context_menu_extension.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_profile_setting_action_type_click_extension.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/open_and_close_composer_extension.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
@@ -464,7 +465,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
);
}).toList();
controller.openPopupMenuAction(context, buttonPosition, popupMenuItems);
controller.openPopupMenu(context, buttonPosition, popupMenuItems);
}
void _onDeleteFilterMessageOptionAction() {
@@ -725,7 +726,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
);
}).toList();
controller.openPopupMenuAction(context, position, popupMenuItems);
controller.openPopupMenu(context, position, popupMenuItems);
}
void _openPopupMenuSortFilter(BuildContext context, RelativeRect position) {
@@ -747,6 +748,6 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
);
}).toList();
controller.openPopupMenuAction(context, position, popupMenuItems);
controller.openPopupMenu(context, position, popupMenuItems);
}
}
lib/features/search/mailbox/presentation/search_mailbox_view.dart
+7 -2
View File
@@ -19,6 +19,7 @@ import 'package:tmail_ui_user/features/mailbox/presentation/mixin/mailbox_widget
import 'package:tmail_ui_user/features/mailbox/presentation/model/context_item_mailbox_action.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_actions.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/utils/mailbox_utils.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_open_context_menu_extension.dart';
import 'package:tmail_ui_user/features/search/mailbox/presentation/search_mailbox_controller.dart';
import 'package:tmail_ui_user/features/search/mailbox/presentation/widgets/mailbox_searched_item_builder.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
@@ -282,7 +283,7 @@ class SearchMailboxView extends GetWidget<SearchMailboxController>
controller.clearSearchInputFocus();
return controller.openBottomSheetContextMenuAction(
return controller.dashboardController.openBottomSheetContextMenu(
context: context,
itemActions: contextMenuActions,
onContextMenuActionClick: (menuAction) {
@@ -325,7 +326,11 @@ class SearchMailboxView extends GetWidget<SearchMailboxController>
);
}).toList();
return controller.openPopupMenuAction(context, position, popupMenuItems);
return controller.dashboardController.openPopupMenu(
context,
position,
popupMenuItems,
);
}
}
}
lib/features/thread/presentation/extensions/handle_open_context_menu_filter_email_action_extension.dart
+5 -1
View File
@@ -34,6 +34,10 @@ extension HandleOpenContextMenuFilterEmailActionExtension on ThreadController {
);
}).toList();
openPopupMenuAction(context, position, popupMenuItems);
mailboxDashBoardController.openPopupMenuAction(
context,
position,
popupMenuItems,
);
}
}
lib/features/thread/presentation/thread_view.dart
+7 -2
View File
@@ -16,6 +16,7 @@ import 'package:tmail_ui_user/features/email/presentation/model/context_item_ema
import 'package:tmail_ui_user/features/email/presentation/model/popup_menu_item_email_action.dart';
import 'package:tmail_ui_user/features/mailbox/domain/state/clear_mailbox_state.dart';
import 'package:tmail_ui_user/features/mailbox/domain/state/mark_as_mailbox_read_state.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_open_context_menu_extension.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/open_and_close_composer_extension.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/recover_deleted_message_loading_banner_widget.dart';
import 'package:tmail_ui_user/features/manage_account/presentation/extensions/vacation_response_extension.dart';
@@ -639,7 +640,7 @@ class ThreadView extends GetWidget<ThreadController>
))
.toList();
return controller.openBottomSheetContextMenuAction(
return controller.mailboxDashBoardController.openBottomSheetContextMenu(
context: context,
itemActions: contextMenuActions,
onContextMenuActionClick: (menuAction) {
@@ -673,7 +674,11 @@ class ThreadView extends GetWidget<ThreadController>
);
}).toList();
return controller.openPopupMenuAction(context, position, popupMenuItems);
return controller.mailboxDashBoardController.openPopupMenuAction(
context,
position,
popupMenuItems,
);
}
}