@craft-native/ios 0.0.163 → 0.0.164

package/README.md

@@ -148,6 +148,8 @@ The iOS host uses the shared layout ABI when it is available and retains a
 local fallback for older runtimes. Both paths implement wrapped-line and grid
 `alignContent`, including `space-evenly`, so a missing optional shared symbol
 does not change placement semantics.
+Reverse flex directions also retain wrapped line order on the cross axis while
+reversing each line's main-axis children, matching Android's native host.
 
 For multiple native screens, configure named `.stx` routes and an initial screen in `native.config.json` (see [`fixtures/native-navigation`](./fixtures/native-navigation)). Compile without a positional file: `stx native compile --format bundle --output ./screen.js`. A screen can call `craft.navigation.push('details', { id: 7 })`, `.replace('home')`, or `.back()`; the destination reads `craft.route.params`. Craft uses a native navigation stack, so the back button and edge-swipe reveal the existing controller and retain its JavaScript and input state. `bun packages/ios/scripts/test-native-navigation.ts` compiles the fixture and runs its simulator test; the default WebView renderer is unchanged.
 
@@ -405,6 +407,10 @@ const workouts = await health.getWorkouts({ startDate: Date.now() - 30 * 8640000
 const hrv = await health.getDailyStatistics('heartRateVariability', { startDate: Date.now() - 30 * 86400000 })
 // What a food log wrote (MyFitnessPal, Lose It!...): kcal, then grams of protein, carbohydrate and fat, summed per day.
 const eaten = await health.getDailyStatistics('dietaryEnergy', { startDate: Date.now() - 7 * 86400000 })
+// Food logs can write a quantity too; request write access first. The result
+// contains HealthKit's sample id, and the date range defaults to this instant.
+await health.requestAuthorization(['dietaryEnergy', 'dietaryProtein'], { write: true })
+const sample = await health.saveData('dietaryProtein', 28, { startDate: mealStart, endDate: mealEnd })
 // Every heart-rate reading in a range (bpm, start/end, source and device), oldest first.
 const readings = await health.getHeartRateSamples({ startDate: Date.now() - 86400000 })
 // The night as Apple Health recorded it: in bed, awake, and each asleep stage.

package/package.json

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

package/templates/CraftApp.swift

@@ -738,6 +738,18 @@ final class CraftChrome: ObservableObject {
         emit("craftTabSelect", ["id": tab.id])
     }
 
+    /// A completed horizontal swipe selects the adjacent tab. The shell owns
+    /// this path so it works over both native screens and the shared WebView.
+    /// The gesture recognizer yields before calling this for a screen-owned
+    /// horizontal scroll or custom pager.
+    func swipe(to id: String) {
+        guard id != selected, tabs.contains(where: { $0.id == id }) else { return }
+        withAnimation(Self.motion(.spring(response: 0.32, dampingFraction: 0.86))) { selected = id }
+        UISelectionFeedbackGenerator().selectionChanged()
+        guard CraftHybrid.shared.tabTapped(id, reselect: false) else { return }
+        emit("craftTabSelect", ["id": id])
+    }
+
     /// The animation, or none with Reduce Motion on: the selection jumps to
     /// its tab rather than springing there, as UIKit's own controls do.
     static func motion(_ animation: Animation) -> Animation? {
@@ -2514,6 +2526,21 @@ struct CraftWebView: UIViewRepresentable {
                 } else {
                     rejectCallback(callbackId, error: "HealthKit is disabled", code: "CAPABILITY_DISABLED")
                 }
+            case "saveHealthData":
+                if config.enableHealthKit {
+                    guard let dataType = body["type"] as? String,
+                          let value = (body["value"] as? NSNumber)?.doubleValue else {
+                        rejectCallback(callbackId, error: "saveHealthData was called without a type and numeric value", code: "INVALID_ARGUMENT")
+                        break
+                    }
+                    CraftHealth.shared.saveData(
+                        type: dataType,
+                        value: value,
+                        options: body
+                    ) { [weak self] in self?.answer(callbackId, $0) }
+                } else {
+                    rejectCallback(callbackId, error: "HealthKit is disabled", code: "CAPABILITY_DISABLED")
+                }
             case "saveHealthWorkout":
                 if config.enableHealthKit {
                     saveHealthWorkout(body: body, callbackId: callbackId)
@@ -5077,6 +5104,10 @@ struct CraftWebView: UIViewRepresentable {
                         options = options || {};
                         return craft._invoke('getHealthData', {type: type, startDate: options.startDate, endDate: options.endDate});
                     },
+                    saveData: function(type, value, options) {
+                        options = options || {};
+                        return craft._invoke('saveHealthData', {type: type, value: value, startDate: options.startDate, endDate: options.endDate});
+                    },
                     saveWorkout: function(workout) { return craft._invoke('saveHealthWorkout', workout || {}); },
                     getWorkouts: function(options) {
                         options = options || {};

package/templates/CraftHealth.swift

@@ -32,6 +32,13 @@ final class CraftHealth {
         case "getData":
             guard let type = args.first as? String else { return completion(.failure(CraftHealthError(message: "getData needs a type", code: "INVALID_ARGUMENT"))) }
             getData(type: type, startDate: options(1)["startDate"] as? Double, endDate: options(1)["endDate"] as? Double, completion: completion)
+        case "saveData":
+            guard let type = args.first as? String,
+                  args.count > 1,
+                  let value = (args[1] as? NSNumber)?.doubleValue else {
+                return completion(.failure(CraftHealthError(message: "saveData needs a type and numeric value", code: "INVALID_ARGUMENT")))
+            }
+            saveData(type: type, value: value, options: options(2), completion: completion)
         case "saveWorkout":
             saveWorkout(body: options(0), completion: completion)
         case "getWorkouts":
@@ -120,12 +127,15 @@ final class CraftHealth {
                 }
             case "dietaryEnergy", "dietaryProtein", "dietaryCarbohydrates", "dietaryFat":
                 // What a food log (MyFitnessPal, Lose It!, Cronometer...)
-                // writes to Apple Health: read only, never written back.
+                // writes to Apple Health. Request the write grant too unless
+                // the caller explicitly asked for a read-only authorization.
                 if let dietaryType = Self.healthQuantity(type)?.type {
                     readTypes.insert(dietaryType)
+                    if !readOnly { shareTypes.insert(dietaryType) }
                 }
             default:
-                break
+                completion(.failure(CraftHealthError(message: "Unknown health data type: \(type)", code: "INVALID_ARGUMENT")))
+                return
             }
         }
 
@@ -179,6 +189,42 @@ final class CraftHealth {
         healthStore.execute(query)
     }
 
+    /// Save one quantity sample, primarily a food-log entry. Dates are epoch
+    /// milliseconds; an omitted range records an instantaneous sample now.
+    func saveData(type: String, value: Double, options: [String: Any], completion: @escaping Completion) {
+        guard let healthStore = healthStore else {
+            completion(.failure(CraftHealthError(message: "HealthKit not available")))
+            return
+        }
+        guard value.isFinite, value >= 0 else {
+            completion(.failure(CraftHealthError(message: "saveData needs a finite, non-negative value", code: "INVALID_ARGUMENT")))
+            return
+        }
+        guard let spec = Self.healthQuantity(type), let qType = spec.type else {
+            completion(.failure(CraftHealthError(message: "Unknown health data type: \(type)", code: "INVALID_ARGUMENT")))
+            return
+        }
+        let startValue = options["startDate"] as? Double ?? Date().timeIntervalSince1970 * 1000
+        let endValue = options["endDate"] as? Double ?? startValue
+        guard startValue.isFinite, endValue.isFinite, endValue >= startValue else {
+            completion(.failure(CraftHealthError(message: "saveData needs a valid date range", code: "INVALID_ARGUMENT")))
+            return
+        }
+        let sample = HKQuantitySample(
+            type: qType,
+            quantity: HKQuantity(unit: spec.unit, doubleValue: value),
+            start: Date(timeIntervalSince1970: startValue / 1000),
+            end: Date(timeIntervalSince1970: endValue / 1000)
+        )
+        healthStore.save(sample) { success, error in
+            if success {
+                completion(.success(["id": sample.uuid.uuidString]))
+            } else {
+                completion(.failure(CraftHealthError(message: error?.localizedDescription ?? "Health data could not be saved")))
+            }
+        }
+    }
+
     func saveWorkout(body: [String: Any], completion: @escaping Completion) {
         guard let healthStore = healthStore else {
             completion(.failure(CraftHealthError(message: "HealthKit not available")))

package/templates/CraftHybrid.swift

@@ -1004,6 +1004,7 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
     private var openingWeb = false
     private var firstFrameLogged = false
     private var tabBarHeight: CGFloat = 0
+    private var tabSwipeRecognizers: [UISwipeGestureRecognizer] = []
 
     init(config: CraftConfig) {
         self.config = config
@@ -1033,6 +1034,7 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
         let tabs = hybrid.tabIds
         let start = CraftHybridRoutes.tab(owning: hybrid.startPath, among: tabs) ?? tabs.first ?? ""
         show(tab: start, rootPath: hybrid.startPath)
+        installTabSwipeGestures()
         if hybrid.hasWeb && hybrid.startsNative {
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { [weak self] in self?.attachWeb() }
         }
@@ -1043,6 +1045,42 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
 
     private var webAttached = false
 
+    private func installTabSwipeGestures() {
+        guard tabSwipeRecognizers.isEmpty else { return }
+        for direction in [UISwipeGestureRecognizer.Direction.left, .right] {
+            let recognizer = UISwipeGestureRecognizer(target: self, action: #selector(tabSwipeRecognized(_:)))
+            recognizer.direction = direction
+            recognizer.delegate = self
+            recognizer.cancelsTouchesInView = false
+            recognizer.delaysTouchesBegan = false
+            view.addGestureRecognizer(recognizer)
+            tabSwipeRecognizers.append(recognizer)
+        }
+    }
+
+    @objc private func tabSwipeRecognized(_ recognizer: UISwipeGestureRecognizer) {
+        let tabs = hybrid.tabIds
+        guard let index = tabs.firstIndex(of: currentTab), tabs.count > 1 else { return }
+        let next = recognizer.direction == .left ? index + 1 : index - 1
+        guard tabs.indices.contains(next) else { return }
+        CraftChrome.shared.swipe(to: tabs[next])
+    }
+
+    private func horizontalScrollAt(_ point: CGPoint, in root: UIView) -> Bool {
+        let local = root.convert(point, from: view)
+        guard root.bounds.contains(local), let hit = root.hitTest(local, with: nil) else { return false }
+        var candidate: UIView? = hit
+        while let current = candidate {
+            if let scroll = current as? UIScrollView,
+               scroll.isScrollEnabled,
+               scroll.alwaysBounceHorizontal || scroll.contentSize.width > scroll.bounds.width + 1 {
+                return true
+            }
+            candidate = current.superview
+        }
+        return false
+    }
+
     /// The web view joins the screen, behind the native screens, and loads.
     private func attachWeb() {
         guard let webHost, !webAttached else { return }
@@ -1481,8 +1519,19 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
     }
 
     func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+        if tabSwipeRecognizers.contains(where: { $0 === gestureRecognizer }) {
+            guard hybrid.tabIds.count > 1, let top = visibleStack?.topViewController else { return false }
+            if let native = top as? CraftNativeScreenController,
+               !native.tabSwipeEnabled || !native.contentSwipeBack { return false }
+            return !horizontalScrollAt(gestureRecognizer.location(in: view), in: top.view)
+        }
         guard let nav = visibleStack, isPopRecognizer(gestureRecognizer),
               nav.viewControllers.count > 1, nav.transitionCoordinator == nil else { return false }
+        if let native = nav.topViewController as? CraftNativeScreenController,
+           gestureRecognizer !== nav.interactivePopGestureRecognizer,
+           !native.contentSwipeBack {
+            return false
+        }
         if let native = nav.topViewController as? CraftNativeScreenController,
            gestureRecognizer !== nav.interactivePopGestureRecognizer,
            nativeScreenContainsHorizontalScroll(native) {

package/templates/CraftNativeActions.swift

@@ -40,7 +40,7 @@ enum CraftNativeActions {
     static func capabilities(config: CraftConfig) -> [String] {
         // `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"]
+        var values = ["device", "clipboard", "haptics", "storage", "lifecycle", "fetch", "dialog", "speech", "audio", "eventStream", "linking", "badge"]
         if config.enableBiometric { values.append("biometric") }
         if config.enableSecureStorage { values.append("secureStorage") }
         if config.enableLocalDatabase { values.append("database") }
@@ -76,6 +76,9 @@ enum CraftNativeActions {
         // runs out of process and asks no permission. Taking a photo needs
         // the camera, which the app declares.
         values.append("files")
+        // Video and audio kept on the phone for offline (CraftNativeMedia),
+        // which the native Video element plays in place of the address.
+        values.append("media")
         if config.enableCamera { values.append("camera") }
         return values
     }
@@ -190,6 +193,19 @@ enum CraftNativeActions {
             return
         case ("Files", "remove"):
             sync = .success(CraftNativeFiles.remove(args.first as? String ?? ""))
+        case ("Media", "keep"):
+            keepMedia(requestToken: requestToken, args: args, completion: completion)
+            return
+        case ("Media", "path"):
+            sync = .success(CraftNativeMedia.local(args.first as? String ?? "")?.path ?? NSNull())
+        case ("Media", "prune"):
+            let keep = (args.first as? [Any] ?? []).compactMap { $0 as? String }
+            DispatchQueue.global(qos: .utility).async {
+                complete(requestToken, .success(CraftNativeMedia.prune(keep: keep)), completion)
+            }
+            return
+        case ("Media", "usage"):
+            sync = .success(CraftNativeMedia.usage())
         case ("Lifecycle", "getState"):
             sync = .success(currentAppState())
         case ("DeepLinks", "getInitialURL"):
@@ -440,6 +456,19 @@ enum CraftNativeActions {
                 complete(requestToken, .success(true), completion)
             }
             return
+        case ("Badge", "set"):
+            guard let value = args.first as? NSNumber,
+                  value.doubleValue.isFinite,
+                  value.doubleValue >= 0,
+                  value.doubleValue.rounded() == value.doubleValue else {
+                complete(requestToken, failure("INVALID_ARGUMENT", "Badge.set needs a non-negative whole number"), completion)
+                return
+            }
+            setBadgeCount(value.intValue) { complete(requestToken, $0, completion) }
+            return
+        case ("Badge", "clear"):
+            setBadgeCount(0) { complete(requestToken, $0, completion) }
+            return
         case ("Notifications", _):
             guard config.enableLocalNotifications else {
                 complete(requestToken, failure("CAPABILITY_DISABLED", "Local notifications are disabled"), completion)
@@ -614,6 +643,63 @@ enum CraftNativeActions {
         if !alreadyCancelled { task.resume() }
     }
 
+    /// `craft.media.keep`: the file at an address kept on the phone for
+    /// offline, fetched once (a copy already there answers at once, and two
+    /// screens asking at the same time share one download). A refused answer
+    /// (not 2xx) keeps nothing and says its status. Cancelled like fetch.
+    private static func keepMedia(
+        requestToken: String,
+        args: [Any],
+        completion: @escaping (Result<Any, CraftNativeActionError>) -> Void
+    ) {
+        guard let address = args.first as? String,
+              let url = URL(string: address),
+              let scheme = url.scheme?.lowercased(), scheme == "https" || scheme == "http",
+              url.host?.isEmpty == false else {
+            complete(requestToken, failure("INVALID_ARGUMENT", "media.keep needs an absolute http or https URL"), completion)
+            return
+        }
+        if let kept = CraftNativeMedia.local(address) {
+            complete(requestToken, .success(CraftNativeMedia.describe(address, kept)), completion)
+            return
+        }
+        let options = args.count > 1 ? args[1] as? [String: Any] ?? [:] : [:]
+        var request = URLRequest(url: url, timeoutInterval: craftNativeFetchTimeoutSeconds)
+        request.httpMethod = "GET"
+        if let headers = options["headers"] as? [String: Any] {
+            for (name, value) in headers {
+                guard let value = value as? String else {
+                    complete(requestToken, failure("INVALID_ARGUMENT", "media.keep header values must be strings"), completion)
+                    return
+                }
+                request.setValue(value, forHTTPHeaderField: name)
+            }
+        }
+        if CraftNativeMedia.join(address, { complete(requestToken, $0, completion) }) { return }
+        let task = fetchSession.downloadTask(with: request) { location, response, error in
+            cancellationLock.lock()
+            fetchTasks.removeValue(forKey: requestToken)
+            cancellationLock.unlock()
+            if let error = error {
+                let code = (error as? URLError)?.code == .timedOut ? "TIMEOUT" : "NETWORK_ERROR"
+                CraftNativeMedia.finish(address, failure(code, error.localizedDescription))
+                return
+            }
+            guard let http = response as? HTTPURLResponse, let location else {
+                CraftNativeMedia.finish(address, failure("NETWORK_ERROR", "media.keep received a response that is not HTTP"))
+                return
+            }
+            // The system deletes `location` once this returns: move it now.
+            CraftNativeMedia.finish(address, CraftNativeMedia.store(address, at: location, response: http))
+        }
+        cancellationLock.lock()
+        let alreadyCancelled = cancelledRequests.contains(requestToken)
+        if !alreadyCancelled { fetchTasks[requestToken] = task }
+        cancellationLock.unlock()
+        if alreadyCancelled { CraftNativeMedia.finish(address, failure("CANCELLED", "media.keep was cancelled")) }
+        else { task.resume() }
+    }
+
     private static func claimInitialDeepLink() -> URL? {
         cancellationLock.lock()
         defer { cancellationLock.unlock() }
@@ -920,6 +1006,30 @@ enum CraftNativeActions {
         }
     }
 
+    /// Set the app icon badge without requesting notification authorization.
+    /// Native screens use this same permission-free path as the page bridge.
+    private static func setBadgeCount(
+        _ count: Int,
+        completion: @escaping (Result<Any, CraftNativeActionError>) -> Void
+    ) {
+        DispatchQueue.main.async {
+            if #available(iOS 16.0, *) {
+                UNUserNotificationCenter.current().setBadgeCount(count) { error in
+                    DispatchQueue.main.async {
+                        if let error {
+                            completion(.failure(CraftNativeActionError(code: "NATIVE_CALL_FAILED", message: error.localizedDescription)))
+                        } else {
+                            completion(.success(true))
+                        }
+                    }
+                }
+            } else {
+                UIApplication.shared.applicationIconBadgeNumber = count
+                completion(.success(true))
+            }
+        }
+    }
+
     static func deepLinkData(_ url: URL) -> [String: Any] {
         let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
         return [

package/templates/CraftNativeFiles.swift

@@ -1,3 +1,4 @@
+import CryptoKit
 import Foundation
 import ImageIO
 import PhotosUI
@@ -375,3 +376,109 @@ enum CraftNativeFiles {
         return ["ok": false, "status": response.statusCode, "body": text]
     }
 }
+
+// `craft.media` on a native screen: video and audio kept on the phone for
+// when there is no signal (a gym's basement, a plane). Not tmp/craft-files,
+// which iOS and the sweep above both empty: Application Support/craft-media,
+// left out of iCloud backups because every file can be fetched again. A file
+// is named by its address's SHA-256, so the native `Video` element finds the
+// copy of the URL it was given and plays it instead, with no lookup in
+// JavaScript. The screen decides what to keep (`keep`) and what to drop
+// (`prune`); nothing is evicted behind its back.
+enum CraftNativeMedia {
+    static var root: URL {
+        let base = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first
+            ?? FileManager.default.temporaryDirectory
+        return base.appendingPathComponent("craft-media", isDirectory: true)
+    }
+
+    private static let lock = NSLock()
+    /// Addresses being fetched now, so a second `keep` waits for the first.
+    private static var inFlight: [String: [(Result<Any, CraftNativeActionError>) -> Void]] = [:]
+
+    /// Where `address`'s copy lives (whether or not it is there yet). The
+    /// extension is the address's, because AVPlayer reads the type from it.
+    static func file(for address: String) -> URL {
+        let digest = SHA256.hash(data: Data(address.utf8)).map { String(format: "%02x", $0) }.joined()
+        let ext = URL(string: address)?.pathExtension.lowercased() ?? ""
+        let safe = ext.range(of: "^[a-z0-9]{1,5}$", options: .regularExpression) != nil ? ext : "bin"
+        return root.appendingPathComponent("\(digest).\(safe)")
+    }
+
+    /// The copy of `address` on this phone, or nil.
+    static func local(_ address: String) -> URL? {
+        guard !address.isEmpty else { return nil }
+        let url = file(for: address)
+        return FileManager.default.fileExists(atPath: url.path) ? url : nil
+    }
+
+    static func describe(_ address: String, _ url: URL) -> [String: Any] {
+        let size = (try? url.resourceValues(forKeys: [.fileSizeKey]).fileSize) ?? 0
+        return ["ok": true, "url": address, "path": url.path, "size": size]
+    }
+
+    /// Joins a fetch of `address` already under way; true when one was.
+    static func join(_ address: String, _ done: @escaping (Result<Any, CraftNativeActionError>) -> Void) -> Bool {
+        lock.lock()
+        defer { lock.unlock() }
+        if inFlight[address] != nil {
+            inFlight[address]!.append(done)
+            return true
+        }
+        inFlight[address] = [done]
+        return false
+    }
+
+    static func finish(_ address: String, _ result: Result<Any, CraftNativeActionError>) {
+        lock.lock()
+        let waiting = inFlight.removeValue(forKey: address) ?? []
+        lock.unlock()
+        for done in waiting { done(result) }
+    }
+
+    /// A finished download moved into place (atomically, so a half-written
+    /// file is never played), or a refusal with the server's status.
+    static func store(_ address: String, at location: URL, response: HTTPURLResponse) -> Result<Any, CraftNativeActionError> {
+        guard (200..<300).contains(response.statusCode) else {
+            return .success(["ok": false, "url": address, "status": response.statusCode])
+        }
+        let fm = FileManager.default
+        do {
+            var folder = root
+            if !fm.fileExists(atPath: folder.path) {
+                try fm.createDirectory(at: folder, withIntermediateDirectories: true)
+                var values = URLResourceValues()
+                values.isExcludedFromBackup = true
+                try? folder.setResourceValues(values)
+            }
+            let target = file(for: address)
+            let staging = root.appendingPathComponent(UUID().uuidString + ".part")
+            try fm.moveItem(at: location, to: staging)
+            _ = try? fm.removeItem(at: target)
+            try fm.moveItem(at: staging, to: target)
+            return .success(describe(address, target))
+        }
+        catch {
+            return .failure(CraftNativeActionError(code: "IO_ERROR", message: "media.keep could not store the file: \(error.localizedDescription)"))
+        }
+    }
+
+    /// Removes every copy whose address is not in `keep`; answers how many.
+    static func prune(keep: [String]) -> Int {
+        let wanted = Set(keep.map { file(for: $0).lastPathComponent })
+        let files = (try? FileManager.default.contentsOfDirectory(at: root, includingPropertiesForKeys: nil)) ?? []
+        var removed = 0
+        for url in files where !wanted.contains(url.lastPathComponent) {
+            if (try? FileManager.default.removeItem(at: url)) != nil { removed += 1 }
+        }
+        return removed
+    }
+
+    /// What the kept copies come to, in bytes, and how many there are.
+    static func usage() -> [String: Any] {
+        let files = (try? FileManager.default.contentsOfDirectory(at: root, includingPropertiesForKeys: [.fileSizeKey])) ?? []
+        let kept = files.filter { $0.pathExtension != "part" }
+        let bytes = kept.reduce(0) { $0 + ((try? $1.resourceValues(forKeys: [.fileSizeKey]).fileSize) ?? 0) }
+        return ["files": kept.count, "bytes": bytes]
+    }
+}

package/templates/CraftNativeScreen.swift

@@ -341,8 +341,19 @@ private final class CraftNativeVideoView: UIView {
             detachPlayer()
             sourceURI = uri
             loops = false
-            guard let url = URL(string: uri), !uri.isEmpty, url.scheme != nil else {
+            // The copy `craft.media.keep` put on the phone plays in place of
+            // the address, so a kept video plays with no signal.
+            let kept = CraftNativeMedia.local(uri)
+            guard let url = kept ?? URL(string: uri), !uri.isEmpty, kept != nil || url.scheme != nil else {
                 playerController.player = nil
+                // A path with no scheme ("/videos/a.mp4") has nowhere to load
+                // from on a native screen. Say so rather than stay black.
+                if !uri.isEmpty {
+                    DispatchQueue.main.async { [weak self] in
+                        guard let self, self.sourceURI == uri else { return }
+                        self.fire("onError", ["message": "The video address is not a full URL: \(uri)"])
+                    }
+                }
                 return
             }
             let next = AVPlayer(url: url)
@@ -1110,6 +1121,10 @@ private class CraftNativeFlowView: UIStackView {
             }
             if start < items.count { lines.append(start..<items.count) }
         }
+        // Reconciliation reverses the child order for the requested main
+        // axis. A wrapped flex container must keep its lines in cross-axis
+        // order, so restore the groups without changing each line's order.
+        if reverse && wrap && lines.count > 1 { lines.reverse() }
 
         var lineMains: [CGFloat] = []
         var lineCrosses: [CGFloat] = []
@@ -1922,7 +1937,9 @@ private final class CraftNativeSvgView: UIView {
             if let fill = style["fill"] as? String ?? props["fill"] as? String { next.fill = fill }
             if let stroke = style["stroke"] as? String ?? props["stroke"] as? String { next.stroke = stroke }
             if let width = (style["strokeWidth"] as? NSNumber ?? props["strokeWidth"] as? NSNumber) { next.strokeWidth = CGFloat(truncating: width) }
-            if let opacity = props["opacity"] as? NSNumber ?? style["opacity"] as? NSNumber { next.opacity *= CGFloat(truncating: opacity) }
+            // Computed style wins over the component prop, matching Android
+            // and the browser's cascade when both provide opacity.
+            if let opacity = style["opacity"] as? NSNumber ?? props["opacity"] as? NSNumber { next.opacity *= CGFloat(truncating: opacity) }
             if let cap = props["strokeLinecap"] as? String { next.linecap = cap }
             if let join = props["strokeLinejoin"] as? String { next.linejoin = join }
             if let dashes = props["strokeDasharray"] as? [Any] { next.dashes = dashes.compactMap { ($0 as? NSNumber).map { CGFloat(truncating: $0) } } }
@@ -2709,7 +2726,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     /// - `craft.secureStorage.getSync(key)`: the Keychain item the web page's
     ///   `craft.secureStorage.set` wrote.
     /// - `craft.navigation.setOptions({ title, largeTitle, hidden, backTitle,
-    ///   rightButtons })`; a right button's tap is the event `navButton`.
+    ///   tabBarHidden, contentSwipeBack, tabSwipeEnabled, rightButtons })`; a right button's
+    ///   tap is the event `navButton`.
     ///
     /// A runtime that assigns `craft.storage` (or the others) afterwards keeps
     /// these: each namespace is a property whose setter adds them back to the
@@ -2953,6 +2971,13 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     private var navigationBarHidden: Bool?
     /// The app's tab bar away while this screen shows (`tabBarHidden`).
     private var tabBarHidden = false
+    /// Whether iOS 26's content-wide back-swipe may begin on this screen.
+    /// Setting `contentSwipeBack: false` leaves the 32-point edge gesture.
+    private(set) var contentSwipeBack = true
+    /// Whether the shell's horizontal tab switch gesture may begin here.
+    /// This is separate so a screen can keep navigation back while owning its
+    /// own horizontal pager or chart gesture.
+    private(set) var tabSwipeEnabled = true
     private var prefersLargeTitle: Bool?
 
     /// Whether this screen asked for a bar of its own through `setOptions`: a
@@ -2988,6 +3013,12 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                 CraftChrome.shared.setHiddenByScreen(hidden)
             }
         }
+        if let contentSwipeBack = options["contentSwipeBack"] as? Bool {
+            self.contentSwipeBack = contentSwipeBack
+        }
+        if let tabSwipeEnabled = options["tabSwipeEnabled"] as? Bool {
+            self.tabSwipeEnabled = tabSwipeEnabled
+        }
         if let hidden = options["hidden"] as? Bool {
             navigationBarHidden = hidden
             if navigationController?.topViewController === self {