react-native-theoplayer 3.5.0 → 3.7.0

package/CHANGELOG.md

@@ -5,6 +5,23 @@ 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).
 
+## [3.7.0] - 24-02-09
+
+### Added
+
+- Added fullscreen presentation mode support for iOS and Android. More info on the [documentation](./doc/fullscreen.md) page.
+
+## [3.6.0] - 24-02-02
+
+### Fixed
+
+- Fixed a build issue on the iOS bridge caused by the deprecated DispatchDispatch protocol.
+- Fixed an issue on Android where the `MediaPlaybackService` would sometimes crash with a `ForegroundServiceDidNotStartInTimeException` exception.
+
+### Added
+
+- Added the ability to override both small and large notification icons in Android with `ic_notification_small` and `ic_notification_large` resources respectively.
+
 ## [3.5.0] - 24-01-30
 
 ### Added

package/README.md

@@ -101,6 +101,7 @@ and discussed in the next section. Finally, an overview of features, limitations
   - [Casting with Chromecast and Airplay](./doc/cast.md)
   - [Custom iOS framework](./doc/custom-ios-framework.md)
   - [Digital Rights Management (DRM)](./doc/drm.md)
+  - [Fullscreen presentation](./doc/fullscreen.md)
   - [Media Caching](./doc/media_caching.md)
   - [Migrating to `react-native-theoplayer` v2.x](./doc/migrating_v2.md)
   - [Picture-in-Picture (PiP)](./doc/pip.md)

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

@@ -294,7 +294,7 @@ class PlayerEventEmitter internal constructor(
     )
     payload.putMap(EVENT_PROP_VERSION, WritableNativeMap().apply {
       putString(EVENT_PROP_VERSION, THEOplayerGlobal.getVersion())
-      putString(EVENT_PROP_SUITE_VERSION, THEOplayerGlobal.getPlayerSuiteVersion())
+      putString(EVENT_PROP_SUITE_VERSION, "")
     })
 
     // Notify the player is ready

package/android/src/main/java/com/theoplayer/broadcast/DefaultEventDispatcher.kt

@@ -21,7 +21,8 @@ open class DefaultEventDispatcher: EventDispatcher<Event<*>> {
 
     fun dispatchEvent(event: Event<*>) {
         _listeners[event.type]?.forEach { listener ->
-            (listener as EventListener<Event<*>>).handleEvent(event)
+          @Suppress("UNCHECKED_CAST")
+          (listener as EventListener<Event<*>>).handleEvent(event)
         }
     }
 }

package/android/src/main/java/com/theoplayer/cast/CastEventAdapter.kt

@@ -41,6 +41,7 @@ class CastEventAdapter(private val castApi: Cast, private val emitter: Emitter)
 
   private fun serializeError(error: CastError): WritableMap  {
     val errorPayload = Arguments.createMap()
+    @Suppress("SENSELESS_NULL_IN_WHEN")
     errorPayload.putString(
       EVENT_PROP_ERROR_CODE,
       when (error.errorCode) {

package/android/src/main/java/com/theoplayer/drm/ContentProtectionModule.kt

@@ -216,10 +216,12 @@ class ContentProtectionModule(private val context: ReactApplicationContext) :
   }
 
   @ReactMethod
+  @Suppress("UNUSED_PARAMETER")
   fun addListener(eventName: String?) {
   }
 
   @ReactMethod
+  @Suppress("UNUSED_PARAMETER")
   fun removeListeners(count: Int?) {
   }
 

package/android/src/main/java/com/theoplayer/media/MediaNotificationBuilder.kt

@@ -5,6 +5,7 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import android.graphics.Bitmap
+import android.graphics.BitmapFactory
 import android.net.Uri
 import android.os.Build
 import android.support.v4.media.session.MediaSessionCompat
@@ -195,3 +196,13 @@ fun fetchImageFromUri(uri: Uri?, block: (Bitmap?) -> Unit) {
     )
   }
 }
