@arkyn/components 1.3.148 → 1.3.150

package/dist/components/Pagination/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/Pagination/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAO/C,OAAO,cAAc,CAAC;AAEtB,iBAAS,UAAU,CAAC,KAAK,EAAE,eAAe,2CAsGzC;AAED,OAAO,EAAE,UAAU,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/Pagination/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAM/C,OAAO,cAAc,CAAC;AAUtB,iBAAS,UAAU,CAAC,KAAK,EAAE,eAAe,2CAoHzC;AAED,OAAO,EAAE,UAAU,EAAE,CAAC"}

package/dist/components/Pagination/index.js

@@ -2,20 +2,32 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import { useNavigate } from "@remix-run/react";
 import { ChevronLeft, ChevronRight, Ellipsis } from "lucide-react";
 import { useScopedParams } from "../../hooks/useScopedParams";
-import { getNextPages, getPreviousPages } from "../../services";
 import "./styles.css";
+function generatePagesArray(from, to) {
+    return [...new Array(to - from)]
+        .map((_, index) => {
+        return from + index + 1;
+    })
+        .filter((page) => page > 0);
+}
 function Pagination(props) {
-    const { scope, totalCountRegisters, perPageKey = "per_page", pageKey = "page", siblingsCount = 2, ...rest } = props;
+    const { scope, totalCountRegisters, perPageKey = "per_page", pageKey = "page", siblingsCount = 2, currentPage: baseCurrentPage = 1, registerPerPage: baseRegisterPerPage = 20, ...rest } = props;
     const navigate = useNavigate();
     const { getParam, getScopedSearch } = useScopedParams(scope);
-    const currentPage = Number(getParam(pageKey)) || 1;
-    const registerPerPage = Number(getParam(perPageKey)) || 20;
+    const currentPage = Number(getParam("page")) || baseCurrentPage;
+    const registerPerPage = Number(getParam("per_page")) || baseRegisterPerPage;
     const lastPage = Math.ceil(totalCountRegisters / registerPerPage);
-    const previosPages = getPreviousPages(currentPage, siblingsCount);
-    const nextPages = getNextPages(currentPage, siblingsCount, lastPage);
+    const previosPages = currentPage > 1
+        ? generatePagesArray(currentPage - 1 - siblingsCount, currentPage - 1)
+        : [];
+    const nextPages = currentPage < lastPage
+        ? generatePagesArray(currentPage, Math.min(currentPage + siblingsCount, lastPage))
+        : [];
     function handlePageChange(page) {
         navigate(getScopedSearch({ page }));
     }
-    return (_jsxs("div", { className: "arkynPagination", ...rest, children: [_jsx("button", { className: "arkynPaginationIconButton", disabled: currentPage <= 1, onClick: () => handlePageChange(currentPage - 1), children: _jsx(ChevronLeft, {}) }), currentPage > 1 + siblingsCount && (_jsxs(_Fragment, { children: [_jsx("button", { className: "arkynPaginationPageButton", onClick: () => handlePageChange(1), children: "1" }), currentPage > 2 + siblingsCount && (_jsx("button", { disabled: true, className: "arkynPaginationSpread", children: _jsx(Ellipsis, {}) }))] })), previosPages.map((page, index) => (_jsx("button", { onClick: () => handlePageChange(page), className: "arkynPaginationPageButton", children: page }, index))), _jsx("button", { className: "arkynPaginationCurrent", disabled: true, children: currentPage }), nextPages.map((page, index) => (_jsx("button", { onClick: () => handlePageChange(page), className: "arkynPaginationPageButton", children: page }, index))), currentPage + siblingsCount < lastPage && (_jsxs(_Fragment, { children: [currentPage + 1 + siblingsCount < lastPage && (_jsx("button", { disabled: true, className: "arkynPaginationSpread", children: _jsx(Ellipsis, {}) })), _jsx("button", { className: "arkynPaginationPageButton", onClick: () => handlePageChange(lastPage), children: lastPage })] })), _jsx("button", { className: "arkynPaginationIconButton", disabled: currentPage >= lastPage, onClick: () => handlePageChange(currentPage + 1), children: _jsx(ChevronRight, {}) })] }));
+    return (_jsxs("div", { className: "arkynPagination", ...rest, children: [_jsx("button", { className: "arkynPaginationIconButton", disabled: currentPage <= 1, onClick: () => handlePageChange(currentPage - 1), children: _jsx(ChevronLeft, {}) }), currentPage > 1 + siblingsCount && (_jsxs(_Fragment, { children: [_jsx("button", { className: "arkynPaginationPageButton", onClick: () => handlePageChange(1), children: "1" }), currentPage > 2 + siblingsCount && (_jsx("button", { disabled: true, className: "arkynPaginationSpread", children: _jsx(Ellipsis, {}) }))] })), previosPages.length > 0 &&
+                previosPages.map((page, index) => (_jsx("button", { onClick: () => handlePageChange(page), className: "arkynPaginationPageButton", children: page }, index))), _jsx("button", { className: "arkynPaginationCurrent", disabled: true, children: currentPage }), nextPages.length > 0 &&
+                nextPages.map((page, index) => (_jsx("button", { onClick: () => handlePageChange(page), className: "arkynPaginationPageButton", children: page }, index))), currentPage + siblingsCount < lastPage && (_jsxs(_Fragment, { children: [currentPage + 1 + siblingsCount < lastPage && (_jsx("button", { disabled: true, className: "arkynPaginationSpread", children: _jsx(Ellipsis, {}) })), _jsx("button", { className: "arkynPaginationPageButton", onClick: () => handlePageChange(lastPage), children: lastPage })] })), _jsx("button", { className: "arkynPaginationIconButton", disabled: currentPage >= lastPage, onClick: () => handlePageChange(currentPage + 1), children: _jsx(ChevronRight, {}) })] }));
 }
 export { Pagination };

