diff --git a/lib/features/mailbox/presentation/extensions/handle_mailbox_action_extension.dart b/lib/features/mailbox/presentation/extensions/handle_mailbox_action_extension.dart index a51d28b5b..30f3b692a 100644 --- a/lib/features/mailbox/presentation/extensions/handle_mailbox_action_extension.dart +++ b/lib/features/mailbox/presentation/extensions/handle_mailbox_action_extension.dart @@ -39,11 +39,14 @@ extension HandleMailboxActionExtension on MailboxController { openBottomSheetContextMenuAction( context: context, itemActions: contextMenuActions, - onContextMenuActionClick: (menuAction) => handleMailboxAction( - context, - menuAction.action, - mailbox, - ), + onContextMenuActionClick: (menuAction) { + popBack(); + handleMailboxAction( + context, + menuAction.action, + mailbox, + ); + }, ); } diff --git a/lib/features/search/mailbox/presentation/search_mailbox_view.dart b/lib/features/search/mailbox/presentation/search_mailbox_view.dart index 368b3ffb4..738fe6d25 100644 --- a/lib/features/search/mailbox/presentation/search_mailbox_view.dart +++ b/lib/features/search/mailbox/presentation/search_mailbox_view.dart @@ -283,11 +283,14 @@ class SearchMailboxView extends GetWidget return controller.openBottomSheetContextMenuAction( context: context, itemActions: contextMenuActions, - onContextMenuActionClick: (menuAction) => controller.handleMailboxAction( - context, - menuAction.action, - mailbox, - ), + onContextMenuActionClick: (menuAction) { + popBack(); + controller.handleMailboxAction( + context, + menuAction.action, + mailbox, + ); + }, ); } else { final popupMenuActions = getListPopupMenuItemAction( diff --git a/lib/features/search/mailbox/presentation/widgets/mailbox_searched_item_builder.dart b/lib/features/search/mailbox/presentation/widgets/mailbox_searched_item_builder.dart index 48ae1a370..6bc80a38b 100644 --- a/lib/features/search/mailbox/presentation/widgets/mailbox_searched_item_builder.dart +++ b/lib/features/search/mailbox/presentation/widgets/mailbox_searched_item_builder.dart @@ -253,13 +253,13 @@ class _MailboxSearchedItemBuilderState extends State iconSize: 16, padding: const EdgeInsetsDirectional.all(2), onTapActionAtPositionCallback: (position) { - if (!_responsiveUtils.isScreenWithShortestSide(context)) { + if (PlatformInfo.isCanvasKit) { _onPopupMenuVisibleChange(true); } widget.onClickOpenMenuMailboxAction ?.call(position, widget.presentationMailbox) .whenComplete(() { - if (context.mounted && !_responsiveUtils.isScreenWithShortestSide(context)) { + if (context.mounted && PlatformInfo.isCanvasKit) { _onPopupMenuVisibleChange(false); } });