@craft-native/ios 0.0.491 → 0.0.496

package/package.json

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

package/templates/CraftApp.swift

@@ -819,6 +819,8 @@ final class CraftChrome: ObservableObject {
         var image: String? = nil
         /// A compact floating icon, instead of the system full-width accessory shelf.
         var iconOnly = false
+        /// A shared material capsule; nil keeps separate floating buttons.
+        var accessoryLayout: String? = nil
         var companions: [Tab] = []
         /// A tap opens these destinations in a compact menu instead of navigating.
         var menu: [TabMenuItem] = []
@@ -964,10 +966,11 @@ final class CraftChrome: ObservableObject {
         if let item, let path = item["path"] as? String,
            path.hasPrefix("/"), !path.hasPrefix("//"),
            let title = item["title"] as? String {
-            next = Tab(id: path, title: title, symbol: item["symbol"] as? String ?? "message",
+            next = Tab(id: path, title: title, symbol: item["symbol"] as? String ?? "bubble.left",
                 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) || ["vertical", "horizontal"].contains(item["layout"] as? String ?? ""),
+                accessoryLayout: (item["layout"] as? String).flatMap { ["vertical", "horizontal"].contains($0) ? $0 : nil },
                 companions: ((item["companions"] as? [[String: Any]]) ?? []).prefix(2).compactMap { action in
                     guard let companionPath = action["path"] as? String,
                           companionPath.hasPrefix("/"), !companionPath.hasPrefix("//"), companionPath != path,

package/templates/CraftHybrid.swift

@@ -1241,9 +1241,14 @@ final class CraftHybridController: UITabBarController, UITabBarControllerDelegat
     private var synchronizingTabs = false
     private var accessoryModel: CraftChrome.Tab?
     private let accessoryButton = UIButton(type: .system)
+    // UIKit retains its shelf's content view across removal animations. Never
+    // reparent that same button into floating chrome: the shelf can take it
+    // back after our layout, leaving a perfectly sized but empty capsule.
+    private let shelfAccessoryButton = UIButton(type: .system)
     private var companionButtons: [UIButton] = []
     private var companionModels: [CraftChrome.Tab] = []
     private var companionGlasses: [UIVisualEffectView] = []
+    private var accessorySeparators: [UIView] = []
     private let accessoryBadge = UILabel()
     private let accessoryGlass = UIVisualEffectView(effect: UIBlurEffect(style: .systemMaterial))
     private static let tabPictures = NSCache<NSURL, UIImage>()
@@ -1309,6 +1314,8 @@ final class CraftHybridController: UITabBarController, UITabBarControllerDelegat
         CraftChromeFonts.apply(to: tabBar)
         accessoryButton.accessibilityIdentifier = "craft-tab-accessory"
         accessoryButton.addTarget(self, action: #selector(openTabAccessory), for: .touchUpInside)
+        shelfAccessoryButton.accessibilityIdentifier = "craft-tab-accessory"
+        shelfAccessoryButton.addTarget(self, action: #selector(openTabAccessory), for: .touchUpInside)
         chromeSubscription = CraftChrome.shared.objectWillChange.sink { [weak self] in
             guard let self, !self.chromeUpdatePending else { return }
             self.chromeUpdatePending = true
@@ -1474,6 +1481,7 @@ final class CraftHybridController: UITabBarController, UITabBarControllerDelegat
                 let button = UIButton(type: .system)
                 var configuration = UIButton.Configuration.plain()
                 configuration.image = UIImage(systemName: action.symbol)
+                configuration.preferredSymbolConfigurationForImage = UIImage.SymbolConfiguration(pointSize: 22, weight: .regular)
                 button.configuration = configuration
                 button.accessibilityIdentifier = "craft-tab-companion:" + action.id
                 button.accessibilityLabel = action.accessibilityLabel ?? action.title
@@ -1506,16 +1514,32 @@ final class CraftHybridController: UITabBarController, UITabBarControllerDelegat
         for (index, action) in companionModels.enumerated() {
             companionButtons[index].accessibilityTraits = chrome.accessorySelected(action) ? [.button, .selected] : [.button]
         }
+        let grouped = model?.accessoryLayout != nil
+        for glass in companionGlasses { glass.isHidden = grouped }
+        for button in companionButtons { button.tintColor = grouped ? .label : nil }
+        accessoryButton.tintColor = grouped ? .label : nil
+        for separator in accessorySeparators { separator.removeFromSuperview() }
+        accessorySeparators = grouped ? companionButtons.map { _ in
+            let separator = UIView()
+            separator.backgroundColor = .separator
+            separator.isUserInteractionEnabled = false
+            separator.isAccessibilityElement = false
+            view.addSubview(separator)
+            return separator
+        } : []
         if let model {
             var configuration = UIButton.Configuration.plain()
             configuration.image = UIImage(systemName: model.symbol)
+            configuration.preferredSymbolConfigurationForImage = UIImage.SymbolConfiguration(pointSize: 22, weight: .regular)
             configuration.title = model.iconOnly ? nil : model.displayTitle
             configuration.subtitle = model.iconOnly ? nil : model.badge
             configuration.imagePadding = model.iconOnly ? 0 : 8
-            accessoryButton.configuration = configuration
-            accessoryButton.accessibilityLabel = model.accessibilityLabel ?? model.displayTitle
-            accessoryButton.accessibilityValue = model.badge
-            accessoryButton.accessibilityTraits = chrome.accessorySelected(model) ? [.button, .selected] : [.button]
+            for button in [accessoryButton, shelfAccessoryButton] {
+                button.configuration = configuration
+                button.accessibilityLabel = model.accessibilityLabel ?? model.displayTitle
+                button.accessibilityValue = model.badge
+                button.accessibilityTraits = chrome.accessorySelected(model) ? [.button, .selected] : [.button]
+            }
         }
 #if compiler(>=6.2)
         if #available(iOS 26.0, *), model?.iconOnly != true {
@@ -1525,7 +1549,7 @@ final class CraftHybridController: UITabBarController, UITabBarControllerDelegat
                 accessoryButton.removeFromSuperview()
             }
             if (model == nil) != (bottomAccessory == nil) {
-                bottomAccessory = model.map { _ in UITabAccessory(contentView: accessoryButton) }
+                bottomAccessory = model.map { _ in UITabAccessory(contentView: shelfAccessoryButton) }
             }
             accessoryModel = model
             for nav in stacks.values { nav.additionalSafeAreaInsets.bottom = 0 }
@@ -1549,7 +1573,7 @@ final class CraftHybridController: UITabBarController, UITabBarControllerDelegat
         accessoryButton.isHidden = model == nil
         accessoryGlass.isHidden = model == nil
         accessoryGlass.isUserInteractionEnabled = false
-        accessoryGlass.layer.cornerRadius = 24
+        accessoryGlass.layer.cornerRadius = grouped ? 26 : 24
         accessoryGlass.clipsToBounds = true
         accessoryButton.backgroundColor = .clear
         accessoryButton.layer.cornerRadius = 24
@@ -1563,6 +1587,15 @@ final class CraftHybridController: UITabBarController, UITabBarControllerDelegat
         accessoryBadge.clipsToBounds = true
         accessoryBadge.isAccessibilityElement = false
         accessoryModel = model
+        // The shared material must stay behind every button, even after a
+        // companion-only update creates new controls or a shelf changes mode.
+        if accessoryGlass.superview === view {
+            view.bringSubviewToFront(accessoryGlass)
+            for button in companionButtons { view.bringSubviewToFront(button) }
+            view.bringSubviewToFront(accessoryButton)
+            for separator in accessorySeparators { view.bringSubviewToFront(separator) }
+            view.bringSubviewToFront(accessoryBadge)
+        }
         for nav in stacks.values { nav.additionalSafeAreaInsets.bottom = safeAreaForTabBar() }
         view.setNeedsLayout()
     }
@@ -1586,14 +1619,30 @@ final class CraftHybridController: UITabBarController, UITabBarControllerDelegat
         let iconOnly = accessoryModel?.iconOnly == true
         let height: CGFloat = iconOnly ? 48 : 44
         let width: CGFloat = iconOnly ? 48 : max(0, view.bounds.width - 32)
-        let x = iconOnly ? view.bounds.maxX - view.safeAreaInsets.right - width - 20 : 16
+        let trailingX = view.effectiveUserInterfaceLayoutDirection == .rightToLeft
+            ? view.safeAreaInsets.left + 20 : view.bounds.maxX - view.safeAreaInsets.right - width - 20
+        let x = iconOnly ? trailingX : 16
         accessoryButton.frame = CGRect(x: x, y: tabBar.frame.minY - height - (iconOnly ? 8 : 0), width: width, height: height)
         accessoryGlass.frame = accessoryButton.frame
+        let layout = accessoryModel?.accessoryLayout
         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)
+            let offset = CGFloat(companionButtons.count - index)
+            if layout == "vertical" {
+                button.frame = accessoryButton.frame.offsetBy(dx: 0, dy: -offset * height)
+            } else {
+                let direction: CGFloat = view.effectiveUserInterfaceLayoutDirection == .rightToLeft ? 1 : -1
+                button.frame = accessoryButton.frame.offsetBy(dx: direction * offset * (width + (layout == nil ? 12 : 0)), dy: 0)
+            }
             companionGlasses[index].frame = button.frame
+            if layout != nil {
+                accessoryGlass.frame = accessoryGlass.frame.union(button.frame)
+                let line = 1 / (view.window?.screen.scale ?? 2)
+                accessorySeparators[index].frame = layout == "vertical"
+                    ? CGRect(x: button.frame.minX + 12, y: button.frame.maxY - line / 2, width: width - 24, height: line)
+                    : CGRect(x: view.effectiveUserInterfaceLayoutDirection == .rightToLeft ? button.frame.minX : button.frame.maxX - line / 2, y: button.frame.minY + 12, width: line, height: height - 24)
+            }
         }
+        if layout != nil { accessoryGlass.frame = accessoryGlass.frame.insetBy(dx: -2, dy: -2) }
         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.
@@ -2595,8 +2644,8 @@ final class CraftHybridController: UITabBarController, UITabBarControllerDelegat
             // Craft's content swipe must not steal their drag/hold gestures.
             let point = gestureRecognizer.location(in: view)
             if !tabBar.isHidden, tabBar.frame.contains(point) { return false }
-            if !accessoryButton.isHidden, accessoryButton.window != nil,
-               accessoryButton.convert(accessoryButton.bounds, to: view).contains(point) { return false }
+            if [accessoryButton, shelfAccessoryButton].contains(where: { !$0.isHidden && $0.window != nil && $0.convert($0.bounds, to: view).contains(point) }) { return false }
+            if companionButtons.contains(where: { !$0.isHidden && $0.window != nil && $0.convert($0.bounds, to: view).contains(point) }) { return false }
             // A swipe may begin while the last one settles: it catches it.
             guard activeTabSwipeTarget == nil || tabSwipeSettling,
                   hybrid.tabIds.count > 1, let nav = visibleStack, let top = nav.topViewController else { return false }

package/templates/CraftNativeActions.swift

@@ -2007,8 +2007,9 @@ enum CraftSnapshots {
                 // after a failure finds the previous value, because `pending`
                 // was cleared above and the cache was only refilled on success.
                 // Posting only on success left a failed checkpoint on screen as
-                // though it had been kept; Android already restores it
-                // (`changed("snapshots", name, if (ok) json else previous, null)`).
+                // though it had been kept; Android restores it by sending what
+                // a read gives once the write settles
+                // (`changed("snapshots", name, current, null)`).
                 NotificationCenter.default.post(name: changed, object: nil, userInfo: ["name": name])
                 completion?(ok)
             }

package/templates/CraftNativeFiles.swift

@@ -126,12 +126,21 @@ enum CraftNativeFiles {
         return url
     }
 
-    /// A file name with no path in it.
+    /// A file name with no path in it that the disk will take. A long name
+    /// is cut to fit and keeps its extension, which is how a share sheet and
+    /// an upload know what the file is.
     static func safeName(_ name: String) -> String {
         let parts = name.components(separatedBy: CharacterSet(charactersIn: "/\\:\u{0}\r\n"))
         var cleaned = parts.joined(separator: "-").trimmingCharacters(in: .whitespacesAndNewlines)
         while cleaned.hasPrefix(".") { cleaned.removeFirst() }
-        return cleaned.isEmpty ? "file" : String(cleaned.prefix(120))
+        // 255 UTF-16 units is what the file system takes, and 120 characters
+        // of flags or family emoji is more than that.
+        guard cleaned.count > 120 || cleaned.utf16.count > 255 else { return cleaned.isEmpty ? "file" : cleaned }
+        let ending = (cleaned as NSString).pathExtension
+        let suffix = ending.isEmpty || ending.count > 15 ? "" : "." + ending
+        var stem = String(cleaned.dropLast(suffix.count).prefix(120 - suffix.count))
+        while (stem + suffix).utf16.count > 255, !stem.isEmpty { stem.removeLast() }
+        return stem + suffix
     }
 
     static func describe(_ url: URL, type: String, extra: [String: Any] = [:]) -> [String: Any] {
@@ -857,6 +866,30 @@ enum CraftNativeFiles {
         }
     }
 
+    /// Base64 as `atob` reads it, which is what the browser host runs and
+    /// what Android is held to: the alphabet, ASCII white space anywhere,
+    /// padding optional but right when it is there, and nothing else.
+    /// Foundation alone wants the padding present and lets a third `=` by.
+    static func decodeBase64(_ text: String) -> Data? {
+        var data = [UInt8]()
+        data.reserveCapacity(text.utf8.count + 2)
+        var padding = 0
+        for byte in text.utf8 {
+            switch byte {
+            case 0x20, 0x09, 0x0A, 0x0C, 0x0D: continue
+            case UInt8(ascii: "="): padding += 1
+            case _ where padding > 0: return nil
+            case UInt8(ascii: "A")...UInt8(ascii: "Z"), UInt8(ascii: "a")...UInt8(ascii: "z"),
+                 UInt8(ascii: "0")...UInt8(ascii: "9"), UInt8(ascii: "+"), UInt8(ascii: "/"):
+                data.append(byte)
+            default: return nil
+            }
+        }
+        guard padding <= 2, data.count % 4 != 1, padding == 0 || (data.count + padding) % 4 == 0 else { return nil }
+        data.append(contentsOf: repeatElement(UInt8(ascii: "="), count: (4 - data.count % 4) % 4))
+        return Data(base64Encoded: Data(data))
+    }
+
     /// What a screen made itself (a CSV export, a route it built) written as
     /// a file for the share sheet: `data` is text (`encoding: 'utf8'`, the
     /// default, so a CSV crosses the bridge once and no larger) or base64
@@ -874,7 +907,7 @@ enum CraftNativeFiles {
         case "utf8":
             bytes = Data(text.utf8)
         case "base64":
-            guard let decoded = Data(base64Encoded: text.filter { !$0.isWhitespace }) else {
+            guard let decoded = decodeBase64(text) else {
                 return .failure(CraftNativeActionError(code: "INVALID_ARGUMENT", message: "files.write was given base64 it could not read"))
             }
             bytes = decoded

package/templates/CraftNativeScreen.swift

@@ -9423,7 +9423,18 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         case ("Audio", "resume"):
             reply(.success(sounds.resume(id: id)))
         case ("Audio", "setVolume"):
-            reply(.success(sounds.setVolume(id: id, volume: number(1), fade: number(2, "fade") / 1000)))
+            // A missing or non-numeric volume used to arrive here as 0 — the
+            // `number` helper's fallback — which silenced the sound and
+            // answered true. Android refuses it and leaves the sound as it
+            // was (`!volume.isFinite() || !fade.isFinite() || fade < 0`), so a
+            // malformed call muted on one host and did nothing on the other.
+            let fade = number(2, "fade")
+            guard args.count > 1, let volume = craftNativeNumber(args[1])?.doubleValue,
+                  volume.isFinite, fade.isFinite, fade >= 0 else {
+                reply(.success(false))
+                return true
+            }
+            reply(.success(sounds.setVolume(id: id, volume: volume, fade: fade / 1000)))
         case ("Audio", "stop"):
             reply(.success(sounds.stop(id: id, fadeOut: number(1, "fadeOut") / 1000)))
         case ("Audio", "stopAll"):

package/templates/testing/DriverTests.swift.template

@@ -342,7 +342,19 @@ final class DriverTests: XCTestCase {
     }
 
     /// Deliver one gesture; the command's observation determines success.
-    func press(_ element: XCUIElement) {
+    ///
+    /// Waits for the target to come to rest first (`settledFrame`) and returns
+    /// the frame it settled on. Every tap command goes through here, so a
+    /// control touched straight after a flick cannot be hit while the scroll
+    /// view is still decelerating — whichever command did the tapping. #449
+    /// settled only the boolean `tapid` branch, which left `tap`, `tapif`,
+    /// `tapexact` and non-boolean `tapid` with the same exposure.
+    ///
+    /// Waiting before the one gesture is not a second gesture, and for a
+    /// control already at rest this costs one 0.1s read.
+    @discardableResult
+    func press(_ element: XCUIElement) -> CGRect {
+        let settled = settledFrame(element)
         // Resolve this before activation: a menu item can disappear as soon
         // as its gesture completes (for example Select All).
         let input = [.textField, .secureTextField, .textView, .searchField].contains(element.elementType)
@@ -352,6 +364,7 @@ final class DriverTests: XCTestCase {
         // A tap on a read-only text view need not open the keyboard. Only a
         // following type command observes whether this target took focus.
         lastTappedInput = input
+        return settled
     }
 
     /// `target`'s frame once it has stopped moving, or its last reading at
@@ -541,8 +554,9 @@ final class DriverTests: XCTestCase {
                 // renderer or hit-testing failure (HQ agreement job 7570).
                 let before = target.value as? String
                 let enabledBefore = target.isEnabled
-                let frameBefore = settledFrame(target)
-                press(target)
+                // press settles before it taps and hands back the frame it
+                // settled on, so this is one read rather than two.
+                let frameBefore = press(target)
                 let settle = Date().addingTimeInterval(1.5)
                 var flipped = false
                 repeat {