react-native-firework-sdk 2.4.0 → 2.4.1

package/FireworkVideoUI.xcframework/Info.plist

@@ -6,30 +6,30 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>FireworkVideoUI.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>FireworkVideoUI.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/FireworkVideoUI.xcframework/ios-arm64_x86_64-simulator/FireworkVideoUI.framework/_CodeSignature/CodeResources

@@ -14,7 +14,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		vynjssapRRLOw+EPs8l4dpEQcu0=
+		lnnYD7r18hc09qUb74T6hGCkqIU=
 		</data>
 		<key>Modules/FireworkVideoUI.swiftmodule/arm64-apple-ios-simulator.abi.json</key>
 		<data>

package/android/src/main/AndroidManifest.xml

@@ -5,6 +5,10 @@
 
   <application>
 
+    <activity
+      android:name="com.fireworksdk.bridge.reactnative.pages.FWContainerActivity"
+      />
+
     <provider
       android:authorities="${applicationId}.fwBridgeProvider"
       android:name="com.fireworksdk.bridge.FWInitializationProvider"

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

@@ -20,6 +20,7 @@ import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
 import com.fireworksdk.bridge.utils.FWFragmentUtil
 import com.fireworksdk.bridge.utils.FWGlobalDataUtil
 import com.fireworksdk.bridge.utils.FWLogUtils
+import com.fireworksdk.bridge.utils.FWStoryBlockUtil
 import org.json.JSONObject
 
 
