feat: update eventemitter for react native 0.65 (#414)

* feat: update eventemitter for react native 0.65 * refactor: make removeListener not private * refactor: remove unwanted lines
AgoraIO-Extensions · Nov 30, 2021 · 1130839 · 1130839
1 parent 86cf714
commit 1130839
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 16 deletions.
diff --git a/src/common/RtcChannel.native.ts b/src/common/RtcChannel.native.ts
@@ -1,4 +1,8 @@
-import { NativeEventEmitter, NativeModules } from 'react-native';
+import {
+  EmitterSubscription,
+  NativeEventEmitter,
+  NativeModules,
+} from 'react-native';
 
 import type {
   ChannelMediaOptions,
@@ -150,11 +154,11 @@ export default class RtcChannel implements RtcChannelInterface {
       map = new Map<Listener, Listener>();
       this._listeners.set(event, map);
     }
-    RtcChannelEvent.addListener(Prefix + event, callback);
+    const subscription = RtcChannelEvent.addListener(Prefix + event, callback);
     map.set(listener, callback);
     return {
       remove: () => {
-        this.removeListener(event, listener);
+        this.removeListener(event, listener, subscription);
       },
     };
   }
@@ -168,14 +172,20 @@ export default class RtcChannel implements RtcChannelInterface {
    */
   removeListener<EventType extends keyof RtcChannelEvents>(
     event: EventType,
-    listener: RtcChannelEvents[EventType]
+    listener: RtcChannelEvents[EventType],
+    subscription?: EmitterSubscription
   ) {
     const map = this._listeners.get(event);
     if (map === undefined) return;
-    RtcChannelEvent.removeListener(
-      Prefix + event,
-      map.get(listener) as Listener
-    );
+
+    if (subscription && 'remove' in subscription) {
+      subscription.remove();
+    } else {
+      RtcChannelEvent.removeListener(
+        Prefix + event,
+        map.get(listener) as Listener
+      );
+    }
     map.delete(listener);
   }
 

diff --git a/src/common/RtcEngine.native.ts b/src/common/RtcEngine.native.ts
@@ -1,4 +1,8 @@
-import { NativeEventEmitter, NativeModules } from 'react-native';
+import {
+  EmitterSubscription,
+  NativeEventEmitter,
+  NativeModules,
+} from 'react-native';
 
 import {
   AudioRecordingConfiguration,
@@ -296,11 +300,11 @@ export default class RtcEngine implements RtcEngineInterface {
       map = new Map<Listener, Listener>();
       this._listeners.set(event, map);
     }
-    RtcEngineEvent.addListener(Prefix + event, callback);
+    const subscription = RtcEngineEvent.addListener(Prefix + event, callback);
     map.set(listener, callback);
     return {
       remove: () => {
-        this.removeListener(event, listener);
+        this.removeListener(event, listener, subscription);
       },
     };
   }
@@ -314,14 +318,20 @@ export default class RtcEngine implements RtcEngineInterface {
    */
   removeListener<EventType extends keyof RtcEngineEvents>(
     event: EventType,
-    listener: RtcEngineEvents[EventType]
+    listener: RtcEngineEvents[EventType],
+    subscription?: EmitterSubscription
   ) {
     const map = this._listeners.get(event);
     if (map === undefined) return;
-    RtcEngineEvent.removeListener(
-      Prefix + event,
-      map.get(listener) as Listener
-    );
+
+    if (subscription && 'remove' in subscription) {
+      subscription.remove();
+    } else {
+      RtcEngineEvent.removeListener(
+        Prefix + event,
+        map.get(listener) as Listener
+      );
+    }
     map.delete(listener);
   }