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

Jump to bottom

Update RCTScrollView.m #13180

Closed
wants to merge 9 commits into from
Closed

Update RCTScrollView.m #13180

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d29efaa
Update RCTScrollView.m
Feng999 Mar 28, 2017
d71c96e
Merge branch 'master' into scrollToEnd_bug_fix
Feng999 Mar 29, 2017
9b7f09a
Update RCTScrollView.m
Feng999 Apr 21, 2017
45d243f
Update RCTScrollView.m
Feng999 Apr 21, 2017
24b0634
Merge branch 'master' into scrollToEnd_bug_fix
Feng999 Apr 21, 2017
ee61574
Merge branch 'master' into scrollToEnd_bug_fix
zpao Apr 25, 2017
3e9028d
Merge branch 'master' into scrollToEnd_bug_fix
ericvicenti Apr 28, 2017
abe17d3
Merge branch 'master' into scrollToEnd_bug_fix
zpao May 19, 2017
ed4b908
Merge branch 'master' into scrollToEnd_bug_fix
zpao May 23, 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: 4 additions & 2 deletions React/Views/RCTScrollView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,9 +525,11 @@ - (void)scrollToEnd:(BOOL)animated
BOOL isHorizontal = [self isHorizontal:_scrollView];
CGPoint offset;
if (isHorizontal) {
offset = CGPointMake(_scrollView.contentSize.width - _scrollView.bounds.size.width, 0);
CGFloat offsetX = _scrollView.contentSize.width - _scrollView.bounds.size.width;
offset = CGPointMake(MAX(offsetX, 0), 0);
} else {
offset = CGPointMake(0, _scrollView.contentSize.height - _scrollView.bounds.size.height);
CGFloat offsetY = _scrollView.contentSize.height - _scrollView.bounds.size.height;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am afraid that we forget to consider contentInset here. :(

offset = CGPointMake(0, MAX(offsetY, 0));
}
if (!CGPointEqualToPoint(_scrollView.contentOffset, offset)) {
// Ensure at least one scroll event will fire
Expand Down