Skip to content

Prevent displaying Paginator when itemsPerPage > totalItems #2172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jialecl merged 5 commits into from
Mar 5, 2025
Merged

Prevent displaying Paginator when itemsPerPage > totalItems #2172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
619db40
Made changes to the Paginator component to prevent displaying when to…
Feb 26, 2025
88006d7
Moved the conditional rendering of the paginator to our components th…
Feb 26, 2025
9a31fbd
Fixed storybook interactions for paginator changes
Feb 27, 2025
0e26115
Merge branch 'master' into Mil4n0r/add_paginator_condition
Mil4n0r Feb 27, 2025
9046c4d
Merge branch 'master' into Mil4n0r/add_paginator_condition
Jialecl Mar 5, 2025
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
2 changes: 1 addition & 1 deletion packages/lib/src/data-grid/DataGrid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ const DxcDataGrid = ({
summaryRowHeight={colorsTheme.dataGrid.summaryRowHeight}
className="fill-grid"
/>
{showPaginator && (
{showPaginator && (totalItems ?? rows.length) > itemsPerPage && (
<DxcPaginator
totalItems={totalItems ?? rows.length}
itemsPerPage={itemsPerPage}
Expand Down
4 changes: 2 additions & 2 deletions packages/lib/src/resultset-table/ResultsetTable.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ export const AscendentSorting: Story = {
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
const idHeader = canvas.getAllByRole("button")[0];
const idHeader2 = canvas.getAllByRole("button")[6];
const idHeader2 = canvas.getAllByRole("button")[2];
idHeader && (await userEvent.click(idHeader));
idHeader2 && (await userEvent.click(idHeader2));
},
Expand All @@ -420,7 +420,7 @@ export const DescendantSorting: Story = {
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
const nameHeader = canvas.getAllByRole("button")[1];
const nameHeader2 = canvas.getAllByRole("button")[7];
const nameHeader2 = canvas.getAllByRole("button")[3];
nameHeader && (await userEvent.click(nameHeader));
nameHeader && (await userEvent.click(nameHeader));
nameHeader2 && (await userEvent.click(nameHeader2));
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/src/resultset-table/ResultsetTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ const DxcResultsetTable = ({
))}
</tbody>
</DxcTable>
{!hidePaginator && (
{!hidePaginator && rows.length > itemsPerPage && (
<DxcPaginator
totalItems={rows.length}
itemsPerPage={itemsPerPage}
Expand Down