File tree Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -191,7 +191,7 @@ export class MatProgressBar extends _MatProgressBarMixinBase implements CanColor
191
191
// instead only on the animation that we care about (primary value bar's transitionend)
192
192
this . _ngZone . runOutsideAngular ( ( ( ) => {
193
193
this . _animationEndSubscription =
194
- fromEvent ( this . _primaryValueBar . nativeElement , 'transitionend' )
194
+ fromEvent < TransitionEvent > ( this . _primaryValueBar . nativeElement , 'transitionend' )
195
195
. pipe ( filter ( ( ( e : TransitionEvent ) =>
196
196
e . target === this . _primaryValueBar . nativeElement ) ) )
197
197
. subscribe ( _ => this . _ngZone . run ( ( ) => this . emitAnimationEnd ( ) ) ) ;
Original file line number Diff line number Diff line change @@ -200,11 +200,11 @@ export class MatTableDataSource<T> extends DataSource<T> {
200
200
// The `sortChange` and `pageChange` acts as a signal to the combineLatests below so that the
201
201
// pipeline can progress to the next step. Note that the value from these streams are not used,
202
202
// they purely act as a signal to progress in the pipeline.
203
- const sortChange : Observable < Sort | null > = this . _sort ?
204
- merge < Sort > ( this . _sort . sortChange , this . _sort . initialized ) :
203
+ const sortChange : Observable < Sort | null | void > = this . _sort ?
204
+ merge < Sort | void > ( this . _sort . sortChange , this . _sort . initialized ) :
205
205
observableOf ( null ) ;
206
- const pageChange : Observable < PageEvent | null > = this . _paginator ?
207
- merge < PageEvent > ( this . _paginator . page , this . _paginator . initialized ) :
206
+ const pageChange : Observable < PageEvent | null | void > = this . _paginator ?
207
+ merge < PageEvent | void > ( this . _paginator . page , this . _paginator . initialized ) :
208
208
observableOf ( null ) ;
209
209
210
210
const dataStream = this . _data ;
You can’t perform that action at this time.
0 commit comments