react-native-theoplayer 8.0.2 → 8.1.0

package/CHANGELOG.md

@@ -5,7 +5,26 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.1.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [8.0.1] - 24-09-14
+## [8.1.0] - 24-09-23
+
+### Added
+
+- Added support for `bitrate` config on the GoogleIMAConfiguration, to be passed to the IMA SDK rendering settings.
+- Added support on iOS and Android for `allowedMimeTypes` config on the AdsConfiguration, to be passed to the IMA SDK rendering settings.
+
+### Fixed
+
+- Fixed an issue where cast events were not forwarded from the native Android SDK.
+- Fixed an issue where presentationMode changes on iOS would cause a UIViewControllerHierarchyInconsistency when an ad is playing.
+- Fixed an issue where some ad event types could not be resolved at runtime when excluding the IMA integration on Android.
+
+## [8.0.3] - 24-09-14
+
+### Fixed
+
+- Fixed an issue on Android where the THEO Maven repository would not be picked up by all dependencies.
+
+## [8.0.2] - 24-09-14
 
 ### Fixed
 

package/android/build.gradle

@@ -89,6 +89,7 @@ android {
 
 rootProject.allprojects {
   repositories {
+    maven { url "https://maven.theoplayer.com/releases" }
     maven { url("$rootDir/../node_modules/react-native-theoplayer/android/local") }
   }
 }

package/android/local/com/theoplayer/theoplayer-sdk-android/ads-wrapper/8.0.0/ads-wrapper-8.0.0.pom

@@ -6,4 +6,19 @@
   <artifactId>ads-wrapper</artifactId>
   <version>8.0.0</version>
   <packaging>aar</packaging>
+  <dependencies>
+    <!-- Include transitive dependencies -->
+    <dependency>
+      <groupId>com.theoplayer.theoplayer-sdk-android</groupId>
+      <artifactId>integration-ads</artifactId>
+      <version>8.0.0</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.theoplayer.theoplayer-sdk-android</groupId>
+      <artifactId>integration-ads-ima</artifactId>
+      <version>8.0.0</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
 </project>

package/android/src/main/java/com/theoplayer/PlayerConfigAdapter.kt

@@ -34,6 +34,8 @@ private const val PROP_FEATURE_FLAGS = "featureFlags"
 private const val PROP_AUTOPLAY_AD_BREAKS = "autoPlayAdBreaks"
 private const val PROP_SESSION_ID = "sessionID"
 private const val PROP_ENABLE_DEBUG_MODE = "enableDebugMode"
+private const val PROP_BITRATE = "bitrate"
+private const val PROP_ALLOWED_MIMETYPES = "allowedMimeTypes"
 
 class PlayerConfigAdapter(private val configProps: ReadableMap?) {
 
@@ -93,7 +95,7 @@ class PlayerConfigAdapter(private val configProps: ReadableMap?) {
    *
    * @see <a href="https://developers.google.com/interactive-media-ads/docs/sdks/android/client-side/api/reference/com/google/ads/interactivemedia/v3/api/ImaSdkSettings">IMA SDK for Android</a>.
    */
-  fun imaSdkSettings(): ImaSdkSettings{
+  fun imaSdkSettings(): ImaSdkSettings {
     return ImaSdkFactory.getInstance().createImaSdkSettings().apply {
       configProps?.getMap(PROP_ADS_CONFIGURATION)?.getMap(PROP_IMA_CONFIGURATION)?.run {
         // Specifies whether VMAP and ad rules ad breaks are automatically played.
@@ -149,6 +151,19 @@ class PlayerConfigAdapter(private val configProps: ReadableMap?) {
           val preloadTypeString = getString(PROP_PRELOAD)
           enablePreloading = preloadTypeString !== "none"
         }
+        if (hasKey(PROP_ALLOWED_MIMETYPES)) {
+          mimeTypes = ArrayList<String>().apply {
+            getArray(PROP_ALLOWED_MIMETYPES)?.toArrayList()?.forEach {
+              add(it as String)
+            }
+          }
+        }
+      }
+      // bitrate is configured under the ima config
+      configProps?.getMap(PROP_ADS_CONFIGURATION)?.getMap(PROP_IMA_CONFIGURATION)?.run {
+        if (hasKey(PROP_BITRATE)) {
+          bitrateKbps = getInt(PROP_BITRATE)
+        }
       }
     }
   }

package/android/src/main/java/com/theoplayer/ReactTHEOplayerView.kt

@@ -52,7 +52,8 @@ class ReactTHEOplayerView(private val reactContext: ThemedReactContext) :
     playerContext = ReactTHEOplayerContext.create(
       reactContext,
       PlayerConfigAdapter(configProps)
-    ).apply {
+    )
+    playerContext?.apply {
       adsApi.initialize(player, imaIntegration, daiIntegration)
       val layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
       playerView.layoutParams = layoutParams

package/ios/ads/THEOplayerRCTView+Ads.swift

@@ -52,6 +52,10 @@ extension THEOplayerRCTView {
             imaRenderSettings.disableUi = disableUi
             imaRenderSettings.uiElements = []
         }
+        imaRenderSettings.bitrate = self.adsConfig.adsImaConfig.bitrate
+        if let allowedMimeTypes = self.adsConfig.allowedMimeTypes {
+            imaRenderSettings.mimeTypes = allowedMimeTypes
+        }
         
         // setup integration
         let imaIntegration = GoogleIMAIntegrationFactory.createIntegration(on: player, with: imaSettings)

package/ios/ads/THEOplayerRCTView+AdsConfig.swift

@@ -3,9 +3,14 @@
 import Foundation
 import THEOplayerSDK
 
+#if canImport(THEOplayerGoogleIMAIntegration)
+import GoogleInteractiveMediaAds
+#endif
+
 struct AdsConfig {
     var adSUIEnabled: Bool = true
     var adsImaConfig = AdsImaConfig()
+    var allowedMimeTypes: [String]?
 }
 
 struct AdsImaConfig {
@@ -15,6 +20,7 @@ struct AdsImaConfig {
     var featureFlags: [String:String]?
     var autoPlayAdBreaks: Bool?
     var sessionID: String?
+    var bitrate: Int = kIMAAutodetectBitrate
 }
 
 #if os(iOS)
@@ -24,6 +30,7 @@ extension THEOplayerRCTView {
     func parseAdsConfig(configDict: NSDictionary) {
         if let adsConfig = configDict["ads"] as? NSDictionary {
             self.adsConfig.adSUIEnabled = adsConfig["uiEnabled"] as? Bool ?? true
+            self.adsConfig.allowedMimeTypes = adsConfig["allowedMimeTypes"] as? [String]
             if let adsImaConfig = adsConfig["ima"] as? NSDictionary {
                 if let ppid = adsImaConfig["ppid"] as? String {
                     self.adsConfig.adsImaConfig.ppid = ppid
@@ -43,6 +50,7 @@ extension THEOplayerRCTView {
                 if let enableDebugMode = adsImaConfig["enableDebugMode"] as? Bool {
                     self.adsConfig.adsImaConfig.enableDebugMode = enableDebugMode
                 }
+                self.adsConfig.adsImaConfig.bitrate = adsImaConfig["bitrate"] as? Int ?? kIMAAutodetectBitrate
             }
         }
     }

package/ios/presentationMode/THEOplayerRCTPresentationModeManager.swift

@@ -2,6 +2,7 @@
 
 import Foundation
 import THEOplayerSDK
+import UIKit
 
 public class THEOplayerRCTPresentationModeManager {
     // MARK: Members
@@ -10,9 +11,9 @@ public class THEOplayerRCTPresentationModeManager {
     var presentationModeContext = THEOplayerRCTPresentationModeContext()
     var presentationMode: THEOplayerSDK.PresentationMode = .inline
     
-    private var containerView: UIView?              // view containing the playerView and it's siblings (e.g. UI)
-    private var fullscreenParentView: UIView?       // target view for fulllscreen representation
-    private var inlineParentView: UIView?           // target view for inline representation
+    private var containerView: UIView?                  // view containing the playerView and it's siblings (e.g. UI)
+    private var inlineParentView: UIView?               // target view for inline representation
+    private var movingChildVCs: [UIViewController] = []  // list of playerView's child VCs that need to be reparented while moving the playerView
         
     // MARK: Events
     var onNativePresentationModeChange: RCTDirectEventBlock?
@@ -37,25 +38,54 @@ public class THEOplayerRCTPresentationModeManager {
     
     // MARK: - logic
     
+    private func storeMovingVCs(for view: UIView) {
+        if let viewController = view.findViewController() {
+            viewController.children.forEach { childVC in
+                self.movingChildVCs.append(childVC)
+            }
+        }
+    }
+    
+    private func clearMovingVCs() {
+        self.movingChildVCs = []
+    }
+    
+    private func moveView(_ movingView: UIView, to targetView: UIView, with movingViewControllers: [UIViewController]) {
+        // detach the moving viewControllers from their parent
+        movingViewControllers.forEach { movedVC in
+            movedVC.removeFromParent()
+        }
+        
+        // move the actual view
+        movingView.removeFromSuperview()
+        targetView.addSubview(movingView)
+        targetView.bringSubviewToFront(movingView)
+        
+        // attach the moving viewControllers to their new parent
+        if let targetViewController = targetView.findViewController() {
+            movingViewControllers.forEach { movedVC in
+                targetViewController.addChild(movedVC)
+                movedVC.didMove(toParent: targetViewController)
+            }
+        }
+    }
+    
     private func enterFullscreen() {
         self.containerView = self.view?.findParentViewOfType(RCTView.self)
-        self.fullscreenParentView = self.view?.findParentViewOfType(RCTRootContentView.self)
         self.inlineParentView = self.containerView?.findParentViewOfType(RCTView.self)
         
         if let containerView = self.containerView,
-           let fullscreenParentView = self.fullscreenParentView {
-            containerView.removeFromSuperview()
-            fullscreenParentView.addSubview(containerView)
-            fullscreenParentView.bringSubviewToFront(containerView)
+           let fullscreenParentView = self.view?.findParentViewOfType(RCTRootContentView.self) {
+            self.storeMovingVCs(for: containerView)
+            self.moveView(containerView, to: fullscreenParentView, with: self.movingChildVCs)
         }
     }
     
     private func exitFullscreen() {
         if let containerView = self.containerView,
            let inlineParentView = self.inlineParentView {
-            containerView.removeFromSuperview()
-            inlineParentView.addSubview(containerView)
-            inlineParentView.bringSubviewToFront(containerView)
+            self.moveView(containerView, to: inlineParentView, with: self.movingChildVCs)
+            self.clearMovingVCs()
         }
     }
     
@@ -156,4 +186,14 @@ extension UIView {
         }
         return nil
     }
+    
+    func findViewController() -> UIViewController? {
+        if let nextResponder = self.next as? UIViewController {
+            return nextResponder
+        } else if let nextResponder = self.next as? UIView {
+            return nextResponder.findViewController()
+        } else {
+            return nil
+        }
+    }
 }

package/lib/commonjs/internal/THEOplayerView.web.js

@@ -24,6 +24,7 @@ function THEOplayerView(props) {
       const ads = {
         ...config?.ads,
         googleIma: {
+          ...config?.ads?.ima,
           useNativeIma: true,
           language: config?.ui?.language ?? 'en'
         }

package/lib/commonjs/internal/THEOplayerView.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_theoplayer","_THEOplayerWebAdapter","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","THEOplayerView","props","config","children","player","useRef","adapter","container","useEffect","current","chromeless","undefined","ads","googleIma","useNativeIma","language","ui","updatedConfig","allowNativeFullscreen","ChromelessPlayer","Player","fluid","THEOplayerWebAdapter","window","nativePlayer","onPlayerReady","onPlayerDestroy","destroy","createElement","Fragment","ref","style","styles","className","display","position","width","height","maxHeight","maxWidth","aspectRatio"],"sourceRoot":"../../../src","sources":["internal/THEOplayerView.web.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAEA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,qBAAA,GAAAF,OAAA;AAAsE,SAAAG,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAL,wBAAAK,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAE/D,SAASW,cAAcA,CAACC,KAAmD,EAAE;EAClF,MAAM;IAAEC,MAAM;IAAEC;EAAS,CAAC,GAAGF,KAAK;EAClC,MAAMG,MAAM,GAAG,IAAAC,aAAM,EAA0B,IAAI,CAAC;EACpD,MAAMC,OAAO,GAAG,IAAAD,aAAM,EAA8B,IAAI,CAAC;EACzD,MAAME,SAAS,GAAG,IAAAF,aAAM,EAAwB,IAAI,CAAC;EAErD,IAAAG,gBAAS,EAAC,MAAM;IACd;IACA,IAAID,SAAS,CAACE,OAAO,EAAE;MACrB,MAAMC,UAAU,GAAGR,MAAM,EAAEQ,UAAU,KAAK,IAAI,IAAIR,MAAM,EAAEQ,UAAU,KAAKC,SAAS;MAClF,MAAMC,GAAG,GAAG;QACV,GAAGV,MAAM,EAAEU,GAAG;QACdC,SAAS,EAAE;UACTC,YAAY,EAAE,IAAI;UAClBC,QAAQ,EAAEb,MAAM,EAAEc,EAAE,EAAED,QAAQ,IAAI;QACpC;MACF,CAAC;MACD,MAAME,aAAa,GAAG;QACpB,GAAGf,MAAM;QACTgB,qBAAqB,EAAE,IAAI;QAC3BN;MACF,CAAC;MACD,IAAIF,UAAU,EAAE;QACdN,MAAM,CAACK,OAAO,GAAG,IAAIU,4BAAgB,CAACZ,SAAS,CAACE,OAAO,EAAEQ,aAAa,CAAC;MACzE,CAAC,MAAM;QACLb,MAAM,CAACK,OAAO,GAAG,IAAIW,kBAAM,CAACb,SAAS,CAACE,OAAO,EAAE;UAC7C,GAAGQ,aAAa;UAChBL,GAAG;UACHI,EAAE,EAAE;YACF,GAAGd,MAAM,EAAEc,EAAE;YACbK,KAAK,EAAE;UACT;QACF,CAAwB,CAAC;MAC3B;;MAEA;MACAf,OAAO,CAACG,OAAO,GAAG,IAAIa,0CAAoB,CAAClB,MAAM,CAACK,OAAO,EAAEP,MAAM,CAAC;;MAElE;MACA;MACAqB,MAAM,CAACnB,MAAM,GAAGE,OAAO,CAACG,OAAO;;MAE/B;MACAc,MAAM,CAACC,YAAY,GAAGpB,MAAM;;MAE5B;MACAH,KAAK,CAACwB,aAAa,GAAGnB,OAAO,CAACG,OAAO,CAAC;IACxC;;IAEA;IACA,OAAO,MAAM;MACX;MACA,MAAM;QAAEiB;MAAgB,CAAC,GAAGzB,KAAK;MACjC,IAAIK,OAAO,EAAEG,OAAO,IAAIiB,eAAe,EAAE;QACvCA,eAAe,CAACpB,OAAO,EAAEG,OAAO,CAAC;MACnC;MACAH,OAAO,EAAEG,OAAO,EAAEkB,OAAO,CAAC,CAAC;IAC7B,CAAC;EACH,CAAC,EAAE,CAACpB,SAAS,CAAC,CAAC;EAEf,MAAMG,UAAU,GAAGR,MAAM,EAAEQ,UAAU,KAAKC,SAAS,IAAIT,MAAM,EAAEQ,UAAU,KAAK,IAAI;EAClF,oBACEnC,MAAA,CAAAW,OAAA,CAAA0C,aAAA,CAAArD,MAAA,CAAAW,OAAA,CAAA2C,QAAA,qBACEtD,MAAA,CAAAW,OAAA,CAAA0C,aAAA;IACEE,GAAG,EAAEvB,SAAU;IACfwB,KAAK,EAAEC,MAAM,CAACzB,SAAU;IACxB0B,SAAS,EAAEvB,UAAU,GAAG,sBAAsB,GAAG;EAAgD,CAClG,CAAC,EACDP,QACD,CAAC;AAEP;AAEA,MAAM6B,MAAM,GAAG;EACb;EACA;EACAzB,SAAS,EAAE;IACT2B,OAAO,EAAE,MAAM;IACfC,QAAQ,EAAE,UAAU;IACpBC,KAAK,EAAE,MAAM;IACbC,MAAM,EAAE,MAAM;IACdC,SAAS,EAAE,OAAO;IAClBC,QAAQ,EAAE,OAAO;IACjBC,WAAW,EAAE;EACf;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_theoplayer","_THEOplayerWebAdapter","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","THEOplayerView","props","config","children","player","useRef","adapter","container","useEffect","current","chromeless","undefined","ads","googleIma","ima","useNativeIma","language","ui","updatedConfig","allowNativeFullscreen","ChromelessPlayer","Player","fluid","THEOplayerWebAdapter","window","nativePlayer","onPlayerReady","onPlayerDestroy","destroy","createElement","Fragment","ref","style","styles","className","display","position","width","height","maxHeight","maxWidth","aspectRatio"],"sourceRoot":"../../../src","sources":["internal/THEOplayerView.web.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/internal/THEOplayerView.web.js

@@ -16,6 +16,7 @@ export function THEOplayerView(props) {
       const ads = {
         ...config?.ads,
         googleIma: {
+          ...config?.ads?.ima,
           useNativeIma: true,
           language: config?.ui?.language ?? 'en'
         }

package/lib/module/internal/THEOplayerView.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","useRef","Player","ChromelessPlayer","THEOplayerWebAdapter","THEOplayerView","props","config","children","player","adapter","container","current","chromeless","undefined","ads","googleIma","useNativeIma","language","ui","updatedConfig","allowNativeFullscreen","fluid","window","nativePlayer","onPlayerReady","onPlayerDestroy","destroy","createElement","Fragment","ref","style","styles","className","display","position","width","height","maxHeight","maxWidth","aspectRatio"],"sourceRoot":"../../../src","sources":["internal/THEOplayerView.web.tsx"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,SAAS,EAAEC,MAAM,QAAQ,OAAO;AAEhD,SAASC,MAAM,EAAEC,gBAAgB,QAA6B,YAAY;AAC1E,SAASC,oBAAoB,QAAQ,gCAAgC;AAErE,OAAO,SAASC,cAAcA,CAACC,KAAmD,EAAE;EAClF,MAAM;IAAEC,MAAM;IAAEC;EAAS,CAAC,GAAGF,KAAK;EAClC,MAAMG,MAAM,GAAGR,MAAM,CAA0B,IAAI,CAAC;EACpD,MAAMS,OAAO,GAAGT,MAAM,CAA8B,IAAI,CAAC;EACzD,MAAMU,SAAS,GAAGV,MAAM,CAAwB,IAAI,CAAC;EAErDD,SAAS,CAAC,MAAM;IACd;IACA,IAAIW,SAAS,CAACC,OAAO,EAAE;MACrB,MAAMC,UAAU,GAAGN,MAAM,EAAEM,UAAU,KAAK,IAAI,IAAIN,MAAM,EAAEM,UAAU,KAAKC,SAAS;MAClF,MAAMC,GAAG,GAAG;QACV,GAAGR,MAAM,EAAEQ,GAAG;QACdC,SAAS,EAAE;UACTC,YAAY,EAAE,IAAI;UAClBC,QAAQ,EAAEX,MAAM,EAAEY,EAAE,EAAED,QAAQ,IAAI;QACpC;MACF,CAAC;MACD,MAAME,aAAa,GAAG;QACpB,GAAGb,MAAM;QACTc,qBAAqB,EAAE,IAAI;QAC3BN;MACF,CAAC;MACD,IAAIF,UAAU,EAAE;QACdJ,MAAM,CAACG,OAAO,GAAG,IAAIT,gBAAgB,CAACQ,SAAS,CAACC,OAAO,EAAEQ,aAAa,CAAC;MACzE,CAAC,MAAM;QACLX,MAAM,CAACG,OAAO,GAAG,IAAIV,MAAM,CAACS,SAAS,CAACC,OAAO,EAAE;UAC7C,GAAGQ,aAAa;UAChBL,GAAG;UACHI,EAAE,EAAE;YACF,GAAGZ,MAAM,EAAEY,EAAE;YACbG,KAAK,EAAE;UACT;QACF,CAAwB,CAAC;MAC3B;;MAEA;MACAZ,OAAO,CAACE,OAAO,GAAG,IAAIR,oBAAoB,CAACK,MAAM,CAACG,OAAO,EAAEL,MAAM,CAAC;;MAElE;MACA;MACAgB,MAAM,CAACd,MAAM,GAAGC,OAAO,CAACE,OAAO;;MAE/B;MACAW,MAAM,CAACC,YAAY,GAAGf,MAAM;;MAE5B;MACAH,KAAK,CAACmB,aAAa,GAAGf,OAAO,CAACE,OAAO,CAAC;IACxC;;IAEA;IACA,OAAO,MAAM;MACX;MACA,MAAM;QAAEc;MAAgB,CAAC,GAAGpB,KAAK;MACjC,IAAII,OAAO,EAAEE,OAAO,IAAIc,eAAe,EAAE;QACvCA,eAAe,CAAChB,OAAO,EAAEE,OAAO,CAAC;MACnC;MACAF,OAAO,EAAEE,OAAO,EAAEe,OAAO,CAAC,CAAC;IAC7B,CAAC;EACH,CAAC,EAAE,CAAChB,SAAS,CAAC,CAAC;EAEf,MAAME,UAAU,GAAGN,MAAM,EAAEM,UAAU,KAAKC,SAAS,IAAIP,MAAM,EAAEM,UAAU,KAAK,IAAI;EAClF,oBACEd,KAAA,CAAA6B,aAAA,CAAA7B,KAAA,CAAA8B,QAAA,qBACE9B,KAAA,CAAA6B,aAAA;IACEE,GAAG,EAAEnB,SAAU;IACfoB,KAAK,EAAEC,MAAM,CAACrB,SAAU;IACxBsB,SAAS,EAAEpB,UAAU,GAAG,sBAAsB,GAAG;EAAgD,CAClG,CAAC,EACDL,QACD,CAAC;AAEP;AAEA,MAAMwB,MAAM,GAAG;EACb;EACA;EACArB,SAAS,EAAE;IACTuB,OAAO,EAAE,MAAM;IACfC,QAAQ,EAAE,UAAU;IACpBC,KAAK,EAAE,MAAM;IACbC,MAAM,EAAE,MAAM;IACdC,SAAS,EAAE,OAAO;IAClBC,QAAQ,EAAE,OAAO;IACjBC,WAAW,EAAE;EACf;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useEffect","useRef","Player","ChromelessPlayer","THEOplayerWebAdapter","THEOplayerView","props","config","children","player","adapter","container","current","chromeless","undefined","ads","googleIma","ima","useNativeIma","language","ui","updatedConfig","allowNativeFullscreen","fluid","window","nativePlayer","onPlayerReady","onPlayerDestroy","destroy","createElement","Fragment","ref","style","styles","className","display","position","width","height","maxHeight","maxWidth","aspectRatio"],"sourceRoot":"../../../src","sources":["internal/THEOplayerView.web.tsx"],"mappings":"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","ignoreList":[]}

package/lib/typescript/api/ads/GoogleImaConfiguration.d.ts

@@ -40,5 +40,13 @@ export interface GoogleImaConfiguration {
      * @defaultValue `false`
      */
     enableDebugMode?: boolean;
+    /**
+     * Maximum recommended bitrate. The value is in kbit/s. SDK will pick media with bitrate below the specified max,
+     * or the closest bitrate if there is no media with smaller bitrate found. Default value -1, means the bitrate will
+     * be selected by the SDK.
+     *
+     * @defaultValue `-1`
+     */
+    bitrate?: number;
 }
 //# sourceMappingURL=GoogleImaConfiguration.d.ts.map

package/lib/typescript/api/ads/GoogleImaConfiguration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GoogleImaConfiguration.d.ts","sourceRoot":"","sources":["../../../../src/api/ads/GoogleImaConfiguration.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;;;;;OAOG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,YAAY,CAAC,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAE1C;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B"}
+{"version":3,"file":"GoogleImaConfiguration.d.ts","sourceRoot":"","sources":["../../../../src/api/ads/GoogleImaConfiguration.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;;;;;OAOG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,YAAY,CAAC,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAE1C;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB"}

package/lib/typescript/internal/THEOplayerView.web.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"THEOplayerView.web.d.ts","sourceRoot":"","sources":["../../../src/internal/THEOplayerView.web.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAC;AACjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAInE,wBAAgB,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,qBAuEjF"}
+{"version":3,"file":"THEOplayerView.web.d.ts","sourceRoot":"","sources":["../../../src/internal/THEOplayerView.web.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAC;AACjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAInE,wBAAgB,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,qBAwEjF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-theoplayer",
-  "version": "8.0.2",
+  "version": "8.1.0",
   "description": "A THEOplayer video component for react-native.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -25,14 +25,19 @@
   ],
   "scripts": {
     "typescript": "tsc --noEmit",
-    "prettier": "prettier --check .",
-    "prettier:fix": "prettier --write .",
+    "prettier": "prettier --check \"(src|example)/**/*.{js,jsx,ts,tsx}\"",
+    "prettier:fix": "prettier --write \"(src|example)/**/*.{js,jsx,ts,tsx}\"",
     "lint": "eslint \"**/*.{ts,tsx}\"",
     "lint:fix": "npm run lint -- --fix",
     "prepare": "bob build && husky install",
     "pods": "cd example && pod-install --quiet",
     "docs": "typedoc --treatWarningsAsErrors"
   },
+  "lint-staged": {
+    "(src|example)/**/*.{js,jsx,ts,tsx}": [
+      "prettier --write"
+    ]
+  },
   "keywords": [
     "react-native",
     "THEOplayer",
@@ -56,6 +61,7 @@
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "husky": "^9.1.5",
+    "lint-staged": "^15.2.10",
     "pod-install": "^0.1.39",
     "prettier": "^3.3.3",
     "react": "^18.2.0",

package/src/api/ads/GoogleImaConfiguration.ts

@@ -43,4 +43,13 @@ export interface GoogleImaConfiguration {
    * @defaultValue `false`
    */
   enableDebugMode?: boolean;
+
+  /**
+   * Maximum recommended bitrate. The value is in kbit/s. SDK will pick media with bitrate below the specified max,
+   * or the closest bitrate if there is no media with smaller bitrate found. Default value -1, means the bitrate will
+   * be selected by the SDK.
+   *
+   * @defaultValue `-1`
+   */
+  bitrate?: number;
 }

package/src/internal/THEOplayerView.web.tsx

@@ -16,6 +16,7 @@ export function THEOplayerView(props: React.PropsWithChildren<THEOplayerViewProp
       const ads = {
         ...config?.ads,
         googleIma: {
+          ...config?.ads?.ima,
           useNativeIma: true,
           language: config?.ui?.language ?? 'en',
         },