diff --git a/src/cdk/overlay/overlay-directives.ts b/src/cdk/overlay/overlay-directives.ts index 54dc66465dc..4128cdcf54a 100644 --- a/src/cdk/overlay/overlay-directives.ts +++ b/src/cdk/overlay/overlay-directives.ts @@ -95,7 +95,7 @@ export class CdkOverlayOrigin { }) export class CdkConnectedOverlay implements OnDestroy, OnChanges { private _overlayRef: OverlayRef; - private _templatePortal: TemplatePortal; + private _templatePortal: TemplatePortal; private _hasBackdrop = false; private _backdropSubscription = Subscription.EMPTY; private _positionSubscription = Subscription.EMPTY; diff --git a/src/cdk/overlay/overlay.spec.ts b/src/cdk/overlay/overlay.spec.ts index 01fc5400ed3..e896ad8dce2 100644 --- a/src/cdk/overlay/overlay.spec.ts +++ b/src/cdk/overlay/overlay.spec.ts @@ -20,7 +20,7 @@ import { describe('Overlay', () => { let overlay: Overlay; let componentPortal: ComponentPortal; - let templatePortal: TemplatePortal; + let templatePortal: TemplatePortal; let overlayContainerElement: HTMLElement; let overlayContainer: OverlayContainer; let viewContainerFixture: ComponentFixture; diff --git a/src/cdk/portal/portal-directives.ts b/src/cdk/portal/portal-directives.ts index 7bb40f3a206..c806a3ead58 100644 --- a/src/cdk/portal/portal-directives.ts +++ b/src/cdk/portal/portal-directives.ts @@ -31,7 +31,7 @@ import {Portal, TemplatePortal, ComponentPortal, BasePortalOutlet} from './porta selector: '[cdk-portal], [cdkPortal], [portal]', exportAs: 'cdkPortal', }) -export class CdkPortal extends TemplatePortal { +export class CdkPortal extends TemplatePortal { constructor(templateRef: TemplateRef, viewContainerRef: ViewContainerRef) { super(templateRef, viewContainerRef); } diff --git a/src/cdk/portal/portal.ts b/src/cdk/portal/portal.ts index 08947ca21ce..71442c5754b 100644 --- a/src/cdk/portal/portal.ts +++ b/src/cdk/portal/portal.ts @@ -107,22 +107,21 @@ export class ComponentPortal extends Portal> { /** * A `TemplatePortal` is a portal that represents some embedded template (TemplateRef). */ -export class TemplatePortal extends Portal { +export class TemplatePortal extends Portal { /** The embedded template that will be used to instantiate an embedded View in the host. */ templateRef: TemplateRef; /** Reference to the ViewContainer into which the template will be stamped out. */ viewContainerRef: ViewContainerRef; + /** Contextual data to be passed in to the embedded view. */ context: C | undefined; - constructor(template: TemplateRef, viewContainerRef: ViewContainerRef, context?: C) { + constructor(template: TemplateRef, viewContainerRef: ViewContainerRef, context?: C) { super(); this.templateRef = template; this.viewContainerRef = viewContainerRef; - if (context) { - this.context = context; - } + this.context = context; } get origin(): ElementRef { diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts index d5e0ef62473..6465f09a93b 100644 --- a/src/lib/autocomplete/autocomplete-trigger.ts +++ b/src/lib/autocomplete/autocomplete-trigger.ts @@ -117,7 +117,7 @@ export function getMatAutocompleteMissingPanelError(): Error { }) export class MatAutocompleteTrigger implements ControlValueAccessor, OnDestroy { private _overlayRef: OverlayRef | null; - private _portal: TemplatePortal; + private _portal: TemplatePortal; private _panelOpen: boolean = false; /** Strategy that is used to position the panel. */ diff --git a/src/lib/expansion/expansion-panel.ts b/src/lib/expansion/expansion-panel.ts index 68430edc519..18b81ac89fa 100644 --- a/src/lib/expansion/expansion-panel.ts +++ b/src/lib/expansion/expansion-panel.ts @@ -105,7 +105,7 @@ export class MatExpansionPanel extends _MatExpansionPanelMixinBase @ContentChild(MatExpansionPanelContent) _lazyContent: MatExpansionPanelContent; /** Portal holding the user's content. */ - _portal: TemplatePortal; + _portal: TemplatePortal; constructor(@Optional() @Host() accordion: MatAccordion, _changeDetectorRef: ChangeDetectorRef, @@ -144,7 +144,7 @@ export class MatExpansionPanel extends _MatExpansionPanelMixinBase filter(() => this.expanded && !this._portal), take(1) ).subscribe(() => { - this._portal = new TemplatePortal(this._lazyContent._template, this._viewContainerRef); + this._portal = new TemplatePortal(this._lazyContent._template, this._viewContainerRef); }); } } diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts index de3063f5723..4eb15f91203 100644 --- a/src/lib/menu/menu-trigger.ts +++ b/src/lib/menu/menu-trigger.ts @@ -83,7 +83,7 @@ export const MENU_PANEL_TOP_PADDING = 8; exportAs: 'matMenuTrigger' }) export class MatMenuTrigger implements AfterContentInit, OnDestroy { - private _portal: TemplatePortal; + private _portal: TemplatePortal; private _overlayRef: OverlayRef | null = null; private _menuOpen: boolean = false; private _closeSubscription = Subscription.EMPTY; diff --git a/src/lib/tabs/tab-body.spec.ts b/src/lib/tabs/tab-body.spec.ts index 58c9f81edbc..b461d98bfd6 100644 --- a/src/lib/tabs/tab-body.spec.ts +++ b/src/lib/tabs/tab-body.spec.ts @@ -156,7 +156,7 @@ describe('MatTabBody', () => { ` }) class SimpleTabBodyApp { - content: TemplatePortal; + content: TemplatePortal; position: number; origin: number; diff --git a/src/lib/tabs/tab-body.ts b/src/lib/tabs/tab-body.ts index bff34b8ceb9..595187d8a46 100644 --- a/src/lib/tabs/tab-body.ts +++ b/src/lib/tabs/tab-body.ts @@ -131,7 +131,7 @@ export class MatTabBody implements OnInit { @Output() _onCentered: EventEmitter = new EventEmitter(true); /** The tab body content to display. */ - @Input('content') _content: TemplatePortal; + @Input('content') _content: TemplatePortal; /** The shifted index position of the tab body, where zero represents the active center tab. */ @Input() diff --git a/src/lib/tabs/tab.ts b/src/lib/tabs/tab.ts index 193c334ee4e..bcb1a0edf98 100644 --- a/src/lib/tabs/tab.ts +++ b/src/lib/tabs/tab.ts @@ -52,10 +52,10 @@ export class MatTab extends _MatTabMixinBase implements OnInit, CanDisable, OnCh @Input('label') textLabel: string = ''; /** The portal that will be the hosted content of the tab */ - private _contentPortal: TemplatePortal | null = null; + private _contentPortal: TemplatePortal | null = null; /** @docs-private */ - get content(): TemplatePortal | null { + get content(): TemplatePortal | null { return this._contentPortal; }