react-router-pagination 3.3.5 → 3.3.7

package/README.md

@@ -2,7 +2,7 @@
 
 ## React Router Pagination
 
-A *React Router 6* pagination component.
+A *React Router 7* pagination component.
 
 - You have lots of data?
 - You want users to page through that data?

package/eslint.config.mjs

@@ -54,7 +54,7 @@ const reactSettings = {
 export default [
   {
     ignores: [
-      '.coverage'
+      'coverage'
     ]
   },
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router-pagination",
-  "version": "3.3.5",
+  "version": "3.3.7",
   "description": "A React Router Pagination component",
   "main": "./src/index.mjs",
   "type": "module",
@@ -51,6 +51,7 @@
     "@storybook/theming": "^8.6.7",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.2.0",
+    "@types/babel__register": "^7.17.3",
     "@types/debug": "^4.1.12",
     "@types/jest": "^29.5.14",
     "@types/prop-types": "^15.7.14",
@@ -106,6 +107,10 @@
     "#pagination/super/pagination/component": {
       "require": "./src/super/pagination/component.cjs",
       "import": "./src/super/pagination/component.mjs"
+    },
+    "#pagination/super/pagination/common": {
+      "require": "./src/super/pagination/common/index.cjs",
+      "import": "./src/super/pagination/common/index.mjs"
     }
   },
   "exports": {

package/src/pagination/common/index.mts

@@ -1,18 +1,5 @@
-export function toInteger (v: number | string): number {
-  const n = Number(v)
-  return isNaN(n) ? 0 : Math.round(n)
-}
-
-export function calculateTotalPages (totalItemsInCollection: number | string, itemsPerPage: number | string): number {
-  const e = toInteger(totalItemsInCollection)
-  const p = toInteger(itemsPerPage)
-  const r = Boolean(e % p) // !!(e % p)
-  const l = Math.floor(e / p)
-  return r ? l + 1 : l
-}
-
-export function calculatePageNumber (pageNumber: number | string, totalPages: number | string): number {
-  const p = toInteger(pageNumber)
-  const t = toInteger(totalPages)
-  return Math.max(1, Math.min(p, t))
-}
+export {
+  toInteger,
+  calculateTotalPages,
+  calculatePageNumber
+} from '#pagination/super/pagination/common'

package/src/super/pagination/common/index.cjs

@@ -0,0 +1,20 @@
+require('@babel/register')({
+  ignore: [
+    /node_modules\/(?!react-router-pagination)/
+  ],
+  extensions: [
+    '.mts',
+    '.cts',
+    '.tsx'
+  ]
+})
+
+const {
+  toInteger,
+  calculateTotalPages,
+  calculatePageNumber
+} = require('./index.mts')
+
+module.exports.toInteger = toInteger
+module.exports.calculateTotalPages = calculateTotalPages
+module.exports.calculatePageNumber = calculatePageNumber

package/src/super/pagination/common/index.mjs

@@ -0,0 +1,5 @@
+export {
+  toInteger,
+  calculateTotalPages,
+  calculatePageNumber
+} from './index.cjs'

package/src/super/pagination/common/index.mts

@@ -0,0 +1,18 @@
+export function toInteger (v: number | string): number {
+  const n = Number(v)
+  return isNaN(n) ? 0 : Math.round(n)
+}
+
+export function calculateTotalPages (totalItemsInCollection: number | string, itemsPerPage: number | string): number {
+  const e = toInteger(totalItemsInCollection)
+  const p = toInteger(itemsPerPage)
+  const r = Boolean(e % p) // !!(e % p)
+  const l = Math.floor(e / p)
+  return r ? l + 1 : l
+}
+
+export function calculatePageNumber (pageNumber: number | string, totalPages: number | string): number {
+  const p = toInteger(pageNumber)
+  const t = toInteger(totalPages)
+  return Math.max(1, Math.min(p, t))
+}

package/src/super/pagination/component.tsx

@@ -13,7 +13,7 @@ import {
   toInteger,
   calculateTotalPages,
   calculatePageNumber
-} from '#pagination/pagination/common'
+} from '#pagination/super/pagination/common'
 
 const getListItemClassName = (currentPageNumber: string | number, pageNumber: string | number): string => (
   toInteger(currentPageNumber) === toInteger(pageNumber)
@@ -122,7 +122,7 @@ export abstract class AbstractPagination<P, S> extends Component<P & AbstractPag
         <li key={getListItemKey(n)} className='zero-page'>
           <Link to={getLinkTo(match, n)} onClick={() => { this.handlePageNumberSelect(n) }}>
             <span className='page-number'>
-              {n}
+              1
             </span>
           </Link>
         </li>
@@ -138,7 +138,7 @@ export abstract class AbstractPagination<P, S> extends Component<P & AbstractPag
         <li key={getListItemKey(n)} className='last-page'>
           <Link to={getLinkTo(match, n)} onClick={() => { this.handlePageNumberSelect(n) }}>
             <span className='page-number'>
-              {n}
+              {String(n)}
             </span>
           </Link>
         </li>
@@ -153,15 +153,15 @@ export abstract class AbstractPagination<P, S> extends Component<P & AbstractPag
     const a = []
     for (j; i < j; i = i + 1) {
       const n = (i + 1)
-      a.push((
+      a.push(
         <li key={getListItemKey(n)} className={getListItemClassName(pageNumber, n)}>
           <Link to={getLinkTo(match, n)} onClick={() => { this.handlePageNumberSelect(n) }}>
             <span className='page-number'>
-              {n}
+              {String(n)}
             </span>
           </Link>
         </li>
-      ))
+      )
     }
     return a
   }
@@ -201,13 +201,13 @@ export abstract class AbstractPagination<P, S> extends Component<P & AbstractPag
             {this.lastPageLinkItem(match, page, totalPages)}
           </ul>
         )
-      } else {
-        return (
-          <ul className='pagination'>
-            {this.pageLinkItems(match, page, totalPages)}
-          </ul>
-        )
       }
+
+      return (
+        <ul className='pagination'>
+          {this.pageLinkItems(match, page, totalPages)}
+        </ul>
+      )
     }
     return null
   }