@stream-io/video-react-native-sdk 1.10.12 → 1.10.14

package/dist/typescript/components/Call/CallContent/RTCViewPipNative.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+export declare function onNativeCallClosed(reactTag: number): void;
+/** Wrapper for the native view
+ * meant to stay private and not exposed */
+export declare const RTCViewPipNative: React.MemoExoticComponent<React.ForwardRefExoticComponent<{
+    streamURL?: string;
+} & React.RefAttributes<React.Ref<any>>>>;
+//# sourceMappingURL=RTCViewPipNative.d.ts.map

package/dist/typescript/components/Call/CallContent/RTCViewPipNative.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RTCViewPipNative.d.ts","sourceRoot":"","sources":["../../../../../src/components/Call/CallContent/RTCViewPipNative.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAkB1B,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,QAQlD;AAED;2CAC2C;AAC3C,eAAO,MAAM,gBAAgB;gBAIX,MAAM;yCAevB,CAAC"}

package/dist/typescript/hooks/push/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/hooks/push/index.ts"],"names":[],"mappings":"AAOA;;;GAGG;AACH,eAAO,MAAM,qBAAqB,YAOjC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/hooks/push/index.ts"],"names":[],"mappings":"AAMA;;;GAGG;AACH,eAAO,MAAM,qBAAqB,YAMjC,CAAC"}

package/dist/typescript/hooks/push/useIosCallkeepWithCallingStateEffect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useIosCallkeepWithCallingStateEffect.d.ts","sourceRoot":"","sources":["../../../../src/hooks/push/useIosCallkeepWithCallingStateEffect.ts"],"names":[],"mappings":"AAuCA;;GAEG;AACH,eAAO,MAAM,oCAAoC,YAyJhD,CAAC"}
+{"version":3,"file":"useIosCallkeepWithCallingStateEffect.d.ts","sourceRoot":"","sources":["../../../../src/hooks/push/useIosCallkeepWithCallingStateEffect.ts"],"names":[],"mappings":"AA6CA;;GAEG;AACH,eAAO,MAAM,oCAAoC,YAyJhD,CAAC"}

package/dist/typescript/hooks/push/useIosVoipPushEventsSetupEffect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useIosVoipPushEventsSetupEffect.d.ts","sourceRoot":"","sources":["../../../../src/hooks/push/useIosVoipPushEventsSetupEffect.ts"],"names":[],"mappings":"AAmDA;;;GAGG;AACH,eAAO,MAAM,+BAA+B,YAuI3C,CAAC"}
+{"version":3,"file":"useIosVoipPushEventsSetupEffect.d.ts","sourceRoot":"","sources":["../../../../src/hooks/push/useIosVoipPushEventsSetupEffect.ts"],"names":[],"mappings":"AAuCA;;;GAGG;AACH,eAAO,MAAM,+BAA+B,YAiI3C,CAAC"}

package/dist/typescript/utils/StreamVideoRN/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/utils/StreamVideoRN/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAEjD,OAAiC,EAC/B,KAAK,2BAA2B,EACjC,MAAM,sCAAsC,CAAC;AAoB9C,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAC,MAAM,CAA+B;IAEpD;;;;OAIG;IACH,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;IAO1E,MAAM,CAAC,gCAAgC,CACrC,aAAa,EAAE,OAAO,CACpB,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,qBAAqB,CAAC,CACzE;IAWH;;;;;;;;;;;;;;OAcG;IACH,MAAM,CAAC,aAAa,CAAC,UAAU,EAAE,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAmBvE,MAAM,CAAC,SAAS;IAIhB;;;OAGG;IACH,MAAM,CAAC,YAAY;IASnB,MAAM,CAAC,wBAAwB;IAI/B;;;;OAIG;IACH,MAAM,CAAC,gCAAgC,CACrC,QAAQ,EAAE,2BAA2B;CAYxC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/utils/StreamVideoRN/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAEjD,OAAiC,EAC/B,KAAK,2BAA2B,EACjC,MAAM,sCAAsC,CAAC;AAsB9C,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAC,MAAM,CAA+B;IAEpD;;;;OAIG;IACH,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;IAO1E,MAAM,CAAC,gCAAgC,CACrC,aAAa,EAAE,OAAO,CACpB,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,qBAAqB,CAAC,CACzE;IAWH;;;;;;;;;;;;;;OAcG;IACH,MAAM,CAAC,aAAa,CAAC,UAAU,EAAE,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAsBvE,MAAM,CAAC,SAAS;IAIhB;;;OAGG;IACH,MAAM,CAAC,YAAY;IASnB,MAAM,CAAC,wBAAwB;IAI/B;;;;OAIG;IACH,MAAM,CAAC,gCAAgC,CACrC,QAAQ,EAAE,2BAA2B;CAYxC"}

