Move default tap coords for enterText other place

leancodepl · Oct 1, 2024 · 24e26f7 · 24e26f7
1 parent d2a3319
commit 24e26f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/packages/patrol/darwin/Classes/AutomatorServer/Automator/IOSAutomator.swift b/packages/patrol/darwin/Classes/AutomatorServer/Automator/IOSAutomator.swift
@@ -924,15 +924,16 @@
     }
 
     // MARK: Private stuff
-    private func clearAndEnterText(data: String, element: XCUIElement, dx: CGFloat, dy: CGFloat) {
+    private func clearAndEnterText(data: String, element: XCUIElement, dx: CGFloat?, dy: CGFloat?) {
       let currentValue = element.value as? String
       var delete: String = ""
       if let value = currentValue {
         delete = String(repeating: XCUIKeyboardKey.delete.rawValue, count: value.count)
       }
 
-      // We need to tap at the end of the field to ensure the cursor is at the end
-      let coordinate = element.coordinate(withNormalizedOffset: CGVector(dx: dx, dy: dy))
+      // By default we tap at the end of the field to ensure the cursor is at the end
+      let coordinate = element.coordinate(
+        withNormalizedOffset: CGVector(dx: dx ?? 0.9, dy: dy ?? 0.9))
       coordinate.tap()
 
       element.typeText(delete + data)

diff --git a/packages/patrol/darwin/Classes/AutomatorServer/AutomatorServer.swift b/packages/patrol/darwin/Classes/AutomatorServer/AutomatorServer.swift
@@ -155,8 +155,8 @@
             inApp: request.appId,
             dismissKeyboard: request.keyboardBehavior == .showAndDismiss,
             withTimeout: request.timeoutMillis.map { TimeInterval($0 / 1000) },
-            dx: request.dx ?? 0.9,
-            dy: request.dy ?? 0.9
+            dx: request.dx,
+            dy: request.dy
           )
         } else if let selector = request.selector {
           try automator.enterText(
@@ -165,8 +165,8 @@
             inApp: request.appId,
             dismissKeyboard: request.keyboardBehavior == .showAndDismiss,
             withTimeout: request.timeoutMillis.map { TimeInterval($0 / 1000) },
-            dx: request.dx ?? 0.9,
-            dy: request.dy ?? 0.9
+            dx: request.dx,
+            dy: request.dy
           )
         } else if let iosSelector = request.iosSelector {
           try automator.enterText(