Skip to content

Commit

Permalink
fix(radio): Move .mat-radio-input above .mat-focus-indicator. (#18709)
Browse files Browse the repository at this point in the history
* fix(radio): Move .mat-radio-input above .mat-focus-indicator so that we
can apply styles to .mat-focus-indicator with CSS based upon whether or
not .mat-radio-input is focused.

* Explicitly add comment explaining why ripple must come after input.
  • Loading branch information
mmalerba committed Mar 5, 2020
1 parent cf13ecb commit 8c51dda
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions src/material/radio/radio.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,6 @@
<div class="mat-radio-container">
<div class="mat-radio-outer-circle"></div>
<div class="mat-radio-inner-circle"></div>
<div mat-ripple class="mat-radio-ripple mat-focus-indicator"
[matRippleTrigger]="label"
[matRippleDisabled]="_isRippleDisabled()"
[matRippleCentered]="true"
[matRippleRadius]="20"
[matRippleAnimation]="{enterDuration: 150}">

<div class="mat-ripple-element mat-radio-persistent-ripple"></div>
</div>

<input #input class="mat-radio-input cdk-visually-hidden" type="radio"
[id]="inputId"
[checked]="checked"
Expand All @@ -28,6 +18,18 @@
[attr.aria-describedby]="ariaDescribedby"
(change)="_onInputChange($event)"
(click)="_onInputClick($event)">

<!-- The ripple comes after the input so that we can target it with a CSS
sibling selector when the input is focused. -->
<div mat-ripple class="mat-radio-ripple mat-focus-indicator"
[matRippleTrigger]="label"
[matRippleDisabled]="_isRippleDisabled()"
[matRippleCentered]="true"
[matRippleRadius]="20"
[matRippleAnimation]="{enterDuration: 150}">

<div class="mat-ripple-element mat-radio-persistent-ripple"></div>
</div>
</div>

<!-- The label content for radio control. -->
Expand Down

0 comments on commit 8c51dda

Please sign in to comment.