package/dist/typescript/utils/push/ios.d.ts

@@ -11,5 +11,6 @@ export declare const oniOSNotifeeEvent: ({ event, }: {
 export declare function onPushNotificationiOSStreamVideoEvent(notification: PushNotificationiOSType): void;
 /** Send token to stream */
 export declare function initIosNonVoipToken(client: StreamVideoClient, pushConfig: PushConfig, setUnsubscribeListener: (unsubscribe: () => void) => void): Promise<void>;
+export declare const onVoipNotificationReceived: (notification: any) => Promise<void>;
 export {};
 //# sourceMappingURL=ios.d.ts.map

package/dist/typescript/utils/push/ios.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../../../src/utils/push/ios.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEhE,OAAO,EACL,KAAK,gBAAgB,EAIrB,KAAK,uBAAuB,EAC7B,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,iBAAiB,EAAa,MAAM,yBAAyB,CAAC;AAEvE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD,KAAK,UAAU,GAAG,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;AAqBzD,eAAO,MAAM,0BAA0B,UAAW,gBAAgB,SAoBjE,CAAC;AAEF,eAAO,MAAM,iBAAiB,eAE3B;IACD,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;CACvB,SAmBA,CAAC;AAEF,wBAAgB,qCAAqC,CACnD,YAAY,EAAE,uBAAuB,QAiCtC;AAED,2BAA2B;AAC3B,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,iBAAiB,EACzB,UAAU,EAAE,UAAU,EACtB,sBAAsB,EAAE,CAAC,WAAW,EAAE,MAAM,IAAI,KAAK,IAAI,iBAoF1D"}
+{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../../../src/utils/push/ios.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAMhE,OAAO,EACL,KAAK,gBAAgB,EAMrB,KAAK,uBAAuB,EAC7B,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAW,iBAAiB,EAAa,MAAM,yBAAyB,CAAC;AAEhF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAQnD,KAAK,UAAU,GAAG,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;AAqBzD,eAAO,MAAM,0BAA0B,UAAW,gBAAgB,SAoBjE,CAAC;AAEF,eAAO,MAAM,iBAAiB,eAE3B;IACD,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;CACvB,SAmBA,CAAC;AAEF,wBAAgB,qCAAqC,CACnD,YAAY,EAAE,uBAAuB,QAiCtC;AAED,2BAA2B;AAC3B,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,iBAAiB,EACzB,UAAU,EAAE,UAAU,EACtB,sBAAsB,EAAE,CAAC,WAAW,EAAE,MAAM,IAAI,KAAK,IAAI,iBAoF1D;AAED,eAAO,MAAM,0BAA0B,iBAAwB,GAAG,kBAwHjE,CAAC"}

package/dist/typescript/utils/push/setupIosCallKeepEvents.d.ts

@@ -0,0 +1,6 @@
+import type { StreamVideoConfig } from '../StreamVideoRN/types';
+/**
+ * This hook is used to listen to callkeep events and do the necessary actions
+ */
+export declare function setupIosCallKeepEvents(pushConfig: NonNullable<StreamVideoConfig['push']>): void;
+//# sourceMappingURL=setupIosCallKeepEvents.d.ts.map

package/dist/typescript/utils/push/setupIosCallKeepEvents.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setupIosCallKeepEvents.d.ts","sourceRoot":"","sources":["../../../../src/utils/push/setupIosCallKeepEvents.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAchE;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,QAgHnD"}

package/dist/typescript/utils/push/setupIosVoipPushEvents.d.ts

@@ -0,0 +1,3 @@
+import { StreamVideoConfig } from '../StreamVideoRN/types';
+export declare function setupIosVoipPushEvents(pushConfig: NonNullable<StreamVideoConfig['push']>): void;
+//# sourceMappingURL=setupIosVoipPushEvents.d.ts.map

package/dist/typescript/utils/push/setupIosVoipPushEvents.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setupIosVoipPushEvents.d.ts","sourceRoot":"","sources":["../../../../src/utils/push/setupIosVoipPushEvents.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,WAAW,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,QAmBnD"}

package/dist/typescript/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "1.10.12";
+export declare const version = "1.10.14";
 //# sourceMappingURL=version.d.ts.map

package/ios/PictureInPicture/StreamPictureInPictureController.swift

@@ -104,6 +104,7 @@ import Foundation
         _ pictureInPictureController: AVPictureInPictureController,
         failedToStartPictureInPictureWithError error: Error
     ) {
+        NSLog("PiP - failedToStartPictureInPictureWithError:\(error)")
     }
     
     public func pictureInPictureControllerWillStopPictureInPicture(
@@ -184,4 +185,10 @@ import Foundation
     private func didUpdatePictureInPictureActiveState(_ isActive: Bool) {
         trackStateAdapter.isEnabled = isActive
     }
+    
+    func stopPictureInPicture() {
+        if (pictureInPictureController?.isPictureInPictureActive ?? false) {
+            pictureInPictureController?.stopPictureInPicture()
+        }
+    }
 }

package/ios/RTCViewPip.swift

@@ -10,52 +10,76 @@ import Foundation
 @objc(RTCViewPip)
 class RTCViewPip: UIView {
     
-    private lazy var pictureInPictureController = StreamPictureInPictureController()
+    private var pictureInPictureController = StreamPictureInPictureController()
     private var webRtcModule: WebRTCModule?
     
     override init(frame: CGRect) {
         super.init(frame: frame)
-        setupView()
+        setupNotificationObserver()
+        self.pictureInPictureController?.sourceView = self
     }
     
     required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
-        setupView()
+        setupNotificationObserver()
     }
     
-    private func setupView() {
-        let videoView = UIView()
-        self.addSubview(videoView)
-        pictureInPictureController?.sourceView = videoView
-        videoView.backgroundColor = UIColor.clear // make it transparent
+    private func setupNotificationObserver() {
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(appBecameActive),
+            name: UIApplication.didBecomeActiveNotification,
+            object: nil
+        )
+    }
+    
+    deinit {
+        NotificationCenter.default.removeObserver(self)
     }
     
     func setWebRtcModule(_ module: WebRTCModule) {
         webRtcModule = module
     }
     
-    @objc func setStreamURL(_ streamReactTag: NSString) {
-        let tag = String(streamReactTag)
-        webRtcModule?.workerQueue.async {
-            let stream = self.webRtcModule?.stream(forReactTag: tag)
-            let videoTracks = stream?.videoTracks ?? []
-            let videoTrack = videoTracks.first
-            if videoTrack == nil {
-                NSLog("PiP - No video stream for react tag: -\(tag)")
-            } else {
-                DispatchQueue.main.async {
-                    self.pictureInPictureController?.track = videoTrack
-                }
+    @objc public var streamURL: NSString? = nil {
+        didSet {
+            // https://github.com/react-native-webrtc/react-native-webrtc/blob/8dfc9c394b4bf627c0214255466ebd3b160ca563/ios/RCTWebRTC/RTCVideoViewManager.m#L405-L418
+            guard let streamURLString = streamURL as String? else {
+                NSLog("PiP - No streamURL set")
+                return
+            }
+            
+            guard let stream = self.webRtcModule?.stream(forReactTag: streamURLString) else {
+                NSLog("PiP - No stream for streamURL: -\(streamURLString)")
+                return
+            }
+            
+            guard let videoTrack = stream.videoTracks.first else {
+                NSLog("PiP - No video track for streamURL: -\(streamURLString)")
+                return
+            }
+            if (self.pictureInPictureController?.track == videoTrack) {
+                NSLog("PiP - Skipping video track for streamURL: -\(streamURLString)")
+                return
+            }
+            
+            DispatchQueue.main.async {
+                NSLog("PiP - Setting video track for streamURL: -\(streamURLString)")
+                self.pictureInPictureController?.track = videoTrack
             }
         }
     }
     
+    @objc func appBecameActive() {
+        self.pictureInPictureController?.stopPictureInPicture()
+    }
+    
+    
     @objc
     func onCallClosed() {
-        DispatchQueue.main.async {
-            self.pictureInPictureController?.cleanup()
-            self.pictureInPictureController = nil
-        }
+        NSLog("PiP - pictureInPictureController cleanup called")
+        self.pictureInPictureController?.cleanup()
+        self.pictureInPictureController = nil
     }
     
     override func didMoveToWindow() {
@@ -64,7 +88,10 @@ class RTCViewPip: UIView {
         if (!isVisible) {
             // view is detached so we cleanup the pip controller
             // taken from:  https://github.com/software-mansion/react-native-screens/blob/main/Example/ios/ScreensExample/RNSSampleLifecycleAwareView.m
-            onCallClosed()
+            DispatchQueue.main.async {
+                NSLog("PiP - onCallClosed called due to view detaching")
+                self.onCallClosed()
+            }
         }
     }
 }

package/ios/RTCViewPipManager.swift

@@ -22,13 +22,13 @@ class RTCViewPipManager: RCTViewManager {
     
     @objc func onCallClosed(_ reactTag: NSNumber) {
         self.bridge!.uiManager.addUIBlock { (_: RCTUIManager?, viewRegistry: [NSNumber: UIView]?) in
-            guard let view = viewRegistry?[reactTag] as? RTCViewPip else {
-                if RCT_DEBUG == 1 {
-                    print("Invalid view returned from registry, expecting RTCViewPip")
-                }
+            guard let pipView = viewRegistry?[reactTag] as? RTCViewPip else {
+                NSLog("PiP - onCallClosed cant be called, Invalid view returned from registry, expecting RTCViewPip")
                 return
             }
-            view.onCallClosed()
+            DispatchQueue.main.async {
+                pipView.onCallClosed()
+            }
         }
     }
 }

package/ios/StreamVideoReactNative.m

@@ -7,7 +7,10 @@
 // Do not change these consts, it is what is used react-native-webrtc
 NSNotificationName const kBroadcastStartedNotification = @"iOS_BroadcastStarted";
 NSNotificationName const kBroadcastStoppedNotification = @"iOS_BroadcastStopped";
-NSMutableDictionary *dictionary;
+
+static NSMutableDictionary *_incomingCallUUIDsByCallID = nil;
+static NSMutableDictionary *_incomingCallCidsByUUID = nil;
+static dispatch_queue_t _dictionaryQueue = nil;
 
 void broadcastNotificationCallback(CFNotificationCenterRef center,
                                    void *observer,
@@ -17,7 +20,6 @@ void broadcastNotificationCallback(CFNotificationCenterRef center,
     StreamVideoReactNative *this = (__bridge StreamVideoReactNative*)observer;
     NSString *eventName = (__bridge NSString*)name;
     [this screenShareEventReceived: eventName];
-
 }
 
 @implementation StreamVideoReactNative
@@ -38,16 +40,22 @@ RCT_EXPORT_MODULE();
     // options.videoEncoderFactory = simulcastVideoEncoderFactory;
 }
 
++(void)initializeSharedDictionaries {
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        _dictionaryQueue = dispatch_queue_create("com.stream.video.dictionary", DISPATCH_QUEUE_SERIAL);
+        _incomingCallUUIDsByCallID = [NSMutableDictionary dictionary];
+        _incomingCallCidsByUUID = [NSMutableDictionary dictionary];
+    });
+}
+
 -(instancetype)init {
-    self = [super init];
-    if (self) {
+    if ((self = [super init])) {
         _notificationCenter = CFNotificationCenterGetDarwinNotifyCenter();
-        [self setupObserver];
-    }
-    if (self) {
         [UIDevice currentDevice].batteryMonitoringEnabled = YES;
+        [self setupObserver];
+        [StreamVideoReactNative initializeSharedDictionaries];
     }
-
     return self;
 }
 
@@ -153,26 +161,68 @@ RCT_EXPORT_METHOD(currentThermalState:(RCTPromiseResolveBlock)resolve rejecter:(
 }
 
 +(void)registerIncomingCall:(NSString *)cid uuid:(NSString *)uuid {
-    if (dictionary == nil) {
-       dictionary = [NSMutableDictionary dictionary];
-    }
-    dictionary[cid] = uuid;
+    [StreamVideoReactNative initializeSharedDictionaries];
+    dispatch_sync(_dictionaryQueue, ^{
+        
+#ifdef DEBUG
+        NSLog(@"registerIncomingCall cid:%@ -> uuid:%@",cid,uuid);
+#endif
+        NSString *lowercaseUUID = [uuid lowercaseString];
+        _incomingCallUUIDsByCallID[cid] = lowercaseUUID;
+        _incomingCallCidsByUUID[lowercaseUUID] = cid;
+    });
 }
 
 RCT_EXPORT_METHOD(getIncomingCallUUid:(NSString *)cid
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-    if (dictionary == nil) {
-        reject(@"access_failure", @"no incoming call dictionary found", nil);
-    }
-    NSString *uuid = dictionary[cid];
-    if (uuid) {
-       resolve(uuid);
-     } else {
-        reject(@"access_failure", @"requested incoming call found", nil);
-     }
-
+    dispatch_sync(_dictionaryQueue, ^{
+        NSString *uuid = _incomingCallUUIDsByCallID[cid];
+        if (uuid) {
+            resolve(uuid);
+        } else {
+            NSString *errorString = [NSString stringWithFormat:@"requested incoming call not found for cid: %@", cid];
+            reject(@"access_failure", errorString, nil);
+        }
+    });
+}
+
+RCT_EXPORT_METHOD(getIncomingCallCid:(NSString *)uuid
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    dispatch_sync(_dictionaryQueue, ^{
+        NSString *lowercaseUUID = [uuid lowercaseString];
+        NSString *foundCid = _incomingCallCidsByUUID[lowercaseUUID];
+        
+        if (foundCid) {
+            resolve(foundCid);
+        } else {
+            NSString *errorString = [NSString stringWithFormat:@"requested incoming call not found for uuid: %@", uuid];
+            reject(@"access_failure", errorString, nil);
+        }
+    });
+}
+
+RCT_EXPORT_METHOD(removeIncomingCall:(NSString *)cid
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    dispatch_sync(_dictionaryQueue, ^{
+        NSString *uuid = _incomingCallUUIDsByCallID[cid];
+        if (uuid) {
+#ifdef DEBUG
+            NSLog(@"removeIncomingCall cid:%@ -> uuid:%@",cid,uuid);
+#endif
+            
+            [_incomingCallUUIDsByCallID removeObjectForKey:cid];
+            [_incomingCallCidsByUUID removeObjectForKey:uuid];
+            resolve(@YES);
+        } else {
+            resolve(@NO);
+        }
+    });
 }
 
 -(NSArray<NSString *> *)supportedEvents {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stream-io/video-react-native-sdk",
-  "version": "1.10.12",
+  "version": "1.10.14",
   "packageManager": "yarn@3.2.4",
   "description": "Stream Video SDK for React Native",
   "author": "https://getstream.io",
@@ -46,8 +46,8 @@
     "!**/.*"
   ],
   "dependencies": {
-    "@stream-io/video-client": "1.18.3",
-    "@stream-io/video-react-bindings": "1.5.5",
+    "@stream-io/video-client": "1.18.4",
+    "@stream-io/video-react-bindings": "1.5.6",
     "intl-pluralrules": "2.0.1",
     "lodash.merge": "^4.6.2",
     "react-native-url-polyfill": "1.3.0",

package/src/components/Call/CallContent/RTCViewPipIOS.tsx

@@ -1,45 +1,17 @@
 import {
   CallingState,
+  getLogger,
   hasScreenShare,
   speakerLayoutSortPreset,
 } from '@stream-io/video-client';
 import { useCall, useCallStateHooks } from '@stream-io/video-react-bindings';
 import type { MediaStream } from '@stream-io/react-native-webrtc';
 import React, { useEffect, useMemo } from 'react';
-import {
-  findNodeHandle,
-  type HostComponent,
-  Platform,
-  requireNativeComponent,
-  UIManager,
-} from 'react-native';
+import { findNodeHandle } from 'react-native';
+import { RTCViewPipNative, onNativeCallClosed } from './RTCViewPipNative';
 import { useDebouncedValue } from '../../../utils/hooks/useDebouncedValue';
 import { shouldDisableIOSLocalVideoOnBackgroundRef } from '../../../utils/internal/shouldDisableIOSLocalVideoOnBackground';
 
-const COMPONENT_NAME = 'RTCViewPip';
-
-type RTCViewPipNativeProps = {
-  streamURL?: string;
-};
-
-const RTCViewPipNative: HostComponent<RTCViewPipNativeProps> =
-  requireNativeComponent(COMPONENT_NAME);
-
-/** Wrapper for the native view
- * meant to stay private and not exposed */
-const RTCViewPip = React.memo(
-  React.forwardRef<
-    React.Ref<any>,
-    {
-      streamURL?: string;
-    }
-  >((props, ref) => {
-    if (Platform.OS !== 'ios') return null;
-    // @ts-ignore
-    return <RTCViewPipNative streamURL={props.streamURL} ref={ref} />;
-  })
-);
-
 type Props = {
   includeLocalParticipantVideo?: boolean;
 };
@@ -80,20 +52,25 @@ const RTCViewPipIOS = React.memo(({ includeLocalParticipantVideo }: Props) => {
       callClosedInvokedOnce = true;
       const node = findNodeHandle(nativeRef.current);
       if (node !== null) {
-        UIManager.dispatchViewManagerCommand(
-          node,
-          // @ts-ignore
-          UIManager.getViewManagerConfig(COMPONENT_NAME).Commands.onCallClosed,
-          []
-        );
+        onNativeCallClosed(node);
       }
       shouldDisableIOSLocalVideoOnBackgroundRef.current = true;
     };
     const unsubFunc = call?.on('call.ended', () => {
+      getLogger(['RTCViewPipIOS'])(
+        'debug',
+        `onCallClosed due to call.ended event`
+      );
+      unsubFunc?.();
       onCallClosed();
     });
     const subscription = call?.state.callingState$.subscribe((state) => {
       if (state === CallingState.LEFT || state === CallingState.IDLE) {
+        getLogger(['RTCViewPipIOS'])(
+          'debug',
+          `onCallClosed due to callingState: ${state}`
+        );
+        subscription?.unsubscribe();
         onCallClosed();
       }
     });
@@ -120,7 +97,7 @@ const RTCViewPipIOS = React.memo(({ includeLocalParticipantVideo }: Props) => {
     return videoStreamToRender?.toURL();
   }, [participantInSpotlight]);
 
-  return <RTCViewPip streamURL={streamURL} ref={nativeRef} />;
+  return <RTCViewPipNative streamURL={streamURL} ref={nativeRef} />;
 });
 
 export default RTCViewPipIOS;

package/src/components/Call/CallContent/RTCViewPipNative.tsx

@@ -0,0 +1,51 @@
+import { getLogger } from '@stream-io/video-client';
+import React from 'react';
+import {
+  type HostComponent,
+  Platform,
+  requireNativeComponent,
+  UIManager,
+  StyleSheet,
+} from 'react-native';
+
+const COMPONENT_NAME = 'RTCViewPip';
+
+type RTCViewPipNativeProps = {
+  streamURL?: string;
+};
+
+const NativeComponent: HostComponent<RTCViewPipNativeProps> =
+  requireNativeComponent(COMPONENT_NAME);
+
+export function onNativeCallClosed(reactTag: number) {
+  getLogger(['RTCViewPipNative'])('debug', 'onNativeCallClosed');
+  UIManager.dispatchViewManagerCommand(
+    reactTag,
+    // @ts-ignore
+    UIManager.getViewManagerConfig(COMPONENT_NAME).Commands.onCallClosed,
+    []
+  );
+}
+
+/** Wrapper for the native view
+ * meant to stay private and not exposed */
+export const RTCViewPipNative = React.memo(
+  React.forwardRef<
+    React.Ref<any>,
+    {
+      streamURL?: string;
+    }
+  >((props, ref) => {
+    if (Platform.OS !== 'ios') return null;
+
+    return (
+      <NativeComponent
+        style={StyleSheet.absoluteFill}
+        pointerEvents={'none'}
+        streamURL={props.streamURL}
+        // @ts-ignore
+        ref={ref}
+      />
+    );
+  })
+);

package/src/hooks/push/index.ts

@@ -1,4 +1,3 @@
-import { useIosCallKeepEventsSetupEffect } from './useIosCallKeepEventsSetupEffect';
 import { useIosVoipPushEventsSetupEffect } from './useIosVoipPushEventsSetupEffect';
 import { useProcessPushCallEffect } from './useProcessPushCallEffect';
 import { useInitAndroidTokenAndRest } from './useInitAndroidTokenAndRest';
@@ -11,7 +10,6 @@ import { useProcessPushNonRingingCallEffect } from './useProcessPushNonRingingCa
  */
 export const usePushRegisterEffect = () => {
   useIosInitRemoteNotifications();
-  useIosCallKeepEventsSetupEffect();
   useIosVoipPushEventsSetupEffect();
   useProcessPushNonRingingCallEffect();
   useProcessPushCallEffect();