Skip to content
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/cdk/a11y/key-manager/list-key-manager.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ describe('Key managers', () => {
expect(keyManager.activeItemIndex)
.toBe(0, `Expected first item of the list to be active.`);

keyManager.updateActiveItemIndex(1);
keyManager.updateActiveItem(1);
expect(keyManager.activeItemIndex)
.toBe(1, `Expected activeItemIndex to update after calling updateActiveItemIndex().`);
expect(itemList.items[1].focus).not.toHaveBeenCalledTimes(1);
Expand Down
2 changes: 1 addition & 1 deletion src/cdk/table/table.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1612,7 +1612,7 @@ class WrapperCdkTableApp<T> implements AfterContentInit {
// Register the content's column, row, and header row definitions.
this.columnDefs.forEach(columnDef => this.table.addColumnDef(columnDef));
this.rowDefs.forEach(rowDef => this.table.addRowDef(rowDef));
this.table.setHeaderRowDef(this.headerRowDef);
this.table.addHeaderRowDef(this.headerRowDef);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/lib/menu/menu-directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ export class MatMenu implements AfterContentInit, MatMenuPanel<MatMenuItem>, OnD

ngAfterContentInit() {
this._keyManager = new FocusKeyManager<MatMenuItem>(this._items).withWrap().withTypeAhead();
this._tabSubscription = this._keyManager.tabOut.subscribe(() => this.close.emit('tab'));
this._tabSubscription = this._keyManager.tabOut.subscribe(() => this.closed.emit('tab'));
}

ngOnDestroy() {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/menu/menu-trigger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy {
private _menuClosingActions() {
const backdrop = this._overlayRef!.backdropClick();
const detachments = this._overlayRef!.detachments();
const parentClose = this._parentMenu ? this._parentMenu.close : observableOf();
const parentClose = this._parentMenu ? this._parentMenu.closed : observableOf();
const hover = this._parentMenu ? this._parentMenu._hovered().pipe(
filter(active => active !== this._menuItemInstance),
filter(() => this._menuOpen)
Expand Down
6 changes: 3 additions & 3 deletions src/lib/menu/menu.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1643,7 +1643,7 @@ class CustomMenu {
[matMenuTriggerFor]="levelTwo"
#alternateTrigger="matMenuTrigger">Toggle alternate menu</button>

<mat-menu #root="matMenu" (close)="rootCloseCallback($event)">
<mat-menu #root="matMenu" (closed)="rootCloseCallback($event)">
<button mat-menu-item
id="level-one-trigger"
[matMenuTriggerFor]="levelOne"
Expand All @@ -1656,7 +1656,7 @@ class CustomMenu {
#lazyTrigger="matMenuTrigger">Three</button>
</mat-menu>

<mat-menu #levelOne="matMenu" (close)="levelOneCloseCallback($event)">
<mat-menu #levelOne="matMenu" (closed)="levelOneCloseCallback($event)">
<button mat-menu-item>Four</button>
<button mat-menu-item
id="level-two-trigger"
Expand All @@ -1665,7 +1665,7 @@ class CustomMenu {
<button mat-menu-item>Six</button>
</mat-menu>

<mat-menu #levelTwo="matMenu" (close)="levelTwoCloseCallback($event)">
<mat-menu #levelTwo="matMenu" (closed)="levelTwoCloseCallback($event)">
<button mat-menu-item>Seven</button>
<button mat-menu-item>Eight</button>
<button mat-menu-item>Nine</button>
Expand Down
8 changes: 4 additions & 4 deletions src/lib/snack-bar/snack-bar.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -317,17 +317,17 @@ describe('MatSnackBar', () => {
}));

it('should indicate in `afterClosed` whether it was dismissed by an action', fakeAsync(() => {
const closeSpy = jasmine.createSpy('dismiss spy');
const dismissSpy = jasmine.createSpy('dismiss spy');
const snackBarRef = snackBar.open('Some content');
viewContainerFixture.detectChanges();

snackBarRef.afterDismissed().subscribe(closeSpy);
snackBarRef.afterDismissed().subscribe(dismissSpy);

snackBarRef.closeWithAction();
snackBarRef.dismissWithAction();
viewContainerFixture.detectChanges();
tick();

expect(closeSpy).toHaveBeenCalledWith(jasmine.objectContaining({dismissedByAction: true}));
expect(dismissSpy).toHaveBeenCalledWith(jasmine.objectContaining({dismissedByAction: true}));
tick(500);
}));

Expand Down