react-native-google-mobile-ads 11.1.1 → 11.3.0

package/ios/RNGoogleMobileAds/{RNGoogleMobileAdsBannerViewManager.m → RNGoogleMobileAdsBannerViewManager.mm}

@@ -16,9 +16,16 @@
  *
  */
 
-#import "RNGoogleMobileAdsBannerViewManager.h"
 #import <React/RCTUIManager.h>
+#import <React/RCTViewManager.h>
+#ifdef RCT_NEW_ARCH_ENABLE
+
+#else
 #import "RNGoogleMobileAdsBannerComponent.h"
+#endif
+
+@interface RNGoogleMobileAdsBannerViewManager : RCTViewManager
+@end
 
 @implementation RNGoogleMobileAdsBannerViewManager
 
@@ -28,13 +35,14 @@ RCT_EXPORT_VIEW_PROPERTY(sizes, NSArray);
 
 RCT_EXPORT_VIEW_PROPERTY(unitId, NSString);
 
-RCT_EXPORT_VIEW_PROPERTY(request, NSDictionary);
+RCT_EXPORT_VIEW_PROPERTY(request, NSString);
 
 RCT_EXPORT_VIEW_PROPERTY(manualImpressionsEnabled, BOOL);
 
 RCT_EXPORT_VIEW_PROPERTY(onNativeEvent, RCTBubblingEventBlock);
 
 RCT_EXPORT_METHOD(recordManualImpression : (nonnull NSNumber *)reactTag) {
+#if !TARGET_OS_MACCATALYST
   [self.bridge.uiManager
       addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
         RNGoogleMobileAdsBannerComponent *banner = viewRegistry[reactTag];
@@ -44,17 +52,26 @@ RCT_EXPORT_METHOD(recordManualImpression : (nonnull NSNumber *)reactTag) {
         }
         [banner recordManualImpression];
       }];
+#endif
 }
 
+#ifdef RCT_NEW_ARCH_ENABLE
+
+#else
 @synthesize bridge = _bridge;
 
 - (UIView *)view {
+#if TARGET_OS_MACCATALYST
+  return nil;
+#else
   RNGoogleMobileAdsBannerComponent *banner = [RNGoogleMobileAdsBannerComponent new];
   return banner;
+#endif
 }
 
 - (dispatch_queue_t)methodQueue {
   return dispatch_get_main_queue();
 }
+#endif
 
 @end

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsCommon.h

@@ -16,8 +16,10 @@
  *
  */
 
+#if !TARGET_OS_MACCATALYST
+
+#import <GoogleMobileAds/GoogleMobileAds.h>
 #import <React/RCTBridgeModule.h>
-@import GoogleMobileAds;
 
 @interface RNGoogleMobileAdsCommon : NSObject
 
@@ -64,3 +66,5 @@ extern NSString *const GOOGLE_MOBILE_ADS_EVENT_APP_EVENT;
 
 extern NSString *const GOOGLE_MOBILE_ADS_EVENT_REWARDED_LOADED;
 extern NSString *const GOOGLE_MOBILE_ADS_EVENT_REWARDED_EARNED_REWARD;
+
+#endif

package/ios/RNGoogleMobileAds/{RNGoogleMobileAdsCommon.m → RNGoogleMobileAdsCommon.mm}

@@ -16,6 +16,8 @@
  *
  */
 
+#if !TARGET_OS_MACCATALYST
+
 #import "RNGoogleMobileAdsCommon.h"
 #import "common/RNRCTEventEmitter.h"
 
@@ -231,3 +233,5 @@ NSString *const GOOGLE_MOBILE_ADS_EVENT_REWARDED_EARNED_REWARD = @"rewarded_earn
 }
 
 @end
+
+#endif

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsConsentModule.m

@@ -19,7 +19,9 @@
 #import <React/RCTUtils.h>
 
 #import <React/RCTConvert.h>
+#if !TARGET_OS_MACCATALYST
 #include <UserMessagingPlatform/UserMessagingPlatform.h>
+#endif
 #import "RCTBridgeModule.h"
 #import "RNGoogleMobileAdsConsentModule.h"
 #import "common/RNSharedUtils.h"
@@ -37,6 +39,7 @@ RCT_EXPORT_MODULE();
 #pragma mark -
 #pragma mark Google Mobile Ads Methods
 
+#if !TARGET_OS_MACCATALYST
 - (NSString *)getConsentStatusString:(UMPConsentStatus)consentStatus {
   switch (consentStatus) {
     case UMPConsentStatusRequired:
@@ -50,11 +53,13 @@ RCT_EXPORT_MODULE();
       return @"UNKNOWN";
   }
 }
