Update data table pagination pageEnd to handle zero based index (#5913)

Co-authored-by: Marie Lucca <[email protected]>

Author: 2 people

.changeset/weak-spiders-love.md

@@ -0,0 +1,5 @@
+---
+"@primer/react": patch
+---
+
+Update data table pagination pageEnd to handle zero based index

packages/react/src/DataTable/Pagination.tsx

@@ -367,7 +367,7 @@ type RangeProps = {
 
 function Range({pageStart, pageEnd, totalCount}: RangeProps) {
   const start = pageStart + 1
-  const end = pageEnd === totalCount - 1 ? totalCount : pageEnd
+  const end = pageEnd
   return (
     <>
       <Message value={`Showing ${start} through ${end} of ${totalCount}`} />
@@ -524,7 +524,7 @@ function usePagination(config: PaginationConfig): PaginationResult {
     onChange?.({pageIndex: defaultPageIndex})
   }
   const pageStart = pageIndex * pageSize
-  const pageEnd = Math.min(pageIndex * pageSize + pageSize, totalCount - 1)
+  const pageEnd = Math.min((pageIndex + 1) * pageSize, totalCount)
   const hasNextPage = pageIndex + 1 < pageCount
   const hasPreviousPage = pageIndex > 0
 

packages/react/src/DataTable/__tests__/Pagination.test.tsx

@@ -116,6 +116,14 @@ describe('Table.Pagination', () => {
       expect(getPageRange()).toEqual('1 through 25 of 50')
     })
 
+    it('should display two pages with correct range when totalCount is one plus pageSize', () => {
+      render(<Pagination aria-label="Test label" pageSize={25} totalCount={26} />)
+
+      expect(getPages()).toHaveLength(2)
+      expect(getCurrentPage()).toEqual(getPage(0))
+      expect(getPageRange()).toEqual('1 through 25 of 26')
+    })
+
     it('should call `onChange` when clicking on pages', async () => {
       const user = userEvent.setup()
       const onChange = jest.fn()