From 16d360bb005af448b61034f615bea3629a668904 Mon Sep 17 00:00:00 2001 From: dab246 Date: Fri, 27 Jan 2023 11:36:47 +0700 Subject: [PATCH] TF-1288 Fix email detailed view automatically closes when focusing on composer's editor on the web --- .../presentation/controller/single_email_controller.dart | 6 ++++++ lib/features/email/presentation/email_view.dart | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/features/email/presentation/controller/single_email_controller.dart b/lib/features/email/presentation/controller/single_email_controller.dart index a28be304d..8646f0309 100644 --- a/lib/features/email/presentation/controller/single_email_controller.dart +++ b/lib/features/email/presentation/controller/single_email_controller.dart @@ -1130,4 +1130,10 @@ class SingleEmailController extends BaseController with AppLoaderMixin { emailSupervisorController.backToPreviousEmail(); } } + Future backButtonPressedCallbackAction(BuildContext context) async { + if (!BuildUtils.isWeb) { + closeEmailView(context); + } + return false; + } } \ No newline at end of file diff --git a/lib/features/email/presentation/email_view.dart b/lib/features/email/presentation/email_view.dart index 44d877863..3f8e0b527 100644 --- a/lib/features/email/presentation/email_view.dart +++ b/lib/features/email/presentation/email_view.dart @@ -43,10 +43,7 @@ class EmailView extends GetWidget @override Widget build(BuildContext context) { return WillPopScope( - onWillPop: () async { - controller.closeEmailView(context); - return false; - }, + onWillPop: () => controller.backButtonPressedCallbackAction.call(context), child: Scaffold( backgroundColor: responsiveUtils.isWebDesktop(context) ? AppColor.colorBgDesktop