@craft-native/ios 0.0.242 → 0.0.243

package/package.json

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

package/templates/CraftApp.swift

@@ -896,12 +896,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 +910,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/CraftNativeScreen.swift

@@ -4598,11 +4598,25 @@ 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)
@@ -4620,11 +4634,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