From 9bc48ea9b9493d19da14039999ed80eafbf48682 Mon Sep 17 00:00:00 2001
From: Harley Cooper <harley@squareup.com>
Date: Tue, 16 Apr 2019 16:19:09 -0700
Subject: [PATCH] Fixing table scrolling

---
 Additions/UIView-KIFAdditions.m | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/Additions/UIView-KIFAdditions.m b/Additions/UIView-KIFAdditions.m
index 596879d37..49baf0c40 100644
--- a/Additions/UIView-KIFAdditions.m
+++ b/Additions/UIView-KIFAdditions.m
@@ -242,7 +242,7 @@ - (UIAccessibilityElement *)accessibilityElementMatchingBlock:(BOOL(^)(UIAccessi
             }
 
             UITableView *tableView = (UITableView *)self;
-            __block NSIndexPath *firstIndexPath = nil;
+            CGRect initialPosition = CGRectMake(tableView.contentOffset.x, tableView.contentOffset.y, tableView.frame.size.width, tableView.frame.size.height);
 
             // Because of a bug in [UITableView indexPathsForVisibleRows] http://openradar.appspot.com/radar?id=5191284490764288
             // We use [UITableView visibleCells] to determine the index path of the visible cells
@@ -252,13 +252,9 @@ - (UIAccessibilityElement *)accessibilityElementMatchingBlock:(BOOL(^)(UIAccessi
                 if (indexPath) {
                     [indexPathsForVisibleRows addObject:indexPath];
                 }
-                if (!firstIndexPath || ([firstIndexPath compare:indexPath] == NSOrderedDescending)) {
-                    firstIndexPath = indexPath;
-                }
             }];
 
-            BOOL animationEnabled = [KIFUITestActor testActorAnimationsEnabled];
-            CFTimeInterval delay = animationEnabled ? 0.5 : 0.05;
+            CFTimeInterval delay = 0.05;
             for (NSUInteger section = 0, numberOfSections = [tableView numberOfSections]; section < numberOfSections; section++) {
                 for (NSUInteger row = 0, numberOfRows = [tableView numberOfRowsInSection:section]; row < numberOfRows; row++) {
                     if (!self.window) {
@@ -270,21 +266,15 @@ - (UIAccessibilityElement *)accessibilityElementMatchingBlock:(BOOL(^)(UIAccessi
                     if ([indexPathsForVisibleRows containsObject:indexPath]) {
                         @autoreleasepool {
                             //scroll to the last row of each section before continuing. Attemps to ensure we can get to sections that are off screen. KIF tests (e.g. testButtonAbsentAfterRemoveFromSuperview) fails without this line. Also without this... we can't expose the next section (in code downstream)
-                            [tableView scrollToRowAtIndexPath:[indexPathsForVisibleRows lastObject] atScrollPosition:UITableViewScrollPositionNone animated:animationEnabled];
+                            [tableView scrollToRowAtIndexPath:[indexPathsForVisibleRows lastObject] atScrollPosition:UITableViewScrollPositionNone animated:NO];
                             continue;
                         }
                     }
 
-                    //expose the next section (unless it's a UIPicker View).
-                    if (subViewName && ![subViewName containsString:@"UIPicker"] )
-                    {
-                        CGRect sectionRect = [tableView rectForSection:section];
-                        [tableView scrollRectToVisible:sectionRect animated:NO];
-                    }
-
                     @autoreleasepool {
                         // Scroll to the cell and wait for the animation to complete. Using animations here may not be optimal.
-                        [tableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionNone animated:animationEnabled];
+                        CGRect sectionRect = [tableView rectForRowAtIndexPath:indexPath];
+                        [tableView scrollRectToVisible:sectionRect animated:NO];
 
                         UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
                         UIAccessibilityElement *element = [cell accessibilityElementMatchingBlock:matchBlock notHidden:NO];
@@ -300,13 +290,13 @@ - (UIAccessibilityElement *)accessibilityElementMatchingBlock:(BOOL(^)(UIAccessi
                     return [self accessibilityElementMatchingBlock:matchBlock];
                 }
             }
-            if (firstIndexPath) {
-                [tableView scrollToRowAtIndexPath:firstIndexPath atScrollPosition:UITableViewScrollPositionTop animated:NO];
-            }
+
 			//if we're in a picker (scrollView), let's make sure we set the position back to how it was last set.
             if(scrollView != nil && scrollContentOffset.x != -1.0)
             {
                 [scrollView setContentOffset:scrollContentOffset];
+            } else {
+                [tableView scrollRectToVisible:initialPosition animated:NO];
             }
             CFRunLoopRunInMode(UIApplicationCurrentRunMode, delay, false);
         } else if ([self isKindOfClass:[UICollectionView class]]) {