craft-native 0.0.127 → 0.0.132

package/dist/ios/templates/CraftApp.swift

@@ -1470,6 +1470,11 @@ struct CraftWebView: UIViewRepresentable {
         private var pendingCallbackId: String?
         private var pendingPushCallbackId: String?
         private var loadedBundledFallback = false
+        /// Tries at the app's own page while it waits on the offline page out
+        /// of sight, behind a hybrid app's native screen; reset by a page that
+        /// loads.
+        private var hiddenFallbackRetries = 0
+        private var hiddenFallbackRetry: DispatchWorkItem?
         /// Whether the current document's bridge has announced itself.
         private var documentReady = false
         /// Reloads after the content process dies, budgeted per burst.
@@ -2594,7 +2599,10 @@ struct CraftWebView: UIViewRepresentable {
             CraftChrome.shared.pageFinished()
             CraftChrome.shared.publishLayout()
             guard isTrustedURL(webView.url) else { return }
-            if !loadedBundledFallback { lastPageURL = webView.url }
+            if !loadedBundledFallback {
+                lastPageURL = webView.url
+                hiddenFallbackRetries = 0
+            }
             // The bridge is a document-start user script, so it is normally
             // here long before this. A document that came without it is given
             // it now, the way every page used to be, so no page is ever worse
@@ -2703,6 +2711,7 @@ struct CraftWebView: UIViewRepresentable {
         private func showOfflinePage(in webView: WKWebView) {
             if config.devServerURL != nil { loadedBundledFallback = true }
             loadBundledPage(in: webView)
+            retryHiddenFallbackLater()
         }
 
         /// Whether Info.plist declares WKAppBoundDomains.
@@ -2823,6 +2832,32 @@ struct CraftWebView: UIViewRepresentable {
             guard !loadedBundledFallback, config.devServerURL != nil else { return }
             loadedBundledFallback = true
             loadBundledPage(in: webView)
+            retryHiddenFallbackLater()
+        }
+
+        /// The offline page behind a hybrid app's native screen.
+        ///
+        /// Nobody sees its Retry there, and the page still has work to do
+        /// behind the screen: sending a signed-out person to sign in, keeping
+        /// the shared sign-in and snapshots current. A launch whose first load
+        /// timed out (a slow network, a server still starting) left the page
+        /// on the offline copy until the app next came to the foreground, and
+        /// a signed-out person on a native screen that waits for the page. So
+        /// the shell tries the page again itself, backing off from 2 to 30
+        /// seconds; once the web view is on screen, its Retry is the person's.
+        private func retryHiddenFallbackLater() {
+            guard loadedBundledFallback, CraftHybrid.shared.isEnabled, !CraftHybrid.shared.webIsVisible else { return }
+            hiddenFallbackRetry?.cancel()
+            let delay = min(30.0, 2.0 * pow(2.0, Double(min(hiddenFallbackRetries, 4))))
+            hiddenFallbackRetries += 1
+            let work = DispatchWorkItem { [weak self] in
+                guard let self, self.loadedBundledFallback, !CraftHybrid.shared.webIsVisible else { return }
+                // In the background, coming back to the foreground retries.
+                guard UIApplication.shared.applicationState == .active else { return }
+                self.returnFromBundledFallback(because: "the page behind a native screen was on the offline page")
+            }
+            hiddenFallbackRetry = work
+            DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: work)
         }
 
         /// Leave the bundled copy for the remote origin again (#252).
@@ -5809,14 +5844,23 @@ struct CraftWebView: UIViewRepresentable {
 
         // MARK: - App Badge
         private func setBadgeCount(_ count: Int, callbackId: String?) {
-            UNUserNotificationCenter.current().requestAuthorization(options: .badge) { granted, _ in
-                if granted {
-                    DispatchQueue.main.async {
-                        UIApplication.shared.applicationIconBadgeNumber = count
-                        self.resolveCallback(callbackId, result: true)
+            // Changing a badge must not ask for a badge-only authorization:
+            // notification permission belongs to the explicit registration
+            // flow, which requests alerts, badges and sounds together.
+            DispatchQueue.main.async {
+                if #available(iOS 16.0, *) {
+                    UNUserNotificationCenter.current().setBadgeCount(count) { [weak self] error in
+                        DispatchQueue.main.async {
+                            if let error {
+                                self?.rejectCallback(callbackId, error: error.localizedDescription)
+                            } else {
+                                self?.resolveCallback(callbackId, result: true)
+                            }
+                        }
                     }
                 } else {
-                    self.rejectCallback(callbackId, error: "Badge permission denied")
+                    UIApplication.shared.applicationIconBadgeNumber = count
+                    self.resolveCallback(callbackId, result: true)
                 }
             }
         }

package/dist/ios/templates/CraftHybrid.swift

@@ -573,13 +573,10 @@ final class CraftHybrid: NSObject {
         // `craft.snapshots` (CraftSnapshots, CraftNativeActions.swift).
         case .snapshotSet(let name, let json):
             CraftSnapshots.write(name, json: json) { ok in
-                if ok { NotificationCenter.default.post(name: Self.snapshotChanged, object: nil, userInfo: ["name": name]) }
-                else { NSLog("[craft hybrid] snapshot %@ was not written: not a snapshot name, or not JSON", name) }
+                if !ok { NSLog("[craft hybrid] snapshot %@ was not written: not a snapshot name, or not JSON", name) }
             }
         case .snapshotRemove(let name):
-            CraftSnapshots.write(name, json: nil) { _ in
-                NotificationCenter.default.post(name: Self.snapshotChanged, object: nil, userInfo: ["name": name])
-            }
+            CraftSnapshots.write(name, json: nil)
         case .snapshotClear:
             let names = CraftSnapshots.directory
                 .flatMap { try? FileManager.default.contentsOfDirectory(atPath: $0.path) }?
@@ -604,7 +601,7 @@ final class CraftHybrid: NSObject {
     }
 
     /// Posted when the page wrote or removed a snapshot (`userInfo["name"]`).
-    static let snapshotChanged = Notification.Name("craftSnapshotChanged")
+    static let snapshotChanged = CraftSnapshots.changed
 
     // MARK: Tabs and links
 

package/dist/ios/templates/CraftNativeActions.swift

@@ -680,6 +680,7 @@ extension CraftNativeActions {
 /// (`snapshots.set` in the mobile API) and a native screen reads them
 /// synchronously before its first render, or writes its own.
 enum CraftSnapshots {
+    static let changed = Notification.Name("craftSnapshotChanged")
     private static let queue = DispatchQueue(label: "dev.craft.snapshots", qos: .utility)
     private static let lock = NSLock()
     /// Writes not on disk yet, so a read right after a write sees it.
@@ -742,7 +743,10 @@ enum CraftSnapshots {
             lock.lock()
             if let current = pending[name], current == json { pending.removeValue(forKey: name) }
             lock.unlock()
-            DispatchQueue.main.async { completion?(ok) }
+            DispatchQueue.main.async {
+                if ok { NotificationCenter.default.post(name: changed, object: nil, userInfo: ["name": name]) }
+                completion?(ok)
+            }
         }
     }
 }

package/dist/ios/templates/CraftNativeMutation.swift

@@ -195,9 +195,9 @@ final class CraftNativeMutationDocument {
         if let unknown = patch.keys.sorted().first(where: { !allowed.contains($0) }) {
             throw CraftNativeMutationFailure("INVALID_PATCH", "unsupported patch field \(unknown)")
         }
-        if patch.keys.contains("props") { node.props = dictionary(patch["props"]) }
-        if patch.keys.contains("style") { node.style = dictionary(patch["style"]) }
-        if patch.keys.contains("events") { node.events = dictionary(patch["events"]) }
+        if patch.keys.contains("props") { mergePatch(patch["props"], into: &node.props) }
+        if patch.keys.contains("style") { mergePatch(patch["style"], into: &node.style) }
+        if patch.keys.contains("events") { mergePatch(patch["events"], into: &node.events) }
         if patch.keys.contains("children") || patch.keys.contains("text") {
             node.text = try textChildren(patch["children"] ?? patch["text"])
         }
@@ -352,6 +352,13 @@ final class CraftNativeMutationDocument {
         value as? [String: Any] ?? [:]
     }
 
+    private func mergePatch(_ value: Any?, into target: inout [String: Any]) {
+        for (key, next) in dictionary(value) {
+            if next is NSNull { target.removeValue(forKey: key) }
+            else { target[key] = next }
+        }
+    }
+
     private func integer(_ value: Any?) -> Int? {
         guard let number = value as? NSNumber else { return nil }
         guard CFGetTypeID(number) != CFBooleanGetTypeID() else { return nil }

package/dist/ios/templates/CraftNativeScreen.swift

@@ -241,6 +241,7 @@ private final class CraftNativeFlowView: UIStackView {
     var pressBaseOpacity: CGFloat = 1
     var wrap = false { didSet { if wrap != oldValue { invalidateMeasurements() } } }
     var alignItems = "stretch" { didSet { alignment = alignmentValue; if alignItems != oldValue { invalidateMeasurements() } } }
+    var alignContent = "flex-start" { didSet { if alignContent != oldValue { invalidateMeasurements() } } }
     var justifyContent = "flex-start" { didSet { distribution = distributionValue; if justifyContent != oldValue { invalidateMeasurements() } } }
     var gap: CGFloat = 0 { didSet { spacing = gap; if gap != oldValue { invalidateMeasurements() } } }
     var rowGap: CGFloat? { didSet { if rowGap != oldValue { invalidateMeasurements() } } }
@@ -641,11 +642,29 @@ private final class CraftNativeFlowView: UIStackView {
         }
 
         let contentMain = definiteMain ?? (lineMains.max() ?? 0)
-        let contentCross = definiteCross
+        var contentCross = definiteCross
             ?? (lineCrosses.reduce(0, +) + CGFloat(max(0, lineCrosses.count - 1)) * crossGap)
+        var crossLeading: CGFloat = 0
+        var crossBetween = crossGap
+        if wrap, let definiteCross, lineCrosses.count > 1 {
+            let free = max(0, definiteCross - (lineCrosses.reduce(0, +) + CGFloat(lineCrosses.count - 1) * crossGap))
+            switch alignContent {
+            case "center": crossLeading = free / 2
+            case "flex-end": crossLeading = free
+            case "space-between": crossBetween = free / CGFloat(lineCrosses.count - 1) + crossGap
+            case "space-around":
+                crossBetween = free / CGFloat(lineCrosses.count) + crossGap
+                crossLeading = free / CGFloat(lineCrosses.count * 2)
+            case "stretch":
+                let extra = free / CGFloat(lineCrosses.count)
+                lineCrosses = lineCrosses.map { $0 + extra }
+            default: break
+            }
+            contentCross = definiteCross
+        }
 
         if place {
-            var crossOffset: CGFloat = 0
+            var crossOffset = crossLeading
             for (lineIndex, line) in lines.enumerated() {
                 let free = max(0, contentMain - lineMains[lineIndex])
                 let count = line.count
@@ -676,7 +695,7 @@ private final class CraftNativeFlowView: UIStackView {
                     frames.append((item.view, frame))
                     mainOffset += item.mainMargins + item.main + mainGap + between
                 }
-                crossOffset += lineCross + crossGap
+                crossOffset += lineCross + crossBetween
             }
         }
         return horizontal ? CGSize(width: contentMain, height: contentCross) : CGSize(width: contentCross, height: contentMain)
@@ -756,6 +775,7 @@ private final class CraftNativeModalView: UIView {
     let contentStack = CraftNativeFlowView()
     private let blocker = UIView()
     private var renderedVisible = false
+    private var animationGeneration = 0
     var onRequestClose: (() -> Void)?
 
     var transparent = false {
@@ -776,22 +796,63 @@ private final class CraftNativeModalView: UIView {
     required init?(coder: NSCoder) { nil }
 
     func setVisible(_ visible: Bool, opacity: CGFloat, animationType: String?) {
-        guard renderedVisible != visible || isHidden != !visible else { return }
+        if renderedVisible == visible && isHidden == !visible {
+            if visible, alpha != opacity { alpha = opacity }
+            return
+        }
+        let wasVisible = renderedVisible && !isHidden
         renderedVisible = visible
+        animationGeneration += 1
+        let generation = animationGeneration
+        layer.removeAllAnimations()
         guard visible else {
-            isHidden = true
-            alpha = 0
+            if animationType == "slide" && wasVisible {
+                let distance = max(bounds.height, superview?.bounds.height ?? UIScreen.main.bounds.height)
+                UIView.animate(withDuration: 0.24, animations: {
+                    self.transform = CGAffineTransform(translationX: 0, y: distance)
+                    self.alpha = 0
+                }, completion: { _ in
+                    guard self.animationGeneration == generation else { return }
+                    self.isHidden = true
+                    self.transform = .identity
+                })
+            } else {
+                isHidden = true
+                transform = .identity
+                alpha = 0
+            }
             return
         }
         isHidden = false
         if animationType == "none" {
+            transform = .identity
             alpha = opacity
+        } else if animationType == "slide" {
+            let distance = max(bounds.height, superview?.bounds.height ?? UIScreen.main.bounds.height)
+            transform = CGAffineTransform(translationX: 0, y: distance)
+            alpha = opacity
+            DispatchQueue.main.async {
+                guard self.animationGeneration == generation, !self.isHidden else { return }
+                let distance = max(self.bounds.height, self.superview?.bounds.height ?? UIScreen.main.bounds.height)
+                self.transform = CGAffineTransform(translationX: 0, y: distance)
+                UIView.animate(withDuration: 0.24) { self.transform = .identity }
+            }
         } else {
+            transform = .identity
             alpha = 0
-            UIView.animate(withDuration: animationType == "slide" ? 0.24 : 0.18) { self.alpha = opacity }
+            UIView.animate(withDuration: 0.18) { self.alpha = opacity }
         }
     }
 
+    func resetForTeardown() {
+        animationGeneration += 1
+        layer.removeAllAnimations()
+        isHidden = true
+        transform = .identity
+        alpha = 0
+        onRequestClose = nil
+    }
+
     @objc private func blockerTapped() { onRequestClose?() }
 
     override func layoutSubviews() {
@@ -1235,6 +1296,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     /// could not be drawn, and of `craft.navigation.open(path)`.
     weak var hybridEvents: CraftHybridScreenEvents?
     private var hybridRendered = false
+    private var runtimeDisposed = false
 
     init(config: CraftConfig, routeName: String? = nil, routeParams: [String: Any] = [:]) {
         self.config = config
@@ -1248,6 +1310,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     }
 
     deinit {
+        disposeRuntime()
         imageTasks.values.forEach { $0.cancel() }
         pendingCapabilityDeadlines.values.forEach { $0.cancel() }
         pendingTimers.values.forEach { $0.cancel() }
@@ -1297,6 +1360,19 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         refreshTraitDefaults()
     }
 
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        if isMovingFromParent || navigationController?.viewControllers.contains(where: { $0 === self }) == false {
+            disposeRuntime()
+        }
+    }
+
+    private func disposeRuntime() {
+        guard !runtimeDisposed else { return }
+        runtimeDisposed = true
+        jsContext.objectForKeyedSubscript("__stxNativeUnmount")?.call(withArguments: [])
+    }
+
     private func refreshTraitDefaults() {
         view.backgroundColor = config.resolvedBackgroundColor
         if let document = mutationDocument.node("root") {
@@ -1318,14 +1394,24 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         emitLayoutEvents()
     }
 
+    private static func safeJavaScriptString(_ value: JSValue?) -> String? {
+        guard let value, !value.isUndefined, !value.isNull, value.isString else { return nil }
+        return value.toString()
+    }
+
     private func setupJavaScript() {
         if let routeName = routeName {
             jsContext.setObject(routeName, forKeyedSubscript: "__stxNativeRoute" as NSString)
         }
         jsContext.setObject(routeParams as NSDictionary, forKeyedSubscript: "__stxNativeParams" as NSString)
         jsContext.exceptionHandler = { [weak self] context, exception in
-            let message = exception?.toString() ?? "unknown"
-            let stack = exception?.objectForKeyedSubscript("stack")?.toString() ?? ""
+            // Never stringify an arbitrary JS object here. JavaScriptCore can
+            // re-enter this handler while coercing an exception whose
+            // `toString` is broken, turning a page error into a native crash.
+            let message = Self.safeJavaScriptString(exception?.objectForKeyedSubscript("message"))
+                ?? Self.safeJavaScriptString(exception)
+                ?? "unknown"
+            let stack = Self.safeJavaScriptString(exception?.objectForKeyedSubscript("stack")) ?? ""
             CraftNativeConsole.write("error", category: self?.screenName(in: context) ?? "screen", message: stack.isEmpty || stack == "undefined" ? "Uncaught \(message)" : "Uncaught \(message)\n\(stack)")
             self?.hybridFailed(message)
         }
@@ -1647,6 +1733,9 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         let action = UIAction { [weak self] _ in
             self?.send(type: "EVENT", payload: ["handlerName": "navButton", "nativeEvent": ["id": id]])
         }
+        if spec["variant"] as? String == "accent" || spec["variant"] as? String == "account" {
+            return accountNavigationButton(spec, action: action)
+        }
         let item: UIBarButtonItem
         if let symbol = spec["symbol"] as? String, let image = UIImage(systemName: symbol) {
             item = UIBarButtonItem(image: image, primaryAction: action)
@@ -1662,9 +1751,95 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             item.accessibilityLabel = id
         }
         if let tint = (spec["color"] as? String).flatMap({ UIColor(hex: $0) }) { item.tintColor = tint }
+        // `image`: a picture (an https URL, the account's own photo), drawn
+        // round as iOS draws an account button. The symbol or title shows
+        // until it has loaded, and stays if it cannot be.
+        if let source = spec["image"] as? String, let url = URL(string: source), url.scheme == "https" {
+            loadBarImage(url) { [weak item] image in
+                guard let item, let image else { return }
+                let size = CGSize(width: 32, height: 32)
+                let round = UIGraphicsImageRenderer(size: size).image { _ in
+                    UIBezierPath(ovalIn: CGRect(origin: .zero, size: size)).addClip()
+                    let scale = max(size.width / image.size.width, size.height / image.size.height)
+                    let drawn = CGSize(width: image.size.width * scale, height: image.size.height * scale)
+                    image.draw(in: CGRect(x: (size.width - drawn.width) / 2, y: (size.height - drawn.height) / 2, width: drawn.width, height: drawn.height))
+                }
+                item.title = nil
+                item.image = round.withRenderingMode(.alwaysOriginal)
+            }
+        }
+        return item
+    }
+
+    /// Shared account/chat controls: the same 44-point target, independent
+    /// circular surface and unread indicator on every native screen.
+    private func accountNavigationButton(_ spec: [String: Any], action: UIAction) -> UIBarButtonItem {
+        let button = UIButton(type: .custom)
+        button.addAction(action, for: .touchUpInside)
+        button.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([button.widthAnchor.constraint(equalToConstant: 44), button.heightAnchor.constraint(equalToConstant: 44)])
+        let accent = spec["variant"] as? String == "accent"
+        button.backgroundColor = UIColor { traits in
+            if traits.userInterfaceStyle == .dark { return UIColor(red: 0.15, green: 0.39, blue: 0.92, alpha: accent ? 0.24 : 0.12) }
+            return UIColor(red: 0.15, green: 0.39, blue: 0.92, alpha: 0.08)
+        }
+        button.layer.cornerRadius = 22
+        button.tintColor = UIColor { $0.userInterfaceStyle == .dark ? UIColor(red: 0.58, green: 0.77, blue: 0.99, alpha: 1) : UIColor(red: 0.11, green: 0.30, blue: 0.85, alpha: 1) }
+        button.setTitleColor(button.tintColor, for: .normal)
+        button.titleLabel?.font = .systemFont(ofSize: 13, weight: .semibold)
+        if let title = spec["title"] as? String, !title.isEmpty { button.setTitle(title, for: .normal) }
+        else if let symbol = spec["symbol"] as? String { button.setImage(UIImage(systemName: symbol, withConfiguration: UIImage.SymbolConfiguration(pointSize: 20, weight: .regular)), for: .normal) }
+        button.accessibilityIdentifier = spec["id"] as? String
+        button.accessibilityLabel = spec["accessibilityLabel"] as? String
+        if let value = spec["badge"] as? NSNumber, value.intValue > 0 {
+            let dot = spec["badgeStyle"] as? String == "dot"
+            let badge = UILabel()
+            badge.text = dot ? nil : value.intValue > 99 ? "99+" : String(value.intValue)
+            badge.font = .systemFont(ofSize: 10, weight: .bold)
+            badge.textColor = .white
+            badge.textAlignment = .center
+            badge.backgroundColor = dot ? .systemRed : .systemBlue
+            badge.clipsToBounds = true
+            let size: CGFloat = dot ? 9 : 18
+            badge.layer.cornerRadius = size / 2
+            badge.frame = CGRect(x: 44 - size, y: 0, width: size, height: size)
+            badge.isAccessibilityElement = false
+            button.addSubview(badge)
+            button.accessibilityValue = "\(value.intValue) unread"
+        }
+        if let source = spec["image"] as? String, let url = URL(string: source), url.scheme == "https" {
+            loadBarImage(url) { [weak button] image in
+                guard let button, let image else { return }
+                let size = CGSize(width: 36, height: 36)
+                let round = UIGraphicsImageRenderer(size: size).image { _ in
+                    UIBezierPath(ovalIn: CGRect(origin: .zero, size: size)).addClip()
+                    let scale = max(size.width / image.size.width, size.height / image.size.height)
+                    let drawn = CGSize(width: image.size.width * scale, height: image.size.height * scale)
+                    image.draw(in: CGRect(x: (size.width - drawn.width) / 2, y: (size.height - drawn.height) / 2, width: drawn.width, height: drawn.height))
+                }
+                button.setTitle(nil, for: .normal)
+                button.setImage(round.withRenderingMode(.alwaysOriginal), for: .normal)
+            }
+        }
+        let item = UIBarButtonItem(customView: button)
+        // Keep the custom-view item compatible with the Xcode SDKs used by
+        // Craft's release matrix; iOS 26-only bar-item APIs are not required
+        // for the account surface itself.
         return item
     }
 
+    /// A bar picture, kept for the app's life so each screen does not fetch it again.
+    private static let barImages = NSCache<NSURL, UIImage>()
+
+    private func loadBarImage(_ url: URL, _ done: @escaping (UIImage?) -> Void) {
+        if let cached = Self.barImages.object(forKey: url as NSURL) { done(cached); return }
+        URLSession.shared.dataTask(with: url) { data, _, _ in
+            let image = data.flatMap(UIImage.init(data:))
+            if let image { Self.barImages.setObject(image, forKey: url as NSURL) }
+            DispatchQueue.main.async { done(image) }
+        }.resume()
+    }
+
     /// The first vertical scroll view of the screen drives the bar: a large
     /// title collapses as it scrolls, and the bar's background follows it.
     private func trackContentScrollView() {
@@ -1688,6 +1863,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             rootTopToSafeArea?.isActive = !edgeToEdge
             rootTopToView?.isActive = edgeToEdge
         }
+        scroll?.contentInsetAdjustmentBehavior = edgeToEdge ? .automatic : .never
         guard scroll !== trackedScrollView else { return }
         trackedScrollView = scroll
         setContentScrollView(scroll, for: .top)
@@ -1718,6 +1894,14 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         ) { [weak self] notification in
             self?.applyKeyboardSafeArea(notification, hidden: true)
         })
+        lifecycleObservers.append(NotificationCenter.default.addObserver(
+            forName: CraftSnapshots.changed,
+            object: nil,
+            queue: .main
+        ) { [weak self] notification in
+            guard let name = notification.userInfo?["name"] as? String else { return }
+            self?.send(type: "SNAPSHOT_CHANGED", payload: ["name": name])
+        })
         sendAppState(CraftNativeActions.currentAppState())
         deepLinkListener = DeepLinkManager.shared.addNativeListener { [weak self] url, initial in
             guard let self = self, self.navigationController?.topViewController === self else { return }
@@ -1797,6 +1981,9 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                     "version": craftNativeMutationProtocolVersion,
                 ]
                 if let operationIndex = failure.operationIndex { error["operationIndex"] = operationIndex }
+                // In the log as well: the screen redraws itself on this, so
+                // nothing on screen says a batch was refused.
+                CraftNativeConsole.write("error", category: screenName(), message: "mutation \(error["batchId"] ?? "") refused: \(failure.code) \(failure.message)")
                 send(type: "MUTATION_ERROR", payload: error)
             } catch {
                 send(type: "MUTATION_ERROR", payload: [
@@ -1816,6 +2003,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             if type == "NAVIGATE" {
                 navigation.pushViewController(next, animated: true)
             } else {
+                disposeRuntime()
                 navigation.setViewControllers(Array(navigation.viewControllers.dropLast()) + [next], animated: true)
             }
         case "NAVIGATION_SET_OPTIONS":
@@ -2115,7 +2303,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         case "Modal":
             let modal = result as! CraftNativeModalView
             modal.transparent = props["transparent"] as? Bool == true
-            let visible = props["visible"] as? Bool == true
+            let visible = props["visible"] as? Bool == true && style["display"] as? String != "none"
             let modalID = ObjectIdentifier(modal)
             let wasVisible = modalVisibility[modalID]
             modalVisibility[modalID] = visible
@@ -2508,6 +2696,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             if let owner = node.protocolId { flatListOwners = flatListOwners.filter { $0.value != owner } }
         }
         let id = ObjectIdentifier(node.view)
+        if let modal = node.view as? CraftNativeModalView { modal.resetForTeardown() }
         handlers.removeValue(forKey: id)
         pressInHandlers.removeValue(forKey: id)
         pressOutHandlers.removeValue(forKey: id)
@@ -2795,6 +2984,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         stack.axis = direction == "row" || direction == "row-reverse" ? .horizontal : .vertical
         stack.wrap = style["flexWrap"] as? String == "wrap" || style["flexWrap"] as? Bool == true
         stack.alignItems = style["alignItems"] as? String ?? "stretch"
+        stack.alignContent = style["alignContent"] as? String ?? "flex-start"
         stack.justifyContent = style["justifyContent"] as? String ?? "flex-start"
         let gap = number(style["gap"]) ?? 0
         stack.gap = gap
@@ -3021,8 +3211,9 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         let uri = (source as? String) ?? (source as? [String: Any])?["uri"] as? String
         let id = ObjectIdentifier(view)
         guard let uri, !uri.isEmpty else {
+            if imageSources[id] == "" { return }
             imageTasks.removeValue(forKey: id)?.cancel()
-            imageSources.removeValue(forKey: id)
+            imageSources[id] = ""
             imageFailure(view, uri: nil, message: "Image source is missing")
             return
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "craft-native",
-  "version": "0.0.127",
+  "version": "0.0.132",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",
@@ -94,6 +94,6 @@
     "@stacksjs/clapp": "^0.2.0",
     "@types/bun": "^1.2.0",
     "@types/node": "^22.0.0",
-    "better-dx": "^0.2.25"
+    "better-dx": "^0.2.38"
   }
 }