react-native-google-mobile-ads 6.2.0 → 6.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. package/ios/RNGoogleMobileAds/RNGoogleMobileAdsAppOpenModule.m +1 -2
  2. package/ios/RNGoogleMobileAds/RNGoogleMobileAdsCommon.h +2 -0
  3. package/ios/RNGoogleMobileAds/RNGoogleMobileAdsCommon.m +11 -0
  4. package/ios/RNGoogleMobileAds/RNGoogleMobileAdsInterstitialModule.m +1 -2
  5. package/ios/RNGoogleMobileAds/RNGoogleMobileAdsRewardedInterstitialModule.m +1 -1
  6. package/ios/RNGoogleMobileAds/RNGoogleMobileAdsRewardedModule.m +18 -18
  7. package/lib/commonjs/version.js +1 -1
  8. package/lib/commonjs/version.js.map +1 -1
  9. package/lib/module/version.js +1 -1
  10. package/lib/module/version.js.map +1 -1
  11. package/lib/typescript/index.d.ts +1 -1
  12. package/lib/typescript/version.d.ts +1 -1
  13. package/package.json +1 -1
  14. package/src/version.ts +1 -1
package/ios/RNGoogleMobileAds/RNGoogleMobileAdsAppOpenModule.m CHANGED
@@ -82,8 +82,7 @@ RCT_EXPORT_METHOD(appOpenShow
82
82
  : (RCTPromiseResolveBlock)resolve
83
83
  : (RCTPromiseRejectBlock)reject) {
84
84
  if (self.appOpenAd) {
85
- [self.appOpenAd
86
- presentFromRootViewController:RCTSharedApplication().delegate.window.rootViewController];
85
+ [self.appOpenAd presentFromRootViewController:RNGoogleMobileAdsCommon.currentViewController];
87
86
  resolve([NSNull null]);
88
87
  } else {
89
88
  [RNSharedUtils
package/ios/RNGoogleMobileAds/RNGoogleMobileAdsCommon.h CHANGED
@@ -36,6 +36,8 @@
36
36
 
37
37
  + (BOOL)isAdManagerUnit:(NSString *)unitId;
38
38
 
39
+ + (nullable UIViewController *)currentViewController;
40
+
39
41
  @end
40
42
 
41
43
  @interface RNGADInterstitial : GADInterstitialAd
package/ios/RNGoogleMobileAds/RNGoogleMobileAdsCommon.m CHANGED
@@ -209,4 +209,15 @@ NSString *const GOOGLE_MOBILE_ADS_EVENT_REWARDED_EARNED_REWARD = @"rewarded_earn
209
209
  return [unitId hasPrefix:@"/"];
210
210
  }
211
211
 
212
+ + (UIViewController *)currentViewController {
213
+ UIViewController *controller = [[[UIApplication sharedApplication] keyWindow] rootViewController];
214
+ UIViewController *presentedController = controller.presentedViewController;
215
+
216
+ while (presentedController && ![presentedController isBeingDismissed]) {
217
+ controller = presentedController;
218
+ presentedController = controller.presentedViewController;
219
+ }
220
+ return controller;
221
+ }
222
+
212
223
  @end
package/ios/RNGoogleMobileAds/RNGoogleMobileAdsInterstitialModule.m CHANGED
@@ -121,8 +121,7 @@ RCT_EXPORT_METHOD(interstitialShow
121
121
  : (RCTPromiseRejectBlock)reject) {
122
122
  GADInterstitialAd *interstitial = interstitialMap[requestId];
123
123
  if (interstitial) {
124
- [interstitial
125
- presentFromRootViewController:RCTSharedApplication().delegate.window.rootViewController];
124
+ [interstitial presentFromRootViewController:RNGoogleMobileAdsCommon.currentViewController];
126
125
  resolve([NSNull null]);
127
126
  } else {
128
127
  [RNSharedUtils
package/ios/RNGoogleMobileAds/RNGoogleMobileAdsRewardedInterstitialModule.m CHANGED
@@ -142,7 +142,7 @@ RCT_EXPORT_METHOD(rewardedInterstitialShow
142
142
 
143
143
  if (rewardedInterstitialAd) {
144
144
  [rewardedInterstitialAd
145
- presentFromRootViewController:RCTSharedApplication().delegate.window.rootViewController
145
+ presentFromRootViewController:RNGoogleMobileAdsCommon.currentViewController
146
146
  userDidEarnRewardHandler:^{
147
147
  GADAdReward *reward = rewardedInterstitialAd.adReward;
148
148
  NSMutableDictionary *data = [NSMutableDictionary dictionary];
package/ios/RNGoogleMobileAds/RNGoogleMobileAdsRewardedModule.m CHANGED
@@ -141,24 +141,24 @@ RCT_EXPORT_METHOD(rewardedShow
141
141
  GADRewardedAd *rewardedAd = rewardedMap[requestId];
142
142
 
143
143
  if (rewardedAd) {
144
- [rewardedAd
145
- presentFromRootViewController:RCTSharedApplication().delegate.window.rootViewController
146
- userDidEarnRewardHandler:^{
147
- GADAdReward *reward = rewardedAd.adReward;
148
- NSMutableDictionary *data = [NSMutableDictionary dictionary];
149
- if (reward.type != nil) {
150
- [data setValue:reward.type forKey:@"type"];
151
- }
152
- if (reward.amount != nil) {
153
- [data setValue:reward.amount forKey:@"amount"];
154
- }
155
- [RNGoogleMobileAdsCommon sendAdEvent:GOOGLE_MOBILE_ADS_EVENT_REWARDED
156
- requestId:requestId
157
- type:GOOGLE_MOBILE_ADS_EVENT_REWARDED_EARNED_REWARD
158
- adUnitId:rewardedAd.adUnitID
159
- error:nil
160
- data:data];
161
- }];
144
+ [rewardedAd presentFromRootViewController:RNGoogleMobileAdsCommon.currentViewController
145
+ userDidEarnRewardHandler:^{
146
+ GADAdReward *reward = rewardedAd.adReward;
147
+ NSMutableDictionary *data = [NSMutableDictionary dictionary];
148
+ if (reward.type != nil) {
149
+ [data setValue:reward.type forKey:@"type"];
150
+ }
151
+ if (reward.amount != nil) {
152
+ [data setValue:reward.amount forKey:@"amount"];
153
+ }
154
+ [RNGoogleMobileAdsCommon
155
+ sendAdEvent:GOOGLE_MOBILE_ADS_EVENT_REWARDED
156
+ requestId:requestId
157
+ type:GOOGLE_MOBILE_ADS_EVENT_REWARDED_EARNED_REWARD
158
+ adUnitId:rewardedAd.adUnitID
159
+ error:nil
160
+ data:data];
161
+ }];
162
162
  } else {
163
163
  [RNSharedUtils
164
164
  rejectPromiseWithUserInfo:reject
package/lib/commonjs/version.js CHANGED
@@ -5,6 +5,6 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.version = void 0;
7
7
  // Generated by genversion.
8
- const version = '6.2.0';
8
+ const version = '6.2.1';
9
9
  exports.version = version;
10
10
  //# sourceMappingURL=version.js.map
package/lib/commonjs/version.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["version.ts"],"names":["version"],"mappings":";;;;;;AAAA;AACO,MAAMA,OAAO,GAAG,OAAhB","sourcesContent":["// Generated by genversion.\nexport const version = '6.2.0';\n"]}
1
+ {"version":3,"sources":["version.ts"],"names":["version"],"mappings":";;;;;;AAAA;AACO,MAAMA,OAAO,GAAG,OAAhB","sourcesContent":["// Generated by genversion.\nexport const version = '6.2.1';\n"]}
package/lib/module/version.js CHANGED
@@ -1,3 +1,3 @@
1
1
  // Generated by genversion.
2
- export const version = '6.2.0';
2
+ export const version = '6.2.1';
3
3
  //# sourceMappingURL=version.js.map
package/lib/module/version.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["version.ts"],"names":["version"],"mappings":"AAAA;AACA,OAAO,MAAMA,OAAO,GAAG,OAAhB","sourcesContent":["// Generated by genversion.\nexport const version = '6.2.0';\n"]}
1
+ {"version":3,"sources":["version.ts"],"names":["version"],"mappings":"AAAA;AACA,OAAO,MAAMA,OAAO,GAAG,OAAhB","sourcesContent":["// Generated by genversion.\nexport const version = '6.2.1';\n"]}
package/lib/typescript/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- export declare const SDK_VERSION = "6.2.0";
1
+ export declare const SDK_VERSION = "6.2.1";
2
2
  export { default, MobileAds } from './MobileAds';
3
3
  export { AdsConsentDebugGeography } from './AdsConsentDebugGeography';
4
4
  export { AdsConsentPurposes } from './AdsConsentPurposes';
package/lib/typescript/version.d.ts CHANGED
@@ -1 +1 @@
1
- export declare const version = "6.2.0";
1
+ export declare const version = "6.2.1";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-native-google-mobile-ads",
3
- "version": "6.2.0",
3
+ "version": "6.2.1",
4
4
  "author": "Invertase <oss@invertase.io> (http://invertase.io)",
5
5
  "description": "React Native Google Mobile Ads is an easy way to monetize mobile apps with targeted, in-app advertising.",
6
6
  "main": "lib/commonjs/index.js",
package/src/version.ts CHANGED
@@ -1,2 +1,2 @@
1
1
  // Generated by genversion.
2
- export const version = '6.2.0';
2
+ export const version = '6.2.1';