Skip to content

Commit 0a25fca

Browse files
benleshjelbourn
authored andcommitted
fix(typings): update typings to support more strict typings in RxJS 6.3.2 (#12979)
1 parent 9886b1b commit 0a25fca

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/lib/progress-bar/progress-bar.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ export class MatProgressBar extends _MatProgressBarMixinBase implements CanColor
191191
// instead only on the animation that we care about (primary value bar's transitionend)
192192
this._ngZone.runOutsideAngular((() => {
193193
this._animationEndSubscription =
194-
fromEvent(this._primaryValueBar.nativeElement, 'transitionend')
194+
fromEvent<TransitionEvent>(this._primaryValueBar.nativeElement, 'transitionend')
195195
.pipe(filter(((e: TransitionEvent) =>
196196
e.target === this._primaryValueBar.nativeElement)))
197197
.subscribe(_ => this._ngZone.run(() => this.emitAnimationEnd()));

src/lib/table/table-data-source.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,11 @@ export class MatTableDataSource<T> extends DataSource<T> {
200200
// The `sortChange` and `pageChange` acts as a signal to the combineLatests below so that the
201201
// pipeline can progress to the next step. Note that the value from these streams are not used,
202202
// 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) :
205205
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) :
208208
observableOf(null);
209209

210210
const dataStream = this._data;

0 commit comments

Comments
 (0)