Skip to content
This repository was archived by the owner on Sep 30, 2025. It is now read-only.

[Page Actions] Remove shadow on focus states for buttons in Page Header #10582

Merged
merged 3 commits into from
Sep 22, 2023
Merged

[Page Actions] Remove shadow on focus states for buttons in Page Header #10582

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
504f83d
chore: fix focus states of actions in Page Header
mrcthms Sep 20, 2023
d540705
chore: changeset
mrcthms Sep 20, 2023
3cb9fd5
chore: tidy up from review
mrcthms Sep 21, 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/purple-sheep-cough.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@shopify/polaris': patch
---

Fixed the focus states of actions within the Page Header component
8 changes: 3 additions & 5 deletions polaris-react/src/components/ActionMenu/components/SecondaryAction/SecondaryAction.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,16 @@
background-color: var(--p-color-bg-strong) !important;
border-radius: var(--p-border-radius-2) !important;
/* stylelint-disable-next-line selector-max-combinators -- se23 */
&:hover {
&:is(:hover, :focus) {
background-color: var(--p-color-bg-strong-hover) !important;
}
/* stylelint-disable-next-line selector-max-combinators -- se23 */
&:focus,
&:active {
background-color: var(--p-color-bg-strong-active) !important;
box-shadow: var(--p-shadow-inset-md) !important;
}
/* stylelint-disable-next-line selector-max-combinators -- se23 */
&:focus:not(:active) {
&:focus-visible {
/* stylelint-disable-next-line polaris/border/polaris/at-rule-disallowed-list -- se23 */
@include no-focus-ring;
outline: var(--p-border-width-2) solid
Expand All @@ -94,11 +93,10 @@
button {
color: var(--p-color-text-critical) !important;
/* stylelint-disable-next-line selector-max-combinators, max-nesting-depth -- se23 */
&:hover {
&:is(:hover, :focus) {
background-color: var(--p-color-bg-strong-hover) !important;
}
/* stylelint-disable-next-line selector-max-combinators, max-nesting-depth -- se23 */
&:focus,
&:active {
background-color: var(--p-color-bg-strong-active) !important;
}
Expand Down
11 changes: 8 additions & 3 deletions polaris-react/src/components/Page/components/Header/Header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,18 @@ $action-menu-rollup-computed-width: 40px;
box-shadow: none;

/* stylelint-disable-next-line selector-max-combinators -- SE23 match button group */
&:hover {
box-shadow: none;
&:is(:hover, :focus, :focus-visible) {
/* stylelint-disable-next-line declaration-no-important -- SE23 match button group */
box-shadow: none !important;
}

/* stylelint-disable-next-line selector-max-combinators -- SE23 match button group */
&:is(:hover, :focus-visible) {
background-color: var(--p-color-bg-strong-hover);
}

/* stylelint-disable-next-line selector-max-combinators -- SE23 match button group */
&:focus {
&:active {
background-color: var(--p-color-bg-strong-active);
/* stylelint-disable-next-line declaration-no-important -- SE23 match button group */
box-shadow: var(--p-shadow-inset-md) !important;
Expand Down