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

Wrap supplementary node blocks to enable resizing them. #1265

Merged
merged 2 commits into from
Dec 10, 2018
Merged

Wrap supplementary node blocks to enable resizing them. #1265

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58edce9
Wrap supplementary node blocks to enable resizing them.
Dec 4, 2018
b10afc0
Simplify code / block will never be nil
wiseoldduck Dec 10, 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: 16 additions & 1 deletion Source/ASCollectionView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2015,7 +2015,22 @@ - (ASCellNodeBlock)dataController:(ASDataController *)dataController supplementa
block = ^{ return cell; };
}

return block;
// Wrap the node block
__weak __typeof__(self) weakSelf = self;
Copy link
Member

Choose a reason for hiding this comment

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

At one point we should add strongify & weakify macros.

return ^{
__typeof__(self) strongSelf = weakSelf;
ASCellNode *node = block();
ASDisplayNodeAssert([node isKindOfClass:[ASCellNode class]],
@"ASCollectionNode provided a non-ASCellNode! %@, %@", node, strongSelf);

if (node.interactionDelegate == nil) {
node.interactionDelegate = strongSelf;
}
if (strongSelf.inverted) {
node.transform = CATransform3DMakeScale(1, -1, 1);
}
return node;
};
}

- (NSArray<NSString *> *)dataController:(ASDataController *)dataController supplementaryNodeKindsInSections:(NSIndexSet *)sections
Expand Down