ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-24 07:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Issue in ASPagerNode Flags Handling, Restore Disabled Test (#2582)

Browse Source 
* Fix ASPagerNode flags handling, restore affected test

* Rejigger ASPagerNode's flag handling to ensure it handles edge case in production
This commit is contained in:
Adlai Holler
2016-11-09 14:20:07 +09:00
committed by GitHub
parent edf2b669ae
commit 88fecbe3eb
2 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
AsyncDisplayKit/ASPagerNode.m
View File

@@ -14,6 +14,8 @@
#import "ASDelegateProxy.h"
#import "ASDisplayNode+Subclasses.h"
#import "ASPagerFlowLayout.h"
#import "ASAssert.h"
#import "ASCellNode.h"
@interface ASPagerNode () <ASCollectionDataSource, ASCollectionDelegate, ASCollectionViewDelegateFlowLayout, ASDelegateProxyInterceptor>
{
@@ -21,11 +23,16 @@
__weak id <ASPagerDataSource> _pagerDataSource;
ASPagerNodeProxy *_proxyDataSource;
BOOL _pagerDataSourceImplementsNodeBlockAtIndex;
struct {
unsigned nodeBlockAtIndex:1;
unsigned nodeAtIndex:1;
} _pagerDataSourceFlags;
__weak id <ASPagerDelegate> _pagerDelegate;
struct {
unsigned constrainedSizeForNode:1;
} _pagerDelegateFlags;
ASPagerNodeProxy *_proxyDelegate;
BOOL _pagerDelegateImplementsConstrainedSizeForNode;
}
@end
@@ -122,12 +129,17 @@
- (ASCellNodeBlock)collectionNode:(ASCollectionNode *)collectionNode nodeBlockForItemAtIndexPath:(NSIndexPath *)indexPath
{
ASDisplayNodeAssert(_pagerDataSource != nil, @"ASPagerNode must have a data source to load nodes to display");
if (!_pagerDataSourceImplementsNodeBlockAtIndex) {
if (_pagerDataSourceFlags.nodeBlockAtIndex) {
return [_pagerDataSource pagerNode:self nodeBlockAtIndex:indexPath.item];
} else if (_pagerDataSourceFlags.nodeAtIndex) {
ASCellNode *node = [_pagerDataSource pagerNode:self nodeAtIndex:indexPath.item];
return ^{ return node; };
} else {
ASDisplayNodeFailAssert(@"Pager data source must implement either %@ or %@. Data source: %@", NSStringFromSelector(@selector(pagerNode:nodeBlockAtIndex:)), NSStringFromSelector(@selector(pagerNode:nodeAtIndex:)), _pagerDataSource);
return ^{
return [[ASCellNode alloc] init];
};
}
return [_pagerDataSource pagerNode:self nodeBlockAtIndex:indexPath.item];
}
- (NSInteger)collectionNode:(ASCollectionNode *)collectionNode numberOfItemsInSection:(NSInteger)section
@@ -140,7 +152,7 @@
- (ASSizeRange)collectionNode:(ASCollectionNode *)collectionNode constrainedSizeForItemAtIndexPath:(NSIndexPath *)indexPath
{
if (_pagerDelegateImplementsConstrainedSizeForNode) {
if (_pagerDelegateFlags.constrainedSizeForNode) {
return [_pagerDelegate pagerNode:self constrainedSizeForNodeAtIndex:indexPath.item];
}
@@ -159,9 +171,12 @@
if (dataSource != _pagerDataSource) {
_pagerDataSource = dataSource;
_pagerDataSourceImplementsNodeBlockAtIndex = [_pagerDataSource respondsToSelector:@selector(pagerNode:nodeBlockAtIndex:)];
// Data source must implement pagerNode:nodeBlockAtIndex: or pagerNode:nodeAtIndex:
ASDisplayNodeAssertTrue(_pagerDataSourceImplementsNodeBlockAtIndex || [_pagerDataSource respondsToSelector:@selector(pagerNode:nodeAtIndex:)]);
if (dataSource == nil) {
memset(&_pagerDataSourceFlags, 0, sizeof(_pagerDataSourceFlags));
} else {
_pagerDataSourceFlags.nodeBlockAtIndex = [_pagerDataSource respondsToSelector:@selector(pagerNode:nodeBlockAtIndex:)];
_pagerDataSourceFlags.nodeAtIndex = [_pagerDataSource respondsToSelector:@selector(pagerNode:nodeAtIndex:)];
}
_proxyDataSource = dataSource ? [[ASPagerNodeProxy alloc] initWithTarget:dataSource interceptor:self] : nil;
@@ -174,7 +189,11 @@
if (delegate != _pagerDelegate) {
_pagerDelegate = delegate;
_pagerDelegateImplementsConstrainedSizeForNode = [_pagerDelegate respondsToSelector:@selector(pagerNode:constrainedSizeForNodeAtIndex:)];
if (delegate == nil) {
memset(&_pagerDelegateFlags, 0, sizeof(_pagerDelegateFlags));
} else {
_pagerDelegateFlags.constrainedSizeForNode = [_pagerDelegate respondsToSelector:@selector(pagerNode:constrainedSizeForNodeAtIndex:)];
}
_proxyDelegate = delegate ? [[ASPagerNodeProxy alloc] initWithTarget:delegate interceptor:self] : nil;