@@ -368,14 +368,24 @@ describe('MatSlideToggle without forms', () => {
368
368
. toBe ( 5 , 'Expected tabIndex property to have been set based on the native attribute' ) ;
369
369
} ) ) ;
370
370
371
- it ( 'should clear the tabindex from the host element' , fakeAsync ( ( ) => {
372
- const fixture = TestBed . createComponent ( SlideToggleWithTabindexAttr ) ;
371
+ it ( 'should set the tabindex of the host element to -1 ' , fakeAsync ( ( ) => {
372
+ const fixture = TestBed . createComponent ( SlideToggleWithTabindexAttr ) ;
373
373
374
- fixture . detectChanges ( ) ;
374
+ fixture . detectChanges ( ) ;
375
375
376
- const slideToggle = fixture . debugElement . query ( By . directive ( MatSlideToggle ) ) . nativeElement ;
377
- expect ( slideToggle . getAttribute ( 'tabindex' ) ) . toBe ( '-1' ) ;
378
- } ) ) ;
376
+ const slideToggle = fixture . debugElement . query ( By . directive ( MatSlideToggle ) ) . nativeElement ;
377
+ expect ( slideToggle . getAttribute ( 'tabindex' ) ) . toBe ( '-1' ) ;
378
+ } ) ) ;
379
+
380
+ it ( 'should remove the tabindex from the host element when disabled' , fakeAsync ( ( ) => {
381
+ const fixture = TestBed . createComponent ( SlideToggleWithTabindexAttr ) ;
382
+
383
+ fixture . componentInstance . disabled = true ;
384
+ fixture . detectChanges ( ) ;
385
+
386
+ const slideToggle = fixture . debugElement . query ( By . directive ( MatSlideToggle ) ) . nativeElement ;
387
+ expect ( slideToggle . hasAttribute ( 'tabindex' ) ) . toBe ( false ) ;
388
+ } ) ) ;
379
389
} ) ;
380
390
381
391
describe ( 'custom action configuration' , ( ) => {
@@ -1124,10 +1134,10 @@ class SlideToggleWithFormControl {
1124
1134
formControl = new FormControl ( ) ;
1125
1135
}
1126
1136
1127
- @Component ( {
1128
- template : `<mat-slide-toggle tabindex="5"></mat-slide-toggle>`
1129
- } )
1130
- class SlideToggleWithTabindexAttr { }
1137
+ @Component ( { template : `<mat-slide-toggle tabindex="5" [disabled]="disabled"></mat-slide-toggle>` } )
1138
+ class SlideToggleWithTabindexAttr {
1139
+ disabled = false ;
1140
+ }
1131
1141
1132
1142
@Component ( {
1133
1143
template : `<mat-slide-toggle>{{label}}</mat-slide-toggle>`
0 commit comments