refactor(core): Add an ActionResolver option to Dispatcher.

This will enable internal usages to migrate from ActionResolver in
EventContrat to ActionResolver in Dispatcher.

packages/core/primitives/event-dispatch/src/dispatcher.ts

@@ -11,6 +11,7 @@ import {EventType} from './event_type';
 import {Restriction} from './restriction';
 import {UnrenamedEventContract} from './eventcontract';
 import * as eventLib from './event';
+import {ActionResolver} from './action_resolver';
 
 /**
  * A replayer is a function that is called when there are queued events,
@@ -35,13 +36,18 @@ export type GlobalHandler = (event: Event) => boolean | void;
  * jsaction.
  */
 export class Dispatcher {
- /** The queue of events. */
- private readonly replayEventInfoWrappers: EventInfoWrapper[] = [];
+ // The ActionResolver to use to resolve actions.
+ private actionResolver?: ActionResolver;
+
  /** The replayer function to be called when there are queued events. */
  private eventReplayer?: Replayer;
+
  /** Whether the event replay is scheduled. */
  private eventReplayScheduled = false;
 
+ /** The queue of events. */
+ private readonly replayEventInfoWrappers: EventInfoWrapper[] = [];
+
  /**
  * Options are:
  * 1. `eventReplayer`: When the event contract dispatches replay events
@@ -51,8 +57,12 @@ export class Dispatcher {
  */
  constructor(
  private readonly dispatchDelegate: (eventInfoWrapper: EventInfoWrapper) => void,
- {eventReplayer = undefined}: {eventReplayer?: Replayer} = {},
+ {
+ actionResolver = undefined,
+ eventReplayer = undefined,
+ }: {actionResolver?: ActionResolver; eventReplayer?: Replayer} = {},
  ) {
+ this.actionResolver = actionResolver;
  this.eventReplayer = eventReplayer;
  }
 
@@ -78,6 +88,9 @@ export class Dispatcher {
  */
  dispatch(eventInfo: EventInfo): void {
  const eventInfoWrapper = new EventInfoWrapper(eventInfo);
+ if (this.actionResolver) {
+ this.actionResolver.resolve(eventInfo);
+ }
  if (eventInfoWrapper.getIsReplay()) {
  if (!this.eventReplayer) {
  return;

packages/core/primitives/event-dispatch/src/eventcontract.ts

@@ -93,11 +93,6 @@ export class EventContract implements UnrenamedEventContract {
 
  private containerManager: EventContractContainerManager | null;
 
- private readonly actionResolver = new ActionResolver({
- customEventSupport: EventContract.CUSTOM_EVENT_SUPPORT,
- syntheticMouseEventSupport: EventContract.MOUSE_SPECIAL_SUPPORT,
- });
-
  /**
  * The DOM events which this contract covers. Used to prevent double
  * registration of event types. The value of the map is the
@@ -133,7 +128,13 @@ export class EventContract implements UnrenamedEventContract {
  populateClickOnlyAction: typeof a11yClickLib.populateClickOnlyAction,
  ) => void;
 
- constructor(containerManager: EventContractContainerManager) {
+ constructor(
+ containerManager: EventContractContainerManager,
+ readonly actionResolver: ActionResolver | null = new ActionResolver({
+ customEventSupport: EventContract.CUSTOM_EVENT_SUPPORT,
+ syntheticMouseEventSupport: EventContract.MOUSE_SPECIAL_SUPPORT,
+ }),
+ ) {
  this.containerManager = containerManager;
  if (EventContract.CUSTOM_EVENT_SUPPORT) {
  this.addEvent(EventType.CUSTOM);
@@ -165,7 +166,7 @@ export class EventContract implements UnrenamedEventContract {
  this.queuedEventInfos?.push(eventInfo);
  return;
  }
- this.actionResolver.resolve(eventInfo);
+ this.actionResolver?.resolve(eventInfo);
  const action = eventInfoLib.getAction(eventInfo);
  if (action) {
  if (shouldPreventDefaultBeforeDispatching(eventInfoLib.getActionElement(action), eventInfo)) {
@@ -363,7 +364,7 @@ export class EventContract implements UnrenamedEventContract {
  populateClickOnlyAction: typeof a11yClickLib.populateClickOnlyAction,
  ) {
  this.addA11yClickListener = true;
- this.actionResolver.addA11yClickSupport(
+ this.actionResolver?.addA11yClickSupport(
  updateEventInfoForA11yClick,
  preventDefaultForA11yClick,
  populateClickOnlyAction,