refactor(datagrid): merge the row count into the page-size control and regroup the bottom bar

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- The data view bottom bar groups the row count with the pagination controls, and the rows-per-page menu shows plain numbers instead of locale-grouped values like "1.000". Click the row range to change rows per page.
 - Selecting a Redis namespace in the sidebar key tree now filters the open database view to that prefix, with paging, instead of opening a separate tab limited to one batch of keys. (#1701)
 
 ### Fixed

TablePro/Models/Query/PaginationState+Display.swift

@@ -0,0 +1,25 @@
+//
+//  PaginationState+Display.swift
+//  TablePro
+//
+
+import Foundation
+
+extension PaginationState {
+    func rangeText(loadedRowCount: Int) -> String? {
+        if let total = totalRowCount, total > 0 {
+            let formattedTotal = total.formatted(.number.grouping(.automatic))
+            let prefix = isApproximateRowCount ? "~" : ""
+            return String(format: String(localized: "%d-%d of %@%@ rows"), rangeStart, rangeEnd, prefix, formattedTotal)
+        }
+        if currentPage > 1 || loadedRowCount >= pageSize {
+            let end = currentOffset + loadedRowCount
+            return String(format: String(localized: "%d-%d of ? rows"), rangeStart, end)
+        }
+        return nil
+    }
+
+    static func pageSizeLabel(_ size: Int) -> String {
+        size.formatted(.number.grouping(.never))
+    }
+}

TablePro/Views/Components/PaginationControlsView.swift

@@ -27,18 +27,20 @@ struct PaginationControlsView: View {
 
     var body: some View {
         HStack(spacing: 8) {
-            pageSizeMenu
+            rangeMenu
             navigationCluster
+                .fixedSize()
+                .layoutPriority(1)
         }
     }
 
-    // MARK: - Page Size Menu
+    // MARK: - Range / Page Size Menu
 
-    private var pageSizeMenu: some View {
+    private var rangeMenu: some View {
         Menu {
             Picker(String(localized: "Rows per page"), selection: pageSizeBinding) {
                 ForEach(Self.pageSizePresets, id: \.self) { size in
-                    Text(size.formatted()).tag(size)
+                    Text(PaginationState.pageSizeLabel(size)).tag(size)
                 }
             }
             .pickerStyle(.inline)
@@ -52,13 +54,16 @@ struct PaginationControlsView: View {
                 showCustomPopover = true
             }
         } label: {
-            Text(pageSizeLabel)
+            Text(rangeLabel)
+                .lineLimit(1)
+                .truncationMode(.middle)
+                .frame(minWidth: 60, alignment: .leading)
         }
         .menuStyle(.borderlessButton)
-        .fixedSize()
         .controlSize(.small)
         .help(String(localized: "Rows per page"))
-        .accessibilityLabel(String(localized: "Rows per page"))
+        .accessibilityLabel(rangeLabel)
+        .accessibilityHint(String(localized: "Rows per page"))
         .overlay(alignment: .bottom) {
             Color.clear
                 .frame(width: 0, height: 0)
@@ -72,8 +77,8 @@ struct PaginationControlsView: View {
         Binding(get: { pagination.pageSize }, set: { onPageSizeChange($0) })
     }
 
-    private var pageSizeLabel: String {
-        pagination.pageSize.formatted()
+    private var rangeLabel: String {
+        pagination.rangeText(loadedRowCount: loadedRowCount) ?? PaginationState.pageSizeLabel(pagination.pageSize)
     }
 
     // MARK: - Navigation