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

Fix content offset validation #15670

Closed
wants to merge 2 commits into from
Closed

Fix content offset validation #15670

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c518c6
Fix content offset validation
janicduplessis Aug 27, 2017
81d26af
Merge branch 'master' into fix-content-offset
shergin Sep 5, 2017
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
17 changes: 11 additions & 6 deletions React/Views/RCTScrollView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,12 +315,17 @@ - (void)setFrame:(CGRect)frame

UIEdgeInsets contentInset = self.contentInset;
CGSize contentSize = self.contentSize;

CGSize boundsSize = self.bounds.size;

self.contentOffset = CGPointMake(
MAX(-contentInset.top, MIN(contentSize.width - boundsSize.width + contentInset.bottom, originalOffset.x)),
MAX(-contentInset.left, MIN(contentSize.height - boundsSize.height + contentInset.right, originalOffset.y)));

// If contentSize has not been measured yet we can't check bounds.
if (CGSizeEqualToSize(contentSize, CGSizeZero)) {
self.contentOffset = originalOffset;
} else {
// Make sure offset don't exceed bounds. This could happen on screen rotation.
CGSize boundsSize = self.bounds.size;
self.contentOffset = CGPointMake(
MAX(-contentInset.left, MIN(contentSize.width - boundsSize.width + contentInset.right, originalOffset.x)),
MAX(-contentInset.top, MIN(contentSize.height - boundsSize.height + contentInset.bottom, originalOffset.y)));
}
}

#if !TARGET_OS_TV
Expand Down