fix: Correctly open actions panel multiple selection iPadOS (#1579)

Infomaniak · Oct 14, 2024 · e74227d · e74227d
2 parents bd1fb18 + baae817
commit e74227d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/Mail/Views/Thread List/ThreadListModifiers.swift b/Mail/Views/Thread List/ThreadListModifiers.swift
@@ -22,6 +22,7 @@ import InfomaniakDI
 import MailCore
 import MailCoreUI
 import MailResources
+import SwiftModalPresentation
 import SwiftUI
 
 extension View {
@@ -59,7 +60,6 @@ struct ThreadListToolbar: ViewModifier {
     @EnvironmentObject private var actionsManager: ActionsManager
 
     @State private var multipleSelectedMessages: [Message]?
-    @State private var messagesToMove: [Message]?
 
     @Binding var flushAlert: FlushAlertState?
 
@@ -133,7 +133,7 @@ struct ThreadListToolbar: ViewModifier {
                                     origin: .multipleSelection(
                                         originFolder: originFolder,
                                         nearestFlushAlert: $flushAlert,
-                                        nearestMessagesToMoveSheet: $messagesToMove
+                                        nearestMessagesToMoveSheet: nil
                                     )
                                 )
                             }
@@ -150,21 +150,14 @@ struct ThreadListToolbar: ViewModifier {
                     }
                     .accessibilityLabel(MailResourcesStrings.Localizable.buttonMore)
                     .accessibilityAddTraits(.isButton)
-                }
-                .actionsPanel(
-                    messages: $multipleSelectedMessages,
-                    originFolder: viewModel.frozenFolder,
-                    panelSource: .threadList
-                ) { _ in
-                    multipleSelectionViewModel.disable()
-                }
-                .sheet(item: $messagesToMove) { messages in
-                    MoveEmailView(
-                        mailboxManager: viewModel.mailboxManager,
-                        movedMessages: messages,
-                        originFolder: viewModel.frozenFolder
-                    )
-                    .sheetViewStyle()
+                    .actionsPanel(
+                        messages: $multipleSelectedMessages,
+                        originFolder: viewModel.frozenFolder,
+                        panelSource: .threadList
+                    ) { action in
+                        guard action != .openMovePanel else { return }
+                        multipleSelectionViewModel.disable()
+                    }
                 }
                 .navigationTitle(
                     multipleSelectionViewModel.isEnabled

diff --git a/MailCoreUI/Components/BottomBarView.swift b/MailCoreUI/Components/BottomBarView.swift
@@ -27,7 +27,8 @@ public struct BottomBar<Items: View>: ViewModifier {
     public func body(content: Content) -> some View {
         VStack(spacing: 0) {
             content
-            Spacer(minLength: 0)
+                .frame(maxHeight: .infinity, alignment: .top)
+
             if isVisible {
                 BottomBarView(items: items)
             }