+
+fun loadPlaceHolderIcon(context: Context, res: Int = R.drawable.ic_notification_large): Bitmap? {
+  return try {
+    BitmapFactory.decodeResource(context.resources, res)
+  } catch(e: Exception) {
+    // Make sure we never crash on trying to decode a possibly overridden icon resource.
+    Log.w(TAG, "Failed to decode placeHolderIcon: ${e.message}")
+    null
+  }
+}

package/android/src/main/java/com/theoplayer/media/MediaPlaybackService.kt

@@ -3,6 +3,7 @@ package com.theoplayer.media
 import android.app.*
 import android.content.Intent
 import android.content.pm.ServiceInfo
+import android.graphics.Bitmap
 import android.os.Binder
 import android.os.Build
 import android.os.Bundle
@@ -96,6 +97,8 @@ class MediaPlaybackService : MediaBrowserServiceCompat() {
       Log.w(TAG, "Failed to start foreground service: ${e.message}")
     }
 
+    // Quickly post a notification and already call startForeground. This has to happen within 5s
+    // after creating the service to avoid a ForegroundServiceDidNotStartInTimeException
     updateNotification(PlaybackStateCompat.STATE_PLAYING)
   }
 
@@ -222,6 +225,7 @@ class MediaPlaybackService : MediaBrowserServiceCompat() {
     }
   }
 
+  @Suppress("UNUSED_PARAMETER")
   private fun allowBrowsing(clientPackageName: String, clientUid: Int): Boolean {
     // Only allow browsing from the same package
     return TextUtils.equals(clientPackageName, packageName)
@@ -264,26 +268,13 @@ class MediaPlaybackService : MediaBrowserServiceCompat() {
         // When a service runs in the foreground, it must display a notification, ideally
         // with one or more transport controls. The notification should also include useful
         // information from the session's metadata.
-        // Fetch large icon asynchronously
+
+        // Get the foreground service started in time before fetching an icon.
+        startForegroundWithPlaybackState(playbackState, loadPlaceHolderIcon(this))
+
+        // Fetch the correct large icon asynchronously.
         fetchImageFromUri(mediaSession.controller.metadata?.description?.iconUri) { largeIcon ->
-         try {
-           if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-             startForeground(
-               NOTIFICATION_ID,
-               notificationBuilder.build(playbackState, largeIcon, enableMediaControls),
-               ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK
-             )
-           } else {
-             startForeground(
-               NOTIFICATION_ID,
-               notificationBuilder.build(playbackState, largeIcon, enableMediaControls)
-             )
-           }
-         } catch (e: IllegalStateException) {
-           // Make sure that app does not crash in case anything goes wrong with starting the service.
-           // https://issuetracker.google.com/issues/229000935
-           Log.w(TAG, "Failed to start foreground service: ${e.message}")
-         }
+          startForegroundWithPlaybackState(playbackState, largeIcon)
         }
       }
       PlaybackStateCompat.STATE_STOPPED -> {
@@ -303,4 +294,25 @@ class MediaPlaybackService : MediaBrowserServiceCompat() {
       }
     }
   }
+
+  private fun startForegroundWithPlaybackState(@PlaybackStateCompat.State playbackState: Int, largeIcon: Bitmap? = null) {
+    try {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        startForeground(
+          NOTIFICATION_ID,
+          notificationBuilder.build(playbackState, largeIcon, enableMediaControls),
+          ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK
+        )
+      } else {
+        startForeground(
+          NOTIFICATION_ID,
+          notificationBuilder.build(playbackState, largeIcon, enableMediaControls)
+        )
+      }
+    } catch (e: IllegalStateException) {
+      // Make sure that app does not crash in case anything goes wrong with starting the service.
+      // https://issuetracker.google.com/issues/229000935
+      Log.w(TAG, "Failed to start foreground service: ${e.message}")
+    }
+  }
 }

package/android/src/main/java/com/theoplayer/presentation/PresentationManager.kt

