fix(Pagination): fix total page calculation

gravity-ui · Jan 9, 2024 · 296fff4 · 296fff4
1 parent 4f0f099
commit 296fff4
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 4 deletions.
diff --git a/src/components/Pagination/Pagination.tsx b/src/components/Pagination/Pagination.tsx
@@ -13,10 +13,13 @@ import {
 } from './components';
 import {usePagination} from './hooks/usePagination';
 import type {PaginationProps} from './types';
+import {getResultPage, getResultTotal} from './utils';
 
 import './Pagination.scss';
 
 const b = blockNew('pagination');
+const DEFAULT_TOTAL = 1;
+const DEFAULT_PAGE = 1;
 
 export const Pagination = ({
     page,
@@ -35,7 +38,20 @@ 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, DEFAULT_TOTAL);
+    const resultPage = getResultPage({
+        page,
+        total: resultTotal,
+        pageSize,
+        defaultPage: DEFAULT_PAGE,
+    });
+
+    const {items, numberOfPages} = usePagination({
+        page: resultPage,
+        pageSize,
+        total: resultTotal,
+        mobile,
+    });
 
     const pagination = items
         .map((item) => {
@@ -79,7 +95,7 @@ export const Pagination = ({
                             key={item.action}
                             size={size}
                             item={item}
-                            page={page}
+                            page={resultPage}
                             pageSize={pageSize}
                             onUpdate={onUpdate}
                             compact={compact}
@@ -107,11 +123,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,23 @@ 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, defaultTotal: number) {
+    return total === undefined || total > 0 ? total : defaultTotal;
+}
+
+export function getResultPage({
+    page,
+    total,
+    pageSize,
+    defaultPage,
+}: {
+    page: number;
+    total: number | undefined;
+    pageSize: number;
+    defaultPage: number;
+}) {
+    return page > 0 && (total === undefined || page <= getNumberOfPages(pageSize, total))
+        ? page
+        : defaultPage;
+}