TF-933 Apply search/quick search in all mailbox and unselected mailbox when show search result

This commit is contained in:
dab246
2022-09-15 22:24:43 +07:00
committed by Dat H. Pham
parent 376b28cad1
commit fe1693fa3e
2 changed files with 9 additions and 5 deletions
@@ -374,6 +374,7 @@ class MailboxDashBoardController extends ReloadableController {
if (value.isEmpty){ if (value.isEmpty){
searchController.setEmailReceiveTimeType(null); searchController.setEmailReceiveTimeType(null);
} }
_unSelectedMailbox();
} }
bool _searchInsideEmailDetailedViewIsActive(BuildContext context) { bool _searchInsideEmailDetailedViewIsActive(BuildContext context) {
@@ -382,6 +383,10 @@ class MailboxDashBoardController extends ReloadableController {
&& routePath.value == AppRoutes.EMAIL; && routePath.value == AppRoutes.EMAIL;
} }
void _unSelectedMailbox() {
selectedMailbox.value = null;
}
void _closeEmailDetailedView() { void _closeEmailDetailedView() {
dispatchRoute(AppRoutes.THREAD); dispatchRoute(AppRoutes.THREAD);
clearSelectedEmail(); clearSelectedEmail();
@@ -236,8 +236,12 @@ class ThreadController extends BaseController {
if (_currentMailboxId != mailbox.id) { if (_currentMailboxId != mailbox.id) {
_currentMailboxId = mailbox.id; _currentMailboxId = mailbox.id;
_resetToOriginalValue(); _resetToOriginalValue();
disableSearch();
_getAllEmail(); _getAllEmail();
} }
} else if (mailbox == null) { // disable current mailbox when search active
_currentMailboxId = null;
_resetToOriginalValue();
} }
}); });
@@ -336,7 +340,6 @@ class ThreadController extends BaseController {
emailList.clear(); emailList.clear();
canLoadMore = true; canLoadMore = true;
_isLoadingMore = false; _isLoadingMore = false;
disableSearch();
cancelSelectEmail(); cancelSelectEmail();
mailboxDashBoardController.dispatchRoute(AppRoutes.THREAD); mailboxDashBoardController.dispatchRoute(AppRoutes.THREAD);
} }
@@ -862,10 +865,6 @@ class ThreadController extends BaseController {
if (_accountId != null && searchQuery != null) { if (_accountId != null && searchQuery != null) {
searchController.searchIsActive.value = true; searchController.searchIsActive.value = true;
if(searchController.isAdvancedSearchHasApply.isFalse){
searchController.updateFilterEmail(mailbox: currentMailbox);
}
filterMessageOption = EmailFilterCondition( filterMessageOption = EmailFilterCondition(
notKeyword: filterMessageOption?.notKeyword, notKeyword: filterMessageOption?.notKeyword,
hasKeyword: filterMessageOption?.hasKeyword, hasKeyword: filterMessageOption?.hasKeyword,