Skip to content

Commit

Permalink
fix(button-toggle): remove hover state on touch devices (#13724)
Browse files Browse the repository at this point in the history
Negates the `:hover` state on touch devices, in order to prevent it from lingering after the user taps on a button toggle. Also fixes the native tap highlight showing up if the user taps on a disabled toggle group.
  • Loading branch information
crisbeto authored and jelbourn committed Nov 3, 2018
1 parent 8fad5d1 commit a320af2
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion src/lib/button-toggle/button-toggle.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ $mat-button-toggle-legacy-border-radius: 2px !default;
white-space: nowrap;
overflow: hidden;
border-radius: $mat-button-toggle-legacy-border-radius;
-webkit-tap-highlight-color: transparent;

@include cdk-high-contrast {
outline: solid 1px;
Expand Down Expand Up @@ -46,7 +47,6 @@ $mat-button-toggle-legacy-border-radius: 2px !default;
.mat-button-toggle {
white-space: nowrap;
position: relative;
-webkit-tap-highlight-color: transparent;

&.cdk-keyboard-focused {
.mat-button-toggle-focus-overlay {
Expand Down Expand Up @@ -77,6 +77,16 @@ $mat-button-toggle-legacy-border-radius: 2px !default;
opacity: 0.5;
}
}

// On touch devices the hover state will linger on the element after the user has tapped.
// Disable it, because it can be confused with focus. We target the :hover state explicitly,
// because we still want to preserve the keyboard focus state for hybrid devices that have
// a keyboard and a touchscreen.
@media (hover: none) {
&:not(.mat-button-toggle-disabled):hover .mat-button-toggle-focus-overlay {
display: none;
}
}
}

.mat-button-toggle-label-content {
Expand Down

0 comments on commit a320af2

Please sign in to comment.