Skip to content

Commit

Permalink
Merge 88ede85 into d44a4cf
Browse files Browse the repository at this point in the history
  • Loading branch information
langermank authored Dec 11, 2024
2 parents d44a4cf + 88ede85 commit 4467279
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions .changeset/eight-bears-worry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

ActionList color bug fixes
2 changes: 1 addition & 1 deletion packages/react/src/ActionList/Item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ export const Item = React.forwardRef<HTMLLIElement, ActionListItemProps>(
'&:focus-visible, > a.focus-visible, &:focus.focus-visible': {
outline: 'none',
border: `2 solid`,
boxShadow: `0 0 0 2px ${theme?.colors.accent.emphasis}`,
boxShadow: `0 0 0 2px var(--focus-outlineColor)`,
},
'&:active:not([aria-disabled]):not([data-inactive])': {
backgroundColor: `actionListItem.${variant}.activeBg`,
Expand Down
4 changes: 2 additions & 2 deletions packages/react/src/ActionList/Selection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const Selection: React.FC<React.PropsWithChildren<SelectionProps>> = ({se
<LeadingVisualContainer data-component="ActionList.Selection" sx={{minWidth: '16px'}}>
<Box
sx={{
borderColor: selected ? 'accent.fg' : 'neutral.emphasis',
borderColor: selected ? 'var(--control-checked-borderColor-rest)' : 'var(--control-borderColor-rest)',
borderStyle: 'solid',
borderWidth: '1',
borderRadius: '1',
Expand All @@ -76,7 +76,7 @@ export const Selection: React.FC<React.PropsWithChildren<SelectionProps>> = ({se
margin: '0',
placeContent: 'center',
width: 'var(--base-size-16, 16px)',
backgroundColor: selected ? 'accent.fg' : 'canvas.default',
backgroundColor: selected ? 'var(--control-checked-bgColor-rest)' : 'canvas.default',
transition: selected
? 'background-color, border-color 80ms cubic-bezier(0.33, 1, 0.68, 1)'
: 'background-color, border-color 80ms cubic-bezier(0.32, 0, 0.67, 0) 0ms',
Expand Down

0 comments on commit 4467279

Please sign in to comment.