@craft-native/ios 0.0.338 → 0.0.341

package/package.json

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

package/templates/CraftNativeActions.swift

@@ -203,7 +203,13 @@ enum CraftNativeActions {
         case ("Clipboard", "read"):
             sync = perform(action: "clipboardRead", body: [:], config: config)
         case ("Storage", _):
-            DispatchQueue.main.async { complete(requestToken, storage(method: method, args: args), completion) }
+            DispatchQueue.main.async {
+                cancellationLock.lock()
+                let cancelled = cancelledRequests.remove(requestToken) != nil
+                cancellationLock.unlock()
+                guard !cancelled else { return }
+                complete(requestToken, storage(method: method, args: args), completion)
+            }
             return
         case ("SecureStorage", _):
             guard config.enableSecureStorage else {

package/templates/CraftNativeFlatList.swift

@@ -60,7 +60,7 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
         /// The row this cell showed is gone; its views stay in the cell, and
         /// the next row it shows reuses them when it has the same shape.
         func recycle() {
-            if let identity = representedIdentity { onRecycle?(identity) }
+            if let identity = representedIdentity, showsHostedView { onRecycle?(identity) }
             representedIdentity = nil
             onRecycle = nil
         }
@@ -81,6 +81,7 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
             // since moved to another cell is that cell's now, and pulling it
             // from there blanked a row on screen.
             if let shown = hostedView, shown !== view, shown.superview === contentView { shown.removeFromSuperview() }
+            NSLayoutConstraint.deactivate(hostedConstraints)
             hostedView = view
             view.translatesAutoresizingMaskIntoConstraints = false
             contentView.addSubview(view)
@@ -110,6 +111,8 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
         func releaseHostedView() {
             recycle()
             if let shown = hostedView, shown.superview === contentView { shown.removeFromSuperview() }
+            NSLayoutConstraint.deactivate(hostedConstraints)
+            hostedConstraints = []
             hostedView = nil
         }
 
@@ -195,8 +198,11 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
     private var endReachedThreshold = 0.1
     private var endReachedSignature: String?
     private var dataContentSignature = ""
+    private var dataOrdinals: [Int] = []
+    private var dataItemCount = 0
     private var columns = 1
     private var isApplyingSnapshot = false
+    private var snapshotNeedsReset = false
     private var pendingApply: (() -> Void)?
     private var pendingThemeRefresh = false
     private let nativeRefreshControl = UIRefreshControl()
@@ -224,6 +230,10 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
         backgroundColor = .clear
         alwaysBounceVertical = true
         delegate = self
+        // The renderer keeps one live view per keyed row. UIKit's speculative
+        // cell prefetch can otherwise move that view out of its visible cell.
+        // UICollectionView still recycles and self-sizes the visible window.
+        isPrefetchingEnabled = false
         keyboardTapGesture.cancelsTouchesInView = false
         keyboardTapGesture.delegate = self
         keyboardTapGesture.addTarget(self, action: #selector(keyboardTap))
@@ -382,13 +392,15 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
         let padding = nonNegative(raw?["padding"]) ?? 0
         let horizontal = nonNegative(raw?["paddingHorizontal"]) ?? padding
         let vertical = nonNegative(raw?["paddingVertical"]) ?? padding
-        contentInset = UIEdgeInsets(
+        let inset = UIEdgeInsets(
             top: nonNegative(raw?["paddingTop"]) ?? vertical,
             left: nonNegative(raw?["paddingLeft"]) ?? horizontal,
             bottom: nonNegative(raw?["paddingBottom"]) ?? vertical,
             right: nonNegative(raw?["paddingRight"]) ?? horizontal
         )
-        scrollIndicatorInsets = contentInset
+        guard contentInset != inset else { return }
+        contentInset = inset
+        scrollIndicatorInsets = inset
         collectionViewLayout.invalidateLayout()
     }
 
@@ -479,7 +491,9 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
         self.removeItem = removeItem
         self.endReached = endReached
         self.endReachedThreshold = max(0, endReachedThreshold)
-        self.columns = max(1, columns)
+        let nextColumns = max(1, columns)
+        let layoutChanged = self.columns != nextColumns || flowLayout.scrollDirection != (horizontal ? .horizontal : .vertical)
+        self.columns = nextColumns
 
         layoutIfNeeded()
         let oldItems = itemsByIdentity
@@ -496,6 +510,19 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
             return Item(identity: identity, node: node, signature: signature, isChrome: role != nil && role != "item")
         }
         if inverted { next.reverse() }
+        // Reapplying an identical keyed tree during a timer or badge update
+        // must not reconfigure cells, invalidate self-sizing, or reset a drag.
+        if !snapshotNeedsReset, !layoutChanged, next.count == items.count,
+           zip(next, items).allSatisfy({ $0.identity == $1.identity && $0.signature == $1.signature }) {
+            finishApplyingSnapshot()
+            return
+        }
+        snapshotNeedsReset = false
+        dataItemCount = 0
+        dataOrdinals = next.map { item in
+            if !item.isChrome { dataItemCount += 1 }
+            return dataItemCount - 1
+        }
         items = next
         itemsByIdentity = Dictionary(uniqueKeysWithValues: next.map { ($0.identity, $0) })
 
@@ -504,7 +531,7 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
         alwaysBounceVertical = !horizontal
         showsHorizontalScrollIndicator = horizontal
         showsVerticalScrollIndicator = !horizontal
-        flowLayout.invalidateLayout()
+        if layoutChanged { flowLayout.invalidateLayout() }
 
         let nextIds = Set(itemsByIdentity.keys)
         for identity in oldItems.keys where !nextIds.contains(identity) { removeItem(identity) }
@@ -550,9 +577,12 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
     }
 
     func discardAll() {
+        snapshotNeedsReset = true
         visibleCells.compactMap { $0 as? Cell }.forEach { $0.releaseHostedView() }
         itemsByIdentity.keys.forEach { recycleItem?($0) }
         items = []
+        dataOrdinals = []
+        dataItemCount = 0
         itemsByIdentity = [:]
         renderItem = nil
         recycleItem = nil
@@ -638,11 +668,11 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
         guard !isApplyingSnapshot, pendingApply == nil,
               let endReached = endReached,
               let lastVisible = indexPathsForVisibleItems.map(\.item).max() else { return }
-        let dataIndices = items.indices.filter { !items[$0].isChrome }
-        guard !dataIndices.isEmpty,
-              let lastDataOrdinal = dataIndices.lastIndex(where: { $0 <= lastVisible }) else { return }
-        let remaining = dataIndices.count - lastDataOrdinal - 1
-        let thresholdItems = max(1, Int(ceil(Double(dataIndices.count) * endReachedThreshold)))
+        guard dataItemCount > 0, dataOrdinals.indices.contains(lastVisible) else { return }
+        let lastDataOrdinal = dataOrdinals[lastVisible]
+        guard lastDataOrdinal >= 0 else { return }
+        let remaining = dataItemCount - lastDataOrdinal - 1
+        let thresholdItems = max(1, Int(ceil(Double(dataItemCount) * endReachedThreshold)))
         guard remaining <= thresholdItems else { return }
         let signature = dataContentSignature
         guard endReachedSignature != signature else { return }

package/templates/CraftNativeScreen.swift

@@ -15,6 +15,45 @@ import UIKit
 
 private let craftNativeCapabilityTimeoutMilliseconds = 30_000
 
+/// A retained JavaScript context must lose synchronous storage access when
+/// its screen closes. Only the actual synchronous unmount callback may finish
+/// its cleanup; queued script work runs after that allowance ends.
+private final class CraftNativeStorageLifetime {
+    private let lock = NSLock()
+    private var closed = false
+    private var unmounting = false
+
+    func close() {
+        lock.lock()
+        closed = true
+        lock.unlock()
+    }
+
+    func unmount(_ work: () -> Void) {
+        lock.lock()
+        unmounting = true
+        lock.unlock()
+        defer {
+            lock.lock()
+            unmounting = false
+            lock.unlock()
+        }
+        work()
+    }
+
+    func access<T>(closedValue: T, _ work: () -> T) -> T {
+        lock.lock()
+        defer { lock.unlock() }
+        guard !closed || unmounting else {
+            if let context = JSContext.current() {
+                context.exception = JSValue(newErrorFromMessage: "SCREEN_CLOSED: The native screen is closed", in: context)
+            }
+            return closedValue
+        }
+        return work()
+    }
+}
+
 /// Foundation's `NSNumber(0/1) is Bool` is true even for JSON numbers.
 /// Check the Core Foundation identity so real booleans stay invalid numeric
 /// props while zero lengths, flex factors and opacity 1 remain numbers.
@@ -5751,6 +5790,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     weak var hybridEvents: CraftHybridScreenEvents?
     private var hybridRendered = false
     private var runtimeDisposed = false
+    private let storageLifetime = CraftNativeStorageLifetime()
     /// The app script (`nativeApp`, CraftHybrid.swift): a bundle route with
     /// no screen, loaded once and never shown, that runs for the app's life.
     /// It hears every `APP_STATE` and the app's events (`CRAFT_EVENT`), no
@@ -5998,6 +6038,11 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     private func disposeRuntime() {
         guard !runtimeDisposed else { return }
         runtimeDisposed = true
+        storageLifetime.close()
+        pendingCapabilityDeadlines.values.forEach { $0.cancel() }
+        pendingCapabilityDeadlines.removeAll()
+        pendingCapabilityRequests.forEach { CraftNativeActions.cancel(requestToken: $0) }
+        pendingCapabilityRequests.removeAll()
         if let owner = voiceRecordingOwner {
             voiceRecordingOwner = nil
             CraftVoiceRecording.shared.perform(method: "cancel", args: [owner]) { _ in }
@@ -6007,7 +6052,10 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         disposeRenderedTree()
         let context = jsContext
         let route = routeName ?? "screen"
-        CraftNativeScriptThread.run(label: "unmount \(route)") { context.objectForKeyedSubscript("__stxNativeUnmount")?.call(withArguments: []) }
+        let storageLifetime = self.storageLifetime
+        CraftNativeScriptThread.run(label: "unmount \(route)") {
+            storageLifetime.unmount { context.objectForKeyedSubscript("__stxNativeUnmount")?.call(withArguments: []) }
+        }
         audio.close()
         sounds.close()
         streams.close()
@@ -6469,17 +6517,22 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         let log: @convention(block) (String, String, String) -> Void = { level, category, message in
             CraftNativeConsole.write(level, category: category, message: message)
         }
+        let storageLifetime = self.storageLifetime
         let storageGet: @convention(block) (String) -> String? = { key in
-            do { return try CraftNativeActions.storageJSON(forKey: key) }
-            catch {
-                if let context = JSContext.current() {
-                    context.exception = JSValue(newErrorFromMessage: "STORAGE_ERROR: Unable to read stored value", in: context)
+            storageLifetime.access(closedValue: nil) {
+                do { return try CraftNativeActions.storageJSON(forKey: key) }
+                catch {
+                    if let context = JSContext.current() {
+                        context.exception = JSValue(newErrorFromMessage: "STORAGE_ERROR: Unable to read stored value", in: context)
+                    }
+                    return nil
                 }
-                return nil
             }
         }
         let storageSet: @convention(block) (String, JSValue) -> Bool = { key, value in
-            CraftNativeActions.setStorageJSON(value.isNull || value.isUndefined ? nil : value.toString(), forKey: key)
+            storageLifetime.access(closedValue: false) {
+                CraftNativeActions.setStorageJSON(value.isNull || value.isUndefined ? nil : value.toString(), forKey: key)
+            }
         }
         let snapshotGet: @convention(block) (String) -> String? = { name in
             CraftSnapshots.read(name)
@@ -7613,6 +7666,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                 navigationController?.popToRootViewController(animated: true)
             }
         case "API_REQUEST":
+            guard !runtimeDisposed else { return }
             guard let id = message["id"] as? String else { return }
             let args = payload["args"] as? [Any] ?? []
             let requestToken = "\(capabilityScope)/\(id)"
@@ -7682,7 +7736,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         case "API_CANCEL":
             guard let id = payload["requestId"] as? String else { return }
             let requestToken = "\(capabilityScope)/\(id)"
-            pendingCapabilityRequests.remove(requestToken)
+            guard pendingCapabilityRequests.remove(requestToken) != nil else { return }
             pendingCapabilityDeadlines.removeValue(forKey: requestToken)?.cancel()
             screenRequestCancellers.removeValue(forKey: requestToken)?()
             CraftNativeActions.cancel(requestToken: requestToken)