+#endif
 
 RCT_EXPORT_METHOD(requestInfoUpdate
                   : (NSDictionary *)options
                   : (RCTPromiseResolveBlock)resolve
                   : (RCTPromiseRejectBlock)reject) {
+#if !TARGET_OS_MACCATALYST
   UMPRequestParameters *parameters = [[UMPRequestParameters alloc] init];
   UMPDebugSettings *debugSettings = [[UMPDebugSettings alloc] init];
 
@@ -86,9 +91,11 @@ RCT_EXPORT_METHOD(requestInfoUpdate
                                });
                              }
                            }];
+#endif
 }
 
 RCT_EXPORT_METHOD(showForm : (RCTPromiseResolveBlock)resolve : (RCTPromiseRejectBlock)reject) {
+#if !TARGET_OS_MACCATALYST
   [UMPConsentForm loadWithCompletionHandler:^(UMPConsentForm *form, NSError *loadError) {
     if (loadError) {
       [RNSharedUtils rejectPromiseWithUserInfo:reject
@@ -117,9 +124,14 @@ RCT_EXPORT_METHOD(showForm : (RCTPromiseResolveBlock)resolve : (RCTPromiseReject
                   }];
     }
   }];
+#endif
 }
 
-RCT_EXPORT_METHOD(reset) { [UMPConsentInformation.sharedInstance reset]; }
+RCT_EXPORT_METHOD(reset) {
+#if !TARGET_OS_MACCATALYST
+  [UMPConsentInformation.sharedInstance reset];
+#endif
+}
 
 RCT_EXPORT_METHOD(getTCString : (RCTPromiseResolveBlock)resolve : (RCTPromiseRejectBlock)reject) {
   @try {

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsFullScreenAd.swift

@@ -15,6 +15,8 @@
  *
  */
 
+#if !targetEnvironment(macCatalyst)
+
 import Foundation
 import GoogleMobileAds
 
@@ -206,3 +208,5 @@ class RNGoogleMobileAdsFullScreenAd<T>: NSObject where T : GADFullScreenPresenti
     resolve!(nil)
   }
 }
+
+#endif

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsFullScreenContentDelegate.swift

@@ -1,3 +1,5 @@
+#if !targetEnvironment(macCatalyst)
+
 import Foundation
 import GoogleMobileAds
 
@@ -70,3 +72,5 @@ class RNGoogleMobileAdsFullScreenContentDelegate: NSObject, GADFullScreenContent
     )
   }
 }
+
+#endif

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsInterstitialModule.m

@@ -15,6 +15,8 @@
  *
  */
 
+#if !TARGET_OS_MACCATALYST
+
 #import <React/RCTBridgeModule.h>
 
 @interface RCT_EXTERN_MODULE (RNGoogleMobileAdsInterstitialModule, NSObject)
@@ -40,3 +42,5 @@ RCT_EXTERN_METHOD(interstitialShow
                   : (RCTPromiseRejectBlock)reject)
 
 @end
+
+#endif

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsInterstitialModule.swift

@@ -15,6 +15,8 @@
  *
  */
 
+#if !targetEnvironment(macCatalyst)
+
 import Foundation
 import GoogleMobileAds
 
@@ -117,3 +119,5 @@ class RNGoogleMobileAdsInterstitialModule: NSObject {
     }
   }
 }
+
+#endif

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsModule.h

@@ -17,8 +17,16 @@
 
 #import <Foundation/Foundation.h>
 
-#import <React/RCTBridgeModule.h>
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import <RNGoogleMobileAdsSpec/RNGoogleMobileAdsSpec.h>
+@interface RNGoogleMobileAdsModule : NSObject <NativeGoogleMobileAdsModuleSpec>
+
+#else
 
+#import <React/RCTBridgeModule.h>
 @interface RNGoogleMobileAdsModule : NSObject <RCTBridgeModule>
 
+#endif
+
 @end

package/ios/RNGoogleMobileAds/{RNGoogleMobileAdsModule.m → RNGoogleMobileAdsModule.mm}

@@ -15,10 +15,15 @@
  *
  */
 
+#if !TARGET_OS_MACCATALYST
 #import <GoogleMobileAds/GoogleMobileAds.h>
+#endif
 #import <React/RCTUtils.h>
 
 #import "RNGoogleMobileAdsModule.h"
+#ifdef RCT_NEW_ARCH_ENABLED
+#import "RNGoogleMobileAdsSpec.h"
+#endif
 #import "common/RNSharedUtils.h"
 
 @implementation RNGoogleMobileAdsModule
