@craft-native/ios 0.0.250 → 0.0.254

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craft-native/ios",
-  "version": "0.0.250",
+  "version": "0.0.254",
   "homepage": "https://github.com/craft-native/craft/tree/main/packages/ios#readme",
   "repository": {
     "type": "git",

package/templates/CraftHybrid.swift

@@ -2080,7 +2080,14 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
     /// The edge swipe goes ahead of the web view's own gestures, which
     /// otherwise hold every touch over the page until the page has answered it.
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
-        gestureRecognizer === visibleStack?.interactivePopGestureRecognizer
+        if gestureRecognizer === visibleStack?.interactivePopGestureRecognizer { return true }
+        guard tabSwipeRecognizers.contains(where: { $0 === gestureRecognizer }),
+              let scroll = otherGestureRecognizer.view as? UIScrollView,
+              otherGestureRecognizer === scroll.panGestureRecognizer,
+              scroll.isScrollEnabled else { return false }
+        // A vertical list must not suppress the shell's horizontal tab pan.
+        // Horizontal content keeps ownership of its own drag instead.
+        return !scroll.alwaysBounceHorizontal && scroll.contentSize.width <= scroll.bounds.width + 1
     }
 
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldBeRequiredToFailBy otherGestureRecognizer: UIGestureRecognizer) -> Bool {

package/templates/CraftNativeFlatList.swift

@@ -371,24 +371,9 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
     @objc private func keyboardTap() {
         guard keyboardShouldPersistTaps != "always" else { return }
         let point = keyboardTapGesture.location(in: self)
-        var hit = hitTest(point, with: nil)
-        var onControl = false
-        var onButton = false
-        while let view = hit, view !== self {
-            if view is UIButton { onButton = true }
-            if view is UIControl || !(view.gestureRecognizers ?? []).isEmpty { onControl = true; break }
-            hit = view.superview
+        craftHandleKeyboardTap(in: self, hit: hitTest(point, with: nil), persistTaps: keyboardShouldPersistTaps) {
+            self.craftScreenController?.forgetFocusedInput()
         }
-        if keyboardShouldPersistTaps == "handled", onControl { return }
-        // A button keeps the keyboard: its press gives the focus straight
-        // back. Ending editing first only let the keyboard's inset go while
-        // the finger was down, the button moved out from under it, and the
-        // press was lost.
-        if onButton { return }
-        // Otherwise the keyboard goes; after a tap on nothing, for good (the
-        // next render must not bring the last input back).
-        if !onControl { craftScreenController?.forgetFocusedInput() }
-        window?.endEditing(true)
     }
 
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {

package/templates/CraftNativeScreen.swift

@@ -3954,6 +3954,23 @@ func craftScrollGesture(_ gesture: UIGestureRecognizer, runsWith other: UIGestur
     return false
 }
 
+/// Scroll containers observe taps without cancelling native input focus or
+/// selection. Text views are not UIControls, and their selection subviews may
+/// have recognizers of their own, so inspect the whole ancestor chain.
+func craftHandleKeyboardTap(in container: UIView, hit: UIView?, persistTaps: String, forgetFocus: () -> Void) {
+    guard persistTaps != "always" else { return }
+    var candidate = hit
+    var onControl = false
+    while let view = candidate, view !== container {
+        if view is UITextField || view is UITextView || view is UIButton { return }
+        if view is UIControl || !(view.gestureRecognizers ?? []).isEmpty { onControl = true }
+        candidate = view.superview
+    }
+    if persistTaps == "handled", onControl { return }
+    if !onControl { forgetFocus() }
+    container.window?.endEditing(true)
+}
+
 private final class CraftNativeScrollView: UIScrollView, UIGestureRecognizerDelegate {
     let contentStack = CraftNativeFlowView()
     private let keyboardTapGesture = UITapGestureRecognizer()
@@ -4226,24 +4243,9 @@ private final class CraftNativeScrollView: UIScrollView, UIGestureRecognizerDele
     @objc private func keyboardTap() {
         guard keyboardShouldPersistTaps != "always" else { return }
         let point = keyboardTapGesture.location(in: self)
-        var hit = hitTest(point, with: nil)
-        var onControl = false
-        var onButton = false
-        while let view = hit, view !== self {
-            if view is UIButton { onButton = true }
-            if view is UIControl || !(view.gestureRecognizers ?? []).isEmpty { onControl = true; break }
-            hit = view.superview
-        }
-        if keyboardShouldPersistTaps == "handled", onControl { return }
-        // A button keeps the keyboard: its press gives the focus straight
-        // back. Ending editing first only let the keyboard's inset go while
-        // the finger was down, the button moved out from under it, and the
-        // press was lost.
-        if onButton { return }
-        // Otherwise the keyboard goes; after a tap on nothing, for good (the
-        // next render must not bring the last input back).
-        if !onControl { craftScreenController?.forgetFocusedInput() }
-        window?.endEditing(true)
+        craftHandleKeyboardTap(in: self, hit: hitTest(point, with: nil), persistTaps: keyboardShouldPersistTaps) {
+            self.craftScreenController?.forgetFocusedInput()
+        }
     }
 
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {

package/templates/testing/DriverTests.swift.template

@@ -68,6 +68,26 @@ final class DriverTests: XCTestCase {
         return result
     }
 
+    /// The journey, from the runner's control server, asked for again
+    /// until a minute has passed.
+    ///
+    /// The server is up before the test starts, but a freshly created
+    /// simulator's first request can outlast one wait: the first journey of
+    /// a CI run spent 15s on it and failed before doing anything. XCTWaiter
+    /// reports a timeout instead of failing the test, so a slow first answer
+    /// is retried rather than fatal.
+    func remoteScript(seconds: Double = 60) -> Data? {
+        let end = Date().addingTimeInterval(seconds)
+        repeat {
+            var result: Data?
+            let done = XCTestExpectation(description: "/script")
+            URLSession.shared.dataTask(with: URL(string: control + "/script")!) { data, _, _ in result = data; done.fulfill() }.resume()
+            if XCTWaiter().wait(for: [done], timeout: 15) == .completed, let result, !result.isEmpty { return result }
+            Thread.sleep(forTimeInterval: 1)
+        } while Date() < end
+        return nil
+    }
+
     func post(_ path: String, _ body: Data) {
         if bundledJourney {
             guard path.hasPrefix("/save?"),
@@ -139,6 +159,30 @@ final class DriverTests: XCTestCase {
         return nil
     }
 
+    /// About a third of a screen of scrolling, as a held drag.
+    ///
+    /// `app.swipeUp()` is a flick, and how far a flick throws a scroll view
+    /// depends on how its touches arrive: on a loaded machine, with a map
+    /// keeping the app busy, eight of them moved a trail page less than one
+    /// screen. A drag that stops before it lifts moves the content by its
+    /// own length every time. It runs between the middle of the screen and
+    /// the upper part, where a flick began too, so it stays off the keys when
+    /// a keyboard is up - an iOS 27 simulator reports its keyboard's frame
+    /// below the screen while drawing it over the lower half - and it stops
+    /// short of a keyboard whose frame is known.
+    func scrollPage(towardTop: Bool) {
+        let frame = app.frame
+        var lower = frame.minY + frame.height * 0.55
+        let keyboard = app.keyboards.firstMatch
+        if keyboard.exists, !keyboard.frame.isEmpty, keyboard.frame.minY < frame.maxY {
+            lower = min(lower, keyboard.frame.minY - 24)
+        }
+        let upper = max(frame.minY + frame.height * 0.15, lower - frame.height * 0.4)
+        let point = { (y: CGFloat) in self.app.coordinate(withNormalizedOffset: .zero).withOffset(CGVector(dx: frame.midX, dy: y)) }
+        let (from, to) = towardTop ? (point(upper), point(lower)) : (point(lower), point(upper))
+        from.press(forDuration: 0.05, thenDragTo: to, withVelocity: .default, thenHoldForDuration: 0.2)
+    }
+
     /// Whether `target`, or a field inside it, holds the keyboard.
     func hasKeyboardFocus(_ target: XCUIElement) -> Bool {
         if (target.value(forKey: "hasKeyboardFocus") as? Bool) == true { return true }
@@ -222,7 +266,7 @@ final class DriverTests: XCTestCase {
             bundledJourney = true
             data = try Data(contentsOf: resource)
         } else {
-            data = get("/script")
+            data = remoteScript()
         }
         guard let data, let script = String(data: data, encoding: .utf8) else {
             XCTFail("no script")
@@ -478,14 +522,11 @@ final class DriverTests: XCTestCase {
             else { XCTFail("Element not found"); note("FAIL tab \(arg): NOT FOUND") }
         case "scrollto":
             var found = element(containing: arg)
-            var swipes = 0
-            while (found == nil || !(found!.isHittable)) && swipes < 8 {
-                if let target = found, !target.frame.isEmpty, target.frame.midY < app.frame.midY {
-                    app.swipeDown()
-                } else {
-                    app.swipeUp()
-                }
-                swipes += 1
+            var drags = 0
+            while (found == nil || !(found!.isHittable)) && drags < 12 {
+                let towardTop = found.map { !$0.frame.isEmpty && $0.frame.midY < app.frame.midY } ?? false
+                scrollPage(towardTop: towardTop)
+                drags += 1
                 found = element(containing: arg)
             }
             check(found != nil && found!.isHittable, "scrollto \(arg)")