Skip to content

Handle pan gesture began state in scrollView check #678

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

Open
zy19890102 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Handle pan gesture began state in scrollView check #678

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ed97af
Handle pan gesture began state in scrollView check
zy19890102 Jan 14, 2026
8384684
Fix touch handling by converting initial location
Jan 16, 2026
b8929ec
Fix touch handling conversion in shouldScrollViewHandleTouch
Jan 16, 2026
98d5016
Refactor touch handling in shouldScrollViewHandleTouch
Jan 16, 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
11 changes: 9 additions & 2 deletions Sources/Core.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,12 @@ class Core: NSObject, UIGestureRecognizerDelegate {

private func shouldScrollViewHandleTouch(_ scrollView: UIScrollView?, point: CGPoint, velocity: CGFloat) -> Bool {
// When no scrollView, nothing to handle.
guard let scrollView = scrollView, scrollView.frame.contains(initialLocation) else { return false }
guard let scrollView = scrollView else { return false }
let scrollViewFrame = surfaceView.convert(
Copy link
Owner

@scenee scenee Jan 16, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! The current code implicitly assumes that the scrollView is a subview of the surfaceView. This update makes the implementation more flexible. Could you also update scrollView.frame.contains(initialLocation) on line 837 to match this change? It might be worth adding a computed property for this.

scrollView.frame,
from: scrollView.superview
)
guard scrollViewFrame.contains(initialLocation) else { return false }

// Prevents moving a panel on swipe actions using _UISwipeActionPanGestureRecognizer.
// [Warning] Do not apply this to WKWebView. Since iOS 17.4, WKWebView has an additional pan
Expand Down Expand Up @@ -731,7 +736,9 @@ class Core: NSObject, UIGestureRecognizerDelegate {
if surfaceView.grabberAreaContains(initialLocation) {
return false
}
if let sv = scrollView, sv.panGestureRecognizer.state == .changed {
if let sv = scrollView, (
sv.panGestureRecognizer.state == .changed || sv.panGestureRecognizer.state == .began
) {
let (contentSize, bounds, alwaysBounceHorizontal, alwaysBounceVertical)
= (sv.contentSize, sv.bounds, sv.alwaysBounceHorizontal, sv.alwaysBounceVertical)

Expand Down