react-native-firework-sdk 2.19.2 → 2.19.3

package/android/gradle.properties

@@ -6,4 +6,4 @@ FireworkSDK_targetSdkVersion=33
 FireworkSDK_compileSdkVersion=33
 FireworkSDK_kotlinVersion=1.8.22
 FireworkSDK_fwPlayerLaunchMode=singleTask
-FireworkSDK_fwNativeVersion=6.30.8
+FireworkSDK_fwNativeVersion=6.30.7

package/android/src/main/java/com/fireworksdk/bridge/components/storyblock/StoryBlockContainerView.kt

@@ -133,18 +133,6 @@ class StoryBlockContainerView(
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
-
-        // Re-register fragment lifecycle callbacks after reattach (e.g., from removeClippedSubviews)
-        if (!isCallbackRegistered && storyBlockFragment != null) {
-            (context as? FragmentActivity)?.supportFragmentManager?.let { fm ->
-                fm.registerFragmentLifecycleCallbacks(fragmentLifecycleCallbacks, false)
-                isCallbackRegistered = true
-            }
-            if (storyBlockFragment?.isAdded == true) {
-                isFragmentAttached = true
-            }
-        }
-
         // Try to attach pending fragment when view is attached to window
         pendingFragment?.let { fragment ->
             val savedPendingFragment = fragment
@@ -181,6 +169,9 @@ class StoryBlockContainerView(
             }
         }
         
+        // Clear all references to prevent memory leaks
+        // pendingFragment = null
+        // storyBlockFragment = null
         isFragmentAttached = false
         retryCount = 0
         totalRetryCount = 0

package/android/src/main/java/com/fireworksdk/bridge/components/videofeed/FWVideoFeed.kt

@@ -2,7 +2,6 @@ package com.fireworksdk.bridge.components.videofeed
 
 import android.content.Context
 import android.util.AttributeSet
-import android.view.Choreographer
 import android.widget.FrameLayout
 import com.firework.error.FwErrorListener
 import com.firework.videofeed.FeedViewStateListener
@@ -22,13 +21,10 @@ class FWVideoFeed(
 
   val videoFeedView = FwVideoFeedView(context)
   var videoFeedPropsModel: FWVideoFeedPropsModel = FWVideoFeedPropsModel()
-  var themedReactContext: Any? = null
   private var isInit = false
 
   private var onWindowFocusChanged = false
   private var feedViewStateListener: FeedViewStateListener? = null
-  private var layoutFrameCallback: Choreographer.FrameCallback? = null
-  private var needsForceLayout = false
 
   init {
     FWLanguageUtil.getInstance(context).updateBaseContextLocale(context)
@@ -36,52 +32,6 @@ class FWVideoFeed(
     addView(videoFeedView, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
   }
 
-  override fun onAttachedToWindow() {
-    super.onAttachedToWindow()
-    needsForceLayout = true
-    startLayoutUpdates()
-  }
-
-  override fun onDetachedFromWindow() {
-    super.onDetachedFromWindow()
-    stopLayoutUpdates()
-  }
-
-  private fun startLayoutUpdates() {
-    if (layoutFrameCallback != null) return
-    layoutFrameCallback = object : Choreographer.FrameCallback {
-      override fun doFrame(frameTimeNanos: Long) {
-        manuallyLayoutChildren()
-        if (viewTreeObserver.isAlive) {
-          viewTreeObserver.dispatchOnGlobalLayout()
-        }
-        layoutFrameCallback?.let {
-          Choreographer.getInstance().postFrameCallback(it)
-        }
-      }
-    }
-    Choreographer.getInstance().postFrameCallback(layoutFrameCallback!!)
-  }
-
-  private fun stopLayoutUpdates() {
-    layoutFrameCallback?.let {
-      Choreographer.getInstance().removeFrameCallback(it)
-    }
-    layoutFrameCallback = null
-  }
-
-  private fun manuallyLayoutChildren() {
-    if (needsForceLayout) {
-      videoFeedView.forceLayout()
-      needsForceLayout = false
-    }
-    videoFeedView.measure(
-      MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
-      MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
-    )
-    videoFeedView.layout(0, 0, width, height)
-  }
-
   fun setVideoFeedLayoutParams(l: LayoutParams?) {
     l ?: return
     videoFeedView.layoutParams = l

package/android/src/main/java/com/fireworksdk/bridge/reactnative/FWReactNativeSDK.kt

@@ -42,10 +42,6 @@ object FWReactNativeSDK {
     })
   }
 
-  fun setLanguageSwitchingBehavior(behavior: FWSwitchLanguageBehavior) {
-    FWGlobalDataUtil.switchLanguageBehavior = behavior
-  }
-
   fun addLivestreamPlayerInitializer(initializer: LivestreamPlayerInitializer?) {
     FWLiveStreamUtil.addLivestreamPlayerInitializer(initializer)
   }

package/android/src/main/java/com/fireworksdk/bridge/reactnative/manager/FWStoryBlockManager.kt

@@ -2,6 +2,7 @@ package com.fireworksdk.bridge.reactnative.manager
 
 import android.view.Choreographer
 import android.view.View
+import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
@@ -11,99 +12,34 @@ import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.firework.error.storyblock.StoryBlockError
 import com.firework.storyblock.FeedLoadState
-import com.fireworksdk.bridge.components.storyblock.StoryBlockContainerView
 import com.fireworksdk.bridge.components.storyblock.StoryBlockFragment
+import com.fireworksdk.bridge.components.storyblock.StoryBlockFrameLayout
 import com.fireworksdk.bridge.models.*
 import com.fireworksdk.bridge.models.enums.FWStoryBlockEventName
 import com.fireworksdk.bridge.models.enums.FWVideoFeedSource
 import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
+import com.fireworksdk.bridge.utils.FWFragmentUtil
 import com.fireworksdk.bridge.utils.FWLogUtils
 import org.json.JSONObject
-import java.util.WeakHashMap
 
 
-class FWStoryBlockManager : ViewGroupManager<StoryBlockContainerView>() {
+class FWStoryBlockManager : ViewGroupManager<StoryBlockFrameLayout>() {
 
-  private val viewContextMap = WeakHashMap<StoryBlockContainerView, ThemedReactContext>()
-  private val viewLayoutCallbackMap = WeakHashMap<StoryBlockContainerView, Choreographer.FrameCallback>()
-  private val viewNeedsForceLayoutMap = WeakHashMap<StoryBlockContainerView, Boolean>()
+  private lateinit var reactContext: ThemedReactContext
 
   override fun getName(): String {
     return REACT_CLASS
   }
 
-  override fun createViewInstance(reactContext: ThemedReactContext): StoryBlockContainerView {
-    val activity = reactContext.currentActivity as? FragmentActivity
-        ?: throw IllegalStateException("StoryBlock requires a FragmentActivity")
-    val containerView = StoryBlockContainerView(activity)
-    viewContextMap[containerView] = reactContext
-    containerView.addOnAttachStateChangeListener(object : View.OnAttachStateChangeListener {
-      override fun onViewAttachedToWindow(v: View) {
-        viewNeedsForceLayoutMap[containerView] = true
-        startLayoutUpdates(containerView)
-      }
-
-      override fun onViewDetachedFromWindow(v: View) {
-        stopLayoutUpdates(containerView)
-      }
-    })
-    return containerView
+  override fun createViewInstance(reactContext: ThemedReactContext): StoryBlockFrameLayout {
+    this.reactContext = reactContext
+    return StoryBlockFrameLayout(reactContext)
   }
 
-  override fun onAfterUpdateTransaction(view: StoryBlockContainerView) {
+  override fun onAfterUpdateTransaction(view: StoryBlockFrameLayout) {
     super.onAfterUpdateTransaction(view)
-    initStoryBlock(view)
-  }
-
-  private fun initStoryBlock(containerView: StoryBlockContainerView) {
-    if (containerView.storyBlockFragment != null) {
-      return
-    }
-
-    val fragment = StoryBlockFragment.newInstance(containerView.videoFeedPropsModel)
-    val reactContext = viewContextMap[containerView] ?: return
-    addStoryBlockListener(reactContext, fragment, containerView.id)
-    containerView.setFragment(fragment)
-  }
-
-  private fun startLayoutUpdates(containerView: StoryBlockContainerView) {
-    if (viewLayoutCallbackMap.containsKey(containerView)) return
-    val callback = object : Choreographer.FrameCallback {
-      override fun doFrame(frameTimeNanos: Long) {
-        manuallyLayoutChildren(containerView)
-        if (containerView.viewTreeObserver.isAlive) {
-          containerView.viewTreeObserver.dispatchOnGlobalLayout()
-        }
-        if (viewLayoutCallbackMap.containsKey(containerView)) {
-          Choreographer.getInstance().postFrameCallback(this)
-        }
-      }
-    }
-    viewLayoutCallbackMap[containerView] = callback
-    Choreographer.getInstance().postFrameCallback(callback)
-  }
-
-  private fun stopLayoutUpdates(containerView: StoryBlockContainerView) {
-    viewLayoutCallbackMap.remove(containerView)?.let {
-      Choreographer.getInstance().removeFrameCallback(it)
-    }
-  }
-
-  private fun manuallyLayoutChildren(containerView: StoryBlockContainerView) {
-    val needsForce = viewNeedsForceLayoutMap.remove(containerView) == true
-    val width = containerView.width
-    val height = containerView.height
-    for (i in 0 until containerView.childCount) {
-      val child = containerView.getChildAt(i)
-      if (needsForce) {
-        child.forceLayout()
-      }
-      child.measure(
-        View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY),
-        View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.EXACTLY)
-      )
-      child.layout(0, 0, width, height)
-    }
+    // after createFragment
+    FWLogUtils.d { "FWStoryBlockManager onAfterUpdateTransaction" }
   }
 
   override fun getCommandsMap(): Map<String, Int> {
@@ -118,30 +54,37 @@ class FWStoryBlockManager : ViewGroupManager<StoryBlockContainerView>() {
   }
 
   override fun receiveCommand(
-    root: StoryBlockContainerView,
+    root: StoryBlockFrameLayout,
     commandId: Int,
     args: ReadableArray?
   ) {
     super.receiveCommand(root, commandId, args)
-    FWLogUtils.d { "FWStoryBlockManager receiveCommand (Int), commandId: $commandId" }
-    handleCommand(root, commandId)
+    FWLogUtils.d { "FWStoryBlockManager receiveCommand, args (StoryBlockFrameLayout, Int, ReadableArray?), commandId: $commandId, root.isAttachedToWindow: ${root.isAttachedToWindow}" }
+    when (commandId) {
+      COMMAND_CREATE -> {
+        val reactNativeViewId = requireNotNull(args).getInt(0)
+        createFragment(root, reactNativeViewId)
+      }
+      COMMAND_PLAY -> root.storyBlockFragment?.play()
+      COMMAND_PAUSE -> root.storyBlockFragment?.pause()
+      COMMAND_OPEN_FULL_SCREEN -> root.storyBlockFragment?.openFullscreen()
+      COMMAND_ON_VIEWPORT_ENTERED -> root.storyBlockFragment?.onViewportEntered()
+      COMMAND_ON_VIEWPORT_LEFT -> root.storyBlockFragment?.onViewportLeft()
+      else -> {}
+    }
   }
 
   override fun receiveCommand(
-    root: StoryBlockContainerView,
+    root: StoryBlockFrameLayout,
     commandId: String?,
     args: ReadableArray?
   ) {
     super.receiveCommand(root, commandId, args)
-    FWLogUtils.d { "FWStoryBlockManager receiveCommand (String), commandId: $commandId" }
-    handleCommand(root, commandId?.toIntOrNull() ?: return)
-  }
-
-  private fun handleCommand(root: StoryBlockContainerView, commandId: Int) {
-    when (commandId) {
+    FWLogUtils.d { "FWStoryBlockManager receiveCommand, args (StoryBlockFrameLayout, String?, ReadableArray?), commandId: $commandId, root.isAttachedToWindow: ${root.isAttachedToWindow}" }
+    when (commandId?.toInt()) {
       COMMAND_CREATE -> {
-        // No-op: fragment creation is now handled in onAfterUpdateTransaction.
-        // Kept for backward compatibility with older JS versions.
+        val reactNativeViewId = requireNotNull(args).getInt(0)
+        createFragment(root, reactNativeViewId)
       }
       COMMAND_PLAY -> root.storyBlockFragment?.play()
       COMMAND_PAUSE -> root.storyBlockFragment?.pause()
@@ -153,28 +96,28 @@ class FWStoryBlockManager : ViewGroupManager<StoryBlockContainerView>() {
   }
 
   @ReactProp(name = "source")
-  fun setSource(view: StoryBlockContainerView, source: String?) {
+  fun setSource(view: StoryBlockFrameLayout, source: String?) {
     view.videoFeedPropsModel = view.videoFeedPropsModel.copy(
       source = FWVideoFeedSource.deserialize(source)
     )
   }
 
   @ReactProp(name = "channel")
-  fun setChannel(view: StoryBlockContainerView, channel: String?) {
+  fun setChannel(view: StoryBlockFrameLayout, channel: String?) {
     view.videoFeedPropsModel = view.videoFeedPropsModel.copy(
       channel = channel
     )
   }
 
   @ReactProp(name = "playlist")
-  fun setPlaylist(view: StoryBlockContainerView, playlist: String?) {
+  fun setPlaylist(view: StoryBlockFrameLayout, playlist: String?) {
     view.videoFeedPropsModel = view.videoFeedPropsModel.copy(
       playlist = playlist
     )
   }
 
   @ReactProp(name = "hashtagFilterExpression")
-  fun setHashtagFilterExpression(view: StoryBlockContainerView, hashtagFilterExpression: String?) {
+  fun setHashtagFilterExpression(view: StoryBlockFrameLayout, hashtagFilterExpression: String?) {
     view.videoFeedPropsModel = view.videoFeedPropsModel.copy(
       hashtagFilterExpression = hashtagFilterExpression
     )
@@ -182,21 +125,21 @@ class FWStoryBlockManager : ViewGroupManager<StoryBlockContainerView>() {
 
   @Suppress("UNCHECKED_CAST")
   @ReactProp(name = "productIds")
-  fun setProductIds(view: StoryBlockContainerView, productIdArray: ReadableArray?) {
+  fun setProductIds(view: StoryBlockFrameLayout, productIdArray: ReadableArray?) {
     view.videoFeedPropsModel = view.videoFeedPropsModel.copy(
       productIds = productIdArray?.toArrayList() as ArrayList<String>?
     )
   }
 
   @ReactProp(name = "contentId")
-  fun setContentId(view: StoryBlockContainerView, contentId: String?) {
+  fun setContentId(view: StoryBlockFrameLayout, contentId: String?) {
     view.videoFeedPropsModel = view.videoFeedPropsModel.copy(
       contentId = contentId
     )
   }
 
   @ReactProp(name = "shareUrl")
-  fun setShareUrl(view: StoryBlockContainerView, shareUrl: String?) {
+  fun setShareUrl(view: StoryBlockFrameLayout, shareUrl: String?) {
     view.videoFeedPropsModel = view.videoFeedPropsModel.copy(
       shareUrl = shareUrl
     )
@@ -204,7 +147,7 @@ class FWStoryBlockManager : ViewGroupManager<StoryBlockContainerView>() {
 
   @Suppress("UNCHECKED_CAST")
   @ReactProp(name = "dynamicContentParameters")
-  fun setDynamicContentParameters(view: StoryBlockContainerView, parameters: ReadableMap?) {
+  fun setDynamicContentParameters(view: StoryBlockFrameLayout, parameters: ReadableMap?) {
     val parametersMap = parameters?.toHashMap() as? HashMap<String, List<String>>
     view.videoFeedPropsModel = view.videoFeedPropsModel.copy(
       dynamicContentParameters = parametersMap
@@ -212,7 +155,7 @@ class FWStoryBlockManager : ViewGroupManager<StoryBlockContainerView>() {
   }
 
   @ReactProp(name = "videoFeedConfiguration")
-  fun setVideoFeedConfig(view: StoryBlockContainerView, config: ReadableMap?) {
+  fun setVideoFeedConfig(view: StoryBlockFrameLayout, config: ReadableMap?) {
     val configMap = config?.toHashMap() ?: hashMapOf()
     val jsonObject = JSONObject(configMap)
     val videoFeedConfigModel = FWVideoFeedConfigModelDeserializer.deserialize(jsonObject)
@@ -222,7 +165,7 @@ class FWStoryBlockManager : ViewGroupManager<StoryBlockContainerView>() {
   }
 
   @ReactProp(name = "storyBlockConfiguration")
-  fun setStoryBlockConfig(view: StoryBlockContainerView, config: ReadableMap?) {
+  fun setStoryBlockConfig(view: StoryBlockFrameLayout, config: ReadableMap?) {
     val configMap = config?.toHashMap() ?: hashMapOf()
     val jsonObject = JSONObject(configMap)
     val videoPlayerConfigModel = FWVideoPlayerConfigModelDeserializer.deserialize(jsonObject)
@@ -232,7 +175,7 @@ class FWStoryBlockManager : ViewGroupManager<StoryBlockContainerView>() {
   }
 
   @ReactProp(name = "adConfiguration")
-  fun setAdConfiguration(view: StoryBlockContainerView, config: ReadableMap?) {
+  fun setAdConfiguration(view: StoryBlockFrameLayout, config: ReadableMap?) {
     val configMap = config?.toHashMap() ?: hashMapOf()
     val jsonObject = JSONObject(configMap)
     val adConfigurationModel = FWAdConfigurationDeserializer.deserialize(jsonObject)
@@ -242,27 +185,42 @@ class FWStoryBlockManager : ViewGroupManager<StoryBlockContainerView>() {
   }
 
   @ReactProp(name = "cornerRadius")
-  fun setCornerRadius(view: StoryBlockContainerView, cornerRadius: Int?) {
+  fun setCornerRadius(view: StoryBlockFrameLayout, cornerRadius: Int?) {
     view.videoFeedPropsModel = view.videoFeedPropsModel.copy(
       cornerRadius = cornerRadius
     )
   }
 
-  private fun addStoryBlockListener(
-    reactContext: ThemedReactContext,
-    fragment: StoryBlockFragment,
-    reactNativeViewId: Int
-  ) {
+  private fun setupLayout(view: View) {
+    Choreographer.getInstance().postFrameCallback(object : Choreographer.FrameCallback {
+      override fun doFrame(frameTimeNanos: Long) {
+        manuallyLayoutChildren(view)
+        view.viewTreeObserver.dispatchOnGlobalLayout()
+        Choreographer.getInstance().postFrameCallback(this)
+      }
+    })
+  }
+
+  private fun manuallyLayoutChildren(view: View) {
+    view.measure(
+      View.MeasureSpec.makeMeasureSpec(view.measuredWidth, View.MeasureSpec.EXACTLY),
+      View.MeasureSpec.makeMeasureSpec(view.measuredHeight, View.MeasureSpec.EXACTLY)
+    )
+    view.layout(view.left, view.top, view.right, view.bottom)
+  }
+
+  private fun addStoryBlockListener(fragment: StoryBlockFragment, reactNativeViewId: Int) {
     fragment.setCreateViewCallback(object : StoryBlockFragment.OnCreateViewCallback {
       override fun onCreateView() {
+
         FWEventUtils.receiveStoryBlockGetFeedIdEvent(
           reactContext,
           reactNativeViewId,
           fragment.getFeedId()
         )
       }
-    })
 
+    })
     fragment.setFeedLoadListener { feedLoadState ->
       when (feedLoadState) {
         FeedLoadState.Loading -> {
@@ -304,12 +262,52 @@ class FWStoryBlockManager : ViewGroupManager<StoryBlockContainerView>() {
     }
   }
 
-  override fun onDropViewInstance(containerView: StoryBlockContainerView) {
-    stopLayoutUpdates(containerView)
-    viewContextMap.remove(containerView)
-    viewNeedsForceLayoutMap.remove(containerView)
-    containerView.destroy()
-    super.onDropViewInstance(containerView)
+
+  private fun createFragment(root: StoryBlockFrameLayout, reactNativeViewId: Int?) {
+    FWLogUtils.d { "FWStoryBlockManager createFragment, reactNativeViewId = $reactNativeViewId" }
+    reactNativeViewId ?: return
+    val activity = reactContext.currentActivity as FragmentActivity?
+    activity ?: return
+
+    val parentView = root.findViewById(reactNativeViewId) as ViewGroup
+//    parentView.setBackgroundColor(Color.YELLOW)
+    setupLayout(parentView)
+
+    val fragment = StoryBlockFragment.newInstance(root.videoFeedPropsModel)
+    root.storyBlockFragment = fragment
+    addStoryBlockListener(fragment, reactNativeViewId)
+
+    if (parentView.isAttachedToWindow) {
+      if (!fragment.isAdded) {
+        activity.supportFragmentManager
+          .beginTransaction()
+          .replace(reactNativeViewId, fragment, reactNativeViewId.toString())
+          .commit()
+      }
+    } else {
+      parentView.addOnAttachStateChangeListener(object : View.OnAttachStateChangeListener {
+        override fun onViewAttachedToWindow(v: View) {
+          FWLogUtils.d { "FWStoryBlockManager createFragment doOnAttach" }
+          if (!fragment.isAdded) {
+            activity.supportFragmentManager
+              .beginTransaction()
+              .replace(reactNativeViewId, fragment, reactNativeViewId.toString())
+              .commit()
+          }
+        }
+
+        override fun onViewDetachedFromWindow(v: View) {
+        }
+      })
+    }
+  }
+
+  override fun onDropViewInstance(storyBlockFrameLayout: StoryBlockFrameLayout) {
+    val activity = reactContext.currentActivity as FragmentActivity?
+    FWFragmentUtil.removeFragment(activity, storyBlockFrameLayout.storyBlockFragment)
+    storyBlockFrameLayout.destroy()
+
+    super.onDropViewInstance(storyBlockFrameLayout)
   }
 
   override fun getExportedCustomBubblingEventTypeConstants(): Map<String, Any>? {

package/android/src/main/java/com/fireworksdk/bridge/reactnative/manager/FWVideoFeedManager.kt

@@ -29,13 +29,16 @@ import org.json.JSONObject
 
 class FWVideoFeedManager : SimpleViewManager<FWVideoFeed>() {
 
+  private lateinit var reactContext: ThemedReactContext
+  private lateinit var videoFeed: FWVideoFeed
+
   override fun getName(): String {
     return "FWVideoFeed"
   }
 
   override fun createViewInstance(reactContext: ThemedReactContext): FWVideoFeed {
-    val videoFeed = FWVideoFeed(reactContext.currentActivity as Activity)
-    videoFeed.themedReactContext = reactContext
+    this.reactContext = reactContext
+    videoFeed = FWVideoFeed(reactContext.currentActivity as Activity)
     addVideoFeedListener(reactContext, videoFeed)
     return videoFeed
   }
@@ -49,10 +52,9 @@ class FWVideoFeedManager : SimpleViewManager<FWVideoFeed>() {
     super.onAfterUpdateTransaction(view)
     view.initVideoFeedView()
 
-    val reactContext = view.themedReactContext as? ThemedReactContext ?: return
     FWEventUtils.receiveVideoFeedGetFeedIdEvent(
       reactContext,
-      view.id,
+      videoFeed.id,
       view.getFeedId()
     )
   }

package/android/src/main/java/com/fireworksdk/bridge/reactnative/models/FireworkSDKInterface.kt

@@ -18,5 +18,4 @@ interface FireworkSDKInterface {
   fun setDataTrackingLevel(level: String?, promise: Promise)
   fun setLivestreamPlayerDesignVersion(version: String?, promise: Promise)
   fun setShortVideoPlayerDesignVersion(version: String?, promise: Promise)
-  fun setPreventPipOnLeave(prevent: Boolean?, promise: Promise)
 }

package/android/src/main/java/com/fireworksdk/bridge/reactnative/module/FireworkSDKModule.kt

@@ -360,12 +360,6 @@ class FireworkSDKModule(
     promise.resolve(true)
   }
 
-  @ReactMethod
-  override fun setPreventPipOnLeave(prevent: Boolean?, promise: Promise) {
-    FireworkSdk.setPreventPipOnLeave(prevent ?: false)
-    promise.resolve(true)
-  }
-
   @ReactMethod
   fun addListener(eventName: String?, promise: Promise) {
     // Set up any upstream listeners or background tasks as necessary

package/ios/Modules/FireworkSDKModule/FireworkSDKModule.swift

@@ -66,9 +66,10 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
     static func initializeSDK(_ options: SDKInitOptions?) {
         if let shared = shared {
             shared.initializeSDK(options, true)
+        } else {
+            hasCachedSDKInitOptions = true
+            cachedSDKInitOptions = options
         }
-        hasCachedSDKInitOptions = true
-        cachedSDKInitOptions = options
     }
 
     @objc(markInitCalled:rejecter:)
@@ -87,16 +88,8 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
 
     func initializeSDK(_ options: SDKInitOptions?, _ fromNative: Bool) {
         if hasCalledSDKInit {
-            if hasListeners, let argumentsForInitEvent = argumentsForInitEvent {
-                sendEvent(withName: FWEventName.sdkInit.rawValue, body: argumentsForInitEvent)
-            }
-        } else if FireworkVideoSDK.isInitialized {
-            argumentsForInitEvent = [:]
-            gVideoLaunchBehavior = options?.videoLaunchBehavior
-            FireworkVideoSDK.ctaDelegate = self
-            FireworkVideoSDK.eventTracking.videoPlaybackDelegate = self
-            FireworkVideoSDK.eventTracking.feedDelegate = self
-            if hasListeners {
+            if let argumentsForInitEvent = argumentsForInitEvent {
+                // The sdk init event was received before.
                 sendEvent(withName: FWEventName.sdkInit.rawValue, body: argumentsForInitEvent)
             }
         } else {

package/lib/commonjs/FireworkSDK.js

@@ -154,23 +154,6 @@ class FireworkSDK {
     });
   }
   _shortVideoPlayerDesignVersion = _ShortVideoPlayerDesignVersion.default.v1;
-
-  /**
-   * When enabled, prevents auto-entering PiP when the user leaves the fullscreen player
-   * (e.g. presses Home or switches to another app). The player activity stays in the
-   * background stack instead of entering PiP mode.
-   * Defaults to false. Only supported on Android.
-   */
-  set preventPipOnLeave(prevent) {
-    this._preventPipOnLeave = prevent;
-    if (_reactNative.Platform.OS === 'android') {
-      _FireworkSDKModule.default.setPreventPipOnLeave(prevent);
-    }
-  }
-  get preventPipOnLeave() {
-    return this._preventPipOnLeave;
-  }
-  _preventPipOnLeave = false;
   get eventEmitter() {
     return _FireworkSDKModule.FireworkSDKModuleEventEmitter;
   }