TF-1513 Fix rich text toolbar lost on mobile

lib/features/composer/presentation/composer_controller.dart

@@ -314,6 +314,17 @@ class ComposerController extends BaseController {
   void createFocusNodeInput() {
     toAddressFocusNode = FocusNode();
     subjectEmailInputFocusNode = FocusNode();
+
+    subjectEmailInputFocusNode?.addListener(() {
+      log('ComposerController::createFocusNodeInput():subjectEmailInputFocusNode: ${subjectEmailInputFocusNode?.hasFocus}');
+      if (subjectEmailInputFocusNode?.hasFocus == true) {
+        if (!BuildUtils.isWeb) {
+          htmlEditorApi?.unfocus();
+        }
+        _collapseAllRecipient();
+        _autoCreateEmailTag();
+      }
+    });
   }
 
   void initRichTextForMobile(BuildContext context, HtmlEditorApi editorApi) {
@@ -322,14 +333,8 @@ class ComposerController extends BaseController {
       editorApi,
       onEnterKeyDown: _onEnterKeyDown,
       context: context,
+      onFocus: _onEditorFocusOnMobile
     );
-
-    richTextMobileTabletController.htmlEditorApi?.onFocus = () {
-      FocusManager.instance.primaryFocus?.unfocus();
-
-      _collapseAllRecipient();
-      _autoCreateEmailTag();
-    };
   }
 
   void _initEmail() {
@@ -1170,15 +1175,6 @@ class ComposerController extends BaseController {
     }
   }
 
-  void onSubjectEmailFocusChange(bool isFocus) {
-    log('ComposerController::onSubjectEmailFocusChange(): Focus: $isFocus');
-    if (isFocus) {
-      _collapseAllRecipient();
-      htmlEditorApi?.unfocus();
-      _autoCreateEmailTag();
-    }
-  }
-
   void onEditorFocusChange(bool isFocus) {
     log('ComposerController::onEditorFocusChange(): Focus: $isFocus');
     if (isFocus) {
@@ -1312,6 +1308,9 @@ class ComposerController extends BaseController {
           break;
       }
       _closeSuggestionBox();
+      if (!BuildUtils.isWeb) {
+        htmlEditorApi?.unfocus();
+      }
     } else {
       if (!BuildUtils.isWeb) {
         _collapseAllRecipient();
@@ -1507,6 +1506,13 @@ class ComposerController extends BaseController {
     popBack();
   }
 
+  void _onEditorFocusOnMobile() {
+    if (Platform.isAndroid) {
+      _collapseAllRecipient();
+      _autoCreateEmailTag();
+    }
+  }
+
   void _onEnterKeyDown() {
     if(scrollController.position.pixels < scrollController.position.maxScrollExtent) {
       scrollController.animateTo(

lib/features/composer/presentation/composer_view.dart

@@ -337,14 +337,7 @@ class ComposerView extends GetWidget<ComposerController>
   }
 
   Widget _buildEmailAddress(BuildContext context) {
-    return Focus(
+    return Column(
-      onFocusChange: (focus) {
-        if(focus) {
-          controller.htmlEditorApi?.unfocus();
-          controller.keyboardRichTextController.hideRichTextView();
-        }
-      },
-      child: Column(
       children: [
         Obx(() => Padding(
             padding: EdgeInsets.only(left: responsiveUtils.isMobile(context) ? 16 : 0),
@@ -410,29 +403,24 @@ class ComposerView extends GetWidget<ComposerController>
             : const SizedBox.shrink()
         ),
       ],
-      ),
     );
   }
 
   Widget _buildSubjectEmail(BuildContext context) {
-    return Focus(
+    log('ComposerView::_buildSubjectEmail(): ');
-      onFocusChange: (focus) {
+    return Row(
-        if(focus) {
-          controller.htmlEditorApi?.unfocus();
-          controller.keyboardRichTextController.hideRichTextView();
-        }
-      },
-      child: Row(
       children: [
         Padding(
           padding: const EdgeInsets.only(right: 8),
           child: Text(
             '${AppLocalizations.of(context).subject_email}:',
-                    style: const TextStyle(fontSize: 15, color: AppColor.colorHintEmailAddressInput))),
+            style: const TextStyle(
-            Expanded(
+              fontSize: 15,
-                child: FocusScope(child: Focus(
+              color: AppColor.colorHintEmailAddressInput
-                  onFocusChange: (focus) => controller.onSubjectEmailFocusChange(focus),
+            )
-                  child: (TextFieldBuilder()
+          )
+        ),
+        Expanded(child: (TextFieldBuilder()
           ..key(const Key('subject_email_input'))
           ..cursorColor(AppColor.colorTextButton)
           ..maxLines(responsiveUtils.isMobile(context) ? null : 1)
@@ -441,11 +429,8 @@ class ComposerView extends GetWidget<ComposerController>
           ..textStyle(const TextStyle(color: Colors.black, fontSize: 15, fontWeight: FontWeight.normal))
           ..textDecoration(const InputDecoration(contentPadding: EdgeInsets.zero, border: InputBorder.none))
           ..addController(controller.subjectEmailInputController))
-                    .build(),
+        .build())
-                ))
-            )
       ]
-      ),
     );
   }
 

lib/features/composer/presentation/composer_view_web.dart

@@ -550,11 +550,13 @@ class ComposerView extends GetWidget<ComposerController>
           padding: const EdgeInsets.only(right: 8, top: 16),
           child: Text(
             '${AppLocalizations.of(context).subject_email}:',
-                style: const TextStyle(fontSize: 15, color: AppColor.colorHintEmailAddressInput))),
+            style: const TextStyle(
-          Expanded(
+              fontSize: 15,
-              child: FocusScope(child: Focus(
+              color: AppColor.colorHintEmailAddressInput
-                onFocusChange: (focus) => controller.onSubjectEmailFocusChange(focus),
+            )
-                child: (TextFieldBuilder()
+          )
+        ),
+        Expanded(child: (TextFieldBuilder()
           ..key(const Key('subject_email_input'))
           ..cursorColor(AppColor.colorTextButton)
           ..addFocusNode(controller.subjectEmailInputFocusNode)
@@ -562,8 +564,7 @@ class ComposerView extends GetWidget<ComposerController>
           ..textStyle(const TextStyle(color: Colors.black, fontSize: 15, fontWeight: FontWeight.normal))
           ..textDecoration(const InputDecoration(contentPadding: EdgeInsets.zero, border: InputBorder.none))
           ..addController(controller.subjectEmailInputController))
-                  .build(),
+        .build()
-              ))
         )
       ]
     );