Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 .changeset/tough-ears-drive.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@primer/react': patch
---

ActionList.Item: fix inline descriptions being referenced via `aria-labelledby` instead of `aria-describedby`
36 changes: 36 additions & 0 deletions packages/react/src/ActionList/ActionList.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,42 @@ describe('ActionList', () => {
expect(descriptions[2]).not.toHaveAttribute('title')
})

it('references inline description via aria-describedby', () => {
const {container} = HTMLRender(
<ActionList role="listbox" selectionVariant="single" aria-label="List">
<ActionList.Item role="option">
Item label
<ActionList.Description>Inline description</ActionList.Description>
</ActionList.Item>
</ActionList>,
)

const item = container.querySelector('[role="option"]')!
const descriptionEl = container.querySelector('[data-component="ActionList.Description"]')!
const descriptionId = descriptionEl.getAttribute('id')!

expect(item.getAttribute('aria-describedby')).toContain(descriptionId)
expect(item.getAttribute('aria-labelledby')).not.toContain(descriptionId)
})

it('references block description via aria-describedby', () => {
const {container} = HTMLRender(
<ActionList role="listbox" selectionVariant="single" aria-label="List">
<ActionList.Item role="option">
Item label
<ActionList.Description variant="block">Block description</ActionList.Description>
</ActionList.Item>
</ActionList>,
)

const item = container.querySelector('[role="option"]')!
const descriptionEl = container.querySelector('[data-component="ActionList.Description"]')!
const descriptionId = descriptionEl.getAttribute('id')!

expect(item.getAttribute('aria-describedby')).toContain(descriptionId)
expect(item.getAttribute('aria-labelledby')).not.toContain(descriptionId)
})

it('should support size prop on LinkItem', () => {
const {container} = HTMLRender(
<ActionList>
Expand Down
6 changes: 3 additions & 3 deletions packages/react/src/ActionList/Item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -232,16 +232,16 @@ const UnwrappedItem = <As extends React.ElementType = 'li'>(
const ariaLabelledBy = React.useMemo(() => {
const parts = [labelId]
if (hasTrailingVisualSlot) parts.push(trailingVisualId)
if (hasDescriptionSlot && descriptionVariant === 'inline') parts.push(inlineDescriptionId)
return parts.join(' ')
}, [labelId, hasTrailingVisualSlot, trailingVisualId, hasDescriptionSlot, descriptionVariant, inlineDescriptionId])
}, [labelId, hasTrailingVisualSlot, trailingVisualId])

const ariaDescribedBy = React.useMemo(() => {
const parts: string[] = []
if (hasDescriptionSlot && descriptionVariant === 'block') parts.push(blockDescriptionId)
if (hasDescriptionSlot && descriptionVariant === 'inline') parts.push(inlineDescriptionId)
if (inactiveWarningId) parts.push(inactiveWarningId)
return parts.length > 0 ? parts.join(' ') : undefined
}, [hasDescriptionSlot, descriptionVariant, blockDescriptionId, inactiveWarningId])
}, [hasDescriptionSlot, descriptionVariant, blockDescriptionId, inlineDescriptionId, inactiveWarningId])

const menuItemProps = React.useMemo(
() => ({
Expand Down
Loading