@craft-native/ios 0.0.249 → 0.0.251

package/package.json

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

package/templates/CraftNativeScreen.swift

@@ -3788,7 +3788,6 @@ private final class CraftNativeModalView: UIView, UIGestureRecognizerDelegate {
     private let blocker = UIView()
     private let backdropTap = UITapGestureRecognizer()
     private var renderedVisible = false
-    private var dismissSuppressedByRequest = false
     private var animationGeneration = 0
     var onRequestClose: ((String) -> Void)?
 
@@ -3877,25 +3876,15 @@ private final class CraftNativeModalView: UIView, UIGestureRecognizerDelegate {
         transform = .identity
         alpha = 0
         isUserInteractionEnabled = true
-        dismissSuppressedByRequest = false
         onRequestClose = nil
     }
 
     func requestClose(reason: String = "backdrop") {
         guard let onRequestClose else { return }
-        dismissSuppressedByRequest = true
         isUserInteractionEnabled = false
         onRequestClose(reason)
     }
 
-    func consumeDismissSuppression() -> Bool {
-        let suppressed = dismissSuppressedByRequest
-        dismissSuppressedByRequest = false
-        return suppressed
-    }
-
-    func clearDismissSuppression() { dismissSuppressedByRequest = false }
-
     @objc private func backdropTapped() { requestClose(reason: "backdrop") }
 
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
@@ -3993,9 +3982,10 @@ private final class CraftNativeScrollView: UIScrollView, UIGestureRecognizerDele
     required init?(coder: NSCoder) { nil }
 
     override func touchesShouldCancel(in view: UIView) -> Bool {
-        // A drag beginning on a button scrolls; lifting without dragging
-        // remains a tap. Sliders, switches and text fields keep tracking.
-        if view is UIButton { return true }
+        // Buttons and text fields yield once a scroll drag begins; an
+        // ordinary tap still reaches them immediately. Value controls such
+        // as sliders, switches and date pickers keep their tracking gesture.
+        if view is UIButton || view is UITextField { return true }
         if view is UIControl { return false }
         return super.touchesShouldCancel(in: view)
     }
@@ -7366,11 +7356,9 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             modal.onRequestClose = nonEmptyHandler(events["onRequestClose"]).map { handler in
                 { [weak self] reason in self?.send(type: "EVENT", payload: ["handlerName": handler, "nativeEvent": ["reason": reason]]) }
             }
-            if visible { modal.clearDismissSuppression() }
-            let suppressDismiss = !visible && modal.consumeDismissSuppression()
             if wasVisible != visible, visible || wasVisible == true {
                 let lifecycleHandler = visible ? events["onShow"] : events["onDismiss"]
-                if let lifecycleHandler = nonEmptyHandler(lifecycleHandler), !suppressDismiss {
+                if let lifecycleHandler = nonEmptyHandler(lifecycleHandler) {
                     send(type: "EVENT", payload: ["handlerName": lifecycleHandler, "nativeEvent": [:]])
                 }
             }
@@ -7448,10 +7436,10 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                 // already-stopped view changes hidesWhenStopped to false.
                 // Android applies the requested visibility on every render;
                 // keep the two hosts in lockstep for dynamic prop changes.
-                indicator.isHidden = indicator.hidesWhenStopped
+                indicator.isHidden = style["display"] as? String == "none" || indicator.hidesWhenStopped
             } else {
                 indicator.startAnimating()
-                indicator.isHidden = false
+                indicator.isHidden = style["display"] as? String == "none"
             }
         case "Svg":
             let drawing = result as! CraftNativeSvgView

package/templates/CraftNativeServices.swift

@@ -690,8 +690,15 @@ enum CraftNativePush {
 
 // MARK: - Share sheet
 
-/// A URL stays a URL in Messages, AirDrop and Copy. Its title belongs in the
+/// A URL stays a URL in Messages and AirDrop. Its title belongs in the
 /// system preview and mail subject, rather than becoming a second text item.
+///
+/// Copy is the exception: it writes the address as text. A URL-only
+/// pasteboard item has no textual representation, so `UIPasteboard.string`
+/// is nil, a web page's `navigator.clipboard.readText()` gets nothing, and
+/// so does the simulator's `pbpaste` - the shared link copied as nothing
+/// anywhere text is read. Text that is an address is still detected as a
+/// link wherever it is pasted.
 final class CraftShareLink: NSObject, UIActivityItemSource {
     let url: URL
     let title: String
@@ -703,7 +710,9 @@ final class CraftShareLink: NSObject, UIActivityItemSource {
 
     func activityViewControllerPlaceholderItem(_ activityViewController: UIActivityViewController) -> Any { url }
 
-    func activityViewController(_ activityViewController: UIActivityViewController, itemForActivityType activityType: UIActivity.ActivityType?) -> Any? { url }
+    func activityViewController(_ activityViewController: UIActivityViewController, itemForActivityType activityType: UIActivity.ActivityType?) -> Any? {
+        activityType == .copyToPasteboard ? url.absoluteString : url
+    }
 
     func activityViewController(_ activityViewController: UIActivityViewController, subjectForActivityType activityType: UIActivity.ActivityType?) -> String { title }
 

package/templates/testing/DriverTests.swift.template

@@ -139,6 +139,57 @@ 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 }
+        return target.descendants(matching: .any).matching(NSPredicate(format: "hasKeyboardFocus == 1")).firstMatch.exists
+    }
+
+    /// Taps `target` until it holds the keyboard, for up to `seconds`.
+    ///
+    /// A tap is not focus. The first keyboard a freshly created simulator
+    /// shows takes its keyboard process many seconds to start - one CI run
+    /// spent 20s delivering the tap - and the field had not become first
+    /// responder when the text was typed, which failed with "Neither element
+    /// nor any descendant has keyboard focus". A later tap lands once the app
+    /// is idle again.
+    func focus(_ target: XCUIElement, seconds: Double = 15) -> Bool {
+        let end = Date().addingTimeInterval(seconds)
+        repeat {
+            target.tap()
+            let settle = Date().addingTimeInterval(3)
+            repeat {
+                if hasKeyboardFocus(target) { return true }
+                Thread.sleep(forTimeInterval: 0.25)
+            } while Date() < settle
+        } while Date() < end
+        return hasKeyboardFocus(target)
+    }
+
     func waitFor(_ text: String, _ seconds: Double) -> XCUIElement? {
         poll(seconds) { element(containing: text) }
     }
@@ -375,8 +426,10 @@ final class DriverTests: XCTestCase {
             let idParts = arg.split(separator: " ", maxSplits: 1).map(String.init)
             let target = identified(idParts[0])
             if target.waitForExistence(timeout: 10) {
-                target.tap()
-                Thread.sleep(forTimeInterval: 0.8)
+                guard focus(target) else {
+                    check(false, "typeid \(idParts[0]) takes keyboard focus")
+                    return
+                }
                 app.typeText(idParts.count > 1 ? idParts[1] : "")
                 note("typeid \(idParts[0]): ok")
             } else { XCTFail("Element not found"); note("FAIL typeid \(idParts[0]): NOT FOUND") }
@@ -402,8 +455,10 @@ final class DriverTests: XCTestCase {
             let index = Int(fieldParts[0]) ?? 0
             let fields = app.textFields.allElementsBoundByIndex + app.secureTextFields.allElementsBoundByIndex
             if index >= 0 && index < fields.count {
-                fields[index].tap()
-                Thread.sleep(forTimeInterval: 0.6)
+                guard focus(fields[index]) else {
+                    check(false, "field \(index) takes keyboard focus")
+                    return
+                }
                 app.typeText(fieldParts.count > 1 ? fieldParts[1] : "")
                 note("field \(index): ok")
             } else { XCTFail("Element not found"); note("FAIL field \(index): NOT FOUND (\(fields.count) fields)") }
@@ -447,14 +502,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)")