craft-native 0.0.248 → 0.0.249

package/dist/android/templates/CraftNativeShell.kt.template

@@ -766,6 +766,8 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
     private val tabIconTints = mutableMapOf<String, Int>()
     private val tabIconPulses = mutableSetOf<String>()
     private val selectedSymbols = mutableMapOf<String, String>()
+    /** The page's own symbol for a tab while it says so, in place of the configured one. */
+    private val tabSymbols = mutableMapOf<String, String>()
     private val selectedIconTints = mutableMapOf<String, Int>()
     private val selectedIconPulses = mutableMapOf<String, Boolean>()
     private val tabImageURLs = mutableMapOf<String, String>()
@@ -1000,6 +1002,10 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         if (item.has("iconPulse")) {
             if (item.optBoolean("iconPulse", false)) tabIconPulses.add(id) else tabIconPulses.remove(id)
         }
+        if (item.has("symbol")) {
+            tabSymbols.remove(id)
+            item.optString("symbol").trim().takeUnless { item.isNull("symbol") || it.isBlank() }?.let { tabSymbols[id] = it }
+        }
         if (item.has("selectedSymbol")) {
             selectedSymbols.remove(id)
             item.optString("selectedSymbol").trim().takeUnless { item.isNull("selectedSymbol") || it.isBlank() }?.let { selectedSymbols[id] = it }
@@ -1042,7 +1048,7 @@ internal class CraftNativeChrome(context: Context, private val tabs: List<CraftN
         val tab = tabs[index]
         val selected = index == selectedTab
         return CraftTabIconAppearance(
-            if (selected) selectedSymbols[tab.id] ?: tab.symbol else tab.symbol,
+            if (selected) selectedSymbols[tab.id] ?: tabSymbols[tab.id] ?: tab.symbol else tabSymbols[tab.id] ?: tab.symbol,
             if (selected) selectedIconTints[tab.id] ?: tabIconTints[tab.id] else tabIconTints[tab.id],
             (if (selected) selectedIconPulses[tab.id] ?: tabIconPulses.contains(tab.id) else tabIconPulses.contains(tab.id)) && motionAllowed,
         )

package/dist/cli.js

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

package/dist/index.cjs

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

package/dist/index.js

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

package/dist/ios/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/dist/ios/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/dist/ios/templates/CraftNativeScreen.swift

@@ -3993,6 +3993,9 @@ private final class CraftNativeScrollView: UIScrollView, UIGestureRecognizerDele
     required init?(coder: NSCoder) { nil }
 
     override func touchesShouldCancel(in view: UIView) -> Bool {
+        // A drag beginning on a button scrolls; lifting without dragging
+        // remains a tap. Sliders, switches and text fields keep tracking.
+        if view is UIButton { return true }
         if view is UIControl { return false }
         return super.touchesShouldCancel(in: view)
     }
@@ -5143,6 +5146,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 +5331,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 +5349,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 +5362,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
@@ -9097,7 +9104,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 +9117,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/package.json

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