craft-native 0.0.182 → 0.0.183

package/dist/cli.js

@@ -3303,7 +3303,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.182";
+var version = "0.0.183";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];

package/dist/index.cjs

@@ -310,7 +310,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.182";
+var version = "0.0.183";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/index.js

@@ -58,7 +58,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.182";
+var version = "0.0.183";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/ios/templates/CraftHybrid.swift

@@ -1572,8 +1572,12 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         // title unless it asked for the bar; a pushed native screen gets the
         // bar and its Back.
         // A root screen that asked for its own bar (setOptions) keeps it.
-        let asksForBar = (viewController as? CraftNativeScreenController)?.wantsNavigationBar ?? false
-        let bare = viewController is CraftHybridWebSlot || (navigationController.viewControllers.first === viewController && !asksForBar)
+        // A screen that put its bar away (`hidden: true`, a tour drawing its
+        // own Back and Skip) stays bare, pushed or not.
+        let native = viewController as? CraftNativeScreenController
+        let asksForBar = native?.wantsNavigationBar ?? false
+        let bare = viewController is CraftHybridWebSlot || native?.navigationBarHidden == true
+            || (navigationController.viewControllers.first === viewController && !asksForBar)
         navigationController.setNavigationBarHidden(bare, animated: animated)
     }
 

package/dist/ios/templates/CraftNativeScreen.swift

@@ -3883,7 +3883,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     private var rootTrailingToSafeArea: NSLayoutConstraint?
     private var rootTrailingToView: NSLayoutConstraint?
     private var rootIsSafeAreaView = false
-    private var navigationBarHidden: Bool?
+    private(set) var navigationBarHidden: Bool?
     /// A native `<StatusBar>` node overrides the app default for this screen.
     private var statusBarStyleOverride: UIStatusBarStyle?
     private var statusBarHiddenOverride: Bool?
@@ -5340,17 +5340,26 @@ 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 }
+    }
+
+    /// The key a node's author gave it. A wrapper of one child (a
+    /// component's) is keyed by what it wraps, so a keyed row drawn through
+    /// a component keeps its key. Never a key further down beside siblings:
+    /// one an `:if` shows and hides (a Back button) changed the identity of
+    /// everything above it, and the whole subtree was built again, a pager's
+    /// scroll position with it.
+    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"]]
             .compactMap { $0 as? String }
             .first { !$0.isEmpty }
         if let direct { return direct }
-        for child in node["children"] as? [[String: Any]] ?? [] {
-            let childProps = child["props"] as? [String: Any] ?? [:]
-            if let nested = explicitKey(child, props: childProps) { return nested }
-        }
-        return (node["id"] as? String).flatMap { $0.isEmpty ? nil : $0 }
+        let children = node["children"] as? [Any] ?? []
+        guard children.count == 1, let only = children.first as? [String: Any] else { return nil }
+        return authoredKey(only, props: only["props"] as? [String: Any] ?? [:])
     }
 
     private func accessibilityIdentifier(_ node: [String: Any], props: [String: Any]) -> String? {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "craft-native",
-  "version": "0.0.182",
+  "version": "0.0.183",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",