fix: address review feedback for data grid font setting

Author: datlechin

TablePro/Theme/DataGridFontCache.swift

@@ -8,6 +8,16 @@
 
 import AppKit
 
+/// Tags stored on NSTextField.tag to identify which font variant a cell uses.
+/// Used by `updateVisibleCellFonts` to re-apply the correct variant after a font change.
+enum DataGridFontVariant {
+    static let regular = 0
+    static let italic = 1
+    static let medium = 2
+    static let rowNumber = 3
+}
+
+@MainActor
 struct DataGridFontCache {
     private(set) static var regular = NSFont.monospacedSystemFont(ofSize: 13, weight: .regular)
     private(set) static var italic = regular.withTraits(.italic)

TablePro/Views/Results/DataGridCellFactory.swift

@@ -96,13 +96,15 @@ final class DataGridCellFactory {
            let textField = reused.textField {
             cellView = reused
             cell = textField
+            cell.font = DataGridFontCache.rowNumber
         } else {
             cellView = NSTableCellView()
             cellView.identifier = cellViewId
 
             cell = NSTextField(labelWithString: "")
             cell.alignment = .right
             cell.font = DataGridFontCache.rowNumber
+            cell.tag = DataGridFontVariant.rowNumber
             cell.textColor = .secondaryLabelColor
             cell.translatesAutoresizingMaskIntoConstraints = false
 
@@ -312,35 +314,28 @@ final class DataGridCellFactory {
 
         if value == nil {
             cell.stringValue = ""
+            cell.font = DataGridFontCache.italic
+            cell.tag = DataGridFontVariant.italic
             if !isLargeDataset {
                 cell.placeholderString = nullDisplayString
-                cell.textColor = .secondaryLabelColor
-                if cell.font !== DataGridFontCache.italic {
-                    cell.font = DataGridFontCache.italic
-                }
-            } else {
-                cell.textColor = .secondaryLabelColor
             }
+            cell.textColor = .secondaryLabelColor
         } else if value == "__DEFAULT__" {
             cell.stringValue = ""
+            cell.font = DataGridFontCache.medium
+            cell.tag = DataGridFontVariant.medium
             if !isLargeDataset {
                 cell.placeholderString = "DEFAULT"
-                cell.textColor = .systemBlue
-                cell.font = DataGridFontCache.medium
-            } else {
-                cell.textColor = .systemBlue
             }
+            cell.textColor = .systemBlue
         } else if value == "" {
             cell.stringValue = ""
+            cell.font = DataGridFontCache.italic
+            cell.tag = DataGridFontVariant.italic
             if !isLargeDataset {
                 cell.placeholderString = "Empty"
-                cell.textColor = .secondaryLabelColor
-                if cell.font !== DataGridFontCache.italic {
-                    cell.font = DataGridFontCache.italic
-                }
-            } else {
-                cell.textColor = .secondaryLabelColor
             }
+            cell.textColor = .secondaryLabelColor
         } else {
             var displayValue = value ?? ""
 
@@ -360,9 +355,8 @@ final class DataGridCellFactory {
             cell.stringValue = displayValue
             (cell as? CellTextField)?.originalValue = value
             cell.textColor = .labelColor
-            if cell.font !== DataGridFontCache.regular {
-                cell.font = DataGridFontCache.regular
-            }
+            cell.font = DataGridFontCache.regular
+            cell.tag = DataGridFontVariant.regular
         }
     }
 

TablePro/Views/Results/DataGridView.swift

@@ -667,7 +667,7 @@ final class TableViewCoordinator: NSObject, NSTableViewDelegate, NSTableViewData
     // Settings observer for real-time updates
     fileprivate var settingsObserver: NSObjectProtocol?
     /// Snapshot of last-seen data grid settings for change detection
-    private var lastDataGridSettings = AppSettingsManager.shared.dataGrid
+    private var lastDataGridSettings: DataGridSettings
 
     @Binding var selectedRowIndices: Set<Int>
 
@@ -718,6 +718,7 @@ final class TableViewCoordinator: NSObject, NSTableViewDelegate, NSTableViewData
         self.onPasteRows = onPasteRows
         self.onUndo = onUndo
         self.onRedo = onRedo
+        self.lastDataGridSettings = AppSettingsManager.shared.dataGrid
         super.init()
         updateCache()
 
@@ -780,7 +781,8 @@ final class TableViewCoordinator: NSObject, NSTableViewDelegate, NSTableViewData
     // MARK: - Font Updates
 
     /// Update fonts on existing visible cell views in-place.
-    /// Avoids reloadData which recycles cells through the reuse pool.
+    /// Uses `DataGridFontVariant` tags set during cell configuration
+    /// to apply the correct font variant without inspecting cell content.
     @MainActor
     static func updateVisibleCellFonts(tableView: NSTableView) {
         let visibleRect = tableView.visibleRect
@@ -793,14 +795,14 @@ final class TableViewCoordinator: NSObject, NSTableViewDelegate, NSTableViewData
                 guard let cellView = tableView.view(atColumn: col, row: row, makeIfNecessary: false) as? NSTableCellView,
                       let textField = cellView.textField else { continue }
 
-                let columnId = tableView.tableColumns[col].identifier.rawValue
-                if columnId == "__rowNumber__" {
+                switch textField.tag {
+                case DataGridFontVariant.rowNumber:
                     textField.font = DataGridFontCache.rowNumber
-                } else if textField.stringValue.isEmpty && textField.placeholderString == "DEFAULT" {
-                    textField.font = DataGridFontCache.medium
-                } else if textField.stringValue.isEmpty && textField.placeholderString != nil {
+                case DataGridFontVariant.italic:
                     textField.font = DataGridFontCache.italic
-                } else {
+                case DataGridFontVariant.medium:
+                    textField.font = DataGridFontCache.medium
+                default:
                     textField.font = DataGridFontCache.regular
                 }
             }

TablePro/Views/Settings/DataGridSettingsView.swift

@@ -27,7 +27,7 @@ struct DataGridSettingsView: View {
 
                 GroupBox("Preview") {
                     Text("1  John Doe  john@example.com  NULL")
-                        .font(.custom(settings.fontFamily.displayName, size: CGFloat(settings.clampedFontSize)))
+                        .font(Font(settings.fontFamily.font(size: CGFloat(settings.clampedFontSize))))
                         .frame(maxWidth: .infinity, alignment: .leading)
                         .padding(8)
                 }