@@ -35,6 +40,42 @@ RCT_EXPORT_MODULE();
 #pragma mark Google Mobile Ads Methods
 
 RCT_EXPORT_METHOD(initialize : (RCTPromiseResolveBlock)resolve : (RCTPromiseRejectBlock)reject) {
+  [self initialize:resolve reject:reject];
+}
+
+RCT_EXPORT_METHOD(setRequestConfiguration
+                  : (NSDictionary *)requestConfiguration
+                  : (RCTPromiseResolveBlock)resolve
+                  : (RCTPromiseRejectBlock)reject) {
+  [self setRequestConfiguration:requestConfiguration resolve:resolve reject:reject];
+}
+
+RCT_EXPORT_METHOD(openAdInspector
+                  : (RCTPromiseResolveBlock)resolve
+                  : (RCTPromiseRejectBlock)reject) {
+  [self openAdInspector:resolve reject:reject];
+}
+
+RCT_EXPORT_METHOD(openDebugMenu : (NSString *)adUnit) {
+#if !TARGET_OS_MACCATALYST
+  GADDebugOptionsViewController *debugOptionsViewController =
+      [GADDebugOptionsViewController debugOptionsViewControllerWithAdUnitID:adUnit];
+  [RCTSharedApplication().delegate.window.rootViewController
+      presentViewController:debugOptionsViewController
+                   animated:YES
+                 completion:nil];
+#endif
+}
+
+#ifdef RCT_NEW_ARCH_ENABLED
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params {
+  return std::make_shared<facebook::react::NativeGoogleMobileAdsModuleSpecJSI>(params);
+}
+#endif
+
+- (void)initialize:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
+#if !TARGET_OS_MACCATALYST
   [[GADMobileAds sharedInstance]
       startWithCompletionHandler:^(GADInitializationStatus *_Nonnull status) {
         NSDictionary *adapterStatuses = [status adapterStatusesByClassName];
@@ -50,17 +91,13 @@ RCT_EXPORT_METHOD(initialize : (RCTPromiseResolveBlock)resolve : (RCTPromiseReje
         }
         resolve(result);
       }];
+#endif
 }
 
-RCT_EXPORT_METHOD(setRequestConfiguration
-                  : (NSDictionary *)requestConfiguration
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
-  [self setRequestConfiguration:requestConfiguration];
-  resolve([NSNull null]);
-}
-
-- (void)setRequestConfiguration:(NSDictionary *)requestConfiguration {
+- (void)setRequestConfiguration:(NSDictionary *)requestConfiguration
+                        resolve:(RCTPromiseResolveBlock)resolve
+                         reject:(RCTPromiseRejectBlock)reject {
+#if !TARGET_OS_MACCATALYST
   if (requestConfiguration[@"maxAdContentRating"]) {
     NSString *rating = requestConfiguration[@"maxAdContentRating"];
     if ([rating isEqualToString:@"G"]) {
@@ -99,11 +136,13 @@ RCT_EXPORT_METHOD(setRequestConfiguration
     }
     GADMobileAds.sharedInstance.requestConfiguration.testDeviceIdentifiers = devices;
   }
+
+  resolve([NSNull null]);
+#endif
 }
 
-RCT_EXPORT_METHOD(openAdInspector
-                  : (RCTPromiseResolveBlock)resolve
-                  : (RCTPromiseRejectBlock)reject) {
+- (void)openAdInspector:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
+#if !TARGET_OS_MACCATALYST
   [GADMobileAds.sharedInstance
       presentAdInspectorFromViewController:RCTSharedApplication().delegate.window.rootViewController
                          completionHandler:^(NSError *_Nullable error) {
@@ -119,15 +158,7 @@ RCT_EXPORT_METHOD(openAdInspector
                              resolve(nil);
                            }
                          }];
-}
-
-RCT_EXPORT_METHOD(openDebugMenu : (NSString *)adUnit) {
-  GADDebugOptionsViewController *debugOptionsViewController =
-      [GADDebugOptionsViewController debugOptionsViewControllerWithAdUnitID:adUnit];
-  [RCTSharedApplication().delegate.window.rootViewController
-      presentViewController:debugOptionsViewController
-                   animated:YES
-                 completion:nil];
+#endif
 }
 
 @end

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsRewardedInterstitialModule.m

@@ -15,6 +15,8 @@
  *
  */
 
+#if !TARGET_OS_MACCATALYST
+
 #import <React/RCTBridgeModule.h>
 
 @interface RCT_EXTERN_MODULE (RNGoogleMobileAdsRewardedInterstitialModule, NSObject)
@@ -40,3 +42,5 @@ RCT_EXTERN_METHOD(rewardedInterstitialShow
                   : (RCTPromiseRejectBlock)reject)
 
 @end
+
+#endif

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsRewardedInterstitialModule.swift

@@ -15,6 +15,8 @@
  *
  */
 
+#if !targetEnvironment(macCatalyst)
+
 import Foundation
 import GoogleMobileAds
 
@@ -79,3 +81,5 @@ class RNGoogleMobileAdsRewardedInterstitialModule: NSObject {
     }
   }
 }
+
+#endif

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsRewardedModule.m

@@ -15,6 +15,8 @@
  *
  */
 
