fix: replace codegen event emitter with legacy ee

invertase · Jan 23, 2025 · d8cdc87 · d8cdc87
1 parent 6dc1dbb
commit d8cdc87
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 49 deletions.
diff --git a/android/src/main/java/io/invertase/googlemobileads/ReactNativeGoogleMobileAdsNativeModule.kt b/android/src/main/java/io/invertase/googlemobileads/ReactNativeGoogleMobileAdsNativeModule.kt
@@ -22,6 +22,7 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.module.annotations.ReactModule
 import com.google.android.gms.ads.AdListener
 import com.google.android.gms.ads.AdLoader
@@ -30,6 +31,8 @@ import com.google.android.gms.ads.VideoController.VideoLifecycleCallbacks
 import com.google.android.gms.ads.VideoOptions
 import com.google.android.gms.ads.nativead.NativeAd
 import com.google.android.gms.ads.nativead.NativeAdOptions
+import io.invertase.googlemobileads.common.ReactNativeEventEmitter
+import io.invertase.googlemobileads.interfaces.NativeEvent
 
 @ReactModule(name = ReactNativeGoogleMobileAdsNativeModule.NAME)
 class ReactNativeGoogleMobileAdsNativeModule(
@@ -201,7 +204,12 @@ class ReactNativeGoogleMobileAdsNativeModule(
       val payload = Arguments.createMap()
       payload.putString("responseId", nativeAd.responseInfo?.responseId)
       payload.putString("type", type)
-      this@ReactNativeGoogleMobileAdsNativeModule.emitOnAdEvent(payload)
+
+      val emitter = ReactNativeEventEmitter.getSharedInstance()
+      emitter.sendEvent(object : NativeEvent {
+        override fun getEventName() = "RNGMANativeAdEvent"
+        override fun getEventBody() = payload
+      })
     }
   }
 

diff --git a/android/src/oldarch/io/invertase/googlemobileads/NativeGoogleMobileAdsNativeModuleSpec.kt b/android/src/oldarch/io/invertase/googlemobileads/NativeGoogleMobileAdsNativeModuleSpec.kt
@@ -4,15 +4,8 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.modules.core.DeviceEventManagerModule
 
 abstract class NativeGoogleMobileAdsNativeModuleSpec(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
   abstract fun load(adUnitId: String, requestOptions: ReadableMap, promise: Promise)
   abstract fun destroy(responseId: String)
-
-  fun emitOnAdEvent(params: ReadableMap) {
-    reactApplicationContext
-      .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-      .emit("RNGMANativeAdEvent", params)
-  }
 }
diff --git a/ios/RNGoogleMobileAds/RNGoogleMobileAdsFullScreenAd.mm b/ios/RNGoogleMobileAds/RNGoogleMobileAdsFullScreenAd.mm
@@ -217,4 +217,4 @@ - (void)showWithRequestId:(int)requestId
 
 @end
 
-#endif
+#endif
diff --git a/ios/RNGoogleMobileAds/RNGoogleMobileAdsNativeModule.h b/ios/RNGoogleMobileAds/RNGoogleMobileAdsNativeModule.h
@@ -25,9 +25,8 @@
     : NativeGoogleMobileAdsNativeModuleSpecBase <NativeGoogleMobileAdsNativeModuleSpec>
 #else
 #import <React/RCTBridgeModule.h>
-#import <React/RCTEventEmitter.h>
 
-@interface RNGoogleMobileAdsNativeModule : RCTEventEmitter <RCTBridgeModule>
+@interface RNGoogleMobileAdsNativeModule : NSObject <RCTBridgeModule>
 #endif
 
 - (GADNativeAd *)nativeAdForResponseId:(NSString *)responseId;

diff --git a/ios/RNGoogleMobileAds/RNGoogleMobileAdsNativeModule.mm b/ios/RNGoogleMobileAds/RNGoogleMobileAdsNativeModule.mm
@@ -19,6 +19,7 @@
 
 #import "RNGoogleMobileAdsNativeModule.h"
 #import "RNGoogleMobileAdsCommon.h"
+#import "common/RNRCTEventEmitter.h"
 
 typedef void (^RNGMANativeAdLoadCompletionHandler)(GADNativeAd *_Nullable nativeAd,
                                                    NSError *_Nullable error);
