feat(banner): Support maximum height for Inline Adaptive banners

markwilcox · web-flow · commit 017ffbff9ec2 · 2025-06-07T08:49:45.000+02:00
diff --git a/RNGoogleMobileAdsExample/App.tsx b/RNGoogleMobileAdsExample/App.tsx
@@ -199,12 +199,15 @@ class InterstitialTest implements AutoExecutableTest {
 }
 
 class BannerTest implements AutoExecutableTest {
-  bannerAdSize: BannerAdSize | string;
   bannerRef: RefObject<BannerAd>;
-
-  constructor(bannerAdSize: BannerAdSize) {
+  bannerAdSize: BannerAdSize | string;
+  maxHeight?: number;
+  width?: number;
+  constructor(bannerAdSize: BannerAdSize | string, maxHeight?: number, width?: number) {
     this.bannerAdSize = bannerAdSize;
     this.bannerRef = React.createRef();
+    this.maxHeight = maxHeight;
+    this.width = width;
   }
 
   getPath(): string {
@@ -213,7 +216,9 @@ class BannerTest implements AutoExecutableTest {
       .map(
         s => s.toLowerCase().charAt(0).toUpperCase() + s.toLowerCase().slice(1),
       )
-      .join('');
+      .join('')
+      .concat(this.maxHeight ? `MaxHeight${this.maxHeight}` : '')
+      .concat(this.width ? `Width${this.width}` : '');
   }
 
   getTestType(): TestType {
@@ -231,6 +236,8 @@ class BannerTest implements AutoExecutableTest {
               : TestIds.BANNER
           }
           size={this.bannerAdSize}
+          maxHeight={this.maxHeight}
+          width={this.width}
           onPaid={(event: PaidEvent) => {
             console.log(
               `Paid: ${event.value} ${event.currency} (precision ${
@@ -1145,7 +1152,11 @@ class DebugMenuTest implements AutoExecutableTest {
 }
 
 // All tests must be registered - a future feature will allow auto-bundling of tests via configured path or regex
-Object.values(BannerAdSize).forEach(bannerAdSize => {
+Object.keys(BannerAdSize).forEach(bannerAdSize => {
+  if (bannerAdSize === "INLINE_ADAPTIVE_BANNER") {
+    TestRegistry.registerTest(new BannerTest(bannerAdSize, 100))
+    TestRegistry.registerTest(new BannerTest(bannerAdSize, 200, 200))
+  }
   TestRegistry.registerTest(new BannerTest(bannerAdSize));
 });
 TestRegistry.registerTest(new CollapsibleBannerTest());
diff --git a/android/src/main/java/io/invertase/googlemobileads/ReactNativeGoogleMobileAdsBannerAdViewManager.java b/android/src/main/java/io/invertase/googlemobileads/ReactNativeGoogleMobileAdsBannerAdViewManager.java
@@ -23,6 +23,8 @@
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableType;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.uimanager.PixelUtil;
@@ -118,26 +120,54 @@ public void setRequest(ReactNativeAdView reactViewGroup, String value) {
     }
   }
 
-  @ReactProp(name = "sizes")
-  public void setSizes(ReactNativeAdView reactViewGroup, ReadableArray value) {
-    List<AdSize> sizeList = new ArrayList<>();
-    for (Object size : value.toArrayList()) {
-      if (size instanceof String) {
-        String sizeString = (String) size;
-        sizeList.add(ReactNativeGoogleMobileAdsCommon.getAdSize(sizeString, reactViewGroup));
+  @ReactProp(name = "sizeConfig")
+  public void setSizeConfig(ReactNativeAdView reactViewGroup, ReadableMap sizeConfig) {
+    if (sizeConfig != null) {
+      // Handle maxHeight
+      if (sizeConfig.hasKey("maxHeight") && !sizeConfig.isNull("maxHeight")) {
+        float maxHeight = (float) sizeConfig.getDouble("maxHeight");
+        reactViewGroup.setMaxAdHeight(maxHeight);
+      } else {
+        reactViewGroup.setMaxAdHeight(0);
       }
-    }
 
-    if (sizeList.size() > 0 && !sizeList.contains(AdSize.FLUID)) {
-      AdSize adSize = sizeList.get(0);
-      WritableMap payload = Arguments.createMap();
-      payload.putDouble("width", adSize.getWidth());
-      payload.putDouble("height", adSize.getHeight());
-      sendEvent(reactViewGroup, EVENT_SIZE_CHANGE, payload);
-    }
+      // Handle width
+      if (sizeConfig.hasKey("width") && !sizeConfig.isNull("width")) {
+        float width = (float) sizeConfig.getDouble("width");
+        reactViewGroup.setAdWidth(width);
+      } else {
+        reactViewGroup.setAdWidth(0);
+      }
+      // Handle the sizes array
+      if (sizeConfig.hasKey("sizes") && !sizeConfig.isNull("sizes")) {
+        ReadableArray sizesArray = sizeConfig.getArray("sizes");
+        if (sizesArray != null) {
+          // Process the sizes array and convert to AdSize objects
+          List<AdSize> sizeList = new ArrayList<>();
+          for (int i = 0; i < sizesArray.size(); i++) {
+            if (sizesArray.getType(i) == ReadableType.String) {
+              String sizeString = sizesArray.getString(i);
+              AdSize adSize =
+                  ReactNativeGoogleMobileAdsCommon.getAdSize(sizeString, reactViewGroup);
+              sizeList.add(adSize);
+            }
+          }
 
-    reactViewGroup.setSizes(sizeList);
-    reactViewGroup.setPropsChanged(true);
+          // Update the view with sizes and trigger size change event if needed
+          if (sizeList.size() > 0 && !sizeList.contains(AdSize.FLUID)) {
+            AdSize adSize = sizeList.get(0);
+            WritableMap payload = Arguments.createMap();
+            payload.putDouble("width", adSize.getWidth());
+            payload.putDouble("height", adSize.getHeight());
+            sendEvent(reactViewGroup, EVENT_SIZE_CHANGE, payload);
+          }
+
+          reactViewGroup.setSizes(sizeList);
+        }
+      }
+
+      reactViewGroup.setPropsChanged(true);
+    }
   }
 
   @ReactProp(name = "manualImpressionsEnabled")
diff --git a/android/src/main/java/io/invertase/googlemobileads/ReactNativeGoogleMobileAdsCommon.java b/android/src/main/java/io/invertase/googlemobileads/ReactNativeGoogleMobileAdsCommon.java
@@ -30,6 +30,7 @@
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.AdSize;
 import com.google.android.gms.ads.admanager.AdManagerAdRequest;
+import io.invertase.googlemobileads.common.ReactNativeAdView;
 import io.invertase.googlemobileads.common.ReactNativeEventEmitter;
 import java.util.ArrayList;
 import java.util.Map;
@@ -50,9 +51,18 @@ static AdSize getAdSizeForAdaptiveBanner(String preDefinedAdSize, ViewGroup reac
 
       DisplayMetrics outMetrics = new DisplayMetrics();
       display.getMetrics(outMetrics);
-      int adWidth = (int) (outMetrics.widthPixels / outMetrics.density);
 
+      // Get custom width if set, otherwise use device width
+      float customWidth = ((ReactNativeAdView) reactViewGroup).getAdWidth();
+      int screenWidth = (int) (outMetrics.widthPixels / outMetrics.density);
+      int adWidth = customWidth > 0 ? Math.min(Math.round(customWidth), screenWidth) : screenWidth;
+
+      float maxAdHeight = ((ReactNativeAdView) reactViewGroup).getMaxAdHeight();
       if ("INLINE_ADAPTIVE_BANNER".equals(preDefinedAdSize)) {
+        if (maxAdHeight > 0) {
+          return AdSize.getInlineAdaptiveBannerAdSize(
+              adWidth, Math.round(Math.max(maxAdHeight, 32)));
+        }
         return AdSize.getCurrentOrientationInlineAdaptiveBannerAdSize(
             reactViewGroup.getContext(), adWidth);
       }
diff --git a/android/src/main/java/io/invertase/googlemobileads/common/ReactNativeAdView.java b/android/src/main/java/io/invertase/googlemobileads/common/ReactNativeAdView.java
@@ -18,6 +18,8 @@
 public class ReactNativeAdView extends FrameLayout {
   private AdRequest request;
   private List<AdSize> sizes;
+  private float maxAdHeight;
+  private float adWidth;
   private String unitId;
   private boolean manualImpressionsEnabled;
   private boolean propsChanged;
@@ -74,6 +76,22 @@ public List<AdSize> getSizes() {
     return this.sizes;
   }
 
+  public void setMaxAdHeight(float maxAdHeight) {
+    this.maxAdHeight = maxAdHeight;
+  }
+
+  public float getMaxAdHeight() {
+    return this.maxAdHeight;
+  }
+
+  public void setAdWidth(float adWidth) {
+    this.adWidth = adWidth;
+  }
+
+  public float getAdWidth() {
+    return this.adWidth;
+  }
+
   public void setUnitId(String unitId) {
     this.unitId = unitId;
   }
diff --git a/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerComponent.h b/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerComponent.h
@@ -27,7 +27,7 @@
 @property GADBannerView *banner;
 @property(nonatomic, assign) BOOL requested;
 
-@property(nonatomic, copy) NSArray *sizes;
+@property(nonatomic, copy) NSDictionary *sizeConfig;
 @property(nonatomic, copy) NSString *unitId;
 @property(nonatomic, copy) NSDictionary *request;
 @property(nonatomic, copy) NSNumber *manualImpressionsEnabled;
diff --git a/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerComponent.m b/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerComponent.m
@@ -49,7 +49,7 @@ - (void)initBanner:(GADAdSize)adSize {
       _banner.autoresizingMask = (UIViewAutoresizingFlexibleWidth);
     }
 
-    ((GAMBannerView *)_banner).validAdSizes = _sizes;
+    ((GAMBannerView *)_banner).validAdSizes = _sizeConfig[@"sizes"];
     ((GAMBannerView *)_banner).appEventDelegate = self;
     ((GAMBannerView *)_banner).enableManualImpressions = [_manualImpressionsEnabled boolValue];
   } else {
@@ -64,17 +64,26 @@ - (void)setUnitId:(NSString *)unitId {
   _propsChanged = true;
 }
 
-- (void)setSizes:(NSArray *)sizes {
+- (void)setSizeConfig:(NSDictionary *)sizeConfig {
+  NSArray *sizes = sizeConfig[@"sizes"];
   __block NSMutableArray *adSizes = [[NSMutableArray alloc] initWithCapacity:sizes.count];
+  CGFloat maxHeight = sizeConfig[@"maxHeight"] ? [sizeConfig[@"maxHeight"] doubleValue] : -1;
+  CGFloat width = sizeConfig[@"width"] ? [sizeConfig[@"width"] doubleValue] : -1;
   [sizes enumerateObjectsUsingBlock:^(id jsonValue, NSUInteger idx, __unused BOOL *stop) {
-    GADAdSize adSize = [RNGoogleMobileAdsCommon stringToAdSize:jsonValue];
+    GADAdSize adSize = [RNGoogleMobileAdsCommon stringToAdSize:jsonValue
+                                                 withMaxHeight:maxHeight
+                                                      andWidth:width];
     if (GADAdSizeEqualToSize(adSize, GADAdSizeInvalid)) {
       RCTLogWarn(@"Invalid adSize %@", jsonValue);
     } else {
       [adSizes addObject:NSValueFromGADAdSize(adSize)];
     }
   }];
-  _sizes = adSizes;
+  _sizeConfig = @{
+    @"sizes" : adSizes,
+    @"maxHeight" : [NSNumber numberWithFloat:maxHeight],
+    @"width" : [NSNumber numberWithFloat:width]
+  };
   _propsChanged = true;
 }
 
@@ -94,21 +103,22 @@ - (void)setManualImpressionsEnabled:(BOOL *)manualImpressionsEnabled {
 }
 
 - (GADAdSize)getInitialAdSize {
-  for (NSValue *sizeValue in _sizes) {
+  NSArray *sizes = _sizeConfig[@"sizes"];
+  for (NSValue *sizeValue in sizes) {
     GADAdSize adSize = GADAdSizeFromNSValue(sizeValue);
     if (GADAdSizeEqualToSize(adSize, GADAdSizeFluid)) {
       return GADAdSizeFluid;
     }
   }
-  return GADAdSizeFromNSValue(_sizes[0]);
+  return GADAdSizeFromNSValue(sizes[0]);
 }
 
 - (void)requestAd {
 #ifndef __LP64__
   return;  // prevent crash on 32bit
 #endif
 
-  if (_unitId == nil || _sizes == nil || _request == nil || _manualImpressionsEnabled == nil) {
+  if (_unitId == nil || _sizeConfig == nil || _request == nil || _manualImpressionsEnabled == nil) {
     [self setRequested:NO];
     return;
   }
diff --git a/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerView.h b/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerView.h
@@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property GADBannerView *banner;
 @property(nonatomic, assign) BOOL requested;
 
-@property(nonatomic, copy) NSArray *sizes;
+@property(nonatomic, copy) NSDictionary *sizeConfig;
 @property(nonatomic, copy) NSString *unitId;
 @property(nonatomic, copy) NSDictionary *request;
 @property(nonatomic, copy) NSNumber *manualImpressionsEnabled;
diff --git a/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerView.mm b/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerView.mm
@@ -57,18 +57,31 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
     propsChanged = true;
   }
 
-  if (oldViewProps.sizes != newViewProps.sizes) {
-    NSMutableArray *adSizes = [NSMutableArray arrayWithCapacity:newViewProps.sizes.size()];
-    for (auto i = 0; i < newViewProps.sizes.size(); i++) {
-      NSString *jsonValue = [[NSString alloc] initWithUTF8String:newViewProps.sizes[i].c_str()];
-      GADAdSize adSize = [RNGoogleMobileAdsCommon stringToAdSize:jsonValue];
+  if (oldViewProps.sizeConfig.sizes != newViewProps.sizeConfig.sizes ||
+      oldViewProps.sizeConfig.maxHeight != newViewProps.sizeConfig.maxHeight ||
+      oldViewProps.sizeConfig.width != newViewProps.sizeConfig.width) {
+    NSMutableArray *adSizes =
+        [NSMutableArray arrayWithCapacity:newViewProps.sizeConfig.sizes.size()];
+    CGFloat maxAdHeight =
+        newViewProps.sizeConfig.maxHeight > 0 ? newViewProps.sizeConfig.maxHeight : -1;
+    CGFloat width = newViewProps.sizeConfig.width > 0 ? newViewProps.sizeConfig.width : -1;
+    for (auto i = 0; i < newViewProps.sizeConfig.sizes.size(); i++) {
+      NSString *jsonValue =
+          [[NSString alloc] initWithUTF8String:newViewProps.sizeConfig.sizes[i].c_str()];
+      GADAdSize adSize = [RNGoogleMobileAdsCommon stringToAdSize:jsonValue
+                                                   withMaxHeight:maxAdHeight
+                                                        andWidth:width];
       if (GADAdSizeEqualToSize(adSize, GADAdSizeInvalid)) {
         RCTLogWarn(@"Invalid adSize %@", jsonValue);
       } else {
         [adSizes addObject:NSValueFromGADAdSize(adSize)];
       }
     }
-    _sizes = adSizes;
+    _sizeConfig = @{
+      @"sizes" : adSizes,
+      @"maxHeight" : [NSNumber numberWithFloat:maxAdHeight],
+      @"width" : [NSNumber numberWithFloat:width]
+    };
     propsChanged = true;
   }
 
@@ -117,7 +130,7 @@ - (void)initBanner:(GADAdSize)adSize {
   if ([RNGoogleMobileAdsCommon isAdManagerUnit:_unitId]) {
     _banner = [[GAMBannerView alloc] initWithAdSize:adSize];
 
-    ((GAMBannerView *)_banner).validAdSizes = _sizes;
+    ((GAMBannerView *)_banner).validAdSizes = _sizeConfig[@"sizes"];
     ((GAMBannerView *)_banner).appEventDelegate = self;
     ((GAMBannerView *)_banner).enableManualImpressions = [_manualImpressionsEnabled boolValue];
   } else {
@@ -140,11 +153,11 @@ - (void)requestAd {
   return;  // prevent crash on 32bit
 #endif
 
-  if (_unitId == nil || _sizes == nil || _request == nil || _manualImpressionsEnabled == nil) {
+  if (_unitId == nil || _sizeConfig == nil || _request == nil || _manualImpressionsEnabled == nil) {
     [self setRequested:NO];
     return;
   } else {
-    [self initBanner:GADAdSizeFromNSValue(_sizes[0])];
+    [self initBanner:GADAdSizeFromNSValue(_sizeConfig[@"sizes"][0])];
     [self addSubview:_banner];
     _banner.adUnitID = _unitId;
     [self setRequested:YES];
diff --git a/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerViewManager.mm b/ios/RNGoogleMobileAds/RNGoogleMobileAdsBannerViewManager.mm
@@ -31,7 +31,7 @@ @implementation RNGoogleMobileAdsBannerViewManager
 
 RCT_EXPORT_MODULE(RNGoogleMobileAdsBannerView);
 
-RCT_EXPORT_VIEW_PROPERTY(sizes, NSArray);
+RCT_EXPORT_VIEW_PROPERTY(sizeConfig, NSDictionary);
 
 RCT_EXPORT_VIEW_PROPERTY(unitId, NSString);
 
diff --git a/ios/RNGoogleMobileAds/RNGoogleMobileAdsCommon.h b/ios/RNGoogleMobileAds/RNGoogleMobileAdsCommon.h
@@ -34,7 +34,9 @@
               error:(nullable NSDictionary *)error
                data:(nullable NSDictionary *)data;
 
-+ (GADAdSize)stringToAdSize:(NSString *)value;
++ (GADAdSize)stringToAdSize:(NSString *)value
+              withMaxHeight:(CGFloat)maxHeight
+                   andWidth:(CGFloat)adWidth;
 
 + (BOOL)isAdManagerUnit:(NSString *)unitId;
 
diff --git a/ios/RNGoogleMobileAds/RNGoogleMobileAdsCommon.mm b/ios/RNGoogleMobileAds/RNGoogleMobileAdsCommon.mm
@@ -160,7 +160,9 @@ + (void)sendAdEvent:(NSString *)event
   [[RNRCTEventEmitter shared] sendEventWithName:event body:payload];
 }
 
-+ (GADAdSize)stringToAdSize:(NSString *)value {
++ (GADAdSize)stringToAdSize:(NSString *)value
+              withMaxHeight:(CGFloat)maxHeight
+                   andWidth:(CGFloat)adWidth {
   NSError *error = nil;
   NSRegularExpression *regex =
       [NSRegularExpression regularExpressionWithPattern:@"([0-9]+)x([0-9]+)"
@@ -202,8 +204,11 @@ + (GADAdSize)stringToAdSize:(NSString *)value {
       frame =
           UIEdgeInsetsInsetRect(frame, [UIApplication sharedApplication].keyWindow.safeAreaInsets);
     }
-    CGFloat viewWidth = frame.size.width;
+    CGFloat viewWidth = adWidth > 0 ? MIN(frame.size.width, adWidth) : frame.size.width;
     if ([value isEqualToString:@"INLINE_ADAPTIVE_BANNER"]) {
+      if (maxHeight > 0) {
+        return GADInlineAdaptiveBannerAdSizeWithWidthAndMaxHeight(viewWidth, MAX(maxHeight, 32.0));
+      }
       return GADCurrentOrientationInlineAdaptiveBannerAdSizeWithWidth(viewWidth);
     }
     return GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(viewWidth);
diff --git a/src/ads/BaseAd.tsx b/src/ads/BaseAd.tsx
diff --git a/src/specs/components/GoogleMobileAdsBannerViewNativeComponent.ts b/src/specs/components/GoogleMobileAdsBannerViewNativeComponent.ts
diff --git a/src/types/BannerAdProps.ts b/src/types/BannerAdProps.ts
diff --git a/yarn.lock b/yarn.lock