package/dist/services/index.d.ts

@@ -1,7 +1,5 @@
 import { GenerateIcon } from "./generateIcon";
 import { generatePagesArray } from "./generatePagerArray";
-import { getNextPages } from "./getNextPages";
-import { getPreviousPages } from "./getPreviousPages";
 import { morpheme } from "./morpheme";
-export { GenerateIcon, generatePagesArray, getNextPages, getPreviousPages, morpheme, };
+export { GenerateIcon, generatePagesArray, morpheme };
 //# sourceMappingURL=index.d.ts.map

package/dist/services/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/services/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,YAAY,EACZ,gBAAgB,EAChB,QAAQ,GACT,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/services/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,QAAQ,EAAE,CAAC"}

package/dist/services/index.js

@@ -1,6 +1,4 @@
 import { GenerateIcon } from "./generateIcon";
 import { generatePagesArray } from "./generatePagerArray";
-import { getNextPages } from "./getNextPages";
-import { getPreviousPages } from "./getPreviousPages";
 import { morpheme } from "./morpheme";
-export { GenerateIcon, generatePagesArray, getNextPages, getPreviousPages, morpheme, };
+export { GenerateIcon, generatePagesArray, morpheme };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkyn/components",
-  "version": "1.3.148",
+  "version": "1.3.150",
   "main": "./dist/bundle.js",
   "types": "./dist/index.d.ts",
   "author": "Lucas Gonçalves",

package/src/components/Pagination/index.tsx

@@ -3,10 +3,17 @@ import { useNavigate } from "@remix-run/react";
 import { ChevronLeft, ChevronRight, Ellipsis } from "lucide-react";
 
 import { useScopedParams } from "../../hooks/useScopedParams";
-import { getNextPages, getPreviousPages } from "../../services";
 
 import "./styles.css";
 
