@craft-native/ios 0.0.471 → 0.0.475

package/package.json

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

package/templates/CraftApp.swift

@@ -819,6 +819,7 @@ final class CraftChrome: ObservableObject {
         var image: String? = nil
         /// A compact floating icon, instead of the system full-width accessory shelf.
         var iconOnly = false
+        var companions: [Tab] = []
     }
 
     @Published var tabs: [Tab] = []
@@ -828,8 +829,12 @@ final class CraftChrome: ObservableObject {
     /// The visible destination may be the accessory, independently of its owning stack.
     @Published var visiblePath: String?
     var accessorySelected: Bool {
-        guard let path = visiblePath, let accessory = tabAccessory?.id else { return false }
-        return path == accessory || path.hasPrefix(accessory + "/")
+        guard let accessory = tabAccessory else { return false }
+        return ([accessory] + accessory.companions).contains { accessorySelected($0) }
+    }
+    func accessorySelected(_ accessory: Tab) -> Bool {
+        guard let path = visiblePath else { return false }
+        return path == accessory.id || path.hasPrefix(accessory.id + "/")
     }
     var highlightedTab: String? { accessorySelected ? nil : selected }
     let tabSwipeProgress = CraftTabSwipeProgress()
@@ -954,7 +959,14 @@ final class CraftChrome: ObservableObject {
             next = 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,
-                iconOnly: item["iconOnly"] as? Bool ?? false)
+                iconOnly: item["iconOnly"] as? Bool ?? false,
+                companions: ((item["companions"] as? [[String: Any]]) ?? []).prefix(2).compactMap { action in
+                    guard let companionPath = action["path"] as? String,
+                          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)
+                })
         } else {
             next = nil
         }
@@ -1265,43 +1277,45 @@ private struct CraftTabBarContent: View {
         if !chrome.tabs.isEmpty {
             HStack(spacing: 8) {
                 bar
-                if let accessory = chrome.tabAccessory {
-                    Button { CraftHybrid.shared.open(accessory.id) } label: {
-                        surface {
-                            Image(systemName: accessory.symbol)
-                                .font(.system(size: iconSize))
-                                .foregroundStyle(chrome.accessorySelected ? selectedColor : Color.primary)
-                                .frame(width: 62, height: 62)
-                                .background {
-                                    if chrome.accessorySelected {
-                                        Circle().fill(selectedColor.opacity(0.14)).padding(4)
+                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)
+                                        }
+                                    }
+                            }
+                                .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))
                                     }
                                 }
                         }
-                            .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 {
-                        Image(systemName: accessory.symbol)
-                        Text(accessory.accessibilityLabel ?? accessory.title)
+                        .buttonStyle(.plain)
+                        .accessibilityShowsLargeContentViewer {
+                            Image(systemName: accessory.symbol)
+                            Text(accessory.accessibilityLabel ?? accessory.title)
+                        }
+                        // Keep accessibility intent for the viewer; displayed
+                        // sizes come from the bounded metrics owned above.
+                        .environment(\.dynamicTypeSize, viewerTextSize)
+                        .accessibilityLabel(accessory.accessibilityLabel ?? accessory.title)
+                        .accessibilityValue(accessory.badge ?? "")
+                        .accessibilityIdentifier("craft-tab-accessory")
+                        .accessibilityAddTraits(chrome.accessorySelected(accessory) ? .isSelected : [])
                     }
-                    // Keep accessibility intent for the viewer; displayed
-                    // sizes come from the bounded metrics owned above.
-                    .environment(\.dynamicTypeSize, viewerTextSize)
-                    .accessibilityLabel(accessory.accessibilityLabel ?? accessory.title)
-                    .accessibilityValue(accessory.badge ?? "")
-                    .accessibilityIdentifier("craft-tab-accessory")
-                    .accessibilityAddTraits(chrome.accessorySelected ? .isSelected : [])
                 }
             }
                 .padding(.horizontal, 16)

package/templates/CraftHybrid.swift

@@ -1192,6 +1192,9 @@ final class CraftHybridController: UITabBarController, UITabBarControllerDelegat
     private var synchronizingTabs = false
     private var accessoryModel: CraftChrome.Tab?
     private let accessoryButton = UIButton(type: .system)
+    private var companionButtons: [UIButton] = []
+    private var companionModels: [CraftChrome.Tab] = []
+    private var companionGlasses: [UIVisualEffectView] = []
     private let accessoryBadge = UILabel()
     private let accessoryGlass = UIVisualEffectView(effect: UIBlurEffect(style: .systemMaterial))
     private static let tabPictures = NSCache<NSURL, UIImage>()