@@ -8,11 +8,20 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.os.Build
+import android.view.View
+import android.view.View.OnLayoutChangeListener
+import android.view.ViewGroup
+import android.view.ViewGroup.LayoutParams.MATCH_PARENT
+import android.view.ViewParent
 import androidx.activity.ComponentActivity
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
+import androidx.core.view.children
+import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.Lifecycle
+import com.facebook.react.ReactRootView
 import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.views.view.ReactViewGroup
 import com.theoplayer.PlayerEventEmitter
 import com.theoplayer.ReactTHEOplayerContext
 import com.theoplayer.android.api.error.ErrorCode
@@ -28,7 +37,8 @@ class PresentationManager(
   private var supportsPip = false
   private var onUserLeaveHintReceiver: BroadcastReceiver? = null
   private var onPictureInPictureModeChanged: BroadcastReceiver? = null
-
+  private var playerGroupParentNode: ViewGroup? = null
+  private var playerGroupChildIndex: Int? = null
   private val pipUtils: PipUtils = PipUtils(viewCtx, reactContext)
 
   var currentPresentationMode: PresentationMode = PresentationMode.INLINE
@@ -189,16 +199,38 @@ class PresentationManager(
     }
     val activity = reactContext.currentActivity ?: return
     val window = activity.window
+
+    // Get the player's ReactViewGroup parent, which contains THEOplayerView and its children (typically the UI).
+    val reactPlayerGroup: ReactViewGroup? = getClosestParentOfType(this.viewCtx.playerView)
+
+    // Get ReactNative's root node or the render hiearchy
+    val root: ReactRootView? = getClosestParentOfType(reactPlayerGroup)
+
     if (fullscreen) {
       WindowInsetsControllerCompat(window, window.decorView).apply {
         systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
       }.hide(WindowInsetsCompat.Type.systemBars())
       updatePresentationMode(PresentationMode.FULLSCREEN)
+
+      playerGroupParentNode = (reactPlayerGroup?.parent as ReactViewGroup?)?.also { parent ->
+        playerGroupChildIndex = parent.indexOfChild(reactPlayerGroup)
+        // Re-parent the playerViewGroup to the root node
+        parent.removeView(reactPlayerGroup)
+        root?.addView(reactPlayerGroup)
+      }
     } else {
       WindowInsetsControllerCompat(window, window.decorView).show(
         WindowInsetsCompat.Type.systemBars()
       )
       updatePresentationMode(PresentationMode.INLINE)
+
+      root?.run {
+        // Re-parent the playerViewGroup from the root node to its original parent
+        removeView(reactPlayerGroup)
+        playerGroupParentNode?.addView(reactPlayerGroup, playerGroupChildIndex ?: 0)
+        playerGroupParentNode = null
+        playerGroupChildIndex = null
+      }
     }
   }
 
@@ -224,3 +256,11 @@ class PresentationManager(
     }
   }
 }
+
+inline fun <reified T : View> getClosestParentOfType(view: View?): T? {
+  var parent: ViewParent? = view?.parent
+  while (parent != null && parent !is T) {
+    parent = parent.parent
+  }
+  return parent as? T
+}

package/ios/THEOplayerRCTMainEventHandler.swift

@@ -1,4 +1,4 @@
-// THEOplayerRCTView.swift
+// THEOplayerRCTMainEventHandler.swift
 
 import Foundation
 import THEOplayerSDK
