From 3e9f91699cc54010e84b1c304d29eace8a403acb Mon Sep 17 00:00:00 2001
From: Kara Erickson <karakara@google.com>
Date: Tue, 19 Feb 2019 17:21:31 -0800
Subject: [PATCH] chore(ivy): add static flag to tab-related static queries

---
 src/lib/tabs/tab-header.spec.ts         | 2 +-
 src/lib/tabs/tab-header.ts              | 6 +++---
 src/lib/tabs/tab-nav-bar/tab-nav-bar.ts | 2 +-
 src/lib/tabs/tab.ts                     | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/lib/tabs/tab-header.spec.ts b/src/lib/tabs/tab-header.spec.ts
index b5aaa2a08485..8544d3028fc4 100644
--- a/src/lib/tabs/tab-header.spec.ts
+++ b/src/lib/tabs/tab-header.spec.ts
@@ -418,7 +418,7 @@ class SimpleTabHeaderApp {
   tabs: Tab[] = [{label: 'tab one'}, {label: 'tab one'}, {label: 'tab one'}, {label: 'tab one'}];
   dir: Direction = 'ltr';
 
-  @ViewChild(MatTabHeader) tabHeader: MatTabHeader;
+  @ViewChild(MatTabHeader, {static: true}) tabHeader: MatTabHeader;
 
   constructor() {
     this.tabs[this.disabledTabIndex].disabled = true;
diff --git a/src/lib/tabs/tab-header.ts b/src/lib/tabs/tab-header.ts
index dddcc37e765b..babb17699d99 100644
--- a/src/lib/tabs/tab-header.ts
+++ b/src/lib/tabs/tab-header.ts
@@ -80,9 +80,9 @@ export class MatTabHeader extends _MatTabHeaderMixinBase
     implements AfterContentChecked, AfterContentInit, OnDestroy, CanDisableRipple {
 
   @ContentChildren(MatTabLabelWrapper) _labelWrappers: QueryList<MatTabLabelWrapper>;
-  @ViewChild(MatInkBar) _inkBar: MatInkBar;
-  @ViewChild('tabListContainer') _tabListContainer: ElementRef;
-  @ViewChild('tabList') _tabList: ElementRef;
+  @ViewChild(MatInkBar, {static: true}) _inkBar: MatInkBar;
+  @ViewChild('tabListContainer', {static: true}) _tabListContainer: ElementRef;
+  @ViewChild('tabList', {static: true}) _tabList: ElementRef;
 
   /** The distance in pixels that the tab labels should be translated to the left. */
   private _scrollDistance = 0;
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
index 2a6eeb2452de..e601c1c2bf50 100644
--- a/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
+++ b/src/lib/tabs/tab-nav-bar/tab-nav-bar.ts
@@ -81,7 +81,7 @@ export class MatTabNav extends _MatTabNavMixinBase
   private _activeLinkChanged: boolean;
   private _activeLinkElement: ElementRef<HTMLElement> | null;
 
-  @ViewChild(MatInkBar) _inkBar: MatInkBar;
+  @ViewChild(MatInkBar, {static: true}) _inkBar: MatInkBar;
 
   /** Query list of all tab links of the tab navigation. */
   @ContentChildren(forwardRef(() => MatTabLink), {descendants: true})
diff --git a/src/lib/tabs/tab.ts b/src/lib/tabs/tab.ts
index f8d41a990ec2..69553e2c434b 100644
--- a/src/lib/tabs/tab.ts
+++ b/src/lib/tabs/tab.ts
@@ -49,10 +49,10 @@ export class MatTab extends _MatTabMixinBase implements OnInit, CanDisable, OnCh
   /**
    * Template provided in the tab content that will be used if present, used to enable lazy-loading
    */
-  @ContentChild(MatTabContent, {read: TemplateRef}) _explicitContent: TemplateRef<any>;
+  @ContentChild(MatTabContent, {read: TemplateRef, static: true}) _explicitContent: TemplateRef<any>;
 
   /** Template inside the MatTab view that contains an `<ng-content>`. */
-  @ViewChild(TemplateRef) _implicitContent: TemplateRef<any>;
+  @ViewChild(TemplateRef, {static: true}) _implicitContent: TemplateRef<any>;
 
   /** Plain text label for the tab, used when there is no template label. */
   @Input('label') textLabel: string = '';