feat(platform-browser): expose EventManagerPlugin in the public API.

The exposed type of the `EVENT_MANAGER_PLUGINS` token should be in the public API.

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

@@ -971,6 +971,9 @@
   {
     "name": "getFactoryDef"
   },
+  {
+    "name": "getFactoryOf"
+  },
   {
     "name": "getFirstLContainer"
   },
@@ -1169,6 +1172,9 @@
   {
     "name": "isEnvironmentProviders"
   },
+  {
+    "name": "isForwardRef"
+  },
   {
     "name": "isFunction"
   },

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

@@ -740,6 +740,9 @@
   {
     "name": "getFactoryDef"
   },
+  {
+    "name": "getFactoryOf"
+  },
   {
     "name": "getFirstLContainer"
   },
@@ -917,6 +920,9 @@
   {
     "name": "isEnvironmentProviders"
   },
+  {
+    "name": "isForwardRef"
+  },
   {
     "name": "isFunction"
   },

packages/core/test/bundling/hydration/bundle.golden_symbols.json

@@ -809,6 +809,9 @@
   {
     "name": "getFactoryDef"
   },
+  {
+    "name": "getFactoryOf"
+  },
   {
     "name": "getFirstLContainer"
   },
@@ -980,6 +983,9 @@
   {
     "name": "isEnvironmentProviders"
   },
+  {
+    "name": "isForwardRef"
+  },
   {
     "name": "isFunction"
   },
@@ -1103,6 +1109,9 @@
   {
     "name": "ngZoneApplicationErrorHandlerFactory"
   },
+  {
+    "name": "noSideEffects"
+  },
   {
     "name": "nonNull"
   },

packages/core/test/bundling/router/bundle.golden_symbols.json

@@ -2102,6 +2102,9 @@
   {
     "name": "ɵɵelementStart"
   },
+  {
+    "name": "ɵɵgetInheritedFactory"
+  },
   {
     "name": "ɵɵinject"
   },

packages/core/test/bundling/standalone_bootstrap/bundle.golden_symbols.json

@@ -662,6 +662,9 @@
   {
     "name": "getFactoryDef"
   },
+  {
+    "name": "getFactoryOf"
+  },
   {
     "name": "getFirstLContainer"
   },
@@ -809,6 +812,9 @@
   {
     "name": "isEnvironmentProviders"
   },
+  {
+    "name": "isForwardRef"
+  },
   {
     "name": "isFunction"
   },
@@ -902,6 +908,9 @@
   {
     "name": "ngZoneApplicationErrorHandlerFactory"
   },
+  {
+    "name": "noSideEffects"
+  },
   {
     "name": "nonNull"
   },

packages/core/test/bundling/todo/bundle.golden_symbols.json

@@ -878,6 +878,9 @@
   {
     "name": "getFactoryDef"
   },
+  {
+    "name": "getFactoryOf"
+  },
   {
     "name": "getFirstLContainer"
   },
@@ -1103,6 +1106,9 @@
   {
     "name": "isEnvironmentProviders"
   },
+  {
+    "name": "isForwardRef"
+  },
   {
     "name": "isFunction"
   },

packages/core/test/render3/imported_renderer2.ts

