cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(query): set fixed @ViewChild / @ContentChild right after the view is created

Browse Source 
This is needed to have a true replacement of the previous
`DynamicComponentLoader.loadNextToLocation`, so that components
can be loaded into the view before change detection runs.

Closes #9040
This commit is contained in:
Tobias Bosch
2016-06-06 08:16:45 -07:00
parent 8847580fd7
commit c3d2459a4e
4 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/@angular/compiler/src/view_compiler/compile_query.ts
View File

@ -53,7 +53,11 @@ export class CompileQuery {
}
}
afterChildren(targetMethod: CompileMethod) {
private _isStatic(): boolean {
return !this._values.values.some(value => value instanceof ViewQueryValues);
}
afterChildren(targetStaticMethod, targetDynamicMethod: CompileMethod) {
var values = createQueryValues(this._values);
var updateStmts = [this.queryList.callMethod('reset', [o.literalArr(values)]).toStmt()];
if (isPresent(this.ownerDirectiveExpression)) {
@ -64,7 +68,15 @@ export class CompileQuery {
if (!this.meta.first) {
updateStmts.push(this.queryList.callMethod('notifyOnChanges', []).toStmt());
}
targetMethod.addStmt(new o.IfStmt(this.queryList.prop('dirty'), updateStmts));
if (this.meta.first && this._isStatic()) {
// for queries that don't change and the user asked for a single element,
// set it immediately. That is e.g. needed for querying for ViewContainerRefs, ...
// we don't do this for QueryLists for now as this would break the timing when
// we call QueryList listeners...
targetStaticMethod.addStmts(updateStmts);
} else {
targetDynamicMethod.addStmt(new o.IfStmt(this.queryList.prop('dirty'), updateStmts));
}
}
}