@craft-native/ios 0.0.248 → 0.0.250

package/package.json

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

package/templates/CraftApp.swift

@@ -648,6 +648,9 @@ final class CraftChrome: ObservableObject {
         var titleOverride: String? = nil
         var iconTint: String? = nil
         var iconPulse = false
+        /// The page's own symbol for the tab while it says so (a live
+        /// reading's filled heart), in place of the configured one.
+        var iconSymbol: String? = nil
         var selectedSymbol: String? = nil
         var selectedIconTint: String? = nil
         var selectedIconPulse: Bool? = nil
@@ -658,7 +661,7 @@ final class CraftChrome: ObservableObject {
         }
 
         func iconAppearance(selected: Bool, motionAllowed: Bool) -> (symbol: String, tint: String?, pulse: Bool) {
-            let name = selected ? selectedSymbol ?? symbol : symbol
+            let name = selected ? selectedSymbol ?? iconSymbol ?? symbol : iconSymbol ?? symbol
             let tint = selected ? selectedIconTint ?? iconTint : iconTint
             let pulse = selected ? selectedIconPulse ?? iconPulse : iconPulse
             return (name, tint, pulse && motionAllowed)
@@ -750,6 +753,9 @@ final class CraftChrome: ObservableObject {
         if item.keys.contains("iconPulse") {
             next.iconPulse = item["iconPulse"] as? Bool ?? false
         }
+        if item.keys.contains("symbol") {
+            next.iconSymbol = Tab.normalizedSelectedSymbol(item["symbol"] as? String)
+        }
         if item.keys.contains("selectedSymbol") {
             next.selectedSymbol = Tab.normalizedSelectedSymbol(item["selectedSymbol"] as? String)
         }

package/templates/CraftHybrid.swift

@@ -1249,8 +1249,7 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
             // create a second web root here: the shared WebView cannot draw
             // both pages during the same gesture.
             guard hybrid.routes.match(id) != nil else { return false }
-            target = CraftFramePacing.shared.measure("tab swipe mount \(id)") { makeStack(tab: id, rootPath: id) }
-            (target.topViewController as? CraftNativeScreenController)?.screenVisibilityChanged(false)
+            target = CraftFramePacing.shared.measure("tab swipe mount \(id)") { makeStack(tab: id, rootPath: id, hidden: true) }
         }
         guard current.view !== target.view,
               !(current.topViewController is CraftHybridWebSlot && target.topViewController is CraftHybridWebSlot),
@@ -1546,6 +1545,12 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
 
     private var visibleStack: UINavigationController? { stacks[currentTab] }
 
+    /// A swipe preview can be visible without owning navigation or focus.
+    /// UIKit appearance callbacks must follow the committed native stack.
+    func isFocusedScreen(_ screen: CraftNativeScreenController) -> Bool {
+        visibleStack?.topViewController === screen
+    }
+
     var webIsVisible: Bool {
         guard let webHost, let slot = visibleStack?.topViewController as? CraftHybridWebSlot else { return false }
         return webHost.view.superview === slot.view
@@ -1557,7 +1562,11 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
     /// the view hierarchy, so its screen never takes the shell's chrome (the
     /// bar, the tab accessory) from the one on screen.
     private func makeStack(tab: String, rootPath: String, hidden: Bool = false) -> UINavigationController {
-        let nav = UINavigationController(rootViewController: entry(for: rootPath, isTabRoot: true, depth: nil))
+        let root = entry(for: rootPath, isTabRoot: true, depth: nil)
+        // Constructing the navigation controller can load the root's view and
+        // mount its script immediately. Set its initial focus before that.
+        if hidden { (root as? CraftNativeScreenController)?.screenVisibilityChanged(false) }
+        let nav = UINavigationController(rootViewController: root)
         nav.delegate = self
         nav.view.backgroundColor = config.resolvedBackgroundColor
         nav.additionalSafeAreaInsets.bottom = safeAreaForTabBar()

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,6 +3982,10 @@ private final class CraftNativeScrollView: UIScrollView, UIGestureRecognizerDele
     required init?(coder: NSCoder) { nil }
 
     override func touchesShouldCancel(in view: UIView) -> Bool {
+        // 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)
     }
@@ -5143,6 +5136,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     /// sees, not a tab prepared behind it.
     private var isShownOnScreen: Bool {
         guard let window = view.window else { return false }
+        if let shell = navigationController?.parent as? CraftHybridController,
+           !shell.isFocusedScreen(self) { return false }
         var candidate: UIView? = view
         while let current = candidate, current !== window {
             if current.isHidden { return false }
@@ -5326,13 +5321,14 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     }
 
     /// What a screen's script starts with that only the main thread may read:
-    /// the app's state, the appearance, what the device can do.
+    /// the app's state, the appearance, initial visibility, what the device can do.
     private struct ScriptInputs {
         let capabilityJSON: String
         let appState: String
         let colorScheme: String
         let appearanceJSON: String
         let sessionTokenKey: String
+        let focused: Bool?
     }
 
     private func scriptInputs() -> ScriptInputs {
@@ -5343,7 +5339,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             appState: CraftNativeActions.currentAppState(),
             colorScheme: colorScheme,
             appearanceJSON: appearanceJSON(),
-            sessionTokenKey: Self.jsonString(CraftSession.tokenKey(config))
+            sessionTokenKey: Self.jsonString(CraftSession.tokenKey(config)),
+            focused: reportedVisible
         )
     }
 
@@ -5355,7 +5352,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         jsContext.setObject(routeProps as NSDictionary, forKeyedSubscript: "__stxNativeProps" as NSString)
         // Hidden before its script ran: the SCREEN_FOCUS saying so reached no
         // callback, so the script reads it as it starts instead.
-        if reportedVisible == false {
+        if inputs.focused == false {
             jsContext.setObject(false, forKeyedSubscript: "__stxNativeFocused" as NSString)
         }
         jsContext.exceptionHandler = { [weak self] context, exception in
@@ -7359,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": [:]])
                 }
             }
@@ -7441,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
@@ -9097,7 +9092,9 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         // A video with its system controls is a group too: VoiceOver reaches
         // play, the scrubber, skipping and full screen inside it.
         let controlledVideo = type == "Video" && (props["controls"] as? Bool) == true
-        let container = ["ScrollView", "FlatList", "SectionList"].contains(type)
+        // UIPickerView exposes adjustable component wheels. Making the
+        // picker itself a leaf hides those wheels and their selected values.
+        let container = ["ScrollView", "FlatList", "SectionList", "Picker"].contains(type)
             || ["tablist", "radiogroup", "list", "menu", "menubar", "toolbar"].contains(role ?? "")
             || controlledVideo
         view.isAccessibilityElement = !container && role != "none" && (view.accessibilityLabel != nil || role != nil || ["Text", "Button", "Link", "Checkbox", "Image", "ImageBackground", "Video", "TextInput", "Picker", "DatePicker", "Switch", "Slider"].contains(type))
@@ -9108,7 +9105,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         // screen omits redundant accessibility metadata.
         var traits: UIAccessibilityTraits = []
         switch type {
-        case "Slider", "Picker", "DatePicker": traits.insert(.adjustable)
+        case "Slider", "DatePicker": traits.insert(.adjustable)
         default: break
         }
         switch role ?? type.lowercased() {

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,33 @@ final class DriverTests: XCTestCase {
         return nil
     }
 
+    /// 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 +402,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 +431,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)") }