@@ -62,16 +62,15 @@ export const Pagination = ({
6262
6363 const renderPages = ( ) => {
6464 // Set the ranges to be shown in the pagination
65- const displayMinimumPages = 2 ;
6665 const lowerRangeLimit = iff (
6766 selectedPage === totalPages - 1 ,
68- 1 ,
69- selectedPage === totalPages ? 2 : 1
67+ 2 ,
68+ selectedPage === totalPages ? 3 : 1
7069 ) ;
7170 const upperRangeLimit = iff (
7271 selectedPage === 1 ,
73- 2 ,
74- selectedPage === 2 ? 1 : 1
72+ 3 ,
73+ selectedPage === 2 ? 2 : 1
7574 ) ;
7675 const lowerRange = createRange (
7776 selectedPage - lowerRangeLimit ,
@@ -97,16 +96,6 @@ export const Pagination = ({
9796 1
9897 </ PageItem >
9998 ) }
100- { selectedPage > ( totalPages - displayMinimumPages ) && (
101- < PageItem
102- isClickeable
103- ariaLabel = { `Page 2 of ${ totalPages } ` }
104- selectedPage = { selectedPage === 2 }
105- onClick = { e => handleChangePage ( e , 2 ) }
106- >
107- 2
108- </ PageItem >
109- ) }
11099 { renderedPages [ 0 ] > 2 && < PageItem ellipses > ...</ PageItem > }
111100 { renderedPages . map ( page => (
112101 < PageItem
@@ -122,16 +111,6 @@ export const Pagination = ({
122111 { renderedPages [ renderedPages . length - 1 ] < totalPages - 1 && (
123112 < PageItem ellipses > ...</ PageItem >
124113 ) }
125- { selectedPage < displayMinimumPages + 1 && (
126- < PageItem
127- isClickeable
128- ariaLabel = { `Page ${ totalPages - 1 } of ${ totalPages } ` }
129- selectedPage = { selectedPage === totalPages - 1 }
130- onClick = { e => handleChangePage ( e , totalPages - 1 ) }
131- >
132- { totalPages - 1 }
133- </ PageItem >
134- ) }
135114 { renderedPages [ renderedPages . length - 1 ] !== totalPages && (
136115 < PageItem
137116 isClickeable
0 commit comments