Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed

- pagination skeleton on data loading and fetching.

## [5.13.1] - 2025-11-10

### Fixed
Expand Down
45 changes: 27 additions & 18 deletions src/lib/ReactDataTable/ReactDataTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { useVirtualizer, Virtualizer } from "@tanstack/react-virtual";
import { useRef } from "react";
import { TableBody } from "./TableBody";
import { useVirtualizationTableHeight } from "../hooks/useVirtualizationTableHeight";
import Skeleton from "react-loading-skeleton";

interface TableInternalProps<TData, TFilter extends FilterModel = Record<string, never>> extends ReactDataTableProps<TData, TFilter> {
virtualizer?: Virtualizer<HTMLDivElement, Element>;
Expand Down Expand Up @@ -272,6 +273,8 @@ const ReactDataTable = <TData, TFilter extends FilterModel = Record<string, neve
totalRecords = table.getCoreRowModel().rows.length,
dragAndDropOptions,
pagingNavigationComponents,
isLoading,
isFetching,
onPseudoHeightChange,
} = props;

Expand Down Expand Up @@ -326,24 +329,30 @@ const ReactDataTable = <TData, TFilter extends FilterModel = Record<string, neve
</DndContext>

{showPaging && (
<Paging
currentItemsPerPage={pagination.pageSize}
currentPage={pagination.pageIndex + 1}
totalRecords={totalRecords}
currentRecordCount={table.getRowModel().rows.length}
setItemsPerPage={(x) => {
table.setPageSize(x);
}}
setCurrentPage={(x) => table.setPageIndex(x - 1)}
possiblePageItemCounts={pageSizes}
translations={{
itemsPerPageDropdown: reactDataTableTranslations.itemsPerPageDropdown,
showedItemsText: reactDataTableTranslations.showedItemsText,
}}
pagingPossible={true}
changePageSizePossible={!hidePageSizeChange}
navigationComponents={pagingNavigationComponents}
/>
<>
{isLoading || isFetching ? (
<Skeleton count={1} height={20} />
) : (
<Paging
currentItemsPerPage={pagination.pageSize}
currentPage={pagination.pageIndex + 1}
totalRecords={totalRecords}
currentRecordCount={table.getRowModel().rows.length}
setItemsPerPage={(x) => {
table.setPageSize(x);
}}
setCurrentPage={(x) => table.setPageIndex(x - 1)}
possiblePageItemCounts={pageSizes}
translations={{
itemsPerPageDropdown: reactDataTableTranslations.itemsPerPageDropdown,
showedItemsText: reactDataTableTranslations.showedItemsText,
}}
pagingPossible={true}
changePageSizePossible={!hidePageSizeChange}
navigationComponents={pagingNavigationComponents}
/>
)}
</>
)}
</>
);
Expand Down
Loading