Merge remote-tracking branch 'upstream/master'

Author: Dasmer Singh

.travis.yml

@@ -2,7 +2,7 @@ language: objective-c
 before_install:
   - brew update
   - brew reinstall xctool
-  - gem update cocoapods
+  - gem install cocoapods -v 0.37.2
   - gem install slather
   - xcrun simctl list
 install: echo "<3"

AsyncDisplayKit.xcodeproj/project.pbxproj

@@ -31,13 +31,13 @@ - (instancetype)init
   return self;
 }
 
-- (instancetype)initWithLayerBlock:(ASDisplayNodeLayerBlock)viewBlock
+- (instancetype)initWithLayerBlock:(ASDisplayNodeLayerBlock)viewBlock didLoadBlock:(ASDisplayNodeDidLoadBlock)didLoadBlock
 {
   ASDisplayNodeAssertNotSupported();
   return nil;
 }
 
-- (instancetype)initWithViewBlock:(ASDisplayNodeViewBlock)viewBlock
+- (instancetype)initWithViewBlock:(ASDisplayNodeViewBlock)viewBlock didLoadBlock:(ASDisplayNodeDidLoadBlock)didLoadBlock
 {
   ASDisplayNodeAssertNotSupported();
   return nil;
@@ -106,12 +106,12 @@ - (instancetype)init
   return self;
 }
 
-- (id<ASLayoutable>)layoutSpecThatFits:(ASSizeRange)constrainedSize
+- (ASLayoutSpec *)layoutSpecThatFits:(ASSizeRange)constrainedSize
 {
   static const CGFloat kHorizontalPadding = 15.0f;
   static const CGFloat kVerticalPadding = 11.0f;
   UIEdgeInsets insets = UIEdgeInsetsMake(kVerticalPadding, kHorizontalPadding, kVerticalPadding, kHorizontalPadding);
-  return [ASInsetLayoutSpec newWithInsets:insets child:_textNode];
+  return [ASInsetLayoutSpec insetLayoutSpecWithInsets:insets child:_textNode];
 }
 
 - (void)setText:(NSString *)text

AsyncDisplayKit/ASCellNode.m

@@ -0,0 +1,21 @@
+//
+//  ASCollectionNode.h
+//  AsyncDisplayKit
+//
+//  Created by Scott Goodson on 9/5/15.
+//  Copyright (c) 2015 Facebook. All rights reserved.
+//
+
+#import <AsyncDisplayKit/AsyncDisplayKit.h>
+
+/**
+ * ASCollectionNode is a node based class that wraps an ASCollectionView. It can be used
+ * as a subnode of another node, and provide room for many (great) features and improvements later on.
+ */
+@interface ASCollectionNode : ASDisplayNode
+
+- (instancetype)initWithCollectionViewLayout:(UICollectionViewLayout *)layout NS_DESIGNATED_INITIALIZER;
+
+@property (nonatomic, readonly) ASCollectionView *view;
+
+@end

AsyncDisplayKit/ASCollectionNode.h

@@ -0,0 +1,33 @@
+//
+//  ASCollectionNode.m
+//  AsyncDisplayKit
+//
+//  Created by Scott Goodson on 9/5/15.
+//  Copyright (c) 2015 Facebook. All rights reserved.
+//
+
+#import "ASCollectionNode.h"
+
+@implementation ASCollectionNode
+
+- (instancetype)init
+{
+  ASDISPLAYNODE_NOT_DESIGNATED_INITIALIZER();
+  self = [self initWithCollectionViewLayout:nil]; // Will throw an exception for lacking a UICV Layout.
+  return nil;
+}
+
+- (instancetype)initWithCollectionViewLayout:(UICollectionViewLayout *)layout
+{
+  if (self = [super initWithViewBlock:^UIView *{ return [[ASCollectionView alloc] initWithCollectionViewLayout:layout]; }]) {
+    return self;
+  }
+  return nil;
+}
+
+- (ASCollectionView *)view
+{
+  return (ASCollectionView *)[super view];
+}
+
+@end

AsyncDisplayKit/ASCollectionNode.m

@@ -27,32 +27,42 @@
  */
 @interface ASCollectionView : UICollectionView
 
