Merge branch 'feat/paginated-table-components' into alpha

gisce · Feb 14, 2025 · 1bd87fb · 1bd87fb
2 parents e67fbbc + c49c7b8
commit 1bd87fb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/components/ui/PaginationHeader/PaginationHeader.tsx b/src/components/ui/PaginationHeader/PaginationHeader.tsx
@@ -1,7 +1,7 @@
 import { useLocale } from "@/context";
 import { Col, Pagination, Row, Spin } from "antd";
 import type { PaginationProps } from "antd";
-import { useMemo, useState, useCallback, memo } from "react";
+import { useMemo, useState, useCallback, memo, useEffect } from "react";
 import {
   SelectAllRecordsRow,
   shouldShowSelectionRow,
@@ -12,8 +12,8 @@ import type { SelectAllRecordsRowProps } from "../SelectAllRecordsRow/SelectAllR
 const PaginationHeaderComponent = (props: PaginationHeaderProps) => {
   const {
     total,
-    initialPage,
-    initialPageSize,
+    page: pageProps,
+    pageSize: pageSizeProps,
     currentPageSelectedCount,
     totalSelectedCount,
     onRequestPageChange,
@@ -23,8 +23,16 @@ const PaginationHeaderComponent = (props: PaginationHeaderProps) => {
 
   const { t } = useLocale();
 
-  const [page, setPage] = useState(initialPage);
-  const [pageSize, setPageSize] = useState(initialPageSize);
+  const [page, setPage] = useState(pageProps);
+  const [pageSize, setPageSize] = useState(pageSizeProps);
+
+  useEffect(() => {
+    setPage(pageProps);
+  }, [pageProps]);
+
+  useEffect(() => {
+    setPageSize(pageSizeProps);
+  }, [pageSizeProps]);
 
   const from = useMemo(() => (page - 1) * pageSize + 1, [page, pageSize]);
   const to = useMemo(

diff --git a/src/components/ui/PaginationHeader/PaginationHeader.types.ts b/src/components/ui/PaginationHeader/PaginationHeader.types.ts
@@ -2,9 +2,9 @@ export type PaginationHeaderProps = {
   /** Total number of records across all pages */
   total: number;
   /** Initial page number */
-  initialPage: number;
+  page: number;
   /** Initial number of items per page */
-  initialPageSize: number;
+  pageSize: number;
   /** Number of selected records in the current page */
   currentPageSelectedCount: number;
   /** Total number of selected records across all pages */