@@ -7,7 +7,7 @@ public class THEOplayerRCTMainEventHandler {
     // MARK: Members
     private weak var player: THEOplayer?
     private weak var presentationModeContext: THEOplayerRCTPresentationModeContext?
-    private var metadataTracksInfo: [[String:Any]] = []
+    private var loadedMetadataTracksInfo: [[String:Any]] = []
         
     // MARK: Events
     var onNativePlay: RCTDirectEventBlock?
@@ -29,7 +29,6 @@ public class THEOplayerRCTMainEventHandler {
     var onNativeRateChange: RCTDirectEventBlock?
     var onNativeWaiting: RCTDirectEventBlock?
     var onNativeCanPlay: RCTDirectEventBlock?
-    var onNativePresentationModeChange: RCTDirectEventBlock?
     
     // MARK: player Listeners
     private var playListener: EventListener?
@@ -60,16 +59,15 @@ public class THEOplayerRCTMainEventHandler {
     }
     
     // MARK: - player setup / breakdown
-    func setPlayer(_ player: THEOplayer, presentationModeContext: THEOplayerRCTPresentationModeContext) {
+    func setPlayer(_ player: THEOplayer) {
         self.player = player
-        self.presentationModeContext = presentationModeContext
         
         // attach listeners
         self.attachListeners()
     }
     
-    func setMetadataTracksInfo(metadataTracksInfo: [[String:Any]]) {
-        self.metadataTracksInfo = metadataTracksInfo
+    func setLoadedMetadataTracksInfo(_ metadataTracksInfo: [[String:Any]]) {
+        self.loadedMetadataTracksInfo = metadataTracksInfo
     }
     
     // MARK: - attach/dettach main player Listeners
@@ -273,7 +271,7 @@ public class THEOplayerRCTMainEventHandler {
             if let wplayer = player,
                let welf = self,
                let forwardedLoadedMetadataEvent = self?.onNativeLoadedMetadata {
-                let metadata = THEOplayerRCTTrackMetadataAggregator.aggregateTrackMetadata(player: wplayer, metadataTracksInfo: welf.metadataTracksInfo)
+                let metadata = THEOplayerRCTTrackMetadataAggregator.aggregateTrackMetadata(player: wplayer, metadataTracksInfo: welf.loadedMetadataTracksInfo)
                 print(metadata)
                 forwardedLoadedMetadataEvent(metadata)
             }
@@ -306,16 +304,6 @@ public class THEOplayerRCTMainEventHandler {
             }
         }
         if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] Waiting listener attached to THEOplayer") }
-        
-        // PRESENTATION_MODE_CHANGE
-        self.presentationModeChangeListener = player.addEventListener(type: PlayerEventTypes.PRESENTATION_MODE_CHANGE) { [weak self] event in
-            if DEBUG_THEOPLAYER_EVENTS || true { PrintUtils.printLog(logText: "[NATIVE] Received PRESENTATION_MODE_CHANGE event from THEOplayer (to \(event.presentationMode._rawValue))") }
-            if let forwardedPresentationModeChangeEvent = self?.onNativePresentationModeChange,
-               let presentationModeContext = self?.presentationModeContext {
-                forwardedPresentationModeChangeEvent(presentationModeContext.eventContextForNewPresentationMode(event.presentationMode))
-            }
-        }
-        if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] PresentationModeChange listener attached to THEOplayer") }
     }
     
     private func dettachListeners() {
@@ -430,11 +418,5 @@ public class THEOplayerRCTMainEventHandler {
             player.removeEventListener(type: PlayerEventTypes.CAN_PLAY, listener: canPlayListener)
             if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] CanPlay listener dettached from THEOplayer") }
         }
-        
-        // PRESENTATION_MODE_CHANGE
-        if let presentationModeChangeListener = self.presentationModeChangeListener {
-            player.removeEventListener(type: PlayerEventTypes.PRESENTATION_MODE_CHANGE, listener: presentationModeChangeListener)
-            if DEBUG_EVENTHANDLER { PrintUtils.printLog(logText: "[NATIVE] PresentationModeChange listener dettached from THEOplayer") }
-        }
     }
 }

package/ios/THEOplayerRCTPlayerAPI.swift

@@ -12,7 +12,6 @@ import THEOplayerConnectorSideloadedSubtitle
 
 let ERROR_MESSAGE_PLAYER_ABR_UNSUPPORTED_FEATURE: String = "Setting an ABRconfig is not supported on iOS/tvOS."
 let ERROR_MESSAGE_PLAYER_QUALITY_UNSUPPORTED_FEATURE: String = "Setting a target video quality is not supported on iOS/tvOS."
