fix(inspector): fix CSV header demote width, guard the no-op toggle, wire Cmd+Shift+H through shortcuts

Author: datlechin

Plugins/CSVInspectorPlugin/CSVDocument.swift

@@ -349,6 +349,7 @@ public final class CSVDocument: NSDocument, InspectorDocument {
     }
 
     public func toggleHeaderRow() {
+        guard store.hasHeaderRow || store.rowCount > 0 else { return }
         performStructuralChange(name: String(localized: "Switch Header Row")) {
             store.toggleHeaderRow()
             recomputeInferredTypes()

Plugins/CSVInspectorPlugin/CSVRowStore.swift

@@ -331,7 +331,7 @@ final class CSVRowStore {
 
     func toggleHeaderRow() {
         if hasHeaderRow {
-            let headerCells = currentHeaderCells()
+            let headerCells = columnNames
             let synthetic = (0..<columnNames.count).map { "Column \($0 + 1)" }
             logicalRows.insert(.materialized(headerCells), at: 0)
             columnNames = synthetic
@@ -369,15 +369,6 @@ final class CSVRowStore {
         cacheOrder.removeAll()
     }
 
-    private func currentHeaderCells() -> [String] {
-        switch headerRef {
-        case .original(let range):
-            return applyColumnTransforms(cachedRawCells(in: range))
-        case .materialized(let cells):
-            return cells
-        }
-    }
-
     static func split(_ value: String, spec: SplitSpec) -> [String] {
         switch spec {
         case .literal(let separator):

TablePro/Models/UI/KeyboardShortcutModels.swift

@@ -96,6 +96,7 @@ enum ShortcutAction: String, Codable, CaseIterable, Identifiable {
     case addRow
     case duplicateRow
     case truncateTable
+    case toggleHeaderRow
     case previewFKReference
     case saveAsFavorite
     case previousPage
@@ -138,7 +139,7 @@ enum ShortcutAction: String, Codable, CaseIterable, Identifiable {
             return .editor
         case .undo, .redo, .cut, .copy, .copyRowsExplicit, .copyWithHeaders, .copyAsJson,
              .paste, .delete, .selectAll, .clearSelection, .addRow, .duplicateRow,
-             .truncateTable, .previewFKReference, .saveAsFavorite, .previousPage,
+             .truncateTable, .toggleHeaderRow, .previewFKReference, .saveAsFavorite, .previousPage,
              .nextPage, .firstPage, .lastPage, .refresh, .export, .importData:
             return .dataGrid
         case .newTab, .closeTab, .reopenClosedTab, .quickSwitcher, .toggleTableBrowser,
@@ -216,6 +217,7 @@ enum ShortcutAction: String, Codable, CaseIterable, Identifiable {
         case .addRow: return String(localized: "Add Row")
         case .duplicateRow: return String(localized: "Duplicate Row")
         case .truncateTable: return String(localized: "Truncate Table")
+        case .toggleHeaderRow: return String(localized: "Switch First Row Between Header/Data")
         case .previewFKReference: return String(localized: "Preview FK Reference")
         case .saveAsFavorite: return String(localized: "Save as Favorite")
         case .toggleTableBrowser: return String(localized: "Toggle Table Browser")
@@ -433,6 +435,7 @@ struct KeyboardSettings: Codable, Equatable {
         .addRow: .character("n", command: true, shift: true),
         .duplicateRow: .character("d", command: true, shift: true),
         .truncateTable: .special(.delete, option: true),
+        .toggleHeaderRow: .character("h", command: true, shift: true),
         .previewFKReference: .special(.space),
         .saveAsFavorite: .character("d", command: true),
         .previousPage: .character("[", command: true),

TablePro/TableProApp.swift

@@ -645,10 +645,10 @@ struct AppMenuCommands: Commands {
             }
             .disabled(!keyWindowIsInspector)
 
-            Button(String(localized: "Switch First Row Between Header/Data")) {
+            Button("Switch First Row Between Header/Data") {
                 NSApp.sendAction(#selector(InspectorViewController.inspectorToggleHeaderRow(_:)), to: nil, from: nil)
             }
-            .keyboardShortcut("h", modifiers: [.command, .shift])
+            .optionalKeyboardShortcut(shortcut(for: .toggleHeaderRow))
             .disabled(!keyWindowIsInspector)
 
             Divider()

TableProTests/Plugins/CSVInspectorTests.swift

@@ -395,6 +395,18 @@ struct CSVRowStoreTests {
         #expect(store.rowCount == 2)
         #expect(store.cells(forRow: 0) == ["Alice", "30"])
     }
+
+    @Test("Demoting after a column insert keeps the header row the full width")
+    func toggleHeaderAfterColumnInsert() {
+        let store = makeStore("1,2\n3,4\n")
+        store.toggleHeaderRow()
+        store.insertColumn(at: 2, name: "c")
+        store.toggleHeaderRow()
+        #expect(store.columnCount == 3)
+        #expect(store.columnNames == ["Column 1", "Column 2", "Column 3"])
+        #expect(store.cells(forRow: 0) == ["1", "2", "c"])
+        #expect(store.cells(forRow: 1).count == 3)
+    }
 }
 
 @Suite("CSVWriter round-trip")