Wrap supplementary node blocks to enable resizing them. #1265
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
🚫 CI failed with log |
maicki
reviewed
Dec 7, 2018
Source/ASCollectionView.mm
Outdated
| @@ -2015,7 +2015,26 @@ - (ASCellNodeBlock)dataController:(ASDataController *)dataController supplementa | |||
| block = ^{ return cell; }; | |||
| } | |||
|
|
|||
| return block; | |||
| // Wrap the node block | |||
| BOOL disableRangeController = ASCellLayoutModeIncludes(ASCellLayoutModeDisableRangeController); | |||
There was a problem hiding this comment.
We may should remove that ;)
Most ASCellNodeBlocks are wrapped by ASCollectionView.mm to add an `interactionDelegate` as well as calling `enterHierarchyState` on the node and setting its transform to a reflection if `inverted` is set on the collectionView. This PR adds this behavior to supplementary nodes as well.
wiseoldduck
force-pushed
the
supplementary-blocks
branch
from
46000b8 to
58edce9
Compare
nguyenhuy
approved these changes
Dec 7, 2018
| @@ -2015,7 +2015,22 @@ - (ASCellNodeBlock)dataController:(ASDataController *)dataController supplementa | |||
| block = ^{ return cell; }; | |||
| } | |||
|
|
|||
| return block; | |||
| // Wrap the node block | |||
| __weak __typeof__(self) weakSelf = self; | |||
There was a problem hiding this comment.
At one point we should add strongify & weakify macros.
Source/ASCollectionView.mm
Outdated
| __weak __typeof__(self) weakSelf = self; | ||
| return ^{ | ||
| __typeof__(self) strongSelf = weakSelf; | ||
| ASCellNode *node = (block ? block() : cell); |
There was a problem hiding this comment.
Isn't block is guaranteed to be non-nil after this line? Maybe remove that line to be consistent with the implementation of dataController:nodeBlockAtIndexPath:.
There was a problem hiding this comment.
Concur with @nguyenhuy. The block should not be nil in here and the returning block is retaining the block too.
There was a problem hiding this comment.
I thought you had to copy a block to actually retain it
There was a problem hiding this comment.
nm I'm like stuck in 2010 😛
maicki
approved these changes
Dec 8, 2018
Source/ASCollectionView.mm
Outdated
| __weak __typeof__(self) weakSelf = self; | ||
| return ^{ | ||
| __typeof__(self) strongSelf = weakSelf; | ||
| ASCellNode *node = (block ? block() : cell); |
There was a problem hiding this comment.
Concur with @nguyenhuy. The block should not be nil in here and the returning block is retaining the block too.
wsdwsd0829
pushed a commit
to wsdwsd0829/Texture
that referenced
this pull request
Mar 14, 2019
…#1265) * Wrap supplementary node blocks to enable resizing them. Most ASCellNodeBlocks are wrapped by ASCollectionView.mm to add an `interactionDelegate` as well as calling `enterHierarchyState` on the node and setting its transform to a reflection if `inverted` is set on the collectionView. This PR adds this behavior to supplementary nodes as well. * Simplify code / block will never be nil
wsdwsd0829
pushed a commit
to wsdwsd0829/Texture
that referenced
this pull request
Mar 15, 2019
…#1265) * Wrap supplementary node blocks to enable resizing them. Most ASCellNodeBlocks are wrapped by ASCollectionView.mm to add an `interactionDelegate` as well as calling `enterHierarchyState` on the node and setting its transform to a reflection if `inverted` is set on the collectionView. This PR adds this behavior to supplementary nodes as well. * Simplify code / block will never be nil
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Most ASCellNodeBlocks are wrapped by ASCollectionView.mm to add an
interactionDelegateas well as callingenterHierarchyStateon the node and setting its transform to a reflection ifinvertedis set on the collectionView.This PR adds this behavior to supplementary nodes as well.