merge master from upstream

TextureGroup · Adlai-Holler · Mar 29, 2019 · Jul 16, 2017 · Sep 6, 2017 · Oct 4, 2017
commit d87bb11a69f870039fde7c4e64eb183112852959
diff --git a/Source/ASCollectionView.mm b/Source/ASCollectionView.mm
@@ -1556,8 +1556,6 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView
 {
   ASInterfaceState interfaceState = [self interfaceStateForRangeController:_rangeController];
   if (ASInterfaceStateIncludesVisible(interfaceState)) {
-    _rangeController.contentOffsetHasChanged = YES;
-    [_rangeController updateCurrentRangeWithMode:ASLayoutRangeModeFull];
     [self _checkForBatchFetching];
   }
   for (_ASCollectionViewCell *cell in _cellsForVisibilityUpdates) {

diff --git a/Source/ASTableView.mm b/Source/ASTableView.mm
@@ -1221,8 +1221,6 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView
   }
   ASInterfaceState interfaceState = [self interfaceStateForRangeController:_rangeController];
   if (ASInterfaceStateIncludesVisible(interfaceState)) {
-    _rangeController.contentOffsetHasChanged = YES;
-    [_rangeController updateCurrentRangeWithMode:ASLayoutRangeModeFull];
     [self _checkForBatchFetching];
   }  
   for (_ASTableViewCell *tableCell in _cellsForVisibilityUpdates) {

diff --git a/Source/Details/ASRangeController.h b/Source/Details/ASRangeController.h
@@ -103,7 +103,7 @@ AS_SUBCLASSING_RESTRICTED
 /**
  * Property that indicates whether the scroll view for this range controller has ever changed its contentOffset.
  */
-@property (nonatomic, assign) BOOL contentOffsetHasChanged;
+@property (nonatomic, assign) BOOL contentHasBeenScrolled;
 
 @end
 

diff --git a/Source/Details/ASRangeController.mm b/Source/Details/ASRangeController.mm
@@ -45,7 +45,7 @@ @interface ASRangeController ()
   NSSet<NSIndexPath *> *_allPreviousIndexPaths;
   NSHashTable<ASCellNode *> *_visibleNodes;
   ASLayoutRangeMode _currentRangeMode;
-  BOOL _contentOffsetHasChanged;
+  BOOL _contentHasBeenScrolled;
   BOOL _preserveCurrentRangeMode;
   BOOL _didRegisterForNodeDisplayNotifications;
   CFTimeInterval _pendingDisplayNodesTimestamp;
@@ -78,7 +78,7 @@ - (instancetype)init
 
   _rangeIsValid = YES;
   _currentRangeMode = ASLayoutRangeModeUnspecified;
-  _contentOffsetHasChanged = NO;
+  _contentHasBeenScrolled = NO;
   _preserveCurrentRangeMode = NO;
   _previousScrollDirection = ASScrollDirectionDown | ASScrollDirectionRight;
 
@@ -247,7 +247,7 @@ - (void)_updateVisibleNodeIndexPaths
 
   ASInterfaceState selfInterfaceState = [self interfaceState];
   ASLayoutRangeMode rangeMode = _currentRangeMode;
-  BOOL updateRangeMode = !_preserveCurrentRangeMode && _contentOffsetHasChanged;
+  BOOL updateRangeMode = (!_preserveCurrentRangeMode && _contentHasBeenScrolled);
 
   // If we've never scrolled before, we never update the range mode, so it doesn't jump into Full too early.
   // This can happen if we have multiple, noisy updates occurring from application code before the user has engaged.

diff --git a/Tests/ASCollectionViewTests.mm b/Tests/ASCollectionViewTests.mm
@@ -1074,7 +1074,7 @@ - (void)testInitialRangeBounds
       for (NSInteger i = 0; i < c; i++) {
         NSIndexPath *ip = [NSIndexPath indexPathForItem:i inSection:s];
         ASCellNode *node = [cn nodeForItemAtIndexPath:ip];
-        [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.001]];
+        ASCATransactionQueueWait();
         if (node.inPreloadState) {
           CGRect frame = [cn.view layoutAttributesForItemAtIndexPath:ip].frame;
           r = CGRectUnion(r, frame);
-Original file line number
+Diff line change
@@ Expand Up / @@ -103,7 +103,7 @@ AS_SUBCLASSING_RESTRICTED @@
     /**
      * Property that indicates whether the scroll view for this range controller has ever changed its contentOffset.
      */
-    @property (nonatomic, assign) BOOL contentOffsetHasChanged;
+    @property (nonatomic, assign) BOOL contentHasBeenScrolled;
     @end
@@ Expand Down @@