@@ -1410,6 +1413,40 @@ final class CraftHybridController: UITabBarController, UITabBarControllerDelegat
     private func updateSystemAccessory(hidden: Bool) {
         let chrome = CraftChrome.shared
         let model = hidden ? nil : chrome.tabAccessory
+        // Keep controls when only the selected destination or unread badge changes.
+        let companions = model?.iconOnly == true ? model?.companions ?? [] : []
+        if companionModels != companions {
+            companionModels = companions
+            for button in companionButtons { button.removeFromSuperview() }
+            for glass in companionGlasses { glass.removeFromSuperview() }
+            companionButtons.removeAll()
+            companionGlasses.removeAll()
+            for action in companions {
+                let button = UIButton(type: .system)
+                var configuration = UIButton.Configuration.plain()
+                configuration.image = UIImage(systemName: action.symbol)
+                button.configuration = configuration
+                button.accessibilityIdentifier = "craft-tab-companion:" + action.id
+                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)
+                let glass = UIVisualEffectView(effect: UIBlurEffect(style: .systemMaterial))
+#if compiler(>=6.2)
+                if #available(iOS 26.0, *) { glass.effect = UIGlassEffect() }
+#endif
+                glass.layer.cornerRadius = 24
+                glass.clipsToBounds = true
+                glass.isUserInteractionEnabled = false
+                view.addSubview(glass)
+                view.addSubview(button)
+                companionGlasses.append(glass)
+                companionButtons.append(button)
+            }
+        }
+        for (index, action) in companionModels.enumerated() {
+            companionButtons[index].accessibilityTraits = chrome.accessorySelected(action) ? [.button, .selected] : [.button]
+        }
         if let model {
             var configuration = UIButton.Configuration.plain()
             configuration.image = UIImage(systemName: model.symbol)
@@ -1419,7 +1456,7 @@ final class CraftHybridController: UITabBarController, UITabBarControllerDelegat
             accessoryButton.configuration = configuration
             accessoryButton.accessibilityLabel = model.accessibilityLabel ?? model.displayTitle
             accessoryButton.accessibilityValue = model.badge
-            accessoryButton.accessibilityTraits = chrome.accessorySelected ? [.button, .selected] : [.button]
+            accessoryButton.accessibilityTraits = chrome.accessorySelected(model) ? [.button, .selected] : [.button]
         }
 #if compiler(>=6.2)
         if #available(iOS 26.0, *), model?.iconOnly != true {
@@ -1493,6 +1530,11 @@ final class CraftHybridController: UITabBarController, UITabBarControllerDelegat
         let x = iconOnly ? view.bounds.maxX - view.safeAreaInsets.right - width - 20 : 16
         accessoryButton.frame = CGRect(x: x, y: tabBar.frame.minY - height - (iconOnly ? 8 : 0), width: width, height: height)
         accessoryGlass.frame = accessoryButton.frame
+        for (index, button) in companionButtons.enumerated() {
+            // Array order reads left to right, ending at the primary action.
+            button.frame = accessoryButton.frame.offsetBy(dx: -CGFloat(companionButtons.count - index) * (width + 12), dy: 0)
+            companionGlasses[index].frame = button.frame
+        }
         let badgeWidth = max(18, accessoryBadge.intrinsicContentSize.width + 8)
         accessoryBadge.frame = CGRect(x: accessoryButton.frame.maxX - badgeWidth + 4, y: accessoryButton.frame.minY - 3, width: badgeWidth, height: 18)
         // A compact action floats over the page, not across its whole width.

package/templates/CraftNativeScreen.swift

@@ -11444,6 +11444,17 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         // UISwitch also owns its native identity and enabled/on state.
         // Assigning .button changes its legacy AX type into a button while
         // modern XCTest still identifies its UIKit class as a switch.
+        // The solid variant publishes "1"/"0" as a string from
+        // refreshAccessibility(). A UISwitch left to UIKit does not: the value
+        // it hands XCTest arrives as a number, so every `value as? String`
+        // read finds nothing. The driver's flip check is one of those reads,
+        // which is why a switch that did flip was reported as never flipping,
+        // and only sometimes - it depends which representation the accessibility
+        // snapshot was built from. Publishing the string makes both variants
+        // answer the same way. An authored accessibilityValue still wins.
+        if let toggle = view as? UISwitch, !authoredAccessibilityValues.contains(id) {
+            view.accessibilityValue = toggle.isOn ? "1" : "0"
+        }
         if view is UITextView || view is UISwitch { return }
         if let toggle = view as? CraftNativeSolidSwitch { toggle.refreshAccessibility(); return }
         view.accessibilityTraits = traits

package/templates/CraftNativeUI.swift

@@ -30,14 +30,22 @@ enum CraftPresenter {
     }
 
     /// Present over whatever is on screen. A controller that shows as a
-    /// popover on iPad (an action sheet, a share sheet) points at `anchor` in
-    /// `view`, or sits in the middle of it with no arrow; iPadOS raises an
-    /// exception for a popover with neither. False when nothing can present,
-    /// so the caller answers rather than waiting.
+    /// popover (an action sheet, a share sheet, on a regular-width screen)
+    /// points at `anchor` in `view`, or sits in the middle of it with no
+    /// arrow; iPadOS raises an exception for a popover with neither. False
+    /// when nothing can present, so the caller answers rather than waiting.
+    ///
+    /// Only where the presentation really is a popover. A `.actionSheet`
+    /// always carries a `popoverPresentationController`, phone included, and
+    /// from iOS 26 configuring it is enough to make the phone present the
+    /// sheet as a centred popover -- which silently drops its cancel action,
+    /// as UIKit never draws one in a popover. A compact screen is left alone
+    /// and gets the standard sheet, with its Cancel.
     @discardableResult
     static func present(_ controller: UIViewController, from view: UIView?, anchor: CGRect? = nil) -> Bool {
         guard let top = topViewController() else { return false }
-        if let popover = controller.popoverPresentationController {
+        let asPopover = (view ?? top.view)?.traitCollection.horizontalSizeClass == .regular
+        if asPopover, let popover = controller.popoverPresentationController {
             let source = view ?? top.view!
             popover.sourceView = source
             if let anchor {