Decelect cells after merge. Also added isSelectable to GridCell (#261)

Author: rajdeep

Diff for: Proton/Sources/Swift/Grid/View/GridCell.swift

@@ -137,7 +137,8 @@ open class GridCell {
     public var isSelected: Bool {
         get { selectionView?.superview != nil }
         set {
-            guard newValue != isSelected else { return }
+            guard isSelectable,
+                newValue != isSelected else { return }
             if newValue {
                 selectionView?.addTo(parent: contentView)
             } else {
@@ -147,6 +148,9 @@ open class GridCell {
         }
     }
 
+    /// Controls if the cell can be selected or not.
+    public var isSelectable: Bool = true
+
     private(set) var editorSetupComplete = false
     private var _editor: EditorView?
     /// Editor within the cell

Diff for: Proton/Sources/Swift/Grid/View/GridContentView.swift

@@ -185,6 +185,7 @@ class GridContentView: UIScrollView {
     func selectCells(_ cells: [GridCell]) {
         deselectCells()
 //        selectedCells.append(contentsOf: cells)
+        cells.first?.editor.setFocus()
         cells.forEach { $0.isSelected = true }
     }
 
@@ -200,12 +201,15 @@ class GridContentView: UIScrollView {
     func merge(cells: [GridCell]) -> GridCell? {
         let mergedCell = grid.merge(cells: cells)
         invalidateCellLayout()
+        deselectCells()
         return mergedCell
     }
 
     func split(cell: GridCell) -> [GridCell] {
         let cells = grid.split(cell: cell)
         invalidateCellLayout()
+        // First cell is the existing merged cell. Others are added as new.
+        deselectCells()
         return cells
     }
 
@@ -290,9 +294,11 @@ class GridContentView: UIScrollView {
             deselectCurrentSelection()
         }
 
-        if sender.state == .began ||
-            sender.state == .changed {
-            selectCellsInLocation(location)
+        if sender.state == .began || sender.state == .changed {
+            let cell = selectCellsInLocation(location)
+            if sender.state == .began {
+                cell?.editor.setFocus()
+            }
             let velocity = sender.velocity(in: self)
             let updatedOffset = contentOffset.x + (velocity.x/100)
             if updatedOffset >= 0, // prevent out of bounds scroll to left
@@ -302,9 +308,10 @@ class GridContentView: UIScrollView {
         }
     }
 
-    func selectCellsInLocation(_ location: CGPoint) {
-        guard let cell = cells.first(where: { $0.frame.contains(location) }) else { return }
+    func selectCellsInLocation(_ location: CGPoint) -> GridCell? {
+        guard let cell = cells.first(where: { $0.frame.contains(location) }) else { return nil }
         cell.isSelected = true
+        return cell
     }
 
     func deselectCurrentSelection() {

Diff for: Proton/Tests/Grid/GridViewTests.swift

@@ -219,4 +219,52 @@ class GridViewTests: XCTestCase {
         gridView.selectCells(cellsToSelect)
         waitForExpectations(timeout: 1.0)
     }
+
+    func testDeselectsCellAfterMerge() {
+        let gridView = GridView(config: config)
+        let delegate = MockGridViewDelegate()
+        gridView.delegate = delegate
+        gridView.gridView.willMove(toWindow: UIWindow())
+
+        let cells = gridView.cells.filter({ $0.rowSpan.first ?? 0 < 2 && $0.columnSpan.first ?? 0 < 2 })
+        gridView.selectCells(cells)
+
+        XCTAssertEqual(gridView.selectedCells.count, 4)
+        gridView.merge(cells: cells)
+        XCTAssertEqual(gridView.selectedCells.count, 0)
+    }
+
+    func testDeselectsCellAfterSplit() {
+        let gridView = GridView(config: config)
+        let delegate = MockGridViewDelegate()
+        gridView.delegate = delegate
+        gridView.gridView.willMove(toWindow: UIWindow())
+
+        let cells = gridView.cells.filter({ $0.rowSpan.first ?? 0 < 2 && $0.columnSpan.first ?? 0 < 2 })
+        gridView.selectCells(cells)
+
+        XCTAssertEqual(gridView.selectedCells.count, 4)
+        XCTAssertEqual(gridView.cells.count, 6)
+        gridView.merge(cells: cells)
+        XCTAssertEqual(gridView.cells.count, 3)
+        gridView.selectCells([cells[0]])
+        gridView.split(cell: cells[0])
+        XCTAssertEqual(gridView.cells.count, 6)
+        XCTAssertEqual(gridView.selectedCells.count, 0)
+    }
+
+    func testIgnoresNonSelectableCellsOnSelection() {
+        let gridView = GridView(config: config)
+        let delegate = MockGridViewDelegate()
+        gridView.delegate = delegate
+        gridView.gridView.willMove(toWindow: UIWindow())
+
+        gridView.cells.filter({ $0.rowSpan.first ?? 0 < 2 && $0.columnSpan.first ?? 0 < 1 }).forEach {
+            $0.isSelectable = false
+        }
+        gridView.selectCells(gridView.cells.filter({ $0.rowSpan.first ?? 0 < 2 && $0.columnSpan.first ?? 0 < 2 }))
+        XCTAssertEqual(gridView.selectedCells.count, 2)
+        XCTAssertEqual(gridView.selectedCells[0].id, "{[0],[1]}")
+        XCTAssertEqual(gridView.selectedCells[1].id, "{[1],[1]}")
+    }
 }