[ASDataController] Ensure ASRangeController has an opportunity to upd…

…ate visible nodes before they're deleted by -reloadData path. (#2815) This change is specific to the reloadData path, which had the last-known occurrence of "deallocated while marked visible". #2711
facebookarchive · Dec 22, 2016 · 30924d9 · 30924d9
1 parent 7872cfb
commit 30924d9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/AsyncDisplayKit/Details/ASDataController.h b/AsyncDisplayKit/Details/ASDataController.h
@@ -76,12 +76,11 @@ extern NSString * const ASCollectionInvalidUpdateException;
  */
 @protocol ASDataControllerDelegate <NSObject>
 
-@optional
-
 /**
  Called for batch update.
  */
 - (void)dataControllerBeginUpdates:(ASDataController *)dataController;
+- (void)dataControllerWillDeleteAllData:(ASDataController *)dataController;
 - (void)dataController:(ASDataController *)dataController endUpdatesAnimated:(BOOL)animated completion:(void (^ _Nullable)(BOOL))completion;
 
 /**

diff --git a/AsyncDisplayKit/Details/ASDataController.mm b/AsyncDisplayKit/Details/ASDataController.mm
@@ -452,6 +452,7 @@ - (void)_reloadDataWithAnimationOptions:(ASDataControllerAnimationOptions)animat
         // -beginUpdates
         [_mainSerialQueue performBlockOnMainThread:^{
           [_delegate dataControllerBeginUpdates:self];
+          [_delegate dataControllerWillDeleteAllData:self];
         }];
 
         // deleteSections:

diff --git a/AsyncDisplayKit/Details/ASRangeController.mm b/AsyncDisplayKit/Details/ASRangeController.mm
@@ -476,6 +476,11 @@ - (void)dataControllerBeginUpdates:(ASDataController *)dataController
   [_delegate didBeginUpdatesInRangeController:self];
 }
 
+- (void)dataControllerWillDeleteAllData:(ASDataController *)dataController
+{
+  [self _setVisibleNodes:nil];
+}
+
 - (void)dataController:(ASDataController *)dataController endUpdatesAnimated:(BOOL)animated completion:(void (^)(BOOL))completion
 {
   ASDisplayNodeAssertMainThread();