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

[IOS][BUGFIX] Fix: Added scroll Bounds check in scrollToOffset method in RCTScrollView on iOS #17927

Closed
wants to merge 3 commits into from
Closed

[IOS][BUGFIX] Fix: Added scroll Bounds check in scrollToOffset method in RCTScrollView on iOS #17927

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81c7cd6
Added scroll Bounds check in scrollToOffset method in RCTScrollView f…
Feb 9, 2018
6ae9398
Handled condition in single expression
Feb 12, 2018
b3f4db8
Update RCTScrollView.m
shergin Feb 26, 2018
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: 17 additions & 0 deletions React/Views/ScrollView/RCTScrollView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,23 @@ - (void)scrollToOffset:(CGPoint)offset
- (void)scrollToOffset:(CGPoint)offset animated:(BOOL)animated
{
if (!CGPointEqualToPoint(_scrollView.contentOffset, offset)) {
BOOL isHorizontal = [self isHorizontal:_scrollView];
Copy link
Contributor

Choose a reason for hiding this comment

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

Please follow existing code style guides.

if (isHorizontal) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Why should we have this condition?
Seems we just have to have one single expression which ensure that offset inside allowed range.

Copy link
Contributor Author

@siddhantsoni siddhantsoni Feb 12, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

@shergin Updated PR to handle offset range in single expression.

CGFloat offsetX = _scrollView.contentSize.width - _scrollView.bounds.size.width + _scrollView.contentInset.right;
if(offset.x > offsetX) {
offset = CGPointMake(fmax(offsetX, 0), 0);
} else if(offset.x < 0) {
offset = CGPointMake(0, 0);
}
} else {
CGFloat offsetY = _scrollView.contentSize.height - _scrollView.bounds.size.height + _scrollView.contentInset.bottom;
if(offset.y > offsetY) {
offset = CGPointMake(0, fmax(offsetY, 0));
} else if(offset.y < 0) {
offset = CGPointMake(0, 0);
}
}

// Ensure at least one scroll event will fire
_allowNextScrollNoMatterWhat = YES;
[_scrollView setContentOffset:offset animated:animated];
Expand Down