Skip to content

Landscape Haptic FlowInteractiveDismissDisabled Edge Case #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brody2002 merged 3 commits into from
Feb 2, 2026
Merged

Landscape Haptic FlowInteractiveDismissDisabled Edge Case #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
083fdf8
fix
brody2002 Feb 2, 2026
38dc0d1
Done
brody2002 Feb 2, 2026
b6ca657
edit
brody2002 Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Sources/FlowStack/FlowTransition.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,10 @@ extension AnyTransition {
let scaleRatio = context.shouldScaleHorizontally ? zoomRect.size.width / proxy.size.width : 1.0

content
.onInteractiveDismissGesture(threshold: 80, isDismissing: isDismissing, swipeUpToDismiss: context.swipeUpToDismiss, onDismiss: {
.onInteractiveDismissGesture(threshold: 80, isEnabled: !isDisabled, isDismissing: isDismissing, swipeUpToDismiss: context.swipeUpToDismiss, onDismiss: {
defer { isDismissing = true }
guard !isDisabled else { return }
dismiss()
isDismissing = true
}, onPan: { offset in
defer { self.isEnded = false }
guard !isDisabled else { return }
Expand Down
14 changes: 9 additions & 5 deletions Sources/FlowStack/View+InteractiveDismiss.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ struct InteractiveDismissContainer<T: View>: UIViewControllerRepresentable {
var threshold: Double

var onPan: (CGPoint) -> Void
var isEnabled: Bool
var isDismissing: Bool

var swipeUpToDismiss: Bool
Expand All @@ -56,11 +57,12 @@ struct InteractiveDismissContainer<T: View>: UIViewControllerRepresentable {
}

func updateUIViewController(_ uiViewController: InteractiveDismissViewController<T>, context: Context) {
context.coordinator.isEnabled = isEnabled
context.coordinator.isDismissing = isDismissing
}

func makeCoordinator() -> InteractiveDismissCoordinator {
InteractiveDismissCoordinator(threshold: threshold, onPan: onPan, isDismissing: isDismissing, swipeUpToDismiss: swipeUpToDismiss, onDismiss: onDismiss, onEnded: onEnded)
InteractiveDismissCoordinator(threshold: threshold, isEnabled: isEnabled, onPan: onPan, isDismissing: isDismissing, swipeUpToDismiss: swipeUpToDismiss, onDismiss: onDismiss, onEnded: onEnded)
}
}

Expand Down Expand Up @@ -125,6 +127,7 @@ class InteractiveDismissCoordinator: NSObject, ObservableObject, UIGestureRecogn
var threshold: Double

var onPan: (CGPoint) -> Void
var isEnabled: Bool
var isDismissing: Bool {
didSet {
guard isDismissing else { return }
Expand Down Expand Up @@ -169,10 +172,11 @@ class InteractiveDismissCoordinator: NSObject, ObservableObject, UIGestureRecogn
}
}

init(threshold: Double, onPan: @escaping (CGPoint) -> Void, isDismissing: Bool, swipeUpToDismiss: Bool, onDismiss: @escaping () -> Void, onEnded: @escaping (Bool) -> Void) {
init(threshold: Double, isEnabled: Bool, onPan: @escaping (CGPoint) -> Void, isDismissing: Bool, swipeUpToDismiss: Bool, onDismiss: @escaping () -> Void, onEnded: @escaping (Bool) -> Void) {
self.threshold = threshold

self.onPan = onPan
self.isEnabled = isEnabled
self.isDismissing = isDismissing
self.swipeUpToDismiss = swipeUpToDismiss
self.onDismiss = onDismiss
Expand Down Expand Up @@ -212,7 +216,7 @@ class InteractiveDismissCoordinator: NSObject, ObservableObject, UIGestureRecogn
onPan(offset)

let shouldDismiss = offset.y > threshold || (offset.x > threshold && isEdge) || (-offset.y > threshold * 2 && swipeUpToDismiss)
if shouldDismiss != isPastThreshold && shouldDismiss, edgeGestureRecognizer.isEnabled, panGestureRecognizer.isEnabled {
if shouldDismiss != isPastThreshold && shouldDismiss, isEnabled {
impactGenerator.impactOccurred()
}

Expand Down Expand Up @@ -278,7 +282,7 @@ class InteractiveDismissCoordinator: NSObject, ObservableObject, UIGestureRecogn
}

extension View {
func onInteractiveDismissGesture(threshold: Double = 50, isDismissing: Bool = false, swipeUpToDismiss: Bool, onDismiss: @escaping () -> Void, onPan: @escaping (CGPoint) -> Void = { _ in }, onEnded: @escaping (Bool) -> Void = { _ in }) -> some View {
InteractiveDismissContainer(threshold: threshold, onPan: onPan, isDismissing: isDismissing, swipeUpToDismiss: swipeUpToDismiss, onDismiss: onDismiss, onEnded: onEnded, content: self)
func onInteractiveDismissGesture(threshold: Double = 50, isEnabled: Bool = true, isDismissing: Bool = false, swipeUpToDismiss: Bool, onDismiss: @escaping () -> Void, onPan: @escaping (CGPoint) -> Void = { _ in }, onEnded: @escaping (Bool) -> Void = { _ in }) -> some View {
InteractiveDismissContainer(threshold: threshold, onPan: onPan, isEnabled: isEnabled, isDismissing: isDismissing, swipeUpToDismiss: swipeUpToDismiss, onDismiss: onDismiss, onEnded: onEnded, content: self)
}
}