fix(query): update view queries that query directives in embedded views

tbosch · alexeagle · commit 1f7a41c963b3 · 2016-01-28T14:40:53.000-08:00
Fixes #6747
diff --git a/modules/angular2/src/core/linker/element.ts b/modules/angular2/src/core/linker/element.ts
@@ -463,7 +463,11 @@ export class AppElement implements DependencyProvider, ElementRef, AfterViewChec
     var inj: AppElement = this;
     while (isPresent(inj)) {
       inj._setQueriesAsDirty();
-      inj = inj.parent;
+      if (isBlank(inj.parent) && isPresent(inj.parentView.containerAppElement)) {
+        inj = inj.parentView.containerAppElement;
+      } else {
+        inj = inj.parent;
+      }
     }
   }
 
diff --git a/modules/angular2/test/core/linker/query_integration_spec.ts b/modules/angular2/test/core/linker/query_integration_spec.ts
@@ -140,6 +140,35 @@ export function main() {
                });
          }));
 
+      it('should contain the first view child accross embedded views',
+         inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
+           var template = '<needs-view-child #q></needs-view-child>';
+           tcb.overrideTemplate(MyComp, template)
+               .overrideTemplate(
+                   NeedsViewChild,
+                   '<div *ngIf="true"><div *ngIf="shouldShow" text="foo"></div></div>')
+               .createAsync(MyComp)
+               .then((view) => {
+                 view.detectChanges();
+                 var q = view.debugElement.componentViewChildren[0].getLocal('q');
+
+                 expect(q.log).toEqual([["setter", "foo"], ["init", "foo"], ["check", "foo"]]);
+
+                 q.shouldShow = false;
+                 view.detectChanges();
+
+                 expect(q.log).toEqual([
+                   ["setter", "foo"],
+                   ["init", "foo"],
+                   ["check", "foo"],
+                   ["setter", null],
+                   ["check", null]
+                 ]);
+
+                 async.done();
+               });
+         }));
+
       it('should contain all directives in the light dom when descendants flag is used',
          inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
            var template = '<div text="1"></div>' +
@@ -741,7 +770,6 @@ class NeedsViewChild implements AfterViewInit,
   ngAfterViewChecked() { this.log.push(["check", isPresent(this.child) ? this.child.text : null]); }
 }
 
-
 @Directive({selector: '[dir]'})
 @Injectable()
 class InertDirective {

Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,11 @@ export class AppElement implements DependencyProvider, ElementRef, AfterViewChec`
`463`	`463`	`var inj: AppElement = this;`
`464`	`464`	`while (isPresent(inj)) {`
`465`	`465`	`inj._setQueriesAsDirty();`
`466`		`- inj = inj.parent;`
	`466`	`+ if (isBlank(inj.parent) && isPresent(inj.parentView.containerAppElement)) {`
	`467`	`+ inj = inj.parentView.containerAppElement;`
	`468`	`+ } else {`
	`469`	`+ inj = inj.parent;`
	`470`	`+ }`
`467`	`471`	`}`
`468`	`472`	`}`
`469`	`473`