cloudx-react-native 3.10.0 → 3.11.0

package/android/src/oldarch/com/cloudxreactnative/CloudXNativeAdViewManager.kt

@@ -0,0 +1,118 @@
+package com.cloudxreactnative
+
+import android.view.View
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.annotations.ReactProp
+
+/**
+ * Old-Architecture (Paper) view manager for CloudXNativeAdView. Props are
+ * wired via [ReactProp] and commands via manual [receiveCommand] overloads
+ * (Paper has no codegen delegate); all logic delegates to the shared
+ * CloudXNativeAdViewManagerImpl.
+ */
+class CloudXNativeAdViewManager : ViewGroupManager<CloudXNativeAdView>() {
+
+    private companion object {
+        const val COMMAND_LOAD_AD = 1
+        const val COMMAND_DESTROY_AD = 2
+        const val COMMAND_UPDATE_ASSET_VIEW = 3
+        const val COMMAND_RENDER_NATIVE_AD = 4
+    }
+
+    override fun getName(): String = CloudXNativeAdViewManagerImpl.NAME
+
+    override fun createViewInstance(reactContext: ThemedReactContext): CloudXNativeAdView =
+        CloudXNativeAdViewManagerImpl.createViewInstance(reactContext)
+
+    override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> =
+        CloudXNativeAdViewManagerImpl.getExportedCustomDirectEventTypeConstants()
+
+    @ReactProp(name = "adUnitId")
+    fun setAdUnitId(view: CloudXNativeAdView, value: String?) = CloudXNativeAdViewManagerImpl.setAdUnitId(view, value)
+
+    @ReactProp(name = "templateName")
+    fun setTemplateName(view: CloudXNativeAdView, value: String?) = CloudXNativeAdViewManagerImpl.setTemplateName(view, value)
+
+    // Legacy alias matching the archived package's public prop name; the Old
+    // Architecture is not governed by the codegen props struct, so it can keep
+    // accepting `template` for publisher compatibility (parity with iOS).
+    @ReactProp(name = "template")
+    fun setTemplate(view: CloudXNativeAdView, value: String?) = CloudXNativeAdViewManagerImpl.setTemplateName(view, value)
+
+    @ReactProp(name = "placement")
+    fun setPlacement(view: CloudXNativeAdView, value: String?) = CloudXNativeAdViewManagerImpl.setPlacement(view, value)
+
+    @ReactProp(name = "customData")
+    fun setCustomData(view: CloudXNativeAdView, value: String?) = CloudXNativeAdViewManagerImpl.setCustomData(view, value)
+
+    @ReactProp(name = "extraParameters")
+    fun setExtraParameters(view: CloudXNativeAdView, value: ReadableArray?) = CloudXNativeAdViewManagerImpl.setExtraParameters(view, value)
+
+    @ReactProp(name = "localExtraParameters")
+    fun setLocalExtraParameters(view: CloudXNativeAdView, value: ReadableArray?) = CloudXNativeAdViewManagerImpl.setLocalExtraParameters(view, value)
+
+    @ReactProp(name = "disableVideoFullScreen", defaultBoolean = false)
+    fun setDisableVideoFullScreen(view: CloudXNativeAdView, value: Boolean) = CloudXNativeAdViewManagerImpl.setDisableVideoFullScreen(view, value)
+
+    @ReactProp(name = "startVideoUnmuted", defaultBoolean = false)
+    fun setStartVideoUnmuted(view: CloudXNativeAdView, value: Boolean) = CloudXNativeAdViewManagerImpl.setStartVideoUnmuted(view, value)
+
+    @ReactProp(name = "hideVideoMediaControls", defaultBoolean = false)
+    fun setHideVideoMediaControls(view: CloudXNativeAdView, value: Boolean) = CloudXNativeAdViewManagerImpl.setHideVideoMediaControls(view, value)
+
+    @ReactProp(name = "manualRender", defaultBoolean = false)
+    fun setManualRender(view: CloudXNativeAdView, value: Boolean) = CloudXNativeAdViewManagerImpl.setManualRender(view, value)
+
+    // React-children shadow accessors: see CloudXNativeAdViewManagerImpl for why
+    // the SDK-owned ad view must stay invisible to React's manageChildren.
+
+    override fun getChildCount(parent: CloudXNativeAdView): Int = CloudXNativeAdViewManagerImpl.getChildCount(parent)
+
+    override fun getChildAt(parent: CloudXNativeAdView, index: Int): View? = CloudXNativeAdViewManagerImpl.getChildAt(parent, index)
+
+    override fun addView(parent: CloudXNativeAdView, child: View, index: Int) = CloudXNativeAdViewManagerImpl.addView(parent, child, index)
+
+    override fun removeViewAt(parent: CloudXNativeAdView, index: Int) = CloudXNativeAdViewManagerImpl.removeViewAt(parent, index)
+
+    override fun removeAllViews(parent: CloudXNativeAdView) = CloudXNativeAdViewManagerImpl.removeAllViews(parent)
+
+    override fun getCommandsMap(): MutableMap<String, Int> =
+        mutableMapOf(
+            "loadAd" to COMMAND_LOAD_AD,
+            "destroyAd" to COMMAND_DESTROY_AD,
+            "updateAssetView" to COMMAND_UPDATE_ASSET_VIEW,
+            "renderNativeAd" to COMMAND_RENDER_NATIVE_AD,
+        )
+
+    override fun receiveCommand(view: CloudXNativeAdView, commandId: String?, args: ReadableArray?) {
+        when (commandId) {
+            "loadAd" -> CloudXNativeAdViewManagerImpl.loadAd(view)
+            "destroyAd" -> CloudXNativeAdViewManagerImpl.destroyAd(view)
+            "updateAssetView" -> {
+                if (args == null || args.size() < 2) return
+                CloudXNativeAdViewManagerImpl.updateAssetView(view, args.getInt(0), args.getString(1) ?: return)
+            }
+            "renderNativeAd" -> CloudXNativeAdViewManagerImpl.renderNativeAd(view)
+        }
+    }
+
+    @Deprecated("Use the String-based receiveCommand overload.")
+    override fun receiveCommand(view: CloudXNativeAdView, commandId: Int, args: ReadableArray?) {
+        when (commandId) {
+            COMMAND_LOAD_AD -> CloudXNativeAdViewManagerImpl.loadAd(view)
+            COMMAND_DESTROY_AD -> CloudXNativeAdViewManagerImpl.destroyAd(view)
+            COMMAND_UPDATE_ASSET_VIEW -> {
+                if (args == null || args.size() < 2) return
+                CloudXNativeAdViewManagerImpl.updateAssetView(view, args.getInt(0), args.getString(1) ?: return)
+            }
+            COMMAND_RENDER_NATIVE_AD -> CloudXNativeAdViewManagerImpl.renderNativeAd(view)
+        }
+    }
+
+    override fun onDropViewInstance(view: CloudXNativeAdView) {
+        CloudXNativeAdViewManagerImpl.onDropViewInstance(view)
+        super.onDropViewInstance(view)
+    }
+}

