Skip to content
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

Let delegate decide whether the scroll view should be locked during state transitions #647

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Let delegate decide whether the scroll view should be locked during state transitions #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions Sources/Controller.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,10 @@ import os.log
shouldAllowToScroll scrollView: UIScrollView,
in state: FloatingPanelState
) -> Bool

/// Determines whether the scroll content should be locked during transition to the specified state. If not implemented, the content will always be locked.
@objc(floatingPanel:shouldLockScrollView:transitioningToState:)
optional func floatingPanel(_ fpc: FloatingPanelController, shouldLockScrollView scrollView: UIScrollView, transitioningToState state: FloatingPanelState) -> Bool
}

///
Expand Down
4 changes: 2 additions & 2 deletions Sources/Core.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,8 +933,8 @@ class Core: NSObject, UIGestureRecognizerDelegate {
let translation = data.value - initialData.value
self.backdropView.alpha = self.getBackdropAlpha(at: current, with: translation)

// Pin the offset of the tracking scroll view while moving by this animator
if let scrollView = self.scrollView {
// Pin the offset of the tracking scroll view while moving by this animator, unless the delegate decides otherwise
if let scrollView = self.scrollView, ownerVC.delegate?.floatingPanel?(ownerVC, shouldLockScrollView: scrollView, transitioningToState: state) ?? true {
self.stopScrolling(at: self.initialScrollOffset)
os_log(msg, log: devLog, type: .debug, "move -- pinning scroll offset = \(scrollView.contentOffset)")
}
Expand Down