TF-3996 Add widget test for PopupMenuActionGroupWidget
This commit is contained in:
@@ -0,0 +1,53 @@
|
||||
import 'package:core/presentation/extensions/color_extension.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:tmail_ui_user/features/base/extensions/popup_menu_action_list_extension.dart';
|
||||
import 'package:tmail_ui_user/features/base/mixin/popup_context_menu_action_mixin.dart';
|
||||
import 'package:tmail_ui_user/features/base/model/popup_menu_item_action.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/popup_menu/popup_menu_item_action_widget.dart';
|
||||
|
||||
typedef OnPopupMenuActionSelected = void Function(PopupMenuItemAction action);
|
||||
|
||||
class PopupMenuActionGroupWidget with PopupContextMenuActionMixin {
|
||||
final List<PopupMenuItemAction> actions;
|
||||
final OnPopupMenuActionSelected onActionSelected;
|
||||
final double dividerOpacity;
|
||||
|
||||
const PopupMenuActionGroupWidget({
|
||||
required this.actions,
|
||||
required this.onActionSelected,
|
||||
this.dividerOpacity = 0.12,
|
||||
});
|
||||
|
||||
Future<void> show(
|
||||
BuildContext context,
|
||||
RelativeRect position,
|
||||
) async {
|
||||
final groupedActions = actions.groupByCategory();
|
||||
final entries = groupedActions.entries.toList();
|
||||
|
||||
final popupMenuItems = <PopupMenuEntry>[
|
||||
for (var i = 0; i < entries.length; i++) ...[
|
||||
...entries[i].value.map(
|
||||
(menuAction) => PopupMenuItem(
|
||||
key: menuAction.key != null ? Key(menuAction.key!) : null,
|
||||
padding: EdgeInsets.zero,
|
||||
child: PopupMenuItemActionWidget(
|
||||
menuAction: menuAction,
|
||||
menuActionClick: (menuAction) {
|
||||
Navigator.pop(context);
|
||||
onActionSelected(menuAction);
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
if (i < entries.length - 1)
|
||||
PopupMenuDivider(
|
||||
height: 1,
|
||||
color: AppColor.gray424244.withValues(alpha: dividerOpacity),
|
||||
),
|
||||
],
|
||||
];
|
||||
|
||||
return openPopupMenuAction(context, position, popupMenuItems);
|
||||
}
|
||||
}
|
||||
@@ -98,7 +98,7 @@ class EmailView extends GetWidget<SingleEmailController> {
|
||||
additionalActions: [],
|
||||
emailIsRead: presentationEmail.hasRead,
|
||||
openBottomSheetContextMenu: controller.mailboxDashBoardController.openBottomSheetContextMenu,
|
||||
openPopupMenu: controller.mailboxDashBoardController.openPopupMenu,
|
||||
openPopupMenu: controller.mailboxDashBoardController.openPopupMenuActionGroup,
|
||||
);
|
||||
},
|
||||
supportBackAction: !isInsideThreadDetailView,
|
||||
@@ -283,7 +283,7 @@ class EmailView extends GetWidget<SingleEmailController> {
|
||||
],
|
||||
emailIsRead: presentationEmail.hasRead,
|
||||
openBottomSheetContextMenu: controller.mailboxDashBoardController.openBottomSheetContextMenu,
|
||||
openPopupMenu: controller.mailboxDashBoardController.openPopupMenu,
|
||||
openPopupMenu: controller.mailboxDashBoardController.openPopupMenuActionGroup,
|
||||
),
|
||||
onToggleThreadDetailCollapseExpand: onToggleThreadDetailCollapseExpand,
|
||||
mailboxContain: presentationEmail.findMailboxContain(
|
||||
|
||||
+20
-61
@@ -29,10 +29,9 @@ import 'package:model/extensions/list_email_address_extension.dart';
|
||||
import 'package:model/extensions/presentation_email_extension.dart';
|
||||
import 'package:model/extensions/presentation_mailbox_extension.dart';
|
||||
import 'package:model/mailbox/presentation_mailbox.dart';
|
||||
import 'package:tmail_ui_user/features/base/extensions/popup_menu_action_list_extension.dart';
|
||||
import 'package:tmail_ui_user/features/base/mixin/message_dialog_action_manager.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/context_menu/context_menu_item_action.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/popup_menu/popup_menu_item_action_widget.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/popup_menu/popup_menu_action_group_widget.dart';
|
||||
import 'package:tmail_ui_user/features/destination_picker/presentation/model/destination_picker_arguments.dart';
|
||||
import 'package:tmail_ui_user/features/email/domain/model/email_print.dart';
|
||||
import 'package:tmail_ui_user/features/email/domain/model/mark_read_action.dart';
|
||||
@@ -72,10 +71,10 @@ typedef OpenBottomSheetContextMenuAction = Future<void> Function({
|
||||
bool useGroupedActions,
|
||||
});
|
||||
|
||||
typedef OpenPopUpContextMenuAction = Future<void> Function(
|
||||
typedef OpenPopupMenuActionGroup = Future<void> Function(
|
||||
BuildContext context,
|
||||
RelativeRect position,
|
||||
List<PopupMenuEntry> popupMenuItems,
|
||||
PopupMenuActionGroupWidget popupMenuWidget,
|
||||
);
|
||||
|
||||
class EmailActionReactor {
|
||||
@@ -485,7 +484,7 @@ class EmailActionReactor {
|
||||
required List<EmailActionType> additionalActions,
|
||||
required bool emailIsRead,
|
||||
required OpenBottomSheetContextMenuAction openBottomSheetContextMenu,
|
||||
required OpenPopUpContextMenuAction openPopupMenu,
|
||||
required OpenPopupMenuActionGroup openPopupMenu,
|
||||
}) {
|
||||
if (currentContext == null) return;
|
||||
|
||||
@@ -557,17 +556,24 @@ class EmailActionReactor {
|
||||
useGroupedActions: true,
|
||||
);
|
||||
} else {
|
||||
openPopupMenu(
|
||||
currentContext!,
|
||||
position,
|
||||
_popupMenuEmailActionTile(
|
||||
currentContext!,
|
||||
presentationEmail,
|
||||
moreActions,
|
||||
final popupMenuItemEmailActions = moreActions.map((actionType) {
|
||||
return PopupMenuItemEmailAction(
|
||||
actionType,
|
||||
AppLocalizations.of(currentContext!),
|
||||
imagePaths,
|
||||
handleEmailAction: handleEmailAction,
|
||||
)
|
||||
key: '${actionType.name}_action',
|
||||
category: actionType.category,
|
||||
);
|
||||
}).toList();
|
||||
|
||||
final popupMenuWidget = PopupMenuActionGroupWidget(
|
||||
actions: popupMenuItemEmailActions,
|
||||
onActionSelected: (action) {
|
||||
handleEmailAction(presentationEmail, action.action);
|
||||
},
|
||||
);
|
||||
|
||||
openPopupMenu(currentContext!, position, popupMenuWidget);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -582,53 +588,6 @@ class EmailActionReactor {
|
||||
?? false;
|
||||
}
|
||||
|
||||
List<PopupMenuEntry> _popupMenuEmailActionTile(
|
||||
BuildContext context,
|
||||
PresentationEmail presentationEmail,
|
||||
List<EmailActionType> actionTypes,
|
||||
ImagePaths imagePaths, {
|
||||
required void Function(
|
||||
PresentationEmail presentationEmail,
|
||||
EmailActionType action,
|
||||
) handleEmailAction,
|
||||
}) {
|
||||
final popupMenuItemEmailActions = actionTypes.map((actionType) {
|
||||
return PopupMenuItemEmailAction(
|
||||
actionType,
|
||||
AppLocalizations.of(context),
|
||||
imagePaths,
|
||||
key: '${actionType.name}_action',
|
||||
category: actionType.category,
|
||||
);
|
||||
}).toList();
|
||||
|
||||
final groupedActions = popupMenuItemEmailActions.groupByCategory();
|
||||
final entries = groupedActions.entries.toList();
|
||||
|
||||
final popupMenuItems = <PopupMenuEntry>[
|
||||
for (var i = 0; i < entries.length; i++) ...[
|
||||
...entries[i].value.map((menuAction) => PopupMenuItem(
|
||||
key: menuAction.key != null ? Key(menuAction.key!) : null,
|
||||
padding: EdgeInsets.zero,
|
||||
child: PopupMenuItemActionWidget(
|
||||
menuAction: menuAction,
|
||||
menuActionClick: (menuAction) {
|
||||
popBack();
|
||||
handleEmailAction(presentationEmail, menuAction.action);
|
||||
},
|
||||
),
|
||||
)),
|
||||
if (i < entries.length - 1)
|
||||
PopupMenuDivider(
|
||||
height: 1,
|
||||
color: AppColor.gray424244.withValues(alpha: 0.12),
|
||||
),
|
||||
],
|
||||
];
|
||||
|
||||
return popupMenuItems;
|
||||
}
|
||||
|
||||
Future<void> openEmailAddressDialog(
|
||||
Session session,
|
||||
AccountId accountId, {
|
||||
|
||||
+19
@@ -1,6 +1,7 @@
|
||||
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/base/widget/popup_menu/popup_menu_action_group_widget.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
|
||||
|
||||
extension HandleOpenContextMenuExtension on MailboxDashBoardController {
|
||||
@@ -45,4 +46,22 @@ extension HandleOpenContextMenuExtension on MailboxDashBoardController {
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> openPopupMenuActionGroup(
|
||||
BuildContext context,
|
||||
RelativeRect position,
|
||||
PopupMenuActionGroupWidget popupMenuWidget,
|
||||
) {
|
||||
if (PlatformInfo.isWeb) {
|
||||
isPopupMenuOpened.value = true;
|
||||
}
|
||||
return popupMenuWidget.show(
|
||||
context,
|
||||
position,
|
||||
).whenComplete(() {
|
||||
if (PlatformInfo.isWeb) {
|
||||
isPopupMenuOpened.value = false;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
+17
-33
@@ -1,10 +1,8 @@
|
||||
import 'package:core/presentation/extensions/color_extension.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:model/email/email_action_type.dart';
|
||||
import 'package:model/email/email_action_type.dart';
|
||||
import 'package:model/email/presentation_email.dart';
|
||||
import 'package:model/extensions/presentation_mailbox_extension.dart';
|
||||
import 'package:tmail_ui_user/features/base/extensions/popup_menu_action_list_extension.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/popup_menu/popup_menu_item_action_widget.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/popup_menu/popup_menu_action_group_widget.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/model/context_item_email_action.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/model/popup_menu_item_email_action.dart';
|
||||
import 'package:tmail_ui_user/features/search/email/presentation/search_email_controller.dart';
|
||||
@@ -68,36 +66,22 @@ extension HandleEmailMoreActionExtension on SearchEmailController {
|
||||
);
|
||||
}).toList();
|
||||
|
||||
final groupedActions = popupMenuItemEmailActions.groupByCategory();
|
||||
final entries = groupedActions.entries.toList();
|
||||
final popupMenuWidget = PopupMenuActionGroupWidget(
|
||||
actions: popupMenuItemEmailActions,
|
||||
onActionSelected: (action) {
|
||||
pressEmailAction(
|
||||
context,
|
||||
action.action,
|
||||
presentationEmail,
|
||||
mailboxContain: mailboxContain,
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
final popupMenuItems = <PopupMenuEntry>[
|
||||
for (var i = 0; i < entries.length; i++)
|
||||
...[
|
||||
...entries[i].value.map((menuAction) => PopupMenuItem(
|
||||
padding: EdgeInsets.zero,
|
||||
child: PopupMenuItemActionWidget(
|
||||
menuAction: menuAction,
|
||||
menuActionClick: (menuAction) {
|
||||
popBack();
|
||||
pressEmailAction(
|
||||
context,
|
||||
menuAction.action,
|
||||
presentationEmail,
|
||||
mailboxContain: mailboxContain,
|
||||
);
|
||||
},
|
||||
),
|
||||
)),
|
||||
if (i < entries.length - 1)
|
||||
PopupMenuDivider(
|
||||
height: 1,
|
||||
color: AppColor.gray424244.withValues(alpha: 0.12),
|
||||
),
|
||||
],
|
||||
];
|
||||
|
||||
return openPopupMenuAction(context, position, popupMenuItems);
|
||||
return popupMenuWidget.show(
|
||||
context,
|
||||
position,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,13 +6,12 @@ import 'package:flutter_svg/flutter_svg.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
|
||||
import 'package:model/model.dart';
|
||||
import 'package:tmail_ui_user/features/base/extensions/popup_menu_action_list_extension.dart';
|
||||
import 'package:tmail_ui_user/features/base/mixin/app_loader_mixin.dart';
|
||||
import 'package:tmail_ui_user/features/base/mixin/popup_menu_widget_mixin.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/clean_messages_banner.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/compose_floating_button.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/keyboard/keyboard_handler_wrapper.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/popup_menu/popup_menu_item_action_widget.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/popup_menu/popup_menu_action_group_widget.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/report_message_banner.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/model/composer_arguments.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/model/context_item_email_action.dart';
|
||||
@@ -678,37 +677,21 @@ class ThreadView extends GetWidget<ThreadController>
|
||||
);
|
||||
}).toList();
|
||||
|
||||
final groupedActions = popupMenuItemEmailActions.groupByCategory();
|
||||
final entries = groupedActions.entries.toList();
|
||||
final popupMenuWidget = PopupMenuActionGroupWidget(
|
||||
actions: popupMenuItemEmailActions,
|
||||
onActionSelected: (action) {
|
||||
controller.handleEmailActionType(
|
||||
action.action,
|
||||
presentationEmail,
|
||||
mailboxContain: mailboxContain,
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
final popupMenuItems = <PopupMenuEntry>[
|
||||
for (var i = 0; i < entries.length; i++) ...[
|
||||
...entries[i].value.map((menuAction) => PopupMenuItem(
|
||||
padding: EdgeInsets.zero,
|
||||
child: PopupMenuItemActionWidget(
|
||||
menuAction: menuAction,
|
||||
menuActionClick: (menuAction) {
|
||||
popBack();
|
||||
controller.handleEmailActionType(
|
||||
menuAction.action,
|
||||
presentationEmail,
|
||||
mailboxContain: mailboxContain,
|
||||
);
|
||||
},
|
||||
),
|
||||
)),
|
||||
if (i < entries.length - 1)
|
||||
PopupMenuDivider(
|
||||
height: 1,
|
||||
color: AppColor.gray424244.withValues(alpha: 0.12),
|
||||
),
|
||||
],
|
||||
];
|
||||
|
||||
return controller.mailboxDashBoardController.openPopupMenuAction(
|
||||
return controller.mailboxDashBoardController.openPopupMenuActionGroup(
|
||||
context,
|
||||
position,
|
||||
popupMenuItems,
|
||||
popupMenuWidget,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
+9
-28
@@ -1,4 +1,3 @@
|
||||
import 'package:core/presentation/extensions/color_extension.dart';
|
||||
import 'package:core/utils/platform_info.dart';
|
||||
import 'package:dartz/dartz.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
@@ -7,8 +6,7 @@ import 'package:model/email/email_action_type.dart';
|
||||
import 'package:model/email/mark_star_action.dart';
|
||||
import 'package:model/email/read_actions.dart';
|
||||
import 'package:model/mailbox/presentation_mailbox.dart';
|
||||
import 'package:tmail_ui_user/features/base/extensions/popup_menu_action_list_extension.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/popup_menu/popup_menu_item_action_widget.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/popup_menu/popup_menu_action_group_widget.dart';
|
||||
import 'package:tmail_ui_user/features/destination_picker/presentation/model/destination_picker_arguments.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/action/email_ui_action.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/model/context_item_email_action.dart';
|
||||
@@ -170,34 +168,17 @@ extension OnThreadDetailActionClick on ThreadDetailController {
|
||||
);
|
||||
}).toList();
|
||||
|
||||
final groupedActions = popupMenuItemEmailActions.groupByCategory();
|
||||
final entries = groupedActions.entries.toList();
|
||||
final popupMenuWidget = PopupMenuActionGroupWidget(
|
||||
actions: popupMenuItemEmailActions,
|
||||
onActionSelected: (action) {
|
||||
onThreadDetailActionClick(action.action);
|
||||
},
|
||||
);
|
||||
|
||||
final popupMenuItems = <PopupMenuEntry>[
|
||||
for (var i = 0; i < entries.length; i++) ...[
|
||||
...entries[i].value.map((menuAction) => PopupMenuItem(
|
||||
key: menuAction.key != null ? Key(menuAction.key!) : null,
|
||||
padding: EdgeInsets.zero,
|
||||
child: PopupMenuItemActionWidget(
|
||||
menuAction: menuAction,
|
||||
menuActionClick: (menuAction) {
|
||||
popBack();
|
||||
onThreadDetailActionClick(menuAction.action);
|
||||
},
|
||||
),
|
||||
)),
|
||||
if (i < entries.length - 1)
|
||||
PopupMenuDivider(
|
||||
height: 1,
|
||||
color: AppColor.gray424244.withValues(alpha: 0.12),
|
||||
),
|
||||
],
|
||||
];
|
||||
|
||||
mailboxDashBoardController.openPopupMenu(
|
||||
mailboxDashBoardController.openPopupMenuActionGroup(
|
||||
currentContext!,
|
||||
position,
|
||||
popupMenuItems,
|
||||
popupMenuWidget,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user