-let ERROR_MESSAGE_PLAYER_FULLSCREEN_UNSUPPORTED_FEATURE: String = "Fullscreen presentationmode should be implemented on the RN level for iOS/tvOS."
 
 let TTS_PROP_BACKGROUND_COLOR = "backgroundColor"
 let TTS_PROP_EDGE_STYLE = "edgeStyle"
@@ -85,7 +84,6 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
     @objc(setABRConfig:abrConfig:)
     func setABRConfig(_ node: NSNumber, setABRConfig: NSDictionary) -> Void {
         if DEBUG_PLAYER_API { print(ERROR_MESSAGE_PLAYER_ABR_UNSUPPORTED_FEATURE) }
-        return
     }
     
     @objc(setCurrentTime:time:)
@@ -135,19 +133,11 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
     @objc(setPresentationMode:presentationMode:)
     func setPresentationMode(_ node: NSNumber, presentationMode: String) -> Void {
         DispatchQueue.main.async {
-            let newPresentationMode: PresentationMode = THEOplayerRCTTypeUtils.presentationModeFromString(presentationMode)
-            if newPresentationMode == .fullscreen {
-                print(ERROR_MESSAGE_PLAYER_FULLSCREEN_UNSUPPORTED_FEATURE)
-            }
-            if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView,
-               let player = theView.player {
-                if player.presentationMode != newPresentationMode {
-                    if DEBUG_PLAYER_API { PrintUtils.printLog(logText: "[NATIVE] Changing TheoPlayer to \(presentationMode)") }
-                    player.presentationMode = newPresentationMode
-                }
+            if let theView = self.bridge.uiManager.view(forReactTag: node) as? THEOplayerRCTView {
+                let newPresentationMode: PresentationMode = THEOplayerRCTTypeUtils.presentationModeFromString(presentationMode)
+                theView.setPresentationMode(newPresentationMode: newPresentationMode)
             }
         }
-        return
     }
     
     @objc(setAspectRatio:ratio:)
@@ -162,7 +152,6 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
                     }
                 }
             }
-            return
         }
     
     @objc(setPipConfig:pipConfig:)
@@ -173,7 +162,6 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
                 theView.pipConfig = pipConfig
             }
         }
-        return
     }
     
     private func parsePipConfig(configDict: NSDictionary) -> PipConfig {
@@ -190,7 +178,6 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
                theView.backgroundAudioConfig = newBackgroundAudioConfig
             }
         }
