@craft-native/ios 0.0.242 → 0.0.244

package/package.json

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

package/templates/CraftApp.swift

@@ -670,6 +670,7 @@ final class CraftChrome: ObservableObject {
 
     @Published var tabs: [Tab] = []
     @Published var tabAccessory: Tab?
+    private weak var tabAccessoryOwner: AnyObject?
     @Published var selected: String?
     let tabSwipeProgress = CraftTabSwipeProgress()
     private(set) var tabSwipePosition: CGFloat? {
@@ -771,7 +772,7 @@ final class CraftChrome: ObservableObject {
         tabs[index] = next
     }
     /// A destination beside the tab pill, outside the tab stacks and swipe order.
-    func updateTabAccessory(_ item: [String: Any]?) {
+    func updateTabAccessory(_ item: [String: Any]?, owner: AnyObject? = nil) {
         let next: Tab?
         if let item, let path = item["path"] as? String,
            path.hasPrefix("/"), !path.hasPrefix("//"),
@@ -782,10 +783,17 @@ final class CraftChrome: ObservableObject {
         } else {
             next = nil
         }
+        tabAccessoryOwner = owner
         guard tabAccessory != next else { return }
         tabAccessory = next
     }
 
+    /// A retained or prepared screen cannot clear another screen's chrome.
+    func clearTabAccessory(ownedBy owner: AnyObject) {
+        guard tabAccessoryOwner === owner else { return }
+        updateTabAccessory(nil)
+    }
+
     func setHiddenByScreen(_ hidden: Bool) {
         guard hiddenByScreen != hidden else { return }
         hiddenByScreen = hidden
@@ -896,12 +904,9 @@ final class CraftChrome: ObservableObject {
         // stack. Cancellation belongs to the stack the finger left.
         tabSwipePrevious = previous
         tabSwipeTarget = id
-        // Only the indicator moves now. The highlight follows it across the
-        // midpoint (updateTabSwipe), as iOS's own tab bar lens does; turning
-        // it at once rebuilt every tab in the swipe's first frame, which is
-        // also when UIKit puts the incoming screen on screen.
         withAnimation(nil) {
             tabSwipePosition = tabs.firstIndex(where: { $0.id == previous }).map { CGFloat($0) }
+            selected = id
         }
     }
 
@@ -913,14 +918,11 @@ final class CraftChrome: ObservableObject {
               let to = tabs.firstIndex(where: { $0.id == target }) else { return }
         let position = CGFloat(from) + CGFloat(to - from) * min(1, max(0, progress))
         if tabSwipePosition != position { withAnimation(nil) { tabSwipePosition = position } }
-        let lit = progress >= 0.5 ? target : previous
-        if selected != lit { withAnimation(nil) { selected = lit } }
     }
 
     func settleTabSwipe(completed: Bool, duration: TimeInterval) {
         guard let id = completed ? tabSwipeTarget : tabSwipePrevious,
               let index = tabs.firstIndex(where: { $0.id == id }) else { return }
-        if selected != id { withAnimation(nil) { selected = id } }
         withAnimation(Self.motion(.easeOut(duration: duration))) { tabSwipePosition = CGFloat(index) }
     }
 

package/templates/CraftHybrid.swift

@@ -1402,7 +1402,10 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
 
     // MARK: Stacks
 
-    private func makeStack(tab: String, rootPath: String) -> UINavigationController {
+    /// `hidden`: a stack prepared off screen. It is hidden before it joins
+    /// 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))
         nav.delegate = self
         nav.view.backgroundColor = config.resolvedBackgroundColor
@@ -1411,6 +1414,7 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         addChild(nav)
         nav.view.frame = view.bounds
         nav.view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        nav.view.isHidden = hidden
         view.addSubview(nav.view)
         nav.didMove(toParent: self)
         // Only once the stack's view has loaded: the recognizer is made then,
@@ -1515,8 +1519,7 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
             let id = tabs[next]
             guard self.stacks[id] == nil else { self.prepareAdjacentNativeTabs(); return }
             let nav = CraftFramePacing.shared.measure("prepare \(id)") { () -> UINavigationController in
-                let nav = self.makeStack(tab: id, rootPath: id)
-                nav.view.isHidden = true
+                let nav = self.makeStack(tab: id, rootPath: id, hidden: true)
                 nav.view.layoutIfNeeded()
                 // Draw its text and pictures now. A hidden layer is not
                 // drawn at commit, so the first swipe to this tab drew
@@ -1752,7 +1755,7 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
             // Keep this screen up until the page has switched, rather than
             // showing it half way.
             cancelPendingTab()
-            if stacks[id] == nil { _ = makeStack(tab: id, rootPath: id); stacks[id]?.view.isHidden = true; view.bringSubviewToFront(visibleStack?.view ?? view) }
+            if stacks[id] == nil { _ = makeStack(tab: id, rootPath: id, hidden: true); view.bringSubviewToFront(visibleStack?.view ?? view) }
             let deadline = DispatchWorkItem { [weak self] in self?.show(tab: id) }
             pendingTab = (id, deadline)
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.45, execute: deadline)

package/templates/CraftNativeMutation.swift

@@ -29,6 +29,7 @@ struct CraftNativeMutationResult {
 final class CraftNativeMutationDocument {
     private struct Node {
         let id: String
+        let key: String?
         var type: String
         var props: [String: Any]
         var style: [String: Any]
@@ -177,6 +178,7 @@ final class CraftNativeMutationDocument {
         }
         nodes[id] = Node(
             id: id,
+            key: value["key"] as? String,
             type: type,
             props: dictionary(value["props"]),
             style: dictionary(value["style"]),
@@ -330,6 +332,7 @@ final class CraftNativeMutationDocument {
             "style": node.style,
             "events": node.events,
         ]
+        if let key = node.key { value["key"] = key }
         let text: [Any] = node.text
         let children: [Any] = node.children.compactMap { materialize($0, nodes: nodes) }
         value["children"] = text + children
@@ -350,6 +353,7 @@ final class CraftNativeMutationDocument {
         let children = value["children"] as? [Any] ?? []
         nodes[id] = Node(
             id: id,
+            key: value["key"] as? String,
             type: value["type"] as? String ?? "View",
             props: props,
             style: dictionary(value["style"]),

package/templates/CraftNativeScreen.swift

@@ -1435,21 +1435,47 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
 
     private func configureMarkerView(_ view: MKAnnotationView, id: String) {
         if let bearing = markerBearings[id] {
-            let configuration = UIImage.SymbolConfiguration(pointSize: 16, weight: .semibold)
-                .applying(UIImage.SymbolConfiguration(paletteColors: [.white, .systemGreen]))
-            // MapKit otherwise tints this as a monochrome template and loses
-            // the contrasting route arrow when displayed over map content.
-            view.image = UIImage(systemName: "arrow.up.circle.fill", withConfiguration: configuration)?
-                .withRenderingMode(.alwaysOriginal)
+            let color = (markerPinColors[id] ?? .systemGreen).resolvedColor(with: traitCollection)
+            view.tintColor = color
+            view.image = Self.markerImage(color: color, direction: true)
             view.transform = CGAffineTransform(rotationAngle: CGFloat((bearing - camera.heading) * .pi / 180))
         } else {
-            view.tintColor = markerPinColors[id] ?? .systemRed
-            view.image = UIImage(systemName: "mappin.circle.fill", withConfiguration: UIImage.SymbolConfiguration(pointSize: 28))?
-                .withTintColor(view.tintColor, renderingMode: .alwaysOriginal)
+            let color = (markerPinColors[id] ?? .systemRed).resolvedColor(with: traitCollection)
+            view.tintColor = color
+            view.image = Self.markerImage(color: color, direction: false)
             view.transform = .identity
         }
     }
 
+    private static let markerImages: NSCache<NSString, UIImage> = {
+        let cache = NSCache<NSString, UIImage>()
+        cache.countLimit = 64
+        return cache
+    }()
+
+    private static func markerImage(color: UIColor, direction: Bool) -> UIImage {
+        let key = "\(direction ? "direction" : "pin"):\(color.description)" as NSString
+        if let cached = markerImages.object(forKey: key) { return cached }
+        let size = direction ? CGSize(width: 20, height: 24) : CGSize(width: 28, height: 28)
+        // Explicit native drawing preserves the light backing independently
+        // of MapKit's tint and SF Symbols' multicolor rendering preferences.
+        let image = UIGraphicsImageRenderer(size: size).image { _ in
+            let border = UIBezierPath(roundedRect: CGRect(origin: .zero, size: size).insetBy(dx: 1, dy: 1),
+                                      cornerRadius: (size.width - 2) / 2)
+            UIColor.white.setFill()
+            border.fill()
+            color.setStroke()
+            border.lineWidth = 1.5
+            border.stroke()
+            let symbol = UIImage(systemName: direction ? "arrow.up" : "mappin",
+                withConfiguration: UIImage.SymbolConfiguration(pointSize: 16, weight: .semibold))?
+                .withTintColor(color, renderingMode: .alwaysOriginal)
+            symbol?.draw(in: direction ? CGRect(x: 5, y: 6, width: 10, height: 12) : CGRect(x: 7, y: 5, width: 14, height: 18))
+        }.withRenderingMode(.alwaysOriginal)
+        markerImages.setObject(image, forKey: key)
+        return image
+    }
+
     override func layoutSubviews() {
         super.layoutSubviews()
         if tileTemplate != nil {
@@ -4598,19 +4624,32 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         }
         applyNavigationBarAppearance()
         // Each screen says whether it wants the tab bar, so one that hid it
-        // never leaves it hidden for the next.
-        restoreShellChrome()
+        // never leaves it hidden for the next. Only the screen on screen:
+        // UIKit tells a tab's screen prepared in a hidden stack that it
+        // appears too, and that one took the accessory of the screen showing.
+        if isShownOnScreen { restoreShellChrome() }
         refreshTraitDefaults()
     }
 
+    /// In the window with nothing above it hidden: the screen the person
+    /// sees, not a tab prepared behind it.
+    private var isShownOnScreen: Bool {
+        guard let window = view.window else { return false }
+        var candidate: UIView? = view
+        while let current = candidate, current !== window {
+            if current.isHidden { return false }
+            candidate = current.superview
+        }
+        return true
+    }
+
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         screenVisibilityChanged(false)
         stopCelebrations(in: view)
-        // The accessory belongs to the visible native screen. Clear the
-        // shared shell state before a hybrid/web route appears, otherwise a
-        // destination from the outgoing screen remains tappable on top of it.
-        CraftChrome.shared.updateTabAccessory(nil)
+        // Release only this screen's accessory. A retained or prepared screen
+        // can disappear after the destination has already published its own.
+        CraftChrome.shared.clearTabAccessory(ownedBy: self)
         // Popped (or its stack dismissed) while the bar was away: it comes
         // back for whatever shows next, a web page included.
         if tabBarHidden, isMovingFromParent || isBeingDismissed || navigationController?.isBeingDismissed == true {
@@ -4620,11 +4659,15 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
 
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
-        screenVisibilityChanged(true)
-        // A navigation breadcrumb for the crash reporter: the trail a crash
-        // report carries is the screens that led to it.
-        if !isAppScript, let routeName, !routeName.isEmpty {
-            CraftCrashReporter.shared.screenAppeared(routeName)
+        // A tab prepared in a hidden stack "appears" to UIKit as well; the
+        // shell says when it really shows (screenVisibilityChanged).
+        if isShownOnScreen {
+            screenVisibilityChanged(true)
+            // A navigation breadcrumb for the crash reporter: the trail a
+            // crash report carries is the screens that led to it.
+            if !isAppScript, let routeName, !routeName.isEmpty {
+                CraftCrashReporter.shared.screenAppeared(routeName)
+            }
         }
         // onLayout reports views that are on screen: a pushed screen lays
         // out before it has a window, and nothing moved again once it had
@@ -4651,7 +4694,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     private func restoreShellChrome() {
         guard !isAppScript else { return }
         CraftChrome.shared.setHiddenByScreen(tabBarHidden)
-        CraftChrome.shared.updateTabAccessory(tabAccessory)
+        CraftChrome.shared.updateTabAccessory(tabAccessory, owner: self)
     }
 
     /// The screen came on screen or went off it: a screen pushed over it was
@@ -5322,7 +5365,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         if options.keys.contains("tabAccessory") {
             tabAccessory = options["tabAccessory"] as? [String: Any]
             if navigationController?.topViewController === self, view.window != nil {
-                CraftChrome.shared.updateTabAccessory(tabAccessory)
+                CraftChrome.shared.updateTabAccessory(tabAccessory, owner: self)
             }
         }
         if options.keys.contains("title") {
@@ -6847,7 +6890,11 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
 
     private func explicitKey(_ node: [String: Any], props: [String: Any]) -> String? {
         if let authored = authoredKey(node, props: props) { return authored }
-        return (node["id"] as? String).flatMap { $0.isEmpty ? nil : $0 }
+        // Repeated test selectors are valid for list rows. Retain each row by
+        // its unique protocol ID before considering legacy selector identity.
+        return [node["id"], props["testID"]]
+            .compactMap { $0 as? String }
+            .first { !$0.isEmpty }
     }
 
     /// The key a node's author gave it. A wrapper of one child (a
@@ -6859,7 +6906,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     private func authoredKey(_ node: [String: Any], props: [String: Any]) -> String? {
         // The current @stacksjs/stx native compiler emits key in props; accept the IR
         // field too so keyed children keep working when the compiler adopts it.
-        let direct = [node["key"], props["key"], props["testID"]]
+        let direct = [node["key"], props["key"]]
             .compactMap { $0 as? String }
             .first { !$0.isEmpty }
         if let direct { return direct }

package/templates/testing/DriverTests.swift.template

@@ -448,7 +448,11 @@ final class DriverTests: XCTestCase {
             var found = element(containing: arg)
             var swipes = 0
             while (found == nil || !(found!.isHittable)) && swipes < 8 {
-                app.swipeUp()
+                if let target = found, !target.frame.isEmpty, target.frame.midY < app.frame.midY {
+                    app.swipeDown()
+                } else {
+                    app.swipeUp()
+                }
                 swipes += 1
                 found = element(containing: arg)
             }