@craft-native/ios 0.0.497 → 0.0.500

package/templates/CraftNativeFlatList.swift

@@ -316,7 +316,8 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
             rows += (pending + columns - 1) / columns
             content = CGFloat(rows) * 44 + CGFloat(max(0, rows - 1)) * flowLayout.minimumLineSpacing
         }
-        return max(0, ceil(content + contentInset.top + contentInset.bottom))
+        // Its rows and its own padding: not the room left for what floats over it.
+        return max(0, ceil(content + contentPadding.top + contentPadding.bottom))
     }
 
     /// The width a row gets: the list's own width inside its content padding,
@@ -406,6 +407,24 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
             bottom: nonNegative(raw?["paddingBottom"]) ?? vertical,
             right: nonNegative(raw?["paddingRight"]) ?? horizontal
         )
+        guard contentPadding != inset else { return }
+        contentPadding = inset
+        applyContentInsets()
+    }
+
+    /// `contentContainerStyle`'s padding, which the list draws as its insets.
+    private var contentPadding: UIEdgeInsets = .zero
+
+    /// How far the compact tab actions reach over the end of this list. The
+    /// rows get that much more room at the end, so the last one can be
+    /// brought clear of them (#523).
+    var floatingCover: CGFloat = 0 {
+        didSet { if abs(oldValue - floatingCover) > 0.5 { applyContentInsets() } }
+    }
+
+    private func applyContentInsets() {
+        var inset = contentPadding
+        if flowLayout.scrollDirection == .vertical { inset.bottom += floatingCover }
         guard contentInset != inset else { return }
         contentInset = inset
         scrollIndicatorInsets = inset
@@ -507,11 +526,10 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
         let oldItems = itemsByIdentity
         let viewportAnchor = currentViewportAnchor()
         var seen: [String: Int] = [:]
+        var taken = Set<String>()
         var next = nodes.enumerated().map { index, node -> Item in
             let base = Self.identity(for: node) ?? "index:\(index)"
-            let occurrence = seen[base, default: 0]
-            seen[base] = occurrence + 1
-            let identity = occurrence == 0 ? base : "\(base)#\(occurrence)"
+            let identity = Self.uniqueIdentity(base, seen: &seen, taken: &taken)
             let props = node["props"] as? [String: Any] ?? [:]
             let role = props["listRole"] as? String
             let signature = (try? JSONSerialization.data(withJSONObject: node, options: [.sortedKeys])) ?? Data()
@@ -532,7 +550,7 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
             return dataItemCount - 1
         }
         items = next
-        itemsByIdentity = Dictionary(uniqueKeysWithValues: next.map { ($0.identity, $0) })
+        itemsByIdentity = Dictionary(next.map { ($0.identity, $0) }, uniquingKeysWith: { first, _ in first })
 
         flowLayout.scrollDirection = horizontal ? .horizontal : .vertical
         alwaysBounceHorizontal = horizontal
@@ -680,7 +698,7 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
         let lastDataOrdinal = dataOrdinals[lastVisible]
         guard lastDataOrdinal >= 0 else { return }
         let remaining = dataItemCount - lastDataOrdinal - 1
-        let thresholdItems = max(1, Int(ceil(Double(dataItemCount) * endReachedThreshold)))
+        let thresholdItems = max(1, craftNativeInt(ceil(Double(dataItemCount) * endReachedThreshold)))
         guard remaining <= thresholdItems else { return }
         let signature = dataContentSignature
         guard endReachedSignature != signature else { return }
@@ -864,6 +882,25 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
         setContentOffset(clamped(offset), animated: false)
     }
 
+    /// A row's identity, its own in this list.
+    ///
+    /// Rows that share a key are told apart by a suffix: `run`, then `run#1`.
+    /// A row whose own key was `run#1` then had the identity of the second
+    /// `run`, and the list's table and its snapshot both trap on a repeated
+    /// identity: three tags keyed `run`, `run` and `run#1` ended the process.
+    /// The suffix counts on until the identity is one no row has taken. A
+    /// list with no such key has the identities it always had.
+    static func uniqueIdentity(_ base: String, seen: inout [String: Int], taken: inout Set<String>) -> String {
+        var occurrence = seen[base, default: 0]
+        var identity = occurrence == 0 ? base : "\(base)#\(occurrence)"
+        while !taken.insert(identity).inserted {
+            occurrence += 1
+            identity = "\(base)#\(occurrence)"
+        }
+        seen[base] = occurrence + 1
+        return identity
+    }
+
     private static func identity(for node: [String: Any]) -> String? {
         let props = node["props"] as? [String: Any] ?? [:]
         return [node["key"], props["key"], props["testID"], node["id"]]