use IEventEmitterMap to handle view events since pixi view are extend…

…ing eventemitter3
RobotlegsJS · May 11, 2022 · 233ac06 · 233ac06
1 parent 5618787
commit 233ac06
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 117 deletions.
diff --git a/packages/pixi/src/robotlegs/bender/bundles/pixi/PixiBundle.ts b/packages/pixi/src/robotlegs/bender/bundles/pixi/PixiBundle.ts
@@ -6,6 +6,7 @@
 // ------------------------------------------------------------------------------
 
 import { IBundle, IContext, ILogger, instanceOfType } from "@robotlegsjs/core";
+import { LocalEventEmitterMapExtension } from "@robotlegsjs/eventemitter3";
 import { IContextView } from "../../extensions/contextView/api/IContextView";
 import { ContextViewExtension } from "../../extensions/contextView/ContextViewExtension";
 import { ContextView } from "../../extensions/contextView/impl/ContextView";
@@ -41,6 +42,7 @@ export class PixiBundle implements IBundle {
         this._logger = context.getLogger(this);
 
         this._context.install(
+            LocalEventEmitterMapExtension,
             ContextViewExtension,
             ViewManagerExtension,
             StageObserverExtension,

diff --git a/packages/pixi/src/robotlegs/bender/extensions/mediatorMap/impl/ConvertToEventDispatcher.ts b/packages/pixi/src/robotlegs/bender/extensions/mediatorMap/impl/ConvertToEventDispatcher.ts
diff --git a/packages/pixi/src/robotlegs/bender/extensions/mediatorMap/impl/Mediator.ts b/packages/pixi/src/robotlegs/bender/extensions/mediatorMap/impl/Mediator.ts
@@ -5,18 +5,10 @@
 //  in accordance with the terms of the license agreement accompanying it.
 // ------------------------------------------------------------------------------
 
-import {
-    Event,
-    IClass,
-    IEvent,
-    IEventDispatcher,
-    IEventMap,
-    inject,
-    injectable
-} from "@robotlegsjs/core";
-import { DisplayObject } from "pixi.js";
+import { Event, IClass, IEvent, IEventDispatcher, inject, injectable } from "@robotlegsjs/core";
+import { IEventEmitterMap } from "@robotlegsjs/eventemitter3";
+import { DisplayObject, utils } from "pixi.js";
 import { IMediator } from "../api/IMediator";
-import { ConvertToEventDispatcher } from "./ConvertToEventDispatcher";
 
 /**
  * Classic Robotlegs mediator implementation
@@ -25,18 +17,12 @@ import { ConvertToEventDispatcher } from "./ConvertToEventDispatcher";
  */
 @injectable()
 export abstract class Mediator<T extends DisplayObject> implements IMediator {
-    /*============================================================================*/
-    /* Private Properties                                                         */
-    /*============================================================================*/
-
-    private _viewConverted: ConvertToEventDispatcher;
-
     /*============================================================================*/
     /* Protected Properties                                                       */
     /*============================================================================*/
 
-    @inject(IEventMap)
-    protected eventMap: IEventMap;
+    @inject(IEventEmitterMap)
+    protected eventMap: IEventEmitterMap;
 
     @inject(IEventDispatcher)
     protected eventDispatcher: IEventDispatcher;
@@ -49,7 +35,6 @@ export abstract class Mediator<T extends DisplayObject> implements IMediator {
 
     public set view(view: T) {
         this._viewComponent = view;
-        this._viewConverted = new ConvertToEventDispatcher(this._viewComponent);
     }
 
     public get view(): T {
@@ -84,21 +69,10 @@ export abstract class Mediator<T extends DisplayObject> implements IMediator {
 
     protected addViewListener(
         eventString: string,
-        listener: Function,
-        thisObject?: any,
-        eventClass?: IClass<IEvent>,
-        useCapture?: boolean,
-        priority?: number
+        listener: utils.EventEmitter.ListenerFn,
+        thisObject?: any
     ): void {
-        this.eventMap.mapListener(
-            this._viewConverted,
-            eventString,
-            listener,
-            thisObject,
-            eventClass,
-            useCapture,
-            priority
-        );
+        this.eventMap.on(this._viewComponent, eventString, listener, thisObject);
     }
 
     protected addContextListener(
@@ -131,19 +105,10 @@ export abstract class Mediator<T extends DisplayObject> implements IMediator {
 
     protected removeViewListener(
         eventString: string,
-        listener: Function,
-        thisObject?: any,
-        eventClass?: IClass<IEvent>,
-        useCapture?: boolean
+        listener: utils.EventEmitter.ListenerFn,
+        thisObject?: any
     ): void {
-        this.eventMap.unmapListener(
-            this._viewConverted,
-            eventString,
-            listener,
-            thisObject,
-            eventClass,
-            useCapture
-        );
+        this.eventMap.off(this._viewComponent, eventString, listener, thisObject);
     }
 
     protected removeContextListener(