@@ -12,14 +12,15 @@ import {
12
12
} from '@angular/core/testing' ;
13
13
import { By } from '@angular/platform-browser' ;
14
14
import { NoopAnimationsModule } from '@angular/platform-browser/animations' ;
15
- import { Observable } from 'rxjs' ;
15
+ import { Observable , Subscriber } from 'rxjs' ;
16
16
import {
17
17
MAT_TABS_CONFIG ,
18
18
MatTab ,
19
19
MatTabGroup ,
20
20
MatTabHeader ,
21
21
MatTabHeaderPosition ,
22
22
MatTabsModule ,
23
+ MatTabChangeEvent ,
23
24
} from './index' ;
24
25
25
26
describe ( 'MatTabGroup' , ( ) => {
@@ -1034,7 +1035,7 @@ describe('MatTabGroup', () => {
1034
1035
* Checks that the `selectedIndex` has been updated; checks that the label and body have their
1035
1036
* respective `active` classes
1036
1037
*/
1037
- function checkSelectedIndex ( expectedIndex : number , fixture : ComponentFixture < any > ) {
1038
+ function checkSelectedIndex ( expectedIndex : number , fixture : ComponentFixture < unknown > ) {
1038
1039
fixture . detectChanges ( ) ;
1039
1040
1040
1041
let tabComponent : MatTabGroup = fixture . debugElement . query (
@@ -1053,11 +1054,11 @@ describe('MatTabGroup', () => {
1053
1054
expect ( tabContentElement . classList . contains ( 'mat-mdc-tab-body-active' ) ) . toBe ( true ) ;
1054
1055
}
1055
1056
1056
- function getSelectedLabel ( fixture : ComponentFixture < any > ) : HTMLElement {
1057
+ function getSelectedLabel ( fixture : ComponentFixture < unknown > ) : HTMLElement {
1057
1058
return fixture . nativeElement . querySelector ( '.mdc-tab--active' ) ;
1058
1059
}
1059
1060
1060
- function getSelectedContent ( fixture : ComponentFixture < any > ) : HTMLElement {
1061
+ function getSelectedContent ( fixture : ComponentFixture < unknown > ) : HTMLElement {
1061
1062
return fixture . nativeElement . querySelector ( '.mat-mdc-tab-body-active' ) ;
1062
1063
}
1063
1064
} ) ;
@@ -1291,18 +1292,18 @@ class SimpleTabsTestApp {
1291
1292
@ViewChild ( MatTabGroup ) tabGroup : MatTabGroup ;
1292
1293
@ViewChildren ( MatTab ) tabs : QueryList < MatTab > ;
1293
1294
selectedIndex : number = 1 ;
1294
- focusEvent : any ;
1295
- selectEvent : any ;
1295
+ focusEvent : MatTabChangeEvent ;
1296
+ selectEvent : MatTabChangeEvent ;
1296
1297
disableRipple : boolean = false ;
1297
1298
contentTabIndex : number | null = null ;
1298
1299
headerPosition : MatTabHeaderPosition = 'above' ;
1299
1300
ariaLabel : string ;
1300
1301
ariaLabelledby : string ;
1301
1302
secondTabId : string | null = null ;
1302
- handleFocus ( event : any ) {
1303
+ handleFocus ( event : MatTabChangeEvent ) {
1303
1304
this . focusEvent = event ;
1304
1305
}
1305
- handleSelection ( event : any ) {
1306
+ handleSelection ( event : MatTabChangeEvent ) {
1306
1307
this . selectEvent = event ;
1307
1308
}
1308
1309
animationDone ( ) { }
@@ -1332,13 +1333,13 @@ class SimpleDynamicTabsTestApp {
1332
1333
{ label : 'Label 3' , content : 'Content 3' } ,
1333
1334
] ;
1334
1335
selectedIndex : number = 1 ;
1335
- focusEvent : any ;
1336
- selectEvent : any ;
1336
+ focusEvent : MatTabChangeEvent ;
1337
+ selectEvent : MatTabChangeEvent ;
1337
1338
disablePagination = false ;
1338
- handleFocus ( event : any ) {
1339
+ handleFocus ( event : MatTabChangeEvent ) {
1339
1340
this . focusEvent = event ;
1340
1341
}
1341
- handleSelection ( event : any ) {
1342
+ handleSelection ( event : MatTabChangeEvent ) {
1342
1343
this . selectEvent = event ;
1343
1344
}
1344
1345
}
@@ -1412,11 +1413,11 @@ class AsyncTabsTestApp implements OnInit {
1412
1413
{ label : 'two' , content : 'two' } ,
1413
1414
] ;
1414
1415
1415
- tabs : Observable < any > ;
1416
+ tabs : Observable < typeof this . _tabs > ;
1416
1417
1417
1418
ngOnInit ( ) {
1418
1419
// Use ngOnInit because there is some issue with scheduling the async task in the constructor.
1419
- this . tabs = new Observable ( ( observer : any ) => {
1420
+ this . tabs = new Observable ( ( observer : Subscriber < typeof this . _tabs > ) => {
1420
1421
setTimeout ( ( ) => observer . next ( this . _tabs ) ) ;
1421
1422
} ) ;
1422
1423
}
@@ -1437,7 +1438,7 @@ class TabGroupWithSimpleApi {
1437
1438
preserveContent = false ;
1438
1439
otherLabel = 'Fruit' ;
1439
1440
otherContent = 'Apples, grapes' ;
1440
- @ViewChild ( 'legumes' ) legumes : any ;
1441
+ @ViewChild ( 'legumes' ) legumes : HTMLParagraphElement ;
1441
1442
}
1442
1443
1443
1444
@Component ( {
0 commit comments