diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts index bcb90de89bac..33a69a05834e 100644 --- a/src/lib/menu/menu-directive.ts +++ b/src/lib/menu/menu-directive.ts @@ -191,7 +191,7 @@ export class MatMenu implements OnInit, AfterContentInit, MatMenuPanel, OnDestro * menu template that displays in the overlay container. Otherwise, it's difficult * to style the containing menu from outside the component. * @deprecated Use `panelClass` instead. - * @deletion-target 6.0.0 + * @deletion-target 7.0.0 */ @Input() get classList(): string { return this.panelClass; } @@ -204,7 +204,7 @@ export class MatMenu implements OnInit, AfterContentInit, MatMenuPanel, OnDestro /** * Event emitted when the menu is closed. * @deprecated Switch to `closed` instead - * @deletion-target 6.0.0 + * @deletion-target 7.0.0 */ @Output() close = this.closed; @@ -318,13 +318,13 @@ export class MatMenu implements OnInit, AfterContentInit, MatMenuPanel, OnDestro /** Starts the enter animation. */ _startAnimation() { - // @deletion-target 6.0.0 Combine with _resetAnimation. + // @deletion-target 7.0.0 Combine with _resetAnimation. this._panelAnimationState = 'enter'; } /** Resets the panel animation to its initial state. */ _resetAnimation() { - // @deletion-target 6.0.0 Combine with _startAnimation. + // @deletion-target 7.0.0 Combine with _startAnimation. this._panelAnimationState = 'void'; } diff --git a/src/lib/menu/menu-item.ts b/src/lib/menu/menu-item.ts index 3af299b28231..d4062f9d4db9 100644 --- a/src/lib/menu/menu-item.ts +++ b/src/lib/menu/menu-item.ts @@ -72,7 +72,7 @@ export class MatMenuItem extends _MatMenuItemMixinBase @Inject(DOCUMENT) document?: any, private _focusMonitor?: FocusMonitor) { - // @deletion-target 6.0.0 make `_focusMonitor` and `document` required params. + // @deletion-target 7.0.0 make `_focusMonitor` and `document` required params. super(); if (_focusMonitor) { diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts index dba1fdc587c2..5531ffc26bf8 100644 --- a/src/lib/menu/menu-trigger.ts +++ b/src/lib/menu/menu-trigger.ts @@ -84,7 +84,7 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy { /** * @deprecated - * @deletion-target 6.0.0 + * @deletion-target 7.0.0 */ @Input('mat-menu-trigger-for') get _deprecatedMatMenuTriggerFor(): MatMenuPanel { @@ -107,7 +107,7 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy { /** * Event emitted when the associated menu is opened. * @deprecated Switch to `menuOpened` instead - * @deletion-target 6.0.0 + * @deletion-target 7.0.0 */ @Output() readonly onMenuOpen: EventEmitter = this.menuOpened; @@ -117,7 +117,7 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy { /** * Event emitted when the associated menu is closed. * @deprecated Switch to `menuClosed` instead - * @deletion-target 6.0.0 + * @deletion-target 7.0.0 */ @Output() readonly onMenuClose: EventEmitter = this.menuClosed; @@ -129,6 +129,7 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy { @Optional() @Self() private _menuItemInstance: MatMenuItem, @Optional() private _dir: Directionality, // TODO(crisbeto): make the _focusMonitor required when doing breaking changes. + // @deletion-target 7.0.0 private _focusMonitor?: FocusMonitor) { if (_menuItemInstance) {