package/cloudx-react-native.podspec

@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
 
   s.requires_arc = true
 
-  s.dependency "CloudXCore", "~> 3.10.0"
+  s.dependency "CloudXCore", "~> 3.11.0"
 
   s.source_files = "ios/**/*.{h,mm}"
   s.resource_bundles = { 'CloudXReactNativePrivacy' => ['ios/PrivacyInfo.xcprivacy'] }

package/ios/CloudX.h

@@ -42,6 +42,14 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (NSDictionary<NSString *, id> *)adDisplayFailedInfoForAd:(CLXAd *)ad withError:(CLXError *)error;
 
+/**
+ * Builds the native ad's own metadata dictionary (title, media, icon, etc.) from a
+ * @c CLXAd . Exposed so the in-tree @c CloudXNativeAdView host and this class's
+ * generic ad-info builder share one source of truth for the shape of native ad
+ * metadata instead of duplicating the icon/media/options extraction logic.
+ */
+- (NSDictionary<NSString *, id> *)nativeAdMetadataForAd:(CLXAd *)ad;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/CloudX.mm

@@ -177,7 +177,7 @@ RCT_EXPORT_MODULE(CloudX)
         self.appOpenAds    = [NSMutableDictionary dictionaryWithCapacity: 2];
         self.rewardedAds   = [NSMutableDictionary dictionaryWithCapacity: 2];
 