@@ -17,10 +17,6 @@ import {EventManagerPlugin} from '@angular/platform-browser/src/dom/events/event
 import {isTextNode} from '@angular/platform-browser/testing/src/browser_util';
 
 export class SimpleDomEventsPlugin extends EventManagerPlugin {
-  constructor(doc: any) {
-    super(doc);
-  }
-
   override supports(eventName: string): boolean {
     return true;
   }
@@ -38,7 +34,7 @@ export class SimpleDomEventsPlugin extends EventManagerPlugin {
 
 export function getRendererFactory2(document: any): RendererFactory2 {
   const fakeNgZone: NgZone = new NoopNgZone();
-  const eventManager = new EventManager([new SimpleDomEventsPlugin(document)], fakeNgZone);
+  const eventManager = new EventManager([new SimpleDomEventsPlugin()], fakeNgZone);
   const appId = 'appid';
   const rendererFactory = new ɵDomRendererFactory2(
       eventManager, new ɵSharedStylesHost(document, appId), appId, true, document,

packages/platform-browser/src/dom/events/dom_events.ts

@@ -6,24 +6,20 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {DOCUMENT} from '@angular/common';
-import {Inject, Injectable} from '@angular/core';
+import {Injectable} from '@angular/core';
 
 import {EventManagerPlugin} from './event_manager';
 
 @Injectable()
 export class DomEventsPlugin extends EventManagerPlugin {
-  constructor(@Inject(DOCUMENT) doc: any) {
-    super(doc);
-  }
-
   // This plugin should come last in the list of plugins, because it accepts all
   // events.
   override supports(eventName: string): boolean {
     return true;
   }
 
-  override addEventListener(element: HTMLElement, eventName: string, handler: Function): Function {
+  override addEventListener(
+      element: HTMLElement, eventName: string, handler: (event: Event) => void): () => void {
     element.addEventListener(eventName, handler as EventListener, false);
     return () => this.removeEventListener(element, eventName, handler as EventListener);
   }

packages/platform-browser/src/dom/events/event_manager.ts

@@ -9,7 +9,7 @@
 import {Inject, Injectable, InjectionToken, NgZone} from '@angular/core';
 
 /**
- * The injection token for the event-manager plug-in service.
+ * The injection token for plugins of the `EventManager` service.
  *
  * @publicApi
  */
@@ -48,7 +48,7 @@ export class EventManager {
    */
   addEventListener(element: HTMLElement, eventName: string, handler: Function): Function {
     const plugin = this._findPluginFor(eventName);
-    return plugin.addEventListener(element, eventName, handler);
+    return plugin.addEventListener(element, eventName, handler as (event: Event) => void);
   }
 
   /**
@@ -77,13 +77,24 @@ export class EventManager {
   }
 }
 
+/**
+ * The plugin definition for the `EventManager` class
+ *
+ * @publicApi
+ */
+@Injectable()
 export abstract class EventManagerPlugin {
-  constructor(private _doc: any) {}
-
   // Using non-null assertion because it's set by EventManager's constructor
   manager!: EventManager;
 
+  /**
+   * Should return `true` for every event name that should be supported by this plugin
+   */
   abstract supports(eventName: string): boolean;
 
-  abstract addEventListener(element: HTMLElement, eventName: string, handler: Function): Function;
+  /**
+   * Implement the behaviour for the supported events
+   */
+  abstract addEventListener(
+      element: HTMLElement, eventName: string, handler: (event: Event) => void): Function;
 }

packages/platform-browser/src/dom/events/hammer_gestures.ts

@@ -165,10 +165,9 @@ export class HammerGesturesPlugin extends EventManagerPlugin {
   private _loaderPromise: Promise<void>|null = null;
 
   constructor(
-      @Inject(DOCUMENT) doc: any,
       @Inject(HAMMER_GESTURE_CONFIG) private _config: HammerGestureConfig, private console: Console,
       @Optional() @Inject(HAMMER_LOADER) private loader?: HammerLoader|null) {
-    super(doc);
+    super();
   }
 
   override supports(eventName: string): boolean {
@@ -272,7 +271,7 @@ export class HammerGesturesPlugin extends EventManagerPlugin {
  * HammerJS to detect gesture events.
  *
  * Note that applications still need to include the HammerJS script itself. This module
- * simply sets up the coordination layer between HammerJS and Angular's EventManager.
+ * simply sets up the coordination layer between HammerJS and Angular's `EventManager`.
  *
  * @publicApi
  */

packages/platform-browser/src/dom/events/key_events.ts

@@ -54,8 +54,9 @@ export class KeyEventsPlugin extends EventManagerPlugin {
    * Initializes an instance of the browser plug-in.
    * @param doc The document in which key events will be detected.
    */
+  // TODO: doc is unused and should be remove in the next major.
   constructor(@Inject(DOCUMENT) doc: any) {
-    super(doc);
+    super();
   }
 
   /**
@@ -188,7 +189,6 @@ export class KeyEventsPlugin extends EventManagerPlugin {
 
   /** @internal */
   static _normalizeKey(keyName: string): string {
-    // TODO: switch to a Map if the mapping grows too much
     switch (keyName) {
       case 'esc':
         return 'escape';

packages/platform-browser/src/platform-browser.ts

@@ -73,7 +73,7 @@ export {Title} from './browser/title';
 export {disableDebugTools, enableDebugTools} from './browser/tools/tools';
 export {By} from './dom/debug/by';
 export {REMOVE_STYLES_ON_COMPONENT_DESTROY} from './dom/dom_renderer';
-export {EVENT_MANAGER_PLUGINS, EventManager} from './dom/events/event_manager';
+export {EVENT_MANAGER_PLUGINS, EventManager, EventManagerPlugin} from './dom/events/event_manager';
 export {HAMMER_GESTURE_CONFIG, HAMMER_LOADER, HammerGestureConfig, HammerLoader, HammerModule} from './dom/events/hammer_gestures';
 export {DomSanitizer, SafeHtml, SafeResourceUrl, SafeScript, SafeStyle, SafeUrl, SafeValue} from './security/dom_sanitization_service';
 export {HydrationFeature, provideClientHydration, HydrationFeatureKind, withNoDomReuse, withNoHttpTransferCache} from './hydration';

packages/platform-browser/test/dom/events/event_manager_spec.ts

@@ -23,14 +23,14 @@ describe('EventManager', () => {
   beforeEach(() => {
     doc = getDOM().supportsDOMEvents ? document : getDOM().createHtmlDocument();
     zone = new NgZone({});
-    domEventPlugin = new DomEventsPlugin(doc);
+    domEventPlugin = new DomEventsPlugin();
   });
 
   it('should delegate event bindings to plugins that are passed in from the most generic one to the most specific one',
      () => {
        const element = el('<div></div>');
        const handler = (e: any /** TODO #9100 */) => e;
-       const plugin = new FakeEventManagerPlugin(doc, ['click']);
+       const plugin = new FakeEventManagerPlugin(['click']);
        const manager = new EventManager([domEventPlugin, plugin], new FakeNgZone());
        manager.addEventListener(element, 'click', handler);
        expect(plugin.eventHandler['click']).toBe(handler);
@@ -40,8 +40,8 @@ describe('EventManager', () => {
     const element = el('<div></div>');
     const clickHandler = (e: any /** TODO #9100 */) => e;
     const dblClickHandler = (e: any /** TODO #9100 */) => e;
-    const plugin1 = new FakeEventManagerPlugin(doc, ['dblclick']);
-    const plugin2 = new FakeEventManagerPlugin(doc, ['click', 'dblclick']);
+    const plugin1 = new FakeEventManagerPlugin(['dblclick']);
+    const plugin2 = new FakeEventManagerPlugin(['click', 'dblclick']);
     const manager = new EventManager([plugin2, plugin1], new FakeNgZone());
     manager.addEventListener(element, 'click', clickHandler);
     manager.addEventListener(element, 'dblclick', dblClickHandler);
@@ -51,7 +51,7 @@ describe('EventManager', () => {
 
   it('should throw when no plugin can handle the event', () => {
     const element = el('<div></div>');
-    const plugin = new FakeEventManagerPlugin(doc, ['dblclick']);
+    const plugin = new FakeEventManagerPlugin(['dblclick']);
     const manager = new EventManager([plugin], new FakeNgZone());
     expect(() => manager.addEventListener(element, 'click', null!))
         .toThrowError('No event manager plugin found for event click');
@@ -326,7 +326,7 @@ describe('EventManager', () => {
      (done: DoneFn) => {
        doc = getDOM().supportsDOMEvents ? document : getDOM().createHtmlDocument();
        zone = new NgZone({shouldCoalesceEventChangeDetection: true});
-       domEventPlugin = new DomEventsPlugin(doc);
+       domEventPlugin = new DomEventsPlugin();
        const element = el('<div></div>');
        const child = el('<div></div>');
        element.appendChild(child);
@@ -363,7 +363,7 @@ describe('EventManager', () => {
      (done: DoneFn) => {
        doc = getDOM().supportsDOMEvents ? document : getDOM().createHtmlDocument();
        zone = new NgZone({shouldCoalesceRunChangeDetection: true});
-       domEventPlugin = new DomEventsPlugin(doc);
+       domEventPlugin = new DomEventsPlugin();
        const element = el('<div></div>');
        const child = el('<div></div>');
        element.appendChild(child);
@@ -400,7 +400,7 @@ describe('EventManager', () => {
      (done: DoneFn) => {
        doc = getDOM().supportsDOMEvents ? document : getDOM().createHtmlDocument();
        zone = new NgZone({shouldCoalesceEventChangeDetection: true});
-       domEventPlugin = new DomEventsPlugin(doc);
+       domEventPlugin = new DomEventsPlugin();
        const element = el('<div></div>');
        const child = el('<div></div>');
        doc.body.appendChild(element);
@@ -446,7 +446,7 @@ describe('EventManager', () => {
      (done: DoneFn) => {
        doc = getDOM().supportsDOMEvents ? document : getDOM().createHtmlDocument();
        zone = new NgZone({shouldCoalesceRunChangeDetection: true});
-       domEventPlugin = new DomEventsPlugin(doc);
+       domEventPlugin = new DomEventsPlugin();
        const element = el('<div></div>');
        const child = el('<div></div>');
        doc.body.appendChild(element);
@@ -494,8 +494,8 @@ describe('EventManager', () => {
 class FakeEventManagerPlugin extends EventManagerPlugin {
   eventHandler: {[event: string]: Function} = {};
 
-  constructor(doc: any, public supportedEvents: string[]) {
-    super(doc);
+  constructor(public supportedEvents: string[]) {
+    super();
   }
 
   override supports(eventName: string): boolean {

packages/platform-browser/test/dom/events/hammer_gestures_spec.ts

@@ -27,7 +27,7 @@ import {HammerGestureConfig, HammerGesturesPlugin,} from '@angular/platform-brow
 
     describe('with no custom loader', () => {
       beforeEach(() => {
-        plugin = new HammerGesturesPlugin(document, new HammerGestureConfig(), fakeConsole);
+        plugin = new HammerGesturesPlugin(new HammerGestureConfig(), fakeConsole);
       });
 
       it('should warn user and do nothing when Hammer.js not loaded', () => {
@@ -88,7 +88,7 @@ import {HammerGestureConfig, HammerGesturesPlugin,} from '@angular/platform-brow
         const hammerConfig = new HammerGestureConfig();
         spyOn(hammerConfig, 'buildHammer').and.returnValue(fakeHammerInstance);
 
-        plugin = new HammerGesturesPlugin(document, hammerConfig, fakeConsole, loader);
+        plugin = new HammerGesturesPlugin(hammerConfig, fakeConsole, loader);
 
         // Use a fake EventManager that has access to the NgZone.
         plugin.manager = {getZone: () => ngZone} as EventManager;