Skip to content
Merged
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions Sources/FlowStack/View+InteractiveDismiss.swift
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,9 @@ class InteractiveDismissCoordinator: NSObject, ObservableObject, UIGestureRecogn
}

func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
guard gestureRecognizer == panGestureRecognizer, let scrollView = scrollView else { return true }
guard let scrollView = scrollView else { return true }
scrollView.isScrollEnabled = true
guard gestureRecognizer == panGestureRecognizer else { return true }

if panGestureRecognizer.translation(in: scrollView).y > 0 {
return scrollView.contentOffset.y - 5 <= -scrollView.contentInset.top
Expand All @@ -246,7 +248,6 @@ class InteractiveDismissCoordinator: NSObject, ObservableObject, UIGestureRecogn
}

func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {

guard (gestureRecognizer == panGestureRecognizer || gestureRecognizer == panGestureRecognizer), let scrollView = scrollView else {
return true
}
Expand Down