@craft-native/ios 0.0.148 → 0.0.150

package/package.json

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

package/templates/CraftApp.swift

@@ -566,6 +566,18 @@ final class CraftChrome: ObservableObject {
         tabBarVisible = true
     }
 
+    /// A native screen that wants the whole screen (a workout under way) asks
+    /// the bar away while it shows (`tabBarHidden`, CraftNativeScreen.swift);
+    /// the next screen shown says again. The page's own hideTabBar is apart.
+    private(set) var hiddenByScreen = false
+    func setHiddenByScreen(_ hidden: Bool) {
+        guard hiddenByScreen != hidden else { return }
+        hiddenByScreen = hidden
+        pendingHide?.cancel()
+        withAnimation(Self.motion(.easeInOut(duration: 0.2))) { tabBarVisible = !hidden && !tabs.isEmpty }
+        publishLayout()
+    }
+
     /// However the page behaves, the splash is gone after `seconds`
     /// (`splashMaxSeconds`, three by default). It used to be ten: a page that
     /// never painted held a logo on screen for ten seconds, which reads as a
@@ -595,7 +607,7 @@ final class CraftChrome: ObservableObject {
                 let dark = (body["tintDark"] as? String).flatMap { UIColor(hex: $0) }
                 tint = light.map { light in dark.map { dark in UIColor { $0.userInterfaceStyle == .dark ? dark : light } } ?? light }
             }
-            withAnimation(Self.motion(.easeOut(duration: 0.2))) { tabBarVisible = !tabs.isEmpty }
+            withAnimation(Self.motion(.easeOut(duration: 0.2))) { tabBarVisible = !tabs.isEmpty && !hiddenByScreen }
             publishLayout()
         case "selectTab":
             if let id = body["id"] as? String, id != selected {

package/templates/CraftNativeScreen.swift

@@ -2335,9 +2335,21 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             // a screen that hid its own.
             navigationController?.setNavigationBarHidden(false, animated: animated)
         }
+        // Each screen says whether it wants the tab bar, so one that hid it
+        // never leaves it hidden for the next.
+        CraftChrome.shared.setHiddenByScreen(tabBarHidden)
         refreshTraitDefaults()
     }
 
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        // 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 {
+            CraftChrome.shared.setHiddenByScreen(false)
+        }
+    }
+
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         screenVisibilityChanged(true)
@@ -2852,6 +2864,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     private var rootTopToSafeArea: NSLayoutConstraint?
     private var rootTopToView: NSLayoutConstraint?
     private var navigationBarHidden: Bool?
+    /// The app's tab bar away while this screen shows (`tabBarHidden`).
+    private var tabBarHidden = false
     private var prefersLargeTitle: Bool?
 
     /// Whether this screen asked for a bar of its own through `setOptions`: a
@@ -2879,6 +2893,12 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             if largeTitle { navigationController?.navigationBar.prefersLargeTitles = true }
             trackContentScrollView()
         }
+        if let hidden = options["tabBarHidden"] as? Bool {
+            tabBarHidden = hidden
+            if navigationController?.topViewController === self, view.window != nil {
+                CraftChrome.shared.setHiddenByScreen(hidden)
+            }
+        }
         if let hidden = options["hidden"] as? Bool {
             navigationBarHidden = hidden
             if navigationController?.topViewController === self {
@@ -3274,6 +3294,12 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             if navigationController?.topViewController === self {
                 navigationController?.popViewController(animated: true)
             }
+        case "NAVIGATE_POP_TO_ROOT":
+            // Back to the first screen of this screen's stack in one move: a
+            // finished task (a saved workout) closes the way it was reached.
+            if navigationController?.topViewController === self {
+                navigationController?.popToRootViewController(animated: true)
+            }
         case "API_REQUEST":
             guard let id = message["id"] as? String else { return }
             let args = payload["args"] as? [Any] ?? []