Skip to content

feat(material/checkbox): Avoid nested divs in labels by changing to span instead. #20990

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
merged 1 commit into from
Nov 13, 2020
Merged

feat(material/checkbox): Avoid nested divs in labels by changing to span instead. #20990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions src/material/checkbox/checkbox.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<label [attr.for]="inputId" class="mat-checkbox-layout" #label>
<div class="mat-checkbox-inner-container"
<span class="mat-checkbox-inner-container"
[class.mat-checkbox-inner-container-no-side-margin]="!checkboxLabel.textContent || !checkboxLabel.textContent.trim()">
<input #input
class="mat-checkbox-input cdk-visually-hidden" type="checkbox"
Expand All @@ -16,16 +16,16 @@
[attr.aria-describedby]="ariaDescribedby"
(change)="_onInteractionEvent($event)"
(click)="_onInputClick($event)">
<div matRipple class="mat-checkbox-ripple mat-focus-indicator"
<span matRipple class="mat-checkbox-ripple mat-focus-indicator"
[matRippleTrigger]="label"
[matRippleDisabled]="_isRippleDisabled()"
[matRippleRadius]="20"
[matRippleCentered]="true"
[matRippleAnimation]="{enterDuration: 150}">
<div class="mat-ripple-element mat-checkbox-persistent-ripple"></div>
</div>
<div class="mat-checkbox-frame"></div>
<div class="mat-checkbox-background">
<span class="mat-ripple-element mat-checkbox-persistent-ripple"></span>
</span>
<span class="mat-checkbox-frame"></span>
<span class="mat-checkbox-background">
<svg version="1.1"
focusable="false"
class="mat-checkbox-checkmark"
Expand All @@ -37,9 +37,9 @@
d="M4.1,12.7 9,17.6 20.3,6.3"/>
</svg>
<!-- Element for rendering the indeterminate state checkbox. -->
<div class="mat-checkbox-mixedmark"></div>
</div>
</div>
<span class="mat-checkbox-mixedmark"></span>
</span>
</span>
<span class="mat-checkbox-label" #checkboxLabel (cdkObserveContent)="_onLabelTextChange()">
<!-- Add an invisible span so JAWS can read the label -->
<span style="display:none">&nbsp;</span>
Expand Down
1 change: 1 addition & 0 deletions src/material/checkbox/checkbox.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ $_mat-checkbox-mark-stroke-size: 2 / 15 * $mat-checkbox-size !default;
}

.mat-checkbox-persistent-ripple {
display: block;
width: 100%;
height: 100%;
transform: none;
Expand Down