aix 0.7.1-alpha.1 → 0.7.1-alpha.2

package/ios/HybridAix.swift

@@ -134,6 +134,7 @@ class HybridAix: HybridAixSpec, AixContext, KeyboardNotificationsDelegate {
             blankView = nil
             cells.removeAllObjects()
             lastReportedBlankViewSize = (size: .zero, index: 0)
+            lastCalculatedBlankSize = 0
         }
     }
     
@@ -230,11 +231,7 @@ class HybridAix: HybridAixSpec, AixContext, KeyboardNotificationsDelegate {
     private var boundsObservation: NSKeyValueObservation?
     
     // MARK: - Context References (weak to avoid retain cycles)
-    weak var blankView: HybridAixCellView? = nil {
-        didSet {
-            // Could add observers or callbacks here when blank view changes
-        }
-    }
+    weak var blankView: HybridAixCellView? = nil
     
     weak var composerView: HybridAixComposer? = nil
     
@@ -324,33 +321,58 @@ class HybridAix: HybridAixSpec, AixContext, KeyboardNotificationsDelegate {
         return 0
     }
 
+    /// Cache the last successfully calculated blank size to avoid jumps when cells are temporarily missing
+    private var lastCalculatedBlankSize: CGFloat = 0
+
     private func calculateBlankSize(keyboardHeight: CGFloat, additionalContentInsetBottom: CGFloat) -> CGFloat {
-        guard let scrollView, let blankView else { return 0 }
+        guard let scrollView, let blankView else { return lastCalculatedBlankSize }
         
+        let blankViewIndex = Int(blankView.index)
+        let endIndex = blankViewIndex - 1
         let startIndex: Int
-        let endIndex = Int(blankView.index) - 1
+        
         if let penultimateCellIndex {
-            startIndex = Int(penultimateCellIndex)
+            let penultimate = Int(penultimateCellIndex)
+            // Ensure penultimateCellIndex is valid (not beyond current cells)
+            // If penultimateCellIndex >= blankViewIndex, it means props are out of sync with cells
+            if penultimate >= blankViewIndex {
+                // Props are ahead of cells - use previous behavior (last cell before blank)
+                startIndex = endIndex
+            } else {
+                startIndex = penultimate
+            }
         } else {
             startIndex = endIndex
         }
         
         var cellsBeforeBlankViewHeight: CGFloat = 0
-        if startIndex <= endIndex {
+        var hasMissingCells = false
+        if startIndex >= 0 && startIndex <= endIndex {
             for i in startIndex...endIndex {
-            if let cell = getCell(index: i) {
+                if let cell = getCell(index: i) {
                     cellsBeforeBlankViewHeight += cell.view.frame.height
+                } else {
+                    hasMissingCells = true
                 }
             }
         }
         
-        let blankViewHeight = blankView.view.frame.height
+        // If any required cells are missing, return the last known good value to avoid jumps
+        // When all cells register, we'll calculate correctly
+        if hasMissingCells {
+            return lastCalculatedBlankSize
+        }
         
-        // Calculate visible area above all bottom chrome (keyboard, composer, additional insets)
-        // The blank size fills the remaining space so the last message can scroll to the top
+        let blankViewHeight = blankView.view.frame.height
         let visibleAreaHeight = scrollView.bounds.height - keyboardHeight - composerHeight - additionalContentInsetBottom
         let inset = visibleAreaHeight - blankViewHeight - cellsBeforeBlankViewHeight
-        return max(0, inset)
+        
+        // Cache this value for when cells are temporarily missing
+        lastCalculatedBlankSize = inset
+        
+        // Return raw inset value (can be negative when cells are taller than visible area)
+        // The clamping happens in contentInsetBottom to ensure total inset is never negative
+        return inset
     }
     
     /// Calculate the blank size - the space needed to push content up
@@ -362,7 +384,9 @@ class HybridAix: HybridAixSpec, AixContext, KeyboardNotificationsDelegate {
     /// The content inset for the bottom of the scroll view
     
     private func calculateContentInsetBottom(keyboardHeight: CGFloat, blankSize: CGFloat, additionalContentInsetBottom: CGFloat) -> CGFloat {
-        return blankSize + keyboardHeight + composerHeight + additionalContentInsetBottom
+        // Clamp to 0 here instead of in calculateBlankSize to preserve correct math
+        // when keyboard is open and blankSize goes negative
+        return max(0, blankSize + keyboardHeight + composerHeight + additionalContentInsetBottom)
     }
     var contentInsetBottom: CGFloat {
         return calculateContentInsetBottom(keyboardHeight: self.keyboardHeight, blankSize: self.blankSize, additionalContentInsetBottom: self.additionalContentInsetBottom)
@@ -596,9 +620,7 @@ class HybridAix: HybridAixSpec, AixContext, KeyboardNotificationsDelegate {
     
     func reportBlankViewSizeChange(size: CGSize, index: Int) {
         let didAlreadyUpdate = size.height == lastReportedBlankViewSize.size.height && size.width == lastReportedBlankViewSize.size.width && index == lastReportedBlankViewSize.index
-        if didAlreadyUpdate {
-            return
-        }
+        if didAlreadyUpdate { return }
 
         lastReportedBlankViewSize = (size: size, index: index)
 
@@ -630,14 +652,16 @@ class HybridAix: HybridAixSpec, AixContext, KeyboardNotificationsDelegate {
     func registerCell(_ cell: HybridAixCellView) {
         cells.setObject(cell, forKey: NSNumber(value: cell.index))
         
-        // If this cell is marked as last, update our blank view reference
         if cell.isLast {
             blankView = cell
 
-            // Trigger initial setup - handleLayoutChange may have already fired before
-            // the cell was in window, so we need to report here to ensure setup happens
+            // Trigger initial setup 
             let currentSize = cell.view.bounds.size
             reportBlankViewSizeChange(size: currentSize, index: Int(cell.index))
+        } else if didScrollToEndInitially {
+            // A content cell registered after initial setup - recalculate insets
+            // since this cell's height affects the blank size calculation
+            applyAllInsets()
         }
     }
     
@@ -647,7 +671,7 @@ class HybridAix: HybridAixSpec, AixContext, KeyboardNotificationsDelegate {
         // If this was our blank view, clear it
         if blankView === cell {
             blankView = nil
-        }
+                    }
     }
     
     func registerComposerView(_ composerView: HybridAixComposer) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aix",
-  "version": "0.7.1-alpha.1",
+  "version": "0.7.1-alpha.2",
   "author": "Fernando Rojo",
   "repository": {
     "type": "git",