@nl-rvo/css-page-number-navigation 1.3.1 → 1.5.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # `@nl-rvo/css-pagination`
 
+## 1.5.0
+
+### Minor Changes
+
+- fa36e07: Project structure updates
+
+  - Moved all Storybook stories to the /stories directory.
+  - Moved all documentation files to the /docs directory.
+  - Removed React components from library-component-react and moved them into this package.
+  - Update all .stories imports to the right react package "component-library-react"
+  - Fix all Redundant / PascalCase lint warnings for .stories files.
+
+## 1.4.0
+
+### Minor Changes
+
+- 8b8710c: Update page number navigation: always show 5 items from page 1 and 5 items before the last page (with ellipses between ranges when needed).
+
 ## 1.3.1
 
 ### Patch Changes

package/README.md

@@ -21,58 +21,59 @@
 
 ## Voor ontwikkelaars
 
-De functie voor deze logica kan als volgt worden geschreven:
+De logica voor het genereren van paginanummers met ellipsen kan als volgt worden geïmplementeerd.
 
 ```js
-const generatePageNumberMarkup = () => "";
-const generateEllipsisMarkup = () => "";
+const generatePageNumberMarkup = (page, activePage) => {
+  return page === activePage ? `[${page}]` : `${page}`;
+};
+
+const generateEllipsisMarkup = () => "…";
 
 const generatePageNumbers = (totalPages, activePage) => {
   const pages = [];
-
-  // Always add the first page
-  pages.push(generatePageNumberMarkup(1, activePage));
-
-  // Add ellipses if the active page is more than 4
-  if (activePage > 4) {
-    pages.push(generateEllipsisMarkup());
-  }
-  if (activePage === 4) {
-    pages.push(generatePageNumberMarkup(2, activePage));
-  }
-
-  // Add the page before the active page if it's more than 2
-  if (activePage > 2) {
-    pages.push(generatePageNumberMarkup(activePage - 1, activePage));
+  const windowSize = 5;
+
+  const addRange = (from, to) => {
+    for (let i = from; i <= to; i++) {
+      pages.push(generatePageNumberMarkup(i, activePage));
+    }
+  };
+
+  // Toon alle pagina's als het totaal klein is
+  if (totalPages <= windowSize) {
+    addRange(1, totalPages);
+    return pages;
   }
 
-  // Add the active page if it's not the first or last page
-  if (activePage > 1 && activePage < totalPages) {
-    pages.push(generatePageNumberMarkup(activePage, activePage));
-  }
-
-  // Add the page after the active page if it's less than total pages minus 1 and not the last page
-  if (activePage < totalPages - 1 && activePage !== totalPages - 2) {
-    pages.push(generatePageNumberMarkup(activePage + 1, activePage));
-  }
-
-  // Add ellipses if the active page is less than the total pages minus 3
-  if (activePage < totalPages - 3) {
+  // Begin van de paginering
+  // Voorbeeld: [1] 2 3 4 5 … 100
+  if (activePage <= 4) {
+    addRange(1, 5);
     pages.push(generateEllipsisMarkup());
+    pages.push(generatePageNumberMarkup(totalPages, activePage));
+    return pages;
   }
 
-  // Add the second last page if the active page is less than the total pages minus 1 and greater than or equal to total pages minus 3
-  if (activePage < totalPages - 1 && activePage >= totalPages - 3) {
-    pages.push(generatePageNumberMarkup(totalPages - 1, activePage));
+  // Einde van de paginering
+  // Voorbeeld: 1 … 96 97 98 [99] 100
+  if (activePage >= totalPages - 3) {
+    pages.push(generatePageNumberMarkup(1, activePage));
+    pages.push(generateEllipsisMarkup());
+    addRange(totalPages - 4, totalPages);
+    return pages;
   }
 
-  // Always add the last page
-  if (totalPages !== 1) {
-    pages.push(generatePageNumberMarkup(totalPages, activePage));
-  }
+  // Midden van de paginering
+  // Voorbeeld: 1 … 4 [5] 6 … 100
+  pages.push(generatePageNumberMarkup(1, activePage));
+  pages.push(generateEllipsisMarkup());
+  addRange(activePage - 1, activePage + 1);
+  pages.push(generateEllipsisMarkup());
+  pages.push(generatePageNumberMarkup(totalPages, activePage));
 
   return pages;
 };
 
-generatePageNumbers(5, 30);
+generatePageNumbers(100, 1);
 ```

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.1",
+  "version": "1.5.0",
   "author": "Community for NL Design System",
   "license": "CC0-1.0",
   "name": "@nl-rvo/css-page-number-navigation",