From 61a4715331fddd4c7526148bd5c3aacaaff37acc Mon Sep 17 00:00:00 2001
From: Daniel Ornelas <daniel.ob64@gmail.com>
Date: Mon, 1 May 2023 13:01:57 -0700
Subject: [PATCH 01/15] Bump ios minimum deployment target to 11.0

---
 KIF.xcodeproj/project.pbxproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/KIF.xcodeproj/project.pbxproj b/KIF.xcodeproj/project.pbxproj
index 0dd2ab00..bd469678 100644
--- a/KIF.xcodeproj/project.pbxproj
+++ b/KIF.xcodeproj/project.pbxproj
@@ -1789,7 +1789,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				ONLY_ACTIVE_ARCH = YES;
 				PUBLIC_HEADERS_FOLDER_PATH = "include/$(PRODUCT_NAME)";
 				SDKROOT = iphoneos;
@@ -1834,7 +1834,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				PUBLIC_HEADERS_FOLDER_PATH = "include/$(PRODUCT_NAME)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
@@ -2097,7 +2097,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				PUBLIC_HEADERS_FOLDER_PATH = "include/$(PRODUCT_NAME)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;

From 3eb917baae02356c66d13a241af5408f907b93c2 Mon Sep 17 00:00:00 2001
From: Daniel Ornelas <daniel.ob64@gmail.com>
Date: Sat, 6 May 2023 23:21:19 -0700
Subject: [PATCH 02/15] Fixing tests to compile with iOS11

---
 KIF Tests/ModalViewTests.m                    |  4 +-
 KIF Tests/ModalViewTests_ViewTestActor.m      |  4 +-
 KIF Tests/SystemTests.m                       | 43 -------------------
 .../Base.lproj/MainStoryboard.storyboard      |  6 +--
 Test Host/TestSuiteViewController.m           | 39 ++++++++++++++---
 5 files changed, 41 insertions(+), 55 deletions(-)

diff --git a/KIF Tests/ModalViewTests.m b/KIF Tests/ModalViewTests.m
index cdee7f76..330a9413 100644
--- a/KIF Tests/ModalViewTests.m	
+++ b/KIF Tests/ModalViewTests.m	
@@ -31,8 +31,8 @@ - (void)testInteractionWithAnAlertView
 
 - (void)testInteractionWithAnActionSheet
 {
-    [tester tapViewWithAccessibilityLabel:@"UIActionSheet"];
-    [tester waitForViewWithAccessibilityLabel:@"Action Sheet"];
+    [tester tapViewWithAccessibilityLabel:@"UIAlertController"];
+    [tester waitForViewWithAccessibilityLabel:@"Alert Controller"];
     [tester waitForTappableViewWithAccessibilityLabel:@"Destroy"];
     [tester waitForTappableViewWithAccessibilityLabel:@"A"];
     [tester waitForTappableViewWithAccessibilityLabel:@"B"];
diff --git a/KIF Tests/ModalViewTests_ViewTestActor.m b/KIF Tests/ModalViewTests_ViewTestActor.m
index a885755a..b6e63bf5 100644
--- a/KIF Tests/ModalViewTests_ViewTestActor.m	
+++ b/KIF Tests/ModalViewTests_ViewTestActor.m	
@@ -31,8 +31,8 @@ - (void)testInteractionWithAnAlertView
 
 - (void)testInteractionWithAnActionSheet
 {
-    [[viewTester usingLabel:@"UIActionSheet"] tap];
-    [[viewTester usingLabel:@"Action Sheet"] waitForView];
+    [[viewTester usingLabel:@"UIAlertController"] tap];
+    [[viewTester usingLabel:@"Alert Controller"] waitForView];
     [[viewTester usingLabel:@"Destroy"] waitForTappableView];
     [[viewTester usingLabel:@"A"] waitForTappableView];
     [[viewTester usingLabel:@"B"] waitForTappableView];
diff --git a/KIF Tests/SystemTests.m b/KIF Tests/SystemTests.m
index bf695de1..9973261c 100644
--- a/KIF Tests/SystemTests.m	
+++ b/KIF Tests/SystemTests.m	
@@ -63,48 +63,6 @@ - (void)testMemoryWarningSimulator
 }
 
 - (void)testMockingOpenURL
-{
-    __block BOOL openURLReturnValue;
-    __block BOOL canOpenURLReturnValue;
-    [system waitForApplicationToOpenURL:@"test123://" whileExecutingBlock:^{
-        NSURL *uninstalledAppURL = [NSURL URLWithString:@"test123://"];
-        canOpenURLReturnValue = [[UIApplication sharedApplication] canOpenURL:uninstalledAppURL];
-        openURLReturnValue = [[UIApplication sharedApplication] openURL:uninstalledAppURL];
-    } returning:NO];
-    KIFAssertEqual(NO, openURLReturnValue, @"openURL: should have returned NO");
-    KIFAssertEqual(NO, canOpenURLReturnValue, @"canOpenURL: should have returned NO");
-    
-    [system waitForApplicationToOpenURL:@"test123://" whileExecutingBlock:^{
-        NSURL *installedAppURL = [NSURL URLWithString:@"test123://"];
-        canOpenURLReturnValue = [[UIApplication sharedApplication] canOpenURL:installedAppURL];
-        openURLReturnValue = [[UIApplication sharedApplication] openURL:installedAppURL];
-    } returning:YES];
-    KIFAssertEqual(YES, openURLReturnValue, @"openURL: should have returned YES");
-    KIFAssertEqual(YES, canOpenURLReturnValue, @"canOpenURL: should have returned YES");
-
-    [system waitForApplicationToOpenURLWithScheme:@"test123" whileExecutingBlock:^{
-        NSURL *installedAppURL = [NSURL URLWithString:@"test123://some/path?query"];
-        canOpenURLReturnValue = [[UIApplication sharedApplication] canOpenURL:installedAppURL];
-        openURLReturnValue = [[UIApplication sharedApplication] openURL:installedAppURL];
-    } returning:YES];
-    KIFAssertEqual(YES, openURLReturnValue, @"openURL: should have returned YES");
-    KIFAssertEqual(YES, canOpenURLReturnValue, @"canOpenURL: should have returned YES");
-
-    [system waitForApplicationToOpenAnyURLWhileExecutingBlock:^{
-        NSURL *someURL = [NSURL URLWithString:@"423543523454://"];
-        canOpenURLReturnValue = [[UIApplication sharedApplication] canOpenURL:someURL];
-        openURLReturnValue = [[UIApplication sharedApplication] openURL:someURL];
-    } returning:YES];
-    KIFAssertEqual(YES, openURLReturnValue, @"openURL: should have returned YES");
-    KIFAssertEqual(YES, canOpenURLReturnValue, @"canOpenURL: should have returned YES");
-
-    NSURL *fakeURL = [NSURL URLWithString:@"this-is-a-fake-url://"];
-    KIFAssertFalse([[UIApplication sharedApplication] canOpenURL:fakeURL], @"Should no longer be mocking, reject bad URL.");
-    KIFAssertFalse([[UIApplication sharedApplication] openURL:fakeURL], @"Should no longer be mocking, reject bad URL.");
-}
-
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000
-- (void)testMockingOpenURLiOS10xAndUp
 {
     __block BOOL canOpenURLReturnValue;
     [system waitForApplicationToOpenURL:@"test123://" whileExecutingBlock:^{
@@ -138,6 +96,5 @@ - (void)testMockingOpenURLiOS10xAndUp
     NSURL *fakeURL = [NSURL URLWithString:@"this-is-a-fake-url://"];
     KIFAssertFalse([[UIApplication sharedApplication] canOpenURL:fakeURL], @"Should no longer be mocking, reject bad URL.");
 }
-#endif
 
 @end
diff --git a/Test Host/Base.lproj/MainStoryboard.storyboard b/Test Host/Base.lproj/MainStoryboard.storyboard
index 1235360b..59d0ffdd 100644
--- a/Test Host/Base.lproj/MainStoryboard.storyboard	
+++ b/Test Host/Base.lproj/MainStoryboard.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="3">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="3">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -317,7 +317,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="383.5" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" text="UIActionSheet" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Iob-Ej-M2H">
+                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" text="UIAlertController" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Iob-Ej-M2H">
                                                     <rect key="frame" x="20" y="0.0" width="355.5" height="44"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
diff --git a/Test Host/TestSuiteViewController.m b/Test Host/TestSuiteViewController.m
index 1d740385..5a947172 100644
--- a/Test Host/TestSuiteViewController.m	
+++ b/Test Host/TestSuiteViewController.m	
@@ -8,7 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface TestSuiteViewController : UITableViewController <UIActionSheetDelegate>
+@interface TestSuiteViewController : UITableViewController
 @end
 
 @implementation TestSuiteViewController
@@ -70,7 +70,31 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
 
         case 2:
         {
-            [[[UIActionSheet alloc] initWithTitle:@"Action Sheet" delegate:self cancelButtonTitle:@"Cancel" destructiveButtonTitle:@"Destroy" otherButtonTitles:@"A", @"B", nil] showInView:tableView];
+            UIAlertController *alertController = [UIAlertController
+                                                  alertControllerWithTitle:@"Alert Controller"
+                                                  message:@""
+                                                  preferredStyle:UIAlertControllerStyleActionSheet];
+            UIAlertAction *destroyAction = [UIAlertAction actionWithTitle:@"Destroy" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) {
+                [self alertControllerDismissed];
+            }];
+            
+            UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
+                [self alertControllerDismissed];
+            }];
+            
+            [alertController addAction:destroyAction];
+            [alertController addAction:[self alertActionWithTitle:@"A"]];
+            [alertController addAction:[self alertActionWithTitle:@"B"]];
+            [alertController addAction:cancelAction];
+            
+            if ([alertController respondsToSelector:@selector(popoverPresentationController)] && UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+                // iOS 8 iPad presents in a popover
+                alertController.popoverPresentationController.sourceView = [tableView cellForRowAtIndexPath:indexPath];
+                UIPopoverController *popover = [[UIPopoverController alloc] initWithContentViewController:alertController];
+                [popover presentPopoverFromRect:alertController.popoverPresentationController.sourceView.frame inView:tableView permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
+            } else {
+                [self presentViewController:alertController animated:YES completion:nil];
+            }
             break;
         }
 
@@ -103,9 +127,7 @@ -(void)pullToRefreshHandler
     });
 }
 
