Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 19 additions & 5 deletions src/dev-app/slide-toggle/slide-toggle-demo.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,30 @@
<div class="demo-slide-toggle">
<mat-slide-toggle color="primary" [(ngModel)]="firstToggle">Default Slide Toggle</mat-slide-toggle>
<mat-slide-toggle color="primary" [(ngModel)]="firstToggle"
>Default Slide Toggle</mat-slide-toggle
>
<mat-slide-toggle [(ngModel)]="firstToggle" disabled>Disabled Slide Toggle</mat-slide-toggle>
<mat-slide-toggle [disabled]="firstToggle">Disable Bound</mat-slide-toggle>
<mat-slide-toggle disabled disabledInteractive [(ngModel)]="firstToggle">Disabled Interactive Toggle</mat-slide-toggle>
<mat-slide-toggle disabled disabledInteractive [(ngModel)]="firstToggle"
>Disabled Interactive Toggle</mat-slide-toggle
>
<mat-slide-toggle hideIcon [(ngModel)]="firstToggle">No icon</mat-slide-toggle>

<p>With label before the slide toggle.</p>

<mat-slide-toggle labelPosition="before" color="primary" [(ngModel)]="firstToggle">Default Slide Toggle</mat-slide-toggle>
<mat-slide-toggle labelPosition="before" [(ngModel)]="firstToggle" disabled>Disabled Slide Toggle</mat-slide-toggle>
<mat-slide-toggle labelPosition="before" color="primary" [(ngModel)]="firstToggle"
>Default Slide Toggle</mat-slide-toggle
>
<mat-slide-toggle labelPosition="before" [(ngModel)]="firstToggle" disabled
>Disabled Slide Toggle</mat-slide-toggle
>
<mat-slide-toggle labelPosition="before" [disabled]="firstToggle">Disable Bound</mat-slide-toggle>
<mat-slide-toggle labelPosition="before" hideIcon [(ngModel)]="firstToggle">No icon</mat-slide-toggle>
<mat-slide-toggle labelPosition="before" hideIcon [(ngModel)]="firstToggle"
>No icon</mat-slide-toggle
>

<p>With no label.</p>

<mat-slide-toggle aria-label="Toggle only" hideLabel color="primary" [(ngModel)]="firstToggle" />

<p>Example where the slide toggle is required inside of a form.</p>

Expand Down
24 changes: 19 additions & 5 deletions src/material/slide-toggle/slide-toggle.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ $fallbacks: m3-slide-toggle.get-tokens();
}
}

// Ensure no label element (with a click handler) present to ensure hidden from screen readers.
label:empty {
display: none;
}

.mdc-switch__track {
overflow: hidden;
position: relative;
Expand Down Expand Up @@ -66,9 +71,13 @@ $fallbacks: m3-slide-toggle.get-tokens();

.mdc-switch--disabled & {
border-width: token-utils.slot(
slide-toggle-disabled-unselected-track-outline-width, $fallbacks);
slide-toggle-disabled-unselected-track-outline-width,
$fallbacks
);
border-color: token-utils.slot(
slide-toggle-disabled-unselected-track-outline-color, $fallbacks);
slide-toggle-disabled-unselected-track-outline-color,
$fallbacks
);
}
}

Expand Down Expand Up @@ -223,7 +232,9 @@ $fallbacks: m3-slide-toggle.get-tokens();

&:has(.mdc-switch__icons) {
margin: token-utils.slot(
slide-toggle-unselected-with-icon-handle-horizontal-margin, $fallbacks);
slide-toggle-unselected-with-icon-handle-horizontal-margin,
$fallbacks
);
}
}

Expand All @@ -234,7 +245,9 @@ $fallbacks: m3-slide-toggle.get-tokens();

&:has(.mdc-switch__icons) {
margin: token-utils.slot(
slide-toggle-selected-with-icon-handle-horizontal-margin, $fallbacks);
slide-toggle-selected-with-icon-handle-horizontal-margin,
$fallbacks
);
}
}

Expand Down Expand Up @@ -275,7 +288,8 @@ $fallbacks: m3-slide-toggle.get-tokens();
left: 0;
position: absolute;
top: 0;
transition: background-color 75ms 0ms cubic-bezier(0.4, 0, 0.2, 1),
transition:
background-color 75ms 0ms cubic-bezier(0.4, 0, 0.2, 1),
border-color 75ms 0ms cubic-bezier(0.4, 0, 0.2, 1);
z-index: -1;

Expand Down
2 changes: 2 additions & 0 deletions src/material/slide-toggle/slide-toggle.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -654,6 +654,8 @@ describe('MatSlideToggle with forms', () => {

it('should update checked state on click if control is checked initially', fakeAsync(() => {
fixture = TestBed.createComponent(SlideToggleWithModel);
fixture.detectChanges();

slideToggle = fixture.debugElement.query(By.directive(MatSlideToggle))!.componentInstance;
labelElement = fixture.debugElement.query(By.css('label'))!.nativeElement;

Expand Down
Loading