Skip to content

fix(ios): rebind scroll delegates after collection replacement #1127

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
OskarEichler wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −4
Open

fix(ios): rebind scroll delegates after collection replacement #1127

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
5 changes: 2 additions & 3 deletions ios/PagerScrollDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class PagerScrollDelegate: NSObject, UIScrollViewDelegate, UICollectionViewDeleg
]

func scrollViewDidScroll(_ scrollView: UIScrollView) {
defer { originalDelegate?.scrollViewDidScroll?(scrollView) }
let isHorizontal = orientation == .horizontal
let pageSize = isHorizontal ? scrollView.frame.width : scrollView.frame.height
let contentOffset = isHorizontal ? scrollView.contentOffset.x : scrollView.contentOffset.y
Expand All @@ -31,7 +32,6 @@ class PagerScrollDelegate: NSObject, UIScrollViewDelegate, UICollectionViewDeleg

let eventData = OnPageScrollEventData(position: position, offset: offset)
delegate?.onPageScroll(data: eventData)
originalDelegate?.scrollViewDidScroll?(scrollView)
}

/// Emits a final onPageScroll with offset 0 before transitioning to idle,
Expand Down Expand Up @@ -86,11 +86,10 @@ class PagerScrollDelegate: NSObject, UIScrollViewDelegate, UICollectionViewDeleg
}

override func responds(to aSelector: Selector!) -> Bool {
handledSelectors.contains(aSelector) || (originalDelegate?.responds(to: aSelector) ?? false)
super.responds(to: aSelector) || handledSelectors.contains(aSelector) || (originalDelegate?.responds(to: aSelector) ?? false)
}

override func forwardingTarget(for aSelector: Selector!) -> Any? {
handledSelectors.contains(aSelector) ? nil : originalDelegate
}
}

7 changes: 6 additions & 1 deletion ios/PagerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,19 @@ struct PagerView: View {
.ignoresSafeArea()
.environment(\.layoutDirection, props.layoutDirection.converted)
.introspect(.tabView(style: .page), on: .iOS(.v14...)) { collectionView in
if let previousCollectionView = self.collectionView,
previousCollectionView !== collectionView,
previousCollectionView.delegate === scrollDelegate {
previousCollectionView.delegate = scrollDelegate.originalDelegate
}
self.collectionView = collectionView
collectionView.bounces = props.overdrag
collectionView.isScrollEnabled = props.scrollEnabled
collectionView.keyboardDismissMode = props.keyboardDismissMode
collectionView.showsVerticalScrollIndicator = false
collectionView.showsHorizontalScrollIndicator = false

if scrollDelegate.originalDelegate == nil {
if collectionView.delegate !== scrollDelegate {
scrollDelegate.originalDelegate = collectionView.delegate
scrollDelegate.delegate = delegate
// VTabView-style rotation preserves TabView's horizontal collection view.
Expand Down