Skip to content

Commit dc9315e

Browse files
authored
refactor(slide-toggle): remove deprecated APIs for version 10 (#19307)
1 parent 06921ff commit dc9315e

File tree

8 files changed

+12
-53
lines changed

8 files changed

+12
-53
lines changed

src/material-experimental/mdc-slide-toggle/slide-toggle-config.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ import {InjectionToken} from '@angular/core';
1212
export interface MatSlideToggleDefaultOptions {
1313
/** Whether toggle action triggers value changes in slide toggle. */
1414
disableToggleValue?: boolean;
15-
/**
16-
* Whether drag action triggers value changes in slide toggle.
17-
* @deprecated No longer being used.
18-
* @breaking-change 9.0.0.
19-
*/
20-
disableDragValue?: boolean;
2115
}
2216

2317
/** Injection token to be used to override the default options for `mat-slide-toggle`. */

src/material-experimental/mdc-slide-toggle/slide-toggle.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -185,16 +185,6 @@ export class MatSlideToggle implements ControlValueAccessor, AfterViewInit, OnDe
185185
/** Event will be dispatched each time the slide-toggle input is toggled. */
186186
@Output() readonly toggleChange: EventEmitter<void> = new EventEmitter<void>();
187187

188-
/**
189-
* An event will be dispatched each time the slide-toggle is dragged.
190-
* This event is always emitted when the user drags the slide toggle to make a change greater
191-
* than 50%. It does not mean the slide toggle's value is changed. The event is not emitted when
192-
* the user toggles the slide toggle to change its value.
193-
* @deprecated No longer being used.
194-
* @breaking-change 9.0.0
195-
*/
196-
@Output() readonly dragChange: EventEmitter<void> = new EventEmitter<void>();
197-
198188
/** Returns the unique id for the visual hidden input. */
199189
get inputId(): string { return `${this.id || this._uniqueId}-input`; }
200190

src/material/schematics/ng-update/data/constructor-checks.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ import {ConstructorChecksUpgradeData, TargetVersion, VersionChanges} from '@angu
1414
* automatically through type checking.
1515
*/
1616
export const constructorChecks: VersionChanges<ConstructorChecksUpgradeData> = {
17+
[TargetVersion.V10]: [
18+
{
19+
pr: 'https://github.com/angular/components/pull/19307',
20+
changes: ['MatSlideToggle']
21+
}
22+
],
1723
[TargetVersion.V9]: [
1824
{
1925
pr: 'https://github.com/angular/components/pull/17230',

src/material/slide-toggle/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ ng_module(
2222
module_name = "@angular/material/slide-toggle",
2323
deps = [
2424
"//src/cdk/a11y",
25-
"//src/cdk/bidi",
2625
"//src/cdk/coercion",
2726
"//src/cdk/observers",
2827
"//src/material/core",
@@ -57,7 +56,6 @@ ng_test_library(
5756
deps = [
5857
":slide-toggle",
5958
"//src/cdk/a11y",
60-
"//src/cdk/bidi",
6159
"//src/cdk/observers",
6260
"//src/cdk/testing/private",
6361
"//src/material/testing",

src/material/slide-toggle/slide-toggle-config.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ import {InjectionToken} from '@angular/core';
1212
export interface MatSlideToggleDefaultOptions {
1313
/** Whether toggle action triggers value changes in slide toggle. */
1414
disableToggleValue?: boolean;
15-
/**
16-
* Whether drag action triggers value changes in slide toggle.
17-
* @deprecated No longer being used.
18-
* @breaking-change 10.0.0
19-
*/
20-
disableDragValue?: boolean;
2115
}
2216

2317
/** Injection token to be used to override the default options for `mat-slide-toggle`. */

src/material/slide-toggle/slide-toggle.spec.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import {BidiModule, Direction} from '@angular/cdk/bidi';
21
import {MutationObserverFactory} from '@angular/cdk/observers';
32
import {dispatchFakeEvent} from '@angular/cdk/testing/private';
43
import {Component} from '@angular/core';
@@ -25,7 +24,7 @@ describe('MatSlideToggle without forms', () => {
2524
mutationObserverCallbacks = [];
2625

2726
TestBed.configureTestingModule({
28-
imports: [MatSlideToggleModule, BidiModule],
27+
imports: [MatSlideToggleModule],
2928
declarations: [
3029
SlideToggleBasic,
3130
SlideToggleWithTabindexAttr,
@@ -850,7 +849,7 @@ describe('MatSlideToggle with forms', () => {
850849

851850
@Component({
852851
template: `
853-
<mat-slide-toggle [dir]="direction" [required]="isRequired"
852+
<mat-slide-toggle [required]="isRequired"
854853
[disabled]="isDisabled"
855854
[color]="slideColor"
856855
[id]="slideId"
@@ -883,7 +882,6 @@ class SlideToggleBasic {
883882
labelPosition: string;
884883
toggleTriggered: number = 0;
885884
dragTriggered: number = 0;
886-
direction: Direction = 'ltr';
887885

888886
onSlideClick: (event?: Event) => void = () => {};
889887
onSlideChange = (event: MatSlideToggleChange) => this.lastEvent = event;

src/material/slide-toggle/slide-toggle.ts

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
*/
88

99
import {FocusMonitor} from '@angular/cdk/a11y';
10-
import {Directionality} from '@angular/cdk/bidi';
1110
import {BooleanInput, coerceBooleanProperty} from '@angular/cdk/coercion';
1211
import {
1312
AfterContentInit,
@@ -23,7 +22,6 @@ import {
2322
Output,
2423
ViewChild,
2524
ViewEncapsulation,
26-
NgZone,
2725
Optional,
2826
Inject,
2927
} from '@angular/core';
@@ -155,16 +153,6 @@ export class MatSlideToggle extends _MatSlideToggleMixinBase implements OnDestro
155153
*/
156154
@Output() readonly toggleChange: EventEmitter<void> = new EventEmitter<void>();
157155

158-
/**
159-
* An event will be dispatched each time the slide-toggle is dragged.
160-
* This event is always emitted when the user drags the slide toggle to make a change greater
161-
* than 50%. It does not mean the slide toggle's value is changed. The event is not emitted when
162-
* the user toggles the slide toggle to change its value.
163-
* @deprecated No longer being used. To be removed.
164-
* @breaking-change 10.0.0
165-
*/
166-
@Output() readonly dragChange: EventEmitter<void> = new EventEmitter<void>();
167-
168156
/** Returns the unique id for the visual hidden input. */
169157
get inputId(): string { return `${this.id || this._uniqueId}-input`; }
170158

@@ -175,15 +163,9 @@ export class MatSlideToggle extends _MatSlideToggleMixinBase implements OnDestro
175163
private _focusMonitor: FocusMonitor,
176164
private _changeDetectorRef: ChangeDetectorRef,
177165
@Attribute('tabindex') tabIndex: string,
178-
/**
179-
* @deprecated `_ngZone` and `_dir` parameters to be removed.
180-
* @breaking-change 10.0.0
181-
*/
182-
_ngZone: NgZone,
183166
@Inject(MAT_SLIDE_TOGGLE_DEFAULT_OPTIONS)
184167
public defaults: MatSlideToggleDefaultOptions,
185-
@Optional() @Inject(ANIMATION_MODULE_TYPE) public _animationMode?: string,
186-
@Optional() _dir?: Directionality) {
168+
@Optional() @Inject(ANIMATION_MODULE_TYPE) public _animationMode?: string) {
187169
super(elementRef);
188170
this.tabIndex = parseInt(tabIndex) || 0;
189171
}

tools/public_api_guard/material/slide-toggle.d.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,14 @@ export declare class MatSlideToggle extends _MatSlideToggleMixinBase implements
2020
get checked(): boolean;
2121
set checked(value: boolean);
2222
defaults: MatSlideToggleDefaultOptions;
23-
readonly dragChange: EventEmitter<void>;
2423
id: string;
2524
get inputId(): string;
2625
labelPosition: 'before' | 'after';
2726
name: string | null;
2827
get required(): boolean;
2928
set required(value: boolean);
3029
readonly toggleChange: EventEmitter<void>;
31-
constructor(elementRef: ElementRef, _focusMonitor: FocusMonitor, _changeDetectorRef: ChangeDetectorRef, tabIndex: string,
32-
_ngZone: NgZone, defaults: MatSlideToggleDefaultOptions, _animationMode?: string | undefined, _dir?: Directionality);
30+
constructor(elementRef: ElementRef, _focusMonitor: FocusMonitor, _changeDetectorRef: ChangeDetectorRef, tabIndex: string, defaults: MatSlideToggleDefaultOptions, _animationMode?: string | undefined);
3331
_onChangeEvent(event: Event): void;
3432
_onInputClick(event: Event): void;
3533
_onLabelTextChange(): void;
@@ -45,8 +43,8 @@ export declare class MatSlideToggle extends _MatSlideToggleMixinBase implements
4543
static ngAcceptInputType_disableRipple: BooleanInput;
4644
static ngAcceptInputType_disabled: BooleanInput;
4745
static ngAcceptInputType_required: BooleanInput;
48-
static ɵcmp: i0.ɵɵComponentDefWithMeta<MatSlideToggle, "mat-slide-toggle", ["matSlideToggle"], { "disabled": "disabled"; "disableRipple": "disableRipple"; "color": "color"; "tabIndex": "tabIndex"; "name": "name"; "id": "id"; "labelPosition": "labelPosition"; "ariaLabel": "aria-label"; "ariaLabelledby": "aria-labelledby"; "required": "required"; "checked": "checked"; }, { "change": "change"; "toggleChange": "toggleChange"; "dragChange": "dragChange"; }, never, ["*"]>;
49-
static ɵfac: i0.ɵɵFactoryDef<MatSlideToggle, [null, null, null, { attribute: "tabindex"; }, null, null, { optional: true; }, { optional: true; }]>;
46+
static ɵcmp: i0.ɵɵComponentDefWithMeta<MatSlideToggle, "mat-slide-toggle", ["matSlideToggle"], { "disabled": "disabled"; "disableRipple": "disableRipple"; "color": "color"; "tabIndex": "tabIndex"; "name": "name"; "id": "id"; "labelPosition": "labelPosition"; "ariaLabel": "aria-label"; "ariaLabelledby": "aria-labelledby"; "required": "required"; "checked": "checked"; }, { "change": "change"; "toggleChange": "toggleChange"; }, never, ["*"]>;
47+
static ɵfac: i0.ɵɵFactoryDef<MatSlideToggle, [null, null, null, { attribute: "tabindex"; }, null, { optional: true; }]>;
5048
}
5149

5250
export declare class MatSlideToggleChange {
@@ -58,7 +56,6 @@ export declare class MatSlideToggleChange {
5856
}
5957

6058
export interface MatSlideToggleDefaultOptions {
61-
disableDragValue?: boolean;
6259
disableToggleValue?: boolean;
6360
}
6461

0 commit comments

Comments
 (0)