Skip to content

Commit 5ec4849

Browse files
committed
refactor(button)!: replace focus-ring with focus-visible
BREAKING CHANGE: use native focus-visible pseudo class for focus styling on button and basebutton
1 parent 4475461 commit 5ec4849

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

components/button/index.css

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ governing permissions and limitations under the License.
129129
color: inherit;
130130
}
131131

132-
/* correct focus-ring radius for t-shirt sizing */
132+
/* correct focus indicator radius for t-shirt sizing */
133133
&:after {
134134
border-radius: calc(var(--mod-button-border-radius, var(--spectrum-button-border-radius)) + var(--mod-focus-indicator-gap, var(--spectrum-focus-indicator-gap)));
135135
}
@@ -163,7 +163,7 @@ a.spectrum-Button {
163163
}
164164

165165
.spectrum-Button {
166-
&:focus-ring,
166+
&:focus-visible,
167167
&.is-focused {
168168
&:after {
169169
box-shadow: 0 0 0 var(--mod-button-focus-ring-thickness, var(--spectrum-button-focus-ring-thickness)) var(--mod-button-focus-ring-color, var(--spectrum-button-focus-indicator-color));
@@ -189,9 +189,10 @@ a.spectrum-Button {
189189
content: '';
190190
}
191191

192-
&:focus-ring {
192+
&:focus-visible {
193193
/* kill the default ring */
194194
box-shadow: none;
195+
outline: none;
195196

196197
&:after {
197198
box-shadow: 0 0 0 var(--mod-button-focus-ring-thickness, var(--spectrum-button-focus-ring-thickness)) var(--highcontrast-button-focus-ring-color, var(--mod-button-focus-ring-color,
@@ -216,7 +217,7 @@ a.spectrum-Button {
216217
color: var(--highcontrast-button-content-color-hover, var(--mod-button-content-color-hover, var(--spectrum-button-content-color-hover)));
217218
}
218219

219-
&:focus-ring {
220+
&:focus-visible {
220221
background-color: var(--highcontrast-button-background-color-focus, var(--mod-button-background-color-focus, var(--spectrum-button-background-color-focus)));
221222
border-color: var(--highcontrast-button-border-color-focus, var(--mod-button-border-color-focus, var(--spectrum-button-border-color-focus)));
222223
color: var(--highcontrast-button-content-color-focus, var(--mod-button-content-color-focus, var(--spectrum-button-content-color-focus)));
@@ -242,7 +243,7 @@ a.spectrum-Button {
242243
--highcontrast-button-content-color-disabled: GrayText;
243244
--highcontrast-button-border-color-disabled: GrayText;
244245

245-
&:focus-ring {
246+
&:focus-visible {
246247
&:after {
247248
forced-color-adjust: none;
248249
box-shadow: 0 0 0 var(--mod-button-focus-ring-thickness, var(--spectrum-button-focus-ring-thickness)) ButtonText;

components/commons/basebutton-coretokens.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ governing permissions and limitations under the License.
9797
margin var(--mod-animation-duration-100, var(--spectrum-animation-duration-100)) ease-out;
9898
}
9999

100-
&:focus-ring {
100+
&:focus-visible {
101101
&:after {
102102
margin: calc(var(--mod-focus-indicator-gap, var(--spectrum-focus-indicator-gap)) * -2);
103103
}

components/commons/basebutton.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ governing permissions and limitations under the License.
102102
margin var(--spectrum-global-animation-duration-100) ease-out;
103103
}
104104

105-
&:focus-ring {
105+
&:focus-visible {
106106
&:after {
107107
margin: calc(var(--spectrum-alias-focus-ring-gap) * -2);
108108
}

0 commit comments

Comments
 (0)