+#if !TARGET_OS_MACCATALYST
+
 #import <React/RCTBridgeModule.h>
 
 @interface RCT_EXTERN_MODULE (RNGoogleMobileAdsRewardedModule, NSObject)
@@ -40,3 +42,5 @@ RCT_EXTERN_METHOD(rewardedShow
                   : (RCTPromiseRejectBlock)reject)
 
 @end
+
+#endif

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsRewardedModule.swift

@@ -15,6 +15,8 @@
  *
  */
 
+#if !targetEnvironment(macCatalyst)
+
 import Foundation
 import GoogleMobileAds
 
@@ -79,3 +81,5 @@ class RNGoogleMobileAdsRewardedModule: NSObject {
     }
   }
 }
+
+#endif

package/jest.setup.ts

@@ -20,12 +20,23 @@ jest.doMock('react-native', () => {
           removeListeners: jest.fn(),
           eventsAddListener: jest.fn(),
           eventsNotifyReady: jest.fn(),
+        },
+        RNGoogleMobileAdsInterstitialModule: {
           interstitialLoad: jest.fn(),
         },
-        RNGoogleMobileAdsInterstitialModule: {},
         RNGoogleMobileAdsRewardedModule: {},
         RNGoogleMobileAdsConsentModule: {},
       },
+      TurboModuleRegistry: {
+        getEnforcing: () => {
+          return {
+            initialize: jest.fn(),
+            setRequestConfiguration: jest.fn(),
+            openAdInspector: jest.fn(),
+            openDebugMenu: jest.fn(),
+          };
+        },
+      },
     },
     ReactNative,
   );

package/lib/commonjs/MobileAds.js

@@ -4,29 +4,31 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.MobileAds = void 0;
-var _internal = require("./internal");
+var _NativeGoogleMobileAdsModule = _interopRequireDefault(require("./NativeGoogleMobileAdsModule"));
 var _validateAdRequestConfiguration = require("./validateAdRequestConfiguration");
