Skip to content

Fix paging overflow and text placement #40

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
neotob merged 1 commit into from
Oct 2, 2023
Merged

Fix paging overflow and text placement #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed

- Fixed row size and overflow behaviour for Paging component so that it does not always show a horizontal scrollbar regardless of the available width
- The paging text will now occupy the whole row in case there are no page buttons to be rendered

## [2.8.1] - 2023-09-19

### Fixed
Expand Down
36 changes: 19 additions & 17 deletions cypress/cypress/component/Paging/Paging.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ describe("Paging.cy.tsx", () => {
);

// Check pages per item dropdown
cy.get("[data-cy-root] > .row > .col-6:first-of-type > .btn-group > button.dropdown-toggle")
cy.get("[data-cy-root] > .container-fluid > .row > .col-6:first-of-type > .btn-group > button.dropdown-toggle")
.should("have.text", itemsPerPage.toString())
.click();
cy.get("[data-cy-root] > .row > .col-6:first-of-type > .btn-group > .dropdown-menu > h6").should(
cy.get("[data-cy-root] > .container-fluid > .row > .col-6:first-of-type > .btn-group > .dropdown-menu > h6").should(
"have.text",
translations.itemsPerPageDropdown,
);
cy.get("[data-cy-root] > .row > .col-6:first-of-type > .btn-group > .dropdown-menu > .dropdown-item").then(
cy.get("[data-cy-root] > .container-fluid > .row > .col-6:first-of-type > .btn-group > .dropdown-menu > .dropdown-item").then(
(items: JQuery<HTMLElement>) => {
expect(items.map((_, item) => item.innerText).toArray(), "possible items per page").to.deep.eq(
[25, 50, 100, 200, itemsPerPage].sort((a, b) => a - b).map((itemNumber): string => itemNumber.toString()),
Expand All @@ -40,7 +40,7 @@ describe("Paging.cy.tsx", () => {
);

// Check current page/items text
cy.get("[data-cy-root] > .row > .col-6:first-of-type > span.small").should(
cy.get("[data-cy-root] > .container-fluid > .row > .col-6:first-of-type > span.small").should(
"have.text",
translations.showedItemsText
.replace("{from}", (currentPage * itemsPerPage - itemsPerPage + 1).toString())
Expand All @@ -49,18 +49,20 @@ describe("Paging.cy.tsx", () => {
);

// Check pagination buttons
cy.get("[data-cy-root] > .row > .col-6:nth-of-type(2) > .btn-group > button.btn").then((items: JQuery<HTMLElement>) => {
expect(items.length, "navigation buttons count").to.eq(Math.min(7, pages) + 4);
cy.wrap(items.filter((_, item) => item.innerText === "<<")).click();
cy.get("@setCurrentPage").should("be.calledOnceWith", 1);
cy.wrap(items.filter((_, item) => item.innerText === "<")).click();
cy.get("@setCurrentPage").should("be.calledWith", currentPage - 1);
cy.wrap(items.filter((_, item) => item.innerText === (currentPage - 1).toString())).click();
cy.get("@setCurrentPage").should("be.calledWith", currentPage - 1);
cy.wrap(items.filter((_, item) => item.innerText === ">")).click();
cy.get("@setCurrentPage").should("be.calledWith", currentPage + 1);
cy.wrap(items.filter((_, item) => item.innerText === ">>")).click();
cy.get("@setCurrentPage").should("be.calledWith", pages);
});
cy.get("[data-cy-root] > .container-fluid > .row > .col-6:nth-of-type(2) > .btn-group > button.btn").then(
(items: JQuery<HTMLElement>) => {
expect(items.length, "navigation buttons count").to.eq(Math.min(7, pages) + 4);
cy.wrap(items.filter((_, item) => item.innerText === "<<")).click();
cy.get("@setCurrentPage").should("be.calledOnceWith", 1);
cy.wrap(items.filter((_, item) => item.innerText === "<")).click();
cy.get("@setCurrentPage").should("be.calledWith", currentPage - 1);
cy.wrap(items.filter((_, item) => item.innerText === (currentPage - 1).toString())).click();
cy.get("@setCurrentPage").should("be.calledWith", currentPage - 1);
cy.wrap(items.filter((_, item) => item.innerText === ">")).click();
cy.get("@setCurrentPage").should("be.calledWith", currentPage + 1);
cy.wrap(items.filter((_, item) => item.innerText === ">>")).click();
cy.get("@setCurrentPage").should("be.calledWith", pages);
},
);
});
});
118 changes: 60 additions & 58 deletions src/lib/Paging/Paging.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,66 +45,68 @@ function Paging({
);

return (
<Row style={{ marginBottom: "20px" }}>
<Col xs={6}>
{pagingPossible && (
<UncontrolledButtonDropdown>
<DropdownToggle caret color="link" size="sm">
{currentItemsPerPage}
</DropdownToggle>
<DropdownMenu>
<DropdownItem header>{translations.itemsPerPageDropdown}</DropdownItem>
{possibleItemsPerPage.map((pageItemCount) => (
<DropdownItem key={`pageItemCount_${pageItemCount}`} onClick={() => setItemsPerPage(pageItemCount)}>
{pageItemCount}
</DropdownItem>
))}
</DropdownMenu>
</UncontrolledButtonDropdown>
)}
<span className="small ml-2">
{translations.showedItemsText
.replace("{from}", ((currentPage - 1) * currentItemsPerPage + 1).toString())
.replace("{to}", ((currentPage - 1) * currentItemsPerPage + currentRecordCount).toString())
.replace("{total}", totalRecords.toString())}
</span>
</Col>
<div className="container-fluid">
<Row style={{ marginBottom: "20px" }}>
<Col xs={pagingPossible && currentItemsPerPage < totalRecords ? 6 : 12} style={{ paddingLeft: 0 }}>
{pagingPossible && (
<UncontrolledButtonDropdown>
<DropdownToggle caret color="link" size="sm">
{currentItemsPerPage}
</DropdownToggle>
<DropdownMenu>
<DropdownItem header>{translations.itemsPerPageDropdown}</DropdownItem>
{possibleItemsPerPage.map((pageItemCount) => (
<DropdownItem key={`pageItemCount_${pageItemCount}`} onClick={() => setItemsPerPage(pageItemCount)}>
{pageItemCount}
</DropdownItem>
))}
</DropdownMenu>
</UncontrolledButtonDropdown>
)}
<span className="small ml-2">
{translations.showedItemsText
.replace("{from}", ((currentPage - 1) * currentItemsPerPage + 1).toString())
.replace("{to}", ((currentPage - 1) * currentItemsPerPage + currentRecordCount).toString())
.replace("{total}", totalRecords.toString())}
</span>
</Col>

{pagingPossible && currentItemsPerPage < totalRecords && (
<Col xs={6} style={{ textAlign: "right" }}>
<ButtonGroup size="sm">
{showControls && (
<Button color="secondary" outline disabled={currentPage === 1} onClick={() => setCurrentPage(1)}>
{"<<"}
</Button>
)}
{showControls && (
<Button color="secondary" outline disabled={currentPage === 1} onClick={() => setCurrentPage(currentPage - 1)}>
{"<"}
</Button>
)}
{Array.from(Array(maxPage + 1).keys())
.filter((page) => page > firstPageShown)
.slice(0, maxPagesShown)
.map((page) => (
<Button key={page} outline={currentPage !== page} color="secondary" onClick={() => setCurrentPage(page)}>
{page}
{pagingPossible && currentItemsPerPage < totalRecords && (
<Col xs={6} style={{ textAlign: "right", paddingRight: 0 }}>
<ButtonGroup size="sm">
{showControls && (
<Button color="secondary" outline disabled={currentPage === 1} onClick={() => setCurrentPage(1)}>
{"<<"}
</Button>
))}
{showControls && (
<Button color="secondary" outline disabled={currentPage === maxPage} onClick={() => setCurrentPage(currentPage + 1)}>
{">"}
</Button>
)}
{showControls && (
<Button color="secondary" outline disabled={currentPage === maxPage} onClick={() => setCurrentPage(maxPage)}>
{">>"}
</Button>
)}
</ButtonGroup>
</Col>
)}
</Row>
)}
{showControls && (
<Button color="secondary" outline disabled={currentPage === 1} onClick={() => setCurrentPage(currentPage - 1)}>
{"<"}
</Button>
)}
{Array.from(Array(maxPage + 1).keys())
.filter((page) => page > firstPageShown)
.slice(0, maxPagesShown)
.map((page) => (
<Button key={page} outline={currentPage !== page} color="secondary" onClick={() => setCurrentPage(page)}>
{page}
</Button>
))}
{showControls && (
<Button color="secondary" outline disabled={currentPage === maxPage} onClick={() => setCurrentPage(currentPage + 1)}>
{">"}
</Button>
)}
{showControls && (
<Button color="secondary" outline disabled={currentPage === maxPage} onClick={() => setCurrentPage(maxPage)}>
{">>"}
</Button>
)}
</ButtonGroup>
</Col>
)}
</Row>
</div>
);
}

Expand Down