Merge branch 'master' into astableview-in-xib

eanagel · eanagel · commit a38cf3ef374b · 2015-05-05T09:31:31.000-07:00
diff --git a/AsyncDisplayKit/ASCollectionView.h b/AsyncDisplayKit/ASCollectionView.h
@@ -70,6 +70,15 @@
  */
 @property (nonatomic, assign) CGFloat leadingScreensForBatching;
 
+/**
+ * Reload everything from scratch, destroying the working range and all cached nodes.
+ *
+ * @param completion block to run on completion of asynchronous loading or nil. If supplied, the block is run on
+ * the main thread.
+ * @warning This method is substantially more expensive than UICollectionView's version.
+ */
+- (void)reloadDataWithCompletion:(void (^)())completion;
+
 /**
  * Reload everything from scratch, destroying the working range and all cached nodes.
  *
diff --git a/AsyncDisplayKit/ASCollectionView.mm b/AsyncDisplayKit/ASCollectionView.mm
@@ -162,13 +162,18 @@ - (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionVi
 #pragma mark -
 #pragma mark Overrides.
 
-- (void)reloadData
+- (void)reloadDataWithCompletion:(void (^)())completion
 {
   ASDisplayNodeAssert(self.asyncDelegate, @"ASCollectionView's asyncDelegate property must be set.");
   ASDisplayNodePerformBlockOnMainThread(^{
     [super reloadData];
   });
-  [_dataController reloadDataWithAnimationOption:kASCollectionViewAnimationNone];
+  [_dataController reloadDataWithAnimationOption:kASCollectionViewAnimationNone completion:completion];
+}
+
+- (void)reloadData
+{
+  [self reloadDataWithCompletion:nil];
 }
 
 - (void)setDataSource:(id<UICollectionViewDataSource>)dataSource
diff --git a/AsyncDisplayKit/ASControlNode.m b/AsyncDisplayKit/ASControlNode.m
@@ -226,7 +226,7 @@ - (void)addTarget:(id)target action:(SEL)action forControlEvents:(ASControlNodeE
       if (!eventDispatchTable)
       {
         // Create the dispatch table for this event.
-        eventDispatchTable = [NSMapTable strongToStrongObjectsMapTable];
+        eventDispatchTable = [NSMapTable weakToStrongObjectsMapTable];
         [_controlEventDispatchTable setObject:eventDispatchTable forKey:eventKey];
       }
 
diff --git a/AsyncDisplayKit/ASTableView.h b/AsyncDisplayKit/ASTableView.h
@@ -70,6 +70,15 @@
  */
 @property (nonatomic, assign) CGFloat leadingScreensForBatching;
 
+/**
+ * Reload everything from scratch, destroying the working range and all cached nodes.
+ *
+ * @param completion block to run on completion of asynchronous loading or nil. If supplied, the block is run on 
+ * the main thread.
+ * @warning This method is substantially more expensive than UITableView's version.
+ */
+-(void)reloadDataWithCompletion:(void (^)())completion;
+
 /**
  * Reload everything from scratch, destroying the working range and all cached nodes.
  *
diff --git a/AsyncDisplayKit/ASTableView.mm b/AsyncDisplayKit/ASTableView.mm
@@ -217,13 +217,18 @@ - (void)setAsyncDelegate:(id<ASTableViewDelegate>)asyncDelegate
   }
 }
 
-- (void)reloadData
+- (void)reloadDataWithCompletion:(void (^)())completion
 {
   ASDisplayNodeAssert(self.asyncDelegate, @"ASTableView's asyncDelegate property must be set.");
   ASDisplayNodePerformBlockOnMainThread(^{
     [super reloadData];
   });
-  [_dataController reloadDataWithAnimationOption:UITableViewRowAnimationNone];
+  [_dataController reloadDataWithAnimationOption:UITableViewRowAnimationNone completion:completion];
+}
+
+- (void)reloadData
+{
+  [self reloadDataWithCompletion:nil];
 }
 
 - (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType
diff --git a/AsyncDisplayKit/Details/ASDataController.h b/AsyncDisplayKit/Details/ASDataController.h
@@ -155,7 +155,7 @@ typedef NSUInteger ASDataControllerAnimationOptions;
 
 - (void)moveRowAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)newIndexPath withAnimationOption:(ASDataControllerAnimationOptions)animationOption;;
 
-- (void)reloadDataWithAnimationOption:(ASDataControllerAnimationOptions)animationOption;;
+- (void)reloadDataWithAnimationOption:(ASDataControllerAnimationOptions)animationOption completion:(void (^)())completion;
 
 /** @name Data Querying */
 
