Skip to content

Commit cd30c6b

Browse files
committed
chore: remove internal usages of deprecated APIs
Removes some internal usages of APIs that we've marked as deprecated, but which have stable equivalents. Doesn't include logic that's in place for backward compatibility.
1 parent b090f6d commit cd30c6b

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

src/cdk/a11y/key-manager/list-key-manager.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ describe('Key managers', () => {
759759
expect(keyManager.activeItemIndex)
760760
.toBe(0, `Expected first item of the list to be active.`);
761761

762-
keyManager.updateActiveItemIndex(1);
762+
keyManager.updateActiveItem(1);
763763
expect(keyManager.activeItemIndex)
764764
.toBe(1, `Expected activeItemIndex to update after calling updateActiveItemIndex().`);
765765
expect(itemList.items[1].focus).not.toHaveBeenCalledTimes(1);

src/cdk/table/table.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1612,7 +1612,7 @@ class WrapperCdkTableApp<T> implements AfterContentInit {
16121612
// Register the content's column, row, and header row definitions.
16131613
this.columnDefs.forEach(columnDef => this.table.addColumnDef(columnDef));
16141614
this.rowDefs.forEach(rowDef => this.table.addRowDef(rowDef));
1615-
this.table.setHeaderRowDef(this.headerRowDef);
1615+
this.table.addHeaderRowDef(this.headerRowDef);
16161616
}
16171617
}
16181618

src/lib/menu/menu-directive.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ export class MatMenu implements AfterContentInit, MatMenuPanel<MatMenuItem>, OnD
232232

233233
ngAfterContentInit() {
234234
this._keyManager = new FocusKeyManager<MatMenuItem>(this._items).withWrap().withTypeAhead();
235-
this._tabSubscription = this._keyManager.tabOut.subscribe(() => this.close.emit('tab'));
235+
this._tabSubscription = this._keyManager.tabOut.subscribe(() => this.closed.emit('tab'));
236236
}
237237

238238
ngOnDestroy() {

src/lib/menu/menu-trigger.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy {
433433
private _menuClosingActions() {
434434
const backdrop = this._overlayRef!.backdropClick();
435435
const detachments = this._overlayRef!.detachments();
436-
const parentClose = this._parentMenu ? this._parentMenu.close : observableOf();
436+
const parentClose = this._parentMenu ? this._parentMenu.closed : observableOf();
437437
const hover = this._parentMenu ? this._parentMenu._hovered().pipe(
438438
filter(active => active !== this._menuItemInstance),
439439
filter(() => this._menuOpen)

src/lib/menu/menu.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1643,7 +1643,7 @@ class CustomMenu {
16431643
[matMenuTriggerFor]="levelTwo"
16441644
#alternateTrigger="matMenuTrigger">Toggle alternate menu</button>
16451645
1646-
<mat-menu #root="matMenu" (close)="rootCloseCallback($event)">
1646+
<mat-menu #root="matMenu" (closed)="rootCloseCallback($event)">
16471647
<button mat-menu-item
16481648
id="level-one-trigger"
16491649
[matMenuTriggerFor]="levelOne"
@@ -1656,7 +1656,7 @@ class CustomMenu {
16561656
#lazyTrigger="matMenuTrigger">Three</button>
16571657
</mat-menu>
16581658
1659-
<mat-menu #levelOne="matMenu" (close)="levelOneCloseCallback($event)">
1659+
<mat-menu #levelOne="matMenu" (closed)="levelOneCloseCallback($event)">
16601660
<button mat-menu-item>Four</button>
16611661
<button mat-menu-item
16621662
id="level-two-trigger"
@@ -1665,7 +1665,7 @@ class CustomMenu {
16651665
<button mat-menu-item>Six</button>
16661666
</mat-menu>
16671667
1668-
<mat-menu #levelTwo="matMenu" (close)="levelTwoCloseCallback($event)">
1668+
<mat-menu #levelTwo="matMenu" (closed)="levelTwoCloseCallback($event)">
16691669
<button mat-menu-item>Seven</button>
16701670
<button mat-menu-item>Eight</button>
16711671
<button mat-menu-item>Nine</button>

src/lib/snack-bar/snack-bar.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,17 +317,17 @@ describe('MatSnackBar', () => {
317317
}));
318318

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

324-
snackBarRef.afterDismissed().subscribe(closeSpy);
324+
snackBarRef.afterDismissed().subscribe(dismissSpy);
325325

326-
snackBarRef.closeWithAction();
326+
snackBarRef.dismissWithAction();
327327
viewContainerFixture.detectChanges();
328328
tick();
329329

330-
expect(closeSpy).toHaveBeenCalledWith(jasmine.objectContaining({dismissedByAction: true}));
330+
expect(dismissSpy).toHaveBeenCalledWith(jasmine.objectContaining({dismissedByAction: true}));
331331
tick(500);
332332
}));
333333

0 commit comments

Comments
 (0)