Fixed issue where a cell with nested editor in focus may get recycled

rajdeep · Oct 4, 2024 · d75c0c7 · d75c0c7
1 parent 486b674
commit d75c0c7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/Proton/Sources/Swift/Table/TableCell.swift b/Proton/Sources/Swift/Table/TableCell.swift
@@ -54,7 +54,7 @@ public class TableCell {
     /// Returns `true` if the cell has one or more retain invocations.
     @MainActor
     public var isRetained: Bool {
-        retainCount > 0
+        retainCount > 0 || containsFirstResponder
     }
 
     /// Additional attributes that can be stored on Cell to identify various aspects like Header, Numbered etc.

diff --git a/Proton/Sources/Swift/Table/TableView.swift b/Proton/Sources/Swift/Table/TableView.swift
@@ -416,7 +416,7 @@ public class TableView: UIView {
 
     var cellsInViewport: [TableCell] = [] {
         didSet {
-            reclaimReleasedCells()
+            reclaimReleasedCells(cellsInViewport)
 
             guard oldValue != cellsInViewport else { return }
 
@@ -496,13 +496,15 @@ public class TableView: UIView {
             .intersects(adjustedViewport) }
     }
 
-    private func reclaimReleasedCells() {
-        retainedCells.forEach {
-            if $0.isRetained == false {
-                self.repository.enqueue(cell: $0)
-                retainedCells.remove($0)
+    private func reclaimReleasedCells(_ cellsInViewport: [TableCell]) {
+        retainedCells
+            .filter { cellsInViewport.contains($0) == false }
+            .forEach {
+                if $0.isRetained == false {
+                    self.repository.enqueue(cell: $0)
+                    retainedCells.remove($0)
+                }
             }
-        }
     }
 
     func cellBelow(_ cell: TableCell) -> TableCell? {
@@ -870,13 +872,11 @@ extension TableView: TableContentViewDelegate {
     }
 
     func tableContentView(_ tableContentView: TableContentView, didReceiveFocusAt range: NSRange, in cell: TableCell) {
-        cell.retain()
         resetColumnResizingHandles(selectedCell: cell)
         delegate?.tableView(self, didReceiveFocusAt: range, in: cell)
     }
 
     func tableContentView(_ tableContentView: TableContentView, didLoseFocusFrom range: NSRange, in cell: TableCell) {
-        cell.release()
         removeSelectionBorders()
         delegate?.tableView(self, didLoseFocusFrom: range, in: cell)
     }