@@ -53,10 +54,6 @@ - (dispatch_queue_t)methodQueue {
     (const facebook::react::ObjCTurboModule::InitParams &)params {
   return std::make_shared<facebook::react::NativeGoogleMobileAdsNativeModuleSpecJSI>(params);
 }
-#else
-- (NSArray<NSString *> *)supportedEvents {
-  return @[ @"RNGMANativeAdEvent" ];
-}
 #endif
 
 - (instancetype)init {
@@ -278,11 +275,7 @@ - (void)emitAdEvent:(NSString *)type {
   }
   NSDictionary *payload =
       @{@"responseId" : _nativeAd.responseInfo.responseIdentifier, @"type" : type};
-#ifdef RCT_NEW_ARCH_ENABLED
-  [_nativeModule emitOnAdEvent:payload];
-#else
-  [_nativeModule sendEventWithName:@"RNGMANativeAdEvent" body:payload];
-#endif
+  [[RNRCTEventEmitter shared] sendEventWithName:@"RNGMANativeAdEvent" body:payload];
 }
 
 @end

diff --git a/src/MobileAds.ts b/src/MobileAds.ts
@@ -25,9 +25,12 @@ class MobileAdsModule implements MobileAdsModuleInterface {
 
   subscribeToNativeModuleEvent(eventName: string) {
     if (!NATIVE_MODULE_EVENT_SUBSCRIPTIONS[eventName]) {
-      GoogleMobileAdsNativeEventEmitter.addListener(eventName, event => {
-        SharedEventEmitter.emit(`${eventName}:${event.adUnitId}:${event.requestId}`, event);
-      });
+      GoogleMobileAdsNativeEventEmitter.addListener<{ adUnitId: string; requestId: number }>(
+        eventName,
+        event => {
+          SharedEventEmitter.emit(`${eventName}:${event.adUnitId}:${event.requestId}`, event);
+        },
+      );
 
       NATIVE_MODULE_EVENT_SUBSCRIPTIONS[eventName] = true;
     }

diff --git a/src/ads/native-ad/NativeAd.ts b/src/ads/native-ad/NativeAd.ts
@@ -15,7 +15,7 @@
  *
  */
 
-import { EventSubscription, NativeEventEmitter, Platform } from 'react-native';
+import { EventSubscription } from 'react-native';
 import EventEmitter from 'react-native/Libraries/vendor/emitter/EventEmitter';
 
 import { NativeAdEventType } from '../../NativeAdEventType';
@@ -28,6 +28,7 @@ import NativeGoogleMobileAdsNativeModule, {
 } from '../../specs/modules/NativeGoogleMobileAdsNativeModule';
 import { NativeAdRequestOptions } from '../../types';
 import { validateAdRequestOptions } from '../../validateAdRequestOptions';
+import { GoogleMobileAdsNativeEventEmitter } from '../../internal/GoogleMobileAdsNativeEventEmitter';
 
 /**
  * A class for loading Native Ads.
@@ -65,22 +66,17 @@ export class NativeAd {
     this.mediaContent = props.mediaContent;
     this.extras = props.extras as Record<string, unknown>;
 
-    if ('onAdEvent' in NativeGoogleMobileAdsNativeModule) {
-      this.nativeEventSubscription = NativeGoogleMobileAdsNativeModule.onAdEvent(
-        this.onNativeAdEvent.bind(this),
-      );
-    } else {
-      let eventEmitter;
-      if (Platform.OS === 'ios') {
-        eventEmitter = new NativeEventEmitter(NativeGoogleMobileAdsNativeModule);
-      } else {
-        eventEmitter = new NativeEventEmitter();
-      }
-      this.nativeEventSubscription = eventEmitter.addListener(
-        'RNGMANativeAdEvent',
-        this.onNativeAdEvent.bind(this),
-      );
-    }
+    // Codegen EventEmitter was introduced in RN 0.76.2, so we can't apply it for now, due to backward compatibility.
+    // if ('onAdEvent' in NativeGoogleMobileAdsNativeModule) {
+    //   this.nativeEventSubscription = NativeGoogleMobileAdsNativeModule.onAdEvent(
+    //     this.onNativeAdEvent.bind(this),
+    //   );
+    // }
+
+    this.nativeEventSubscription = GoogleMobileAdsNativeEventEmitter.addListener(
+      'RNGMANativeAdEvent',
+      this.onNativeAdEvent.bind(this),
+    );
     this.eventEmitter = new EventEmitter();
   }
 

diff --git a/src/internal/GoogleMobileAdsNativeEventEmitter.ts b/src/internal/GoogleMobileAdsNativeEventEmitter.ts
@@ -27,9 +27,9 @@ class GANativeEventEmitter extends NativeEventEmitter {
     this.ready = false;
   }
 
-  addListener(
+  addListener<T>(
     eventType: string,
-    listener: (event: { adUnitId: string; requestId: number }) => void,
+    listener: (event: T) => void,
     context?: Record<string, unknown>,
   ) {
     if (!this.ready) {

diff --git a/src/specs/modules/NativeGoogleMobileAdsNativeModule.ts b/src/specs/modules/NativeGoogleMobileAdsNativeModule.ts
@@ -17,12 +17,7 @@
 
 import type { TurboModule } from 'react-native';
 import { TurboModuleRegistry } from 'react-native';
-import type {
-  Double,
-  Float,
-  UnsafeObject,
-  EventEmitter,
-} from 'react-native/Libraries/Types/CodegenTypes';
+import type { Double, Float, UnsafeObject } from 'react-native/Libraries/Types/CodegenTypes';
 
 export type NativeAdProps = {
   responseId: string;
@@ -58,7 +53,8 @@ export type NativeAdEventPayload = {
 export interface Spec extends TurboModule {
   load(adUnitId: string, requestOptions: UnsafeObject): Promise<NativeAdProps>;
   destroy(responseId: string): void;
-  readonly onAdEvent: EventEmitter<NativeAdEventPayload>;
+  // Codegen EventEmitter was introduced in RN 0.76.2, so we can't apply it for now, due to backward compatibility.
+  // readonly onAdEvent: EventEmitter<NativeAdEventPayload>;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('RNGoogleMobileAdsNativeModule');
Original file line number	Diff line number	Diff line change
Expand Up		@@ -217,4 +217,4 @@ - (void)showWithRequestId:(int)requestId

		@end

		#endif
		#endif