Merge pull request #1028 from cagov/jbum-pagination-patch

Pagination display fix. @cagov/ds-pagination version 2.0.4
cagov · Aug 21, 2024 · 703b288 · 703b288
2 parents 3ea1a7a + 074bd78
commit 703b288
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/components/pagination/CHANGELOG.md b/components/pagination/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Pagination changelog
 
+## 2.0.4
+- Fixes an issue with small page counts (4,5,6,7) in which on some page numbers
+an ellipsis is displayed where a single-page is missing, or both the ellipsis and
+a single page are skipped leaving a gap in the sequence. New system uses ellipsis for
+2 or more pages only, and displays single pages in its place, when appropriate.
+
 ## 2.0.3
 
 - Removed redundant package-lock.json (due to workspaces config in monorepo). This fixes vulnerability in the npm `ip` package.

diff --git a/components/pagination/dist/index.js b/components/pagination/dist/index.js
@@ -35,7 +35,8 @@ function templateHTML(next, previous, page, currentPage, totalPages) {
       </li>
       ${currentPage > 2 ? pageListItem(page, 1) : ''}
 
-      ${currentPage > 3 ? pageOverflow() : ''}
+      ${currentPage > 4 ? pageOverflow() : ''}
+      ${currentPage === 4 ? pageListItem(page, 2) : ''}
 
       ${currentPage > 1 ? pageListItem(page, currentPage - 1) : ''}
 
@@ -54,6 +55,9 @@ function templateHTML(next, previous, page, currentPage, totalPages) {
       ${currentPage < totalPages ? pageListItem(page, currentPage + 1) : ''}
 
       ${currentPage < totalPages - 3 ? pageOverflow() : ''}
+      ${
+        currentPage === totalPages - 3 ? pageListItem(page, totalPages - 1) : ''
+      }
 
       ${currentPage < totalPages - 1 ? pageListItem(page, totalPages) : ''}
 

diff --git a/components/pagination/package.json b/components/pagination/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cagov/ds-pagination",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "",
   "main": "dist/index.js",
   "customElements": "custom-elements.json",

diff --git a/components/pagination/src/template.js b/components/pagination/src/template.js
@@ -35,7 +35,8 @@ function templateHTML(next, previous, page, currentPage, totalPages) {
       </li>
       ${currentPage > 2 ? pageListItem(page, 1) : ''}
 
-      ${currentPage > 3 ? pageOverflow() : ''}
+      ${currentPage > 4 ? pageOverflow() : ''}
+      ${currentPage === 4 ? pageListItem(page, 2) : ''}
 
       ${currentPage > 1 ? pageListItem(page, currentPage - 1) : ''}
 
@@ -54,6 +55,9 @@ function templateHTML(next, previous, page, currentPage, totalPages) {
       ${currentPage < totalPages ? pageListItem(page, currentPage + 1) : ''}
 
       ${currentPage < totalPages - 3 ? pageOverflow() : ''}
+      ${
+        currentPage === totalPages - 3 ? pageListItem(page, totalPages - 1) : ''
+      }
 
       ${currentPage < totalPages - 1 ? pageListItem(page, totalPages) : ''}