@craft-native/ios 0.0.358 → 0.0.359

package/README.md

@@ -174,7 +174,7 @@ and linear gradients are applied by UIKit with the same style keys as Android;
 `elevation` remains Android-specific. Gradient layers follow the native view's
 bounds and corners through layout changes.
 
-The opt-in `native` renderer hosts compiled `.stx` screens in JavaScriptCore and renders their `View`, `SafeAreaView`, `KeyboardAvoidingView`, `StatusBar`, `RefreshControl`, `Text`, `Button`, `Link`, `Checkbox`, `TextInput`, `Picker`, `SegmentedControl`, `DatePicker`, `Switch`, `Slider`, `ActivityIndicator`, `Icon`, `Image`, `ImageBackground`, `Video`, `Map`, `Svg`, `G`, `SvgText`, `ScrollView`, `SectionList`, and recycling `FlatList` nodes as UIKit controls. `StatusBar` and `RefreshControl` are screen/scroll utility nodes rather than visible children. `Map` uses MapKit for trail polylines and marker taps; its overlays carry flat latitude/longitude `geometry` arrays, `strokeWidth` is expressed in logical points, and the camera supports controlled `region`, one-time `initialRegion`, and `fitToBounds`. `Svg` is a DOM-free drawing surface; grouped `G` and `SvgText` nodes are painted inside it. `Icon` uses SF Symbols with the shared symbol/name contract and accessibility metadata. `SectionList` uses the same native scroll host for ordinary `.stx` slot children; grouped section data should use `FlatList` until the section-data protocol is available. `FlatList` uses `UICollectionView` with stable keyed rows, incremental diffs, grids, horizontal and inverted layouts, list chrome, and end-reached pagination. Native views support `onLayout` callbacks with point-based frame measurements that refresh after safe-area or orientation changes. Flex items support `flex`, `flexGrow`, `flexShrink`, and numeric `flexBasis` for main-axis space distribution. Native screens also expose the versioned capability bridge: JSON storage and SQLite survive relaunch, lifecycle and deep-link events are scoped to the top route, and local notifications use `UNUserNotificationCenter`. Enable each capability in `craft.config.json`; disabled calls preserve Craft's `CAPABILITY_DISABLED` rejection code and every request has deterministic timeout/cancellation behavior. The default remains `web`; existing iOS apps are unchanged. `Checkbox` supports controlled `checked`/`value`, indeterminate state, and boolean `onValueChange`; `Picker` renders `<select>`/`<option>` values with `onValueChange` or `onChange`; `DatePicker` emits local date/time values plus ISO and millisecond `timestamp` fields; `Switch` supports state-aware `trackColor`, `thumbColor`, and iOS `ios_backgroundColor`; `Slider` supports track/thumb tint props and `step` snapping; `Image` reports load lifecycle events and structured failures; `Video` uses an `AVPlayerViewController` attached to the native screen for URI playback, native controls, and route-safe teardown. `craft.navigation.setOptions` also accepts a `tabAccessory` destination beside the tab pill; it uses an app-local `path`, `title`, `symbol`, optional `badge`, and `accessibilityLabel`, and `null` clears it. The portable component, capability, list, style, image-source, event, accessibility, and reconciliation behavior is specified in the [Native STX guide](../../docs/guides/native-stx.md).
+The opt-in `native` renderer hosts compiled `.stx` screens in JavaScriptCore and renders their `View`, `SafeAreaView`, `KeyboardAvoidingView`, `StatusBar`, `RefreshControl`, `Text`, `Button`, `Link`, `Checkbox`, `TextInput`, `Picker`, `SegmentedControl`, `DatePicker`, `Switch`, `Slider`, `ActivityIndicator`, `Icon`, `Image`, `ImageBackground`, `Video`, `Map`, `Svg`, `G`, `SvgText`, `ScrollView`, `SectionList`, and recycling `FlatList` nodes as UIKit controls. `StatusBar` and `RefreshControl` are screen/scroll utility nodes rather than visible children. `Map` uses MapKit for trail polylines and marker taps; its overlays carry flat latitude/longitude `geometry` arrays, `strokeWidth` is expressed in logical points, and the camera supports controlled `region`, one-time `initialRegion`, and `fitToBounds`. `Svg` is a DOM-free drawing surface; grouped `G` and `SvgText` nodes are painted inside it. `Icon` uses SF Symbols with the shared symbol/name contract and accessibility metadata. `SectionList` uses the same native scroll host for ordinary `.stx` slot children; grouped section data should use `FlatList` until the section-data protocol is available. `FlatList` uses `UICollectionView` with stable keyed rows, incremental diffs, grids, horizontal and inverted layouts, list chrome, and end-reached pagination. Native views support `onLayout` callbacks with point-based frame measurements that refresh after safe-area or orientation changes. Flex items support `flex`, `flexGrow`, `flexShrink`, and numeric `flexBasis` for main-axis space distribution. Native screens also expose the versioned capability bridge: JSON storage and SQLite survive relaunch, lifecycle and deep-link events are scoped to the top route, and local notifications use `UNUserNotificationCenter`. Enable each capability in `craft.config.json`; disabled calls preserve Craft's `CAPABILITY_DISABLED` rejection code and every request has deterministic timeout/cancellation behavior. The default remains `web`; existing iOS apps are unchanged. `Checkbox` supports controlled `checked`/`value`, indeterminate state, and boolean `onValueChange`; `Picker` renders `<select>`/`<option>` values with `onValueChange` or `onChange`; `DatePicker` emits local date/time values plus ISO and millisecond `timestamp` fields; `Switch` supports state-aware `trackColor`, `thumbColor`, and iOS `ios_backgroundColor`; `Slider` supports track/thumb tint props and `step` snapping; `Image` reports load lifecycle events and structured failures; `Video` uses an `AVPlayerViewController` attached to the native screen for URI playback, native controls, and route-safe teardown. `craft.navigation.setOptions` also accepts a `tabAccessory` destination beside the tab pill; it uses an app-local `path`, `title`, `symbol`, optional `badge`, and `accessibilityLabel`, and `null` clears it. Dynamic `craft.shortcuts.set`/`clear` are not installed by the all-native host yet; configure static `appShortcuts` in `craft.config.json` to publish home-screen quick actions. Runtime shortcut registration remains tracked in #412. The portable component, capability, list, style, image-source, event, accessibility, and reconciliation behavior is specified in the [Native STX guide](../../docs/guides/native-stx.md).
 
 `FlatList` rows are authored as keyed `:for` child rows in native STX; the
 maintained protocol does not serialize `data`/`renderItem` callbacks.

