TF-691 Persist mailbox selected when click outside destination picker to close
This commit is contained in:
+10
-7
@@ -111,23 +111,26 @@ class AdvancedFilterController extends GetxController {
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> selectedMailBox() async {
|
||||
final PresentationMailbox destinationMailbox = await push(
|
||||
void selectedMailBox() async {
|
||||
final destinationMailbox = await push(
|
||||
AppRoutes.DESTINATION_PICKER,
|
||||
arguments: DestinationPickerArguments(
|
||||
_mailboxDashBoardController.accountId.value!,
|
||||
MailboxActions.select));
|
||||
searchController.updateFilterEmail(mailbox: destinationMailbox);
|
||||
mailBoxFilterInputController.text =
|
||||
StringConvert.writeNullToEmpty(destinationMailbox.name?.name);
|
||||
|
||||
if (destinationMailbox is PresentationMailbox) {
|
||||
searchController.updateFilterEmail(mailbox: destinationMailbox);
|
||||
mailBoxFilterInputController.text =
|
||||
StringConvert.writeNullToEmpty(destinationMailbox.name?.name);
|
||||
}
|
||||
}
|
||||
|
||||
void applyAdvancedSearchFilter(BuildContext context) {
|
||||
_updateFilterEmailFromAdvancedSearchView();
|
||||
searchController.isAdvancedSearchHasApply.value = _checkAdvancedSearchHasApply();
|
||||
searchController.isAdvancedSearchViewOpen.toggle();
|
||||
_mailboxDashBoardController.searchEmail(
|
||||
context, StringConvert.writeNullToEmpty(searchEmailFilter.text?.value));
|
||||
searchController.isAdvancedSearchViewOpen.toggle();
|
||||
searchController.isAdvancedSearchHasApply.value = _checkAdvancedSearchHasApply();
|
||||
}
|
||||
|
||||
void _checkContactPermission() async {
|
||||
|
||||
@@ -67,7 +67,9 @@ class SearchEmailFilter {
|
||||
Filter mappingToEmailFilterCondition({Filter? moreFilterCondition}) {
|
||||
final emailEmailFilterConditionShared = EmailFilterCondition(
|
||||
text: text?.value,
|
||||
inMailbox: mailbox?.id,
|
||||
inMailbox: mailbox == PresentationMailbox.unifiedMailbox
|
||||
? null
|
||||
: mailbox?.id,
|
||||
after: emailReceiveTimeType.toUTCDate(),
|
||||
hasAttachment: hasAttachment == false ? null : hasAttachment,
|
||||
subject: subject,
|
||||
|
||||
+1
-3
@@ -71,9 +71,7 @@ class AdvancedSearchInputForm extends GetWidget<AdvancedFilterController>
|
||||
currentFocusNode: controller.focusManager.mailboxFieldFocusNode,
|
||||
nextFocusNode: controller.focusManager.attachmentCheckboxFocusNode,
|
||||
mouseCursor: SystemMouseCursors.click,
|
||||
onTap: () async {
|
||||
await controller.selectedMailBox();
|
||||
}),
|
||||
onTap: () => controller.selectedMailBox()),
|
||||
_buildFilterField(
|
||||
textEditingController: controller.dateFilterInputController,
|
||||
context: context,
|
||||
|
||||
Reference in New Issue
Block a user