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

ActionList: Fix leaky disabled description styles #4566

Merged
merged 2 commits into from
May 13, 2024
Merged

ActionList: Fix leaky disabled description styles #4566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30ef19c
replace leaky & with data-component
siddharthkp May 7, 2024
e995bb9
Create stupid-stingrays-sparkle.md
siddharthkp May 7, 2024
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/stupid-stingrays-sparkle.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

ActionList: Fix leaky description styles for disabled item
17 changes: 5 additions & 12 deletions packages/react/src/ActionList/Description.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,15 @@ export const Description: React.FC<React.PropsWithChildren<ActionListDescription
minWidth: 0,
marginLeft: variant === 'block' ? 0 : 2,
color: 'fg.muted',
'li[aria-disabled="true"] &': {
color: 'inherit',
},
'li[data-variant="danger"]:hover &, li[data-variant="danger"]:active &': {
color: 'inherit',
},
'li[aria-disabled="true"] &[data-component="ActionList.Description"]': {color: 'inherit'},
'li[data-variant="danger"]:hover &[data-component="ActionList.Description"], li[data-variant="danger"]:active &[data-component="ActionList.Description"]':
{color: 'inherit'},
}

const {blockDescriptionId, inlineDescriptionId} = React.useContext(ItemContext)

return variant === 'block' ? (
<Box
as="span"
// huh why?
sx={merge(styles, sx as SxProp)}
id={blockDescriptionId}
>
<Box as="span" sx={merge(styles, sx as SxProp)} id={blockDescriptionId} data-component="ActionList.Description">
{props.children}
</Box>
) : (
Expand All @@ -54,6 +46,7 @@ export const Description: React.FC<React.PropsWithChildren<ActionListDescription
title={props.children as string}
inline={true}
maxWidth="100%"
data-component="ActionList.Description"
>
{props.children}
</Truncate>
Expand Down
Loading