Skip to content

Commit 2e7cfcb

Browse files
iterianialxhub
iteriani
authored and
alxhub
committed
refactor(core): Remove global event delegation code. (#57893)
This is no longer needed since we are no longer experimenting with it. PR Close #57893
1 parent e40a4fa commit 2e7cfcb

File tree

19 files changed

+5
-588
lines changed

19 files changed

+5
-588
lines changed

‎packages/core/src/core_private_export.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,7 @@ export {
7272
withI18nSupport as ɵwithI18nSupport,
7373
} from './hydration/api';
7474
export {withEventReplay as ɵwithEventReplay} from './hydration/event_replay';
75-
export {
76-
GLOBAL_EVENT_DELEGATION as ɵGLOBAL_EVENT_DELEGATION,
77-
JSACTION_EVENT_CONTRACT as ɵJSACTION_EVENT_CONTRACT,
78-
} from './event_delegation_utils';
79-
export {provideGlobalEventDelegation as ɵprovideGlobalEventDelegation} from './event_dispatch/event_delegation';
75+
export {JSACTION_EVENT_CONTRACT as ɵJSACTION_EVENT_CONTRACT} from './event_delegation_utils';
8076
export {IS_HYDRATION_DOM_REUSE_ENABLED as ɵIS_HYDRATION_DOM_REUSE_ENABLED} from './hydration/tokens';
8177
export {
8278
HydratedNode as ɵHydratedNode,

‎packages/core/src/event_delegation_utils.ts‎

Lines changed: 2 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,10 @@
77
*/
88

99
// tslint:disable:no-duplicate-imports
10-
import {
11-
EventContract,
12-
EventContractContainer,
13-
EventDispatcher,
14-
isEarlyEventType,
15-
getActionCache,
16-
registerDispatcher,
17-
} from '@angular/core/primitives/event-dispatch';
10+
import {EventContract} from '@angular/core/primitives/event-dispatch';
1811
import {Attribute} from '@angular/core/primitives/event-dispatch';
19-
import {Injectable, InjectionToken, Injector, inject} from './di';
12+
import {InjectionToken} from './di';
2013
import {RElement} from './render3/interfaces/renderer_dom';
21-
import {EVENT_REPLAY_ENABLED_DEFAULT, IS_EVENT_REPLAY_ENABLED} from './hydration/tokens';
22-
import {OnDestroy} from './interface/lifecycle_hooks';
2314

2415
declare global {
2516
interface Element {
@@ -71,60 +62,3 @@ export const JSACTION_EVENT_CONTRACT = new InjectionToken<EventContractDetails>(
7162
factory: () => ({}),
7263
},
7364
);
74-
75-
export const GLOBAL_EVENT_DELEGATION = new InjectionToken<GlobalEventDelegation>(
76-
ngDevMode ? 'GLOBAL_EVENT_DELEGATION' : '',
77-
);
78-
79-
/**
80-
* This class is the delegate for `EventDelegationPlugin`. It represents the
81-
* noop version of this class, with the enabled version set when
82-
* `provideGlobalEventDelegation` is called.
83-
*/
84-
@Injectable()
85-
export class GlobalEventDelegation implements OnDestroy {
86-
private eventContractDetails = inject(JSACTION_EVENT_CONTRACT);
87-
88-
ngOnDestroy() {
89-
this.eventContractDetails.instance?.cleanUp();
90-
}
91-
92-
supports(eventType: string): boolean {
93-
return isEarlyEventType(eventType);
94-
}
95-
96-
addEventListener(element: HTMLElement, eventType: string, handler: Function): Function {
97-
// Note: contrary to the type, Window and Document can be passed in
98-
// as well.
99-
if (element.nodeType === Node.ELEMENT_NODE) {
100-
this.eventContractDetails.instance!.addEvent(eventType);
101-
getActionCache(element)[eventType] = '';
102-
sharedStashFunction(element, eventType, handler);
103-
} else {
104-
element.addEventListener(eventType, handler as EventListener);
105-
}
106-
return () => this.removeEventListener(element, eventType, handler);
107-
}
108-
109-
removeEventListener(element: HTMLElement, eventType: string, callback: Function): void {
110-
if (element.nodeType === Node.ELEMENT_NODE) {
111-
getActionCache(element)[eventType] = undefined;
112-
} else {
113-
element.removeEventListener(eventType, callback as EventListener);
114-
}
115-
}
116-
}
117-
118-
export const initGlobalEventDelegation = (
119-
eventContractDetails: EventContractDetails,
120-
injector: Injector,
121-
) => {
122-
if (injector.get(IS_EVENT_REPLAY_ENABLED, EVENT_REPLAY_ENABLED_DEFAULT)) {
123-
return;
124-
}
125-
const eventContract = (eventContractDetails.instance = new EventContract(
126-
new EventContractContainer(document.body),
127-
));
128-
const dispatcher = new EventDispatcher(invokeRegisteredListeners, /** clickModSupport */ false);
129-
registerDispatcher(eventContract, dispatcher);
130-
};

‎packages/core/src/event_dispatch/event_delegation.ts‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎packages/core/src/hydration/event_replay.ts‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,7 @@ import {CLEANUP, LView, TView} from '../render3/interfaces/view';
2727
import {isPlatformBrowser} from '../render3/util/misc_utils';
2828
import {unwrapRNode} from '../render3/util/view_utils';
2929

30-
import {
31-
EVENT_REPLAY_ENABLED_DEFAULT,
32-
IS_EVENT_REPLAY_ENABLED,
33-
IS_GLOBAL_EVENT_DELEGATION_ENABLED,
34-
} from './tokens';
30+
import {EVENT_REPLAY_ENABLED_DEFAULT, IS_EVENT_REPLAY_ENABLED} from './tokens';
3531
import {
3632
sharedStashFunction,
3733
removeListeners,
@@ -47,18 +43,11 @@ import {performanceMarkFeature} from '../util/performance';
4743
*/
4844
const jsactionSet = new Set<Element>();
4945

50-
function isGlobalEventDelegationEnabled(injector: Injector) {
51-
return injector.get(IS_GLOBAL_EVENT_DELEGATION_ENABLED, false);
52-
}
53-
5446
/**
5547
* Determines whether Event Replay feature should be activated on the client.
5648
*/
5749
function shouldEnableEventReplay(injector: Injector) {
58-
return (
59-
injector.get(IS_EVENT_REPLAY_ENABLED, EVENT_REPLAY_ENABLED_DEFAULT) &&
60-
!isGlobalEventDelegationEnabled(injector)
61-
);
50+
return injector.get(IS_EVENT_REPLAY_ENABLED, EVENT_REPLAY_ENABLED_DEFAULT);
6251
}
6352

6453
/**

‎packages/core/src/hydration/tokens.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,3 @@ export const IS_EVENT_REPLAY_ENABLED = new InjectionToken<boolean>(
4949
);
5050

5151
export const EVENT_REPLAY_ENABLED_DEFAULT = false;
52-
53-
/**
54-
* Internal token that indicates whether global event delegation support is enabled.
55-
*/
56-
export const IS_GLOBAL_EVENT_DELEGATION_ENABLED = new InjectionToken<boolean>(
57-
typeof ngDevMode === 'undefined' || !!ngDevMode ? 'IS_GLOBAL_EVENT_DELEGATION_ENABLED' : '',
58-
);

‎packages/core/test/bundling/animations-standalone/bundle.golden_symbols.json‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,6 @@
179179
{
180180
"name": "DomAdapter"
181181
},
182-
{
183-
"name": "DomEventsPlugin"
184-
},
185182
{
186183
"name": "DomRendererFactory2"
187184
},
@@ -236,9 +233,6 @@
236233
{
237234
"name": "ErrorHandler"
238235
},
239-
{
240-
"name": "EventDelegationPlugin"
241-
},
242236
{
243237
"name": "EventEmitter"
244238
},
@@ -251,9 +245,6 @@
251245
{
252246
"name": "FALSE_BOOLEAN_VALUES"
253247
},
254-
{
255-
"name": "GLOBAL_EVENT_DELEGATION"
256-
},
257248
{
258249
"name": "GenericBrowserDomAdapter"
259250
},

‎packages/core/test/bundling/animations/bundle.golden_symbols.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,6 @@
257257
{
258258
"name": "ErrorHandler"
259259
},
260-
{
261-
"name": "EventDelegationPlugin"
262-
},
263260
{
264261
"name": "EventEmitter"
265262
},
@@ -272,9 +269,6 @@
272269
{
273270
"name": "FALSE_BOOLEAN_VALUES"
274271
},
275-
{
276-
"name": "GLOBAL_EVENT_DELEGATION"
277-
},
278272
{
279273
"name": "GenericBrowserDomAdapter"
280274
},

‎packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,6 @@
164164
{
165165
"name": "ErrorHandler"
166166
},
167-
{
168-
"name": "EventDelegationPlugin"
169-
},
170167
{
171168
"name": "EventEmitter"
172169
},
@@ -176,9 +173,6 @@
176173
{
177174
"name": "EventManagerPlugin"
178175
},
179-
{
180-
"name": "GLOBAL_EVENT_DELEGATION"
181-
},
182176
{
183177
"name": "GenericBrowserDomAdapter"
184178
},

‎packages/core/test/bundling/defer/bundle.golden_symbols.json‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,6 @@
197197
{
198198
"name": "ErrorHandler"
199199
},
200-
{
201-
"name": "EventDelegationPlugin"
202-
},
203200
{
204201
"name": "EventEmitter"
205202
},
@@ -209,9 +206,6 @@
209206
{
210207
"name": "EventManagerPlugin"
211208
},
212-
{
213-
"name": "GLOBAL_EVENT_DELEGATION"
214-
},
215209
{
216210
"name": "GenericBrowserDomAdapter"
217211
},
@@ -1436,9 +1430,6 @@
14361430
{
14371431
"name": "init_event_contract_defines"
14381432
},
1439-
{
1440-
"name": "init_event_delegation"
1441-
},
14421433
{
14431434
"name": "init_event_delegation_utils"
14441435
},

‎packages/core/test/bundling/forms_reactive/bundle.golden_symbols.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,6 @@
224224
{
225225
"name": "ErrorHandler"
226226
},
227-
{
228-
"name": "EventDelegationPlugin"
229-
},
230227
{
231228
"name": "EventEmitter"
232229
},
@@ -272,9 +269,6 @@
272269
{
273270
"name": "FormsExampleModule"
274271
},
275-
{
276-
"name": "GLOBAL_EVENT_DELEGATION"
277-
},
278272
{
279273
"name": "GenericBrowserDomAdapter"
280274
},

0 commit comments

Comments
 (0)