fix: Disable multiselection after selecting action

Infomaniak · May 3, 2023 · 7639572 · 7639572
1 parent d81e1a9
commit 7639572
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/Mail/Views/Thread List/ThreadListView.swift b/Mail/Views/Thread List/ThreadListView.swift
@@ -257,6 +257,7 @@ private struct ThreadListToolbar: ViewModifier {
     @ObservedObject var multipleSelectionViewModel: ThreadListMultipleSelectionViewModel
 
     @State private var isShowingSwitchAccount = false
+    @State private var multipleSelectionActionsTarget: ActionsTarget?
 
     @EnvironmentObject var splitViewManager: SplitViewManager
     @EnvironmentObject var navigationDrawerState: NavigationDrawerState
@@ -347,16 +348,22 @@ private struct ThreadListToolbar: ViewModifier {
                                 .disabled(action == .archive && splitViewManager.selectedFolder?.role == .archive)
                             }
 
-                            ActionsPanelButton(threads: Array(multipleSelectionViewModel.selectedItems),
-                                               isMultiSelectionEnabled: true) {
-                                ToolbarButtonLabel(text: MailResourcesStrings.Localizable.buttonMore,
-                                                   icon: MailResourcesAsset.plusActions.swiftUIImage)
+                            ToolbarButton(
+                                text: MailResourcesStrings.Localizable.buttonMore,
+                                icon: MailResourcesAsset.plusActions.swiftUIImage
+                            ) {
+                                multipleSelectionActionsTarget = .threads(Array(multipleSelectionViewModel.selectedItems), true)
                             }
                         }
                         .disabled(multipleSelectionViewModel.selectedItems.isEmpty)
                     }
                 }
             }
+            .actionsPanel(actionsTarget: $multipleSelectionActionsTarget) {
+                withAnimation {
+                    multipleSelectionViewModel.isEnabled = false
+                }
+            }
             .navigationTitle(
                 multipleSelectionViewModel.isEnabled
                     ? MailResourcesStrings.Localizable.multipleSelectionCount(multipleSelectionViewModel.selectedItems.count)