From 83ecf4d12b8fd67f08191ab1cfe6187c31a63695 Mon Sep 17 00:00:00 2001 From: crisbeto Date: Thu, 3 Oct 2019 15:38:33 +0200 Subject: [PATCH] fix(tabs): avoid Ivy template type checking errors in tab link Follow-up from #17228. Adds a directive annotation to the `_MatTabLinkBase` because it was overlooked the last time around. --- src/material/tabs/tab-nav-bar/tab-nav-bar.ts | 4 ++++ src/material/tabs/tabs-module.ts | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/material/tabs/tab-nav-bar/tab-nav-bar.ts b/src/material/tabs/tab-nav-bar/tab-nav-bar.ts index 10a40f548f31..fe64f3b02a50 100644 --- a/src/material/tabs/tab-nav-bar/tab-nav-bar.ts +++ b/src/material/tabs/tab-nav-bar/tab-nav-bar.ts @@ -191,6 +191,10 @@ const _MatTabLinkMixinBase: mixinTabIndex(mixinDisableRipple(mixinDisabled(MatTabLinkMixinBase))); /** Base class with all of the `MatTabLink` functionality. */ +@Directive({ + // TODO(crisbeto): this selector can be removed when we update to Angular 9.0. + selector: 'do-not-use-abstract-mat-tab-link-base' +}) // tslint:disable-next-line:class-name export class _MatTabLinkBase extends _MatTabLinkMixinBase implements OnDestroy, CanDisable, CanDisableRipple, HasTabIndex, RippleTarget, FocusableOption { diff --git a/src/material/tabs/tabs-module.ts b/src/material/tabs/tabs-module.ts index 18689555bd26..70668b6fd815 100644 --- a/src/material/tabs/tabs-module.ts +++ b/src/material/tabs/tabs-module.ts @@ -20,7 +20,7 @@ import {MatTabGroup, _MatTabGroupBase} from './tab-group'; import {MatTabHeader, _MatTabHeaderBase} from './tab-header'; import {MatTabLabel} from './tab-label'; import {MatTabLabelWrapper} from './tab-label-wrapper'; -import {MatTabLink, MatTabNav, _MatTabNavBase} from './tab-nav-bar/tab-nav-bar'; +import {MatTabLink, MatTabNav, _MatTabNavBase, _MatTabLinkBase} from './tab-nav-bar/tab-nav-bar'; import {MatPaginatedTabHeader} from './paginated-tab-header'; @@ -62,6 +62,7 @@ import {MatPaginatedTabHeader} from './paginated-tab-header'; _MatTabNavBase as any, _MatTabBodyBase as any, _MatTabHeaderBase as any, + _MatTabLinkBase as any, ], }) export class MatTabsModule {}