craft-native 0.0.206 → 0.0.209

package/dist/cli.js

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

package/dist/index.cjs

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

package/dist/index.js

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

package/dist/ios/templates/CraftApp.swift

@@ -621,6 +621,7 @@ final class CraftChrome: ObservableObject {
     }
 
     @Published var tabs: [Tab] = []
+    @Published var tabAccessory: Tab?
     @Published var selected: String?
     @Published var tabBarVisible = false
     @Published var splashVisible = true
@@ -688,6 +689,16 @@ final class CraftChrome: ObservableObject {
             tabs[index].badge = (item["badge"] as? String).flatMap { $0.isEmpty ? nil : String($0.prefix(8)) }
         }
     }
+    /// A destination beside the tab pill, outside the tab stacks and swipe order.
+    func updateTabAccessory(_ item: [String: Any]?) {
+        guard let item, let path = item["path"] as? String,
+              path.hasPrefix("/"), !path.hasPrefix("//"),
+              let title = item["title"] as? String else { tabAccessory = nil; return }
+        tabAccessory = Tab(id: path, title: title, symbol: item["symbol"] as? String ?? "message",
+            badge: (item["badge"] as? String).flatMap { $0.isEmpty ? nil : String($0.prefix(8)) },
+            accessibilityLabel: item["accessibilityLabel"] as? String)
+    }
+
     func setHiddenByScreen(_ hidden: Bool) {
         guard hiddenByScreen != hidden else { return }
         hiddenByScreen = hidden
@@ -913,7 +924,31 @@ struct CraftTabBarView: View {
 
     var body: some View {
         if chrome.tabBarVisible && !chrome.tabs.isEmpty {
-            bar
+            HStack(spacing: 8) {
+                bar
+                if let accessory = chrome.tabAccessory {
+                    Button { CraftHybrid.shared.open(accessory.id) } label: {
+                        Image(systemName: accessory.symbol)
+                            .font(.system(size: iconSize))
+                            .frame(width: 62, height: 62)
+                            .background(.ultraThinMaterial, in: Circle())
+                            .overlay(alignment: .topTrailing) {
+                                if let badge = accessory.badge {
+                                    Text(badge)
+                                        .font(.system(size: badgeSize, weight: .bold))
+                                        .foregroundStyle(.white)
+                                        .padding(.horizontal, 4)
+                                        .frame(minWidth: 18, minHeight: 18)
+                                        .background(Capsule().fill(Color.red))
+                                }
+                            }
+                    }
+                    .buttonStyle(.plain)
+                    .accessibilityLabel(accessory.accessibilityLabel ?? accessory.title)
+                    .accessibilityValue(accessory.badge ?? "")
+                    .accessibilityIdentifier("craft-tab-accessory")
+                }
+            }
                 .padding(.horizontal, 16)
                 .padding(.bottom, 4)
                 .background(GeometryReader { proxy in

package/dist/ios/templates/CraftHybrid.swift

@@ -854,9 +854,11 @@ final class CraftHybrid: NSObject {
         let show: (CraftHybridController) -> Void = { [weak self] controller in
             if native { controller.showNative(path: path, replace: false, fromLink: true) } else { self?.openOutside(url.absoluteString) }
         }
-        guard let controller else {
+        guard let controller, controller.isViewLoaded else {
             // Before the shell: a hybrid app's page has it; an all-native app
             // opens it once the shell is up (a link that launched the app).
+            // Construction assigns controller before viewDidLoad makes the
+            // navigation stacks; a link in that interval must wait too.
             guard !hasWeb else { return false }
             untilShell.append(show)
             return true

package/dist/ios/templates/CraftNativeScreen.swift

@@ -21,6 +21,13 @@ private func number(_ value: Any?) -> CGFloat? {
     return value.isFinite ? value : nil
 }
 
+private func craftNativeFontWeight(_ value: Any?) -> String? {
+    if let value = value as? String { return value }
+    guard !(value is Bool), let number = value as? NSNumber, number.doubleValue.isFinite else { return nil }
+    let integer = number.doubleValue.rounded()
+    return integer == number.doubleValue ? String(Int(integer)) : nil
+}
+
 private func craftNativePickerValue(_ value: Any?) -> String? {
     if let value = value as? String, !value.isEmpty { return value }
     if let value = value as? NSNumber, value.doubleValue.isFinite { return String(value.doubleValue) }
@@ -1228,6 +1235,11 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
         return MKCoordinateRegion(center: CLLocationCoordinate2D(latitude: latitude, longitude: longitude), span: MKCoordinateSpan(latitudeDelta: latitudeDelta, longitudeDelta: longitudeDelta))
     }
 
+    private func nonEmptyHandler(_ handler: String?) -> String? {
+        guard let handler, !handler.isEmpty else { return nil }
+        return handler
+    }
+
     private static func color(_ value: String?) -> UIColor {
         switch value?.lowercased() {
         case "red": return .systemRed
@@ -3947,11 +3959,16 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         // 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)
+        CraftChrome.shared.updateTabAccessory(tabAccessory)
         refreshTraitDefaults()
     }
 
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
+        // 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)
         // 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 {
@@ -4517,6 +4534,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     private var statusBarHiddenOverride: Bool?
     /// The app's tab bar away while this screen shows (`tabBarHidden`).
     private var tabBarHidden = false
+    private var tabAccessory: [String: Any]?
     /// Whether a back-swipe may leave this screen at all, the edge's
     /// included (`swipeBack: false`): a screen that steps through its own
     /// pages with a Back of its own (a first-run tour's questions) would
@@ -4563,6 +4581,12 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         }
         // The app script has no screen, so no bar and no tab bar to change.
         guard !isAppScript else { return }
+        if options.keys.contains("tabAccessory") {
+            tabAccessory = options["tabAccessory"] as? [String: Any]
+            if navigationController?.topViewController === self, view.window != nil {
+                CraftChrome.shared.updateTabAccessory(tabAccessory)
+            }
+        }
         if options.keys.contains("title") {
             navigationItem.title = options["title"] as? String
             titleFromOptions = true
@@ -6610,7 +6634,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         (icon as? CraftNativeIconView)?.defaultBox = box == nil && fontSize == nil ? 20 : nil
         let pointSize = fontSize ?? (box ?? 20) * 0.84
         let weight: UIImage.SymbolWeight
-        switch style["fontWeight"] as? String {
+        switch craftNativeFontWeight(style["fontWeight"]) {
         case "100": weight = .ultraLight
         case "200": weight = .thin
         case "300": weight = .light
@@ -6927,8 +6951,15 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         case "900": weight = .black
         default: weight = .regular
         }
-        var font = (style["fontFamily"] as? String).flatMap { UIFont(name: $0, size: size) }
-            ?? .systemFont(ofSize: size, weight: weight)
+        // Android's TextView uses SP, so its native text scales with the
+        // user's content-size setting. Apply the same Dynamic Type multiplier
+        // here before assigning the font to labels, buttons, and inputs.
+        let scaledSize = UIFontMetrics(forTextStyle: .body).scaledValue(
+            for: size,
+            compatibleWith: traitCollection
+        )
+        var font = (style["fontFamily"] as? String).flatMap { UIFont(name: $0, size: scaledSize) }
+            ?? .systemFont(ofSize: scaledSize, weight: weight)
         if style["fontStyle"] as? String == "italic",
            let descriptor = font.fontDescriptor.withSymbolicTraits(.traitItalic) {
             font = UIFont(descriptor: descriptor, size: size)

package/package.json

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