From 5bb9d5819c268ba63f3fa20a104460fafd68cd5f Mon Sep 17 00:00:00 2001 From: dab246 Date: Fri, 31 May 2024 11:05:29 +0700 Subject: [PATCH] TF-2143 Automatically create tags for `To/Cc/Bcc` input when clicking open new tab --- .../presentation/composer_controller.dart | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/features/composer/presentation/composer_controller.dart b/lib/features/composer/presentation/composer_controller.dart index f5fe699e66..c48de3e76d 100644 --- a/lib/features/composer/presentation/composer_controller.dart +++ b/lib/features/composer/presentation/composer_controller.dart @@ -818,9 +818,7 @@ class ComposerController extends BaseController with DragDropFileMixin implement clearFocus(context); - if (toEmailAddressController.text.isNotEmpty - || ccEmailAddressController.text.isNotEmpty - || bccEmailAddressController.text.isNotEmpty) { + if (_isExistRecipientInputText) { _collapseAllRecipient(); _autoCreateEmailTag(); } @@ -2305,6 +2303,12 @@ class ComposerController extends BaseController with DragDropFileMixin implement } } + bool get _isExistRecipientInputText { + return toEmailAddressController.text.isNotEmpty + || ccEmailAddressController.text.isNotEmpty + || bccEmailAddressController.text.isNotEmpty; + } + Future onOpenNewTabAction() async { if (openNewTabButtonState == ButtonState.disabled) { log('ComposerController::onOpenNewTabAction: OPENING NEW TAB COMPOSER'); @@ -2312,6 +2316,13 @@ class ComposerController extends BaseController with DragDropFileMixin implement } openNewTabButtonState = ButtonState.disabled; + FocusManager.instance.primaryFocus?.unfocus(); + + if (_isExistRecipientInputText) { + _collapseAllRecipient(); + _autoCreateEmailTag(); + } + final arguments = composerArguments.value; final session = mailboxDashBoardController.sessionCurrent; final accountId = mailboxDashBoardController.accountId.value;