react-native-spalla-player 0.16.2 → 0.16.4

package/android/src/main/java/com/spallaplayer/SpallaPlayerPipModule.kt

@@ -11,6 +11,7 @@ class SpallaPlayerPipModule(reactContext: ReactApplicationContext) : ReactContex
   companion object {
     const val NAME = "SpallaPlayerPipModule"
     private var activePlayerManager: RNSpallaPlayerManager? = null
+    private var instance: SpallaPlayerPipModule? = null
 
     fun registerPlayerManager(manager: RNSpallaPlayerManager) {
       activePlayerManager = manager
@@ -21,12 +22,27 @@ class SpallaPlayerPipModule(reactContext: ReactApplicationContext) : ReactContex
         activePlayerManager = null
       }
     }
+
+    /**
+    * A static method that MainActivity can call without needing a ReactContext.
+    * It safely forwards the call to the active module instance.
+    */
+    fun triggerUserLeaveHint() {
+      // Check if an instance exists before calling the method
+      instance?.onUserLeaveHint()
+    }
   }
 
   override fun getName(): String = NAME
 
+  init {
+    // When React Native creates the module, assign it to our static property
+    instance = this
+  }
+
   @ReactMethod
   fun onUserLeaveHint() {
     activePlayerManager?.triggerPipImmediate()
   }
+
 }

package/android/src/main/java/com/spallaplayer/SpallaPlayerViewManager.kt

@@ -6,7 +6,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.PictureInPictureModeChangedInfo
 import androidx.core.util.Consumer
 import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.ViewGroupManager
@@ -46,12 +45,15 @@ class RNSpallaPlayerManager() : ViewGroupManager<SpallaPlayerContainerView>(),
     // Reset the flag when PiP mode changes
     pipTriggered = false
 
-    _container?.let { container ->
-      _reactContext?.getJSModule(RCTEventEmitter::class.java)?.receiveEvent(
-        container.id,
-        "onPlayerEvent",
-        map
-      )
+    // we will only dispatch exits for now
+    if(!info.isInPictureInPictureMode) {
+      _container?.let { container ->
+        _reactContext?.getJSModule(RCTEventEmitter::class.java)?.receiveEvent(
+          container.id,
+          "onPlayerEvent",
+          map
+        )
+      }
     }
     _reactContext?.currentActivity?.let { activity ->
       _playerView?.onPictureInPictureModeChanged(activity, info.isInPictureInPictureMode)
@@ -93,7 +95,11 @@ class RNSpallaPlayerManager() : ViewGroupManager<SpallaPlayerContainerView>(),
 
   override fun onDropViewInstance(view: SpallaPlayerContainerView) {
     Log.v("RNSpallaPlayerManager", "onDropViewInstance")
-    //_reactContext?.removeLifecycleEventListener(this)
+
+    if (_reactContext?.currentActivity is AppCompatActivity) {
+      val activity = _reactContext?.currentActivity as? AppCompatActivity
+      activity?.removeOnPictureInPictureModeChangedListener(pipModeListener)
+    }
 
     // Unregister this manager
     SpallaPlayerPipModule.unregisterPlayerManager(this)
@@ -307,6 +313,19 @@ class RNSpallaPlayerManager() : ViewGroupManager<SpallaPlayerContainerView>(),
   fun triggerPipImmediate() {
     if (pipTriggered) return
 
+    // dispatch early, as waiting for the callback on piplistener may be too late
+    val map: WritableMap = Arguments.createMap()
+    map.putString("event", "enterPiP")
+    map.putBoolean("isInPictureInPictureMode", true)
+
+    _container?.let { container ->
+      _reactContext?.getJSModule(RCTEventEmitter::class.java)?.receiveEvent(
+        container.id,
+        "onPlayerEvent",
+        map
+      )
+    }
+
     _playerView?.let { player ->
       val activity = _reactContext?.currentActivity
       if (activity != null && isPlaying) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-spalla-player",
-  "version": "0.16.2",
+  "version": "0.16.4",
   "description": "Spalla SDK for RN",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",
@@ -82,7 +82,6 @@
     "react": "18.3.1",
     "react-native": "0.75.4",
     "react-native-builder-bob": "^0.30.2",
-    "react-native-safe-area-context": "^5.4.1",
     "release-it": "^15.0.0",
     "turbo": "^1.10.7",
     "typescript": "^5.2.2"
@@ -92,8 +91,7 @@
   },
   "peerDependencies": {
     "react": "*",
-    "react-native": "*",
-    "react-native-safe-area-context": "*"
+    "react-native": "*"
   },
   "workspaces": [
     "example"

package/plugin/withPipAndroid.js

@@ -47,9 +47,7 @@ import com.spallaplayer.SpallaPlayerPipModule`
     const method = `
   override fun onUserLeaveHint() {
     super.onUserLeaveHint()
-    reactNativeHost.reactInstanceManager.currentReactContext?.let { context ->
-      context.getNativeModule(SpallaPlayerPipModule::class.java)?.onUserLeaveHint()
-    }
+    SpallaPlayerPipModule.triggerUserLeaveHint()
   }
 `;