+- (instancetype)initWithCollectionViewLayout:(UICollectionViewLayout *)layout;
+
 @property (nonatomic, weak) id<ASCollectionViewDataSource> asyncDataSource;
 @property (nonatomic, weak) id<ASCollectionViewDelegate> asyncDelegate;       // must not be nil
 
 /**
- * Tuning parameters for a range.
+ * Tuning parameters for a range type.
  *
- * @param range The range to get the tuning parameters for.
+ * @param rangeType The range type to get the tuning parameters for.
  *
- * @returns A tuning parameter value for the given range.
+ * @returns A tuning parameter value for the given range type.
  *
  * Defaults to the render range having one sceenful both leading and trailing and the preload range having two
  * screenfuls in both directions.
  */
 - (ASRangeTuningParameters)tuningParametersForRangeType:(ASLayoutRangeType)rangeType;
 
 /**
- * Set the tuning parameters for a range.
+ * Set the tuning parameters for a range type.
  *
- * @param tuningParameters The tuning parameters to store for a range.
- * @param range The range to set the tuning parameters for.
+ * @param tuningParameters The tuning parameters to store for a range type.
+ * @param rangeType The range type to set the tuning parameters for.
  */
 - (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType;
 
 /**
  * Initializer.
  *
+ * @param frame The frame rectangle for the collection view, measured in points. The origin of the frame is relative to the superview 
+ * in which you plan to add it. This frame is passed to the superclass during initialization.
+ * 
+ * @param layout The layout object to use for organizing items. The collection view stores a strong reference to the specified object. 
+ * Must not be nil.
+ *
+ * @param asyncDataFetchingEnabled Enable the data fetching in async mode.
+ *
  * @discussion If asyncDataFetching is enabled, the `AScollectionView` will fetch data through `collectionView:numberOfRowsInSection:` and
  * `collectionView:nodeForRowAtIndexPath:` in async mode from background thread. Otherwise, the methods will be invoked synchronically
  * from calling thread.
@@ -70,6 +80,29 @@
  */
 @property (nonatomic, assign) CGFloat leadingScreensForBatching;
 
+/**
+ *  Perform a batch of updates asynchronously, optionally disabling all animations in the batch. This method must be called from the main thread. 
+ *  The asyncDataSource must be updated to reflect the changes before the update block completes.
+ *
+ *  @param animated   NO to disable animations for this batch
+ *  @param updates    The block that performs the relevant insert, delete, reload, or move operations.
+ *  @param completion A completion handler block to execute when all of the operations are finished. This block takes a single 
+ *                    Boolean parameter that contains the value YES if all of the related animations completed successfully or 
+ *                    NO if they were interrupted. This parameter may be nil. If supplied, the block is run on the main thread.
+ */
+- (void)performBatchAnimated:(BOOL)animated updates:(void (^)())updates completion:(void (^)(BOOL))completion;
+
+/**
+ *  Perform a batch of updates asynchronously.  This method must be called from the main thread.
+ *  The asyncDataSource must be updated to reflect the changes before update block completes.
+ *
+ *  @param updates    The block that performs the relevant insert, delete, reload, or move operations.
+ *  @param completion A completion handler block to execute when all of the operations are finished. This block takes a single
+ *                    Boolean parameter that contains the value YES if all of the related animations completed successfully or
+ *                    NO if they were interrupted. This parameter may be nil. If supplied, the block is run on the main thread.
+ */
+- (void)performBatchUpdates:(void (^)())updates completion:(void (^)(BOOL))completion;
+
 /**
  * Reload everything from scratch, destroying the working range and all cached nodes.
  *
@@ -87,25 +120,87 @@
 - (void)reloadData;
 
 /**
- * Section updating.
+ * Inserts one or more sections.
+ *
+ * @param sections An index set that specifies the sections to insert.
  *
- * All operations are asynchronous and thread safe. You can call it from background thread (it is recommendated) and the UI collection
- * view will be updated asynchronously. The asyncDataSource must be updated to reflect the changes before these methods are called.
+ * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
+ * before this method is called.
  */
 - (void)insertSections:(NSIndexSet *)sections;
+
+/**
+ * Deletes one or more sections.
+ *
+ * @param sections An index set that specifies the sections to delete.
+ *
+ * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
+ * before this method is called.
+ */
 - (void)deleteSections:(NSIndexSet *)sections;
+
+/**
+ * Reloads the specified sections.
+ *
+ * @param sections An index set that specifies the sections to reload.
+ *
+ * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
+ * before this method is called.
+ */
 - (void)reloadSections:(NSIndexSet *)sections;
+
+/**
+ * Moves a section to a new location.
+ *
+ * @param section The index of the section to move.
+ *
+ * @param newSection The index that is the destination of the move for the section.
+ *
+ * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
+ * before this method is called.
+ */
 - (void)moveSection:(NSInteger)section toSection:(NSInteger)newSection;
 
 /**
- * Items updating.
+ * Inserts items at the locations identified by an array of index paths.
+ *
+ * @param indexPaths An array of NSIndexPath objects, each representing an item index and section index that together identify an item.
  *
- * All operations are asynchronous and thread safe. You can call it from background thread (it is recommendated) and the UI collection
- * view will be updated asynchronously. The asyncDataSource must be updated to reflect the changes before these methods are called.
+ * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
+ * before this method is called.
  */
 - (void)insertItemsAtIndexPaths:(NSArray *)indexPaths;
+
+/**
+ * Deletes the items specified by an array of index paths.
+ *
+ * @param indexPaths An array of NSIndexPath objects identifying the items to delete.
+ *
+ * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
+ * before this method is called.
+ */
 - (void)deleteItemsAtIndexPaths:(NSArray *)indexPaths;
+
+/**
+ * Reloads the specified items.
+ *
+ * @param indexPaths An array of NSIndexPath objects identifying the items to reload.
+ *
+ * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
+ * before this method is called.
+ */
 - (void)reloadItemsAtIndexPaths:(NSArray *)indexPaths;
+
+/**
+ * Moves the item at a specified location to a destination location.
+ *
+ * @param indexPath The index path identifying the item to move.
+ *
+ * @param newIndexPath The index path that is the destination of the move for the item.
+ *
+ * @discussion This method must be called from the main thread. The asyncDataSource must be updated to reflect the changes
+ * before this method is called.
+ */
 - (void)moveItemAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)newIndexPath;
 
 /**
@@ -156,7 +251,7 @@
 /**
  * Similar to -collectionView:cellForItemAtIndexPath:.
  *
- * @param collection The sender.
+ * @param collectionView The sender.
  *
  * @param indexPath The index path of the requested node.
  *
@@ -168,6 +263,17 @@
 
 @optional
 
+/**
+ * Provides the constrained size range for measuring the node at the index path.
+ *
+ * @param collectionView The sender.
+ *
+ * @param indexPath The index path of the node.
+ *
+ * @returns A constrained size range for layout the node at this index path.
+ */
+- (ASSizeRange)collectionView:(ASCollectionView *)collectionView constrainedSizeForNodeAtIndexPath:(NSIndexPath *)indexPath;
+
 /**
  * Indicator to lock the data source for data fetching in async mode.
  * We should not update the data source until the data source has been unlocked. Otherwise, it will incur data inconsistence or exception
@@ -227,6 +333,19 @@
  */
 - (BOOL)shouldBatchFetchForCollectionView:(ASCollectionView *)collectionView;
 
+/**
+ * Passthrough support to UICollectionViewDelegateFlowLayout sectionInset behavior.
+ *
+ * @param collectionView The sender.
+ * @param collectionViewLayout The layout object requesting the information.
+ * #param section The index number of the section whose insets are needed.
+ *
+ * @discussion The same rules apply as the UICollectionView implementation, but this can also be used without a UICollectionViewFlowLayout.
+ * https://developer.apple.com/library/ios/documentation/UIKit/Reference/UICollectionViewDelegateFlowLayout_protocol/index.html#//apple_ref/occ/intfm/UICollectionViewDelegateFlowLayout/collectionView:layout:insetForSectionAtIndex:
+ *
+ */
+- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section;
+
 @end
 
 @interface ASCollectionView (Deprecated)