-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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.
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
Renew supplementary node on relayout #842
Merged
Adlai-Holler
merged 26 commits into
TextureGroup:master
from
wsdwsd0829:renew-supplementary-node-on-relayout
Jun 4, 2018
Merged
Changes from 22 commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
929d118
fix SIMULATE_WEB_RESPONSE not imported #449
wsdwsd0829 dd24d8f
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 b8eaffa
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 2918ea0
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 9c42266
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 329f35f
Fix to make rangeMode update in right time
wsdwsd0829 5f8b7ec
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 d87bb11
merge master from upstream
wsdwsd0829 269c2ab
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 24c1ce8
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 5b9acd4
Renew supplementary node on relayout.
wsdwsd0829 a4e4ba7
Add support for layoutDelegate (ASCollectionLayout).
wsdwsd0829 fcb4a05
revert space
wsdwsd0829 233169e
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 d0e78dc
Update change log
wsdwsd0829 785d6fc
merge master
wsdwsd0829 19fc1e3
fix build error
wsdwsd0829 9f7cf47
Merge branch 'master' into renew-supplementary-node-on-relayout
Adlai-Holler 327d65c
refactor
wsdwsd0829 90686fd
merge upstream
wsdwsd0829 1c7a7f6
merge upstream
wsdwsd0829 88db8b7
set default size
wsdwsd0829 5865ce7
Merge branch 'master' into renew-supplementary-node-on-relayout
wsdwsd0829 785c97a
Merge branch 'renew-supplementary-node-on-relayout' of github.com:wsd…
wsdwsd0829 811c5d0
return early when can delegate
wsdwsd0829 8ec0e25
Merge branch 'master' into renew-supplementary-node-on-relayout
wsdwsd0829 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change | ||
---|---|---|---|---|
|
@@ -25,6 +25,7 @@ | |||
#import <AsyncDisplayKit/ASCellNode.h> | ||||
#import <AsyncDisplayKit/ASCollectionElement.h> | ||||
#import <AsyncDisplayKit/ASCollectionLayoutContext.h> | ||||
#import <AsyncDisplayKit/ASCollectionLayoutState.h> | ||||
#import <AsyncDisplayKit/ASDispatch.h> | ||||
#import <AsyncDisplayKit/ASDisplayNodeExtras.h> | ||||
#import <AsyncDisplayKit/ASElementMap.h> | ||||
|
@@ -281,6 +282,52 @@ - (void)_repopulateSupplementaryNodesIntoMap:(ASMutableElementMap *)map | |||
} | ||||
} | ||||
|
||||
/** | ||||
* Update supplementary nodes of all kinds for sections. | ||||
* | ||||
* @param map The element map into which to apply the change. | ||||
* @param traitCollection The trait collection needed to initialize elements | ||||
* @param shouldFetchSizeRanges Whether constrained sizes should be fetched from data source | ||||
*/ | ||||
- (void)_updateSupplementaryNodesIntoMap:(ASMutableElementMap *)map | ||||
traitCollection:(ASPrimitiveTraitCollection)traitCollection | ||||
shouldFetchSizeRanges:(BOOL)shouldFetchSizeRanges | ||||
previousMap:(ASElementMap *)previousMap | ||||
{ | ||||
ASDisplayNodeAssertMainThread(); | ||||
|
||||
NSUInteger sectionCount = [self itemCountsFromDataSource].size(); | ||||
BOOL canDelegate = (self.layoutDelegate != nil); | ||||
if (sectionCount > 0) { | ||||
NSIndexSet *sectionIndexes = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, sectionCount)]; | ||||
ASSizeRange newSizeRange; | ||||
for (NSString *kind in [self supplementaryKindsInSections:sectionIndexes]) { | ||||
NSArray<NSIndexPath *> *indexPaths = [self _allIndexPathsForItemsOfKind:kind inSections:sectionIndexes]; | ||||
NSMutableArray<NSIndexPath *> *indexPathsToDeleteForKind = [[NSMutableArray alloc] init]; | ||||
NSMutableArray<NSIndexPath *> *indexPathsToInsertForKind = [[NSMutableArray alloc] init]; | ||||
// If supplementary node does exist and size is now zero, remove it. | ||||
// If supplementary node doesn't exist and size is now non-zero, insert one. | ||||
for (NSIndexPath *indexPath in indexPaths) { | ||||
ASCollectionElement *previousElement = [previousMap supplementaryElementOfKind:kind atIndexPath:indexPath]; | ||||
if (canDelegate) { | ||||
// TODO: https://github.com/TextureGroup/Texture/issues/948 | ||||
} else { | ||||
newSizeRange = [self constrainedSizeForNodeOfKind:kind atIndexPath:indexPath]; | ||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This will call out to Texture/Source/ASCollectionView.mm Line 2032 in 8a4bb6c
Is it true that the assert will never trigged if called from here. I remember the only case to accidentally trigger it might be calling it if canDelegate == true. |
||||
} | ||||
BOOL sizeRangeIsZero = ASSizeRangeEqualToSizeRange(ASSizeRangeZero, newSizeRange); | ||||
if (previousElement != nil && sizeRangeIsZero) { | ||||
[indexPathsToDeleteForKind addObject:indexPath]; | ||||
} else if (previousElement == nil && !sizeRangeIsZero) { | ||||
[indexPathsToInsertForKind addObject:indexPath]; | ||||
} | ||||
} | ||||
|
||||
[map removeSupplementaryElementsAtIndexPaths:indexPathsToDeleteForKind kind:kind]; | ||||
[self _insertElementsIntoMap:map kind:kind atIndexPaths:indexPathsToInsertForKind traitCollection:traitCollection shouldFetchSizeRanges:shouldFetchSizeRanges changeSet:nil previousMap:previousMap]; | ||||
} | ||||
} | ||||
} | ||||
|
||||
/** | ||||
* Inserts new elements of a certain kind for some sections | ||||
* | ||||
|
@@ -830,13 +877,20 @@ - (void)relayoutAllNodesWithInvalidationBlock:(nullable void (^)())invalidationB | |||
- (void)_relayoutAllNodes | ||||
{ | ||||
ASDisplayNodeAssertMainThread(); | ||||
// Aggressively repopulate all supplemtary elements | ||||
// Assuming this method is run on the main serial queue, _pending and _visible maps are synced and can be manipulated directly. | ||||
ASDisplayNodeAssert(_visibleMap == _pendingMap, @"Expected visible and pending maps to be synchronized: %@", self); | ||||
|
||||
ASMutableElementMap *newMap = [_pendingMap mutableCopy]; | ||||
[self _updateSupplementaryNodesIntoMap:newMap | ||||
traitCollection:[self.node primitiveTraitCollection] | ||||
shouldFetchSizeRanges:YES | ||||
previousMap:_pendingMap]; | ||||
_pendingMap = [newMap copy]; | ||||
_visibleMap = _pendingMap; | ||||
|
||||
for (ASCollectionElement *element in _visibleMap) { | ||||
// Ignore this element if it is no longer in the latest data. It is still recognized in the UIKit world but will be deleted soon. | ||||
NSIndexPath *indexPathInPendingMap = [_pendingMap indexPathForElement:element]; | ||||
if (indexPathInPendingMap == nil) { | ||||
continue; | ||||
} | ||||
|
||||
NSString *kind = element.supplementaryElementKind ?: ASDataControllerRowNodeKind; | ||||
ASSizeRange newConstrainedSize = [self constrainedSizeForNodeOfKind:kind atIndexPath:indexPathInPendingMap]; | ||||
|
||||
|
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we need to set newSizeRange here? If so oZero? does not sound quite right though
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, doesn't sound good to me as well. I think we can just completely ignore this case and bail early.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh right. Done