@@ -189,7 +190,9 @@ class FWStoryBlockManager : ViewGroupManager<StoryBlockFrameLayout>() {
 
     fragment.setOnFullScreenStateChangedListener { isFullScreen ->
       if (isFullScreen) {
-        FWGlobalDataUtil.storyBlockFragment = fragment
+        FWStoryBlockUtil.addFullScreenStoryBlockFragment(fragment)
+      } else {
+        FWStoryBlockUtil.removeFullScreenStoryBlockFragment(fragment)
       }
       FWEventUtils.receiveStoryBlockFullScreenStateChangedEvent(
         reactContext,

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

@@ -5,6 +5,8 @@ import com.facebook.react.bridge.ReadableMap
 
 interface FWNavigatorInterface {
 
+  fun pushRNContainer(props: ReadableMap?, promise: Promise)
+  fun popRNContainer(promise: Promise)
   fun popNativeContainer(promise: Promise)
   fun canPopNativeContainer(promise: Promise)
   fun startFloatingPlayer(promise: Promise)

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

@@ -5,14 +5,40 @@ import com.facebook.react.bridge.*
 import com.firework.sdk.FireworkSdk
 import com.fireworksdk.bridge.FWInitializationProvider
 import com.fireworksdk.bridge.reactnative.models.FWNavigatorInterface
-import com.fireworksdk.bridge.utils.FWGlobalDataUtil
+import com.fireworksdk.bridge.reactnative.pages.FWContainerActivity
 import com.fireworksdk.bridge.utils.FWLogUtils
+import com.fireworksdk.bridge.utils.FWStoryBlockUtil
 
 
 class FWNavigatorModule(
   reactContext: ReactApplicationContext
 ) : ReactContextBaseJavaModule(reactContext), FWNavigatorInterface {
 
+  @ReactMethod
+  override fun pushRNContainer(props: ReadableMap?, promise: Promise) {
+    val activity = FWInitializationProvider.INSTANCE.resumedActivity
+    if (activity == null) {
+      promise.resolve(false)
+      return
+    }
+
+    UiThreadUtil.runOnUiThread {
+      activity.startActivity(FWContainerActivity.createIntent(activity, props?.toHashMap()))
+    }
+    promise.resolve(true)
+  }
+
+  @ReactMethod
+  override fun popRNContainer(promise: Promise) {
+    val activity = FWInitializationProvider.INSTANCE.resumedActivity
+    if (activity is FWContainerActivity) {
+      activity.finish()
+      promise.resolve(true)
+      return
+    }
+    promise.resolve(false)
+  }
+
   @ReactMethod
   override fun popNativeContainer(promise: Promise) {
     FWLogUtils.d { "FWNavigatorModule popNativeContainer" }
@@ -23,23 +49,25 @@ class FWNavigatorModule(
       return
     }
 
-    if (isTaskRoot(activity)) {
-      if (FWGlobalDataUtil.storyBlockFragment?.isFullScreen() == true) {
-        UiThreadUtil.runOnUiThread {
-          FWGlobalDataUtil.storyBlockFragment?.toggleFullScreen()
-        }
-        promise.resolve(true)
-        return
+    val currentStoryBlockFragment = FWStoryBlockUtil.getCurrentFullScreenStoryBlockFragment()
+    if (currentStoryBlockFragment?.activity == activity) {
+      UiThreadUtil.runOnUiThread {
+        currentStoryBlockFragment.toggleFullScreen()
       }
-
-      promise.resolve(false)
+      promise.resolve(true)
       return
     }
 
-    UiThreadUtil.runOnUiThread {
-      activity.finish()
+    if (activity.javaClass.name.equals("com.firework.player.pager.PlayerActivity")) {
+      UiThreadUtil.runOnUiThread {
+        activity.finish()
+      }
+
+      promise.resolve(true)
+      return
     }
-    promise.resolve(true)
+
+    promise.resolve(false)
   }
 
   @ReactMethod

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

@@ -201,7 +201,7 @@ class FWVideoShoppingModule(
     }
 
     if (!resultModel.tips.isNullOrBlank()) {
-      Toast.makeText(currentActivity, resultModel.tips, Toast.LENGTH_LONG).show()
+      Toast.makeText(reactApplicationContext, resultModel.tips, Toast.LENGTH_LONG).show()
     }
   }
 

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

@@ -0,0 +1,61 @@
+package com.fireworksdk.bridge.reactnative.pages
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import com.facebook.react.ReactActivity
+import com.facebook.react.ReactActivityDelegate
+import com.fireworksdk.bridge.utils.FWBundleUtils
+
+
+class FWContainerActivity : ReactActivity() {
+
+  override fun getMainComponentName(): String {
+    return ""
+  }
+
+  override fun createReactActivityDelegate(): ReactActivityDelegate {
+    return FWContainerActivityDelegate(this, mainComponentName)
+  }
+
+//  https://cmichel.io/how-to-set-initial-props-in-react-native
+  class FWContainerActivityDelegate(
+    private val mActivity: ReactActivity,
+    mainComponentName: String?
+  ) :
+    ReactActivityDelegate(mActivity, mainComponentName) {
+    private var mInitialProps: Bundle? = null
+    override fun onCreate(savedInstanceState: Bundle?) {
+
+      val params = mActivity.intent.getSerializableExtra(KEY_PARAMS) as HashMap<String, Any?>?
+      mInitialProps = FWBundleUtils.mapToBundle(params)
+
+      super.onCreate(savedInstanceState)
+    }
+
+    override fun getMainComponentName(): String? {
+      val bundle = mActivity.intent.extras
+      return bundle?.getString(KEY_COMPONENT_NAME)
+    }
+
+    override fun getLaunchOptions(): Bundle? {
+      return mInitialProps
+    }
+  }
+
+  companion object {
+
+    private const val KEY_PARAMS = "params"
+    private const val KEY_COMPONENT_NAME = "componentName"
+
+    @Suppress("UNCHECKED_CAST")
+    fun createIntent(activity: Activity, params: HashMap<String, Any?>?): Intent {
+      val intent = Intent(activity, FWContainerActivity::class.java)
+      intent.putExtra(KEY_COMPONENT_NAME, params?.get("appKey") as String?)
+      intent.putExtra(KEY_PARAMS, params?.get("appProps") as HashMap<String, Any?>)
+      intent.flags = Intent.FLAG_ACTIVITY_NO_ANIMATION
+      activity.overridePendingTransition(0, 0)
+      return intent
+    }
+  }
+}

package/android/src/main/java/com/fireworksdk/bridge/utils/FWConfigUtil.kt

@@ -373,6 +373,7 @@ object FWConfigUtil {
 
   private fun getDefaultPlayerOptionBuilder(): PlayerOption.Builder {
     return PlayerOption.Builder()
+      .enablePipMode(false)
   }
 
   private fun getDefaultBaseOptionBuilder(): BaseOption.Builder {

package/android/src/main/java/com/fireworksdk/bridge/utils/FWGlobalDataUtil.kt

@@ -14,7 +14,5 @@ object FWGlobalDataUtil {
 
   var customClickLinkButtonEnabled: Boolean = false
 
-  var storyBlockFragment by weakProperty<StoryBlockFragment?>()
-
   var shareBaseUrl: String? = null
 }

package/android/src/main/java/com/fireworksdk/bridge/utils/FWStoryBlockUtil.kt

@@ -0,0 +1,30 @@
+package com.fireworksdk.bridge.utils
+
+import com.fireworksdk.bridge.components.storyblock.StoryBlockFragment
+
+object FWStoryBlockUtil {
+
+  private val list = ArrayList<StoryBlockFragment>()
+
+  fun getCurrentFullScreenStoryBlockFragment(): StoryBlockFragment? {
+    while (list.size > 0) {
+      val fragment = list.last()
+      if (!fragment.isFullScreen()) {
+        list.removeLast()
+      } else {
+        return fragment
+      }
+    }
+    return null
+  }
+
+  fun addFullScreenStoryBlockFragment(fragment: StoryBlockFragment?) {
+    fragment ?: return
+    list.add(fragment)
+  }
+
+  fun removeFullScreenStoryBlockFragment(fragment: StoryBlockFragment?) {
+    fragment ?: return
+    list.remove(fragment)
+  }
+}

package/android/src/main/res/layout/fw_bridge_fragment_container.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/fw_bridge_container"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+</FrameLayout>

package/ios/FireworkSdk.xcodeproj/project.pbxproj

@@ -7,6 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		891F4AF62A67E12800A9E8DA /* FWRNContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891F4AF52A67E12800A9E8DA /* FWRNContainerViewController.swift */; };
+		891F4AF82A68DEDF00A9E8DA /* PushRNContainerParams.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891F4AF72A68DEDF00A9E8DA /* PushRNContainerParams.swift */; };
+		891F4AFA2A68DF2B00A9E8DA /* RCTConvert+FWNavigatorModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891F4AF92A68DF2B00A9E8DA /* RCTConvert+FWNavigatorModule.swift */; };
 		897523872817DEF80070EBB6 /* (null) in Sources */ = {isa = PBXBuildFile; };
 		897523882817DEF80070EBB6 /* (null) in Sources */ = {isa = PBXBuildFile; };
 		897523892817DEF80070EBB6 /* (null) in Sources */ = {isa = PBXBuildFile; };
@@ -89,6 +92,9 @@
 
 /* Begin PBXFileReference section */
 		1F6F718A2771B48100224AF3 /* FireworkSdk-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "FireworkSdk-Bridging-Header.h"; sourceTree = "<group>"; };
+		891F4AF52A67E12800A9E8DA /* FWRNContainerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FWRNContainerViewController.swift; sourceTree = "<group>"; };
+		891F4AF72A68DEDF00A9E8DA /* PushRNContainerParams.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushRNContainerParams.swift; sourceTree = "<group>"; };
+		891F4AF92A68DF2B00A9E8DA /* RCTConvert+FWNavigatorModule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RCTConvert+FWNavigatorModule.swift"; sourceTree = "<group>"; };
 		894FADB229BAD571000FB51A /* libFireworkSdk.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libFireworkSdk.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		897523632817DEF80070EBB6 /* react_native_firework_sdk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = react_native_firework_sdk.h; sourceTree = "<group>"; };
 		898873132A0A8E7E0089CD1C /* UIViewController+AttachChild.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewController+AttachChild.swift"; sourceTree = "<group>"; };
@@ -187,6 +193,8 @@
 			children = (
 				8988731D2A0A8E7E0089CD1C /* FWNavigatorModule.swift */,
 				8988731E2A0A8E7E0089CD1C /* FWNavigatorModule.m */,
+				891F4AF52A67E12800A9E8DA /* FWRNContainerViewController.swift */,
+				891F4AF72A68DEDF00A9E8DA /* PushRNContainerParams.swift */,
 			);
 			path = FWNavigatorModule;
 			sourceTree = "<group>";
@@ -251,6 +259,7 @@
 				898873362A0A8E7E0089CD1C /* RCTConvert+FireworkSDKModule.swift */,
 				898873372A0A8E7E0089CD1C /* RCTConvert+Shopping.swift */,
 				898873382A0A8E7E0089CD1C /* RCTConvert+VideoFeed.swift */,
+				891F4AF92A68DF2B00A9E8DA /* RCTConvert+FWNavigatorModule.swift */,
 			);
 			path = RNToNative;
 			sourceTree = "<group>";
@@ -377,6 +386,7 @@
 				897523902817DEF80070EBB6 /* (null) in Sources */,
 				8988736D2A0A8E7E0089CD1C /* VideoFeedManager.m in Sources */,
 				8988735A2A0A8E7E0089CD1C /* FireworkSDKModule+CTA.swift in Sources */,
+				891F4AFA2A68DF2B00A9E8DA /* RCTConvert+FWNavigatorModule.swift in Sources */,
 				898873472A0A8E7E0089CD1C /* UIView+Constraints.swift in Sources */,
 				897523882817DEF80070EBB6 /* (null) in Sources */,
 				897523982817DEF80070EBB6 /* (null) in Sources */,
@@ -394,10 +404,12 @@
 				8975238D2817DEF80070EBB6 /* (null) in Sources */,
 				8975238C2817DEF80070EBB6 /* (null) in Sources */,
 				8988736B2A0A8E7E0089CD1C /* VideoFeed.swift in Sources */,
+				891F4AF62A67E12800A9E8DA /* FWRNContainerViewController.swift in Sources */,
 				898873522A0A8E7E0089CD1C /* ShoppingCTAResult.swift in Sources */,
 				8975239D2817DEF80070EBB6 /* (null) in Sources */,
 				898873562A0A8E7E0089CD1C /* SDKInitOptions.swift in Sources */,
 				89DF27DE28A53A77003F3CCB /* (null) in Sources */,
+				891F4AF82A68DEDF00A9E8DA /* PushRNContainerParams.swift in Sources */,
 				897523892817DEF80070EBB6 /* (null) in Sources */,
 				897523912817DEF80070EBB6 /* (null) in Sources */,
 				8975238F2817DEF80070EBB6 /* (null) in Sources */,

package/ios/Models/RNToNative/RCTConvert+FWNavigatorModule.swift

@@ -0,0 +1,21 @@
+//
+//  RCTConvert+FWNavigatorModule.swift
+//  FireworkSdk
+//
+//  Created by linjie jiang on 7/20/23.
+//
+
+import Foundation
+
+extension RCTConvert {
+    static func pushRNContainerParams(_ json: [String: Any]) -> PushRNContainerParams? {
+        if let appKey = json["appKey"] as? String {
+            let params = PushRNContainerParams()
+            params.appKey = appKey
+            params.appProps = json["appProps"] as? [String: Any]
+
+            return params
+        }
+        return nil
+    }
+}

package/ios/Models/RNToNative/RCTConvert+FireworkSDKModule.swift

@@ -10,15 +10,6 @@ import Foundation
 import UIKit
 
 extension RCTConvert {
-    static func videoPlayerContentConfiguration(_ config: [String: AnyObject])
-        -> VideoPlayerContentConfiguration? {
-        let videoPlayerConfig = RCTConvert.videoPlayerConfiguration(config)
-
-        let finalConfig = VideoFeed.convertToVideoPlayerContentConfiguration(videoPlayerConfig)
-
-        return finalConfig
-    }
-
     static func videoPlayerStyle(_ style: String?) -> VideoPlayerContentConfiguration
         .VideoPlayerStyle? {
         guard let rStyle = style else {
@@ -43,25 +34,7 @@ extension RCTConvert {
         }
     }
 
-    static func ctaButtonStyle(_ style: [String: AnyObject]?) -> ButtonContentConfiguration? {
-        guard let rStyle = style else {
-            return nil
-        }
-        var btnContentConfig = ButtonContentConfiguration()
-        if let backgroundColor = rStyle["backgroundColor"] as? String {
-            btnContentConfig.backgroundColor = backgroundColor.uicolor()
-        }
-        if let textColor = rStyle["textColor"] as? String {
-            btnContentConfig.textColor = textColor.uicolor()
-        }
-        if let fontSize = rStyle["fontSize"] as? Double {
-            btnContentConfig.font = UIFont.systemFont(ofSize: fontSize)
-        }
-
-        return btnContentConfig
-    }
-
-    static func adBadgeConfiguration(_ config: [String: AnyObject]?) -> AdBadgeConfiguration? {
+    static func adBadgeConfiguration(_ config: [String: Any]?) -> AdBadgeConfiguration? {
         guard let rConfig = config else {
             return nil
         }
@@ -81,7 +54,7 @@ extension RCTConvert {
         return result
     }
 
-    static func trackPurchaseParameters(_ parameters: [String: AnyObject]?)
+    static func trackPurchaseParameters(_ parameters: [String: Any]?)
         -> TrackPurchaseParameters? {
         guard let rParameters = parameters else {
             return nil
@@ -103,7 +76,7 @@ extension RCTConvert {
         return result
     }
 
-    static func sdkInitOptions(_ options: [String: AnyObject]?) -> SDKInitOptions? {
+    static func sdkInitOptions(_ options: [String: Any]?) -> SDKInitOptions? {
         guard let rOptions = options else {
             return nil
         }

package/ios/Models/RNToNative/RCTConvert+StoryBlock.swift

@@ -30,9 +30,9 @@ extension RCTConvert {
         return StoryBlockSourceType.sourceTypeMapper[rType] ?? .discover
     }
 
-    public static func storyBlockConfiguration(_ config: [String: AnyObject]?)
+    public static func storyBlockConfiguration(_ config: NSDictionary?)
         -> StoryBlockConfiguration? {
-        guard let rConfig = config else {
+            guard let rConfig = config as? [String: Any] else {
             return nil
         }
 

package/ios/Models/RNToNative/RCTConvert+VideoFeed.swift

@@ -50,9 +50,9 @@ extension RCTConvert {
         return VideoFeedMode.feedModeMapper[rType] ?? .row
     }
 
-    public static func videoFeedConfiguration(_ config: [String: AnyObject]?)
+    public static func videoFeedConfiguration(_ config: NSDictionary?)
         -> VideoFeedConfiguration? {
-        guard let rConfig = config else {
+            guard let rConfig = config as? [String: Any] else {
             return nil
         }
 
@@ -64,7 +64,7 @@ extension RCTConvert {
         return try? JSONDecoder().decode(VideoFeedConfiguration.self, from: rJsonData)
     }
 
-    public static func videoPlayerConfiguration(_ config: [String: AnyObject]?)
+    public static func videoPlayerConfiguration(_ config: [String: Any]?)
         -> VideoPlayerConfiguration? {
         guard let rConfig = config else {
             return nil
@@ -78,8 +78,8 @@ extension RCTConvert {
         return try? JSONDecoder().decode(VideoPlayerConfiguration.self, from: rJsonData)
     }
 
-    public static func adConfiguration(_ config: [String: AnyObject]?) -> AdConfiguration? {
-        guard let rConfig = config else {
+    public static func adConfiguration(_ config: NSDictionary?) -> AdConfiguration? {
+        guard let rConfig = config as? [String: Any] else {
             return nil
         }
 

package/ios/Modules/FWNavigatorModule/FWNavigatorModule.m

@@ -11,9 +11,9 @@
 
 @interface RCT_EXTERN_REMAP_MODULE(FWNavigatorModule, FWNavigatorModule, NSObject)
 
-RCT_EXTERN_METHOD(pushNativeContainer:(NSDictionary *)props resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
+RCT_EXTERN_METHOD(pushRNContainer:(NSDictionary *)params resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
+RCT_EXTERN_METHOD(popRNContainer:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 RCT_EXTERN_METHOD(popNativeContainer:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
-RCT_EXTERN_METHOD(canPopNativeContainer:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 RCT_EXTERN_METHOD(startFloatingPlayer:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 RCT_EXTERN_METHOD(stopFloatingPlayer:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 

package/ios/Modules/FWNavigatorModule/FWNavigatorModule.swift

@@ -5,6 +5,7 @@
 //  Created by Big Bear Xiong on 2022/4/21.
 //
 
+import UIKit
 import FireworkVideo
 
 private struct PlayerExitButtonInfo {
@@ -29,6 +30,61 @@ class FWNavigatorModule: RCTEventEmitter {
         return DispatchQueue.main
     }
 
+    @objc(pushRNContainer:resolver:rejecter:)
+    func pushRNContainer(
+        _ params: NSDictionary?,
+        resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock
+    ) {
+        guard let presentedVC = RCTPresentedViewController() else {
+            resolver(false)
+            return
+        }
+
+        guard let params = params as? [String: Any] else {
+            resolver(false)
+            return
+        }
+
+        guard let pushRNContainerParams = RCTConvert.pushRNContainerParams(params) else {
+            resolver(false)
+            return
+        }
+
+        guard let appKey = pushRNContainerParams.appKey, appKey.count > 0 else {
+            resolver(false)
+            return
+        }
+
+        let containerViewController = FWRNContainerViewController()
+        containerViewController.appKey = appKey
+        containerViewController.appProps = pushRNContainerParams.appProps ?? [:]
+        containerViewController.modalPresentationStyle = .fullScreen
+
+//        if presentedVC.modalPresentationStyle == .custom,
+//            let presentingVC = presentedVC.presentingViewController,
+//            presentingVC is FireworkVideo.PlayerViewController {
+//            containerViewController.modalPresentationStyle = .overFullScreen
+//        }
+
+        presentedVC.present(containerViewController, animated: true) {
+            resolver(true)
+        }
+    }
+
+    @objc(popRNContainer:rejecter:)
+    func popRNContainer(
+        _ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock
+    ) {
+        if let containerVC = RCTPresentedViewController() as? FWRNContainerViewController,
+           containerVC.presentingViewController != nil {
+            containerVC.dismiss(animated: true) {
+                resolver(true)
+            }
+        } else {
+            resolver(false)
+        }
+    }
+
     @objc(popNativeContainer:rejecter:)
     func popNativeContainer(
         _ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock
@@ -54,9 +110,9 @@ class FWNavigatorModule: RCTEventEmitter {
                     }
                 }
             }
-        } else if let rootVC = RCTKeyWindow()?.rootViewController,
-                    let presentedVC = rootVC.presentedViewController,
-                  FWNavigatorModule.isIOSSDKViewController(presentedVC) {
+        } else if let presentedVC = RCTPresentedViewController(),
+                  FWNavigatorModule.isIOSSDKViewController(presentedVC),
+                  presentedVC.presentingViewController == RCTKeyWindow()?.rootViewController {
             if let buttonInfo = FWNavigatorModule.getPlayerExitButtonInfo(view: presentedVC.view) {
                 if buttonInfo.type == .close {
                     buttonInfo.button.sendActions(for: .touchUpInside)
@@ -121,7 +177,6 @@ extension FWNavigatorModule {
 
     private static func getPlayerExitButtonInfo(view: UIView) -> PlayerExitButtonInfo? {
         if let button = view as? UIButton, let image = button.image(for: .normal) {
-            let iOSSDKBundle = Bundle(for: FireworkVideoSDK.self)
             if isTargetIOSSDKImage(image, targetImageName: "closeX") {
                 return PlayerExitButtonInfo(button: button, type: .close)
             }

package/ios/Modules/FWNavigatorModule/FWRNContainerViewController.swift

@@ -0,0 +1,33 @@
+//
+//  FWRNContainerViewController.swift
+//  FireworkSdk
+//
+//  Created by linjie jiang on 7/19/23.
+//  Copyright © 2023 Facebook. All rights reserved.
+//
+
+import UIKit
+
+class FWRNContainerViewController: UIViewController {
+    var appKey: String = ""
+    var appProps: [String: Any] = [:]
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        loadContent()
+    }
+
+    private func loadContent() {
+        let rctRootView = RCTRootView.init(
+            bridge: RCTBridge.current(), moduleName: appKey, initialProperties: appProps)
+        view.addSubview(rctRootView)
+        rctRootView.translatesAutoresizingMaskIntoConstraints = false
+
+        NSLayoutConstraint.activate([
+            rctRootView.leftAnchor.constraint(equalTo: view.leftAnchor),
+            rctRootView.topAnchor.constraint(equalTo: view.topAnchor),
+            rctRootView.rightAnchor.constraint(equalTo: view.rightAnchor),
+            rctRootView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
+        ])
+    }
+}

package/ios/Modules/FWNavigatorModule/PushRNContainerParams.swift

@@ -0,0 +1,14 @@
+//
+//  PushRNContainerParams.swift
+//  FireworkSdk
+//
+//  Created by linjie jiang on 7/20/23.
+//  Copyright © 2023 Facebook. All rights reserved.
+//
+
+import Foundation
+
+class PushRNContainerParams {
+    var appKey: String?
+    var appProps: [String: Any]?
+}

package/ios/Modules/FireworkSDKModule/FireworkSDKModule.m

@@ -12,8 +12,8 @@
 
 _RCT_EXTERN_REMAP_METHOD(init, initializeSDK:(NSDictionary * __nullable)options resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter, NO)
 RCT_EXTERN_METHOD(openVideoPlayer:(NSString *)url config:(NSDictionary *)config)
+RCT_EXTERN_METHOD(setVideoFeedClickCallbackEnabled:(BOOL)enabled)
 RCT_EXTERN_METHOD(setCustomCTAClickEnabled:(BOOL)enabled)
-RCT_EXTERN_METHOD(setCustomCTALinkContentPageRouteName:(NSString *)name resolver: (RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 RCT_EXTERN_METHOD(setShareBaseURL:(NSString *)url resolver: (RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 RCT_EXTERN_METHOD(setVideoPlaybackEventEnabled:(BOOL)enabled)
 RCT_EXTERN_METHOD(setAdBadgeConfiguration:(NSDictionary *)config resolver: (RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)