-        return
     }
     
     private func parseBackgroundAudioConfig(configDict: NSDictionary) -> BackgroundAudioConfig {

package/ios/THEOplayerRCTTextTrackEventHandler.swift

@@ -37,15 +37,6 @@ class THEOplayerRCTTextTrackEventHandler {
         self.attachListeners()
     }
     
-    func triggerAddMetadataTrackEvent(metadataTrackInfo: [String:Any]) {
-        if let addTrackEvent = self.onNativeTextTrackListEvent {
-            addTrackEvent([
-                "track" : metadataTrackInfo,
-                "type" : TrackListEventType.ADD_TRACK.rawValue
-            ])
-        }
-    }
-    
     // MARK: - attach/dettach textTrackList Listeners
     private func attachListeners() {
         guard let player = self.player else {

package/ios/THEOplayerRCTTrackMetadataAggregator.swift

@@ -247,7 +247,7 @@ class THEOplayerRCTTrackMetadataAggregator {
             guard trackDescription.kind == .metadata, trackDescription.format == .WebVTT else { continue }
             
             let urlString = trackDescription.src.absoluteString
-            THEOplayerRCTSideloadedMetadataTrackHandler.parseVtt(urlString) { cueArray in
+            THEOplayerRCTSideloadedMetadataProcessor.parseVtt(urlString) { cueArray in
                 if let cues = cueArray {
                     var track: [String:Any] = [:]
                     let trackUid = 1000 + trackIndex

package/ios/THEOplayerRCTView.swift

@@ -11,12 +11,13 @@ public class THEOplayerRCTView: UIView {
     public private(set) var broadcastEventHandler: THEOplayerRCTBroadcastEventHandler
     var textTrackEventHandler: THEOplayerRCTTextTrackEventHandler
     var mediaTrackEventHandler: THEOplayerRCTMediaTrackEventHandler
+    var metadataTrackEventHandler: THEOplayerRCTSideloadedMetadataTrackEventHandler
     var adEventHandler: THEOplayerRCTAdsEventHandler
     var castEventHandler: THEOplayerRCTCastEventHandler
+    var presentationModeManager: THEOplayerRCTPresentationModeManager
     var nowPlayingManager: THEOplayerRCTNowPlayingManager
     var remoteCommandsManager: THEOplayerRCTRemoteCommandsManager
     var pipControlsManager: THEOplayerRCTPipControlsManager
-    var presentationModeContext = THEOplayerRCTPresentationModeContext()
     var adsConfig = AdsConfig()
     var castConfig = CastConfig()
     var uiConfig = UIConfig()
@@ -48,8 +49,10 @@ public class THEOplayerRCTView: UIView {
         self.broadcastEventHandler = THEOplayerRCTBroadcastEventHandler()
         self.textTrackEventHandler = THEOplayerRCTTextTrackEventHandler()
         self.mediaTrackEventHandler = THEOplayerRCTMediaTrackEventHandler()
+        self.metadataTrackEventHandler = THEOplayerRCTSideloadedMetadataTrackEventHandler()
         self.adEventHandler = THEOplayerRCTAdsEventHandler()
         self.castEventHandler = THEOplayerRCTCastEventHandler()
+        self.presentationModeManager = THEOplayerRCTPresentationModeManager()
         self.nowPlayingManager = THEOplayerRCTNowPlayingManager()
         self.remoteCommandsManager = THEOplayerRCTRemoteCommandsManager()
         self.pipControlsManager = THEOplayerRCTPipControlsManager()
@@ -75,9 +78,10 @@ public class THEOplayerRCTView: UIView {
         // Create new player instance
         if let player = self.initPlayer() {
             // Attach player instance to event handlers
-            self.mainEventHandler.setPlayer(player, presentationModeContext: self.presentationModeContext)
+            self.mainEventHandler.setPlayer(player)
             self.textTrackEventHandler.setPlayer(player)
             self.mediaTrackEventHandler.setPlayer(player)
+            self.presentationModeManager.setPlayer(player, view: self)
             self.adEventHandler.setPlayer(player)
             self.castEventHandler.setPlayer(player)
             self.nowPlayingManager.setPlayer(player)
@@ -157,13 +161,9 @@ public class THEOplayerRCTView: UIView {
     }
     
     func processMetadataTracks(metadataTrackDescriptions: [TextTrackDescription]?) {
-        if let trackDescriptions = metadataTrackDescriptions {
-            THEOplayerRCTTrackMetadataAggregator.aggregatedMetadataTrackInfo(metadataTrackDescriptions: trackDescriptions) { tracksInfo in
-                self.mainEventHandler.setMetadataTracksInfo(metadataTracksInfo: tracksInfo)
-                for trackInfo in tracksInfo {
-                    self.textTrackEventHandler.triggerAddMetadataTrackEvent(metadataTrackInfo: trackInfo)
-                }
-            }
+        THEOplayerRCTSideloadedMetadataProcessor.loadTrackInfoFromTrackDescriptions(metadataTrackDescriptions) { tracksInfo in
+            self.mainEventHandler.setLoadedMetadataTracksInfo(tracksInfo)
+            self.metadataTrackEventHandler.setLoadedMetadataTracksInfo(tracksInfo)
         }
     }
     
@@ -312,9 +312,11 @@ public class THEOplayerRCTView: UIView {
         if DEBUG_VIEW { PrintUtils.printLog(logText: "[NATIVE] nativeCanPlay prop set.") }
     }
     
+    // MARK: - Listener based PRESENTATIONMODE event bridging
+    
     @objc(setOnNativePresentationModeChange:)
     func setOnNativePresentationModeChange(nativePresentationMode: @escaping RCTDirectEventBlock) {
-        self.mainEventHandler.onNativePresentationModeChange = nativePresentationMode
+        self.presentationModeManager.onNativePresentationModeChange = nativePresentationMode
         if DEBUG_VIEW { PrintUtils.printLog(logText: "[NATIVE] nativePresentationMode prop set.") }
     }
     

package/ios/Theoplayer-Bridging-Header.h

@@ -6,3 +6,4 @@
 #import <React/RCTUIManager.h>
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
+#import <React/RCTRootContentView.h>

package/ios/eventBroadcasting/THEOplayerRCTBroadcastEventHandler.swift

@@ -27,7 +27,7 @@ public class THEOplayerRCTBroadcastEventHandler: DefaultEventDispatcher {
     }
 }
 
-public class DefaultEventDispatcher: NSObject, THEOplayerSDK.EventDispatcherProtocol, THEOplayerSDK.DispatchDispatch {
+public class DefaultEventDispatcher: NSObject, THEOplayerSDK.EventDispatcherProtocol {
     private var eventListeners = [String: [EventListenerWrapper]]()
     
     public func addEventListener<E>(type: THEOplayerSDK.EventType<E>, listener: @escaping (_ : E) -> ()) -> THEOplayerSDK.EventListener {

package/ios/pip/THEOplayerRCTView+PipConfig.swift

@@ -40,12 +40,12 @@ extension THEOplayerRCTView: AVPictureInPictureControllerDelegate {
     // MARK: - AVPictureInPictureControllerDelegate
     @available(tvOS 14.0, *)
     public func pictureInPictureControllerWillStartPictureInPicture(_ pictureInPictureController: AVPictureInPictureController) {
-        self.presentationModeContext.pipContext = .PIP_CLOSED
+        self.presentationModeManager.presentationModeContext.pipContext = .PIP_CLOSED
         self.pipControlsManager.willStartPip()
     }
     
     @available(tvOS 14.0, *)
     public func pictureInPictureController(_ pictureInPictureController: AVPictureInPictureController, restoreUserInterfaceForPictureInPictureStopWithCompletionHandler completionHandler: @escaping (Bool) -> Void) {
-        self.presentationModeContext.pipContext = .PIP_RESTORED
+        self.presentationModeManager.presentationModeContext.pipContext = .PIP_RESTORED
     }
 }

package/ios/{THEOplayerRCTPresentationModeContext.swift → presentationMode/THEOplayerRCTPresentationModeContext.swift}

@@ -10,18 +10,14 @@ enum PipContext: String {
 
 class THEOplayerRCTPresentationModeContext {
     // MARK: Members
-    var currentPresentationMode: THEOplayerSDK.PresentationMode = .inline // TheoPlayer's initial presentationMode
     var pipContext: PipContext = .PIP_CLOSED
     
-    func eventContextForNewPresentationMode(_ newPresentationMode: PresentationMode) -> [String:Any] {
-        let previousPresentationMode = self.currentPresentationMode
-        self.currentPresentationMode = newPresentationMode
-        
+    func eventContextForNewPresentationMode(oldPresentationMode: PresentationMode, newPresentationMode: PresentationMode) -> [String:Any] {
         var eventContext: [String:Any] = [
-            "presentationMode": THEOplayerRCTTypeUtils.presentationModeToString(self.currentPresentationMode),
-            "previousPresentationMode": THEOplayerRCTTypeUtils.presentationModeToString(previousPresentationMode),
+            "presentationMode": THEOplayerRCTTypeUtils.presentationModeToString(newPresentationMode),
+            "previousPresentationMode": THEOplayerRCTTypeUtils.presentationModeToString(oldPresentationMode),
         ]
-        if previousPresentationMode == .pictureInPicture {
+        if oldPresentationMode == .pictureInPicture {
             eventContext["context"] = ["pip" : self.pipContext.rawValue]
         }
         return eventContext