fix(datagrid): continue row numbers across pages instead of resetting per page (#1236)

* fix(datagrid): continue row numbers across pages instead of resetting per page

* fix(datagrid): size # column to fit the widest row number on the current page

* test(datagrid): cover row number column sizing and extract padding constants

Author: datlechin

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Row numbers in the data grid now continue across pages instead of resetting to 1, matching the pagination footer (page 2 with a page size of 1000 shows 1001-2000). The `#` column auto-sizes to fit the widest row number expected on the current page so values like `14001` no longer clip.
 - The connection window shows the connecting state inline with a Cancel button instead of an empty sidebar.
 - Date, datetime, and timestamp cells use the same inline text editor as other columns; the popover date picker is removed.
 - The foreign key preview popover now follows the selected row when you arrow up or down, refreshing both the anchor and the displayed reference row. Arrow left or right (column change) and row mutations dismiss the popover.

TablePro/Views/Main/Child/MainEditorContentView.swift

@@ -561,6 +561,9 @@ struct MainEditorContentView: View {
                     return .none
                 }
             },
+            paginationOffsetProvider: { [coordinator] in
+                coordinator.tabManager.tabs.first(where: { $0.id == tabId })?.pagination.currentOffset ?? 0
+            },
             changeManager: currentChangeManager,
             isEditable: isEditable,
             configuration: DataGridConfiguration(

TablePro/Views/Results/Cells/DataGridCellRegistry.swift

@@ -68,6 +68,7 @@ final class DataGridCellRegistry {
     func makeRowNumberCell(
         in tableView: NSTableView,
         row: Int,
+        pageOffset: Int,
         cachedRowCount: Int,
         visualState: RowVisualState
     ) -> NSView {
@@ -111,9 +112,10 @@ final class DataGridCellRegistry {
             return cellView
         }
 
-        cell.stringValue = "\(row + 1)"
+        let displayNumber = row + pageOffset + 1
+        cell.stringValue = "\(displayNumber)"
         cell.textColor = visualState.isDeleted ? ThemeEngine.shared.colors.dataGrid.deletedText : .secondaryLabelColor
-        cellView.setAccessibilityLabel(String(format: String(localized: "Row %d"), row + 1))
+        cellView.setAccessibilityLabel(String(format: String(localized: "Row %d"), displayNumber))
         cellView.setAccessibilityRowIndexRange(NSRange(location: row, length: 1))
 
         return cellView

TablePro/Views/Results/Cells/DataGridMetrics.swift

@@ -7,4 +7,6 @@ import CoreGraphics
 
 enum DataGridMetrics {
     static let cellHorizontalInset: CGFloat = 4
+    static let rowNumberHeaderPadding: CGFloat = 8
+    static let rowNumberColumnMinWidth: CGFloat = 40
 }

TablePro/Views/Results/DataGridCoordinator.swift

@@ -11,6 +11,7 @@ final class TableViewCoordinator: NSObject, NSTableViewDelegate, NSTableViewData
 {
     var tableRowsProvider: @MainActor () -> TableRows = { TableRows() }
     var tableRowsMutator: @MainActor (@MainActor (inout TableRows) -> Void) -> Void = { _ in }
+    var paginationOffsetProvider: @MainActor () -> Int = { 0 }
     var changeManager: AnyChangeManager
     var isEditable: Bool
     var sortedIDs: [RowID]?
@@ -223,6 +224,17 @@ final class TableViewCoordinator: NSObject, NSTableViewDelegate, NSTableViewData
         let tableRows = tableRowsProvider()
         cachedRowCount = sortedIDs?.count ?? tableRows.count
         cachedColumnCount = tableRows.columns.count
+        resizeRowNumberColumnForCurrentRange()
+    }
+
+    func resizeRowNumberColumnForCurrentRange() {
+        guard let tableView,
+              let column = tableView.tableColumns.first(where: {
+                  $0.identifier == ColumnIdentitySchema.rowNumberIdentifier
+              }),
+              !column.isHidden else { return }
+        let maxRowNumber = paginationOffsetProvider() + cachedRowCount
+        DataGridView.sizeRowNumberColumn(column, forMaxRowNumber: maxRowNumber)
     }
 
     func applyInsertedRows(_ indices: IndexSet) {

TablePro/Views/Results/DataGridView.swift

@@ -30,6 +30,7 @@ struct RowVisualState: Equatable {
 struct DataGridView: NSViewRepresentable {
     var tableRowsProvider: @MainActor () -> TableRows = { TableRows() }
     var tableRowsMutator: @MainActor (@MainActor (inout TableRows) -> Void) -> Void = { _ in }
+    var paginationOffsetProvider: @MainActor () -> Int = { 0 }
     var changeManager: AnyChangeManager
     let isEditable: Bool
     var configuration: DataGridConfiguration = .init()
@@ -112,6 +113,7 @@ struct DataGridView: NSViewRepresentable {
         context.coordinator.tableRowsController.attach(tableView)
         context.coordinator.tableRowsProvider = tableRowsProvider
         context.coordinator.tableRowsMutator = tableRowsMutator
+        context.coordinator.paginationOffsetProvider = paginationOffsetProvider
         context.coordinator.sortedIDs = sortedIDs
         // Intentionally do not prime cachedRowCount/cachedColumnCount here.
         // They represent what NSTableView has actually rendered. Leaving them
@@ -143,6 +145,7 @@ struct DataGridView: NSViewRepresentable {
 
         coordinator.tableRowsProvider = tableRowsProvider
         coordinator.tableRowsMutator = tableRowsMutator
+        coordinator.paginationOffsetProvider = paginationOffsetProvider
         coordinator.changeManager = changeManager
 
         let latestRows = tableRowsProvider()
@@ -197,6 +200,9 @@ struct DataGridView: NSViewRepresentable {
             let shouldHide = !configuration.showRowNumbers
             if rowNumCol.isHidden != shouldHide {
                 rowNumCol.isHidden = shouldHide
+                if !shouldHide {
+                    coordinator.resizeRowNumberColumnForCurrentRange()
+                }
             }
         }
 
@@ -344,11 +350,9 @@ struct DataGridView: NSViewRepresentable {
     static func makeRowNumberColumn() -> NSTableColumn {
         let column = NSTableColumn(identifier: ColumnIdentitySchema.rowNumberIdentifier)
         column.title = "#"
-        column.width = 40
-        column.minWidth = 40
-        column.maxWidth = 60
         column.isEditable = false
         column.resizingMask = []
+        sizeRowNumberColumn(column, forMaxRowNumber: 1)
         let defaultHeaderFont = column.headerCell.font
         let headerCell = SortableHeaderCell(textCell: "#")
         headerCell.font = defaultHeaderFont
@@ -358,6 +362,20 @@ struct DataGridView: NSViewRepresentable {
         return column
     }
 
+    @MainActor
+    static func sizeRowNumberColumn(_ column: NSTableColumn, forMaxRowNumber maxNumber: Int) {
+        let display = "\(max(maxNumber, 1))"
+        let font = ThemeEngine.shared.dataGridFonts.rowNumber
+        let textWidth = (display as NSString).size(withAttributes: [.font: font]).width
+        let measured = ceil(textWidth)
+            + 2 * DataGridMetrics.cellHorizontalInset
+            + DataGridMetrics.rowNumberHeaderPadding
+        let columnWidth = max(DataGridMetrics.rowNumberColumnMinWidth, measured)
+        column.minWidth = columnWidth
+        column.maxWidth = columnWidth
+        column.width = columnWidth
+    }
+
     static let firstDataTableColumnIndex: Int = 1
 
     static func isDataTableColumn(_ tableColumnIndex: Int) -> Bool {

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

@@ -22,6 +22,7 @@ extension TableViewCoordinator {
             return cellRegistry.makeRowNumberCell(
                 in: tableView,
                 row: row,
+                pageOffset: paginationOffsetProvider(),
                 cachedRowCount: displayCount,
                 visualState: visualState(for: row)
             )

TableProTests/Views/Results/RowNumberColumnSizingTests.swift

@@ -0,0 +1,60 @@
+//
+//  RowNumberColumnSizingTests.swift
+//  TableProTests
+//
+
+import AppKit
+import Foundation
+@testable import TablePro
+import TableProPluginKit
+import Testing
+
+@Suite("Row Number Column Sizing")
+@MainActor
+struct RowNumberColumnSizingTests {
+    @Test("Single-digit max number sizes to the configured floor")
+    func singleDigitHonoursFloor() {
+        let column = NSTableColumn(identifier: ColumnIdentitySchema.rowNumberIdentifier)
+        DataGridView.sizeRowNumberColumn(column, forMaxRowNumber: 1)
+        #expect(column.width == DataGridMetrics.rowNumberColumnMinWidth)
+        #expect(column.minWidth == column.width)
+        #expect(column.maxWidth == column.width)
+    }
+
+    @Test("Zero and negative inputs are clamped to the floor")
+    func zeroAndNegativeClampToFloor() {
+        let zero = NSTableColumn(identifier: ColumnIdentitySchema.rowNumberIdentifier)
+        let negative = NSTableColumn(identifier: ColumnIdentitySchema.rowNumberIdentifier)
+        DataGridView.sizeRowNumberColumn(zero, forMaxRowNumber: 0)
+        DataGridView.sizeRowNumberColumn(negative, forMaxRowNumber: -42)
+        #expect(zero.width == DataGridMetrics.rowNumberColumnMinWidth)
+        #expect(negative.width == DataGridMetrics.rowNumberColumnMinWidth)
+    }
+
+    @Test("Five-digit numbers grow past the floor")
+    func fiveDigitGrowsPastFloor() {
+        let column = NSTableColumn(identifier: ColumnIdentitySchema.rowNumberIdentifier)
+        DataGridView.sizeRowNumberColumn(column, forMaxRowNumber: 14_001)
+        #expect(column.width > DataGridMetrics.rowNumberColumnMinWidth)
+    }
+
+    @Test("Width grows monotonically with digit count")
+    func widthGrowsWithDigits() {
+        let twoDigit = NSTableColumn(identifier: ColumnIdentitySchema.rowNumberIdentifier)
+        let fourDigit = NSTableColumn(identifier: ColumnIdentitySchema.rowNumberIdentifier)
+        let sixDigit = NSTableColumn(identifier: ColumnIdentitySchema.rowNumberIdentifier)
+        DataGridView.sizeRowNumberColumn(twoDigit, forMaxRowNumber: 99)
+        DataGridView.sizeRowNumberColumn(fourDigit, forMaxRowNumber: 9_999)
+        DataGridView.sizeRowNumberColumn(sixDigit, forMaxRowNumber: 999_999)
+        #expect(fourDigit.width >= twoDigit.width)
+        #expect(sixDigit.width >= fourDigit.width)
+    }
+
+    @Test("Min, max and width stay equal so the column is pinned")
+    func widthIsPinned() {
+        let column = NSTableColumn(identifier: ColumnIdentitySchema.rowNumberIdentifier)
+        DataGridView.sizeRowNumberColumn(column, forMaxRowNumber: 1_234_567)
+        #expect(column.minWidth == column.width)
+        #expect(column.maxWidth == column.width)
+    }
+}