TF-3007 [SEARCH] Support drag & drop between From & To field

linagora · Sep 17, 2024 · eb37ade · eb37ade
1 parent 2739a28
commit eb37ade
Show file tree

Hide file tree

Showing 5 changed files with 206 additions and 112 deletions.
diff --git a/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart
@@ -9,6 +9,7 @@ import 'package:super_tag_editor/tag_editor.dart';
 import 'package:tmail_ui_user/features/base/base_controller.dart';
 import 'package:tmail_ui_user/features/composer/domain/state/get_autocomplete_state.dart';
 import 'package:tmail_ui_user/features/composer/domain/usecases/get_autocomplete_interactor.dart';
+import 'package:tmail_ui_user/features/composer/presentation/model/draggable_email_address.dart';
 import 'package:tmail_ui_user/features/destination_picker/presentation/model/destination_picker_arguments.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/extensions/presentation_mailbox_extension.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_actions.dart';
@@ -446,6 +447,24 @@ class AdvancedFilterController extends BaseController {
     applyAdvancedSearchFilter(context);
   }
 
+  void removeDraggableEmailAddress(DraggableEmailAddress draggableEmailAddress) {
+    log('AdvancedFilterController::removeDraggableEmailAddress:removeDraggableEmailAddress: $draggableEmailAddress');
+    switch(draggableEmailAddress.prefix) {
+      case PrefixEmailAddress.to:
+        listToEmailAddress.remove(draggableEmailAddress.emailAddress);
+        toAddressExpandMode.value = ExpandMode.EXPAND;
+        toAddressExpandMode.refresh();
+        break;
+      case PrefixEmailAddress.from:
+        listFromEmailAddress.remove(draggableEmailAddress.emailAddress);
+        fromAddressExpandMode.value = ExpandMode.EXPAND;
+        fromAddressExpandMode.refresh();
+        break;
+      default:
+        break;
+    }
+  }
+
   @override
   void onClose() {
     _removeFocusListener();

diff --git a/lib/features/mailbox_dashboard/presentation/model/search/advanced_search_filter.dart b/lib/features/mailbox_dashboard/presentation/model/search/advanced_search_filter.dart
@@ -1,5 +1,6 @@
 import 'package:core/core.dart';
 import 'package:flutter/cupertino.dart';
+import 'package:model/email/prefix_email_address.dart';
 import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
 
 enum AdvancedSearchFilterField {
@@ -64,6 +65,17 @@ enum AdvancedSearchFilterField {
         color: AppColor.colorContentEmail);
   }
 
+  PrefixEmailAddress getPrefixEmailAddress() {
+    switch (this) {
+      case AdvancedSearchFilterField.from:
+        return PrefixEmailAddress.from;
+      case AdvancedSearchFilterField.to:
+        return PrefixEmailAddress.to;
+      default:
+        return PrefixEmailAddress.cc;
+    }
+  }
+
   TextStyle getHintTextStyle() {
     return const TextStyle(
         fontSize: 16,

diff --git a/...es/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_input_form.dart b/...es/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_input_form.dart
@@ -39,6 +39,7 @@ class AdvancedSearchInputForm extends GetWidget<AdvancedFilterController>
             onUpdateListEmailAddressAction: controller.updateListEmailAddress,
             onSuggestionEmailAddress: controller.getAutoCompleteSuggestion,
             onSearchAction: () => controller.onSearchAction.call(context),
+            onRemoveDraggableEmailAddressAction: controller.removeDraggableEmailAddress,
           )),
           Obx(() => TextFieldAutocompleteEmailAddressWeb(
             field: AdvancedSearchFilterField.to,
@@ -52,6 +53,7 @@ class AdvancedSearchInputForm extends GetWidget<AdvancedFilterController>
             onUpdateListEmailAddressAction: controller.updateListEmailAddress,
             onSuggestionEmailAddress: controller.getAutoCompleteSuggestion,
             onSearchAction: () => controller.onSearchAction.call(context),
+            onRemoveDraggableEmailAddressAction: controller.removeDraggableEmailAddress,
           )),
           _buildFilterField(
             textEditingController: controller.subjectFilterInputController,

diff --git a/...lbox_dashboard/presentation/widgets/advanced_search/autocomplete_tag_item_widget_web.dart b/...lbox_dashboard/presentation/widgets/advanced_search/autocomplete_tag_item_widget_web.dart
@@ -6,6 +6,8 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:get/get.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
 import 'package:model/extensions/email_address_extension.dart';
+import 'package:tmail_ui_user/features/composer/presentation/model/draggable_email_address.dart';
+import 'package:tmail_ui_user/features/composer/presentation/widgets/draggable_recipient_tag_widget.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/advanced_search_filter.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/styles/autocomplete_tag_item_web_style.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/advanced_search/avatar_tag_item_widget.dart';
@@ -48,39 +50,47 @@ class AutoCompleteTagItemWidgetWeb extends StatelessWidget {
             top: AutoCompleteTagItemWebStyle.paddingTop,
             end: isCollapsed ? AutoCompleteTagItemWebStyle.paddingEnd : 0,
           ),
-          child: TextFieldTapRegion(
-            child: InkWell(
-              onTap: () => isCollapsed
-                ? onShowFullAction?.call(field)
-                : null,
-              child: MouseRegion(
-                cursor: SystemMouseCursors.grab,
-                child: Chip(
-                  labelPadding: EdgeInsetsDirectional.symmetric(
-                    horizontal: AutoCompleteTagItemWebStyle.labelPaddingHorizontal,
-                    vertical: DirectionUtils.isDirectionRTLByHasAnyRtl(currentEmailAddress.asString()) ? 0 : 2
-                  ),
-                  label: Text(
-                    currentEmailAddress.asString(),
-                    maxLines: 1,
-                    overflow: CommonTextStyle.defaultTextOverFlow,
-                    softWrap: CommonTextStyle.defaultSoftWrap,
-                  ),
-                  deleteIcon: SvgPicture.asset(
-                    _imagePaths.icClose,
-                    fit: BoxFit.fill,
-                  ),
-                  padding: EdgeInsets.zero,
-                  labelStyle: AutoCompleteTagItemWebStyle.labelTextStyle,
-                  backgroundColor: _getTagBackgroundColor(),
-                  shape: RoundedRectangleBorder(
-                    borderRadius: AutoCompleteTagItemWebStyle.shapeBorderRadius,
-                    side: _getTagBorderSide(),
+          child: Draggable<DraggableEmailAddress>(
+            data: DraggableEmailAddress(
+              emailAddress: currentEmailAddress,
+              prefix: field.getPrefixEmailAddress()
+            ),
+            feedback: DraggableRecipientTagWidget(emailAddress: currentEmailAddress),
+            childWhenDragging: DraggableRecipientTagWidget(emailAddress: currentEmailAddress),
+            child: TextFieldTapRegion(
+              child: InkWell(
+                onTap: () => isCollapsed
+                  ? onShowFullAction?.call(field)
+                  : null,
+                child: MouseRegion(
+                  cursor: SystemMouseCursors.grab,
+                  child: Chip(
+                    labelPadding: EdgeInsetsDirectional.symmetric(
+                      horizontal: AutoCompleteTagItemWebStyle.labelPaddingHorizontal,
+                      vertical: DirectionUtils.isDirectionRTLByHasAnyRtl(currentEmailAddress.asString()) ? 0 : 2
+                    ),
+                    label: Text(
+                      currentEmailAddress.asString(),
+                      maxLines: 1,
+                      overflow: CommonTextStyle.defaultTextOverFlow,
+                      softWrap: CommonTextStyle.defaultSoftWrap,
+                    ),
+                    deleteIcon: SvgPicture.asset(
+                      _imagePaths.icClose,
+                      fit: BoxFit.fill,
+                    ),
+                    padding: EdgeInsets.zero,
+                    labelStyle: AutoCompleteTagItemWebStyle.labelTextStyle,
+                    backgroundColor: _getTagBackgroundColor(),
+                    shape: RoundedRectangleBorder(
+                      borderRadius: AutoCompleteTagItemWebStyle.shapeBorderRadius,
+                      side: _getTagBorderSide(),
+                    ),
+                    avatar: currentEmailAddress.emailAddress.isNotEmpty
+                      ? AvatarTagItemWidget(tagName: currentEmailAddress.emailAddress)
+                      : null,
+                    onDeleted: () => onDeleteTagAction?.call(currentEmailAddress),
                   ),
-                  avatar: currentEmailAddress.emailAddress.isNotEmpty
-                    ? AvatarTagItemWidget(tagName: currentEmailAddress.emailAddress)
-                    : null,
-                  onDeleted: () => onDeleteTagAction?.call(currentEmailAddress),
                 ),
               ),
             ),