TF-2143 Automatically create tags for To/Cc/Bcc input when clicking…

… open new tab
linagora · May 31, 2024 · 1cc848f · 1cc848f
1 parent 19c9dd6
commit 1cc848f
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/lib/features/composer/presentation/composer_controller.dart b/lib/features/composer/presentation/composer_controller.dart
@@ -748,9 +748,7 @@ class ComposerController extends BaseController with DragDropFileMixin {
 
     clearFocus(context);
 
-    if (toEmailAddressController.text.isNotEmpty
-        || ccEmailAddressController.text.isNotEmpty
-        || bccEmailAddressController.text.isNotEmpty) {
+    if (_isExistRecipientInputText) {
       _collapseAllRecipient();
       _autoCreateEmailTag();
     }
@@ -2200,13 +2198,26 @@ class ComposerController extends BaseController with DragDropFileMixin {
     bccRecipientState.value = isEnabled ? PrefixRecipientState.disabled : PrefixRecipientState.enabled;
   }
 
+  bool get _isExistRecipientInputText {
+    return toEmailAddressController.text.isNotEmpty
+      || ccEmailAddressController.text.isNotEmpty
+      || bccEmailAddressController.text.isNotEmpty;
+  }
+
   Future<void> onOpenNewTabAction() async {
     if (openNewTabButtonState == ButtonState.disabled) {
       log('ComposerController::onOpenNewTabAction: OPENING NEW TAB COMPOSER');
       return;
     }
     openNewTabButtonState = ButtonState.disabled;
 
+    FocusManager.instance.primaryFocus?.unfocus();
+
+    if (_isExistRecipientInputText) {
+      _collapseAllRecipient();
+      _autoCreateEmailTag();
+    }
+
     final arguments = composerArguments.value;
     final session = mailboxDashBoardController.sessionCurrent;
     final accountId = mailboxDashBoardController.accountId.value;