diff --git a/lib/features/composer/presentation/composer_controller.dart b/lib/features/composer/presentation/composer_controller.dart index be33d94fb..1d878da2a 100644 --- a/lib/features/composer/presentation/composer_controller.dart +++ b/lib/features/composer/presentation/composer_controller.dart @@ -1516,18 +1516,17 @@ class ComposerController extends BaseController { if (Platform.isAndroid) { _collapseAllRecipient(); _autoCreateEmailTag(); - _removeFocusAllInputEditorHeader(); } } - void _removeFocusAllInputEditorHeader() { + void removeFocusAllInputEditorHeader() { subjectEmailInputFocusNode?.unfocus(); toAddressFocusNode?.unfocus(); ccAddressFocusNode?.unfocus(); bccAddressFocusNode?.unfocus(); } - void _onChangeCursorOnMobile(List? coordinates) { + void _onChangeCursorOnMobile(List? coordinates) { final headerEditorMobileWidgetRenderObject = headerEditorMobileWidgetKey.currentContext?.findRenderObject(); if (headerEditorMobileWidgetRenderObject is RenderBox?) { diff --git a/lib/features/composer/presentation/composer_view.dart b/lib/features/composer/presentation/composer_view.dart index 2036c1a03..ddf649232 100644 --- a/lib/features/composer/presentation/composer_view.dart +++ b/lib/features/composer/presentation/composer_view.dart @@ -487,16 +487,16 @@ class ComposerView extends GetWidget key: controller.headerEditorMobileWidgetKey, children: [ Obx(() => controller.identitySelected.value != null - ? _buildFromEmailAddress(context) - : const SizedBox.shrink()), + ? _buildFromEmailAddress(context) + : const SizedBox.shrink()), Obx(() => controller.identitySelected.value != null - ? const Divider(color: AppColor.colorDividerComposer, height: 1) - : const SizedBox.shrink()), + ? const Divider(color: AppColor.colorDividerComposer, height: 1) + : const SizedBox.shrink()), _buildEmailAddress(context), const Divider(color: AppColor.colorDividerComposer, height: 1), Padding( - padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), - child: _buildSubjectEmail(context)), + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), + child: _buildSubjectEmail(context)), const Divider(color: AppColor.colorDividerComposer, height: 1), _buildAttachmentsWidget(context), buildInlineLoadingView(controller), @@ -631,7 +631,7 @@ class ComposerView extends GetWidget Widget _buildHtmlEditor(BuildContext context, {String? initialContent}) { return GestureDetector( onTapDown: (_) { - FocusManager.instance.primaryFocus?.unfocus(); + controller.removeFocusAllInputEditorHeader(); }, child: Padding( padding: const EdgeInsets.only(left: 16, right: 16, bottom: 20), @@ -640,7 +640,7 @@ class ComposerView extends GetWidget minHeight: 550, addDefaultSelectionMenuItems: false, initialContent: initialContent ?? '', - onCreated: (editorApi) => controller.initRichTextForMobile(context, editorApi) + onCreated: (editorApi) => controller.initRichTextForMobile(context, editorApi, initialContent) ), ), );