package/package.json

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

package/templates/CraftNativeFiles.swift

@@ -192,10 +192,12 @@ enum CraftNativeFiles {
         do {
             let url = try newFile(named: name)
             guard let destination = CGImageDestinationCreateWithURL(url as CFURL, UTType.jpeg.identifier as CFString, 1, nil) else {
+                try? FileManager.default.removeItem(at: url.deletingLastPathComponent())
                 return .failure(CraftNativeActionError(code: "WRITE_ERROR", message: "The photo could not be saved"))
             }
             CGImageDestinationAddImage(destination, image, [kCGImageDestinationLossyCompressionQuality: quality] as CFDictionary)
             guard CGImageDestinationFinalize(destination) else {
+                try? FileManager.default.removeItem(at: url.deletingLastPathComponent())
                 return .failure(CraftNativeActionError(code: "WRITE_ERROR", message: "The photo could not be saved"))
             }
             return .success(describe(url, type: "image/jpeg", extra: ["width": image.width, "height": image.height]))
@@ -731,11 +733,11 @@ enum CraftNativeMedia {
         lock.lock()
         defer { lock.unlock() }
         if let flight, inFlight[address]?.id != flight {
-            return .failure(CraftNativeActionError(code: "CANCELLED", message: "The video cache was cleared"))
+            return .failure(CraftNativeActionError(code: "CANCELLED", message: "The media cache was cleared"))
         }
         // A background transfer from before the cache was cleared (sign-out).
         if let stillWanted, !stillWanted() {
-            return .failure(CraftNativeActionError(code: "CANCELLED", message: "The video cache was cleared"))
+            return .failure(CraftNativeActionError(code: "CANCELLED", message: "The media cache was cleared"))
         }
         let staging = root.appendingPathComponent(UUID().uuidString + ".part")
         defer { try? fm.removeItem(at: staging) }
@@ -784,7 +786,7 @@ enum CraftNativeMedia {
             catch { failure = error }
         }
         lock.unlock()
-        for done in waiting { done(.failure(CraftNativeActionError(code: "CANCELLED", message: "The video cache was cleared"))) }
+        for done in waiting { done(.failure(CraftNativeActionError(code: "CANCELLED", message: "The media cache was cleared"))) }
         if let failure { throw failure }
         return removed
     }

package/templates/CraftNativeScreen.swift

@@ -1443,6 +1443,16 @@ enum CraftBasemap: String {
     static let outdoorCredit = "Topography: Esri, USGS, NOAA, OpenStreetMap contributors"
 }
 
+private final class CraftMarkerPhotoRedirects: NSObject, URLSessionTaskDelegate {
+    static let session = URLSession(configuration: .ephemeral, delegate: CraftMarkerPhotoRedirects(), delegateQueue: nil)
+
+    func urlSession(_ session: URLSession, task: URLSessionTask, willPerformHTTPRedirection response: HTTPURLResponse,
+                    newRequest request: URLRequest, completionHandler: @escaping (URLRequest?) -> Void) {
+        let url = request.url
+        completionHandler(url?.scheme?.lowercased() == "https" && url?.user == nil && url?.password == nil ? request : nil)
+    }
+}
+
 private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
     private var annotationsByID: [String: MKPointAnnotation] = [:]
     private var overlaysByID: [String: MKPolyline] = [:]
@@ -1467,6 +1477,26 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
     private var edgePadding = UIEdgeInsets(top: 24, left: 24, bottom: 24, right: 24)
     private var markerBearings: [String: Double] = [:]
     private var markerPinColors: [String: UIColor] = [:]
+    private struct MarkerPhoto: Equatable {
+        let url: URL
+        let size: CGFloat
+        let circle: Bool
+
+        init?(_ props: [String: Any]) {
+            guard let raw = props["image"] as? String, let url = URL(string: raw),
+                  url.scheme?.lowercased() == "https", let host = url.host, !host.isEmpty,
+                  url.user == nil, url.password == nil else { return nil }
+            self.url = url
+            // Current STX releases preserve unknown HTML/binding spellings.
+            let value = CraftNativeMapView.numeric(props["imageSize"] ?? props["imagesize"] ?? props["image-size"]) ?? 30
+            size = CGFloat(value.isFinite ? min(96, max(16, value)) : 30)
+            circle = (props["imageShape"] ?? props["imageshape"] ?? props["image-shape"]) as? String != "square"
+        }
+    }
+    private var markerPhotos: [String: MarkerPhoto] = [:]
+    private var markerPhotoImages: [String: UIImage] = [:]
+    private var markerPhotoTasks: [String: URLSessionDataTask] = [:]
+    private var markerPhotoRequests: [String: UUID] = [:]
     private var tileOverlay: MKTileOverlay?
     private var tileTemplate: String?
     private var tileReplacesMap = true
@@ -1552,6 +1582,7 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
         edgePadding = UIEdgeInsets(top: inset("top"), left: inset("left"), bottom: inset("bottom"), right: inset("right"))
         var nextBearings: [String: Double] = [:]
         var nextPinColors: [String: UIColor] = [:]
+        var nextPhotos: [String: MarkerPhoto] = [:]
         // Showing the user dot must not trigger a permission prompt from a
         // renderer pass. The app's existing location capability owns that
         // prompt; a map only opts in after authorization is already granted.
@@ -1580,6 +1611,7 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
                 guard let id = (overlay["id"] as? CustomStringConvertible)?.description,
                       let point = points.first else { continue }
                 nextMarkers[id] = (point, overlay["title"] as? String)
+                nextPhotos[id] = MarkerPhoto(overlay)
                 if let color = overlay["pinColor"] as? String { nextPinColors[id] = Self.color(color) }
                 if let bearing = Self.numeric(overlay["bearing"]), bearing.isFinite {
                     nextBearings[id] = bearing.truncatingRemainder(dividingBy: 360)
@@ -1598,6 +1630,7 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
             if type == "mapmarker" || type == "marker" {
                 guard let point = points.first else { continue }
                 nextMarkers[id] = (point, childProps["title"] as? String)
+                nextPhotos[id] = MarkerPhoto(childProps)
                 if let color = childProps["pinColor"] as? String { nextPinColors[id] = Self.color(color) }
                 if let bearing = Self.numeric(childProps["bearing"]), bearing.isFinite {
                     nextBearings[id] = bearing.truncatingRemainder(dividingBy: 360)
@@ -1626,6 +1659,12 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
 
         markerBearings = nextBearings
         markerPinColors = nextPinColors
+        for id in markerPhotos.keys where markerPhotos[id] != nextPhotos[id] {
+            markerPhotoTasks.removeValue(forKey: id)?.cancel()
+            markerPhotoRequests.removeValue(forKey: id)
+            markerPhotoImages.removeValue(forKey: id)
+        }
+        markerPhotos = nextPhotos
         let staleMarkers = annotationsByID.keys.filter { nextMarkers[$0] == nil }
         removeAnnotations(staleMarkers.compactMap { annotationsByID.removeValue(forKey: $0) })
         for (id, value) in nextMarkers {
@@ -1642,6 +1681,9 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
             }
         }
         markerHandlers = nextHandlers
+        for (id, photo) in markerPhotos where markerPhotoRequests[id] == nil {
+            loadMarkerPhoto(photo, id: id)
+        }
 
         let staleOverlays = overlaysByID.keys.filter { nextPolylines[$0] == nil }
         for id in staleOverlays {
@@ -1773,6 +1815,11 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
         markerHandlers.removeAll()
         markerBearings.removeAll()
         markerPinColors.removeAll()
+        markerPhotoTasks.values.forEach { $0.cancel() }
+        markerPhotoTasks.removeAll()
+        markerPhotoRequests.removeAll()
+        markerPhotoImages.removeAll()
+        markerPhotos.removeAll()
         removeAnnotations(Array(annotationsByID.values))
         annotationsByID.removeAll()
         removeOverlays(Array(overlaysByID.values))
@@ -1890,7 +1937,15 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
     }
 
     private func configureMarkerView(_ view: MKAnnotationView, id: String) {
-        if let bearing = markerBearings[id] {
+        if let photo = markerPhotoImages[id] {
+            view.image = photo
+            view.transform = .identity
+            view.displayPriority = .required
+            view.collisionMode = markerPhotos[id]?.circle == true ? .circle : .rectangle
+            if #available(iOS 14.0, *) { view.zPriority = .max }
+            view.isAccessibilityElement = true
+            view.accessibilityTraits = .button
+        } else if let bearing = markerBearings[id] {
             let color = (markerPinColors[id] ?? .systemGreen).resolvedColor(with: traitCollection)
             view.tintColor = color
             view.image = Self.markerImage(color: color, direction: true)
@@ -1919,6 +1974,45 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
         }
     }
 
+    private func loadMarkerPhoto(_ photo: MarkerPhoto, id: String) {
+        let request = UUID()
+        markerPhotoRequests[id] = request
+        let scale = window?.screen.scale ?? UIScreen.main.scale
+        let finish: (Data?) -> Void = { [weak self] data in
+            let pixels = CGSize(width: photo.size * scale, height: photo.size * scale)
+            let decoded = data.flatMap { $0.count <= 8 * 1024 * 1024 ? CraftNativeScreenController.decodeImage($0, fitting: (pixels, scale), fill: true) : nil }
+            DispatchQueue.main.async { [weak self] in
+                guard let self, self.markerPhotoRequests[id] == request else { return }
+                self.markerPhotoTasks.removeValue(forKey: id)
+                guard let decoded, decoded.size.width > 0, decoded.size.height > 0 else { return }
+                let size = CGSize(width: photo.size, height: photo.size)
+                let format = UIGraphicsImageRendererFormat()
+                format.scale = scale
+                self.markerPhotoImages[id] = UIGraphicsImageRenderer(size: size, format: format).image { _ in
+                    let bounds = CGRect(origin: .zero, size: size)
+                    if photo.circle { UIBezierPath(ovalIn: bounds).addClip() }
+                    let factor = max(photo.size / decoded.size.width, photo.size / decoded.size.height)
+                    let drawn = CGSize(width: decoded.size.width * factor, height: decoded.size.height * factor)
+                    decoded.draw(in: CGRect(x: (photo.size - drawn.width) / 2, y: (photo.size - drawn.height) / 2,
+                                            width: drawn.width, height: drawn.height))
+                }.withRenderingMode(.alwaysOriginal)
+                if let annotation = self.annotationsByID[id], let view = self.view(for: annotation) {
+                    self.configureMarkerView(view, id: id)
+                }
+            }
+        }
+        if let local = CraftNativeMedia.local(photo.url.absoluteString) {
+            DispatchQueue.global(qos: .userInitiated).async { finish(try? Data(contentsOf: local)) }
+        } else {
+            let task = CraftMarkerPhotoRedirects.session.dataTask(with: photo.url) { data, response, _ in
+                let response = response as? HTTPURLResponse
+                finish(response?.statusCode == 200 && response?.url?.scheme?.lowercased() == "https" ? data : nil)
+            }
+            markerPhotoTasks[id] = task
+            task.resume()
+        }
+    }
+
     private static let markerImages: NSCache<NSString, UIImage> = {
         let cache = NSCache<NSString, UIImage>()
         cache.countLimit = 64
@@ -4343,6 +4437,36 @@ final class CraftMapTapDelegate: NSObject, UIGestureRecognizerDelegate {
     }
 }
 
+/// A pressable wrapper must yield to an actionable descendant. Without this
+/// ordering UIKit may let the ancestor's tap recognizer win the same touch,
+/// so a nested Button never receives its physical action. A descendant
+/// control or tap recognizer is the source of the event; STX handles the
+/// logical bubbling from there.
+final class CraftPressGestureDelegate: NSObject, UIGestureRecognizerDelegate {
+    static let shared = CraftPressGestureDelegate()
+
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRequireFailureOf otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+        guard let parent = gestureRecognizer.view,
+              let child = otherGestureRecognizer.view,
+              child !== parent else { return false }
+        return child.isDescendant(of: parent)
+    }
+
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
+        guard let container = gestureRecognizer.view else { return true }
+        let hitView = container.hitTest(touch.location(in: container), with: nil)
+        guard var candidate = hitView ?? touch.view else { return true }
+        while candidate !== container {
+            if candidate is UIControl { return false }
+            if candidate.gestureRecognizers?.contains(where: { $0 !== gestureRecognizer && $0 is UITapGestureRecognizer }) == true {
+                return false
+            }
+            candidate = candidate.superview ?? container
+        }
+        return true
+    }
+}
+
 /// The delegate of a Pressable's press-in/out feedback. That recognizer is
 /// a long press of no duration, so it begins the moment a finger lands; on its
 /// own it would claim the touch, and the tap that is the Pressable's onPress
@@ -6538,15 +6662,25 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         let snapshotGet: @convention(block) (String) -> String? = { name in
             CraftSnapshots.read(name)
         }
-        let snapshotSet: @convention(block) (String, JSValue, JSValue) -> Void = { name, value, done in
-            CraftSnapshots.write(name, json: value.isNull || value.isUndefined ? nil : value.toString()) { ok in
-                CraftNativeScriptThread.run { done.call(withArguments: [ok]) }
+        // JavaScriptCore retains these outer host blocks. A weak capture only
+        // on the nested completion still makes the host block retain self,
+        // forming controller -> JSContext -> host block -> controller.
+        let snapshotSet: @convention(block) (String, JSValue, JSValue) -> Void = { [weak self] name, value, done in
+            CraftSnapshots.write(name, json: value.isNull || value.isUndefined ? nil : value.toString()) { [weak self] ok in
+                CraftNativeScriptThread.run {
+                    // A writer can finish after UIKit has disposed this
+                    // screen. Resolve the pending promise as a cancellation,
+                    // never as a successful write into a dead runtime.
+                    done.call(withArguments: [self?.runtimeDisposed != false ? false : ok])
+                }
             }
         }
-        let snapshotClear: @convention(block) (JSValue, JSValue) -> Void = { keep, done in
+        let snapshotClear: @convention(block) (JSValue, JSValue) -> Void = { [weak self] keep, done in
             let names = (keep.isUndefined || keep.isNull ? [] : (keep.toArray() ?? [])).compactMap { $0 as? String }
-            CraftSnapshots.clear(keeping: Set(names)) { ok in
-                CraftNativeScriptThread.run { done.call(withArguments: [ok]) }
+            CraftSnapshots.clear(keeping: Set(names)) { [weak self] ok in
+                CraftNativeScriptThread.run {
+                    done.call(withArguments: [self?.runtimeDisposed != false ? false : ok])
+                }
             }
         }
         let config = self.config
@@ -7915,20 +8049,15 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             screenRequestCancellers[requestToken] = { [weak self] in self?.sounds.stop(id: id, fadeOut: 0) }
             sounds.play(id: id, url: url, options: args.count > 2 ? args[2] as? [String: Any] ?? [:] : [:], answer: reply)
         case ("Audio", "pause"):
-            sounds.pause(id: id)
-            reply(.success(true))
+            reply(.success(sounds.pause(id: id)))
         case ("Audio", "resume"):
-            sounds.resume(id: id)
-            reply(.success(true))
+            reply(.success(sounds.resume(id: id)))
         case ("Audio", "setVolume"):
-            sounds.setVolume(id: id, volume: number(1), fade: number(2, "fade") / 1000)
-            reply(.success(true))
+            reply(.success(sounds.setVolume(id: id, volume: number(1), fade: number(2, "fade") / 1000)))
         case ("Audio", "stop"):
-            sounds.stop(id: id, fadeOut: number(1, "fadeOut") / 1000)
-            reply(.success(true))
+            reply(.success(sounds.stop(id: id, fadeOut: number(1, "fadeOut") / 1000)))
         case ("Audio", "stopAll"):
-            sounds.stopAll(fadeOut: number(0, "fadeOut") / 1000)
-            reply(.success(true))
+            reply(.success(sounds.stopAll(fadeOut: number(0, "fadeOut") / 1000)))
         default:
             return false
         }
@@ -9339,6 +9468,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         let actionable = handler != nil || linkTargets[id] != nil
         if actionable, tapRecognizers[id] == nil {
             let recognizer = UITapGestureRecognizer(target: self, action: #selector(viewPressed(_:)))
+            recognizer.cancelsTouchesInView = false
+            recognizer.delegate = CraftPressGestureDelegate.shared
             tapRecognizers[id] = recognizer
             view.addGestureRecognizer(recognizer)
         } else if !actionable, let recognizer = tapRecognizers.removeValue(forKey: id) {
@@ -10111,6 +10242,26 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             // Decoded at the size it is drawn, when the style fixes that size.
             let pixels = Self.displayPixels(of: view)
             let fill = view.contentMode == .scaleAspectFill
+            // media.keep owns private/offline copies keyed by the authored URL.
+            // Read before the decoded/network cache, without retaining private
+            // pixels there after the app clears its media on sign-out.
+            if let local = CraftNativeMedia.local(uri) {
+                DispatchQueue.global(qos: .userInitiated).async { [weak self, weak view] in
+                    let decoded = (try? Data(contentsOf: local)).flatMap { Self.decodeImage($0, fitting: pixels, fill: fill) }
+                    DispatchQueue.main.async { [weak self, weak view] in
+                        guard let self, let view, self.imageSources[ObjectIdentifier(view)] == requestKey else { return }
+                        guard let image = decoded, CraftNativeMedia.local(uri) == local else {
+                            self.imageFailure(view, uri: uri, message: "Kept image is unavailable or invalid")
+                            return
+                        }
+                        view.image = self.imageForDisplay(image, view: view)
+                        self.imageDidChange(view)
+                        self.emitImageEvent(view, handler: self.imageLoadHandlers[ObjectIdentifier(view)])
+                        self.emitImageEvent(view, handler: self.imageLoadEndHandlers[ObjectIdentifier(view)])
+                    }
+                }
+                return
+            }
             let cacheKey = pixels.map { "\(requestKey)@\(Int($0.size.width))x\(Int($0.size.height))\(fill ? "f" : "")" } ?? requestKey
             // Shown before: on screen in this same frame, already decoded.
             if let decoded = Self.decodedImages.object(forKey: cacheKey as NSString) {
@@ -10239,7 +10390,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         let controlledVideo = type == "Video" && (props["controls"] as? Bool) == true
         // UIPickerView exposes adjustable component wheels. Making the
         // picker itself a leaf hides those wheels and their selected values.
-        let container = ["ScrollView", "FlatList", "SectionList", "Picker", "SegmentedControl"].contains(type)
+        let container = ["ScrollView", "FlatList", "SectionList", "Picker", "SegmentedControl", "Modal", "Drawer"].contains(type)
             || ["tablist", "radiogroup", "list", "menu", "menubar", "toolbar"].contains(role ?? "")
             || controlledVideo
         view.isAccessibilityElement = !container && role != "none" && (view.accessibilityLabel != nil || role != nil || ["Text", "Button", "Link", "Checkbox", "Image", "ImageBackground", "Video", "TextInput", "Picker", "DatePicker", "Switch", "Slider"].contains(type))

package/templates/CraftNativeServices.swift

@@ -279,6 +279,7 @@ final class CraftNativeSounds {
         /// The volume asked for; a fade in or out moves toward or away from it.
         var volume: Float
         var paused = false
+        var interrupted = false
 
         init(player: AVQueuePlayer, volume: Float) {
             self.player = player
@@ -306,9 +307,44 @@ final class CraftNativeSounds {
     private static var category: AVAudioSession.Category = .ambient
 
     private var sounds: [String: Sound] = [:]
+    private var interruptionObserver: NSObjectProtocol?
     /// `{ id, event: "ended" | "error", message? }` to the screen's script.
     var emit: (([String: Any]) -> Void)?
 
+    init() {
+        interruptionObserver = NotificationCenter.default.addObserver(
+            forName: AVAudioSession.interruptionNotification,
+            object: nil,
+            queue: .main,
+        ) { [weak self] note in
+            guard let self else { return }
+            let type = (note.userInfo?[AVAudioSessionInterruptionTypeKey] as? NSNumber)?.uintValue
+            if type == AVAudioSession.InterruptionType.began.rawValue {
+                self.sounds.values.forEach { sound in
+                    guard !sound.paused else { return }
+                    sound.interrupted = true
+                    sound.player.pause()
+                }
+                return
+            }
+            guard type == AVAudioSession.InterruptionType.ended.rawValue else { return }
+            let options = (note.userInfo?[AVAudioSessionInterruptionOptionKey] as? NSNumber)?.uintValue ?? 0
+            let shouldResume = options & AVAudioSession.InterruptionOptions.shouldResume.rawValue != 0
+            self.sounds.values.forEach { sound in
+                guard sound.interrupted else { return }
+                sound.interrupted = false
+                // Without permission to auto-resume, keep a resumable paused
+                // handle. A later unrelated interruption must not restart it.
+                sound.paused = !shouldResume
+                if shouldResume { sound.player.play() }
+            }
+        }
+    }
+
+    deinit {
+        if let interruptionObserver { NotificationCenter.default.removeObserver(interruptionObserver) }
+    }
+
     /// Starts `url`. `answer` hears once it plays (or could not be loaded).
     func play(id: String, url: URL, options: [String: Any], answer: @escaping (Result<Any, CraftNativeActionError>) -> Void) {
         stop(id: id, fadeOut: 0)
@@ -362,40 +398,52 @@ final class CraftNativeSounds {
         if fadeIn > 0 { ramp(sound, to: volume, over: fadeIn) }
     }
 
-    func pause(id: String) {
-        guard let sound = sounds[id] else { return }
+    @discardableResult
+    func pause(id: String) -> Bool {
+        guard let sound = sounds[id] else { return false }
         sound.paused = true
+        sound.interrupted = false
         sound.fade?.invalidate()
         sound.player.pause()
+        return true
     }
 
-    func resume(id: String) {
-        guard let sound = sounds[id], sound.paused else { return }
+    @discardableResult
+    func resume(id: String) -> Bool {
+        guard let sound = sounds[id], sound.paused else { return false }
         sound.paused = false
+        sound.interrupted = false
         sound.player.volume = sound.volume
         sound.player.play()
+        return true
     }
 
     /// Changes the volume, over `fade` seconds when given.
-    func setVolume(id: String, volume: Double, fade: Double) {
-        guard let sound = sounds[id] else { return }
+    @discardableResult
+    func setVolume(id: String, volume: Double, fade: Double) -> Bool {
+        guard let sound = sounds[id] else { return false }
         sound.volume = Float(min(max(volume, 0), 1))
         if fade > 0, !sound.paused { ramp(sound, to: sound.volume, over: fade) }
         else { sound.fade?.invalidate(); sound.player.volume = sound.volume }
+        return true
     }
 
     /// Stops the sound, fading it out over `fadeOut` seconds first.
-    func stop(id: String, fadeOut: Double) {
-        guard let sound = sounds[id] else { return }
-        guard fadeOut > 0, !sound.paused else { remove(id); return }
+    @discardableResult
+    func stop(id: String, fadeOut: Double) -> Bool {
+        guard let sound = sounds[id] else { return false }
+        guard fadeOut > 0, !sound.paused else { remove(id); return true }
         ramp(sound, to: 0, over: fadeOut) { [weak self, weak sound] in
             guard let self, let sound, self.sounds[id] === sound else { return }
             self.remove(id)
         }
+        return true
     }
 
-    func stopAll(fadeOut: Double) {
+    @discardableResult
+    func stopAll(fadeOut: Double) -> Bool {
         for id in Array(sounds.keys) { stop(id: id, fadeOut: fadeOut) }
+        return true
     }
 
     /// The screen closed: everything stops at once.