Skip to content

FUI - Pagination accessibility adjustments #2772

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
merged 4 commits into from
Feb 24, 2025
Merged

FUI - Pagination accessibility adjustments #2772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1dea148
FUI - Pagination rework for API and Product lists
jsorohova Feb 21, 2025
3990715
FUI - Pagination accessibility adjustments
jsorohova Feb 24, 2025
6e70e3b
Merge conflict fix
jsorohova Feb 24, 2025
df8b2fe
FUI - Pagination accessibility adjustments
jsorohova Feb 24, 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
10 changes: 9 additions & 1 deletion src/components/apis/list-of-apis/react/runtime/ApiListTableCards.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,15 @@ export const ApiListTableCards = ({
/>
) : (
<>
<div style={{ marginTop: "2rem" }}>
<div style={{ margin: "1rem auto 2rem" }}>
<Pagination
pageNumber={pageNumber}
setPageNumber={setPageNumber}
pageMax={Math.ceil(apis?.count / defaultPageSize)}
/>
</div>

<div>
{layout === TLayout.table ? (
<ApisTable
apis={apis}
Expand Down
6 changes: 5 additions & 1 deletion src/components/products/product-list/react/runtime/ProductsTableCards.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,11 @@ export const ProductsTableCards = ({
</div>
) : (
<>
<div style={{ marginTop: "2rem" }}>
<div style={{ margin: "1rem auto 2rem" }}>
<Pagination pageNumber={pageNumber} setPageNumber={setPageNumber} pageMax={Math.ceil(products?.count / defaultPageSize)} />
</div>

<div>
{layout === TLayout.table ? (
<ProductsTable products={products.value} getReferenceUrl={getReferenceUrl} />
) : (
Expand Down
14 changes: 12 additions & 2 deletions src/components/utils/react/Pagination.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,14 @@ export const Pagination = ({ pageNumber, setPageNumber, ...props }: TPaginationP
<Stack horizontal tokens={{childrenGap: ".5rem"}}>
<Stack.Item>
<Button appearance="transparent" onClick={() => setPageNumber(1)} disabled={pageNumber === 1} icon={<ChevronDoubleLeft16Regular />}/>
<Button appearance="transparent" onClick={() => setPageNumber(prev => prev - 1)} disabled={pageNumber === 1} icon={<ChevronLeft16Regular />}/>
<Button
appearance="transparent"
onClick={() => setPageNumber(prev => prev - 1)}
disabled={pageNumber === 1}
icon={<ChevronLeft16Regular />}
>
Previous
</Button>
</Stack.Item>

{"pageMax" in props && Array.from({length: props.pageMax}, (_, i) => i + 1).map(e => (
Expand All @@ -39,7 +46,10 @@ export const Pagination = ({ pageNumber, setPageNumber, ...props }: TPaginationP
onClick={() => setPageNumber(prev => prev + 1)}
disabled={"pageMax" in props ? pageNumber === props.pageMax : !props.hasNextPage}
icon={<ChevronRight16Regular/>}
/>
iconPosition="after"
>
Next
</Button>
{"pageMax" in props && (
<Button appearance="transparent" onClick={() => setPageNumber(props.pageMax)} disabled={pageNumber === props.pageMax} icon={<ChevronDoubleRight16Regular />}/>
)}
Expand Down