-var _version = require("./version");
-const namespace = 'google_mobile_ads';
-const nativeModuleName = ['RNGoogleMobileAdsModule', 'RNGoogleMobileAdsAppOpenModule', 'RNGoogleMobileAdsInterstitialModule', 'RNGoogleMobileAdsRewardedModule', 'RNGoogleMobileAdsRewardedInterstitialModule'];
-class MobileAdsModule extends _internal.Module {
-  constructor(app, config) {
-    super(app, config);
-    this.emitter.addListener('google_mobile_ads_app_open_event', event => {
-      this.emitter.emit(`google_mobile_ads_app_open_event:${event.adUnitId}:${event.requestId}`, event);
-    });
-    this.emitter.addListener('google_mobile_ads_interstitial_event', event => {
-      this.emitter.emit(`google_mobile_ads_interstitial_event:${event.adUnitId}:${event.requestId}`, event);
-    });
-    this.emitter.addListener('google_mobile_ads_rewarded_event', event => {
-      this.emitter.emit(`google_mobile_ads_rewarded_event:${event.adUnitId}:${event.requestId}`, event);
-    });
-    this.emitter.addListener('google_mobile_ads_rewarded_interstitial_event', event => {
-      this.emitter.emit(`google_mobile_ads_rewarded_interstitial_event:${event.adUnitId}:${event.requestId}`, event);
-    });
+var _SharedEventEmitter = require("./internal/SharedEventEmitter");
+var _GoogleMobileAdsNativeEventEmitter = require("./internal/GoogleMobileAdsNativeEventEmitter");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const NATIVE_MODULE_EVENT_SUBSCRIPTIONS = {};
+const nativeEvents = ['google_mobile_ads_app_open_event', 'google_mobile_ads_interstitial_event', 'google_mobile_ads_rewarded_event', 'google_mobile_ads_rewarded_interstitial_event'];
+class MobileAdsModule {
+  constructor() {
+    if (nativeEvents && nativeEvents.length) {
+      for (let i = 0, len = nativeEvents.length; i < len; i++) {
+        this.subscribeToNativeModuleEvent(nativeEvents[i]);
+      }
+    }
+  }
+  subscribeToNativeModuleEvent(eventName) {
+    if (!NATIVE_MODULE_EVENT_SUBSCRIPTIONS[eventName]) {
+      _GoogleMobileAdsNativeEventEmitter.GoogleMobileAdsNativeEventEmitter.addListener(eventName, event => {
+        _SharedEventEmitter.SharedEventEmitter.emit(`${eventName}:${event.adUnitId}:${event.requestId}`, event);
+      });
+      NATIVE_MODULE_EVENT_SUBSCRIPTIONS[eventName] = true;
+    }
   }
   initialize() {
-    return this.native.initialize();
+    return _NativeGoogleMobileAdsModule.default.initialize();
   }
   setRequestConfiguration(requestConfiguration) {
     let config;
@@ -37,24 +39,17 @@ class MobileAdsModule extends _internal.Module {
         throw new Error(`googleMobileAds.setRequestConfiguration(*) ${e.message}`);
       }
     }
-    return this.native.setRequestConfiguration(config);
+    return _NativeGoogleMobileAdsModule.default.setRequestConfiguration(config);
   }
   openAdInspector() {
-    return this.native.openAdInspector();
+    return _NativeGoogleMobileAdsModule.default.openAdInspector();
   }
   openDebugMenu(adUnit) {
     if (!adUnit) throw new Error('googleMobileAds.openDebugMenu expected a non-empty string value');
-    this.native.openDebugMenu(adUnit);
+    _NativeGoogleMobileAdsModule.default.openDebugMenu(adUnit);
   }
 }
-const MobileAdsInstance = new MobileAdsModule({
-  name: 'AppName'
-}, {
-  version: _version.version,
-  namespace,
-  nativeModuleName,
-  nativeEvents: ['google_mobile_ads_app_open_event', 'google_mobile_ads_interstitial_event', 'google_mobile_ads_rewarded_event', 'google_mobile_ads_rewarded_interstitial_event']
-});
+const MobileAdsInstance = new MobileAdsModule();
 const MobileAds = () => {
   return MobileAdsInstance;
 };

package/lib/commonjs/MobileAds.js.map

@@ -1 +1 @@
-{"version":3,"names":["namespace","nativeModuleName","MobileAdsModule","Module","constructor","app","config","emitter","addListener","event","emit","adUnitId","requestId","initialize","native","setRequestConfiguration","requestConfiguration","validateAdRequestConfiguration","e","Error","message","openAdInspector","openDebugMenu","adUnit","MobileAdsInstance","name","version","nativeEvents","MobileAds"],"sourceRoot":"../../src","sources":["MobileAds.ts"],"mappings":";;;;;;AAAA;AACA;AACA;AAKA,MAAMA,SAAS,GAAG,mBAAmB;AAErC,MAAMC,gBAAgB,GAAG,CACvB,yBAAyB,EACzB,gCAAgC,EAChC,qCAAqC,EACrC,iCAAiC,EACjC,6CAA6C,CAC9C;AAOD,MAAMC,eAAe,SAASC,gBAAM,CAAqC;EACvEC,WAAW,CAACC,GAAQ,EAAEC,MAAc,EAAE;IACpC,KAAK,CAACD,GAAG,EAAEC,MAAM,CAAC;IAElB,IAAI,CAACC,OAAO,CAACC,WAAW,CAAC,kCAAkC,EAAGC,KAAY,IAAK;MAC7E,IAAI,CAACF,OAAO,CAACG,IAAI,CACd,oCAAmCD,KAAK,CAACE,QAAS,IAAGF,KAAK,CAACG,SAAU,EAAC,EACvEH,KAAK,CACN;IACH,CAAC,CAAC;IAEF,IAAI,CAACF,OAAO,CAACC,WAAW,CAAC,sCAAsC,EAAGC,KAAY,IAAK;MACjF,IAAI,CAACF,OAAO,CAACG,IAAI,CACd,wCAAuCD,KAAK,CAACE,QAAS,IAAGF,KAAK,CAACG,SAAU,EAAC,EAC3EH,KAAK,CACN;IACH,CAAC,CAAC;IAEF,IAAI,CAACF,OAAO,CAACC,WAAW,CAAC,kCAAkC,EAAGC,KAAY,IAAK;MAC7E,IAAI,CAACF,OAAO,CAACG,IAAI,CACd,oCAAmCD,KAAK,CAACE,QAAS,IAAGF,KAAK,CAACG,SAAU,EAAC,EACvEH,KAAK,CACN;IACH,CAAC,CAAC;IAEF,IAAI,CAACF,OAAO,CAACC,WAAW,CAAC,+CAA+C,EAAGC,KAAY,IAAK;MAC1F,IAAI,CAACF,OAAO,CAACG,IAAI,CACd,iDAAgDD,KAAK,CAACE,QAAS,IAAGF,KAAK,CAACG,SAAU,EAAC,EACpFH,KAAK,CACN;IACH,CAAC,CAAC;EACJ;EAEAI,UAAU,GAAG;IACX,OAAO,IAAI,CAACC,MAAM,CAACD,UAAU,EAAE;EACjC;EAEAE,uBAAuB,CAACC,oBAA0C,EAAE;IAClE,IAAIV,MAAM;IACV,IAAI;MACFA,MAAM,GAAG,IAAAW,8DAA8B,EAACD,oBAAoB,CAAC;IAC/D,CAAC,CAAC,OAAOE,CAAC,EAAE;MACV,IAAIA,CAAC,YAAYC,KAAK,EAAE;QACtB,MAAM,IAAIA,KAAK,CAAE,8CAA6CD,CAAC,CAACE,OAAQ,EAAC,CAAC;MAC5E;IACF;IAEA,OAAO,IAAI,CAACN,MAAM,CAACC,uBAAuB,CAACT,MAAM,CAAC;EACpD;EAEAe,eAAe,GAAG;IAChB,OAAO,IAAI,CAACP,MAAM,CAACO,eAAe,EAAE;EACtC;EAEAC,aAAa,CAACC,MAAc,EAAE;IAC5B,IAAI,CAACA,MAAM,EAAE,MAAM,IAAIJ,KAAK,CAAC,iEAAiE,CAAC;IAC/F,IAAI,CAACL,MAAM,CAACQ,aAAa,CAACC,MAAM,CAAC;EACnC;AACF;AAEA,MAAMC,iBAAiB,GAAG,IAAItB,eAAe,CAC3C;EAAEuB,IAAI,EAAE;AAAU,CAAC,EACnB;EACEC,OAAO,EAAPA,gBAAO;EACP1B,SAAS;EACTC,gBAAgB;EAChB0B,YAAY,EAAE,CACZ,kCAAkC,EAClC,sCAAsC,EACtC,kCAAkC,EAClC,+CAA+C;AAEnD,CAAC,CACF;AAEM,MAAMC,SAAS,GAAG,MAAM;EAC7B,OAAOJ,iBAAiB;AAC1B,CAAC;AAAC;AAAA,eAEaI,SAAS;AAAA"}
+{"version":3,"names":["NATIVE_MODULE_EVENT_SUBSCRIPTIONS","nativeEvents","MobileAdsModule","constructor","length","i","len","subscribeToNativeModuleEvent","eventName","GoogleMobileAdsNativeEventEmitter","addListener","event","SharedEventEmitter","emit","adUnitId","requestId","initialize","RNGoogleMobileAdsModule","setRequestConfiguration","requestConfiguration","config","validateAdRequestConfiguration","e","Error","message","openAdInspector","openDebugMenu","adUnit","MobileAdsInstance","MobileAds"],"sourceRoot":"../../src","sources":["MobileAds.ts"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AAAiG;AAIjG,MAAMA,iCAA0D,GAAG,CAAC,CAAC;AAErE,MAAMC,YAAY,GAAG,CACnB,kCAAkC,EAClC,sCAAsC,EACtC,kCAAkC,EAClC,+CAA+C,CAChD;AAED,MAAMC,eAAe,CAAqC;EACxDC,WAAW,GAAG;IACZ,IAAIF,YAAY,IAAIA,YAAY,CAACG,MAAM,EAAE;MACvC,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEC,GAAG,GAAGL,YAAY,CAACG,MAAM,EAAEC,CAAC,GAAGC,GAAG,EAAED,CAAC,EAAE,EAAE;QACvD,IAAI,CAACE,4BAA4B,CAACN,YAAY,CAACI,CAAC,CAAC,CAAC;MACpD;IACF;EACF;EAEAE,4BAA4B,CAACC,SAAiB,EAAE;IAC9C,IAAI,CAACR,iCAAiC,CAACQ,SAAS,CAAC,EAAE;MACjDC,oEAAiC,CAACC,WAAW,CAACF,SAAS,EAAEG,KAAK,IAAI;QAChEC,sCAAkB,CAACC,IAAI,CAAE,GAAEL,SAAU,IAAGG,KAAK,CAACG,QAAS,IAAGH,KAAK,CAACI,SAAU,EAAC,EAAEJ,KAAK,CAAC;MACrF,CAAC,CAAC;MAEFX,iCAAiC,CAACQ,SAAS,CAAC,GAAG,IAAI;IACrD;EACF;EAEAQ,UAAU,GAAG;IACX,OAAOC,oCAAuB,CAACD,UAAU,EAAE;EAC7C;EAEAE,uBAAuB,CAACC,oBAA0C,EAAE;IAClE,IAAIC,MAAM;IACV,IAAI;MACFA,MAAM,GAAG,IAAAC,8DAA8B,EAACF,oBAAoB,CAAC;IAC/D,CAAC,CAAC,OAAOG,CAAC,EAAE;MACV,IAAIA,CAAC,YAAYC,KAAK,EAAE;QACtB,MAAM,IAAIA,KAAK,CAAE,8CAA6CD,CAAC,CAACE,OAAQ,EAAC,CAAC;MAC5E;IACF;IAEA,OAAOP,oCAAuB,CAACC,uBAAuB,CAACE,MAAM,CAAC;EAChE;EAEAK,eAAe,GAAG;IAChB,OAAOR,oCAAuB,CAACQ,eAAe,EAAE;EAClD;EAEAC,aAAa,CAACC,MAAc,EAAE;IAC5B,IAAI,CAACA,MAAM,EAAE,MAAM,IAAIJ,KAAK,CAAC,iEAAiE,CAAC;IAC/FN,oCAAuB,CAACS,aAAa,CAACC,MAAM,CAAC;EAC/C;AACF;AAEA,MAAMC,iBAAiB,GAAG,IAAI1B,eAAe,EAAE;AAExC,MAAM2B,SAAS,GAAG,MAAM;EAC7B,OAAOD,iBAAiB;AAC1B,CAAC;AAAC;AAAA,eAEaC,SAAS;AAAA"}

package/lib/commonjs/NativeGoogleMobileAdsModule.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _reactNative = require("react-native");
+var _default = _reactNative.TurboModuleRegistry.getEnforcing('RNGoogleMobileAdsModule');
+exports.default = _default;
+//# sourceMappingURL=NativeGoogleMobileAdsModule.js.map

package/lib/commonjs/NativeGoogleMobileAdsModule.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["TurboModuleRegistry","getEnforcing"],"sourceRoot":"../../src","sources":["NativeGoogleMobileAdsModule.ts"],"mappings":";;;;;;AACA;AAAmD,eAYpCA,gCAAmB,CAACC,YAAY,CAAO,yBAAyB,CAAC;AAAA"}

package/lib/commonjs/ads/AppOpenAd.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.AppOpenAd = void 0;
 var _common = require("../common");
-var _MobileAds = require("../MobileAds");
 var _validateAdRequestOptions = require("../validateAdRequestOptions");
 var _MobileAd = require("./MobileAd");
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -23,7 +22,7 @@ class AppOpenAd extends _MobileAd.MobileAd {
       }
     }
     const requestId = AppOpenAd._appOpenRequest++;
-    return new AppOpenAd('app_open', (0, _MobileAds.MobileAds)(), requestId, adUnitId, options);
+    return new AppOpenAd('app_open', 'RNGoogleMobileAdsAppOpenModule', requestId, adUnitId, options);
   }
   addAdEventsListener(listener) {
     return this._addAdEventsListener(listener);

package/lib/commonjs/ads/AppOpenAd.js.map

@@ -1 +1 @@
-{"version":3,"names":["AppOpenAd","MobileAd","createForAdRequest","adUnitId","requestOptions","isString","Error","options","validateAdRequestOptions","e","message","requestId","_appOpenRequest","MobileAds","addAdEventsListener","listener","_addAdEventsListener","addAdEventListener","type","_addAdEventListener"],"sourceRoot":"../../src","sources":["AppOpenAd.ts"],"mappings":";;;;;;AAiBA;AACA;AACA;AACA;AAAsC;AAM/B,MAAMA,SAAS,SAASC,kBAAQ,CAAC;EAGtC,OAAOC,kBAAkB,CAACC,QAAgB,EAAEC,cAA+B,EAAE;IAC3E,IAAI,CAAC,IAAAC,gBAAQ,EAACF,QAAQ,CAAC,EAAE;MACvB,MAAM,IAAIG,KAAK,CAAC,sEAAsE,CAAC;IACzF;IAEA,IAAIC,OAAO,GAAG,CAAC,CAAC;IAChB,IAAI;MACFA,OAAO,GAAG,IAAAC,kDAAwB,EAACJ,cAAc,CAAC;IACpD,CAAC,CAAC,OAAOK,CAAC,EAAE;MACV,IAAIA,CAAC,YAAYH,KAAK,EAAE;QACtB,MAAM,IAAIA,KAAK,CAAE,sCAAqCG,CAAC,CAACC,OAAQ,GAAE,CAAC;MACrE;IACF;IAEA,MAAMC,SAAS,GAAGX,SAAS,CAACY,eAAe,EAAE;IAC7C,OAAO,IAAIZ,SAAS,CAAC,UAAU,EAAE,IAAAa,oBAAS,GAAE,EAAEF,SAAS,EAAER,QAAQ,EAAEI,OAAO,CAAC;EAC7E;EAEAO,mBAAmB,CAAwBC,QAA6B,EAAc;IACpF,OAAO,IAAI,CAACC,oBAAoB,CAACD,QAAQ,CAAC;EAC5C;EAEAE,kBAAkB,CAAwBC,IAAO,EAAEH,QAA4B,EAAE;IAC/E,OAAO,IAAI,CAACI,mBAAmB,CAACD,IAAI,EAAEH,QAAQ,CAAC;EACjD;AACF;AAAC;AAAA,gBA5BYf,SAAS,qBACe,CAAC"}
+{"version":3,"names":["AppOpenAd","MobileAd","createForAdRequest","adUnitId","requestOptions","isString","Error","options","validateAdRequestOptions","e","message","requestId","_appOpenRequest","addAdEventsListener","listener","_addAdEventsListener","addAdEventListener","type","_addAdEventListener"],"sourceRoot":"../../src","sources":["AppOpenAd.ts"],"mappings":";;;;;;AAiBA;AACA;AACA;AAAsC;AAM/B,MAAMA,SAAS,SAASC,kBAAQ,CAAC;EAGtC,OAAOC,kBAAkB,CAACC,QAAgB,EAAEC,cAA+B,EAAE;IAC3E,IAAI,CAAC,IAAAC,gBAAQ,EAACF,QAAQ,CAAC,EAAE;MACvB,MAAM,IAAIG,KAAK,CAAC,sEAAsE,CAAC;IACzF;IAEA,IAAIC,OAAO,GAAG,CAAC,CAAC;IAChB,IAAI;MACFA,OAAO,GAAG,IAAAC,kDAAwB,EAACJ,cAAc,CAAC;IACpD,CAAC,CAAC,OAAOK,CAAC,EAAE;MACV,IAAIA,CAAC,YAAYH,KAAK,EAAE;QACtB,MAAM,IAAIA,KAAK,CAAE,sCAAqCG,CAAC,CAACC,OAAQ,GAAE,CAAC;MACrE;IACF;IAEA,MAAMC,SAAS,GAAGX,SAAS,CAACY,eAAe,EAAE;IAC7C,OAAO,IAAIZ,SAAS,CAClB,UAAU,EACV,gCAAgC,EAChCW,SAAS,EACTR,QAAQ,EACRI,OAAO,CACR;EACH;EAEAM,mBAAmB,CAAwBC,QAA6B,EAAc;IACpF,OAAO,IAAI,CAACC,oBAAoB,CAACD,QAAQ,CAAC;EAC5C;EAEAE,kBAAkB,CAAwBC,IAAO,EAAEH,QAA4B,EAAE;IAC/E,OAAO,IAAI,CAACI,mBAAmB,CAACD,IAAI,EAAEH,QAAQ,CAAC;EACjD;AACF;AAAC;AAAA,gBAlCYd,SAAS,qBACe,CAAC"}

package/lib/commonjs/ads/BaseAd.js

@@ -5,11 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.BaseAd = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _reactNative = require("react-native");
 var _common = require("../common");
 var _NativeError = require("../internal/NativeError");
+var _GoogleMobileAdsBannerViewNativeComponent = _interopRequireDefault(require("./GoogleMobileAdsBannerViewNativeComponent"));
 var _BannerAdSize = require("../BannerAdSize");
 var _validateAdRequestOptions = require("../validateAdRequestOptions");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /* eslint-disable react/prop-types */
@@ -62,10 +63,8 @@ const BaseAd = /*#__PURE__*/_react.default.forwardRef((_ref, ref) => {
       }
     }
   }, [parsedRequestOptions]);
