Skip to content

Fixed ScrollView's .scrollToEnd to refrain from exceeding start boundary. #12889

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
Guardiannw wants to merge 9 commits into from
Closed

Fixed ScrollView's .scrollToEnd to refrain from exceeding start boundary. #12889

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e40bd23
Updated iOS ScrollView's method .scrollToEnd to protect against excee…
Guardiannw Mar 12, 2017
a8824f5
Merge branch 'master' into master
Guardiannw Mar 20, 2017
cc820f7
Merge branch 'master' into master
Guardiannw Mar 21, 2017
213944f
Merge branch 'master' into master
Guardiannw Mar 23, 2017
a7d4065
Merge branch 'master' into master
Guardiannw Mar 28, 2017
97cc0f6
Merge branch 'master' into master
Guardiannw Apr 3, 2017
34e89b3
Merge branch 'master' into master
Guardiannw Apr 19, 2017
ad79eed
Merge branch 'master' into master
Guardiannw Apr 21, 2017
9419559
Merge branch 'master' into master
Guardiannw Jun 16, 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
6 changes: 2 additions & 4 deletions React/Views/RCTScrollView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,11 +525,9 @@ - (void)scrollToEnd:(BOOL)animated
BOOL isHorizontal = [self isHorizontal:_scrollView];
CGPoint offset;
if (isHorizontal) {
CGFloat offsetX = _scrollView.contentSize.width - _scrollView.bounds.size.width;
offset = CGPointMake(MAX(offsetX, 0), 0);
offset = CGPointMake(fmax(_scrollView.contentSize.width - _scrollView.bounds.size.width + _scrollView.contentInset.right, 0), 0);
} else {
CGFloat offsetY = _scrollView.contentSize.height - _scrollView.bounds.size.height;
offset = CGPointMake(0, MAX(offsetY, 0));
offset = CGPointMake(0, fmax(_scrollView.contentSize.height - _scrollView.bounds.size.height + _scrollView.contentInset.bottom, 0));
}
if (!CGPointEqualToPoint(_scrollView.contentOffset, offset)) {
// Ensure at least one scroll event will fire
Expand Down