fixing PIP mode on iOS

ios/Video/Features/RCTPictureInPicture.swift

@@ -4,15 +4,15 @@ import MediaAccessibility
 import React
 import Foundation
 
-#if TARGET_OS_IOS
+#if os(iOS)
 class RCTPictureInPicture: NSObject, AVPictureInPictureControllerDelegate {
-    private var _onPictureInPictureStatusChanged: RCTDirectEventBlock?
-    private var _onRestoreUserInterfaceForPictureInPictureStop: RCTDirectEventBlock?
+    private var _onPictureInPictureStatusChanged: (() -> Void)? = nil
+    private var _onRestoreUserInterfaceForPictureInPictureStop: (() -> Void)? = nil
     private var _restoreUserInterfaceForPIPStopCompletionHandler:((Bool) -> Void)? = nil
     private var _pipController:AVPictureInPictureController?
     private var _isActive:Bool = false
     
-    init(_ onPictureInPictureStatusChanged: @escaping RCTDirectEventBlock, _ onRestoreUserInterfaceForPictureInPictureStop: @escaping RCTDirectEventBlock) {
+    init(_ onPictureInPictureStatusChanged: (() -> Void)? = nil, _ onRestoreUserInterfaceForPictureInPictureStop: (() -> Void)? = nil) {
         _onPictureInPictureStatusChanged = onPictureInPictureStatusChanged
         _onRestoreUserInterfaceForPictureInPictureStop = onRestoreUserInterfaceForPictureInPictureStop
     }
@@ -20,22 +20,20 @@ class RCTPictureInPicture: NSObject, AVPictureInPictureControllerDelegate {
     func pictureInPictureControllerDidStartPictureInPicture(_ pictureInPictureController: AVPictureInPictureController) {
         guard let _onPictureInPictureStatusChanged = _onPictureInPictureStatusChanged else { return }
         
-        _onPictureInPictureStatusChanged([ "isActive": NSNumber(value: true)])
+        _onPictureInPictureStatusChanged()
     }
     
     func pictureInPictureControllerDidStopPictureInPicture(_ pictureInPictureController: AVPictureInPictureController) {
         guard let _onPictureInPictureStatusChanged = _onPictureInPictureStatusChanged else { return }
         
-        _onPictureInPictureStatusChanged([ "isActive": NSNumber(value: false)])
+        _onPictureInPictureStatusChanged()
     }
     
     func pictureInPictureController(_ pictureInPictureController: AVPictureInPictureController, restoreUserInterfaceForPictureInPictureStopWithCompletionHandler completionHandler: @escaping (Bool) -> Void) {
-        
-        assert(_restoreUserInterfaceForPIPStopCompletionHandler == nil, "restoreUserInterfaceForPIPStopCompletionHandler was not called after picture in picture was exited.")
-        
+
         guard let _onRestoreUserInterfaceForPictureInPictureStop = _onRestoreUserInterfaceForPictureInPictureStop else { return }
         
-        _onRestoreUserInterfaceForPictureInPictureStop([:])
+        _onRestoreUserInterfaceForPictureInPictureStop()
         
         _restoreUserInterfaceForPIPStopCompletionHandler = completionHandler
     }
@@ -47,7 +45,6 @@ class RCTPictureInPicture: NSObject, AVPictureInPictureControllerDelegate {
     }
     
     func setupPipController(_ playerLayer: AVPlayerLayer?) {
-        guard playerLayer != nil && AVPictureInPictureController.isPictureInPictureSupported() && _isActive else { return }
         // Create new controller passing reference to the AVPlayerLayer
         _pipController = AVPictureInPictureController(playerLayer:playerLayer!)
         _pipController?.delegate = self

ios/Video/Features/RCTPlayerOperations.swift

@@ -112,15 +112,13 @@ enum RCTPlayerOperations {
                 }
             }
         } else { // default. invalid type or "system"
-            #if os(tvOS)
-                // Do noting. Fix for tvOS native audio menu language selector
-            #else
+            #if os(iOS)
                 player?.currentItem?.selectMediaOptionAutomatically(in: group)
                 return
             #endif
         }
 
-        #if os(tvOS)
+        #if os(iOS)
             // Do noting. Fix for tvOS native audio menu language selector
         #else
             // If a match isn't found, option will be nil and text tracks will be disabled