Skip to content
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

Jump to bottom

[FX-4630] Add aria-current to the active button in Pagination #4064

Merged
merged 4 commits into from
Dec 27, 2023
Merged

[FX-4630] Add aria-current to the active button in Pagination #4064

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea87705
Add ariaCurrent to the active button in Pagination
OleksandrNechai Dec 26, 2023
a37464e
Add aria-current false
OleksandrNechai Dec 27, 2023
ab75e2d
Add changeset
OleksandrNechai Dec 27, 2023
aefaf78
Fix changeset
OleksandrNechai Dec 27, 2023
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: 2 additions & 0 deletions packages/picasso/src/Pagination/__snapshots__/test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ exports[`Pagination renders 1`] = `
</span>
</button>
<button
aria-current="true"
class="MuiButtonBase-root PicassoButton-active PicassoButton-small PicassoButton-secondary PicassoButton-root PicassoPaginationButton-root PicassoPaginationButton-active PicassoPagination-button"
data-component-type="button"
tabindex="0"
Expand Down Expand Up @@ -209,6 +210,7 @@ exports[`Pagination renders disabled 1`] = `
</span>
</button>
<button
aria-current="true"
OleksandrNechai marked this conversation as resolved.
Show resolved Hide resolved
class="MuiButtonBase-root PicassoButton-active PicassoButton-disabled PicassoButton-small PicassoButton-secondary PicassoButton-root PicassoPaginationButton-root PicassoPaginationButton-active PicassoPagination-button Mui-disabled"
data-component-type="button"
disabled=""
Expand Down
11 changes: 4 additions & 7 deletions packages/picasso/src/PaginationButton/PaginationButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,14 @@ export interface Props extends StandardProps {

const PaginationButton = (props: Props) => {
const { page, activePage, disabled, onClick, className } = props

const classes = useStyles()
const isActive = page === activePage

return (
<Button
className={cx(
classes.root,
{ [classes.active]: page === activePage },
className
)}
active={activePage === page}
className={cx(classes.root, { [classes.active]: isActive }, className)}
aria-current={isActive ? true : undefined}
active={isActive}
OleksandrNechai marked this conversation as resolved.
Show resolved Hide resolved
disabled={disabled}
onClick={() => onClick(page)}
variant='secondary'
Expand Down
Loading