Skip to content

fix: fix maintainVisibleContentPosition on iOS when _firstVisibleView is removed #52782

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
itsramiel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: fix maintainVisibleContentPosition on iOS when _firstVisibleView is removed #52782

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
9 changes: 9 additions & 0 deletions ...eact-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ @implementation RCTScrollViewComponentView {
__weak UIView *_contentView;

CGRect _prevFirstVisibleFrame;
NSInteger _firstVisibleViewTag;
__weak UIView *_firstVisibleView;

CGFloat _endDraggingSensitivityMultiplier;
Expand Down Expand Up @@ -677,6 +678,7 @@ - (void)prepareForRecycle
self.frame = oldFrame;
_contentView = nil;
_prevFirstVisibleFrame = CGRectZero;
_firstVisibleViewTag = 0;
_firstVisibleView = nil;
}

Expand Down Expand Up @@ -1036,6 +1038,7 @@ - (void)_prepareForMaintainVisibleScrollPosition
}
if (hasNewView || ii == _contentView.subviews.count - 1) {
_prevFirstVisibleFrame = subview.frame;
_firstVisibleViewTag = subview.tag;
_firstVisibleView = subview;
break;
}
Expand All @@ -1049,6 +1052,12 @@ - (void)_adjustForMaintainVisibleContentPosition
return;
}

if(_firstVisibleView && _firstVisibleView.tag != _firstVisibleViewTag) {
_prevFirstVisibleFrame = CGRectZero;
_firstVisibleViewTag = 0;
_firstVisibleView = nil;
}

std::optional<int> autoscrollThreshold = props.maintainVisibleContentPosition.value().autoscrollToTopThreshold;
BOOL horizontal = _scrollView.contentSize.width > self.frame.size.width;
// TODO: detect and handle/ignore re-ordering
Expand Down
Loading