Skip to content

Correct attributes lookup for supplementary elements. #1318

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

Merged
Adlai-Holler merged 2 commits into from
Mar 8, 2019
Merged

Correct attributes lookup for supplementary elements. #1318

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
574e710
Correct attributes lookup for supplementary elements.
wiseoldduck Jan 15, 2019
b53d95f
Merge branch 'master' into supplementary-node
wiseoldduck Mar 7, 2019
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
8 changes: 7 additions & 1 deletion Source/ASCollectionView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2017,7 +2017,13 @@ - (BOOL)dataController:(ASDataController *)dataController presentedSizeForElemen
ASDisplayNodeFailAssert(@"Data controller should not ask for presented size for element that is not presented.");
return YES;

@appleguy appleguy Jan 16, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think the condition above, indexPathForNode:, may also need to be updated to check e.g. indexPathForSupplementaryElement: ofKind: -- or maybe we can implement (or use if existing) indexPathForElement:

@wiseoldduck wiseoldduck Jan 16, 2019

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Yeah indexPathForNode: does appear to lead to indexPathForElement:, which itself just looks up in _elementToIndexPathMap, which I don't know what is but isn't an OS call so maybe it's just fine?

@Adlai-Holler Adlai-Holler Jan 16, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Yep indexPathForNode: is fine here, it works for supplementaries and for items.

}
UICollectionViewLayoutAttributes *attributes = [self layoutAttributesForItemAtIndexPath:indexPath];

UICollectionViewLayoutAttributes *attributes;
if (element.supplementaryElementKind == nil) {
attributes = [self layoutAttributesForItemAtIndexPath:indexPath];
} else {
attributes = [self layoutAttributesForSupplementaryElementOfKind:element.supplementaryElementKind atIndexPath:indexPath];
}
return CGSizeEqualToSizeWithIn(attributes.size, size, FLT_EPSILON);
}

Expand Down