From 1e561f9d8672f68191938677d9170e01e830f773 Mon Sep 17 00:00:00 2001 From: Pawel Kozlowski Date: Mon, 14 Nov 2022 17:07:11 +0100 Subject: [PATCH] refactor(core): remove usage of the useCapture arg to the listener instruction (#48046) The useCapture argument of the listener instruction was only meaningful in the Renderer3 case. Since the Renderer3 code was removed this argument has no use. Note that we can perform additional cleanup and remove the useCapture argument from the listener instruction (this would require change to the instruction signature, though). PR Close #48046 --- packages/core/src/render3/instructions/listener.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/core/src/render3/instructions/listener.ts b/packages/core/src/render3/instructions/listener.ts index 04e86927ca5..76c96e2c658 100644 --- a/packages/core/src/render3/instructions/listener.ts +++ b/packages/core/src/render3/instructions/listener.ts @@ -9,7 +9,7 @@ import {assertIndexInRange} from '../../util/assert'; import {isObservable} from '../../util/lang'; -import {PropertyAliasValue, TNode, TNodeFlags, TNodeType} from '../interfaces/node'; +import {PropertyAliasValue, TNode, TNodeType} from '../interfaces/node'; import {GlobalTargetResolver, Renderer} from '../interfaces/renderer'; import {RElement} from '../interfaces/renderer_dom'; import {isDirectiveHost} from '../interfaces/type_checks'; @@ -31,7 +31,8 @@ import {getOrCreateLViewCleanup, getOrCreateTViewCleanup, handleError, loadCompo * * @param eventName Name of the event * @param listenerFn The function to be called when event emits - * @param useCapture Whether or not to use capture in event listener + * @param useCapture Whether or not to use capture in event listener - this argument is a reminder + * from the Renderer3 infrastructure and should be removed from the instruction arguments * @param eventTargetResolver Function that returns global target information in case this listener * should be attached to a global object like window, document or body * @@ -44,8 +45,7 @@ export function ɵɵlistener( const tView = getTView(); const tNode = getCurrentTNode()!; listenerInternal( - tView, lView, lView[RENDERER], tNode, eventName, listenerFn, !!useCapture, - eventTargetResolver); + tView, lView, lView[RENDERER], tNode, eventName, listenerFn, eventTargetResolver); return ɵɵlistener; } @@ -77,7 +77,7 @@ export function ɵɵsyntheticHostListener( const tView = getTView(); const currentDef = getCurrentDirectiveDef(tView.data); const renderer = loadComponentRenderer(currentDef, tNode, lView); - listenerInternal(tView, lView, renderer, tNode, eventName, listenerFn, false); + listenerInternal(tView, lView, renderer, tNode, eventName, listenerFn); return ɵɵsyntheticHostListener; } @@ -115,8 +115,7 @@ function findExistingListener( function listenerInternal( tView: TView, lView: LView<{}|null>, renderer: Renderer, tNode: TNode, eventName: string, - listenerFn: (e?: any) => any, useCapture: boolean, - eventTargetResolver?: GlobalTargetResolver): void { + listenerFn: (e?: any) => any, eventTargetResolver?: GlobalTargetResolver): void { const isTNodeDirectiveHost = isDirectiveHost(tNode); const firstCreatePass = tView.firstCreatePass; const tCleanup: false|any[] = firstCreatePass && getOrCreateTViewCleanup(tView);