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

fix(ivy): correct query read logic after merges (#21749)

Browse Source 
PR Close #21749
This commit is contained in:
Pawel Kozlowski
2018-01-24 15:33:45 +01:00
committed by Misko Hevery
parent ab69f12e2c
commit 6245637e81
2 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
packages/core/src/render3/query.ts
View File

@ -226,8 +226,8 @@ function geIdxOfMatchingDirective(node: LNode, type: Type<any>): number|null {
}
function readFromNodeInjector(
nodeInjector: LInjector, node: LNode, read: QueryReadType<any>| Type<any>| null,
directiveIdx: number = -1): any {
nodeInjector: LInjector, node: LNode, read: QueryReadType<any>| Type<any>,
directiveIdx: number): any {
if (read instanceof ReadFromInjectorFn) {
return read.read(nodeInjector, node, directiveIdx);
} else {
@ -246,13 +246,12 @@ function add(predicate: QueryPredicate<any>| null, node: LNode) {
if (type) {
const directiveIdx = geIdxOfMatchingDirective(node, type);
if (directiveIdx !== null) {
if (predicate.read !== null) {
const requestedRead = readFromNodeInjector(nodeInjector, node, predicate.read);
if (requestedRead !== null) {
addMatch(predicate, requestedRead);
}
} else {
addMatch(predicate, node.view.data[directiveIdx]);
// a node is matching a predicate - determine what to read
// if read token and / or strategy is not specified, use type as read token
const result =
readFromNodeInjector(nodeInjector, node, predicate.read || type, directiveIdx);
if (result !== null) {
addMatch(predicate, result);
}
}
} else {
@ -260,15 +259,13 @@ function add(predicate: QueryPredicate<any>| null, node: LNode) {
for (let i = 0; i < selector.length; i++) {
ngDevMode && assertNotNull(node.tNode, 'node.tNode');
const directiveIdx = getIdxOfMatchingSelector(node.tNode !, selector[i]);
// is anything on a node matching a selector?
if (directiveIdx !== null) {
if (predicate.read !== null) {
const result = readFromNodeInjector(nodeInjector, node, predicate.read !, directiveIdx);
if (result !== null) {
addMatch(predicate, result);
}
} else {
addMatch(predicate, node.view.data[directiveIdx]);
// a node is matching a predicate - determine what to read
// note that queries using name selector must specify read strategy
ngDevMode && assertNotNull(predicate.read, 'predicate.read');
const result = readFromNodeInjector(nodeInjector, node, predicate.read !, directiveIdx);
if (result !== null) {
addMatch(predicate, result);
}
}
}