Disable cell selection by default. Can be enabled by setting table.isCellSelectionEnabled

Author: rajdeep

Diff for: ExampleApp/ExampleApp/Views/TableViewAttachment.swift

@@ -30,7 +30,7 @@ public class TableViewAttachment: Attachment {
     public let view: TableView
 
     public init(config: GridConfiguration) {
-        view = TableView(config: config)
+        view = TableView(config: config, isCellSelectionEnabled: true)
         super.init(view, size: .fullWidth)
         view.boundsObserver = self
     }

Diff for: Proton/Sources/Swift/Table/TableContentView.swift

@@ -78,6 +78,15 @@ class TableContentView: UIScrollView {
 
     var isFreeScrollingEnabled = false
     var isRendered = false
+    var isCellSelectionEnabled = false {
+        didSet {
+            guard oldValue != isCellSelectionEnabled else { return }
+            setupSelectionGesture()
+        }
+    }
+
+    var selectionGestureRecognizer: UIPanGestureRecognizer?
+    let selectionGestureRecognizerName = "_tableView_selectionGestureRecognizer"
 
     // Border for outer edges are added separately to account for
     // half-width borders added by cells which results in thinner outer border of table
@@ -255,7 +264,17 @@ class TableContentView: UIScrollView {
     }
 
     private func setupSelectionGesture() {
+        if let selectionGestureRecognizer {
+            removeGestureRecognizer(selectionGestureRecognizer)
+        }
+
+        guard isCellSelectionEnabled else {
+            return
+        }
+
         let gestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(handleSelection(_:)))
+        gestureRecognizer.name = selectionGestureRecognizerName
+        selectionGestureRecognizer = gestureRecognizer
         gestureRecognizer.delegate = self
         gestureRecognizer.minimumNumberOfTouches = 2
         gestureRecognizer.maximumNumberOfTouches = 2

Diff for: Proton/Sources/Swift/Table/TableView.swift

@@ -209,6 +209,12 @@ public class TableView: UIView {
         }
     }
 
+    /// Determines if cell selection using 2-finger drag gesture is enabled
+    public var isCellSelectionEnabled: Bool {
+        get { tableView.isCellSelectionEnabled }
+        set { tableView.isCellSelectionEnabled = newValue }
+    }
+
     /// Bounds observer for the `TableView`. Typically, this will be the `Attachment` that hosts the `TableView`.
     /// - Note: In absence of a `boundObserver`, the `TableView` will not autoresize when the content in the cells
     /// are changed.
@@ -294,9 +300,9 @@ public class TableView: UIView {
     ///   - config: Configuration for `TableView`
     ///   - cellEditorInitializer: Custom initializer for `EditorView` within `TableCell`. This will also be used when creating new cells as a
     ///   return of adding new row or column, or cells being split.
-    public convenience init(config: GridConfiguration, cellEditorInitializer: GridCell.EditorInitializer? = nil) {
+    public convenience init(config: GridConfiguration, cellEditorInitializer: GridCell.EditorInitializer? = nil, isCellSelectionEnabled: Bool = false) {
         let tableView = TableContentView(config: config, editorInitializer: cellEditorInitializer)
-        self.init(config: config, tableView: tableView)
+        self.init(config: config, tableView: tableView, isCellSelectionEnabled: isCellSelectionEnabled)
     }
 
     /// Initializes `TableView` using the provided configuration.
@@ -307,12 +313,12 @@ public class TableView: UIView {
     ///   return of adding new row or column, or cells being split.
     ///   - Important:
     ///   Care must be taken that the number of cells are correct per the configuration provided, failing which the `TableView` rendering may be broken.
-    public convenience init(config: GridConfiguration, cells: [TableCell], cellEditorInitializer: TableCell.EditorInitializer? = nil) {
+    public convenience init(config: GridConfiguration, cells: [TableCell], cellEditorInitializer: TableCell.EditorInitializer? = nil, isCellSelectionEnabled: Bool = false) {
         let tableView = TableContentView(config: config, cells: cells, editorInitializer: cellEditorInitializer)
-        self.init(config: config, tableView: tableView)
+        self.init(config: config, tableView: tableView, isCellSelectionEnabled: isCellSelectionEnabled)
     }
 
-    private init(config: GridConfiguration, tableView: TableContentView) {
+    private init(config: GridConfiguration, tableView: TableContentView, isCellSelectionEnabled: Bool ) {
         self.tableView = tableView
         let boundsShadowColors = [
             config.boundsLimitShadowColors.primary.cgColor,
@@ -325,7 +331,7 @@ public class TableView: UIView {
         self.config = config
         super.init(frame: .zero)
         self.leadingShadowConstraint = leadingShadowView.leadingAnchor.constraint(equalTo: self.leadingAnchor)
-
+        self.isCellSelectionEnabled = isCellSelectionEnabled
         setup()
     }
 

Diff for: Proton/Tests/Attachments/TableViewAttachment.swift

@@ -28,13 +28,13 @@ extension EditorContent.Name {
 
 public class TableViewAttachment: Attachment {
     public let view: TableView
-    public init(config: GridConfiguration) {
+    public init(config: GridConfiguration, isCellSelectionEnabled: Bool = false) {
         view = TableView(config: config)
         super.init(view, size: .fullWidth)
         view.boundsObserver = self
     }
 
-    public init(config: GridConfiguration, cells: [TableCell]) {
+    public init(config: GridConfiguration, cells: [TableCell], isCellSelectionEnabled: Bool = false) {
         view = TableView(config: config, cells: cells)
         super.init(view, size: .fullWidth)
         view.boundsObserver = self

Diff for: Proton/Tests/Helpers/AttachmentGenerator.swift

@@ -31,7 +31,8 @@ struct AttachmentGenerator {
         numColumns: Int,
         columnConfig: GridColumnConfiguration? = nil,
         rowConfig: GridRowConfiguration? = nil,
-        initialRowHeight: CGFloat = 50
+        initialRowHeight: CGFloat = 50,
+        isCellSelectionEnabled: Bool = false
     ) -> TableViewAttachment {
         let columnConfiguration = columnConfig ?? GridColumnConfiguration(width: .fixed(100))
         let rowConfiguration = rowConfig ?? GridRowConfiguration(initialHeight: initialRowHeight)

Diff for: Proton/Tests/Table/TableViewTests.swift

@@ -106,6 +106,20 @@ class TableViewTests: XCTestCase {
             try cellIDString(from: tableView.cellsInViewport, filter: filter))
     }
 
+    func testIsCellSelectionEnabled() {
+        let attachment = AttachmentGenerator.makeTableViewAttachment(
+            id: 1,
+            numRows: 20,
+            numColumns: 5,
+            initialRowHeight: 100
+        )
+        let tableView = attachment.view.tableView
+        XCTAssertFalse(tableView.gestureRecognizers?.contains{ $0.name == tableView.selectionGestureRecognizerName } ?? false)
+
+        tableView.isCellSelectionEnabled = true
+        XCTAssertTrue(tableView.gestureRecognizers?.contains{ $0.name == tableView.selectionGestureRecognizerName } ?? false)
+    }
+
     func FIXME_testChangesBoundsOfCell() {
         let expectation = functionExpectation()
         expectation.expectedFulfillmentCount = 2