-        self.adViews                         = [NSMutableDictionary dictionaryWithCapacity: 2];
+        self.adViews                       = [NSMutableDictionary dictionaryWithCapacity: 2];
         self.adViewAdFormats                 = [NSMutableDictionary dictionaryWithCapacity: 2];
         self.adViewPositions                 = [NSMutableDictionary dictionaryWithCapacity: 2];
         self.adViewOffsets                   = [NSMutableDictionary dictionaryWithCapacity: 2];
@@ -190,6 +190,42 @@ RCT_EXPORT_MODULE(CloudX)
     return self;
 }
 
+- (void)invalidate
+{
+    [super invalidate];
+
+    dispatch_async( dispatch_get_main_queue(), ^{
+        for ( CLXAppOpen *appOpen in self.appOpenAds.allValues )
+        {
+            appOpen.delegate = nil;
+            [appOpen destroy];
+        }
+        [self.appOpenAds removeAllObjects];
+
+        for ( CLXInterstitial *interstitial in self.interstitials.allValues )
+        {
+            interstitial.delegate = nil;
+            [interstitial destroy];
+        }
+        [self.interstitials removeAllObjects];
+
+        for ( CLXRewarded *rewarded in self.rewardedAds.allValues )
+        {
+            rewarded.delegate = nil;
+            [rewarded destroy];
+        }
+        [self.rewardedAds removeAllObjects];
+
+        // Banner/MREC overlays: each ad unit owns a window-level CLXBannerAdView
+        // plus a safe-area background and per-unit maps. Without tearing these
+        // down here, bridge invalidation orphans the attached overlay views.
+        for ( NSString *adUnitIdentifier in self.adViews.allKeys )
+        {
+            [self teardownAdViewForAdUnitIdentifier: adUnitIdentifier];
+        }
+    } );
+}
+
 #pragma mark - Initialization
 
 RCT_EXPORT_METHOD(isInitialized:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
@@ -1188,32 +1224,41 @@ RCT_EXPORT_METHOD(destroyRewarded:(NSString *)adUnitIdentifier)
 {
     [self executeOnMainQueue:^{
         [self log: @"Destroying %ld with ad unit identifier \"%@\"", (long)adFormat, adUnitIdentifier];
+        [self teardownAdViewForAdUnitIdentifier: adUnitIdentifier];
+    }];
+}
 
-        [self.adUnitIdentifiersToShowAfterCreate removeObject: adUnitIdentifier];
+// Per-view overlay teardown shared by destroyAdViewWithAdUnitIdentifier: and
+// invalidate so bridge invalidation can't orphan banner/MREC overlays. Must be
+// called on the main queue. On the main queue retrieveAdViewForAdUnitIdentifier:
+// with a nil position returns exactly self.adViews[adUnitIdentifier], so reading
+// the map directly keeps the public method byte-identical.
+- (void)teardownAdViewForAdUnitIdentifier:(NSString *)adUnitIdentifier
+{
+    [self.adUnitIdentifiersToShowAfterCreate removeObject: adUnitIdentifier];
 
-        CLXBannerAdView *view = [self retrieveAdViewForAdUnitIdentifier: adUnitIdentifier adFormat: adFormat];
-        view.delegate        = nil;
-        view.revenueDelegate = nil;
+    CLXBannerAdView *view = self.adViews[adUnitIdentifier];
+    view.delegate        = nil;
+    view.revenueDelegate = nil;
 
-        NSArray<NSLayoutConstraint *> *activeConstraints = self.adViewConstraints[adUnitIdentifier];
-        [NSLayoutConstraint deactivateConstraints: activeConstraints];
+    NSArray<NSLayoutConstraint *> *activeConstraints = self.adViewConstraints[adUnitIdentifier];
+    [NSLayoutConstraint deactivateConstraints: activeConstraints];
 
-        [view destroy];
-        [view removeFromSuperview];
+    [view destroy];
+    [view removeFromSuperview];
 
-        UIView *safeAreaBg = self.safeAreaBackgrounds[adUnitIdentifier];
-        [NSLayoutConstraint deactivateConstraints: safeAreaBg.constraints];
-        [safeAreaBg removeFromSuperview];
+    UIView *safeAreaBg = self.safeAreaBackgrounds[adUnitIdentifier];
+    [NSLayoutConstraint deactivateConstraints: safeAreaBg.constraints];
+    [safeAreaBg removeFromSuperview];
 
-        [self.adViews removeObjectForKey:              adUnitIdentifier];
-        [self.adViewPositions removeObjectForKey:      adUnitIdentifier];
-        [self.adViewOffsets removeObjectForKey:        adUnitIdentifier];
-        [self.adViewAdFormats removeObjectForKey:      adUnitIdentifier];
-        [self.adViewConstraints removeObjectForKey:              adUnitIdentifier];
-        [self.adViewExtraParameters removeObjectForKey:           adUnitIdentifier];
-        [self.safeAreaBackgrounds removeObjectForKey:            adUnitIdentifier];
-        [self.publisherBannerBackgroundColors removeObjectForKey: adUnitIdentifier];
-    }];
+    [self.adViews removeObjectForKey:              adUnitIdentifier];
+    [self.adViewPositions removeObjectForKey:      adUnitIdentifier];
+    [self.adViewOffsets removeObjectForKey:        adUnitIdentifier];
+    [self.adViewAdFormats removeObjectForKey:      adUnitIdentifier];
+    [self.adViewConstraints removeObjectForKey:              adUnitIdentifier];
+    [self.adViewExtraParameters removeObjectForKey:           adUnitIdentifier];
+    [self.safeAreaBackgrounds removeObjectForKey:            adUnitIdentifier];
+    [self.publisherBannerBackgroundColors removeObjectForKey: adUnitIdentifier];
 }
 
 - (CLXInterstitial *)retrieveInterstitialForAdUnitIdentifier:(NSString *)adUnitIdentifier
