TF-1486 Fix duplicate cursor in vacation on android

(cherry picked from commit c0532ec)
linagora · Jul 14, 2023 · 38442aa · 38442aa
1 parent 15df142
commit 38442aa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/features/manage_account/presentation/vacation/vacation_controller.dart b/lib/features/manage_account/presentation/vacation/vacation_controller.dart
@@ -38,6 +38,7 @@ class VacationController extends BaseController {
   final errorMessageBody = Rxn<String>();
 
   final subjectTextController = TextEditingController();
+  final subjectTextFocusNode = FocusNode();
   final richTextControllerForMobile = RichTextController();
   final htmlEditorMinHeight = 150;
 
@@ -338,6 +339,8 @@ class VacationController extends BaseController {
   }
 
   void onFocusHTMLEditor() async {
+    subjectTextFocusNode.unfocus();
+
     await Scrollable.ensureVisible(htmlKey.currentContext!);
     await Future.delayed(const Duration(milliseconds: 500), () {
       scrollController.animateTo(
@@ -360,6 +363,7 @@ class VacationController extends BaseController {
 
   @override
   void onClose() {
+    subjectTextFocusNode.dispose();
     subjectTextController.dispose();
     richTextControllerForMobile.dispose();
     scrollController.dispose();

diff --git a/lib/features/manage_account/presentation/vacation/vacation_view.dart b/lib/features/manage_account/presentation/vacation/vacation_view.dart
@@ -251,7 +251,8 @@ class VacationView extends GetWidget<VacationController> with RichTextButtonMixi
                           child: TextInputFieldBuilder(
                             label: AppLocalizations.of(context).subject,
                             hint: AppLocalizations.of(context).hintSubjectInputVacationSetting,
-                            editingController: controller.subjectTextController
+                            editingController: controller.subjectTextController,
+                            focusNode: controller.subjectTextFocusNode,
                           ),
                         )
                       : Row(children: [
@@ -260,7 +261,8 @@ class VacationView extends GetWidget<VacationController> with RichTextButtonMixi
                             child: TextInputFieldBuilder(
                               label: AppLocalizations.of(context).subject,
                               hint: AppLocalizations.of(context).hintSubjectInputVacationSetting,
-                              editingController: controller.subjectTextController
+                              editingController: controller.subjectTextController,
+                              focusNode: controller.subjectTextFocusNode,
                             ),
                           )),
                           const SizedBox(width: 24),