More logic rework

bbigard · Oct 13, 2020 · fd5cd44 · fd5cd44
1 parent fdb55c1
commit fd5cd44
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/detox/ios/Detox/Actions/UIScrollView+DetoxActions.m b/detox/ios/Detox/Actions/UIScrollView+DetoxActions.m
@@ -217,15 +217,21 @@ static BOOL _DTXApplyScroll(UIScrollView* scrollView, CGPoint startPoint, CGPoin
 
 			prevOffset = scrollView.contentOffset;
 
-			if(didSomeScroll == NO && scrollView.bounces && scrollView._isBouncing)
+			if(scrollView.bounces && scrollView._isBouncing)
 			{
-				didFailTouches = YES;
+				if(didSomeScroll == NO)
+				{
+					didFailTouches = YES;
+				}
 				return NO;
 			}
 
-			if(didSomeScroll == NO && consecutiveTouchPointsWithSameContentOffset > consecutiveTouchPointsWithSameContentOffsetThreshold)
+			if(consecutiveTouchPointsWithSameContentOffset > consecutiveTouchPointsWithSameContentOffsetThreshold)
 			{
-				didFailTouches = YES;
+				if(didSomeScroll == NO)
+				{
+					didFailTouches = YES;
+				}
 				return NO;
 			}