diff --git a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart index 66eee6925..8a28ae119 100644 --- a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart +++ b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart @@ -531,9 +531,7 @@ class MailboxDashBoardController extends ReloadableController { void searchEmail(BuildContext context, {String? queryString}) { log('MailboxDashBoardController::searchEmail():'); clearFilterMessageOption(); - if (searchController.listFilterOnSuggestionForm.isNotEmpty) { - searchController.applyFilterSuggestionToSearchFilter(userProfile.value); - } + searchController.clearFilterSuggestion(); if (queryString?.isNotEmpty == true) { searchController.updateFilterEmail(text: SearchQuery(queryString!)); } diff --git a/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart index 79cac2fd3..e09a49357 100644 --- a/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart +++ b/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart @@ -217,6 +217,7 @@ class SearchController extends BaseController with DateRangePickerMixin { void disableSimpleSearch() { updateFilterEmail(text: SearchQuery.initial()); _clearAllTextInputSimpleSearch(); + deactivateSimpleSearch(); hideSimpleSearchFormView(); } diff --git a/lib/features/mailbox_dashboard/presentation/widgets/search_input_form_widget.dart b/lib/features/mailbox_dashboard/presentation/widgets/search_input_form_widget.dart index b2b75ebb6..bf950732d 100644 --- a/lib/features/mailbox_dashboard/presentation/widgets/search_input_form_widget.dart +++ b/lib/features/mailbox_dashboard/presentation/widgets/search_input_form_widget.dart @@ -126,6 +126,7 @@ class SearchInputFormWidget extends StatelessWidget with AppLoaderMixin { } if (query.isNotEmpty || dashBoardController.searchController.listFilterOnSuggestionForm.isNotEmpty) { + dashBoardController.searchController.applyFilterSuggestionToSearchFilter(dashBoardController.userProfile.value); dashBoardController.searchEmail(context, queryString: query); } else { dashBoardController.clearSearchEmail(); @@ -142,8 +143,11 @@ class SearchInputFormWidget extends StatelessWidget with AppLoaderMixin { } void _invokeSelectRecentItem(BuildContext context, RecentSearch recent) { - dashBoardController.searchController.enableSearch(); dashBoardController.searchController.searchInputController.text = recent.value; + dashBoardController.searchController.searchFocus.unfocus(); + dashBoardController.searchController.enableSearch(); + + dashBoardController.searchController.applyFilterSuggestionToSearchFilter(dashBoardController.userProfile.value); dashBoardController.searchEmail(context, queryString: recent.value); }