Merge branch 'master' into pr/664

AsyncDisplayKit/ASCollectionNode.m

@@ -9,6 +9,22 @@
 #import "ASCollectionNode.h"
 #import "ASDisplayNode+Subclasses.h"
 
+@interface _ASCollectionPendingState : NSObject
+@property (weak, nonatomic) id <ASCollectionDelegate>   delegate;
+@property (weak, nonatomic) id <ASCollectionDataSource> dataSource;
+@end
+
+@implementation _ASCollectionPendingState
+@end
+
+@interface ASCollectionNode ()
+@property (nonatomic) _ASCollectionPendingState *pendingState;
+@end
+
+@interface ASCollectionView ()
+- (instancetype)_initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout;
+@end
+
 @implementation ASCollectionNode
 
 - (instancetype)init
@@ -21,17 +37,92 @@
 
 - (instancetype)initWithCollectionViewLayout:(UICollectionViewLayout *)layout
 {
-  if (self = [super initWithViewBlock:^UIView *{ return [[ASCollectionView alloc] initWithCollectionViewLayout:layout]; }]) {
+  return [self initWithFrame:CGRectZero collectionViewLayout:layout];
+}
+
+- (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout
+{
+  ASDisplayNodeViewBlock collectionViewBlock = ^UIView *{
+    return [[ASCollectionView alloc] _initWithFrame:frame collectionViewLayout:layout];
+  };
+  
+  if (self = [super initWithViewBlock:collectionViewBlock]) {
     return self;
   }
   return nil;
 }
 
+- (void)didLoad
+{
+  [super didLoad];
+  
+  if (_pendingState) {
+    _ASCollectionPendingState *pendingState = _pendingState;
+    self.pendingState = nil;
+    
+    ASCollectionView *view = self.view;
+    view.asyncDelegate     = pendingState.delegate;
+    view.asyncDataSource   = pendingState.dataSource;
+  }
+}
+
+- (_ASCollectionPendingState *)pendingState
+{
+  if (!_pendingState && ![self isNodeLoaded]) {
+    self.pendingState = [[_ASCollectionPendingState alloc] init];
+  }
+  ASDisplayNodeAssert(![self isNodeLoaded] || !_pendingState, @"ASCollectionNode should not have a pendingState once it is loaded");
+  return _pendingState;
+}
+
+- (void)setDelegate:(id <ASCollectionDelegate>)delegate
+{
+  if ([self pendingState]) {
+    _pendingState.delegate = delegate;
+  } else {
+    ASDisplayNodeAssert([self isNodeLoaded], @"ASCollectionNode should be loaded if pendingState doesn't exist");
+    self.view.asyncDelegate = delegate;
+  }
+}
+
+- (id <ASCollectionDelegate>)delegate
+{
+  if ([self pendingState]) {
+    return _pendingState.delegate;
+  } else {
+    return self.view.asyncDelegate;
+  }
+}
+
+- (void)setDataSource:(id <ASCollectionDataSource>)dataSource
+{
+  if ([self pendingState]) {
+    _pendingState.dataSource = dataSource;
+  } else {
+    ASDisplayNodeAssert([self isNodeLoaded], @"ASCollectionNode should be loaded if pendingState doesn't exist");
+    self.view.asyncDataSource = dataSource;
+  }
+}
+
+- (id <ASCollectionDataSource>)dataSource
+{
+  if ([self pendingState]) {
+    return _pendingState.dataSource;
+  } else {
+    return self.view.asyncDataSource;
+  }
+}
+
 - (ASCollectionView *)view
 {
   return (ASCollectionView *)[super view];
 }
 
+- (void)visibilityDidChange:(BOOL)isVisible
+{
+  
+}
+
 - (void)clearContents
 {
   [super clearContents];