Skip to content

fix: ActionList.LinkItem duplicate classes #5515

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

Closed
wants to merge 3 commits into from
Closed

fix: ActionList.LinkItem duplicate classes #5515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a9719d
repro
francinelucca Jan 9, 2025
4aa4fd4
remove className from menuItemProps
francinelucca Jan 9, 2025
b919972
Revert "Pagination: Accessibility enhancements (#5488)"
francinelucca Jan 9, 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
5 changes: 0 additions & 5 deletions .changeset/eighty-carpets-rush.md
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/react/src/ActionList/ActionList.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ export const LinkItemPlayground = args => {

return (
<ActionList>
<ActionList.LinkItem {...args}>
<ActionList.LinkItem {...args} className="hey">
{leadingVisual && <ActionList.LeadingVisual>{leadingVisual}</ActionList.LeadingVisual>}
Action list item
{trailingVisual && <ActionList.TrailingVisual>{trailingVisual}</ActionList.TrailingVisual>}
Expand Down
1 change: 0 additions & 1 deletion packages/react/src/ActionList/Item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,6 @@ export const Item = React.forwardRef<HTMLLIElement, ActionListItemProps>(
...(includeSelectionAttribute && {[itemSelectionAttribute]: selected}),
role: itemRole,
id: itemId,
className,
}

const containerProps = _PrivateItemWrapper
Expand Down
20 changes: 4 additions & 16 deletions packages/react/src/Pagination/Pagination.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, {useState} from 'react'
import React from 'react'
import type {Meta, StoryFn} from '@storybook/react'
import type {ComponentProps} from '../utils/types'
import Pagination from './Pagination'
Expand Down Expand Up @@ -26,21 +26,9 @@ const parseShowPagesArg = (value: boolean | string) => {
}
}

export const Default = () => {
const [page, setPage] = useState(2)

return (
<Pagination
pageCount={15}
currentPage={page}
onPageChange={(e, n) => {
e.preventDefault()
setPage(n)
}}
showPages={{narrow: false}}
/>
)
}
export const Default = () => (
<Pagination pageCount={15} currentPage={2} onPageChange={e => e.preventDefault()} showPages={{narrow: false}} />
)

export const Playground: StoryFn<ComponentProps<typeof Pagination>> = ({showPages, ...args}) => {
return (
Expand Down
4 changes: 2 additions & 2 deletions packages/react/src/Pagination/model.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export function buildComponentData(
key = 'page-prev'
content = 'Previous'
if (page.disabled) {
Object.assign(props, {'aria-hidden': 'true'})
Object.assign(props, {'aria-disabled': 'true', role: 'link'})
} else {
Object.assign(props, {
rel: 'prev',
Expand All @@ -163,7 +163,7 @@ export function buildComponentData(
key = 'page-next'
content = 'Next'
if (page.disabled) {
Object.assign(props, {'aria-hidden': 'true'})
Object.assign(props, {'aria-disabled': 'true', role: 'link'})
} else {
Object.assign(props, {
rel: 'next',
Expand Down
Loading