fix(inspector): operate CSV column verbs on fully selected columns, make header Cmd-click additive

Author: datlechin

TablePro/TableProApp.swift

@@ -620,17 +620,17 @@ struct AppMenuCommands: Commands {
             }
             .disabled(!keyWindowIsInspector)
 
-            Button(String(localized: "Insert Column Left")) {
+            Button("Insert Column Left") {
                 NSApp.sendAction(#selector(InspectorViewController.inspectorInsertColumnLeft(_:)), to: nil, from: nil)
             }
             .disabled(!keyWindowIsInspector)
 
-            Button(String(localized: "Insert Column Right")) {
+            Button("Insert Column Right") {
                 NSApp.sendAction(#selector(InspectorViewController.inspectorInsertColumnRight(_:)), to: nil, from: nil)
             }
             .disabled(!keyWindowIsInspector)
 
-            Button(String(localized: "Delete Column")) {
+            Button("Delete Column") {
                 NSApp.sendAction(#selector(InspectorViewController.inspectorDeleteColumn(_:)), to: nil, from: nil)
             }
             .disabled(!keyWindowIsInspector)

TablePro/Views/Inspector/InspectorColumnTargets.swift

@@ -0,0 +1,29 @@
+//
+//  InspectorColumnTargets.swift
+//  TablePro
+//
+
+import Foundation
+
+enum InspectorColumnTargets {
+    static func deleteMenuSelection(clicked: Int, fullySelected: IndexSet) -> [Int] {
+        guard fullySelected.contains(clicked), fullySelected.count > 1 else { return [clicked] }
+        return fullySelected.sorted()
+    }
+
+    static func deleteTargets(explicit: [Int]?, fullySelected: IndexSet, columnCount: Int) -> [Int] {
+        let candidates = explicit ?? Array(fullySelected)
+        return candidates.filter { $0 >= 0 && $0 < columnCount }.sorted()
+    }
+
+    static func insertAnchor(clicked: Int?, fullySelected: IndexSet, columnCount: Int, toRight: Bool) -> Int? {
+        guard columnCount > 0 else { return nil }
+        if let clicked, clicked >= 0, clicked < columnCount {
+            return clicked
+        }
+        if let bound = toRight ? fullySelected.max() : fullySelected.min(), bound >= 0, bound < columnCount {
+            return bound
+        }
+        return toRight ? columnCount - 1 : 0
+    }
+}

TablePro/Views/Inspector/InspectorViewController.swift

@@ -292,17 +292,14 @@ final class InspectorViewController: NSViewController, NSUserInterfaceValidation
     }
 
     private func columnInsertAnchor(from sender: Any?, toRight: Bool) -> Int? {
-        guard let inspector = inspectorDocument, !inspector.columnNames.isEmpty else { return nil }
-        let count = inspector.columnNames.count
-        if let menuItem = sender as? NSMenuItem, menuItem.tag >= 0, menuItem.tag < count {
-            return menuItem.tag
-        }
-        if let affected = gridDelegate.coordinator?.selectionController.selection.affectedColumns,
-           let bound = toRight ? affected.max() : affected.min(),
-           bound >= 0, bound < count {
-            return bound
-        }
-        return toRight ? count - 1 : 0
+        guard let inspector = inspectorDocument else { return nil }
+        let clicked = (sender as? NSMenuItem).map(\.tag)
+        return InspectorColumnTargets.insertAnchor(
+            clicked: clicked,
+            fullySelected: selectedFullColumns(),
+            columnCount: inspector.columnNames.count,
+            toRight: toRight
+        )
     }
 
     @objc func inspectorDeleteColumn(_ sender: Any?) {
@@ -312,14 +309,15 @@ final class InspectorViewController: NSViewController, NSUserInterfaceValidation
 
     private func columnDeleteTargets(from sender: Any?) -> [Int] {
         guard let inspector = inspectorDocument else { return [] }
-        let count = inspector.columnNames.count
-        if let menuItem = sender as? NSMenuItem, let represented = menuItem.representedObject as? [Int] {
-            return represented.filter { $0 >= 0 && $0 < count }.sorted()
-        }
-        if let affected = gridDelegate.coordinator?.selectionController.selection.affectedColumns {
-            return affected.filter { $0 >= 0 && $0 < count }.sorted()
-        }
-        return []
+        return InspectorColumnTargets.deleteTargets(
+            explicit: (sender as? NSMenuItem)?.representedObject as? [Int],
+            fullySelected: selectedFullColumns(),
+            columnCount: inspector.columnNames.count
+        )
+    }
+
+    private func selectedFullColumns() -> IndexSet {
+        gridDelegate.coordinator?.selectionController.selectedFullColumns() ?? IndexSet()
     }
 
     private func performDeleteColumns(_ columns: [Int]) {
@@ -377,11 +375,7 @@ final class InspectorViewController: NSViewController, NSUserInterfaceValidation
     }
 
     private func columnDeleteSelection(clicked: Int) -> [Int] {
-        guard let affected = gridDelegate.coordinator?.selectionController.selection.affectedColumns,
-              affected.contains(clicked), affected.count > 1 else {
-            return [clicked]
-        }
-        return affected.sorted()
+        InspectorColumnTargets.deleteMenuSelection(clicked: clicked, fullySelected: selectedFullColumns())
     }
 
     fileprivate func rowStructureMenuItems(forRow displayRow: Int) -> [NSMenuItem] {
@@ -468,7 +462,7 @@ final class InspectorViewController: NSViewController, NSUserInterfaceValidation
         case #selector(inspectorDeleteColumn(_:)):
             guard nsDocument != nil else { return false }
             if let menuItem = item as? NSMenuItem, menuItem.representedObject is [Int] { return true }
-            return !(gridDelegate.coordinator?.selectionController.selection.affectedColumns.isEmpty ?? true)
+            return !selectedFullColumns().isEmpty
         case #selector(inspectorDeleteSelectedRows(_:)):
             return !state.selectedRowIndices.isEmpty
         default:

TablePro/Views/Results/DataGridView+RowActions.swift

@@ -340,6 +340,14 @@ extension TableViewCoordinator {
         }
     }
 
+    func extendColumnSelection(_ dataColumnIndex: Int) {
+        let totalRows = displayIDs?.count ?? tableRowsProvider().rows.count
+        selectionController.addEntireColumn(dataColumnIndex, totalRows: totalRows)
+        if let keyTableView = tableView as? KeyHandlingTableView {
+            keyTableView.deselectAll(nil)
+        }
+    }
+
     func copyGridSelection(_ selection: GridSelection) {
         guard let rect = selection.boundingRectangle else { return }
         let tableRows = tableRowsProvider()

TablePro/Views/Results/Selection/GridSelectionController.swift

@@ -152,6 +152,18 @@ final class GridSelectionController {
         update(.single(rect, anchor: anchor, active: anchor))
     }
 
+    func addEntireColumn(_ column: Int, totalRows: Int) {
+        guard column >= 0, totalRows > 0 else { return }
+        let rect = GridRect(rows: 0...(totalRows - 1), columns: column...column)
+        let anchor = GridCoord(row: 0, column: column)
+        let addition = GridSelection.single(rect, anchor: anchor, active: anchor)
+        update(selection.isEmpty ? addition : selection.union(addition))
+    }
+
+    func selectedFullColumns() -> IndexSet {
+        fullySelectedColumns(in: selection)
+    }
+
     func selectEntireRow(_ row: Int, totalColumns: Int) {
         guard row >= 0, totalColumns > 0 else { return }
         let rect = GridRect(rows: row...row, columns: 0...(totalColumns - 1))

TablePro/Views/Results/SortableHeaderView.swift

@@ -303,7 +303,7 @@ final class SortableHeaderView: NSTableHeaderView {
         }
 
         if modifierFlags.contains(.command) && !modifierFlags.contains(.shift) {
-            coordinator.selectColumn(dataIndex)
+            coordinator.extendColumnSelection(dataIndex)
             return
         }
 

TableProTests/Views/InspectorColumnTargetsTests.swift

@@ -0,0 +1,49 @@
+//
+//  InspectorColumnTargetsTests.swift
+//  TableProTests
+//
+
+import Foundation
+@testable import TablePro
+import Testing
+
+@Suite("InspectorColumnTargets")
+struct InspectorColumnTargetsTests {
+    @Test("Delete menu targets the whole selection only when the clicked column is inside it")
+    func deleteMenuSelection() {
+        #expect(InspectorColumnTargets.deleteMenuSelection(
+            clicked: 1, fullySelected: IndexSet([1, 2, 3])) == [1, 2, 3])
+        #expect(InspectorColumnTargets.deleteMenuSelection(
+            clicked: 5, fullySelected: IndexSet([1, 2, 3])) == [5])
+        #expect(InspectorColumnTargets.deleteMenuSelection(
+            clicked: 2, fullySelected: IndexSet([2])) == [2])
+        #expect(InspectorColumnTargets.deleteMenuSelection(
+            clicked: 0, fullySelected: IndexSet()) == [0])
+    }
+
+    @Test("Delete targets prefer the explicit list and fall back to the selection, filtered to range")
+    func deleteTargets() {
+        #expect(InspectorColumnTargets.deleteTargets(
+            explicit: [3, 1], fullySelected: IndexSet([9]), columnCount: 5) == [1, 3])
+        #expect(InspectorColumnTargets.deleteTargets(
+            explicit: nil, fullySelected: IndexSet([0, 2]), columnCount: 5) == [0, 2])
+        #expect(InspectorColumnTargets.deleteTargets(
+            explicit: [1, 99], fullySelected: IndexSet(), columnCount: 3) == [1])
+    }
+
+    @Test("Insert anchor prefers the clicked column, then the selection bound, then the edge")
+    func insertAnchor() {
+        #expect(InspectorColumnTargets.insertAnchor(
+            clicked: 2, fullySelected: IndexSet([0, 4]), columnCount: 5, toRight: true) == 2)
+        #expect(InspectorColumnTargets.insertAnchor(
+            clicked: nil, fullySelected: IndexSet([1, 3]), columnCount: 5, toRight: false) == 1)
+        #expect(InspectorColumnTargets.insertAnchor(
+            clicked: nil, fullySelected: IndexSet([1, 3]), columnCount: 5, toRight: true) == 3)
+        #expect(InspectorColumnTargets.insertAnchor(
+            clicked: nil, fullySelected: IndexSet(), columnCount: 5, toRight: false) == 0)
+        #expect(InspectorColumnTargets.insertAnchor(
+            clicked: nil, fullySelected: IndexSet(), columnCount: 5, toRight: true) == 4)
+        #expect(InspectorColumnTargets.insertAnchor(
+            clicked: 3, fullySelected: IndexSet(), columnCount: 0, toRight: false) == nil)
+    }
+}

docs/features/csv-inspector.mdx

@@ -53,7 +53,7 @@ Right-click a column header, or open the toolbar `Columns` menu, to reach the sa
 - **Change Type ▸** overrides the inferred type as Text, Integer, Real, Boolean, or Date. **Reset to Inferred** drops the override.
 - **Delete Column** removes the column. It sits last in the menu and is undoable with Cmd+Z. Deleting a column that holds data asks you to confirm first.
 
-Select several columns first (click a header, then Cmd-click others) and the menu reads **Delete Columns**, removing all of them in one undoable step. Insert Column Left / Right, and Delete Column, also appear in the Edit menu, where they act on the selected column.
+Cmd-click several column headers to select whole columns, and the menu reads **Delete Columns**, removing all of them in one undoable step. Insert Column Left / Right, and Delete Column, also appear in the Edit menu, where they act on the selected columns.
 
 In the toolbar `Columns` menu, **Add Column…** at the top appends a new column at the end, and every column is listed below it with its current type and the same submenu.