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

refactor(ivy): drop loadRendererFn argument from the listener instruction (#32495)

Browse Source 
PR Close #32495
This commit is contained in:
Pawel Kozlowski 2019-09-05 15:00:28 +02:00 committed by Kara Erickson
parent 51292e27c9
commit f06505aafd
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,10 @@ import {BindingDirection, generatePropertyAliases, getCleanup, handleError, load
export function ɵɵlistener( export function ɵɵlistener(
eventName: string, listenerFn: (e?: any) => any, useCapture = false, eventName: string, listenerFn: (e?: any) => any, useCapture = false,
eventTargetResolver?: GlobalTargetResolver): void { eventTargetResolver?: GlobalTargetResolver): void {
listenerInternal(eventName, listenerFn, useCapture, eventTargetResolver); const lView = getLView();
const tNode = getPreviousOrParentTNode();
listenerInternal(
lView, lView[RENDERER], tNode, eventName, listenerFn, useCapture, eventTargetResolver);
} }
/** /**
@ -64,7 +67,10 @@ export function ɵɵlistener(
export function ɵɵcomponentHostSyntheticListener( export function ɵɵcomponentHostSyntheticListener(
eventName: string, listenerFn: (e?: any) => any, useCapture = false, eventName: string, listenerFn: (e?: any) => any, useCapture = false,
eventTargetResolver?: GlobalTargetResolver): void { eventTargetResolver?: GlobalTargetResolver): void {
listenerInternal(eventName, listenerFn, useCapture, eventTargetResolver, loadComponentRenderer); const lView = getLView();
const tNode = getPreviousOrParentTNode();
const renderer = loadComponentRenderer(tNode, lView);
listenerInternal(lView, renderer, tNode, eventName, listenerFn, useCapture, eventTargetResolver);
} }
/** /**
@ -101,11 +107,9 @@ function findExistingListener(
} }
function listenerInternal( function listenerInternal(
eventName: string, listenerFn: (e?: any) => any, useCapture = false, lView: LView, renderer: Renderer3, tNode: TNode, eventName: string,
eventTargetResolver?: GlobalTargetResolver, listenerFn: (e?: any) => any, useCapture = false,
loadRendererFn?: ((tNode: TNode, lView: LView) => Renderer3) | null): void { eventTargetResolver?: GlobalTargetResolver): void {
const lView = getLView();
const tNode = getPreviousOrParentTNode();
const tView = lView[TVIEW]; const tView = lView[TVIEW];
const firstTemplatePass = tView.firstTemplatePass; const firstTemplatePass = tView.firstTemplatePass;
const tCleanup: false|any[] = firstTemplatePass && (tView.cleanup || (tView.cleanup = [])); const tCleanup: false|any[] = firstTemplatePass && (tView.cleanup || (tView.cleanup = []));
@ -120,7 +124,6 @@ function listenerInternal(
const native = getNativeByTNode(tNode, lView) as RElement; const native = getNativeByTNode(tNode, lView) as RElement;
const resolved = eventTargetResolver ? eventTargetResolver(native) : EMPTY_OBJ as any; const resolved = eventTargetResolver ? eventTargetResolver(native) : EMPTY_OBJ as any;
const target = resolved.target || native; const target = resolved.target || native;
const renderer = loadRendererFn ? loadRendererFn(tNode, lView) : lView[RENDERER];
const lCleanup = getCleanup(lView); const lCleanup = getCleanup(lView);
const lCleanupIndex = lCleanup.length; const lCleanupIndex = lCleanup.length;
const idxOrTargetGetter = eventTargetResolver ? const idxOrTargetGetter = eventTargetResolver ?