fix(Pagination): fix total page calculation (#1237)

Co-authored-by: Evgenij Shangin <[email protected]>
gravity-ui · Jan 10, 2024 · 8f1af66 · 8f1af66
1 parent 5bd5edd
commit 8f1af66
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 4 deletions.
diff --git a/src/components/Pagination/Pagination.tsx b/src/components/Pagination/Pagination.tsx
@@ -13,6 +13,7 @@ import {
 } from './components';
 import {usePagination} from './hooks/usePagination';
 import type {PaginationProps} from './types';
+import {getResultPage, getResultTotal} from './utils';
 
 import './Pagination.scss';
 
@@ -35,7 +36,19 @@ export const Pagination = ({
     const size = mobile ? 'l' : 'm';
     const compact = mobile ? true : propCompact;
 
-    const {items, numberOfPages} = usePagination({page, pageSize, total, mobile});
+    const resultTotal = getResultTotal(total);
+    const resultPage = getResultPage({
+        page,
+        total: resultTotal,
+        pageSize,
+    });
+
+    const {items, numberOfPages} = usePagination({
+        page: resultPage,
+        pageSize,
+        total: resultTotal,
+        mobile,
+    });
 
     const pagination = items
         .map((item) => {
@@ -79,7 +92,7 @@ export const Pagination = ({
                             key={item.action}
                             size={size}
                             item={item}
-                            page={page}
+                            page={resultPage}
                             pageSize={pageSize}
                             onUpdate={onUpdate}
                             compact={compact}
@@ -107,11 +120,11 @@ export const Pagination = ({
             {pageSizeOptions && (
                 <PaginationPageSizer
                     onUpdate={onUpdate}
-                    page={page}
+                    page={resultPage}
                     pageSize={pageSize}
                     pageSizeOptions={pageSizeOptions}
                     size={size}
-                    total={total}
+                    total={resultTotal}
                     className={b('page-sizer')}
                 />
             )}

diff --git a/src/components/Pagination/utils.ts b/src/components/Pagination/utils.ts
@@ -51,3 +51,21 @@ function getDesktopNumerationList(page: number, numberOfPages: number) {
 export function getNumberOfPages(pageSize: number, total = 0) {
     return Math.floor((total - 1) / pageSize) + 1;
 }
+
+export function getResultTotal(total: number | undefined) {
+    return total === undefined || total > 0 ? total : 1;
+}
+
+export function getResultPage({
+    page,
+    total,
+    pageSize,
+}: {
+    page: number;
+    total: number | undefined;
+    pageSize: number;
+}) {
+    return page > 0 && (total === undefined || page <= getNumberOfPages(pageSize, total))
+        ? page
+        : 1;
+}