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

fix(ivy): properly coalesce event handler in presence of queries (#29957)

Browse Source 
The `TNode.cleanup` data structure can contain sequences of 4-element
sequence of entries (event handlers, directive outputs) mixed with
2-element sequence of entries (QueryList cleanup). Before this fix
we would always skip 4 elements in the `TNode.cleanup` while looking
up event handler cleanups. 4-element skips are not correct in case
of query cleanup presence and this commit corrects the algorithm to
jump 4 or 2 elements depending on a type of cleanup encountered.

PR Close #29957
This commit is contained in:
Pawel Kozlowski
2019-04-17 15:28:54 +02:00
committed by Ben Lesh
parent 1a56cd5c0b
commit 5fee9daa5b
2 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/core/src/render3/instructions/listener.ts
View File

@ -75,7 +75,8 @@ function findExistingListener(
const tCleanup = tView.cleanup;
if (tCleanup != null) {
for (let i = 0; i < tCleanup.length - 1; i += 2) {
if (tCleanup[i] === eventName && tCleanup[i + 1] === tNodeIdx) {
const cleanupEventName = tCleanup[i];
if (cleanupEventName === eventName && tCleanup[i + 1] === tNodeIdx) {
// We have found a matching event name on the same node but it might not have been
// registered yet, so we must explicitly verify entries in the LView cleanup data
// structures.
@ -88,7 +89,9 @@ function findExistingListener(
// blocks of 4 or 2 items in the tView.cleanup and this is why we iterate over 2 elements
// first and jump another 2 elements if we detect listeners cleanup (4 elements). Also check
// documentation of TView.cleanup for more details of this data structure layout.
i += 2;
if (typeof cleanupEventName === 'string') {
i += 2;
}
}
}
return null;