diff --git a/AsyncDisplayKit/Details/ASDataController.mm b/AsyncDisplayKit/Details/ASDataController.mm
@@ -437,7 +437,7 @@ - (void)moveRowAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)n
   });
 }
 
-- (void)reloadDataWithAnimationOption:(ASDataControllerAnimationOptions)animationOption
+- (void)reloadDataWithAnimationOption:(ASDataControllerAnimationOptions)animationOption completion:(void (^)())completion
 {
   [self performDataFetchingWithBlock:^{
     // Fetching data in calling thread
@@ -478,6 +478,10 @@ - (void)reloadDataWithAnimationOption:(ASDataControllerAnimationOptions)animatio
       }];
       
       [self _batchInsertNodes:updatedNodes atIndexPaths:updatedIndexPaths withAnimationOptions:animationOption];
+
+      if (completion) {
+        dispatch_async(dispatch_get_main_queue(), completion);
+      }
     });
   }];
 }

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ - (void)addTarget:(id)target action:(SEL)action forControlEvents:(ASControlNodeE`
`226`	`226`	`if (!eventDispatchTable)`
`227`	`227`	`{`
`228`	`228`	`// Create the dispatch table for this event.`
`229`		`- eventDispatchTable = [NSMapTable strongToStrongObjectsMapTable];`
	`229`	`+ eventDispatchTable = [NSMapTable weakToStrongObjectsMapTable];`
`230`	`230`	`[_controlEventDispatchTable setObject:eventDispatchTable forKey:eventKey];`
`231`	`231`	`}`
`232`	`232`
Original file line number	Diff line number	Diff line change
`@@ -217,13 +217,18 @@ - (void)setAsyncDelegate:(id<ASTableViewDelegate>)asyncDelegate`
`217`	`217`	`}`
`218`	`218`	`}`
`219`	`219`
`220`		`-- (void)reloadData`
	`220`	`+- (void)reloadDataWithCompletion:(void (^)())completion`
`221`	`221`	`{`
`222`	`222`	`ASDisplayNodeAssert(self.asyncDelegate, @"ASTableView's asyncDelegate property must be set.");`
`223`	`223`	`ASDisplayNodePerformBlockOnMainThread(^{`
`224`	`224`	`[super reloadData];`
`225`	`225`	`});`
`226`		`- [_dataController reloadDataWithAnimationOption:UITableViewRowAnimationNone];`
	`226`	`+ [_dataController reloadDataWithAnimationOption:UITableViewRowAnimationNone completion:completion];`
	`227`	`+}`
	`228`	`+`
	`229`	`+- (void)reloadData`
	`230`	`+{`
	`231`	`+ [self reloadDataWithCompletion:nil];`
`227`	`232`	`}`
`228`	`233`
`229`	`234`	`- (void)setTuningParameters:(ASRangeTuningParameters)tuningParameters forRangeType:(ASLayoutRangeType)rangeType`
Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,7 @@ - (void)moveRowAtIndexPath:(NSIndexPath )indexPath toIndexPath:(NSIndexPath )n`
`437`	`437`	`});`
`438`	`438`	`}`
`439`	`439`
`440`		`-- (void)reloadDataWithAnimationOption:(ASDataControllerAnimationOptions)animationOption`
	`440`	`+- (void)reloadDataWithAnimationOption:(ASDataControllerAnimationOptions)animationOption completion:(void (^)())completion`
`441`	`441`	`{`
`442`	`442`	`[self performDataFetchingWithBlock:^{`
`443`	`443`	`// Fetching data in calling thread`
`@@ -478,6 +478,10 @@ - (void)reloadDataWithAnimationOption:(ASDataControllerAnimationOptions)animatio`
`478`	`478`	`}];`
`479`	`479`
`480`	`480`	`[self _batchInsertNodes:updatedNodes atIndexPaths:updatedIndexPaths withAnimationOptions:animationOption];`
	`481`	`+`
	`482`	`+ if (completion) {`
	`483`	`+ dispatch_async(dispatch_get_main_queue(), completion);`
	`484`	`+ }`
`481`	`485`	`});`
`482`	`486`	`}];`
`483`	`487`	`}`