-  function onNativeEvent(_ref2) {
-    let {
-      nativeEvent
-    } = _ref2;
+  function onNativeEvent(event) {
+    const nativeEvent = event.nativeEvent;
     const {
       type
     } = nativeEvent;
@@ -95,11 +94,11 @@ const BaseAd = /*#__PURE__*/_react.default.forwardRef((_ref, ref) => {
       }
     }
     if (type === 'onAdLoaded' || type === 'onSizeChange') {
-      const {
-        width,
-        height
-      } = nativeEvent;
-      if (width && height) setDimensions([width, height]);
+      const width = Math.ceil(nativeEvent.width);
+      const height = Math.ceil(nativeEvent.height);
+      if (width && height && JSON.stringify([width, height]) !== JSON.stringify(dimensions)) {
+        setDimensions([width, height]);
+      }
     }
   }
   const style = sizes.includes(_BannerAdSize.GAMBannerAdSize.FLUID) ? {
@@ -109,17 +108,16 @@ const BaseAd = /*#__PURE__*/_react.default.forwardRef((_ref, ref) => {
     width: dimensions[0],
     height: dimensions[1]
   };
-  return /*#__PURE__*/_react.default.createElement(GoogleMobileAdsBannerView, {
+  return /*#__PURE__*/_react.default.createElement(_GoogleMobileAdsBannerViewNativeComponent.default, {
     ref: ref,
     sizes: sizes,
     style: style,
     unitId: unitId,
-    request: (0, _validateAdRequestOptions.validateAdRequestOptions)(requestOptions),
+    request: parsedRequestOptions,
     manualImpressionsEnabled: !!manualImpressionsEnabled,
     onNativeEvent: onNativeEvent
   });
 });
 exports.BaseAd = BaseAd;
 BaseAd.displayName = 'BaseAd';
-const GoogleMobileAdsBannerView = (0, _reactNative.requireNativeComponent)('RNGoogleMobileAdsBannerView');
 //# sourceMappingURL=BaseAd.js.map