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

Fix scrollToObject: inconsistency bug when scrolling to bottom/right with content inset #1284

Closed
wants to merge 4 commits into from
Closed

Fix scrollToObject: inconsistency bug when scrolling to bottom/right with content inset #1284

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51fb1b5
Fix bug with `-[IGListAdapter scrollToObject:supplementaryKinds:scrol…
qhhonx Nov 28, 2018
7ed9b97
Extract individual scroll-to-right test units
qhhonx Nov 29, 2018
f9e9c6a
Merge remote-tracking branch 'origin/master' into fix-scrollToObject
qhhonx May 24, 2019
a3485c9
Disable automatic contentInset adjustment for ScrollVerticallyToBotto…
qhhonx May 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -22,6 +22,8 @@ The changelog for `IGListKit`. Also see the [releases](https://github.com/instag

### Fixes

- Fixed bug with `-[IGListAdapter scrollToObject:supplementaryKinds:scrollDirection:scrollPosition:animated:]` where the content inset(bottom/right) of the collection view was incorrectly being applied to the final offset and was inconsistent with the content inset(top/left) of the collection view being applied. [Qinghua Hong](https://github.com/xohozu) [(#1284)](https://github.com/Instagram/IGListKit/pull/1284)

- Fixed crash when the data source is nil before calling `-[IGListAdapterUpdater performUpdateWithCollectionViewBlock:fromObjects:toObjectsBlock:animated:objectTransitionBlock:completion:]`. [Zhisheng Huang](https://github.com/lorixx) (tbd)

- Experimental fix to get the `UICollectionView` for batch updating immediately before applying the update. [Ryan Nystrom](https://github.com/rnystrom) (tbd)
Expand Down
4 changes: 2 additions & 2 deletions Source/IGListAdapter.m
View file
Open in desktop
Expand Up @@ -263,7 +263,7 @@ - (void)scrollToObject:(id)object
case UICollectionViewScrollDirectionHorizontal: {
switch (scrollPosition) {
case UICollectionViewScrollPositionRight:
contentOffset.x = offsetMax - collectionViewWidth - contentInset.left;
contentOffset.x = offsetMax - collectionViewWidth + contentInset.right;
qhhonx marked this conversation as resolved.
Show resolved Hide resolved
break;
case UICollectionViewScrollPositionCenteredHorizontally: {
const CGFloat insets = (contentInset.left - contentInset.right) / 2.0;
Expand All @@ -287,7 +287,7 @@ - (void)scrollToObject:(id)object
case UICollectionViewScrollDirectionVertical: {
switch (scrollPosition) {
case UICollectionViewScrollPositionBottom:
contentOffset.y = offsetMax - collectionViewHeight;
contentOffset.y = offsetMax - collectionViewHeight + contentInset.bottom;
break;
case UICollectionViewScrollPositionCenteredVertically: {
const CGFloat insets = (contentInset.top - contentInset.bottom) / 2.0;
Expand Down
36 changes: 34 additions & 2 deletions Tests/IGListAdapterTests.m
View file
Open in desktop
Expand Up @@ -751,13 +751,45 @@ - (void)test_whenScrollVerticallyToBottom_withContentInsets_thatBottomFlushWithC
self.collectionView.contentInset = UIEdgeInsetsMake(0, 0, 100, 0);
[self.collectionView layoutIfNeeded];
[self.adapter scrollToObject:@100 supplementaryKinds:nil scrollDirection:UICollectionViewScrollDirectionVertical scrollPosition:UICollectionViewScrollPositionBottom animated:NO];
IGAssertEqualPoint([self.collectionView contentOffset], 0, 900);
IGAssertEqualPoint([self.collectionView contentOffset], 0, 900 + 100);

// top 50, bottom 100
self.collectionView.contentInset = UIEdgeInsetsMake(50, 0, 100, 0);
[self.collectionView layoutIfNeeded];
[self.adapter scrollToObject:@100 supplementaryKinds:nil scrollDirection:UICollectionViewScrollDirectionVertical scrollPosition:UICollectionViewScrollPositionBottom animated:NO];
IGAssertEqualPoint([self.collectionView contentOffset], 0, 900);
IGAssertEqualPoint([self.collectionView contentOffset], 0, 900 + 100);
}

- (void)test_whenScrollHorizontalToRight_withContentInsets_thatRightFlushWithCollectionViewBounds {
self.dataSource.objects = @[@100];
[self.adapter reloadDataWithCompletion:nil];

UICollectionViewFlowLayout *layout = (UICollectionViewFlowLayout *)self.collectionView.collectionViewLayout;
layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
[layout invalidateLayout];

// no insets
self.collectionView.contentInset = UIEdgeInsetsMake(0, 0, 0, 0);
[self.collectionView layoutIfNeeded];
[self.adapter scrollToObject:@100 supplementaryKinds:nil scrollDirection:UICollectionViewScrollDirectionHorizontal scrollPosition:UICollectionViewScrollPositionRight animated:NO];
IGAssertEqualPoint([self.collectionView contentOffset], 900, 0);

// left 100
self.collectionView.contentInset = UIEdgeInsetsMake(0, 100, 0, 0);
[self.adapter scrollToObject:@100 supplementaryKinds:nil scrollDirection:UICollectionViewScrollDirectionHorizontal scrollPosition:UICollectionViewScrollPositionRight animated:NO];
IGAssertEqualPoint([self.collectionView contentOffset], 900, 0);

// right 100
self.collectionView.contentInset = UIEdgeInsetsMake(0, 0, 0, 100);
[self.collectionView layoutIfNeeded];
[self.adapter scrollToObject:@100 supplementaryKinds:nil scrollDirection:UICollectionViewScrollDirectionHorizontal scrollPosition:UICollectionViewScrollPositionRight animated:NO];
IGAssertEqualPoint([self.collectionView contentOffset], 900 + 100, 0);

// left 50, right 100
self.collectionView.contentInset = UIEdgeInsetsMake(0, 50, 0, 100);
[self.collectionView layoutIfNeeded];
[self.adapter scrollToObject:@100 supplementaryKinds:nil scrollDirection:UICollectionViewScrollDirectionHorizontal scrollPosition:UICollectionViewScrollPositionRight animated:NO];
IGAssertEqualPoint([self.collectionView contentOffset], 900 + 100, 0);
}

- (void)test_whenScrollHorizontallyToItem {
Expand Down