-#pragma mark - UIActionSheetDelegate
-
-- (void)actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger)buttonIndex
+- (void)alertControllerDismissed
 {
     UIAlertController * alertController = [UIAlertController alertControllerWithTitle:@"Alert View"
                                                                               message:@"Message"
@@ -115,6 +137,13 @@ - (void)actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSIn
     [self presentViewController:alertController animated:YES completion:nil];
 }
 
+-(UIAlertAction *)alertActionWithTitle:(NSString *)title
+{
+    return [UIAlertAction actionWithTitle:title style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        [self alertControllerDismissed];
+    }];
+}
+
 - (IBAction)resetRefreshControl
 {
 	self.refreshControl.attributedTitle = [[NSAttributedString alloc] initWithString:NSLocalizedString(@"Refreshing...", @"") attributes:nil];

From cc6b0fa2a0017ac889d3547e49b45db02bfcca4e Mon Sep 17 00:00:00 2001
From: Daniel Ornelas <daniel.ob64@gmail.com>
Date: Sat, 6 May 2023 23:24:44 -0700
Subject: [PATCH 03/15] bump iOS platform in podspec to iOS11

---
 KIF.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KIF.podspec b/KIF.podspec
index 40c0c37a..1c7ddedb 100644
--- a/KIF.podspec
+++ b/KIF.podspec
@@ -6,7 +6,7 @@ Pod::Spec.new do |s|
   s.license                 = 'Apache 2.0'
   s.authors                 = 'Michael Thole', 'Eric Firestone', 'Jim Puls', 'Brian Nickel'
   s.source                  = { :git => "https://github.com/kif-framework/KIF.git", :tag => "v#{ s.version.to_s }" }
-  s.platform                = :ios, '10.0'
+  s.platform                = :ios, '11.0'
   s.frameworks              = 'CoreGraphics', 'QuartzCore', 'IOKit', 'WebKit', 'XCTest'
   s.default_subspec         = 'Core'
   s.requires_arc            = true

From 7d85058cd5b05ee6b28f2ef1229882bfd867b302 Mon Sep 17 00:00:00 2001
From: Daniel Ornelas <daniel.ob64@gmail.com>
Date: Sat, 6 May 2023 23:27:27 -0700
Subject: [PATCH 04/15] bump version in Package.swift

---
 Package.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Package.swift b/Package.swift
index bbb111f2..7fc84d6d 100644
--- a/Package.swift
+++ b/Package.swift
@@ -5,7 +5,7 @@ import PackageDescription
 let package = Package(
     name: "KIF",
     platforms: [
-        .iOS(.v9)
+        .iOS(.v11)
     ],
     products: [
         .library(

From 29b67467cbfad1122994bd8b0b0e4fa95f2eac7e Mon Sep 17 00:00:00 2001
From: foo <zcrzcr@qq.com>
Date: Tue, 4 Apr 2023 10:29:50 +0800
Subject: [PATCH 05/15] Add support for swiping from the specified edge of the
 screen

---
 KIF Tests/GestureTests.m                      | 12 ++++
 Sources/KIF/Additions/UITouch-KIFAdditions.h  |  1 +
 Sources/KIF/Additions/UITouch-KIFAdditions.m  |  7 +++
 Sources/KIF/Additions/UIView-KIFAdditions.h   |  1 +
 Sources/KIF/Additions/UIView-KIFAdditions.m   | 12 +++-
 Sources/KIF/Classes/KIFUITestActor.h          |  7 +++
 Sources/KIF/Classes/KIFUITestActor.m          | 56 +++++++++++++++----
 .../Base.lproj/MainStoryboard.storyboard      | 14 +++++
 Test Host/GestureViewController.m             | 19 +++++++
 9 files changed, 116 insertions(+), 13 deletions(-)

diff --git a/KIF Tests/GestureTests.m b/KIF Tests/GestureTests.m
index ecb62b62..6b280f2c 100644
--- a/KIF Tests/GestureTests.m	
+++ b/KIF Tests/GestureTests.m	
@@ -193,6 +193,18 @@ - (void)testSwipingDownWithIdentifier
     [tester waitForViewWithAccessibilityLabel:@"Down"];
 }
 
+- (void)testSwipeFromScreenEdgeLeft
+{
+    [tester swipeFromEdge:UIRectEdgeLeft atY:300];
+    [tester waitForViewWithAccessibilityLabel:@"LeftEdge"];
+}
+
+- (void)testSwipeFromScreenEdgeRight
+{
+    [tester swipeFromEdge:UIRectEdgeRight atY:300];
+    [tester waitForViewWithAccessibilityLabel:@"RightEdge"];
+}
+
 - (void)testScrolling
 {
     // Needs to be offset from the edge to prevent the navigation controller's interactivePopGestureRecognizer from triggering
diff --git a/Sources/KIF/Additions/UITouch-KIFAdditions.h b/Sources/KIF/Additions/UITouch-KIFAdditions.h
index ea8dc350..5fedffe4 100644
--- a/Sources/KIF/Additions/UITouch-KIFAdditions.h
+++ b/Sources/KIF/Additions/UITouch-KIFAdditions.h
@@ -17,5 +17,6 @@
 
 - (void)setLocationInWindow:(CGPoint)location;
 - (void)setPhaseAndUpdateTimestamp:(UITouchPhase)phase;
+- (void)setIsFromEdge:(BOOL)isFromEdge;
 
 @end
diff --git a/Sources/KIF/Additions/UITouch-KIFAdditions.m b/Sources/KIF/Additions/UITouch-KIFAdditions.m
index 59b2e34e..9cc9880c 100644
--- a/Sources/KIF/Additions/UITouch-KIFAdditions.m
+++ b/Sources/KIF/Additions/UITouch-KIFAdditions.m
@@ -37,6 +37,7 @@ - (void)_setIsFirstTouchForView:(BOOL)firstTouchForView;
 - (void)_setIsTapToClick:(BOOL)tapToClick;
 
 - (void)_setHidEvent:(IOHIDEventRef)event;
+- (void)_setEdgeType:(NSInteger)edgeType;
 
 @end
 
@@ -117,6 +118,12 @@ - (void)setPhaseAndUpdateTimestamp:(UITouchPhase)phase
     [self setPhase:phase];
 }
 
+- (void)setIsFromEdge:(BOOL)isFromEdge
+{
+    NSInteger edgeType = isFromEdge ? 4 : 0;
+    [self _setEdgeType:edgeType];
+}
+
 - (void)kif_setHidEvent {
     IOHIDEventRef event = kif_IOHIDEventWithTouches(@[self]);
     [self _setHidEvent:event];
diff --git a/Sources/KIF/Additions/UIView-KIFAdditions.h b/Sources/KIF/Additions/UIView-KIFAdditions.h
index acb48187..6cbb8d9f 100644
--- a/Sources/KIF/Additions/UIView-KIFAdditions.h
+++ b/Sources/KIF/Additions/UIView-KIFAdditions.h
@@ -53,6 +53,7 @@ typedef CGPoint KIFDisplacement;
 - (void)dragFromPoint:(CGPoint)startPoint toPoint:(CGPoint)endPoint;
 - (void)dragFromPoint:(CGPoint)startPoint toPoint:(CGPoint)endPoint steps:(NSUInteger)stepCount;
 - (void)dragFromPoint:(CGPoint)startPoint displacement:(KIFDisplacement)displacement steps:(NSUInteger)stepCount;
+- (void)dragFromPoint:(CGPoint)startPoint displacement:(KIFDisplacement)displacement steps:(NSUInteger)stepCount isFromEdge:(BOOL)isFromEdge;
 - (void)dragAlongPathWithPoints:(CGPoint *)points count:(NSInteger)count;
 - (void)twoFingerPanFromPoint:(CGPoint)startPoint toPoint:(CGPoint)toPoint steps:(NSUInteger)stepCount;
 - (void)pinchAtPoint:(CGPoint)centerPoint distance:(CGFloat)distance steps:(NSUInteger)stepCount;
diff --git a/Sources/KIF/Additions/UIView-KIFAdditions.m b/Sources/KIF/Additions/UIView-KIFAdditions.m
index 4d7b31c3..0f84798b 100644
--- a/Sources/KIF/Additions/UIView-KIFAdditions.m
+++ b/Sources/KIF/Additions/UIView-KIFAdditions.m
@@ -630,10 +630,15 @@ - (void)dragFromPoint:(CGPoint)startPoint toPoint:(CGPoint)endPoint steps:(NSUIn
 }
 
 - (void)dragFromPoint:(CGPoint)startPoint displacement:(KIFDisplacement)displacement steps:(NSUInteger)stepCount;
+{
+    [self dragFromPoint:startPoint displacement:displacement steps:stepCount isFromEdge:NO];
+}
+
+- (void)dragFromPoint:(CGPoint)startPoint displacement:(KIFDisplacement)displacement steps:(NSUInteger)stepCount isFromEdge:(BOOL)isFromEdge;
 {
     CGPoint endPoint = CGPointMake(startPoint.x + displacement.x, startPoint.y + displacement.y);
     NSArray<NSValue *> *path = [self pointsFromStartPoint:startPoint toPoint:endPoint steps:stepCount];
-    [self dragPointsAlongPaths:@[path]];
+    [self dragPointsAlongPaths:@[path] isFromEdge:isFromEdge];
 }
 
 - (void)dragAlongPathWithPoints:(CGPoint *)points count:(NSInteger)count;
@@ -648,6 +653,10 @@ - (void)dragAlongPathWithPoints:(CGPoint *)points count:(NSInteger)count;
 }
 
 - (void)dragPointsAlongPaths:(NSArray<NSArray<NSValue *> *> *)arrayOfPaths {
+    [self dragPointsAlongPaths:arrayOfPaths isFromEdge:NO];
+}
+
+- (void)dragPointsAlongPaths:(NSArray<NSArray<NSValue *> *> *)arrayOfPaths isFromEdge:(BOOL)isFromEdge {
     // There must be at least one path with at least one point
     if (arrayOfPaths.count == 0 || arrayOfPaths.firstObject.count == 0)
     {
@@ -692,6 +701,7 @@ - (void)dragPointsAlongPaths:(NSArray<NSArray<NSValue *> *> *)arrayOfPaths {
                 point = [self convertPoint:point fromView:self.window];
                 UITouch *touch = [[UITouch alloc] initAtPoint:point inView:self];
                 [touch setPhaseAndUpdateTimestamp:UITouchPhaseBegan];
+                [touch setIsFromEdge:isFromEdge];
                 [touches addObject:touch];
             }
             UIEvent *eventDown = [self eventWithTouches:[NSArray arrayWithArray:touches]];
diff --git a/Sources/KIF/Classes/KIFUITestActor.h b/Sources/KIF/Classes/KIFUITestActor.h
index db346ed0..36d92c3e 100644
--- a/Sources/KIF/Classes/KIFUITestActor.h
+++ b/Sources/KIF/Classes/KIFUITestActor.h
@@ -322,6 +322,13 @@ typedef NS_ENUM(NSUInteger, KIFPullToRefreshTiming) {
  */
 - (void)tapScreenAtPoint:(CGPoint)screenPoint;
 
+/*!
+ @abstract Performs a swipe gesture starting from the specified edge of the screen.
+ @param edge The edge from which the swipe gesture should start.
+ @param y The y-coordinate of the starting point for the swipe gesture.
+ */
+- (void)swipeFromEdge:(UIRectEdge)edge atY:(CGFloat)y;
+
 /*!
  @abstract Performs a long press on a particular view in the view hierarchy.
  @discussion The view or accessibility element with the given label is searched for in the view hierarchy. If the element isn't found or isn't currently tappable, then the step will attempt to wait until it is. Once the view is present and tappable, touch events are simulated in the center of the view or element.
diff --git a/Sources/KIF/Classes/KIFUITestActor.m b/Sources/KIF/Classes/KIFUITestActor.m
index ff8c9ca1..bf72bab3 100644
--- a/Sources/KIF/Classes/KIFUITestActor.m
+++ b/Sources/KIF/Classes/KIFUITestActor.m
@@ -366,18 +366,7 @@ - (void)tapAccessibilityElement:(UIAccessibilityElement *)element inView:(UIView
 - (void)tapScreenAtPoint:(CGPoint)screenPoint
 {
     [self runBlock:^KIFTestStepResult(NSError **error) {
-        
-        // Try all the windows until we get one back that actually has something in it at the given point
-        UIView *view = nil;
-        for (UIWindow *window in [[[UIApplication sharedApplication] windowsWithKeyWindow] reverseObjectEnumerator]) {
-            CGPoint windowPoint = [window convertPoint:screenPoint fromView:nil];
-            view = [window hitTest:windowPoint withEvent:nil];
-            
-            // If we hit the window itself, then skip it.
-            if (view != window && view != nil) {
-                break;
-            }
-        }
+        UIView *view = [self viewAtPoint:screenPoint];
         
         KIFTestWaitCondition(view, error, @"No view was found at the point %@", NSStringFromCGPoint(screenPoint));
         
@@ -389,6 +378,49 @@ - (void)tapScreenAtPoint:(CGPoint)screenPoint
     }];
 }
 
+- (void)swipeFromEdge:(UIRectEdge)edge atY:(CGFloat)y
+{
+    CGPoint screenPoint;
+    KIFSwipeDirection direction;
+    if (edge == UIRectEdgeLeft) {
+        screenPoint = CGPointMake(0.3, y);
+        direction = KIFSwipeDirectionRight;
+    } else if (edge == UIRectEdgeRight) {
+        screenPoint = CGPointMake(UIScreen.mainScreen.bounds.size.width - 0.3, y);
+        direction = KIFSwipeDirectionLeft;
+    } else {
+        return;
+    }
+    [self runBlock:^KIFTestStepResult(NSError **error) {
+        UIView *view = [self viewAtPoint:screenPoint];
+        
+        KIFTestWaitCondition(view, error, @"No view was found at the point %@", NSStringFromCGPoint(screenPoint));
+        
+        // This is mostly redundant of the test in _accessibilityElementWithLabel:
+        CGPoint viewPoint = [view convertPoint:screenPoint fromView:nil];
+        KIFDisplacement swipeDisplacement = [self _displacementForSwipingInDirection:direction];
+        [view dragFromPoint:viewPoint displacement:swipeDisplacement steps:20 isFromEdge:YES];
+        
+        return KIFTestStepResultSuccess;
+    }];
+}
+
+- (UIView *)viewAtPoint:(CGPoint)screenPoint
+{
+    // Try all the windows until we get one back that actually has something in it at the given point
+    UIView *view = nil;
+    for (UIWindow *window in [[[UIApplication sharedApplication] windowsWithKeyWindow] reverseObjectEnumerator]) {
+        CGPoint windowPoint = [window convertPoint:screenPoint fromView:nil];
+        view = [window hitTest:windowPoint withEvent:nil];
+        
+        // If we hit the window itself, then skip it.
+        if (view != window && view != nil) {
+            break;
+        }
+    }
+    return view;
+}
+
 - (void)longPressViewWithAccessibilityLabel:(NSString *)label duration:(NSTimeInterval)duration;
 {
     [self longPressViewWithAccessibilityLabel:label value:nil traits:UIAccessibilityTraitNone duration:duration];
diff --git a/Test Host/Base.lproj/MainStoryboard.storyboard b/Test Host/Base.lproj/MainStoryboard.storyboard
index 1235360b..407d1e5d 100644
--- a/Test Host/Base.lproj/MainStoryboard.storyboard	
+++ b/Test Host/Base.lproj/MainStoryboard.storyboard	
@@ -1289,6 +1289,8 @@
                                 </userDefinedRuntimeAttributes>
                                 <connections>
                                     <outletCollection property="gestureRecognizers" destination="F0s-aj-f1p" appends="YES" id="zOl-rL-278"/>
+                                    <outletCollection property="gestureRecognizers" destination="zOy-ea-cks" appends="YES" id="ZRb-UY-JXb"/>
+                                    <outletCollection property="gestureRecognizers" destination="sR1-l1-zcg" appends="YES" id="dzQ-3N-rJw"/>
                                 </connections>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Rr-zq-WBn">
@@ -1362,6 +1364,18 @@
                         <action selector="hadlePanGestureRecognizer:" destination="ubg-mt-ea6" id="cOQ-Xc-3Pe"/>
                     </connections>
                 </panGestureRecognizer>
+                <screenEdgePanGestureRecognizer minimumNumberOfTouches="1" id="zOy-ea-cks">
+                    <rectEdge key="edges" left="YES"/>
+                    <connections>
+                        <action selector="handleScreenEdgePanGestureRecognizer:" destination="ubg-mt-ea6" id="Bqj-n2-Xkz"/>
+                    </connections>
+                </screenEdgePanGestureRecognizer>
+                <screenEdgePanGestureRecognizer minimumNumberOfTouches="1" id="sR1-l1-zcg">
+                    <rectEdge key="edges" right="YES"/>
+                    <connections>
+                        <action selector="handleScreenEdgePanGestureRecognizer:" destination="ubg-mt-ea6" id="Nrb-nt-flP"/>
+                    </connections>
+                </screenEdgePanGestureRecognizer>
             </objects>
             <point key="canvasLocation" x="665.21739130434787" y="504.91071428571428"/>
         </scene>
diff --git a/Test Host/GestureViewController.m b/Test Host/GestureViewController.m
index a41f701a..7e556b06 100644
--- a/Test Host/GestureViewController.m	
+++ b/Test Host/GestureViewController.m	
@@ -26,6 +26,20 @@ - (void)viewDidLoad
     self.scrollView.contentSize = CGRectUnion(self.scrollView.bounds, self.bottomRightLabel.frame).size;
 }
 
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    
+    self.navigationController.interactivePopGestureRecognizer.enabled = NO;
+}
+
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    
+    self.navigationController.interactivePopGestureRecognizer.enabled = YES;
+}
+
 - (IBAction)swipedUp:(id)sender
 {
     self.lastSwipeDescriptionLabel.text = @"Up";
@@ -51,6 +65,11 @@ - (IBAction)hadlePanGestureRecognizer:(UIPanGestureRecognizer *)sender
     self.lastVelocityVeluesLabel.text = [self formattedVelocityValues:[sender velocityInView:self.panAreaLabel]];
 }
 
+- (IBAction)handleScreenEdgePanGestureRecognizer:(UIScreenEdgePanGestureRecognizer *)sender
+{
+    self.lastSwipeDescriptionLabel.text = sender.edges == UIRectEdgeLeft ? @"LeftEdge" : @"RightEdge";
+}
+
 - (NSString*)formattedVelocityValues:(CGPoint)velocity
 {
     return [NSString stringWithFormat:@"X:%.2f Y:%.2f", velocity.x, velocity.y];

From ebf5a0aa2ec38463a7b89f2002664ee582c4d0e7 Mon Sep 17 00:00:00 2001
From: foo <zcrzcr@qq.com>
Date: Fri, 30 Jun 2023 21:18:11 +0800
Subject: [PATCH 06/15] Fix Gestures scene layout

---
 .../Base.lproj/MainStoryboard.storyboard      | 126 ++++++++++++------
 1 file changed, 83 insertions(+), 43 deletions(-)

diff --git a/Test Host/Base.lproj/MainStoryboard.storyboard b/Test Host/Base.lproj/MainStoryboard.storyboard
index 407d1e5d..7c313166 100644
--- a/Test Host/Base.lproj/MainStoryboard.storyboard	
+++ b/Test Host/Base.lproj/MainStoryboard.storyboard	
@@ -1248,39 +1248,12 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="804"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5Pa-Id-GPM">
-                                <rect key="frame" x="-6" y="555" width="418" height="204"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                                <subviews>
-                                    <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7cv-bk-ApT">
-                                        <rect key="frame" x="0.0" y="0.0" width="418" height="204"/>
-                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                        <subviews>
-                                            <label opaque="NO" clipsSubviews="YES" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Top Left" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IQH-0R-Yn9">
-                                                <rect key="frame" x="0.0" y="0.0" width="62" height="20"/>
-                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
-                                            <label opaque="NO" clipsSubviews="YES" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Bottom Right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UYz-K1-bMw">
-                                                <rect key="frame" x="340" y="220" width="102" height="20"/>
-                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
-                                        </subviews>
-                                        <color key="backgroundColor" red="0.13529640436172485" green="1" blue="0.024918794631958008" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                        <userDefinedRuntimeAttributes>
-                                            <userDefinedRuntimeAttribute type="string" keyPath="accessibilityIdentifier" value="Scroll View"/>
-                                        </userDefinedRuntimeAttributes>
-                                    </scrollView>
-                                </subviews>
-                                <color key="backgroundColor" red="1" green="0.99997437000274658" blue="0.99999129772186279" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            </view>
-                            <label opaque="NO" clipsSubviews="YES" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Pan Me" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QqM-lB-aCp">
-                                <rect key="frame" x="-6" y="448" width="418" height="102"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                            <label opaque="NO" clipsSubviews="YES" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Pan Me" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QqM-lB-aCp">
+                                <rect key="frame" x="0.0" y="200" width="414" height="100"/>
                                 <color key="backgroundColor" red="0.98594832420349121" green="0.0" blue="0.026950567960739136" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="100" id="Dlk-bf-Axp"/>
+                                </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="1" green="0.99997437000274658" blue="0.99999129772186279" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
@@ -1289,23 +1262,27 @@
                                 </userDefinedRuntimeAttributes>
                                 <connections>
                                     <outletCollection property="gestureRecognizers" destination="F0s-aj-f1p" appends="YES" id="zOl-rL-278"/>
-                                    <outletCollection property="gestureRecognizers" destination="zOy-ea-cks" appends="YES" id="ZRb-UY-JXb"/>
-                                    <outletCollection property="gestureRecognizers" destination="sR1-l1-zcg" appends="YES" id="dzQ-3N-rJw"/>
                                 </connections>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Rr-zq-WBn">
-                                <rect key="frame" x="43" y="419" width="320" height="24"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Rr-zq-WBn">
+                                <rect key="frame" x="0.0" y="150" width="414" height="50"/>
                                 <accessibility key="accessibilityConfiguration" label="velocityValueLabel"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="50" id="4vh-Rw-In7"/>
+                                    <constraint firstAttribute="height" constant="50" id="Q0P-oD-nuf"/>
+                                </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" systemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" clipsSubviews="YES" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Swipe Me" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u9Q-wh-6hh">
-                                <rect key="frame" x="-6" y="302" width="418" height="97"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                            <label opaque="NO" clipsSubviews="YES" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Swipe Me" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u9Q-wh-6hh">
+                                <rect key="frame" x="0.0" y="50" width="414" height="100"/>
                                 <color key="backgroundColor" red="0.98594832420349121" green="0.0" blue="0.026950567960739136" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <gestureRecognizers/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="100" id="65G-OM-mqM"/>
+                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="100" id="qbA-ea-PlY"/>
+                                </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="1" green="0.99997437000274658" blue="0.99999129772186279" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
@@ -1319,14 +1296,77 @@
                                     <outletCollection property="gestureRecognizers" destination="gMt-Dj-sxh" appends="YES" id="h0b-Ta-LY6"/>
                                 </connections>
                             </label>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FMd-oP-yPf">
-                                <rect key="frame" x="43" y="273" width="320" height="19"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FMd-oP-yPf">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="50"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="50" id="FBD-GL-z1S"/>
+                                    <constraint firstAttribute="height" relation="lessThanOrEqual" constant="50" id="PEX-iv-w7m"/>
+                                    <constraint firstAttribute="height" constant="50" id="sOp-Me-mhk"/>
+                                </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="highlightedColor"/>
                             </label>
+                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7cv-bk-ApT">
+                                <rect key="frame" x="0.0" y="300" width="414" height="421"/>
+                                <subviews>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TUH-eh-cAo">
+                                        <rect key="frame" x="0.0" y="0.0" width="500" height="500"/>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="500" id="PYa-Vw-421"/>
+                                            <constraint firstAttribute="height" constant="500" id="hhm-3M-aEE"/>
+                                        </constraints>
+                                    </view>
+                                    <label opaque="NO" clipsSubviews="YES" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Top Left" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IQH-0R-Yn9">
+                                        <rect key="frame" x="0.0" y="0.0" width="62" height="20"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" clipsSubviews="YES" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Bottom Right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UYz-K1-bMw">
+                                        <rect key="frame" x="400" y="480" width="100" height="20"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" red="0.13529640436172485" green="1" blue="0.024918794631958008" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <constraints>
+                                    <constraint firstItem="IQH-0R-Yn9" firstAttribute="top" secondItem="7cv-bk-ApT" secondAttribute="top" id="4yk-dg-lXV"/>
+                                    <constraint firstAttribute="bottom" secondItem="TUH-eh-cAo" secondAttribute="bottom" id="7Og-MF-t2S"/>
+                                    <constraint firstAttribute="trailing" secondItem="UYz-K1-bMw" secondAttribute="trailing" id="Fu5-HD-tWF"/>
+                                    <constraint firstAttribute="bottom" secondItem="UYz-K1-bMw" secondAttribute="bottom" id="La2-S2-K86"/>
+                                    <constraint firstItem="TUH-eh-cAo" firstAttribute="top" secondItem="7cv-bk-ApT" secondAttribute="top" id="NAA-2D-aOE"/>
+                                    <constraint firstAttribute="trailing" secondItem="TUH-eh-cAo" secondAttribute="trailing" id="RLY-1c-5vO"/>
+                                    <constraint firstItem="IQH-0R-Yn9" firstAttribute="leading" secondItem="7cv-bk-ApT" secondAttribute="leading" id="Vs9-7y-Au6"/>
+                                    <constraint firstItem="TUH-eh-cAo" firstAttribute="leading" secondItem="7cv-bk-ApT" secondAttribute="leading" id="mTB-CM-vMl"/>
+                                </constraints>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="accessibilityIdentifier" value="Scroll View"/>
+                                </userDefinedRuntimeAttributes>
+                            </scrollView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="0.99997437000274658" blue="0.99999129772186279" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="u9Q-wh-6hh" firstAttribute="leading" secondItem="Nr7-Ef-umm" secondAttribute="leading" id="32m-SG-DVE"/>
+                            <constraint firstItem="2Rr-zq-WBn" firstAttribute="top" secondItem="u9Q-wh-6hh" secondAttribute="bottom" id="564-rH-18G"/>
+                            <constraint firstItem="2Rr-zq-WBn" firstAttribute="leading" secondItem="Nr7-Ef-umm" secondAttribute="leading" id="87F-cc-bHc"/>
+                            <constraint firstItem="QqM-lB-aCp" firstAttribute="top" secondItem="2Rr-zq-WBn" secondAttribute="bottom" id="9lZ-WZ-cRL"/>
+                            <constraint firstAttribute="trailing" secondItem="FMd-oP-yPf" secondAttribute="trailing" id="PJb-cN-a4Z"/>
+                            <constraint firstItem="u9Q-wh-6hh" firstAttribute="top" secondItem="FMd-oP-yPf" secondAttribute="bottom" id="VNM-Dp-SIg"/>
+                            <constraint firstItem="FMd-oP-yPf" firstAttribute="leading" secondItem="Nr7-Ef-umm" secondAttribute="leading" id="Vld-58-u44"/>
+                            <constraint firstItem="7cv-bk-ApT" firstAttribute="leading" secondItem="Nr7-Ef-umm" secondAttribute="leading" id="Y3I-2m-sDi"/>
+                            <constraint firstItem="QqM-lB-aCp" firstAttribute="leading" secondItem="Nr7-Ef-umm" secondAttribute="leading" id="ad2-aM-2gf"/>
+                            <constraint firstItem="bTo-tp-Yo7" firstAttribute="top" secondItem="7cv-bk-ApT" secondAttribute="bottom" id="dDh-Lx-dMB"/>
+                            <constraint firstItem="7cv-bk-ApT" firstAttribute="top" secondItem="QqM-lB-aCp" secondAttribute="bottom" id="h8A-dX-MMO"/>
+                            <constraint firstAttribute="trailing" secondItem="7cv-bk-ApT" secondAttribute="trailing" id="k36-lJ-w7O"/>
+                            <constraint firstItem="FMd-oP-yPf" firstAttribute="top" secondItem="kPY-Hb-e2k" secondAttribute="bottom" id="kAZ-mD-Z87"/>
+                            <constraint firstAttribute="trailing" secondItem="2Rr-zq-WBn" secondAttribute="trailing" id="mj3-E2-0j3"/>
+                            <constraint firstAttribute="trailing" secondItem="QqM-lB-aCp" secondAttribute="trailing" id="nOd-it-lgg"/>
+                            <constraint firstAttribute="trailing" secondItem="u9Q-wh-6hh" secondAttribute="trailing" id="o5G-gv-H16"/>
+                        </constraints>
+                        <connections>
+                            <outletCollection property="gestureRecognizers" destination="zOy-ea-cks" appends="YES" id="tAi-Kw-hDI"/>
+                            <outletCollection property="gestureRecognizers" destination="sR1-l1-zcg" appends="YES" id="Rd1-Dk-7Yj"/>
+                        </connections>
                     </view>
                     <navigationItem key="navigationItem" title="Gestures" id="T1e-zN-rut"/>
                     <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>

From f582ccd490964f110fd62c26791e6053ac89a66e Mon Sep 17 00:00:00 2001
From: foo <zcrzcr@qq.com>
Date: Fri, 30 Jun 2023 22:18:12 +0800
Subject: [PATCH 07/15] Add tests for verifying that dragFromPoint doesn't
 trigger

---
 KIF Tests/GestureTests.m | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/KIF Tests/GestureTests.m b/KIF Tests/GestureTests.m
index 6b280f2c..fcf94f83 100644
--- a/KIF Tests/GestureTests.m	
+++ b/KIF Tests/GestureTests.m	
@@ -193,15 +193,31 @@ - (void)testSwipingDownWithIdentifier
     [tester waitForViewWithAccessibilityLabel:@"Down"];
 }
 
-- (void)testSwipeFromScreenEdgeLeft
-{
-    [tester swipeFromEdge:UIRectEdgeLeft atY:300];
+- (void)testSwipingFromScreenEdgeLeft
+{
+    UIView *view = [tester waitForViewWithAccessibilityIdentifier:@"gestures.swipeMe"];
+    CGSize windowSize = view.window.bounds.size;
+    CGPoint point = CGPointMake(0.5, 200);
+    point = [view convertPoint:point fromView:view.window];
+    KIFDisplacement displacement = CGPointMake(windowSize.width * 0.5, 5);
+    [view dragFromPoint:point displacement:displacement steps:20];
+    [tester waitForAbsenceOfViewWithAccessibilityLabel:@"LeftEdge"];
+    
+    [tester swipeFromEdge:UIRectEdgeLeft atY:200];
     [tester waitForViewWithAccessibilityLabel:@"LeftEdge"];
 }
 
-- (void)testSwipeFromScreenEdgeRight
+- (void)testSwipingFromScreenEdgeRight
 {
-    [tester swipeFromEdge:UIRectEdgeRight atY:300];
+    UIView *view = [tester waitForViewWithAccessibilityIdentifier:@"gestures.swipeMe"];
+    CGSize windowSize = view.window.bounds.size;
+    CGPoint point = CGPointMake(windowSize.width - 0.5, 200);
+    point = [view convertPoint:point fromView:view.window];
+    KIFDisplacement displacement = CGPointMake(-windowSize.width * 0.5, 5);
+    [view dragFromPoint:point displacement:displacement steps:20];
+    [tester waitForAbsenceOfViewWithAccessibilityLabel:@"RightEdge"];
+    
+    [tester swipeFromEdge:UIRectEdgeRight atY:200];
     [tester waitForViewWithAccessibilityLabel:@"RightEdge"];
 }
 

From 26b1a96facd5f968ede368f36b22258231bbfcf0 Mon Sep 17 00:00:00 2001
From: foo <zcrzcr@qq.com>
Date: Sat, 1 Jul 2023 01:49:51 +0800
Subject: [PATCH 08/15] Add dragFromEdge

---
 Sources/KIF/Additions/UIView-KIFAdditions.h |  2 +-
 Sources/KIF/Additions/UIView-KIFAdditions.m | 26 +++++++++++++++++----
 Sources/KIF/Classes/KIFUITestActor.m        |  9 ++-----
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/Sources/KIF/Additions/UIView-KIFAdditions.h b/Sources/KIF/Additions/UIView-KIFAdditions.h
index 6cbb8d9f..31995d81 100644
--- a/Sources/KIF/Additions/UIView-KIFAdditions.h
+++ b/Sources/KIF/Additions/UIView-KIFAdditions.h
@@ -53,7 +53,7 @@ typedef CGPoint KIFDisplacement;
 - (void)dragFromPoint:(CGPoint)startPoint toPoint:(CGPoint)endPoint;
 - (void)dragFromPoint:(CGPoint)startPoint toPoint:(CGPoint)endPoint steps:(NSUInteger)stepCount;
 - (void)dragFromPoint:(CGPoint)startPoint displacement:(KIFDisplacement)displacement steps:(NSUInteger)stepCount;
-- (void)dragFromPoint:(CGPoint)startPoint displacement:(KIFDisplacement)displacement steps:(NSUInteger)stepCount isFromEdge:(BOOL)isFromEdge;
+- (void)dragFromEdge:(UIRectEdge)startEdge toEdge:(UIRectEdge)endEdge;
 - (void)dragAlongPathWithPoints:(CGPoint *)points count:(NSInteger)count;
 - (void)twoFingerPanFromPoint:(CGPoint)startPoint toPoint:(CGPoint)toPoint steps:(NSUInteger)stepCount;
 - (void)pinchAtPoint:(CGPoint)centerPoint distance:(CGFloat)distance steps:(NSUInteger)stepCount;
diff --git a/Sources/KIF/Additions/UIView-KIFAdditions.m b/Sources/KIF/Additions/UIView-KIFAdditions.m
index 0f84798b..059ef6d3 100644
--- a/Sources/KIF/Additions/UIView-KIFAdditions.m
+++ b/Sources/KIF/Additions/UIView-KIFAdditions.m
@@ -631,14 +631,30 @@ - (void)dragFromPoint:(CGPoint)startPoint toPoint:(CGPoint)endPoint steps:(NSUIn
 
 - (void)dragFromPoint:(CGPoint)startPoint displacement:(KIFDisplacement)displacement steps:(NSUInteger)stepCount;
 {
-    [self dragFromPoint:startPoint displacement:displacement steps:stepCount isFromEdge:NO];
+    CGPoint endPoint = CGPointMake(startPoint.x + displacement.x, startPoint.y + displacement.y);
+    NSArray<NSValue *> *path = [self pointsFromStartPoint:startPoint toPoint:endPoint steps:stepCount];
+    [self dragPointsAlongPaths:@[path]];
 }
 
-- (void)dragFromPoint:(CGPoint)startPoint displacement:(KIFDisplacement)displacement steps:(NSUInteger)stepCount isFromEdge:(BOOL)isFromEdge;
+- (void)dragFromEdge:(UIRectEdge)startEdge toEdge:(UIRectEdge)endEdge
 {
-    CGPoint endPoint = CGPointMake(startPoint.x + displacement.x, startPoint.y + displacement.y);
-    NSArray<NSValue *> *path = [self pointsFromStartPoint:startPoint toPoint:endPoint steps:stepCount];
-    [self dragPointsAlongPaths:@[path] isFromEdge:isFromEdge];
+    CGFloat width = self.bounds.size.width;
+    CGFloat height = self.bounds.size.height;
+    CGFloat edgeInset = 0.5;
+    NSDictionary *edgeToPoint = @{
+        @(UIRectEdgeTop): @(CGPointMake(width / 2, 0)),
+        @(UIRectEdgeLeft): @(CGPointMake(edgeInset, height / 2)),
+        @(UIRectEdgeBottom): @(CGPointMake(width / 2, height)),
+        @(UIRectEdgeRight): @(CGPointMake(width - edgeInset, height / 2)),
+    };
+    CGPoint startPoint = [edgeToPoint[@(startEdge)] CGPointValue];
+    CGPoint endPoint = [edgeToPoint[@(endEdge)] CGPointValue];
+    
+    CGPoint screenPoint = [self convertPoint:startPoint toView:self.window];
+    BOOL isFromScreenEdge = (screenPoint.x < 1 || screenPoint.x > self.window.bounds.size.width - 1);
+    
+    NSArray<NSValue *> *path = [self pointsFromStartPoint:startPoint toPoint:endPoint steps:20];
+    [self dragPointsAlongPaths:@[path] isFromEdge:isFromScreenEdge];
 }
 
 - (void)dragAlongPathWithPoints:(CGPoint *)points count:(NSInteger)count;
diff --git a/Sources/KIF/Classes/KIFUITestActor.m b/Sources/KIF/Classes/KIFUITestActor.m
index bf72bab3..d537d3b7 100644
--- a/Sources/KIF/Classes/KIFUITestActor.m
+++ b/Sources/KIF/Classes/KIFUITestActor.m
@@ -381,13 +381,10 @@ - (void)tapScreenAtPoint:(CGPoint)screenPoint
 - (void)swipeFromEdge:(UIRectEdge)edge atY:(CGFloat)y
 {
     CGPoint screenPoint;
-    KIFSwipeDirection direction;
     if (edge == UIRectEdgeLeft) {
         screenPoint = CGPointMake(0.3, y);
-        direction = KIFSwipeDirectionRight;
     } else if (edge == UIRectEdgeRight) {
         screenPoint = CGPointMake(UIScreen.mainScreen.bounds.size.width - 0.3, y);
-        direction = KIFSwipeDirectionLeft;
     } else {
         return;
     }
@@ -396,10 +393,8 @@ - (void)swipeFromEdge:(UIRectEdge)edge atY:(CGFloat)y
         
         KIFTestWaitCondition(view, error, @"No view was found at the point %@", NSStringFromCGPoint(screenPoint));
         
-        // This is mostly redundant of the test in _accessibilityElementWithLabel:
-        CGPoint viewPoint = [view convertPoint:screenPoint fromView:nil];
-        KIFDisplacement swipeDisplacement = [self _displacementForSwipingInDirection:direction];
-        [view dragFromPoint:viewPoint displacement:swipeDisplacement steps:20 isFromEdge:YES];
+        UIRectEdge endEdge = (UIRectEdgeLeft | UIRectEdgeRight) - edge;
+        [view dragFromEdge:edge toEdge:endEdge];
         
         return KIFTestStepResultSuccess;
     }];

From d07657e3ee1a6918797283e5407a541e2d23fb1f Mon Sep 17 00:00:00 2001
From: foo <zcrzcr@qq.com>
Date: Tue, 11 Jul 2023 21:19:52 +0800
Subject: [PATCH 09/15] Address review comments

1. Omit the atY: parameter of swipeFromEdge
2. Add an equivalent API to KIFUIViewTestActor and add tests
3. dragFromEdge now uses edgeInset for the top and height - edgeInset for the bottom
---
 KIF Tests/GestureTests.m                       |  4 ++--
 KIF Tests/GestureTests_ViewTestActor.m         | 12 ++++++++++++
 Sources/KIF/Additions/UIView-KIFAdditions.m    |  4 ++--
 Sources/KIF/Classes/KIFUITestActor.h           |  3 +--
 Sources/KIF/Classes/KIFUITestActor.m           |  7 ++++---
 Sources/KIF/Classes/KIFUIViewTestActor.h       |  6 ++++++
 Sources/KIF/Classes/KIFUIViewTestActor.m       |  5 +++++
 Test Host/Base.lproj/MainStoryboard.storyboard |  2 ++
 Test Host/GestureViewController.m              | 12 +++++++++++-
 9 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/KIF Tests/GestureTests.m b/KIF Tests/GestureTests.m
index fcf94f83..1c7abf8e 100644
--- a/KIF Tests/GestureTests.m	
+++ b/KIF Tests/GestureTests.m	
@@ -203,7 +203,7 @@ - (void)testSwipingFromScreenEdgeLeft
     [view dragFromPoint:point displacement:displacement steps:20];
     [tester waitForAbsenceOfViewWithAccessibilityLabel:@"LeftEdge"];
     
-    [tester swipeFromEdge:UIRectEdgeLeft atY:200];
+    [tester swipeFromEdge:UIRectEdgeLeft];
     [tester waitForViewWithAccessibilityLabel:@"LeftEdge"];
 }
 
@@ -217,7 +217,7 @@ - (void)testSwipingFromScreenEdgeRight
     [view dragFromPoint:point displacement:displacement steps:20];
     [tester waitForAbsenceOfViewWithAccessibilityLabel:@"RightEdge"];
     
-    [tester swipeFromEdge:UIRectEdgeRight atY:200];
+    [tester swipeFromEdge:UIRectEdgeRight];
     [tester waitForViewWithAccessibilityLabel:@"RightEdge"];
 }
 
diff --git a/KIF Tests/GestureTests_ViewTestActor.m b/KIF Tests/GestureTests_ViewTestActor.m
index d34fe93e..43e303b0 100644
--- a/KIF Tests/GestureTests_ViewTestActor.m	
+++ b/KIF Tests/GestureTests_ViewTestActor.m	
@@ -108,4 +108,16 @@ - (void)testMissingScrollableElement
     KIFExpectFailure([[[viewTester usingTimeout:0.25] usingIdentifier:@"Unknown"] scrollByFractionOfSizeHorizontal:0.5 vertical:0.5]);
 }
 
+- (void)testSwipingFromScreenEdgeLeft
+{
+    [viewTester swipeFromEdge:UIRectEdgeLeft];
+    [[viewTester usingLabel:@"LeftEdge"] waitForView];
+}
+
+- (void)testSwipingFromScreenEdgeRight
+{
+    [viewTester swipeFromEdge:UIRectEdgeRight];
+    [[viewTester usingLabel:@"RightEdge"] waitForView];
+}
+
 @end
diff --git a/Sources/KIF/Additions/UIView-KIFAdditions.m b/Sources/KIF/Additions/UIView-KIFAdditions.m
index 059ef6d3..93bec407 100644
--- a/Sources/KIF/Additions/UIView-KIFAdditions.m
+++ b/Sources/KIF/Additions/UIView-KIFAdditions.m
@@ -642,9 +642,9 @@ - (void)dragFromEdge:(UIRectEdge)startEdge toEdge:(UIRectEdge)endEdge
     CGFloat height = self.bounds.size.height;
     CGFloat edgeInset = 0.5;
     NSDictionary *edgeToPoint = @{
-        @(UIRectEdgeTop): @(CGPointMake(width / 2, 0)),
+        @(UIRectEdgeTop): @(CGPointMake(width / 2, edgeInset)),
         @(UIRectEdgeLeft): @(CGPointMake(edgeInset, height / 2)),
-        @(UIRectEdgeBottom): @(CGPointMake(width / 2, height)),
+        @(UIRectEdgeBottom): @(CGPointMake(width / 2, height - edgeInset)),
         @(UIRectEdgeRight): @(CGPointMake(width - edgeInset, height / 2)),
     };
     CGPoint startPoint = [edgeToPoint[@(startEdge)] CGPointValue];
diff --git a/Sources/KIF/Classes/KIFUITestActor.h b/Sources/KIF/Classes/KIFUITestActor.h
index 36d92c3e..17dd4a39 100644
--- a/Sources/KIF/Classes/KIFUITestActor.h
+++ b/Sources/KIF/Classes/KIFUITestActor.h
@@ -325,9 +325,8 @@ typedef NS_ENUM(NSUInteger, KIFPullToRefreshTiming) {
 /*!
  @abstract Performs a swipe gesture starting from the specified edge of the screen.
  @param edge The edge from which the swipe gesture should start.
- @param y The y-coordinate of the starting point for the swipe gesture.
  */
-- (void)swipeFromEdge:(UIRectEdge)edge atY:(CGFloat)y;
+- (void)swipeFromEdge:(UIRectEdge)edge;
 
 /*!
  @abstract Performs a long press on a particular view in the view hierarchy.
diff --git a/Sources/KIF/Classes/KIFUITestActor.m b/Sources/KIF/Classes/KIFUITestActor.m
index d537d3b7..8b753ae2 100644
--- a/Sources/KIF/Classes/KIFUITestActor.m
+++ b/Sources/KIF/Classes/KIFUITestActor.m
@@ -378,13 +378,14 @@ - (void)tapScreenAtPoint:(CGPoint)screenPoint
     }];
 }
 
-- (void)swipeFromEdge:(UIRectEdge)edge atY:(CGFloat)y
+- (void)swipeFromEdge:(UIRectEdge)edge
 {
+    CGSize screenSize = UIScreen.mainScreen.bounds.size;
     CGPoint screenPoint;
     if (edge == UIRectEdgeLeft) {
-        screenPoint = CGPointMake(0.3, y);
+        screenPoint = CGPointMake(0.3, screenSize.height / 2);
     } else if (edge == UIRectEdgeRight) {
-        screenPoint = CGPointMake(UIScreen.mainScreen.bounds.size.width - 0.3, y);
+        screenPoint = CGPointMake(screenSize.width - 0.3, screenSize.height / 2);
     } else {
         return;
     }
diff --git a/Sources/KIF/Classes/KIFUIViewTestActor.h b/Sources/KIF/Classes/KIFUIViewTestActor.h
index 1df5d02f..4858ce4e 100644
--- a/Sources/KIF/Classes/KIFUIViewTestActor.h
+++ b/Sources/KIF/Classes/KIFUIViewTestActor.h
@@ -165,6 +165,12 @@ extern NSString *const inputFieldTestString;
  */
 - (void)swipeInDirection:(KIFSwipeDirection)direction;
 
+/*!
+ @abstract Performs a swipe gesture starting from the specified edge of the screen.
+ @param edge The edge from which the swipe gesture should start.
+ */
+- (void)swipeFromEdge:(UIRectEdge)edge;
+
 #pragma mark Waiting & Finding
 
 /*!
diff --git a/Sources/KIF/Classes/KIFUIViewTestActor.m b/Sources/KIF/Classes/KIFUIViewTestActor.m
index 5039f75a..e27ed576 100644
--- a/Sources/KIF/Classes/KIFUIViewTestActor.m
+++ b/Sources/KIF/Classes/KIFUIViewTestActor.m
@@ -380,6 +380,11 @@ - (void)swipeInDirection:(KIFSwipeDirection)direction;
     }
 }
 
+- (void)swipeFromEdge:(UIRectEdge)edge
+{
+    [self.actor swipeFromEdge:edge];
+}
+
 #pragma mark - Scroll/Table/CollectionView Actions
 
 - (void)scrollByFractionOfSizeHorizontal:(CGFloat)horizontalFraction vertical:(CGFloat)verticalFraction;
diff --git a/Test Host/Base.lproj/MainStoryboard.storyboard b/Test Host/Base.lproj/MainStoryboard.storyboard
index 7c313166..a0647980 100644
--- a/Test Host/Base.lproj/MainStoryboard.storyboard	
+++ b/Test Host/Base.lproj/MainStoryboard.storyboard	
@@ -1408,12 +1408,14 @@
                     <rectEdge key="edges" left="YES"/>
                     <connections>
                         <action selector="handleScreenEdgePanGestureRecognizer:" destination="ubg-mt-ea6" id="Bqj-n2-Xkz"/>
+                        <outlet property="delegate" destination="ubg-mt-ea6" id="xbb-vN-gi0"/>
                     </connections>
                 </screenEdgePanGestureRecognizer>
                 <screenEdgePanGestureRecognizer minimumNumberOfTouches="1" id="sR1-l1-zcg">
                     <rectEdge key="edges" right="YES"/>
                     <connections>
                         <action selector="handleScreenEdgePanGestureRecognizer:" destination="ubg-mt-ea6" id="Nrb-nt-flP"/>
+                        <outlet property="delegate" destination="ubg-mt-ea6" id="Wo0-Lv-bYx"/>
                     </connections>
                 </screenEdgePanGestureRecognizer>
             </objects>
diff --git a/Test Host/GestureViewController.m b/Test Host/GestureViewController.m
index 7e556b06..77fd0eda 100644
--- a/Test Host/GestureViewController.m	
+++ b/Test Host/GestureViewController.m	
@@ -8,7 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface GestureViewController : UIViewController
+@interface GestureViewController : UIViewController <UIGestureRecognizerDelegate>
 @property (weak, nonatomic) IBOutlet UILabel *lastSwipeDescriptionLabel;
 @property (weak, nonatomic) IBOutlet UILabel *lastVelocityVeluesLabel;
 @property (weak, nonatomic) IBOutlet UILabel *bottomRightLabel;
@@ -75,4 +75,14 @@ - (NSString*)formattedVelocityValues:(CGPoint)velocity
     return [NSString stringWithFormat:@"X:%.2f Y:%.2f", velocity.x, velocity.y];
 }
 
+#pragma mark - UIGestureRecognizerDelegate
+
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldBeRequiredToFailByGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
+{
+    if ([gestureRecognizer isKindOfClass:UIScreenEdgePanGestureRecognizer.class]) {
+        return YES;
+    }
+    return NO;
+}
+
 @end

From 325a24db0aa587d280e3965f51679850bb3c41e9 Mon Sep 17 00:00:00 2001
From: Justin Martin <jmartin@squareup.com>
Date: Wed, 12 Jul 2023 23:31:55 -0700
Subject: [PATCH 10/15] PullToRefreshTests can exit before the greetingView is
 finished animating out.

---
 KIF Tests/AccessibilityIdentifierPullToRefreshTests.m | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/KIF Tests/AccessibilityIdentifierPullToRefreshTests.m b/KIF Tests/AccessibilityIdentifierPullToRefreshTests.m
index 123088e4..fac2ab30 100644
--- a/KIF Tests/AccessibilityIdentifierPullToRefreshTests.m	
+++ b/KIF Tests/AccessibilityIdentifierPullToRefreshTests.m	
@@ -37,4 +37,9 @@ -(void) testPullToRefreshByAccessibilityIdentifierWithDuration
 	[tester waitForAbsenceOfViewWithAccessibilityLabel:@"Bingo!"];
 }
 
+- (void)afterEach
+{
+    [tester waitForAnimationsToFinish];
+}
+
 @end

From a9821a42be89c40021980e280668e01caa1b4164 Mon Sep 17 00:00:00 2001
From: foo <zcrzcr@qq.com>
Date: Wed, 12 Jul 2023 18:36:34 +0800
Subject: [PATCH 11/15] Fix occasional CI failures on the iPhone simulator

---
 KIF Tests/AccessibilityIdentifierTests.m               | 1 +
 KIF Tests/AccessibilityIdentifierTests_ViewTestActor.m | 1 +
 KIF Tests/LongPressTests.m                             | 1 +
 KIF Tests/LongPressTests_ViewTestActor.m               | 1 +
 KIF Tests/TypingTests.m                                | 1 +
 KIF Tests/TypingTests_ViewTestActor.m                  | 1 +
 6 files changed, 6 insertions(+)

diff --git a/KIF Tests/AccessibilityIdentifierTests.m b/KIF Tests/AccessibilityIdentifierTests.m
index e46ee82a..92f23248 100644
--- a/KIF Tests/AccessibilityIdentifierTests.m	
+++ b/KIF Tests/AccessibilityIdentifierTests.m	
@@ -17,6 +17,7 @@ @implementation AccessibilityIdentifierTests
 
 - (void)beforeEach
 {
+    UIPasteboard.generalPasteboard.string = nil;
     [tester tapViewWithAccessibilityLabel:@"Tapping"];
 }
 
diff --git a/KIF Tests/AccessibilityIdentifierTests_ViewTestActor.m b/KIF Tests/AccessibilityIdentifierTests_ViewTestActor.m
index 20501d16..dc83f230 100644
--- a/KIF Tests/AccessibilityIdentifierTests_ViewTestActor.m	
+++ b/KIF Tests/AccessibilityIdentifierTests_ViewTestActor.m	
@@ -17,6 +17,7 @@ @implementation AccessibilityIdentifierTests_ViewTestActor
 
 - (void)beforeEach
 {
+    UIPasteboard.generalPasteboard.string = nil;
     [[viewTester usingLabel:@"Tapping"] tap];
 }
 
diff --git a/KIF Tests/LongPressTests.m b/KIF Tests/LongPressTests.m
index 95e8875a..d8e3f8d6 100644
--- a/KIF Tests/LongPressTests.m	
+++ b/KIF Tests/LongPressTests.m	
@@ -15,6 +15,7 @@ @implementation LongPressTests
 
 - (void)beforeEach
 {
+    UIPasteboard.generalPasteboard.string = nil;
     [tester tapViewWithAccessibilityLabel:@"Tapping"];
 }
 
diff --git a/KIF Tests/LongPressTests_ViewTestActor.m b/KIF Tests/LongPressTests_ViewTestActor.m
index 393f58ea..d472cd38 100644
--- a/KIF Tests/LongPressTests_ViewTestActor.m	
+++ b/KIF Tests/LongPressTests_ViewTestActor.m	
@@ -16,6 +16,7 @@ @implementation LongPressTests_ViewTestActor
 
 - (void)beforeEach
 {
+    UIPasteboard.generalPasteboard.string = nil;
     [[viewTester usingLabel:@"Tapping"] tap];
 }
 
diff --git a/KIF Tests/TypingTests.m b/KIF Tests/TypingTests.m
index f50a2cd2..2b9f4b25 100644
--- a/KIF Tests/TypingTests.m	
+++ b/KIF Tests/TypingTests.m	
@@ -16,6 +16,7 @@ @implementation TypingTests
 
 - (void)beforeEach
 {
+    UIPasteboard.generalPasteboard.string = nil;
     [tester tapViewWithAccessibilityLabel:@"Tapping"];
 }
 
diff --git a/KIF Tests/TypingTests_ViewTestActor.m b/KIF Tests/TypingTests_ViewTestActor.m
index 384c805b..a907ecda 100644
--- a/KIF Tests/TypingTests_ViewTestActor.m	
+++ b/KIF Tests/TypingTests_ViewTestActor.m	
@@ -17,6 +17,7 @@ @implementation TypingTests_ViewTestActor
 
 - (void)beforeEach
 {
+    UIPasteboard.generalPasteboard.string = nil;
     [[viewTester usingLabel:@"Tapping"] tap];
 }
 

From 62fcb3847bf74bb3d6898dc3bfbe06adbf13ebb0 Mon Sep 17 00:00:00 2001
From: banjun <banjun@gmail.com>
Date: Wed, 20 Sep 2023 21:36:26 +0900
Subject: [PATCH 12/15] fix iOS 17 black screenshot due to calling keyboard
 window drawViewHierarchyInRect

---
 Sources/KIF/Additions/UIApplication-KIFAdditions.m | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Sources/KIF/Additions/UIApplication-KIFAdditions.m b/Sources/KIF/Additions/UIApplication-KIFAdditions.m
index cbc3e5fe..bf7ee7f7 100644
--- a/Sources/KIF/Additions/UIApplication-KIFAdditions.m
+++ b/Sources/KIF/Additions/UIApplication-KIFAdditions.m
@@ -178,7 +178,9 @@ - (BOOL)writeScreenshotForLine:(NSUInteger)lineNumber inFile:(NSString *)filenam
         }
         return NO;
     }
-    
+
+    UIWindow *keyboardWindow = [self keyboardWindow];
+
     UIGraphicsBeginImageContextWithOptions([[windows objectAtIndex:0] bounds].size, YES, 0);
     for (UIWindow *window in windows) {
 		//avoid https://github.com/kif-framework/KIF/issues/679
@@ -186,6 +188,10 @@ - (BOOL)writeScreenshotForLine:(NSUInteger)lineNumber inFile:(NSString *)filenam
 			continue;
 		}
 
+        if (window == keyboardWindow) {
+            continue;
+        }
+
         if ([window respondsToSelector:@selector(drawViewHierarchyInRect:afterScreenUpdates:)]) {
             [window drawViewHierarchyInRect:window.bounds afterScreenUpdates:YES];
         } else {

From da732b55767d1e0cee8bf5f87d3a991b03101d0d Mon Sep 17 00:00:00 2001
From: banjun <banjun@gmail.com>
Date: Wed, 4 Oct 2023 20:58:05 +0900
Subject: [PATCH 13/15] suppress rendering keyboard on screenshot only if
 runtime is iOS 17+

---
 Sources/KIF/Additions/UIApplication-KIFAdditions.m | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Sources/KIF/Additions/UIApplication-KIFAdditions.m b/Sources/KIF/Additions/UIApplication-KIFAdditions.m
index bf7ee7f7..a1bdfc56 100644
--- a/Sources/KIF/Additions/UIApplication-KIFAdditions.m
+++ b/Sources/KIF/Additions/UIApplication-KIFAdditions.m
@@ -188,8 +188,10 @@ - (BOOL)writeScreenshotForLine:(NSUInteger)lineNumber inFile:(NSString *)filenam
 			continue;
 		}
 
-        if (window == keyboardWindow) {
-            continue;
+        if (@available(iOS 17.0, *)) {
+            if (window == keyboardWindow) {
+                continue;
+            }
         }
 
         if ([window respondsToSelector:@selector(drawViewHierarchyInRect:afterScreenUpdates:)]) {

From ad6972aeb1f6ac6737b6b631fc92098639a6ac66 Mon Sep 17 00:00:00 2001
From: Justin Martin <jmartin@squareup.com>
Date: Thu, 9 May 2024 23:16:45 -0700
Subject: [PATCH 14/15] Bump the podspec to 3.8.10

---
 KIF.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KIF.podspec b/KIF.podspec
index 1c7ddedb..c99b9798 100644
--- a/KIF.podspec
+++ b/KIF.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                    = "KIF"
-  s.version                 = "3.8.9"
+  s.version                 = "3.8.10"
   s.summary                 = "Keep It Functional - iOS UI acceptance testing in an XCUnit harness."
   s.homepage                = "https://github.com/kif-framework/KIF/"
   s.license                 = 'Apache 2.0'

From 0176e754e95202e5caaf3ea0c059412ef18f2c47 Mon Sep 17 00:00:00 2001
From: Justin Martin <jmartin@squareup.com>
Date: Mon, 13 May 2024 09:38:30 -0700
Subject: [PATCH 15/15] Use 3.9.0 instead of 3.8.10

---
 KIF.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KIF.podspec b/KIF.podspec
index c99b9798..6e589a3d 100644
--- a/KIF.podspec
+++ b/KIF.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                    = "KIF"
-  s.version                 = "3.8.10"
+  s.version                 = "3.9.0"
   s.summary                 = "Keep It Functional - iOS UI acceptance testing in an XCUnit harness."
   s.homepage                = "https://github.com/kif-framework/KIF/"
   s.license                 = 'Apache 2.0'