From 03768f8a6fd8ff6212f919eb429912826202459e Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Thu, 3 Oct 2024 11:40:35 +0700
Subject: [PATCH] TF-3002 [MOBILE] Allow search when empty string query in
 search input

---
 .../email/presentation/search_email_controller.dart  | 12 +++++++-----
 .../search/email/presentation/search_email_view.dart |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/features/search/email/presentation/search_email_controller.dart b/lib/features/search/email/presentation/search_email_controller.dart
index 0824ded633..72033b1098 100644
--- a/lib/features/search/email/presentation/search_email_controller.dart
+++ b/lib/features/search/email/presentation/search_email_controller.dart
@@ -747,22 +747,24 @@ class SearchEmailController extends BaseController
   }
 
   void onTextSearchSubmitted(BuildContext context, String text) {
-    final query = text.trim();
-    if (query.isNotEmpty) {
-      saveRecentSearch(RecentSearch.now(query));
-      submitSearchAction(context, query);
+    if (text.trim().isNotEmpty) {
+      saveRecentSearch(RecentSearch.now(text.trim()));
     }
+    submitSearchAction(context, text);
   }
 
   void setTextInputSearchForm(String value) {
     textInputSearchController.text = value;
   }
 
-  void clearAllTextInputSearchForm() {
+  void clearAllTextInputSearchForm({bool requestFocus = false}) {
     textInputSearchController.clear();
     currentSearchText.value = '';
     listSuggestionSearch.clear();
     listContactSuggestionSearch.clear();
+    if (requestFocus) {
+      textInputSearchFocus.requestFocus();
+    }
   }
 
   void clearAllResultSearch() {
diff --git a/lib/features/search/email/presentation/search_email_view.dart b/lib/features/search/email/presentation/search_email_view.dart
index a88c1e2080..043dd8716d 100644
--- a/lib/features/search/email/presentation/search_email_view.dart
+++ b/lib/features/search/email/presentation/search_email_view.dart
@@ -159,7 +159,7 @@ class SearchEmailView extends GetWidget<SearchEmailController>
                         height: 18,
                         fit: BoxFit.fill),
                     tooltip: AppLocalizations.of(context).clearAll,
-                    onTap: controller.clearAllTextInputSearchForm);
+                    onTap: () => controller.clearAllTextInputSearchForm(requestFocus: true));
             } else {
               return const SizedBox.shrink();
             }