Skip to content

fix(typings): update typings to support more strict typings in RxJS 6… #12979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 10, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/progress-bar/progress-bar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ export class MatProgressBar extends _MatProgressBarMixinBase implements CanColor
// instead only on the animation that we care about (primary value bar's transitionend)
this._ngZone.runOutsideAngular((() => {
this._animationEndSubscription =
fromEvent(this._primaryValueBar.nativeElement, 'transitionend')
fromEvent<TransitionEvent>(this._primaryValueBar.nativeElement, 'transitionend')
.pipe(filter(((e: TransitionEvent) =>
e.target === this._primaryValueBar.nativeElement)))
.subscribe(_ => this._ngZone.run(() => this.emitAnimationEnd()));
Expand Down
8 changes: 4 additions & 4 deletions src/lib/table/table-data-source.ts
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,11 @@ export class MatTableDataSource<T> extends DataSource<T> {
// The `sortChange` and `pageChange` acts as a signal to the combineLatests below so that the
// pipeline can progress to the next step. Note that the value from these streams are not used,
// they purely act as a signal to progress in the pipeline.
const sortChange: Observable<Sort|null> = this._sort ?
merge<Sort>(this._sort.sortChange, this._sort.initialized) :
const sortChange: Observable<Sort|null|void> = this._sort ?
merge<Sort|void>(this._sort.sortChange, this._sort.initialized) :
observableOf(null);
const pageChange: Observable<PageEvent|null> = this._paginator ?
merge<PageEvent>(this._paginator.page, this._paginator.initialized) :
const pageChange: Observable<PageEvent|null|void> = this._paginator ?
merge<PageEvent|void>(this._paginator.page, this._paginator.initialized) :
observableOf(null);

const dataStream = this._data;
Expand Down