@craft-native/ios 0.0.476 → 0.0.482

package/package.json

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

package/templates/CraftApp.swift

@@ -820,6 +820,14 @@ final class CraftChrome: ObservableObject {
         /// A compact floating icon, instead of the system full-width accessory shelf.
         var iconOnly = false
         var companions: [Tab] = []
+        /// A tap opens these destinations in a compact menu instead of navigating.
+        var menu: [TabMenuItem] = []
+    }
+
+    struct TabMenuItem: Equatable, Identifiable {
+        let id: String
+        let title: String
+        let symbol: String
     }
 
     @Published var tabs: [Tab] = []
@@ -965,7 +973,13 @@ final class CraftChrome: ObservableObject {
                           companionPath.hasPrefix("/"), !companionPath.hasPrefix("//"), companionPath != path,
                           let companionTitle = action["title"] as? String else { return nil }
                     return Tab(id: companionPath, title: companionTitle, symbol: action["symbol"] as? String ?? "circle",
-                        accessibilityLabel: action["accessibilityLabel"] as? String, iconOnly: true)
+                        accessibilityLabel: action["accessibilityLabel"] as? String, iconOnly: true,
+                        menu: ((action["menu"] as? [[String: Any]]) ?? []).prefix(12).compactMap { choice in
+                            guard let destination = choice["path"] as? String,
+                                  destination.hasPrefix("/"), !destination.hasPrefix("//"),
+                                  let label = choice["title"] as? String, !label.isEmpty else { return nil }
+                            return TabMenuItem(id: destination, title: label, symbol: choice["symbol"] as? String ?? "circle")
+                        })
                 })
         } else {
             next = nil
@@ -1273,35 +1287,46 @@ private struct CraftTabBarContent: View {
     @ScaledMetric(relativeTo: .caption2) private var labelSize: CGFloat = 11
     @ScaledMetric(relativeTo: .caption2) private var badgeSize: CGFloat = 10
 
+    private func accessoryLabel(_ accessory: CraftChrome.Tab) -> some View {
+        surface {
+            Image(systemName: accessory.symbol)
+                .font(.system(size: iconSize))
+                .foregroundStyle(chrome.accessorySelected(accessory) ? selectedColor : Color.primary)
+                .frame(width: 62, height: 62)
+                .background {
+                    if chrome.accessorySelected(accessory) {
+                        Circle().fill(selectedColor.opacity(0.14)).padding(4)
+                    }
+                }
+        }
+            .contentShape(Rectangle())
+            .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))
+                }
+            }
+    }
     var body: some View {
         if !chrome.tabs.isEmpty {
             HStack(spacing: 8) {
                 bar
                 if let primary = chrome.tabAccessory {
                     ForEach(primary.companions + [primary]) { accessory in
-                        Button { CraftHybrid.shared.open(accessory.id) } label: {
-                            surface {
-                                Image(systemName: accessory.symbol)
-                                    .font(.system(size: iconSize))
-                                    .foregroundStyle(chrome.accessorySelected(accessory) ? selectedColor : Color.primary)
-                                    .frame(width: 62, height: 62)
-                                    .background {
-                                        if chrome.accessorySelected(accessory) {
-                                            Circle().fill(selectedColor.opacity(0.14)).padding(4)
-                                        }
+                        Group {
+                            if accessory.menu.isEmpty {
+                                Button { CraftHybrid.shared.open(accessory.id) } label: { accessoryLabel(accessory) }
+                            } else {
+                                Menu {
+                                    ForEach(accessory.menu) { choice in
+                                        Button { CraftHybrid.shared.open(choice.id) } label: { Label(choice.title, systemImage: choice.symbol) }
                                     }
+                                } label: { accessoryLabel(accessory) }
                             }
-                                .contentShape(Rectangle())
-                                .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)
                         .accessibilityShowsLargeContentViewer {

package/templates/CraftHybrid.swift

@@ -1430,7 +1430,17 @@ final class CraftHybridController: UITabBarController, UITabBarControllerDelegat
                 button.accessibilityLabel = action.accessibilityLabel ?? action.title
                 button.accessibilityValue = action.badge
                 button.accessibilityTraits = chrome.accessorySelected(action) ? [.button, .selected] : [.button]
-                button.addAction(UIAction { [weak self] _ in self?.hybrid.open(action.id) }, for: .touchUpInside)
+                if action.menu.isEmpty {
+                    button.addAction(UIAction { [weak self] _ in self?.hybrid.open(action.id) }, for: .touchUpInside)
+                } else {
+                    button.menu = UIMenu(children: action.menu.map { choice in
+                        UIAction(title: choice.title, image: UIImage(systemName: choice.symbol)) { [weak self] _ in
+                            self?.hybrid.open(choice.id)
+                        }
+                    })
+                    button.showsMenuAsPrimaryAction = true
+                    if #available(iOS 16.0, *) { button.preferredMenuElementOrder = .fixed }
+                }
                 let glass = UIVisualEffectView(effect: UIBlurEffect(style: .systemMaterial))
 #if compiler(>=6.2)
                 if #available(iOS 26.0, *) { glass.effect = UIGlassEffect() }

package/templates/CraftNativeActions.swift

@@ -36,6 +36,7 @@ enum CraftNativeActions {
     private static var biometricContexts = [String: LAContext]()
     #endif
     private static var fetchTasks = [String: URLSessionTask]()
+    private static var fetchProgress = [String: NSKeyValueObservation]()
     private static let fetchSession: URLSession = {
         let configuration = URLSessionConfiguration.default
         configuration.timeoutIntervalForRequest = craftNativeFetchTimeoutSeconds
@@ -50,6 +51,7 @@ enum CraftNativeActions {
         // `speech`, `audio` (background sound) and `eventStream` (a fetch read
         // as it arrives) need nothing the app has to declare.
         var values = ["device", "clipboard", "haptics", "storage", "lifecycle", "fetch", "dialog", "speech", "audio", "eventStream", "linking", "badge", "animation", "viewFocus", "viewMeasure", "viewReparent", "viewNonModalPresentation", "nativePlatformControls"]
+        values.append("uploadProgress")
         values.append("network")
         values.append("nativePager")
         values.append("storageCompareAndSet")
@@ -180,6 +182,7 @@ enum CraftNativeActions {
         method: String,
         args: [Any],
         config: CraftConfig,
+        onUploadProgress: (([String: Any]) -> Void)? = nil,
         completion: @escaping (Result<Any, CraftNativeActionError>) -> Void
     ) {
         cancellationLock.lock()
@@ -293,7 +296,9 @@ enum CraftNativeActions {
             CraftWebServices.perform(action: "getNetworkStatus", body: [:]) { complete(requestToken, $0, completion) }
             return
         case ("Network", "fetch"):
-            fetch(requestToken: requestToken, args: args, completion: completion)
+            DispatchQueue.global(qos: .utility).async {
+                fetch(requestToken: requestToken, args: args, onUploadProgress: onUploadProgress, completion: completion)
+            }
             return
         case ("Files", "pickImage"):
             // A person picks, so the bridge never times it out.
@@ -783,6 +788,7 @@ enum CraftNativeActions {
         let context = biometricContexts.removeValue(forKey: requestToken)
         #endif
         let task = fetchTasks.removeValue(forKey: requestToken)
+        fetchProgress.removeValue(forKey: requestToken)
         cancellationLock.unlock()
         #if CRAFT_PERMISSION_BIOMETRIC
         context?.invalidate()
@@ -798,8 +804,13 @@ enum CraftNativeActions {
     private static func fetch(
         requestToken: String,
         args: [Any],
+        onUploadProgress: (([String: Any]) -> Void)?,
         completion: @escaping (Result<Any, CraftNativeActionError>) -> Void
     ) {
+        guard !isCancelled(requestToken) else {
+            complete(requestToken, failure("CANCELLED", "Upload cancelled"), completion)
+            return
+        }
         guard let options = args.first as? [String: Any],
               let address = options["url"] as? String,
               let url = URL(string: address),
@@ -855,6 +866,7 @@ enum CraftNativeActions {
             if let uploadFile { CraftNativeFiles.remove(uploadFile.path) }
             cancellationLock.lock()
             fetchTasks.removeValue(forKey: requestToken)
+            fetchProgress.removeValue(forKey: requestToken)
             cancellationLock.unlock()
             if let error = error {
                 let code = (error as? URLError)?.code == .timedOut ? "TIMEOUT" : "NETWORK_ERROR"
@@ -891,12 +903,22 @@ enum CraftNativeActions {
         }
         let task: URLSessionTask = uploadFile.map { fetchSession.uploadTask(with: request, fromFile: $0, completionHandler: responseHandler) }
             ?? fetchSession.dataTask(with: request, completionHandler: responseHandler)
+        let uploadID = options["uploadProgressId"] as? String ?? ""
+        let expectedBytes = uploadFile.flatMap { try? $0.resourceValues(forKeys: [.fileSizeKey]).fileSize }.map { Int64($0) } ?? Int64(request.httpBody?.count ?? 0)
+        let observation = !uploadID.isEmpty && onUploadProgress != nil ? task.observe(\.countOfBytesSent, options: [.initial, .new]) { task, _ in
+            let total = max(task.countOfBytesExpectedToSend, expectedBytes)
+            guard total > 0 else { return }
+            onUploadProgress?(["id": uploadID, "loaded": min(max(0, task.countOfBytesSent), total), "total": total])
+        } : nil
         cancellationLock.lock()
         let alreadyCancelled = cancelledRequests.contains(requestToken)
-        if !alreadyCancelled { fetchTasks[requestToken] = task }
+        if !alreadyCancelled { fetchTasks[requestToken] = task; fetchProgress[requestToken] = observation }
         cancellationLock.unlock()
         if !alreadyCancelled { task.resume() }
-        else if let uploadFile { CraftNativeFiles.remove(uploadFile.path) }
+        else {
+            if let uploadFile { CraftNativeFiles.remove(uploadFile.path) }
+            complete(requestToken, failure("CANCELLED", "Upload cancelled"), completion)
+        }
     }
 
     /// `craft.files.download`: a GET straight to a file made here (for the

package/templates/CraftNativeScreen.swift

@@ -3155,6 +3155,44 @@ private class CraftNativeFlowView: UIStackView {
 
     // MARK: Touches
 
+    /// UIKit skips empty component wrappers, including their visible floating
+    /// controls. Supply the real accessible descendants only when such wrappers
+    /// occur; ordinary native subtrees keep UIKit's automatic traversal.
+    private var authoredAccessibilityElements: [Any]?
+    private weak var explicitAccessibilityOwner: CraftNativeFlowView?
+    private var needsExplicitAccessibility: Bool {
+        if let owner = explicitAccessibilityOwner, isDescendant(of: owner), owner.needsExplicitAccessibility { return true }
+        return subviews.contains(where: { $0 is CraftNativeFlowView && $0.bounds.isEmpty })
+    }
+    override var accessibilityElements: [Any]? {
+        get {
+            if let authored = authoredAccessibilityElements { return authored }
+            guard !isAccessibilityElement, needsExplicitAccessibility else { return nil }
+            return subviews.flatMap { Self.accessibleDescendants($0, owner: self) }
+        }
+        set {
+            authoredAccessibilityElements = newValue
+            super.accessibilityElements = newValue
+        }
+    }
+
+    private static func accessibleDescendants(_ view: UIView, owner: CraftNativeFlowView) -> [Any] {
+        guard !view.isHidden, view.alpha > 0.01, !view.accessibilityElementsHidden else { return [] }
+        guard let flow = view as? CraftNativeFlowView, !flow.isAccessibilityElement,
+              flow.accessibilityContainerType == .none else { return [view] }
+        guard !flow.bounds.isEmpty || !flow.clipsToBounds else { return [] }
+        if let authored = flow.authoredAccessibilityElements { return authored }
+        if !flow.bounds.isEmpty {
+            // Keep the real container's identity and frame, and let UIKit
+            // traverse its real children through the same explicit contract.
+            // Flattening every nonempty View discarded ordinary containers
+            // such as the native navigation fixture's max-content bubble.
+            flow.explicitAccessibilityOwner = owner
+            return [flow]
+        }
+        return flow.subviews.flatMap { accessibleDescendants($0, owner: owner) }
+    }
+
     /// A child drawn outside this view's bounds still takes its touches, as an
     /// overflowing element is clickable on the web, unless the view clips
     /// (`overflow: hidden`). UIKit only asks a view's children when the point
@@ -4414,6 +4452,9 @@ private final class CraftNativeSegmentedControl: UISegmentedControl {
         if segments.count != items.count { segments = items.indices.map { CraftNativeSegmentElement(control: self, index: $0) } }
         for (index, item) in items.enumerated() {
             segments[index].accessibilityLabel = item["spoken"] as? String ?? item["label"] as? String ?? values[index]
+            // Match the shared component's <group testID>-<value> identity.
+            // UIKit's private segment views do not inherit identifiers.
+            segments[index].accessibilityIdentifier = accessibilityIdentifier.map { "\($0)-\(values[index])" }
         }
         refreshAccessibilityState()
         setNeedsLayout()
@@ -7359,10 +7400,14 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     ///   for every screen.
     /// - `craft.secureStorage.getSync(key)`: the Keychain item the web page's
     ///   `craft.secureStorage.set` wrote.
-    /// - `craft.navigation.setOptions({ title, largeTitle, hidden, backTitle,
-    ///   tabBarHidden, swipeBack, contentSwipeBack, tabSwipeEnabled,
-    ///   backgroundColor, navigationBarSolid, rightButtons, tabAccessory })`;
-    ///   a right button's tap is the event `navButton`.
+    /// - `craft.navigation.setOptions({ title, titleColor, largeTitle, hidden,
+    ///   backTitle, tabBarHidden, tabItem, swipeBack, contentSwipeBack,
+    ///   tabSwipeEnabled, backgroundColor, navigationBarSolid, leftButtons,
+    ///   rightButtons, tabAccessory })`; a button's tap is the event
+    ///   `navButton`. `craft.d.ts` types no navigation surface, so this list
+    ///   is the public description of it — keep it in step with the keys
+    ///   `setOptions` reads, which is how `leftButtons`, `tabItem` and
+    ///   `titleColor` came to ship undocumented.
     ///
     /// A runtime that assigns `craft.storage` (or the others) afterwards keeps
     /// these: each namespace is a property whose setter adds them back to the
@@ -8724,6 +8769,12 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                 method: method,
                 args: args,
                 config: config,
+                onUploadProgress: { [weak self] progress in
+                    DispatchQueue.main.async {
+                        guard let self, self.pendingCapabilityRequests.contains(requestToken), !self.runtimeDisposed else { return }
+                        self.send(type: "NETWORK_UPLOAD_PROGRESS", payload: progress)
+                    }
+                },
                 completion: reply
             )
         case "API_CANCEL":