@@ -1732,14 +1777,98 @@ RCT_EXPORT_METHOD(destroyRewarded:(NSString *)adUnitIdentifier)
 
 - (NSDictionary<NSString *, id> *)adInfoForAd:(CLXAd *)ad
 {
-    return @{@"adUnitId":         ad.adUnitId ?: @"",
-             @"adFormat":         [self adFormatStringForAd: ad],
-             @"networkName":      ad.networkName ?: @"",
-             @"networkPlacement": ad.networkPlacement ?: @"",
-             @"placement":        ad.placement ?: @"",
-             @"creativeId":       ad.creativeIdentifier ?: @"",
-             @"revenue":          ad.revenue ?: @(0),
-             @"adValues":         ad.adValues ?: @{}};
+    NSMutableDictionary<NSString *, id> *info = [@{@"adUnitId":         ad.adUnitId ?: @"",
+                                                   @"adFormat":         [self adFormatStringForAd: ad],
+                                                   @"networkName":      ad.networkName ?: @"",
+                                                   @"networkPlacement": ad.networkPlacement ?: @"",
+                                                   @"placement":        ad.placement ?: @"",
+                                                   @"creativeId":       ad.creativeIdentifier ?: @"",
+                                                   @"revenue":          ad.revenue ?: @(0),
+                                                   @"adValues":         ad.adValues ?: @{}} mutableCopy];
+
+    if ( ad.nativeAd )
+    {
+        info[@"nativeAd"] = [self nativeAdMetadataForAd: ad];
+    }
+
+    return info;
+}
+
+// An icon crosses the RN bridge as a base64 PNG string, and this metadata is
+// rebuilt on every native-ad callback. Full-resolution artwork therefore costs a
+// multi-megabyte copy per event. 96pt matches the Android bridge's cap.
+static const CGFloat kCloudXNativeIconMaxDimension = 96.0;
+
+- (nullable NSString *)base64PNGForIconImage:(UIImage *)image
+{
+    CGFloat longestSide = MAX(image.size.width, image.size.height);
+    UIImage *source     = image;
+
+    if ( longestSide > kCloudXNativeIconMaxDimension && longestSide > 0 )
+    {
+        CGFloat scale         = kCloudXNativeIconMaxDimension / longestSide;
+        CGSize  targetSize    = CGSizeMake(round(image.size.width * scale), round(image.size.height * scale));
+
+        if ( targetSize.width >= 1 && targetSize.height >= 1 )
+        {
+            UIGraphicsImageRenderer *renderer = [[UIGraphicsImageRenderer alloc] initWithSize: targetSize];
+            source = [renderer imageWithActions: ^(UIGraphicsImageRendererContext *context) {
+                [image drawInRect: CGRectMake(0, 0, targetSize.width, targetSize.height)];
+            }];
+        }
+    }
+
+    NSData *imageData = UIImagePNGRepresentation(source);
+    if ( !imageData )
+    {
+        NSLog(@"[%@] [%@] could not PNG-encode native ad icon of size %@", SDK_TAG, TAG, NSStringFromCGSize(source.size));
+        return nil;
+    }
+
+    return [imageData base64EncodedStringWithOptions: 0];
+}
+
+- (NSDictionary<NSString *, id> *)nativeAdMetadataForAd:(CLXAd *)ad
+{
+    CLXNativeAd *nativeAd = ad.nativeAd;
+    NSMutableDictionary<NSString *, id> *info = [NSMutableDictionary dictionaryWithCapacity: 16];
+
+    // CloudXNativeAdMetadata declares these as `string | null`, and the Android
+    // bridge sends null. Substituting @"" here made `title ?? fallback` resolve
+    // differently per platform for an asset the creative simply does not carry.
+    info[@"title"]        = nativeAd.title ?: [NSNull null];
+    info[@"advertiser"]   = nativeAd.advertiser ?: [NSNull null];
+    info[@"body"]         = nativeAd.body ?: [NSNull null];
+    info[@"callToAction"] = nativeAd.callToAction ?: [NSNull null];
+    if ( nativeAd.starRating ) info[@"starRating"] = nativeAd.starRating;
+
+    if ( nativeAd.mediaContentAspectRatio > 0 )
+    {
+        info[@"mediaContentAspectRatio"] = @(nativeAd.mediaContentAspectRatio);
+    }
+
+    BOOL iconAvailable = (nativeAd.icon != nil || nativeAd.iconView != nil);
+    info[@"isIconImageAvailable"]   = @(iconAvailable);
+    info[@"isOptionsViewAvailable"] = @(nativeAd.optionsView != nil);
+    info[@"isMediaViewAvailable"]   = @(nativeAd.mediaView != nil);
+
+    if ( nativeAd.icon )
+    {
+        if ( nativeAd.icon.URL )
+        {
+            info[@"url"] = nativeAd.icon.URL.absoluteString;
+        }
+        else if ( nativeAd.icon.image )
+        {
+            info[@"imageSource"] = [self base64PNGForIconImage: nativeAd.icon.image] ?: [NSNull null];
+        }
+    }
+
+    info[@"isVideoContent"] = @(nativeAd.isVideoContent);
+    info[@"videoDuration"]  = @(nativeAd.videoDuration);
+    info[@"isExpired"]      = @(nativeAd.isExpired);
+
+    return info;
 }
 
 - (NSDictionary<NSString *, id> *)adLoadFailedInfoForAd:(NSString *)adUnitIdentifier withError:(nullable CLXError *)error
