[patch][16.21.9] Toniq Pagination Always Include First Page (#140)

Toniq-Labs · Oct 17, 2024 · 53ee4dc · 53ee4dc
1 parent 61cb074
commit 53ee4dc
Show file tree

Hide file tree

Showing 8 changed files with 662 additions and 462 deletions.
diff --git a/.github/workflows/tagged-release.yml b/.github/workflows/tagged-release.yml
@@ -16,11 +16,14 @@ jobs:
               uses: actions/setup-node@v3
               with:
                   node-version-file: '.nvmrc'
+            - name: Install npm@latest
+              run: npm install --global npm@latest
+            - name: Install dependencies
+              run: npm ci
+            - name: Install Playwright
+              run: npx playwright install --with-deps
             - name: run test
-              run: |
-                  npm ci
-                  npx playwright install --with-deps
-                  npm run test:all
+              run: npm run test:all
             - name: pack and set vars
               id: vars
               run: |

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -18,8 +18,11 @@ jobs:
               uses: actions/setup-node@v3
               with:
                   node-version-file: '.nvmrc'
+            - name: Install npm@latest
+              run: npm install --global npm@latest
+            - name: Install dependencies
+              run: npm ci
+            - name: Install Playwright
+              run: npx playwright install --with-deps
             - name: run test
-              run: |
-                  npm ci
-                  npx playwright install --with-deps
-                  npm run test:all
+              run: npm run test:all
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@toniq-labs/design-system-root",
-    "version": "16.21.8",
+    "version": "16.21.9",
     "private": true,
     "description": "Root design system mono-repo package.",
     "homepage": "https://github.com/Toniq-Labs/toniq-labs-design-system",

diff --git a/packages/design-system/package.json b/packages/design-system/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@toniq-labs/design-system",
-    "version": "16.21.8",
+    "version": "16.21.9",
     "private": false,
     "description": "Design system elements for Toniq Labs",
     "keywords": [
@@ -55,7 +55,7 @@
     "devDependencies": {
         "@augment-vir/browser": "^23.3.4",
         "@augment-vir/browser-testing": "^23.3.4",
-        "@augment-vir/node-js": "^26.4.0",
+        "@augment-vir/node-js": "^23.3.4",
         "@open-wc/testing": "^4.0.0",
         "@types/chai": "^4.3.11",
         "@types/mocha": "^10.0.6",
@@ -65,14 +65,14 @@
         "@web/test-runner-playwright": "^0.11.0",
         "@web/test-runner-visual-regression": "^0.9.0",
         "element-book": "^20.0.9",
-        "esbuild": "^0.20.2",
+        "esbuild": "^0.20.1",
         "istanbul-smart-text-reporter": "^1.1.4",
         "npm-check-updates": "~16.12.3",
         "ts-node": "^10.9.2",
         "type-fest": "^4.10.2",
         "typescript": "5.3.3",
         "vite": "^4.5.0",
-        "vite-tsconfig-paths": "^4.3.2"
+        "vite-tsconfig-paths": "^4.3.1"
     },
     "peerDependencies": {
         "element-vir": ">=17"

diff --git a/packages/design-system/src/augments/array.ts b/packages/design-system/src/augments/array.ts
@@ -39,7 +39,7 @@ export function pagination(
         range.start += 1;
         range.end += 1;
     }
-    const pages: number[] =
+    let pages: (string | number)[] =
         currentPage > pageCount - boundaryPagesShown && pageCount > pagesShown
             ? getRange(pageCount - delta, pageCount)
             : currentPage > delta
@@ -51,23 +51,23 @@ export function pagination(
     }
     const lastPage = pages[pages.length - 1];
 
-    if (lastPage && lastPage < pageCount) {
-        const dots = withDots(pageCount, [
-            threeDots,
-            pageCount,
-        ]);
-        return [
-            ...pages,
-            ...dots,
-        ];
-    } else if (pages[0] !== 1) {
-        return withDots(1, [
+    if (pages[0] !== 1) {
+        pages = withDots(1, [
             1,
             threeDots,
         ]).concat(pages);
-    } else {
-        return pages;
     }
+
+    if (typeof lastPage === 'number' && lastPage < pageCount) {
+        pages = pages.concat(
+            withDots(pageCount, [
+                threeDots,
+                pageCount,
+            ]),
+        );
+    }
+
+    return pages;
 }
 
 /** Creates an array of numbers progressing from start up to end. */

diff --git a/packages/native-elements-test/package.json b/packages/native-elements-test/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@toniq-labs/design-system-native-elements-test",
-    "version": "16.21.8",
+    "version": "16.21.9",
     "private": true,
     "scripts": {
         "compile": "virmator compile",

diff --git a/packages/scripts/package.json b/packages/scripts/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@toniq-labs/design-system-scripts",
-    "version": "16.21.8",
+    "version": "16.21.9",
     "private": true,
     "scripts": {
         "compile": "virmator compile",