fix: banners not properly destroyed

invertase · Dec 28, 2023 · bf0ebd2 · bf0ebd2
1 parent bfec491
commit bf0ebd2
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/...main/java/io/invertase/googlemobileads/ReactNativeGoogleMobileAdsBannerAdViewManager.java b/...main/java/io/invertase/googlemobileads/ReactNativeGoogleMobileAdsBannerAdViewManager.java
@@ -158,6 +158,20 @@ public void onAfterUpdateTransaction(@NonNull ReactNativeAdView reactViewGroup)
     reactViewGroup.setPropsChanged(false);
   }
 
+  @Override
+  public void onDropViewInstance(@NonNull ReactNativeAdView reactViewGroup) {
+    BaseAdView adView = getAdView(reactViewGroup);
+    if (adView != null) {
+      adView.setAdListener(null);
+      if (adView instanceof AdManagerAdView) {
+        ((AdManagerAdView) adView).setAppEventListener(null);
+      }
+      adView.destroy();
+      reactViewGroup.removeView(adView);
+    }
+    super.onDropViewInstance(reactViewGroup);
+  }
+
   private BaseAdView initAdView(ReactNativeAdView reactViewGroup) {
     BaseAdView oldAdView = getAdView(reactViewGroup);
     if (oldAdView != null) {

diff --git a/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerComponent.m b/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerComponent.m
@@ -23,6 +23,13 @@
 
 @implementation RNGoogleMobileAdsBannerComponent
 
+- (void)dealloc {
+  if (_banner) {
+    [_banner removeFromSuperview];
+    _banner = nil;
+  }
+}
+
 - (void)didSetProps:(NSArray<NSString *> *)changedProps {
   if (_propsChanged) {
     [self requestAd];

diff --git a/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerView.mm b/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerView.mm
@@ -94,6 +94,13 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
   [super updateProps:props oldProps:oldProps];
 }
 
+- (void)dealloc {
+  if (_banner) {
+    [_banner removeFromSuperview];
+    _banner = nil;
+  }
+}
+
 #pragma mark - Methods
 
 - (void)initBanner:(GADAdSize)adSize {