+function generatePagesArray(from: number, to: number) {
+  return [...new Array(to - from)]
+    .map((_, index) => {
+      return from + index + 1;
+    })
+    .filter((page) => page > 0);
+}
+
 function Pagination(props: PaginationProps) {
   const {
     scope,
@@ -14,19 +21,31 @@ function Pagination(props: PaginationProps) {
     perPageKey = "per_page",
     pageKey = "page",
     siblingsCount = 2,
+    currentPage: baseCurrentPage = 1,
+    registerPerPage: baseRegisterPerPage = 20,
     ...rest
   } = props;
 
   const navigate = useNavigate();
   const { getParam, getScopedSearch } = useScopedParams(scope);
 
-  const currentPage = Number(getParam(pageKey)) || 1;
-  const registerPerPage = Number(getParam(perPageKey)) || 20;
+  const currentPage = Number(getParam("page")) || baseCurrentPage;
+  const registerPerPage = Number(getParam("per_page")) || baseRegisterPerPage;
 
   const lastPage = Math.ceil(totalCountRegisters / registerPerPage);
 
-  const previosPages = getPreviousPages(currentPage, siblingsCount);
-  const nextPages = getNextPages(currentPage, siblingsCount, lastPage);
+  const previosPages =
+    currentPage > 1
+      ? generatePagesArray(currentPage - 1 - siblingsCount, currentPage - 1)
+      : [];
+
+  const nextPages =
+    currentPage < lastPage
+      ? generatePagesArray(
+          currentPage,
+          Math.min(currentPage + siblingsCount, lastPage)
+        )
+      : [];
 
   function handlePageChange(page: number) {
     navigate(getScopedSearch({ page }));
@@ -59,29 +78,31 @@ function Pagination(props: PaginationProps) {
         </>
       )}
 
-      {previosPages.map((page, index) => (
-        <button
-          key={index}
-          onClick={() => handlePageChange(page)}
-          className="arkynPaginationPageButton"
-        >
-          {page}
-        </button>
-      ))}
+      {previosPages.length > 0 &&
+        previosPages.map((page, index) => (
+          <button
+            key={index}
+            onClick={() => handlePageChange(page)}
+            className="arkynPaginationPageButton"
+          >
+            {page}
+          </button>
+        ))}
 
       <button className="arkynPaginationCurrent" disabled>
         {currentPage}
       </button>
 
-      {nextPages.map((page, index) => (
-        <button
-          key={index}
-          onClick={() => handlePageChange(page)}
-          className="arkynPaginationPageButton"
-        >
-          {page}
-        </button>
-      ))}
+      {nextPages.length > 0 &&
+        nextPages.map((page, index) => (
+          <button
+            key={index}
+            onClick={() => handlePageChange(page)}
+            className="arkynPaginationPageButton"
+          >
+            {page}
+          </button>
+        ))}
 
       {currentPage + siblingsCount < lastPage && (
         <>

package/src/services/index.ts

@@ -1,13 +1,5 @@
 import { GenerateIcon } from "./generateIcon";
 import { generatePagesArray } from "./generatePagerArray";
-import { getNextPages } from "./getNextPages";
-import { getPreviousPages } from "./getPreviousPages";
 import { morpheme } from "./morpheme";
 
-export {
-  GenerateIcon,
-  generatePagesArray,
-  getNextPages,
-  getPreviousPages,
-  morpheme,
-};
+export { GenerateIcon, generatePagesArray, morpheme };

package/dist/services/getNextPages.d.ts

@@ -1,3 +0,0 @@
-declare function getNextPages(currentPage: number, siblingsCount: number, lastPage: number): number[];
-export { getNextPages };
-//# sourceMappingURL=getNextPages.d.ts.map

package/dist/services/getNextPages.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getNextPages.d.ts","sourceRoot":"","sources":["../../src/services/getNextPages.ts"],"names":[],"mappings":"AAEA,iBAAS,YAAY,CACnB,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,YAIjB;AAED,OAAO,EAAE,YAAY,EAAE,CAAC"}

package/dist/services/getNextPages.js

@@ -1,7 +0,0 @@
-import { generatePagesArray } from "./generatePagerArray";
-function getNextPages(currentPage, siblingsCount, lastPage) {
-    if (currentPage >= lastPage)
-        return [];
-    return generatePagesArray(currentPage, currentPage + siblingsCount);
-}
-export { getNextPages };

package/dist/services/getPreviousPages.d.ts

@@ -1,3 +0,0 @@
-declare function getPreviousPages(currentPage: number, siblingsCount: number): number[];
-export { getPreviousPages };
-//# sourceMappingURL=getPreviousPages.d.ts.map

package/dist/services/getPreviousPages.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getPreviousPages.d.ts","sourceRoot":"","sources":["../../src/services/getPreviousPages.ts"],"names":[],"mappings":"AAEA,iBAAS,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,YAGnE;AAED,OAAO,EAAE,gBAAgB,EAAE,CAAC"}

package/dist/services/getPreviousPages.js

@@ -1,7 +0,0 @@
-import { generatePagesArray } from "./generatePagerArray";
-function getPreviousPages(currentPage, siblingsCount) {
-    if (currentPage <= 1)
-        return [];
-    return generatePagesArray(currentPage - 1 - siblingsCount, currentPage - 1);
-}
-export { getPreviousPages };

package/src/services/getNextPages.ts

@@ -1,12 +0,0 @@
-import { generatePagesArray } from "./generatePagerArray";
-
-function getNextPages(
-  currentPage: number,
-  siblingsCount: number,
-  lastPage: number
-) {
-  if (currentPage >= lastPage) return [];
-  return generatePagesArray(currentPage, currentPage + siblingsCount);
-}
-
-export { getNextPages };

package/src/services/getPreviousPages.ts

@@ -1,8 +0,0 @@
-import { generatePagesArray } from "./generatePagerArray";
-
-function getPreviousPages(currentPage: number, siblingsCount: number) {
-  if (currentPage <= 1) return [];
-  return generatePagesArray(currentPage - 1 - siblingsCount, currentPage - 1);
-}
-
-export { getPreviousPages };