Add forceCheckForBatchFetching (#2140)

* Add forceCheckForBatchFetching

## Summary

We want the ability to control when and how batch fetching occurs, so add a method to force a batch fetching check even if we're scrolling.

* Update simulator and SDK versions

* Try another simulator

* Update simulator device

* idk, pick something random

* Take it back

* Just update to CI's latest and see what breaks

* Fix snapshot tests and other things related to 2x vs 3x

* Fix debug string

* wut

I don't know why CI is suddenly choking on the examples. Monkey with the minimum sdk

Author: andyfinnell

.github/workflows/ci-master-only.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   cocoapods-lint:
     env: 
-        DEVELOPER_DIR: /Applications/Xcode_26.0.1.app/Contents/Developer
+        DEVELOPER_DIR: /Applications/Xcode_26.5.0.app/Contents/Developer
     name: Verify that podspec lints
     runs-on: macos-latest
     steps:

.github/workflows/ci-pull-requests-only.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   buildsh:
     env:
-        DEVELOPER_DIR: /Applications/Xcode_26.0.1.app/Contents/Developer
+        DEVELOPER_DIR: /Applications/Xcode_26.5.0.app/Contents/Developer
     strategy:
       matrix:
         mode: [cocoapods-lint-default-subspecs, cocoapods-lint-other-subspecs]

.github/workflows/ci.yml

@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
   buildsh:
     env:
-        DEVELOPER_DIR: /Applications/Xcode_26.0.1.app/Contents/Developer
+        DEVELOPER_DIR: /Applications/Xcode_26.5.0.app/Contents/Developer
     strategy:
       matrix:
         mode: [tests, framework, life-without-cocoapods, carthage, examples-pt1, examples-pt2, examples-pt3, examples-pt4]

Source/ASCollectionNode.h

@@ -547,6 +547,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (nullable id<ASSectionContext>)contextForSection:(NSInteger)section AS_WARN_UNUSED_RESULT;
 
+/**
+ Force a check for batch fetching. Ignores if the user is scrolling.
+ */
+- (void)forceCheckForBatchFetching;
+
 @end
 
 @interface ASCollectionNode (Deprecated)

Source/ASCollectionNode.mm

@@ -967,6 +967,11 @@ - (nullable UICollectionViewCell *)cellForItemAtIndexPath:(NSIndexPath *)indexPa
   return [self.dataController.pendingMap contextForSection:section];
 }
 
+- (void)forceCheckForBatchFetching
+{
+  [self.view forceCheckForBatchFetching];
+}
+
 #pragma mark - Editing
 
 - (void)registerSupplementaryNodeOfKind:(NSString *)elementKind

Source/ASCollectionView.h

@@ -81,6 +81,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (nullable id<ASSectionContext>)contextForSection:(NSInteger)section AS_WARN_UNUSED_RESULT NS_SWIFT_UI_ACTOR;
 
+/**
+ Force a check for batch fetching. Ignores if the user is scrolling.
+ */
+- (void)forceCheckForBatchFetching;
+
 @end
 
 @interface ASCollectionView (Deprecated)

Source/ASCollectionView.mm

@@ -1861,6 +1861,11 @@ - (void)_scheduleCheckForBatchFetchingForNumberOfChanges:(NSUInteger)changes
   });
 }
 
