@@ -1068,7 +1068,7 @@ describe('MatDatepicker', () => {
1068
1068
expect ( button . getAttribute ( 'tabindex' ) ) . toBe ( '7' ) ;
1069
1069
} ) ;
1070
1070
1071
- it ( 'should clear the tabindex from the mat-datepicker-toggle host' , ( ) => {
1071
+ it ( 'should reset the tabindex from the mat-datepicker-toggle host' , ( ) => {
1072
1072
const fixture = createComponent ( DatepickerWithTabindexOnToggle , [ MatNativeDateModule ] ) ;
1073
1073
fixture . detectChanges ( ) ;
1074
1074
@@ -1091,6 +1091,16 @@ describe('MatDatepicker', () => {
1091
1091
expect ( document . activeElement ) . toBe ( button ) ;
1092
1092
} ) ;
1093
1093
1094
+ it ( 'should remove the tabindex from the mat-datepicker-toggle host when disabled' , ( ) => {
1095
+ const fixture = createComponent ( DatepickerWithTabindexOnToggle , [ MatNativeDateModule ] ) ;
1096
+ fixture . componentInstance . disabled = true ;
1097
+ fixture . detectChanges ( ) ;
1098
+
1099
+ const host = fixture . nativeElement . querySelector ( '.mat-datepicker-toggle' ) ;
1100
+
1101
+ expect ( host . hasAttribute ( 'tabindex' ) ) . toBe ( false ) ;
1102
+ } ) ;
1103
+
1094
1104
} ) ;
1095
1105
1096
1106
describe ( 'datepicker inside mat-form-field' , ( ) => {
@@ -2037,13 +2047,15 @@ class DelayedDatepicker {
2037
2047
@Component ( {
2038
2048
template : `
2039
2049
<input [matDatepicker]="d">
2040
- <mat-datepicker-toggle tabIndex="7" [for]="d">
2050
+ <mat-datepicker-toggle tabIndex="7" [for]="d" [disabled]="disabled" >
2041
2051
<div class="custom-icon" matDatepickerToggleIcon></div>
2042
2052
</mat-datepicker-toggle>
2043
2053
<mat-datepicker #d></mat-datepicker>
2044
2054
` ,
2045
2055
} )
2046
- class DatepickerWithTabindexOnToggle { }
2056
+ class DatepickerWithTabindexOnToggle {
2057
+ disabled = false ;
2058
+ }
2047
2059
2048
2060
2049
2061
@Component ( {
0 commit comments