Skip to content

Remove incorrect focus styles on ActionList items #3056

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

Merged
langermank merged 5 commits into from
Mar 22, 2023
Merged

Remove incorrect focus styles on ActionList items #3056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9caa658
remove incorrect focus style
langermank Mar 21, 2023
8f6f602
Create .changeset/chilled-icons-hammer.md
langermank Mar 21, 2023
965b12d
test(vrt): update snapshots
langermank Mar 21, 2023
9577d49
test(e2e): remove DataTable snapshots
joshblack Mar 22, 2023
61123f8
Merge branch 'main' of github.com:primer/react into fix-al-focus-style
joshblack Mar 22, 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
5 changes: 5 additions & 0 deletions .changeset/chilled-icons-hammer.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

Remove incorrect focus styles on ActionList items
8 changes: 1 addition & 7 deletions src/ActionList/Item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,7 @@ export const Item = React.forwardRef<HTMLLIElement, ActionListItemProps>(
backgroundColor: `actionListItem.${variant}.hoverBg`,
color: getVariantStyles(variant, disabled).hoverColor,
},
':focus:not([data-focus-visible-added]), > a:focus:not([data-focus-visible-added])': {
backgroundColor: `actionListItem.${variant}.selectedBg`,
color: getVariantStyles(variant, disabled).hoverColor,
outline: 'none',
},
'&[data-focus-visible-added], > a[data-focus-visible-added]': {
// we don't use :focus-visible because not all browsers (safari) have it yet
'&:focus-visible, > a:focus-visible': {
outline: 'none',
border: `2 solid`,
boxShadow: `0 0 0 2px ${theme?.colors.accent.emphasis}`,
Expand Down
88 changes: 16 additions & 72 deletions src/NavList/__snapshots__/NavList.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,15 +239,8 @@ exports[`NavList renders a simple list 1`] = `
color: #24292f;
}

.c2:focus:not([data-focus-visible-added]),
.c2 > a:focus:not([data-focus-visible-added]) {
background-color: rgba(208,215,222,0.24);
color: #24292f;
outline: none;
}

.c2[data-focus-visible-added],
.c2 > a[data-focus-visible-added] {
.c2:focus-visible,
.c2 > a:focus-visible {
outline: none;
border: 2 solid;
box-shadow: 0 0 0 2px #0969da;
Expand All @@ -271,15 +264,8 @@ exports[`NavList renders a simple list 1`] = `
color: #24292f;
}

.c6:focus:not([data-focus-visible-added]),
.c6 > a:focus:not([data-focus-visible-added]) {
background-color: rgba(208,215,222,0.24);
color: #24292f;
outline: none;
}

.c6[data-focus-visible-added],
.c6 > a[data-focus-visible-added] {
.c6:focus-visible,
.c6 > a:focus-visible {
outline: none;
border: 2 solid;
box-shadow: 0 0 0 2px #0969da;
Expand Down Expand Up @@ -649,15 +635,8 @@ exports[`NavList renders with groups 1`] = `
color: #24292f;
}

.c6:focus:not([data-focus-visible-added]),
.c6 > a:focus:not([data-focus-visible-added]) {
background-color: rgba(208,215,222,0.24);
color: #24292f;
outline: none;
}

.c6[data-focus-visible-added],
.c6 > a[data-focus-visible-added] {
.c6:focus-visible,
.c6 > a:focus-visible {
outline: none;
border: 2 solid;
box-shadow: 0 0 0 2px #0969da;
Expand All @@ -681,15 +660,8 @@ exports[`NavList renders with groups 1`] = `
color: #24292f;
}

.c10:focus:not([data-focus-visible-added]),
.c10 > a:focus:not([data-focus-visible-added]) {
background-color: rgba(208,215,222,0.24);
color: #24292f;
outline: none;
}

.c10[data-focus-visible-added],
.c10 > a[data-focus-visible-added] {
.c10:focus-visible,
.c10 > a:focus-visible {
outline: none;
border: 2 solid;
box-shadow: 0 0 0 2px #0969da;
Expand Down Expand Up @@ -1141,15 +1113,8 @@ exports[`NavList.Item with NavList.SubNav does not have active styles if SubNav
color: #24292f;
}

.c10:focus:not([data-focus-visible-added]),
.c10 > a:focus:not([data-focus-visible-added]) {
background-color: rgba(208,215,222,0.24);
color: #24292f;
outline: none;
}

.c10[data-focus-visible-added],
.c10 > a[data-focus-visible-added] {
.c10:focus-visible,
.c10 > a:focus-visible {
outline: none;
border: 2 solid;
box-shadow: 0 0 0 2px #0969da;
Expand All @@ -1173,15 +1138,8 @@ exports[`NavList.Item with NavList.SubNav does not have active styles if SubNav
color: #24292f;
}

.c3:focus:not([data-focus-visible-added]),
.c3 > a:focus:not([data-focus-visible-added]) {
background-color: rgba(208,215,222,0.24);
color: #24292f;
outline: none;
}

.c3[data-focus-visible-added],
.c3 > a[data-focus-visible-added] {
.c3:focus-visible,
.c3 > a:focus-visible {
outline: none;
border: 2 solid;
box-shadow: 0 0 0 2px #0969da;
Expand Down Expand Up @@ -1628,15 +1586,8 @@ exports[`NavList.Item with NavList.SubNav has active styles if SubNav contains t
color: #24292f;
}

.c10:focus:not([data-focus-visible-added]),
.c10 > a:focus:not([data-focus-visible-added]) {
background-color: rgba(208,215,222,0.24);
color: #24292f;
outline: none;
}

.c10[data-focus-visible-added],
.c10 > a[data-focus-visible-added] {
.c10:focus-visible,
.c10 > a:focus-visible {
outline: none;
border: 2 solid;
box-shadow: 0 0 0 2px #0969da;
Expand All @@ -1660,15 +1611,8 @@ exports[`NavList.Item with NavList.SubNav has active styles if SubNav contains t
color: #24292f;
}

.c3:focus:not([data-focus-visible-added]),
.c3 > a:focus:not([data-focus-visible-added]) {
background-color: rgba(208,215,222,0.24);
color: #24292f;
outline: none;
}

.c3[data-focus-visible-added],
.c3 > a[data-focus-visible-added] {
.c3:focus-visible,
.c3 > a:focus-visible {
outline: none;
border: 2 solid;
box-shadow: 0 0 0 2px #0969da;
Expand Down