Skip to content

Fix recycled ScrollView inheriting stale contentInset on iOS #56832

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

Closed
cbrevik wants to merge 1 commit into from
Closed

Fix recycled ScrollView inheriting stale contentInset on iOS #56832

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
14 changes: 14 additions & 0 deletions ...ges/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,20 @@ - (void)setContentOffset:(CGPoint)contentOffset
RCTSanitizeNaNValue(contentOffset.y, @"scrollView.contentOffset.y"));
}

- (void)setCenterContent:(BOOL)centerContent
{
if (_centerContent != centerContent) {
_centerContent = centerContent;
[self centerContentIfNeeded];
}
}

- (void)setContentSize:(CGSize)contentSize
{
[super setContentSize:contentSize];
[self centerContentIfNeeded];
}

- (void)setFrame:(CGRect)frame
{
[super setFrame:frame];
Expand Down
14 changes: 11 additions & 3 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 @@ -396,11 +396,19 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &

MAP_SCROLL_VIEW_PROP(zoomScale);

if (oldScrollViewProps.contentInset != newScrollViewProps.contentInset) {
_scrollView.contentInset = RCTUIEdgeInsetsFromEdgeInsets(newScrollViewProps.contentInset);
RCTEnhancedScrollView *scrollView = (RCTEnhancedScrollView *)_scrollView;

// When disabling centerContent, reset inset to prop value
// (enabling is handled automatically by the setCenterContent: setter)
if (oldScrollViewProps.centerContent && !newScrollViewProps.centerContent) {
scrollView.contentInset = RCTUIEdgeInsetsFromEdgeInsets(newScrollViewProps.contentInset);
}

RCTEnhancedScrollView *scrollView = (RCTEnhancedScrollView *)_scrollView;
// Only apply contentInset from props if centerContent is disabled
// When centerContent is enabled, the inset is calculated by centerContentIfNeeded
if (oldScrollViewProps.contentInset != newScrollViewProps.contentInset && !newScrollViewProps.centerContent) {
_scrollView.contentInset = RCTUIEdgeInsetsFromEdgeInsets(newScrollViewProps.contentInset);
}
if (oldScrollViewProps.contentOffset != newScrollViewProps.contentOffset) {
_scrollView.contentOffset = RCTCGPointFromPoint(newScrollViewProps.contentOffset);
}
Expand Down
Loading