@thealteroffice/react-native-adgeist 0.0.36-beta → 0.0.37-beta

package/ios/NativeHTML5AdView.swift

@@ -9,32 +9,34 @@ import React
     @objc func onAdOpened(_ view: NativeHTML5AdView)
     @objc func onAdClosed(_ view: NativeHTML5AdView)
     @objc func onAdClicked(_ view: NativeHTML5AdView)
+    @objc(onAdWarning:warning:) func onAdWarning(_ view: NativeHTML5AdView, warning: String)
+    @objc(onAdSizeChanged:width:height:) func onAdSizeChanged(_ view: NativeHTML5AdView, width: Double, height: Double)
 }
 
 // MARK: - Main Swift View (Exposed to Objective-C++)
 @objc(NativeHTML5AdView)
 @objcMembers
 public class NativeHTML5AdView: UIView {
-      
+
     // MARK: Public Props (accessible from .mm)
     @objc public var adUnitID: String?
     @objc public var adSize: NSDictionary?
-    @objc public var adType: String?
     @objc public var adIsResponsive: Bool = false
-    
+    @objc public var reserveSpace: Bool = true
+
     // MARK: Events (Old Architecture)
     @objc public var onAdLoaded: ((_ body: [String: Any]) -> Void)?
     @objc public var onAdFailedToLoad: ((_ body: [String: Any]) -> Void)?
     @objc public var onAdOpened: ((_ body: [String: Any]) -> Void)?
     @objc public var onAdClosed: ((_ body: [String: Any]) -> Void)?
     @objc public var onAdClicked: ((_ body: [String: Any]) -> Void)?
+    @objc public var onAdWarning: ((_ body: [String: Any]) -> Void)?
+    @objc public var onAdSizeChanged: ((_ body: [String: Any]) -> Void)?
 
     // MARK: Delegate (used to send events back to manager)
     @objc public weak var delegate: NativeHTML5AdDelegate?
 
-    // MARK: Private Ad View & Listener
     private var adView: AdView?
-    private var adListener: NativeHTML5AdListener?
 
     public override init(frame: CGRect) {
         super.init(frame: frame)
@@ -48,12 +50,11 @@ public class NativeHTML5AdView: UIView {
 
     public override func layoutSubviews() {
         super.layoutSubviews()
+        adView?.frame = bounds
     }
 
-    @objc public func triggerViewWillAppear() {
-        // adView?.resume()
-    }
-    
+    @objc public func triggerViewWillAppear() {}
+
     @objc public func reloadAd() {
         cleanupAdView()
         embedAdView()
@@ -67,126 +68,66 @@ public class NativeHTML5AdView: UIView {
     @objc public func destroy() {
         cleanupAdView()
     }
-    
+
     private func cleanupAdView() {
-        adView?.destroy()
+        adView?.onEvent = nil
         adView?.removeFromSuperview()
         adView = nil
-        adListener = nil
     }
 
     private func embedAdView() {
-        guard let adUnitID = adUnitID else {
-            delegate?.onAdFailedToLoad(self, error: "Ad unit ID is required")
+        guard let adUnitID = adUnitID, !adUnitID.isEmpty else {
+            emitFailedToLoad("Ad unit ID is required")
             return
         }
 
-        let adView = AdView()
-        adView.frame = bounds
-        adView.adUnitId = adUnitID
-        adView.adIsResponsive = adIsResponsive
+        let dict = adSize as? [String: Any]
+        let width = adIsResponsive ? nil : dimension(dict?["width"])
+        let height = dimension(dict?["height"])
 
-        if let dict = adSize as? [String: Any] {
-            if let w = dict["width"] as? Int, let h = dict["height"] as? Int {
-                adView.setAdDimension(AdSize(width: w, height: h))
+        let adView = AdView(adUnitId: adUnitID, width: width, height: height, reserveSpace: reserveSpace)
+        adView.frame = bounds
+        adView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        adView.onEvent = { [weak self, weak adView] event in
+            DispatchQueue.main.async {
+                guard let self = self, let adView = adView, adView === self.adView else { return }
+                self.handle(event, from: adView)
             }
         }
 
-        // Handle adType with default value of BANNER
-        let adTypeStr = (adType ?? "BANNER").uppercased()
-        
-        switch adTypeStr {
-        case "BANNER":
-            adView.adType = .BANNER
-        case "DISPLAY":
-            adView.adType = .DISPLAY
-        case "COMPANION":
-            adView.adType = .COMPANION
-        default:
-            delegate?.onAdFailedToLoad(self, error: "Invalid ad type: \(adTypeStr)")
-            return
-        }
-
-        let listener = NativeHTML5AdListener(view: self)
-        self.adListener = listener
-        adView.setAdListener(listener)
-
         self.adView = adView
         addSubview(adView)
-
-        let request = AdRequest.AdRequestBuilder().build()
-        adView.loadAd(request)
-    }
-}
-
-// MARK: - Ad Listener (Bridge to delegate)
-private class NativeHTML5AdListener: AdListener {
-    private weak var view: NativeHTML5AdView?
-
-    init(view: NativeHTML5AdView) {
-        self.view = view
-        super.init()
-    }
-
-    override func onAdLoaded() {
-        if let view = view {
-            // Old Architecture
-            if let onAdLoaded = view.onAdLoaded {
-                onAdLoaded([:])
-            }
-            // New Architecture (or if delegate is used)
-            view.delegate?.onAdLoaded(view)
-        }
-    }
-
-    override func onAdFailedToLoad(_ errorMessage: String) {
-        if let view = view {
-            // Old Architecture
-            if let onAdFailedToLoad = view.onAdFailedToLoad {
-                let errorDict = ["error": errorMessage]
-                if Thread.isMainThread {
-                    onAdFailedToLoad(errorDict)
-                } else {
-                    DispatchQueue.main.async {
-                        onAdFailedToLoad(errorDict)
-                    }
-                }
-            }
-            // New Architecture (or if delegate is used)
-            view.delegate?.onAdFailedToLoad(view, error: errorMessage)
-        }
+        adView.load()
     }
 
-    override func onAdClicked() {
-        if let view = view {
-            // Old Architecture
-            if let onAdClicked = view.onAdClicked {
-                onAdClicked([:])
+    private func handle(_ event: AdgeistEvent, from adView: AdView) {
+        switch event.type {
+        case .adLoaded:
+            onAdLoaded?([:])
+            delegate?.onAdLoaded(self)
+            let size = adView.intrinsicContentSize
+            if size.width > 0 && size.height > 0 {
+                onAdSizeChanged?(["width": Double(size.width), "height": Double(size.height)])
+                delegate?.onAdSizeChanged(self, width: Double(size.width), height: Double(size.height))
             }
-            // New Architecture (or if delegate is used)
-            view.delegate?.onAdClicked(view)
+        case .adClicked:
+            onAdClicked?([:])
+            delegate?.onAdClicked(self)
+        case .adNoFill, .adNetworkError:
+            emitFailedToLoad(event.message)
+        case .adWarning:
+            onAdWarning?(["warning": event.message])
+            delegate?.onAdWarning(self, warning: event.message)
         }
     }
 
-    override func onAdImpression() {
-        if let view = view {
-            // Old Architecture (mapped to onAdOpened)
-            if let onAdOpened = view.onAdOpened {
-                onAdOpened([:])
-            }
-            // New Architecture (or if delegate is used)
-            view.delegate?.onAdOpened(view)
-        }
+    private func emitFailedToLoad(_ message: String) {
+        onAdFailedToLoad?(["error": message])
+        delegate?.onAdFailedToLoad(self, error: message)
     }
 
-    override func onAdClosed() {
-        if let view = view {
-            // Old Architecture
-            if let onAdClosed = view.onAdClosed {
-                onAdClosed([:])
-            }
-            // New Architecture (or if delegate is used)
-            view.delegate?.onAdClosed(view)
-        }
+    private func dimension(_ value: Any?) -> CGFloat? {
+        guard let number = value as? NSNumber, number.doubleValue > 0 else { return nil }
+        return CGFloat(number.doubleValue)
     }
 }

package/lib/module/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 
 export const PACKAGE_VERSION_TAG = 'RN';
-export const PACKAGE_VERSION = '0.0.36';
+export const PACKAGE_VERSION = '0.0.37';
 export const HTML_5_AD_NATIVE_COMPONENT_NAME = 'HTML5AdNativeComponent';
 //# sourceMappingURL=constants.js.map

package/lib/typescript/src/constants.d.ts

@@ -1,4 +1,4 @@
 export declare const PACKAGE_VERSION_TAG = "RN";
-export declare const PACKAGE_VERSION = "0.0.36";
+export declare const PACKAGE_VERSION = "0.0.37";
 export declare const HTML_5_AD_NATIVE_COMPONENT_NAME = "HTML5AdNativeComponent";
 //# sourceMappingURL=constants.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thealteroffice/react-native-adgeist",
-  "version": "0.0.36-beta",
+  "version": "0.0.37-beta",
   "description": "Publishers can integrate our SDK to connect their ad spaces to the AdGeist marketplace.",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",
@@ -39,9 +39,16 @@
     "clean": "del-cli android/build example/android/build example/android/app/build example/ios/build lib",
     "set-env": "node scripts/set-env.js",
     "sync-version": "node scripts/sync-version.js",
-    "prepare": "yarn sync-version && bob build",
+    "fetch-adgeistkit": "node scripts/fetch-ios-native-adgeistkit.js",
+    "update-adgeistkit": "node scripts/update-adgeistkit.js",
+    "prepare": "yarn sync-version && yarn fetch-adgeistkit && bob build",
     "release": "release-it"
   },
+  "adgeistKit": {
+    "version": "1.0.24-beta.2",
+    "url": "https://github.com/the-alter-office/adgeist-publisher-ios-sdk/releases/download/1.0.24-beta.2/AdgeistKit.xcframework.zip",
+    "checksum": "ff1850115ce44df9a80a27d14422d2e5c97727d7cf576272739ad00cb20bea15"
+  },
   "keywords": [
     "react-native",
     "ios",

package/src/constants.ts

@@ -1,4 +1,4 @@
 export const PACKAGE_VERSION_TAG = 'RN';
-export const PACKAGE_VERSION = '0.0.36';
+export const PACKAGE_VERSION = '0.0.37';
 
 export const HTML_5_AD_NATIVE_COMPONENT_NAME = 'HTML5AdNativeComponent';