+- (void)forceCheckForBatchFetching
+{
+  [self _beginBatchFetchingIfNeededWithContentOffset:self.contentOffset velocity:CGPointZero];
+}
+
 - (void)_checkForBatchFetching
 {
   // Dragging will be handled in scrollViewWillEndDragging:withVelocity:targetContentOffset:

Source/TextExperiment/Component/ASTextLayout.mm

@@ -1597,17 +1597,17 @@ - (ASTextPosition *)closestPositionToPoint:(CGPoint)point {
 
   [self _insideComposedCharacterSequences:line position:position block: ^(CGFloat left, CGFloat right, NSUInteger prev, NSUInteger next) {
     if (isVertical) {
-      position = fabs(left - point.y) < fabs(right - point.y) < (right ? prev : next);
+      position = fabs(left - point.y) < fabs(right - point.y) ? prev : next;
     } else {
-      position = fabs(left - point.x) < fabs(right - point.x) < (right ? prev : next);
+      position = fabs(left - point.x) < fabs(right - point.x) ? prev : next;
     }
   }];
 
   [self _insideEmoji:line position:position block: ^(CGFloat left, CGFloat right, NSUInteger prev, NSUInteger next) {
     if (isVertical) {
-      position = fabs(left - point.y) < fabs(right - point.y) < (right ? prev : next);
+      position = fabs(left - point.y) < fabs(right - point.y) ? prev : next;
     } else {
-      position = fabs(left - point.x) < fabs(right - point.x) < (right ? prev : next);
+      position = fabs(left - point.x) < fabs(right - point.x) ? prev : next;
     }
   }];
 

Tests/ASDisplayNodeTests.mm

@@ -472,7 +472,7 @@ - (void)checkValuesMatchDefaults:(ASDisplayNode *)node isLayerBacked:(BOOL)isLay
   XCTAssertTrue(CGRectEqualToRect(CGRectZero, node.frame), @"default frame broken %@", hasLoadedView);
   XCTAssertTrue(CGPointEqualToPoint(CGPointZero, node.position), @"default position broken %@", hasLoadedView);
   XCTAssertEqual((CGFloat)0.0, node.zPosition, @"default zPosition broken %@", hasLoadedView);
-  XCTAssertEqual(node.isNodeLoaded && isLayerBacked ? 2.0f : 1.0f, node.contentsScale, @"default contentsScale broken %@", hasLoadedView);
+  XCTAssertEqual(node.isNodeLoaded && isLayerBacked ? 3.0f : 1.0f, node.contentsScale, @"default contentsScale broken %@", hasLoadedView);
   XCTAssertEqual([UIScreen mainScreen].scale, node.contentsScaleForDisplay, @"default contentsScaleForDisplay broken %@", hasLoadedView);
   XCTAssertTrue(CATransform3DEqualToTransform(CATransform3DIdentity, node.transform), @"default transform broken %@", hasLoadedView);
   XCTAssertTrue(CATransform3DEqualToTransform(CATransform3DIdentity, node.subnodeTransform), @"default subnodeTransform broken %@", hasLoadedView);
@@ -2111,8 +2111,8 @@ - (void)testDebugDescription
   NSString *viewDescription = [parent.view valueForKey:@"recursiveDescription"];
 
   // Make sure string contains a, b, and c's pointer string
-  XCTAssertTrue(stringContainsPointer(viewDescription, a), @"Layer backed node not present");
-  XCTAssertTrue(stringContainsPointer(viewDescription, b), @"Layer-backed node not present");
+  XCTAssertTrue(stringContainsPointer(viewDescription, a.layer), @"Layer backed node not present");
+  XCTAssertTrue(stringContainsPointer(viewDescription, b.layer), @"Layer-backed node not present");
   XCTAssertTrue(stringContainsPointer(viewDescription, c), @"View-backed node not present");
 
   // Make sure layer names have display node in description

Tests/ASStackLayoutSpecSnapshotTests.mm

@@ -1216,8 +1216,8 @@ - (void)testBaselineAlignmentWithStretchedItem
 - (void)testFlexWrapWithItemSpacings
 {
   ASStackLayoutSpecStyle style = {
-    .spacing = 50,
     .direction = ASStackLayoutDirectionHorizontal,
+    .spacing = 50,
     .flexWrap = ASStackLayoutFlexWrapWrap,
     .alignContent = ASStackLayoutAlignContentStart,
     .lineSpacing = 5,
@@ -1246,8 +1246,8 @@ - (void)testFlexWrapWithItemSpacings
 - (void)testFlexWrapWithItemSpacingsBeingResetOnNewLines
 {
   ASStackLayoutSpecStyle style = {
-    .spacing = 5,
     .direction = ASStackLayoutDirectionHorizontal,
+    .spacing = 5,
     .flexWrap = ASStackLayoutFlexWrapWrap,
     .alignContent = ASStackLayoutAlignContentStart,
     .lineSpacing = 5,
@@ -1327,9 +1327,9 @@ - (void)testAlignContentStretchAndOtherAlignments
 {
   ASStackLayoutSpecStyle style = {
     .direction = ASStackLayoutDirectionHorizontal,
+    .alignItems = ASStackLayoutAlignItemsStart,
     .flexWrap = ASStackLayoutFlexWrapWrap,
     .alignContent = ASStackLayoutAlignContentStretch,
-    .alignItems = ASStackLayoutAlignItemsStart,
   };
 
   CGSize subnodeSize = {50, 50};