TF-3953 Close several modals when click outside

This commit is contained in:
DatDang
2025-08-07 14:14:50 +07:00
committed by Dat H. Pham
parent 44c17bc762
commit 9e7298bc76
34 changed files with 575 additions and 580 deletions
@@ -1,15 +1,13 @@
import 'package:core/presentation/extensions/color_extension.dart';
import 'package:core/presentation/state/success.dart';
import 'package:core/presentation/views/bottom_popup/confirmation_dialog_action_sheet_builder.dart';
import 'package:core/presentation/views/dialog/confirmation_dialog_builder.dart';
import 'package:core/utils/app_logger.dart';
import 'package:core/utils/platform_info.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:pointer_interceptor/pointer_interceptor.dart';
import 'package:rule_filter/rule_filter/tmail_rule.dart';
import 'package:tmail_ui_user/features/base/base_controller.dart';
import 'package:tmail_ui_user/features/base/mixin/message_dialog_action_manager.dart';
import 'package:tmail_ui_user/features/manage_account/domain/model/create_new_email_rule_filter_request.dart';
import 'package:tmail_ui_user/features/manage_account/domain/model/delete_email_rule_request.dart';
import 'package:tmail_ui_user/features/manage_account/domain/model/edit_email_rule_filter_request.dart';
@@ -166,20 +164,15 @@ class EmailRulesController extends BaseController {
}))
.show();
} else {
Get.dialog(
PointerInterceptor(
child: ConfirmationDialogBuilder(
imagePath: imagePaths,
title: AppLocalizations.of(context).deleteEmailRule,
textContent: AppLocalizations.of(context).messageConfirmationDialogDeleteEmailRule(emailRule.name),
confirmText: AppLocalizations.of(context).delete,
cancelText: AppLocalizations.of(context).cancel,
onConfirmButtonAction: () => _handleDeleteEmailRuleAction(emailRule),
onCancelButtonAction: popBack,
onCloseButtonAction: popBack,
),
),
barrierColor: AppColor.colorDefaultCupertinoActionSheet,
MessageDialogActionManager().showConfirmDialogAction(
context,
title: AppLocalizations.of(context).deleteEmailRule,
AppLocalizations.of(context).messageConfirmationDialogDeleteEmailRule(emailRule.name),
AppLocalizations.of(context).delete,
cancelTitle: AppLocalizations.of(context).cancel,
onConfirmAction: () => _handleDeleteEmailRuleAction(emailRule),
onCancelAction: popBack,
onCloseButtonAction: popBack,
);
}
}
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:tmail_ui_user/features/base/mixin/message_dialog_action_manager.dart';
import 'package:tmail_ui_user/features/manage_account/domain/state/export_trace_log_state.dart';
import 'package:tmail_ui_user/features/manage_account/domain/usecases/export_trace_log_interactor.dart';
import 'package:tmail_ui_user/features/manage_account/presentation/manage_account_dashboard_controller.dart';
@@ -18,7 +19,7 @@ extension ExportTraceLogExtension on ManageAccountDashBoardController {
}
Future<void> showExportTraceLogConfirmDialog(BuildContext context) async {
await showConfirmDialogAction(
await MessageDialogActionManager().showConfirmDialogAction(
context,
AppLocalizations.of(context).messageExportTraceLogDialog,
AppLocalizations.of(context).yes,
@@ -10,6 +10,7 @@ import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
import 'package:model/extensions/email_address_extension.dart';
import 'package:model/mailbox/select_mode.dart';
import 'package:tmail_ui_user/features/base/base_controller.dart';
import 'package:tmail_ui_user/features/base/mixin/message_dialog_action_manager.dart';
import 'package:tmail_ui_user/features/base/state/banner_state.dart';
import 'package:tmail_ui_user/features/email/presentation/utils/email_utils.dart';
import 'package:tmail_ui_user/features/home/domain/extensions/session_extensions.dart';
@@ -121,7 +122,7 @@ class ForwardController extends BaseController {
void deleteRecipients(BuildContext context, String emailAddress) {
clearInputFocus();
showConfirmDialogAction(
MessageDialogActionManager().showConfirmDialogAction(
context,
title: AppLocalizations.of(context).deleteRecipient,
AppLocalizations.of(context).messageConfirmationDialogDeleteRecipientForward(emailAddress),
@@ -210,7 +211,7 @@ class ForwardController extends BaseController {
void deleteMultipleRecipients(BuildContext context, Set<String> listEmailAddress) {
clearInputFocus();
showConfirmDialogAction(
MessageDialogActionManager().showConfirmDialogAction(
context,
title: AppLocalizations.of(context).deleteRecipient,
AppLocalizations.of(context).messageConfirmationDialogDeleteAllRecipientForward,
@@ -15,7 +15,7 @@ import 'package:get/get.dart';
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
import 'package:model/model.dart';
import 'package:super_tag_editor/tag_editor.dart';
import 'package:tmail_ui_user/features/base/mixin/message_dialog_action_mixin.dart';
import 'package:tmail_ui_user/features/base/mixin/message_dialog_action_manager.dart';
import 'package:tmail_ui_user/features/composer/presentation/model/suggestion_email_address.dart';
import 'package:tmail_ui_user/features/composer/presentation/styles/composer_style.dart';
import 'package:tmail_ui_user/features/contact/presentation/widgets/contact_input_tag_item.dart';
@@ -58,7 +58,7 @@ class AutocompleteContactTextFieldWithTags extends StatefulWidget {
State<AutocompleteContactTextFieldWithTags> createState() => _AutocompleteContactTextFieldWithTagsState();
}
class _AutocompleteContactTextFieldWithTagsState extends State<AutocompleteContactTextFieldWithTags> with MessageDialogActionMixin {
class _AutocompleteContactTextFieldWithTagsState extends State<AutocompleteContactTextFieldWithTags> {
final _responsiveUtils = Get.find<ResponsiveUtils>();
final _imagePaths = Get.find<ImagePaths>();
@@ -461,7 +461,7 @@ class _AutocompleteContactTextFieldWithTagsState extends State<AutocompleteConta
final message = forwardWarningMessage
?? appLocalizations.dialogWarningMessageForForwardsToOtherDomains;
await showConfirmDialogAction(
await MessageDialogActionManager().showConfirmDialogAction(
context,
message,
AppLocalizations.of(context).yes,
@@ -1,8 +1,6 @@
import 'package:core/presentation/extensions/color_extension.dart';
import 'package:core/presentation/state/failure.dart';
import 'package:core/presentation/state/success.dart';
import 'package:core/presentation/views/dialog/confirmation_dialog_builder.dart';
import 'package:core/utils/app_logger.dart';
import 'package:core/utils/platform_info.dart';
import 'package:dartz/dartz.dart';
@@ -16,6 +14,7 @@ import 'package:model/extensions/identity_request_dto_extension.dart';
import 'package:model/extensions/session_extension.dart';
import 'package:tmail_ui_user/features/base/before_reconnect_handler.dart';
import 'package:tmail_ui_user/features/base/before_reconnect_manager.dart';
import 'package:tmail_ui_user/features/base/mixin/message_dialog_action_manager.dart';
import 'package:tmail_ui_user/features/base/reloadable/reloadable_controller.dart';
import 'package:tmail_ui_user/features/identity_creator/domain/model/identity_cache.dart';
import 'package:tmail_ui_user/features/identity_creator/domain/state/get_identity_cache_on_web_state.dart';
@@ -43,7 +42,6 @@ import 'package:tmail_ui_user/features/manage_account/domain/usecases/transform_
import 'package:tmail_ui_user/features/manage_account/presentation/extensions/identity_extension.dart';
import 'package:tmail_ui_user/features/manage_account/presentation/extensions/update_own_email_address_extension.dart';
import 'package:tmail_ui_user/features/manage_account/presentation/extensions/list_identity_extension.dart';
import 'package:tmail_ui_user/features/manage_account/presentation/identities/widgets/delete_identity_dialog_builder.dart';
import 'package:tmail_ui_user/features/manage_account/presentation/manage_account_dashboard_controller.dart';
import 'package:tmail_ui_user/features/manage_account/presentation/model/identity_action_type.dart';
import 'package:tmail_ui_user/features/public_asset/domain/extensions/string_to_public_asset_extension.dart';
@@ -291,13 +289,19 @@ class IdentitiesController extends ReloadableController implements BeforeReconne
}
void openConfirmationDialogDeleteIdentityAction(BuildContext context, Identity identity) {
Get.dialog(
DeleteIdentityDialogBuilder(
responsiveUtils: responsiveUtils,
imagePaths: imagePaths,
onDeleteIdentityAction: () => _dereferencePublicAssets(identity),
),
barrierColor: AppColor.colorDefaultCupertinoActionSheet,
final appLocalizations = AppLocalizations.of(context);
MessageDialogActionManager().showConfirmDialogAction(
context,
appLocalizations.message_confirmation_dialog_delete_identity,
appLocalizations.delete,
key: const Key('confirm_dialog_delete_identity'),
showAsBottomSheet: responsiveUtils.isMobile(context),
outsideDialogPadding: EdgeInsets.only(bottom: PlatformInfo.isWeb ? 42 : 16),
title: appLocalizations.delete_identity,
cancelTitle: appLocalizations.cancel,
onCancelAction: popBack,
onCloseButtonAction: popBack,
onConfirmAction: () => _dereferencePublicAssets(identity),
);
}
@@ -358,16 +362,14 @@ class IdentitiesController extends ReloadableController implements BeforeReconne
void _deleteIdentityFailure(DeleteIdentityFailure failure) {
if (currentContext != null) {
Get.dialog(
ConfirmationDialogBuilder(
key: const Key('dialog_message_delete_identity_failed'),
imagePath: imagePaths,
title: AppLocalizations.of(currentContext!).delete_failed,
confirmText: '${AppLocalizations.of(currentContext!).got_it}!',
onConfirmButtonAction: popBack,
onCloseButtonAction: popBack,
),
barrierColor: AppColor.colorDefaultCupertinoActionSheet,
MessageDialogActionManager().showConfirmDialogAction(
key: const Key('dialog_message_delete_identity_failed'),
currentContext!,
title: AppLocalizations.of(currentContext!).delete_failed,
'',
'${AppLocalizations.of(currentContext!).got_it}!',
onConfirmAction: popBack,
onCloseButtonAction: popBack,
);
}
}
@@ -1,67 +0,0 @@
import 'package:core/presentation/resources/image_paths.dart';
import 'package:core/presentation/utils/responsive_utils.dart';
import 'package:core/presentation/views/dialog/confirmation_dialog_builder.dart';
import 'package:core/presentation/views/responsive/responsive_widget.dart';
import 'package:core/utils/platform_info.dart';
import 'package:flutter/material.dart';
import 'package:pointer_interceptor/pointer_interceptor.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
import 'package:tmail_ui_user/main/routes/route_navigation.dart';
typedef OnDeleteIdentityAction = void Function();
class DeleteIdentityDialogBuilder extends StatelessWidget {
final ResponsiveUtils responsiveUtils;
final ImagePaths imagePaths;
final OnDeleteIdentityAction onDeleteIdentityAction;
const DeleteIdentityDialogBuilder({
Key? key,
required this.responsiveUtils,
required this.imagePaths,
required this.onDeleteIdentityAction
}) : super(key: key);
@override
Widget build(BuildContext context) {
final appLocalizations = AppLocalizations.of(context);
final deleteDialogBuilder = ResponsiveWidget(
responsiveUtils: responsiveUtils,
mobile: _buildDeleteDialog(
appLocalizations: appLocalizations,
alignment: Alignment.bottomCenter,
outsideDialogPadding: EdgeInsets.only(bottom: PlatformInfo.isWeb ? 42 : 16),
),
landscapeMobile: _buildDeleteDialog(appLocalizations: appLocalizations),
tablet: _buildDeleteDialog(appLocalizations: appLocalizations),
tabletLarge: _buildDeleteDialog(appLocalizations: appLocalizations),
landscapeTablet: _buildDeleteDialog(appLocalizations: appLocalizations),
desktop: _buildDeleteDialog(appLocalizations: appLocalizations),
);
return PlatformInfo.isWeb
? PointerInterceptor(child: deleteDialogBuilder)
: deleteDialogBuilder;
}
ConfirmationDialogBuilder _buildDeleteDialog({
required AppLocalizations appLocalizations,
Alignment? alignment,
EdgeInsets? outsideDialogPadding,
}) {
return ConfirmationDialogBuilder(
key: const Key('confirm_dialog_delete_identity'),
imagePath: imagePaths,
title: appLocalizations.delete_identity,
textContent: appLocalizations.message_confirmation_dialog_delete_identity,
confirmText: appLocalizations.delete,
cancelText: appLocalizations.cancel,
alignment: alignment,
outsideDialogPadding: outsideDialogPadding,
onConfirmButtonAction: onDeleteIdentityAction,
onCancelButtonAction: popBack,
onCloseButtonAction: popBack,
);
}
}
@@ -2,6 +2,10 @@ import 'package:core/presentation/views/html_viewer/html_content_viewer_on_web_w
import 'package:core/presentation/views/html_viewer/html_content_viewer_widget.dart';
import 'package:core/utils/platform_info.dart';
import 'package:flutter/material.dart';
import 'package:get/state_manager.dart';
import 'package:pointer_interceptor/pointer_interceptor.dart';
import 'package:tmail_ui_user/features/base/mixin/message_dialog_action_manager.dart';
import 'package:tmail_ui_user/main/routes/dialog_router.dart';
import 'package:tmail_ui_user/main/utils/app_utils.dart';
class SignatureBuilder extends StatelessWidget {
@@ -22,7 +26,20 @@ class SignatureBuilder extends StatelessWidget {
@override
Widget build(BuildContext context) {
if (PlatformInfo.isWeb) {
return HtmlContentViewerOnWeb(
final iframeOverlay = Obx(() {
if (MessageDialogActionManager().isDialogOpened ||
DialogRouter.isDialogOpened) {
return Positioned.fill(
child: PointerInterceptor(
child: const SizedBox.expand(),
),
);
} else {
return const SizedBox.shrink();
}
});
final htmlView = HtmlContentViewerOnWeb(
contentHtml: value,
widthContent: width,
heightContent: height,
@@ -38,6 +55,13 @@ class SignatureBuilder extends StatelessWidget {
disableScrolling: true,
autoAdjustHeight: true,
);
return Stack(
children: [
htmlView,
iframeOverlay,
],
);
} else {
return HtmlContentViewer(
contentHtml: value,