refactor(datagrid): handle cell-range selection in right-click and simplify delete

Author: datlechin

CHANGELOG.md

@@ -21,7 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Delete key now respects cell-range selection in the data grid, removing all rows covered by the selection instead of ignoring it.
-- Right-clicking a row inside a multi-row selection no longer collapses the selection before the context menu appears.
+- Right-clicking inside a multi-row or cell-range selection no longer collapses the selection before the context menu appears.
 - Oracle connections no longer crash the app during connect. A short or unexpected handshake packet from the server (such as session-setup metadata or an error) now surfaces the error or continues instead of trapping. (#1683)
 - MongoDB filters on `_id` and other ObjectId fields now match. A 24-character hex value is matched as an ObjectId as well as a string, so filtering by `_id` returns the row instead of nothing. (#1682)
 - The sidebar and inspector keep their width per connection, the sidebar keeps its collapsed state, and the inspector keeps its selected tab, when you quit and reopen the app.

TablePro/Views/Results/KeyHandlingTableView.swift

@@ -223,9 +223,7 @@ final class KeyHandlingTableView: NSTableView {
     @objc func delete(_ sender: Any?) {
         guard coordinator?.isEditable == true else { return }
         if let controller = gridSelection, !controller.isEmpty {
-            let rows = controller.selection.affectedRows
-            guard !rows.isEmpty else { return }
-            coordinator?.delegate?.dataGridDeleteRows(Set(rows))
+            coordinator?.delegate?.dataGridDeleteRows(Set(controller.selection.affectedRows))
             return
         }
         guard !selectedRowIndexes.isEmpty else { return }
@@ -531,7 +529,7 @@ final class KeyHandlingTableView: NSTableView {
     override func rightMouseDown(with event: NSEvent) {
         let point = convert(event.locationInWindow, from: nil)
         let clickedRow = row(at: point)
-        if clickedRow >= 0, selectedRowIndexes.contains(clickedRow) {
+        if clickedRow >= 0, clickIsInsideSelection(row: clickedRow, point: point) {
             window?.makeFirstResponder(self)
             if let menu = menu(for: event) {
                 NSMenu.popUpContextMenu(menu, with: event, for: self)
@@ -541,6 +539,18 @@ final class KeyHandlingTableView: NSTableView {
         super.rightMouseDown(with: event)
     }
 
+    private func clickIsInsideSelection(row clickedRow: Int, point: NSPoint) -> Bool {
+        if selectedRowIndexes.contains(clickedRow) { return true }
+        guard let controller = gridSelection, !controller.isEmpty else { return false }
+        let clickedColumn = column(at: point)
+        guard clickedColumn >= 0,
+              let schema = coordinator?.identitySchema,
+              let dataColumn = DataGridView.dataColumnIndex(for: clickedColumn, in: self, schema: schema) else {
+            return false
+        }
+        return controller.selection.contains(row: clickedRow, column: dataColumn)
+    }
+
     override func menu(for event: NSEvent) -> NSMenu? {
         let point = convert(event.locationInWindow, from: nil)
         let clickedRow = row(at: point)

TableProTests/Views/Results/CellSelectionTests.swift

@@ -63,6 +63,16 @@ struct GridSelectionTests {
         #expect(selection.boundingRectangle == rect)
     }
 
+    @Test("a cell-range spanning rows reports every covered row")
+    func cellRangeAffectsEveryCoveredRow() {
+        let selection = GridSelection.single(
+            GridRect(rows: 2...5, columns: 1...3),
+            anchor: GridCoord(row: 2, column: 1),
+            active: GridCoord(row: 5, column: 3)
+        )
+        #expect(selection.affectedRows == IndexSet(integersIn: 2...5))
+    }
+
     @Test("multiple rectangles report union of affected rows and columns")
     func multipleRectanglesUnion() {
         let selection = GridSelection(