@bluebillywig/react-native-bb-player 8.44.0 → 8.45.0

package/android/src/main/java/com/bluebillywig/bbplayer/BBPlayerView.kt

@@ -12,6 +12,7 @@ import android.widget.FrameLayout
 import com.facebook.react.modules.core.ReactChoreographer
 import androidx.collection.ArrayMap
 import androidx.mediarouter.app.MediaRouteButton
+import org.json.JSONObject
 import com.bluebillywig.bbnativeplayersdk.BBNativePlayer
 import com.bluebillywig.bbnativeplayersdk.BBNativePlayerView
 import com.bluebillywig.bbnativeplayersdk.BBNativePlayerViewDelegate
@@ -176,14 +177,8 @@ class BBPlayerView(private val reactContext: ThemedReactContext) : FrameLayout(r
     // END NATIVE LAYOUT INTEGRATION
     // ==================================================================================
 
-    // Timer for periodic time updates (opt-in for performance)
-    private val timeUpdateHandler = Handler(Looper.getMainLooper())
-    private var timeUpdateRunnable: Runnable? = null
     private var isPlaying = false
     private var currentDuration: Double = 0.0
-    private var lastKnownTime: Double = 0.0
-    private var playbackStartTimestamp: Long = 0
-    private var enableTimeUpdates: Boolean = false
 
     // Event emission helper using modern EventDispatcher
     private fun sendEvent(eventName: String, params: WritableMap?) {
@@ -222,17 +217,6 @@ class BBPlayerView(private val reactContext: ThemedReactContext) : FrameLayout(r
         this.options["autoPlay"] = autoPlay
     }
 
-    fun setEnableTimeUpdates(enabled: Boolean) {
-        enableTimeUpdates = enabled
-        debugLog("BBPlayerView") { "Time updates ${if (enabled) "enabled" else "disabled"}" }
-
-        if (!enabled && timeUpdateRunnable != null) {
-            stopTimeUpdates()
-        } else if (enabled && isPlaying && timeUpdateRunnable == null) {
-            startTimeUpdates()
-        }
-    }
-
     fun setOptions(optionsMap: ReadableMap?) {
         optionsMap?.let { map ->
             val iterator = map.keySetIterator()
@@ -275,91 +259,36 @@ class BBPlayerView(private val reactContext: ThemedReactContext) : FrameLayout(r
 
         addView(playerView, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
 
-        // Set ExoPlayer's resize mode to FILL to prevent letterboxing margins
-        // This addresses top/bottom margin issues caused by AspectRatioFrameLayout
+        // RESIZE_MODE_FILL prevents SurfaceView bleed-through at container edges
+        // when embedding inline above a WebView. The container aspect ratio is
+        // adapted dynamically via onDidTriggerMediaClipLoaded to avoid stretching.
         postDelayed({
-            setExoPlayerResizeMode(playerView, RESIZE_MODE_FILL)
-        }, 1000)
+            setExoPlayerResizeMode(playerView)
+        }, 500)
 
         playerSetup = true
         debugLog("BBPlayerView") { "Player setup complete with URL: $jsonUrl" }
     }
 
-    companion object {
-        // AspectRatioFrameLayout resize mode constants
-        private const val RESIZE_MODE_FILL = 3
-    }
-
     /**
-     * Recursively find ExoPlayer's PlayerView or AspectRatioFrameLayout and set resize mode.
-     * Uses reflection since media3 classes aren't directly available in RN module classpath.
-     * This fixes top/bottom margin issues caused by AspectRatioFrameLayout letterboxing.
+     * Set ExoPlayer's resize mode to FILL via reflection.
+     * FILL prevents SurfaceView bleed-through artifacts at container edges.
      */
-    private fun setExoPlayerResizeMode(view: View, resizeMode: Int): Boolean {
-        // Try Media3 AspectRatioFrameLayout via reflection
-        try {
-            val aspectRatioClass = Class.forName("androidx.media3.ui.AspectRatioFrameLayout")
-            if (aspectRatioClass.isInstance(view)) {
-                val method = aspectRatioClass.getMethod("setResizeMode", Int::class.javaPrimitiveType)
-                method.invoke(view, resizeMode)
-                return true
-            }
-        } catch (_: ClassNotFoundException) {
-            // Media3 not available
-        } catch (_: Exception) {
-            // Failed to set resize mode
-        }
-
-        // Try Media3 PlayerView via reflection
+    private fun setExoPlayerResizeMode(view: View): Boolean {
         try {
             val playerViewClass = Class.forName("androidx.media3.ui.PlayerView")
             if (playerViewClass.isInstance(view)) {
                 val method = playerViewClass.getMethod("setResizeMode", Int::class.javaPrimitiveType)
-                method.invoke(view, resizeMode)
-                // Continue searching - there might be an AspectRatioFrameLayout inside
-            }
-        } catch (_: ClassNotFoundException) {
-            // Media3 PlayerView not available
-        } catch (_: Exception) {
-            // Failed to set resize mode
-        }
-
-        // Try legacy ExoPlayer2 AspectRatioFrameLayout via reflection
-        try {
-            val legacyAspectRatioClass = Class.forName("com.google.android.exoplayer2.ui.AspectRatioFrameLayout")
-            if (legacyAspectRatioClass.isInstance(view)) {
-                val method = legacyAspectRatioClass.getMethod("setResizeMode", Int::class.javaPrimitiveType)
-                method.invoke(view, resizeMode)
+                method.invoke(view, 3) // RESIZE_MODE_FILL = 3
                 return true
             }
-        } catch (_: ClassNotFoundException) {
-            // ExoPlayer2 not available
-        } catch (_: Exception) {
-            // Failed to set resize mode
-        }
+        } catch (_: Exception) {}
 
-        // Try legacy ExoPlayer2 StyledPlayerView via reflection
-        try {
-            val styledPlayerViewClass = Class.forName("com.google.android.exoplayer2.ui.StyledPlayerView")
-            if (styledPlayerViewClass.isInstance(view)) {
-                val method = styledPlayerViewClass.getMethod("setResizeMode", Int::class.javaPrimitiveType)
-                method.invoke(view, resizeMode)
-            }
-        } catch (_: ClassNotFoundException) {
-            // StyledPlayerView not available
-        } catch (_: Exception) {
-            // Failed to set resize mode
-        }
-
-        // Recursively search children
         if (view is ViewGroup) {
             for (i in 0 until view.childCount) {
-                if (setExoPlayerResizeMode(view.getChildAt(i), resizeMode)) {
-                    return true
-                }
+                if (setExoPlayerResizeMode(view.getChildAt(i))) return true
             }
         }
-
         return false
     }
 
@@ -370,13 +299,13 @@ class BBPlayerView(private val reactContext: ThemedReactContext) : FrameLayout(r
      *
      * Note: Shorts URLs (/sh/{id}.json) are NOT supported here - use BBShortsView instead.
      */
-    fun loadWithJsonUrl(url: String, autoPlay: Boolean = true) {
+    fun loadWithJsonUrl(url: String, autoPlay: Boolean = true, contextJson: String? = null) {
         if (!::playerView.isInitialized) {
             Log.w("BBPlayerView", "Cannot load content - playerView not initialized")
             return
         }
 
-        Log.d("BBPlayerView", "loadWithJsonUrl called with URL: $url")
+        Log.d("BBPlayerView", "loadWithJsonUrl called with URL: $url, context: $contextJson")
 
         // Extract ID from URL patterns like:
         // /c/{id}.json or /mediaclip/{id}.json -> clip ID
@@ -388,6 +317,8 @@ class BBPlayerView(private val reactContext: ThemedReactContext) : FrameLayout(r
         val projectIdRegex = Regex("/pj/([0-9]+)\\.json|/project/([0-9]+)")
         val shortsIdRegex = Regex("/sh/([0-9]+)\\.json")
 
+        val context = parseContext(contextJson)
+
         when {
             shortsIdRegex.containsMatchIn(url) -> {
                 // Shorts require a separate BBShortsView component
@@ -401,7 +332,7 @@ class BBPlayerView(private val reactContext: ThemedReactContext) : FrameLayout(r
                 val clipListId = match?.groupValues?.drop(1)?.firstOrNull { it.isNotEmpty() }
                 if (clipListId != null) {
                     Log.d("BBPlayerView", "Loading ClipList by ID: $clipListId")
-                    playerView.player?.loadWithClipListId(clipListId, "external", autoPlay, null)
+                    playerView.player?.loadWithClipListId(clipListId, "external", autoPlay, null, context)
                 } else {
                     Log.e("BBPlayerView", "Failed to extract cliplist ID from URL: $url")
                 }
@@ -411,7 +342,7 @@ class BBPlayerView(private val reactContext: ThemedReactContext) : FrameLayout(r
                 val projectId = match?.groupValues?.drop(1)?.firstOrNull { it.isNotEmpty() }
                 if (projectId != null) {
                     Log.d("BBPlayerView", "Loading Project by ID: $projectId")
-                    playerView.player?.loadWithProjectId(projectId, "external", autoPlay, null)
+                    playerView.player?.loadWithProjectId(projectId, "external", autoPlay, null, context)
                 } else {
                     Log.e("BBPlayerView", "Failed to extract project ID from URL: $url")
                 }
@@ -421,7 +352,7 @@ class BBPlayerView(private val reactContext: ThemedReactContext) : FrameLayout(r
                 val clipId = match?.groupValues?.drop(1)?.firstOrNull { it.isNotEmpty() }
                 if (clipId != null) {
                     Log.d("BBPlayerView", "Loading Clip by ID: $clipId")
-                    playerView.player?.loadWithClipId(clipId, "external", autoPlay, null)
+                    playerView.player?.loadWithClipId(clipId, "external", autoPlay, null, context)
                 } else {
                     Log.e("BBPlayerView", "Failed to extract clip ID from URL: $url")
                 }
@@ -439,7 +370,6 @@ class BBPlayerView(private val reactContext: ThemedReactContext) : FrameLayout(r
         debugLog("BBPlayerView") { "removePlayer called" }
         playerSetup = false
         isPlaying = false
-        stopTimeUpdates()
         removeAllViews()
 
         if (::playerView.isInitialized) {
@@ -469,9 +399,7 @@ class BBPlayerView(private val reactContext: ThemedReactContext) : FrameLayout(r
 
     fun seekRelative(offsetInSeconds: Double) {
         if (::playerView.isInitialized) {
-            val currentTime = calculateEstimatedCurrentTime()
-            val newPosition = kotlin.math.max(0.0, kotlin.math.min(currentDuration, currentTime + offsetInSeconds))
-            playerView.player?.seek(newPosition)
+            playerView.player?.seekRelative(offsetInSeconds)
         }
     }
 
@@ -566,6 +494,20 @@ class BBPlayerView(private val reactContext: ThemedReactContext) : FrameLayout(r
         return null
     }
 
+    fun presentModal() {
+        Log.d("BBPlayerView", "presentModal() called")
+        if (::playerView.isInitialized) {
+            playerView.player?.enterFullScreen()
+        }
+    }
+
+    fun closeModal() {
+        Log.d("BBPlayerView", "closeModal() called")
+        if (::playerView.isInitialized) {
+            playerView.player?.exitFullScreen()
+        }
+    }
+
     fun destroy() {
         Log.d("BBPlayerView", "destroy() called")
         if (::playerView.isInitialized) {
@@ -610,22 +552,6 @@ class BBPlayerView(private val reactContext: ThemedReactContext) : FrameLayout(r
         } else null
     }
 
-    private fun calculateEstimatedCurrentTime(): Double {
-        return if (isPlaying && playbackStartTimestamp > 0) {
-            val elapsedSeconds = (System.currentTimeMillis() - playbackStartTimestamp) / 1000.0
-            val estimatedTime = lastKnownTime + elapsedSeconds
-            kotlin.math.min(estimatedTime, currentDuration)
-        } else {
-            lastKnownTime
-        }
-    }
-
-    fun getCurrentTime(): Double? {
-        return if (::playerView.isInitialized) {
-            calculateEstimatedCurrentTime()
-        } else null
-    }
-
     fun getDuration(): Double? {
         return if (::playerView.isInitialized) {
             playerView.getApiProperty(com.bluebillywig.bbnativeshared.enums.ApiProperty.duration) as? Double
@@ -672,73 +598,63 @@ class BBPlayerView(private val reactContext: ThemedReactContext) : FrameLayout(r
         return null
     }
 
-    // Load methods
-    fun loadWithClipId(clipId: String, initiator: String? = "external", autoPlay: Boolean? = true, seekTo: Double? = null) {
-        if (::playerView.isInitialized) {
-            playerView.player?.loadWithClipId(clipId, initiator, autoPlay, seekTo)
+    // Helper to parse context JSON into a Map for the native SDK
+    private fun parseContext(contextJson: String?): Map<String, Any?>? {
+        if (contextJson.isNullOrBlank()) return null
+        return try {
+            val json = JSONObject(contextJson)
+            mapOf(
+                "contextEntityType" to json.optString("contextEntityType", null),
+                "contextEntityId" to json.optString("contextEntityId", null),
+                "contextCollectionType" to json.optString("contextCollectionType", null),
+                "contextCollectionId" to json.optString("contextCollectionId", null)
+            ).filterValues { it != null }
+        } catch (e: Exception) {
+            Log.w("BBPlayerView", "Failed to parse context JSON: $contextJson", e)
+            null
         }
     }
 
-    fun loadWithClipListId(clipListId: String, initiator: String? = "external", autoPlay: Boolean? = true, seekTo: Double? = null) {
+    // Load methods
+    fun loadWithClipId(clipId: String, initiator: String? = "external", autoPlay: Boolean? = true, seekTo: Double? = null, contextJson: String? = null) {
         if (::playerView.isInitialized) {
-            playerView.player?.loadWithClipListId(clipListId, initiator, autoPlay, seekTo)
+            val context = parseContext(contextJson)
+            playerView.player?.loadWithClipId(clipId, initiator, autoPlay, seekTo, context)
         }
     }
 
-    fun loadWithProjectId(projectId: String, initiator: String? = "external", autoPlay: Boolean? = true, seekTo: Double? = null) {
+    fun loadWithClipListId(clipListId: String, initiator: String? = "external", autoPlay: Boolean? = true, seekTo: Double? = null, contextJson: String? = null) {
         if (::playerView.isInitialized) {
-            playerView.player?.loadWithProjectId(projectId, initiator, autoPlay, seekTo)
+            val context = parseContext(contextJson)
+            playerView.player?.loadWithClipListId(clipListId, initiator, autoPlay, seekTo, context)
         }
     }
 
-    fun loadWithClipJson(clipJson: String, initiator: String? = "external", autoPlay: Boolean? = true, seekTo: Double? = null) {
+    fun loadWithProjectId(projectId: String, initiator: String? = "external", autoPlay: Boolean? = true, seekTo: Double? = null, contextJson: String? = null) {
         if (::playerView.isInitialized) {
-            playerView.player?.loadWithClipJson(clipJson, initiator, autoPlay, seekTo)
+            val context = parseContext(contextJson)
+            playerView.player?.loadWithProjectId(projectId, initiator, autoPlay, seekTo, context)
         }
     }
 
-    fun loadWithClipListJson(clipListJson: String, initiator: String? = "external", autoPlay: Boolean? = true, seekTo: Double? = null) {
+    fun loadWithClipJson(clipJson: String, initiator: String? = "external", autoPlay: Boolean? = true, seekTo: Double? = null, contextJson: String? = null) {
         if (::playerView.isInitialized) {
-            playerView.player?.loadWithClipListJson(clipListJson, initiator, autoPlay, seekTo)
+            val context = parseContext(contextJson)
+            playerView.player?.loadWithClipJson(clipJson, initiator, autoPlay, seekTo, context)
         }
     }
 
-    fun loadWithProjectJson(projectJson: String, initiator: String? = "external", autoPlay: Boolean? = true, seekTo: Double? = null) {
+    fun loadWithClipListJson(clipListJson: String, initiator: String? = "external", autoPlay: Boolean? = true, seekTo: Double? = null, contextJson: String? = null) {
         if (::playerView.isInitialized) {
-            playerView.player?.loadWithProjectJson(projectJson, initiator, autoPlay, seekTo)
-        }
-    }
-
-    private fun startTimeUpdates() {
-        if (!enableTimeUpdates || timeUpdateRunnable != null) {
-            return
-        }
-
-        timeUpdateRunnable = object : Runnable {
-            override fun run() {
-                if (::playerView.isInitialized && isPlaying) {
-                    val currentTime = calculateEstimatedCurrentTime()
-
-                    if (currentDuration > 0) {
-                        val params = Arguments.createMap().apply {
-                            putDouble("currentTime", currentTime)
-                            putDouble("duration", currentDuration)
-                        }
-                        sendEvent("onDidTriggerTimeUpdate", params)
-                    }
-
-                    timeUpdateHandler.postDelayed(this, 1000)
-                }
-            }
+            val context = parseContext(contextJson)
+            playerView.player?.loadWithClipListJson(clipListJson, initiator, autoPlay, seekTo, context)
         }
-
-        timeUpdateHandler.postDelayed(timeUpdateRunnable!!, 1000)
     }
 
-    private fun stopTimeUpdates() {
-        timeUpdateRunnable?.let {
-            timeUpdateHandler.removeCallbacks(it)
-            timeUpdateRunnable = null
+    fun loadWithProjectJson(projectJson: String, initiator: String? = "external", autoPlay: Boolean? = true, seekTo: Double? = null, contextJson: String? = null) {
+        if (::playerView.isInitialized) {
+            val context = parseContext(contextJson)
+            playerView.player?.loadWithProjectJson(projectJson, initiator, autoPlay, seekTo, context)
         }
     }
 
@@ -756,10 +672,12 @@ class BBPlayerView(private val reactContext: ThemedReactContext) : FrameLayout(r
     }
 
     override fun didTriggerMediaClipLoaded(view: BBNativePlayerView, clipData: MediaClip?) {
-        debugLog("BBPlayerView") { "didTriggerMediaClipLoaded: ${clipData?.title}" }
+        debugLog("BBPlayerView") { "didTriggerMediaClipLoaded: ${clipData?.title} (${clipData?.width}x${clipData?.height})" }
         val params = Arguments.createMap().apply {
             putString("title", clipData?.title)
             putString("id", clipData?.id)
+            clipData?.width?.let { putDouble("width", it.toDouble()) }
+            clipData?.height?.let { putDouble("height", it.toDouble()) }
         }
         sendEvent("onDidTriggerMediaClipLoaded", params)
     }
@@ -839,24 +757,20 @@ class BBPlayerView(private val reactContext: ThemedReactContext) : FrameLayout(r
     }
 
     override fun didTriggerPlaying(view: BBNativePlayerView) {
-        debugLog("BBPlayerView") { "didTriggerPlaying - starting periodic time updates" }
+        debugLog("BBPlayerView") { "didTriggerPlaying" }
         isPlaying = true
-        playbackStartTimestamp = System.currentTimeMillis()
-        startTimeUpdates()
         sendEvent("onDidTriggerPlaying")
     }
 
     override fun didTriggerPause(view: BBNativePlayerView) {
-        debugLog("BBPlayerView") { "didTriggerPause - stopping periodic time updates" }
+        debugLog("BBPlayerView") { "didTriggerPause" }
         isPlaying = false
-        stopTimeUpdates()
         sendEvent("onDidTriggerPause")
     }
 
     override fun didTriggerEnded(view: BBNativePlayerView) {
-        debugLog("BBPlayerView") { "didTriggerEnded - stopping periodic time updates" }
+        debugLog("BBPlayerView") { "didTriggerEnded" }
         isPlaying = false
-        stopTimeUpdates()
         sendEvent("onDidTriggerEnded")
     }
 
@@ -867,9 +781,6 @@ class BBPlayerView(private val reactContext: ThemedReactContext) : FrameLayout(r
 
     override fun didTriggerSeeked(view: BBNativePlayerView, seekOffset: Double?) {
         debugLog("BBPlayerView") { "didTriggerSeeked: $seekOffset" }
-        lastKnownTime = seekOffset ?: 0.0
-        playbackStartTimestamp = System.currentTimeMillis()
-
         val params = Arguments.createMap().apply {
             putDouble("payload", seekOffset ?: 0.0)
         }
@@ -1062,8 +973,6 @@ class BBPlayerView(private val reactContext: ThemedReactContext) : FrameLayout(r
 
     override fun onDetachedFromWindow() {
         debugLog("BBPlayerView") { "onDetachedFromWindow - cleaning up player" }
-        stopTimeUpdates()
-        timeUpdateHandler.removeCallbacksAndMessages(null)
         removePlayer()
         super.onDetachedFromWindow()
     }

package/android/src/main/java/com/bluebillywig/bbplayer/BBPlayerViewManager.kt

@@ -43,11 +43,6 @@ class BBPlayerViewManager : ViewGroupManager<BBPlayerView>() {
         view.setAutoPlay(autoPlay)
     }
 
-    @ReactProp(name = "enableTimeUpdates")
-    fun setEnableTimeUpdates(view: BBPlayerView, enabled: Boolean) {
-        view.setEnableTimeUpdates(enabled)
-    }
-
     @ReactProp(name = "options")
     fun setOptions(view: BBPlayerView, options: ReadableMap?) {
         view.setOptions(options)
@@ -186,7 +181,6 @@ class BBPlayerViewManager : ViewGroupManager<BBPlayerView>() {
             "onDidTriggerEnded",
             "onDidTriggerSeeking",
             "onDidTriggerSeeked",
-            "onDidTriggerTimeUpdate",
             "onDidTriggerDurationChange",
             "onDidTriggerVolumeChange",
             "onDidTriggerCanPlay",

package/android/src/paper/java/com/bluebillywig/bbplayer/NativeBBPlayerModuleSpec.java

@@ -31,23 +31,34 @@ public abstract class NativeBBPlayerModuleSpec extends ReactContextBaseJavaModul
     public abstract void collapse(int viewTag);
     public abstract void expand(int viewTag);
 
+    // Void methods - modal control
+    public abstract void presentModal(int viewTag);
+    public abstract void closeModal(int viewTag);
+
     // Void methods - other commands
     public abstract void autoPlayNextCancel(int viewTag);
     public abstract void destroy(int viewTag);
     public abstract void showCastPicker(int viewTag);
 
+    // Modal player (module-level)
+    public abstract void presentModalPlayer(String jsonUrl, String optionsJson);
+    public abstract void dismissModalPlayer();
+
+    // Event emitter support
+    public abstract void addListener(String eventName);
+    public abstract void removeListeners(double count);
+
     // Load methods
-    public abstract void loadWithClipId(int viewTag, String clipId, String initiator, boolean autoPlay, double seekTo);
-    public abstract void loadWithClipListId(int viewTag, String clipListId, String initiator, boolean autoPlay, double seekTo);
-    public abstract void loadWithProjectId(int viewTag, String projectId, String initiator, boolean autoPlay, double seekTo);
-    public abstract void loadWithClipJson(int viewTag, String clipJson, String initiator, boolean autoPlay, double seekTo);
-    public abstract void loadWithClipListJson(int viewTag, String clipListJson, String initiator, boolean autoPlay, double seekTo);
-    public abstract void loadWithProjectJson(int viewTag, String projectJson, String initiator, boolean autoPlay, double seekTo);
-    public abstract void loadWithJsonUrl(int viewTag, String jsonUrl, boolean autoPlay);
+    public abstract void loadWithClipId(int viewTag, String clipId, String initiator, boolean autoPlay, double seekTo, String contextJson);
+    public abstract void loadWithClipListId(int viewTag, String clipListId, String initiator, boolean autoPlay, double seekTo, String contextJson);
+    public abstract void loadWithProjectId(int viewTag, String projectId, String initiator, boolean autoPlay, double seekTo, String contextJson);
+    public abstract void loadWithClipJson(int viewTag, String clipJson, String initiator, boolean autoPlay, double seekTo, String contextJson);
+    public abstract void loadWithClipListJson(int viewTag, String clipListJson, String initiator, boolean autoPlay, double seekTo, String contextJson);
+    public abstract void loadWithProjectJson(int viewTag, String projectJson, String initiator, boolean autoPlay, double seekTo, String contextJson);
+    public abstract void loadWithJsonUrl(int viewTag, String jsonUrl, boolean autoPlay, String contextJson);
 
     // Promise getters
     public abstract void getDuration(int viewTag, Promise promise);
-    public abstract void getCurrentTime(int viewTag, Promise promise);
     public abstract void getMuted(int viewTag, Promise promise);
     public abstract void getVolume(int viewTag, Promise promise);
     public abstract void getPhase(int viewTag, Promise promise);

package/ios/BBPlayerModule.mm

@@ -1,10 +1,11 @@
 #import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <BBPlayerModuleSpec/BBPlayerModuleSpec.h>
 #endif
 
-@interface RCT_EXTERN_MODULE(BBPlayerModule, NSObject)
+@interface RCT_EXTERN_MODULE(BBPlayerModule, RCTEventEmitter)
 
 // Playback control
 RCT_EXTERN_METHOD(play:(nonnull NSNumber *)viewTag)
@@ -29,13 +30,13 @@ RCT_EXTERN_METHOD(destroy:(nonnull NSNumber *)viewTag)
 RCT_EXTERN_METHOD(showCastPicker:(nonnull NSNumber *)viewTag)
 
 // Load methods
-RCT_EXTERN_METHOD(loadWithClipId:(nonnull NSNumber *)viewTag clipId:(NSString *)clipId initiator:(NSString *)initiator autoPlay:(BOOL)autoPlay seekTo:(NSNumber *)seekTo)
-RCT_EXTERN_METHOD(loadWithClipListId:(nonnull NSNumber *)viewTag clipListId:(NSString *)clipListId initiator:(NSString *)initiator autoPlay:(BOOL)autoPlay seekTo:(NSNumber *)seekTo)
-RCT_EXTERN_METHOD(loadWithProjectId:(nonnull NSNumber *)viewTag projectId:(NSString *)projectId initiator:(NSString *)initiator autoPlay:(BOOL)autoPlay seekTo:(NSNumber *)seekTo)
-RCT_EXTERN_METHOD(loadWithClipJson:(nonnull NSNumber *)viewTag clipJson:(NSString *)clipJson initiator:(NSString *)initiator autoPlay:(BOOL)autoPlay seekTo:(NSNumber *)seekTo)
-RCT_EXTERN_METHOD(loadWithClipListJson:(nonnull NSNumber *)viewTag clipListJson:(NSString *)clipListJson initiator:(NSString *)initiator autoPlay:(BOOL)autoPlay seekTo:(NSNumber *)seekTo)
-RCT_EXTERN_METHOD(loadWithProjectJson:(nonnull NSNumber *)viewTag projectJson:(NSString *)projectJson initiator:(NSString *)initiator autoPlay:(BOOL)autoPlay seekTo:(NSNumber *)seekTo)
-RCT_EXTERN_METHOD(loadWithJsonUrl:(nonnull NSNumber *)viewTag jsonUrl:(NSString *)jsonUrl autoPlay:(BOOL)autoPlay)
+RCT_EXTERN_METHOD(loadWithClipId:(nonnull NSNumber *)viewTag clipId:(NSString *)clipId initiator:(NSString *)initiator autoPlay:(BOOL)autoPlay seekTo:(NSNumber *)seekTo contextJson:(NSString *)contextJson)
+RCT_EXTERN_METHOD(loadWithClipListId:(nonnull NSNumber *)viewTag clipListId:(NSString *)clipListId initiator:(NSString *)initiator autoPlay:(BOOL)autoPlay seekTo:(NSNumber *)seekTo contextJson:(NSString *)contextJson)
+RCT_EXTERN_METHOD(loadWithProjectId:(nonnull NSNumber *)viewTag projectId:(NSString *)projectId initiator:(NSString *)initiator autoPlay:(BOOL)autoPlay seekTo:(NSNumber *)seekTo contextJson:(NSString *)contextJson)
+RCT_EXTERN_METHOD(loadWithClipJson:(nonnull NSNumber *)viewTag clipJson:(NSString *)clipJson initiator:(NSString *)initiator autoPlay:(BOOL)autoPlay seekTo:(NSNumber *)seekTo contextJson:(NSString *)contextJson)
+RCT_EXTERN_METHOD(loadWithClipListJson:(nonnull NSNumber *)viewTag clipListJson:(NSString *)clipListJson initiator:(NSString *)initiator autoPlay:(BOOL)autoPlay seekTo:(NSNumber *)seekTo contextJson:(NSString *)contextJson)
+RCT_EXTERN_METHOD(loadWithProjectJson:(nonnull NSNumber *)viewTag projectJson:(NSString *)projectJson initiator:(NSString *)initiator autoPlay:(BOOL)autoPlay seekTo:(NSNumber *)seekTo contextJson:(NSString *)contextJson)
+RCT_EXTERN_METHOD(loadWithJsonUrl:(nonnull NSNumber *)viewTag jsonUrl:(NSString *)jsonUrl autoPlay:(BOOL)autoPlay contextJson:(NSString *)contextJson)
 
 // Getter methods with Promise
 RCT_EXTERN_METHOD(getDuration:(nonnull NSNumber *)viewTag resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
@@ -49,6 +50,14 @@ RCT_EXTERN_METHOD(getClipData:(nonnull NSNumber *)viewTag resolver:(RCTPromiseRe
 RCT_EXTERN_METHOD(getProjectData:(nonnull NSNumber *)viewTag resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 RCT_EXTERN_METHOD(getPlayoutData:(nonnull NSNumber *)viewTag resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 
+// Modal player (module-level)
+RCT_EXTERN_METHOD(presentModalPlayer:(NSString *)jsonUrl optionsJson:(NSString *)optionsJson)
+RCT_EXTERN_METHOD(dismissModalPlayer)
+
+// Event emitter support
+RCT_EXTERN_METHOD(addListener:(NSString *)eventName)
+RCT_EXTERN_METHOD(removeListeners:(double)count)
+
 #ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params