Skip to content

Commit cd73f22

Browse files
fix(SnoozedFloatingPanel): Remove Binding
1 parent b4cab46 commit cd73f22

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

Mail/Views/Bottom sheets/Actions/ActionsPanelViewModifier.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ struct ActionsPanelViewModifier: ViewModifier {
148148
}
149149
}
150150
.snoozedFloatingPanel(
151-
messages: $messagesToSnooze,
151+
messages: messagesToSnooze,
152152
initialDate: initialSnoozedDate,
153153
folder: originFolder?.freezeIfNeeded(),
154154
completionHandler: completionHandler

Mail/Views/Schedule/SnoozedFloatingPanel.swift

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import SwiftUI
2121

2222
extension View {
2323
func snoozedFloatingPanel(
24-
messages: Binding<[Message]?>,
24+
messages: [Message]?,
2525
initialDate: Date?,
2626
folder: Folder?,
2727
dismissView: (() -> Void)? = nil,
@@ -44,8 +44,7 @@ struct SnoozedFloatingPanel: ViewModifier {
4444

4545
@State private var isShowingPanel = false
4646

47-
@Binding var messages: [Message]?
48-
47+
let messages: [Message]?
4948
let initialDate: Date?
5049
let folder: Folder?
5150
let dismissView: (() -> Void)?
@@ -61,10 +60,6 @@ struct SnoozedFloatingPanel: ViewModifier {
6160
.onChange(of: messages) { newValue in
6261
isShowingPanel = newValue != nil
6362
}
64-
.onChange(of: isShowingPanel) { newValue in
65-
guard !newValue else { return }
66-
messages = nil
67-
}
6863
.scheduleFloatingPanel(
6964
isPresented: $isShowingPanel,
7065
type: .snooze,

Mail/Views/Thread List/ThreadListSwipeAction.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ struct ThreadListSwipeActions: ViewModifier {
123123
.sheetViewStyle()
124124
}
125125
.snoozedFloatingPanel(
126-
messages: $messagesToSnooze,
126+
messages: messagesToSnooze,
127127
initialDate: nil,
128128
folder: folder
129129
) { messagesToSnooze = nil }

Mail/Views/Thread/SnoozedThreadHeaderView.swift

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,11 @@ struct SnoozedThreadHeaderView: View {
4646
Button(MailResourcesStrings.Localizable.buttonCancelReminder, action: cancel)
4747
}
4848
.snoozedFloatingPanel(
49-
messages: $messagesToSnooze,
49+
messages: messagesToSnooze,
5050
initialDate: date,
51-
folder: folder
52-
) { _ in dismiss() }
51+
folder: folder,
52+
completionHandler: didSnooze
53+
)
5354
}
5455

5556
private func edit() {
@@ -63,6 +64,10 @@ struct SnoozedThreadHeaderView: View {
6364
try await actionsManager.performAction(target: messages, action: .cancelSnooze, origin: origin)
6465
}
6566
}
67+
68+
private func didSnooze(_: Action) {
69+
dismiss()
70+
}
6671
}
6772

6873
#Preview {

0 commit comments

Comments
 (0)