@@ -2038,6 +2167,7 @@ RCT_EXPORT_METHOD(destroyRewarded:(NSString *)adUnitIdentifier)
         case CLXAdFormatMREC:         return @"MREC";
         case CLXAdFormatInterstitial: return @"INTERSTITIAL";
         case CLXAdFormatAppOpen:      return @"APP_OPEN";
+        case CLXAdFormatNative:       return @"NATIVE";
         case CLXAdFormatRewarded:     return @"REWARDED";
         default:                      return @"";
     }

package/ios/CloudXNativeAdView.h

@@ -0,0 +1,75 @@
+//
+//  CloudXNativeAdView.h
+//  cloudx-react-native
+//
+//  In-tree native ad view component. Unlike CloudXAdView (banner/MREC), which
+//  hosts a single SDK-owned ad view, this host owns a dedicated
+//  CLXNativeAdLoader and renders either the SDK's bundled template views or a
+//  publisher-driven manual layout bound via the loadAd/updateAssetView/
+//  renderNativeAd commands.
+//
+
+#import <React/RCTUIManager.h>
+#import <CloudXCore/CloudXCore.h>
+
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <React/RCTViewComponentView.h>
+@interface CloudXNativeAdView : RCTViewComponentView <CLXNativeAdDelegate, CLXAdRevenueDelegate>
+#else
+@interface CloudXNativeAdView : UIView <CLXNativeAdDelegate, CLXAdRevenueDelegate>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@property (nonatomic, copy, nullable) NSString *adUnitId;
+@property (nonatomic, copy, nullable) NSString *templateName;
+@property (nonatomic, copy, nullable) NSString *placement;
+@property (nonatomic, copy, nullable) NSString *customData;
+@property (nonatomic, assign) BOOL disableVideoFullScreen;
+@property (nonatomic, assign) BOOL startVideoUnmuted;
+@property (nonatomic, assign) BOOL hideVideoMediaControls;
+
+/// Controls how a loaded ad is rendered: when @c YES , the host skips
+/// template view creation and lets the JS layer drive layout through the
+/// @c updateAssetView + @c renderNativeAd commands. Auto-load on window
+/// attachment runs in both modes.
+@property (nonatomic, assign) BOOL manualRender;
+
+// Nil by default on the Old Architecture (only set when the publisher passes
+// the corresponding callback); delegate call sites guard with `if (self.onX)`.
+@property (nonatomic, copy, nullable) RCTDirectEventBlock onAdLoadedEvent;
+@property (nonatomic, copy, nullable) RCTDirectEventBlock onAdLoadFailedEvent;
+@property (nonatomic, copy, nullable) RCTDirectEventBlock onAdDisplayFailedEvent;
+@property (nonatomic, copy, nullable) RCTDirectEventBlock onAdClickedEvent;
+@property (nonatomic, copy, nullable) RCTDirectEventBlock onAdExpiredEvent;
+@property (nonatomic, copy, nullable) RCTDirectEventBlock onAdClosedEvent;
+@property (nonatomic, copy, nullable) RCTDirectEventBlock onAdRevenuePaidEvent;
+
+- (void)setExtraParametersFromEntryArray:(nullable NSArray<NSDictionary<NSString *, id> *> *)extraParameters;
+- (void)setLocalExtraParametersFromEntryArray:(nullable NSArray<NSDictionary<NSString *, id> *> *)localExtraParameters;
+
+#pragma mark - Commands
+//
+// These selectors are named to match RCTCloudXNativeAdViewViewProtocol
+// (react/renderer/components/CloudXSpec/RCTComponentViewHelpers.h) exactly, so
+// the same implementations serve both the Fabric command-dispatch protocol
+// and the Old Architecture manager's UIManager-block command handlers.
+
+/// Forces a (re)load, bypassing the "already requested" auto-load guard.
+- (void)loadAd;
+
+/// Destroys the current loaded ad(s) and loader state. Safe to call multiple
+/// times; a no-op when nothing is loaded.
+- (void)destroyAd;
+
+/// Binds a publisher-supplied asset subview (resolved by descendant tag
+/// lookup within this host) to a named asset role for manual rendering.
+- (void)updateAssetView:(NSInteger)assetViewTag assetName:(NSString *)assetName;
+
+/// Registers click/impression tracking against the publisher's manually
+/// bound asset views and fires onAdLoaded/onAdDisplayFailed accordingly.
+- (void)renderNativeAd;
+
+@end
+
+NS_ASSUME_NONNULL_END