refactor(datagrid): centralize chevron-kind check and extract testable picker components (#1405)

Author: datlechin

TablePro/Core/Services/Formatting/DateEditingService.swift

@@ -23,6 +23,12 @@ struct ParsedTemporalValue: Equatable {
     let layout: TemporalLayout
 }
 
+enum TemporalComponents: Equatable {
+    case dateOnly
+    case timeOnly
+    case dateAndTime
+}
+
 enum DateEditingService {
     private static let pattern =
         #"^(?:(\d{4})-(\d{2})-(\d{2}))?(?:([ T])?(\d{2}):(\d{2}):(\d{2})(\.\d+)?)?(Z|[+-]\d{2}(?::?\d{2})?)?$"#
@@ -120,6 +126,12 @@ enum DateEditingService {
         return dateString(from: components) + " " + timeString(from: components)
     }
 
+    static func components(for columnType: ColumnType) -> TemporalComponents {
+        if case .date = columnType { return .dateOnly }
+        if columnType.isTimeOnly { return .timeOnly }
+        return .dateAndTime
+    }
+
     private static func dateString(from components: DateComponents) -> String {
         String(format: "%04d-%02d-%02d", components.year ?? 0, components.month ?? 0, components.day ?? 0)
     }

TablePro/Views/Results/Cells/DataGridCellKind.swift

@@ -13,4 +13,13 @@ enum DataGridCellKind: Equatable {
     case json
     case blob
     case date
+
+    var showsChevron: Bool {
+        switch self {
+        case .dropdown, .boolean, .json, .blob, .date:
+            return true
+        case .text, .foreignKey:
+            return false
+        }
+    }
 }

TablePro/Views/Results/Cells/DataGridCellView.swift

@@ -283,42 +283,37 @@ final class DataGridCellView: NSView {
     }
 
     private func computeAccessoryRect() -> NSRect {
-        switch kind {
-        case .text:
-            return .zero
-        case .foreignKey:
+        if kind == .foreignKey {
             guard let raw = rawValue, !raw.isEmpty else { return .zero }
             let size = NSSize(width: 16, height: 16)
             let x = bounds.maxX - DataGridMetrics.cellHorizontalInset - size.width
             let y = (bounds.height - size.height) / 2
             return NSRect(x: x, y: y, width: size.width, height: size.height)
-        case .dropdown, .boolean, .json, .blob, .date:
-            guard isEditableCell else { return .zero }
-            let size = NSSize(width: 12, height: 14)
-            let minRequired = size.width + 2 * DataGridMetrics.cellHorizontalInset
-            guard bounds.width >= minRequired else { return .zero }
-            let x = bounds.maxX - DataGridMetrics.cellHorizontalInset - size.width
-            let y = (bounds.height - size.height) / 2
-            return NSRect(x: x, y: y, width: size.width, height: size.height)
         }
+        guard kind.showsChevron, isEditableCell else { return .zero }
+        let size = NSSize(width: 12, height: 14)
+        let minRequired = size.width + 2 * DataGridMetrics.cellHorizontalInset
+        guard bounds.width >= minRequired else { return .zero }
+        let x = bounds.maxX - DataGridMetrics.cellHorizontalInset - size.width
+        let y = (bounds.height - size.height) / 2
+        return NSRect(x: x, y: y, width: size.width, height: size.height)
     }
 
     private func drawAccessory(in rect: NSRect) {
         guard !rect.isEmpty else { return }
         let image: CGImage?
-        switch kind {
-        case .text:
-            return
-        case .foreignKey:
+        if kind == .foreignKey {
             image = onEmphasizedSelection ? Self.fkArrowEmphasized : Self.fkArrowNormal
-        case .dropdown, .boolean, .json, .blob, .date:
+        } else if kind.showsChevron {
             if visualState.isDeleted {
                 image = Self.chevronDisabled
             } else if onEmphasizedSelection {
                 image = Self.chevronEmphasized
             } else {
                 image = Self.chevronNormal
             }
+        } else {
+            return
         }
         guard let cgImage = image, let context = NSGraphicsContext.current?.cgContext else { return }
         context.saveGState()
@@ -337,21 +332,17 @@ final class DataGridCellView: NSView {
 
     override func mouseDown(with event: NSEvent) {
         let point = convert(event.locationInWindow, from: nil)
-        if !accessoryHitRect.isEmpty && accessoryHitRect.contains(point) {
-            switch kind {
-            case .foreignKey:
-                accessoryDelegate?.dataGridCellDidClickFKArrow(row: cellRow, columnIndex: cellColumnIndex)
-                return
-            case .dropdown, .boolean, .json, .blob, .date:
-                guard !visualState.isDeleted else {
-                    super.mouseDown(with: event)
-                    return
-                }
-                accessoryDelegate?.dataGridCellDidClickChevron(row: cellRow, columnIndex: cellColumnIndex)
-                return
-            case .text:
-                break
-            }
+        guard !accessoryHitRect.isEmpty, accessoryHitRect.contains(point) else {
+            super.mouseDown(with: event)
+            return
+        }
+        if kind == .foreignKey {
+            accessoryDelegate?.dataGridCellDidClickFKArrow(row: cellRow, columnIndex: cellColumnIndex)
+            return
+        }
+        if kind.showsChevron, !visualState.isDeleted {
+            accessoryDelegate?.dataGridCellDidClickChevron(row: cellRow, columnIndex: cellColumnIndex)
+            return
         }
         super.mouseDown(with: event)
     }

TablePro/Views/Results/Extensions/DataGridView+Popovers.swift

@@ -207,9 +207,11 @@ extension TableViewCoordinator {
     }
 
     private func datePickerElements(for columnType: ColumnType) -> NSDatePicker.ElementFlags {
-        if case .date = columnType { return .yearMonthDay }
-        if columnType.isTimeOnly { return .hourMinuteSecond }
-        return [.yearMonthDay, .hourMinuteSecond]
+        switch DateEditingService.components(for: columnType) {
+        case .dateOnly: return .yearMonthDay
+        case .timeOnly: return .hourMinuteSecond
+        case .dateAndTime: return [.yearMonthDay, .hourMinuteSecond]
+        }
     }
 
     func showEnumPopover(tableView: NSTableView, row: Int, column: Int, columnIndex: Int) {

TableProTests/Core/Services/DateEditingServiceTests.swift

@@ -117,4 +117,24 @@ struct DateEditingServiceTests {
         let value = DateEditingService.defaultString(from: parsed.date, columnType: .timestamp(rawType: "TIME"))
         #expect(value == "09:30:45")
     }
+
+    @Test("date column edits date components only")
+    func componentsForDate() {
+        #expect(DateEditingService.components(for: .date(rawType: "DATE")) == .dateOnly)
+    }
+
+    @Test("time column edits time components only")
+    func componentsForTime() {
+        #expect(DateEditingService.components(for: .timestamp(rawType: "TIME")) == .timeOnly)
+    }
+
+    @Test("time column with precision edits time components only")
+    func componentsForTimeWithPrecision() {
+        #expect(DateEditingService.components(for: .timestamp(rawType: "TIME(6)")) == .timeOnly)
+    }
+
+    @Test("timestamp column edits date and time components")
+    func componentsForTimestamp() {
+        #expect(DateEditingService.components(for: .timestamp(rawType: "TIMESTAMP")) == .dateAndTime)
+    }
 }