react-native-firework-sdk 1.6.2 → 1.7.0

package/android/build.gradle

@@ -167,7 +167,7 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 
 dependencies {
 
-  def firework_sdk_version = 'v5.14.11'
+  def firework_sdk_version = 'v5.14.14'
   implementation "com.github.loopsocial:firework_sdk:$firework_sdk_version"
 
   // noinspection GradleDynamicVersion

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

@@ -13,4 +13,6 @@ interface FireworkSDKInterface {
   fun setCustomCTALinkContentPageRouteName(name: String?, promise: Promise)
   fun setAppComponentName(name: String?, promise: Promise)
   fun setVideoPlaybackEventEnabled(value: Boolean?)
+  fun changeAppLanguage(language: String?, promise: Promise)
+  fun restart(promise: Promise)
 }

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

@@ -1,8 +1,13 @@
 package com.fireworksdk.bridge.reactnative.module
 
 import android.annotation.SuppressLint
+import android.app.Activity
+import android.app.Application
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.os.Handler
+import android.os.Looper
+import android.os.Process
 import android.provider.Settings
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.facebook.react.bridge.*
@@ -20,6 +25,7 @@ import com.fireworksdk.bridge.reactnative.pages.FWContainerActivity
 import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
 import com.loopnow.fireworklibrary.*
 import java.util.*
+import kotlin.system.exitProcess
 
 
 class FireworkSDKModule(
@@ -269,6 +275,55 @@ class FireworkSDKModule(
     promise.resolve(Arguments.createMap())
   }
 
+  @ReactMethod
+  override fun changeAppLanguage(language: String?, promise: Promise) {
+    val activity = FWInitializationProvider.INSTANCE.resumedActivity
+    if (activity == null) {
+      promise.resolve(false)
+      return
+    }
+    UiThreadUtil.runOnUiThread {
+      FWLanguageUtil.changeLanguage(activity, language)
+      promise.resolve(true)
+    }
+  }
+
+  @ReactMethod
+  override fun restart(promise: Promise) {
+    val activity: Activity? = FWInitializationProvider.INSTANCE.resumedActivity
+    if (activity == null) {
+      promise.resolve(false)
+      return
+    }
+    restartApplication(activity.application)
+  }
+
+  private fun recreateActivity(activity: Activity) {
+    UiThreadUtil.runOnUiThread {
+      activity.recreate()
+    }
+  }
+
+  // why delay:
+  // 1. must ensure that the data of SharedPreferences has been saved
+  // 2. if the restart method is called after the I18nManager.forceRTL(false);, sometimes the forceRTL(false) does not work.
+  private fun restartApplication(application: Application) {
+    Handler(Looper.getMainLooper()).postDelayed({
+      UiThreadUtil.runOnUiThread {
+        val intent = application.packageManager
+          .getLaunchIntentForPackage(application.packageName)
+        intent?.addFlags(
+          Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+            or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        )
+        application.startActivity(intent)
+        Process.killProcess(Process.myPid())
+        exitProcess(0)
+      }
+    }, 300)
+  }
+
+
   @ReactMethod
   fun addListener(eventName: String?, promise: Promise) {
     // Set up any upstream listeners or background tasks as necessary

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

@@ -0,0 +1,72 @@
+package com.fireworksdk.bridge.utils
+
+import android.content.Context
+import com.loopnow.fireworklibrary.FwSDK
+import java.util.*
+
+object FWLanguageUtil {
+
+  private var locale: String? = null
+  private const val LOCALE_SP = "fw_locale_sp"
+  private const val LOCALE_KEY = "fw_locale_key"
+
+  private fun init(context: Context) {
+    locale = context.getSharedPreferences(LOCALE_SP, Context.MODE_PRIVATE)
+      .getString(LOCALE_KEY, null)
+  }
+
+  fun changeLanguage(context: Context, l: String?) {
+    if (l.isNullOrBlank() || !isValidLocale(l)) {
+      return
+    }
+
+    locale = l
+    FwSDK.changeAppLocale(context, l)
+
+    // save to sp
+    val sharedPreferences =
+      context.getSharedPreferences(LOCALE_SP, Context.MODE_PRIVATE)
+    sharedPreferences.edit().apply {
+        putString(LOCALE_KEY, l)
+      }.apply()
+  }
+
+  fun updateBaseContextLocale(context: Context): Context {
+    if (locale.isNullOrBlank()) {
+      init(context)
+    }
+    locale?.let {
+      val localeStrings = it.split("-")
+      val locale = if (localeStrings.size > 1) {
+        Locale(localeStrings[0], localeStrings[1])
+      } else {
+        Locale(it)
+      }
+      Locale.setDefault(locale)
+
+      return updateResourcesLocale(context, locale)
+    }
+    return updateResourcesLocale(context, Locale.getDefault())
+  }
+
+  private fun updateResourcesLocale(context: Context, locale: Locale): Context {
+    val resources = context.resources
+    val configuration = resources.configuration
+    configuration.setLocale(locale)
+    configuration.setLayoutDirection(locale)
+    return context.createConfigurationContext(configuration)
+  }
+
+  private fun isValidLocale(locale: String?) : Boolean {
+    locale ?: return false
+    val list = Locale.getAvailableLocales()
+    if (locale.contains("-")) {
+      val locales = locale.split("-")
+      if (locales.size > 1) {
+        return list.contains(Locale(locales[0], locales[1]))
+      }
+    }
+    return list.contains(Locale(locale))
+  }
+
+}

package/ios/Components/StoryBlock.swift

@@ -73,8 +73,6 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate {
         let storyBlockVC = StoryBlockViewController(source: source)
         if self.enablePictureInPicture {
             self.pipController = PictureInPictureController(storyBlock: storyBlockVC)
-        } else {
-            self.pipController = nil
         }
 
         storyBlockVC.delegate = self
@@ -84,13 +82,16 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate {
 
     public override func removeFromSuperview() {
         super.removeFromSuperview()
-        self.pipController = nil
+
+        if let pipController = pipController {
+            FWPiPManager.shared.addPiPController(pipController)
+            self.pipController = nil
+        }
 
         guard let storyBlockVC = self.storyBlockVC else {
             return
         }
 
-        storyBlockVC.pause()
         storyBlockVC.detachFromParent()
         self.storyBlockVC = nil
     }

package/ios/Components/VideoFeed.swift

@@ -8,9 +8,6 @@
 import FireworkVideo
 import UIKit
 
-let gOnVideoTemporarilyReleasePipController = Notification.Name("gOnVideoTemporarilyReleasePipController")
-let gOnVideoRestorePipController = Notification.Name("gOnVideoRestorePipController")
-
 @objc
 public enum VideoFeedMode: Int {
     case row, column, grid
@@ -160,7 +157,6 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
         embed()
     }
 
-    // swiftlint:disable:next function_body_length
     private func embed() {
         guard let parentVC = parentViewController else {
             return
@@ -213,19 +209,6 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
         NotificationCenter.default.removeObserver(self)
         if feedViewConfig?.enablePictureInPicture == true {
             self.pipController = PictureInPictureController(videoFeed: feedVC)
-            NotificationCenter.default.addObserver(
-                self,
-                selector: #selector(onVideoTemporarilyReleasePipController(_:)),
-                name: gOnVideoTemporarilyReleasePipController,
-                object: nil
-            )
-            NotificationCenter.default.addObserver(
-                self,
-                selector: #selector(onVideoRestorePipController(_:)),
-                name: gOnVideoRestorePipController,
-                object: nil)
-        } else {
-            self.pipController = nil
         }
 
         feedVC.delegate = self
@@ -237,7 +220,10 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
         super.removeFromSuperview()
         // swiftlint:disable:next notification_center_detachment
         NotificationCenter.default.removeObserver(self)
-        self.pipController = nil
+        if let pipController = pipController {
+            FWPiPManager.shared.addPiPController(pipController)
+            self.pipController = nil
+        }
 
         guard let feedVC = self.feedVC else {
             return
@@ -331,7 +317,7 @@ extension VideoFeed {
         return vfcConfig
     }
 
-    // swiftlint:disable:next cyclomatic_complexity
+    // swiftlint:disable:next cyclomatic_complexity function_body_length
     static func convertToVideoPlayerContentConfiguration(
         _ config: VideoPlayerConfiguration?
     ) -> VideoPlayerContentConfiguration? {
@@ -388,6 +374,28 @@ extension VideoFeed {
             vpcConfig.shareButton.behavior.baseURL = URL(string: shareBaseUrl)
         }
 
+        if let ctaDelay = config.ctaDelay,
+           let type = ctaDelay.type,
+           let value = ctaDelay.value {
+            switch type {
+            case .constant:
+                vpcConfig.ctaButton.behavior.delay = .constant(value)
+            case .percentage:
+                vpcConfig.ctaButton.behavior.delay = .percentage(Float(value))
+            }
+        }
+
+        if let ctaHighlightDelay = config.ctaHighlightDelay,
+           let type = ctaHighlightDelay.type,
+           let value = ctaHighlightDelay.value {
+            switch type {
+            case .constant:
+                vpcConfig.ctaButton.behavior.highlightDelay = .constant(value)
+            case .percentage:
+                vpcConfig.ctaButton.behavior.highlightDelay = .percentage(Float(value))
+            }
+        }
+
         return vpcConfig
     }
 
@@ -420,22 +428,6 @@ extension VideoFeed {
 
         return videoConfig
     }
-
-    @objc private func onVideoTemporarilyReleasePipController(_ notification: NSNotification) {
-        self.pipController = nil
-    }
-
-    @objc private func onVideoRestorePipController(_ notification: NSNotification) {
-        guard let feedVC = feedVC else {
-            return
-        }
-
-        guard feedViewConfig?.enablePictureInPicture == true else {
-            return
-        }
-
-        self.pipController = PictureInPictureController(videoFeed: feedVC)
-    }
 }
 
 // swiftlint:disable file_length

package/ios/Components/VideoPlayerConfiguration.swift

@@ -17,6 +17,8 @@ public class VideoPlayerConfiguration: NSObject, Codable {
     var showMuteButton: Bool?
     var launchBehavior: VideoLaunchBehavior?
     var showBranding: Bool?
+    var ctaDelay: VideoPlayerCTADelay?
+    var ctaHighlightDelay: VideoPlayerCTADelay?
 
     public enum VideoPlayerStyle: String, Codable {
         case full, fit
@@ -35,4 +37,13 @@ public class VideoPlayerConfiguration: NSObject, Codable {
     public enum VideoLaunchBehavior: String, Codable {
         case `default`, muteOnFirstLaunch
     }
+
+    public enum VideoPlayerCTADelayType: String, Codable {
+        case constant, percentage
+    }
+
+    public class VideoPlayerCTADelay: NSObject, Codable {
+        var type: VideoPlayerCTADelayType?
+        var value: Double?
+    }
 }

package/ios/FireworkSdk.xcodeproj/project.pbxproj

@@ -8,6 +8,12 @@
 
 /* Begin PBXBuildFile section */
 		89335CA628E29D3A00B84BC7 /* TrackPurchaseParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89335CA528E29D3A00B84BC7 /* TrackPurchaseParameters.swift */; };
+		8953CF5E2993E0D200F7413E /* UINavigationController+FWSwizzle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8953CF5D2993E0D200F7413E /* UINavigationController+FWSwizzle.swift */; };
+		8953CF602993E3B200F7413E /* FWSwizzleUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8953CF5F2993E3B200F7413E /* FWSwizzleUtil.swift */; };
+		8953CF622993E44E00F7413E /* DispatchQueue+FWOnce.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8953CF612993E44E00F7413E /* DispatchQueue+FWOnce.swift */; };
+		8953CF642993EF8200F7413E /* UIButton+FWSwizzle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8953CF632993EF8200F7413E /* UIButton+FWSwizzle.swift */; };
+		8953CF662993F13800F7413E /* FWPiPManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8953CF652993F13800F7413E /* FWPiPManager.swift */; };
+		8953CF6C2993FAAB00F7413E /* FWSwizzleLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 8953CF6B2993FAAB00F7413E /* FWSwizzleLoader.m */; };
 		896A8EB928E3DCCA007E51F8 /* AdConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 896A8EB828E3DCCA007E51F8 /* AdConfiguration.swift */; };
 		8975235E2817DEEE0070EBB6 /* VideoFeedManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 897523592817DEEE0070EBB6 /* VideoFeedManager.swift */; };
 		8975235F2817DEEE0070EBB6 /* VideoFeedConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8975235A2817DEEE0070EBB6 /* VideoFeedConfiguration.swift */; };
@@ -39,9 +45,6 @@
 		8975239E2817DEF80070EBB6 /* FireworkSDKModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 897523832817DEF80070EBB6 /* FireworkSDKModule.m */; };
 		8975239F2817DEF80070EBB6 /* LiveStreamModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 897523852817DEF80070EBB6 /* LiveStreamModule.swift */; };
 		897523A02817DEF80070EBB6 /* LiveStreamModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 897523862817DEF80070EBB6 /* LiveStreamModule.m */; };
-		8977F48528C99340008CC888 /* UINavigationController+FWSwizzle.m in Sources */ = {isa = PBXBuildFile; fileRef = 8977F48428C99340008CC888 /* UINavigationController+FWSwizzle.m */; };
-		899703B5296D89B600571B4F /* FWNavigatorUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 899703B4296D89B600571B4F /* FWNavigatorUtils.swift */; };
-		899703B8296D9C5C00571B4F /* AVPlayer+FWSwizzle.m in Sources */ = {isa = PBXBuildFile; fileRef = 899703B7296D9C5C00571B4F /* AVPlayer+FWSwizzle.m */; };
 		89DF27DD28A53A77003F3CCB /* StoryBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89DF27DA28A53A77003F3CCB /* StoryBlock.swift */; };
 		89DF27DE28A53A77003F3CCB /* StoryBlockManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89DF27DB28A53A77003F3CCB /* StoryBlockManager.swift */; };
 		89DF27DF28A53A77003F3CCB /* StoryBlockManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 89DF27DC28A53A77003F3CCB /* StoryBlockManager.m */; };
@@ -64,6 +67,13 @@
 		134814201AA4EA6300B7C361 /* libFireworkSdk.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libFireworkSdk.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		1F6F718A2771B48100224AF3 /* FireworkSdk-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "FireworkSdk-Bridging-Header.h"; sourceTree = "<group>"; };
 		89335CA528E29D3A00B84BC7 /* TrackPurchaseParameters.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TrackPurchaseParameters.swift; sourceTree = "<group>"; };
+		8953CF5D2993E0D200F7413E /* UINavigationController+FWSwizzle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UINavigationController+FWSwizzle.swift"; sourceTree = "<group>"; };
+		8953CF5F2993E3B200F7413E /* FWSwizzleUtil.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FWSwizzleUtil.swift; sourceTree = "<group>"; };
+		8953CF612993E44E00F7413E /* DispatchQueue+FWOnce.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DispatchQueue+FWOnce.swift"; sourceTree = "<group>"; };
+		8953CF632993EF8200F7413E /* UIButton+FWSwizzle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+FWSwizzle.swift"; sourceTree = "<group>"; };
+		8953CF652993F13800F7413E /* FWPiPManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FWPiPManager.swift; sourceTree = "<group>"; };
+		8953CF6A2993FAAB00F7413E /* FWSwizzleLoader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FWSwizzleLoader.h; sourceTree = "<group>"; };
+		8953CF6B2993FAAB00F7413E /* FWSwizzleLoader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FWSwizzleLoader.m; sourceTree = "<group>"; };
 		896A8EB828E3DCCA007E51F8 /* AdConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdConfiguration.swift; sourceTree = "<group>"; };
 		897523592817DEEE0070EBB6 /* VideoFeedManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoFeedManager.swift; sourceTree = "<group>"; };
 		8975235A2817DEEE0070EBB6 /* VideoFeedConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoFeedConfiguration.swift; sourceTree = "<group>"; };
@@ -96,11 +106,6 @@
 		897523832817DEF80070EBB6 /* FireworkSDKModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FireworkSDKModule.m; sourceTree = "<group>"; };
 		897523852817DEF80070EBB6 /* LiveStreamModule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LiveStreamModule.swift; sourceTree = "<group>"; };
 		897523862817DEF80070EBB6 /* LiveStreamModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LiveStreamModule.m; sourceTree = "<group>"; };
-		8977F48328C99340008CC888 /* UINavigationController+FWSwizzle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UINavigationController+FWSwizzle.h"; sourceTree = "<group>"; };
-		8977F48428C99340008CC888 /* UINavigationController+FWSwizzle.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UINavigationController+FWSwizzle.m"; sourceTree = "<group>"; };
-		899703B4296D89B600571B4F /* FWNavigatorUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FWNavigatorUtils.swift; sourceTree = "<group>"; };
-		899703B6296D9C5C00571B4F /* AVPlayer+FWSwizzle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "AVPlayer+FWSwizzle.h"; sourceTree = "<group>"; };
-		899703B7296D9C5C00571B4F /* AVPlayer+FWSwizzle.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "AVPlayer+FWSwizzle.m"; sourceTree = "<group>"; };
 		89DF27DA28A53A77003F3CCB /* StoryBlock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StoryBlock.swift; sourceTree = "<group>"; };
 		89DF27DB28A53A77003F3CCB /* StoryBlockManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StoryBlockManager.swift; sourceTree = "<group>"; };
 		89DF27DC28A53A77003F3CCB /* StoryBlockManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StoryBlockManager.m; sourceTree = "<group>"; };
@@ -158,15 +163,17 @@
 		897523642817DEF80070EBB6 /* Utils */ = {
 			isa = PBXGroup;
 			children = (
+				8953CF612993E44E00F7413E /* DispatchQueue+FWOnce.swift */,
+				8953CF5F2993E3B200F7413E /* FWSwizzleUtil.swift */,
 				897523652817DEF80070EBB6 /* UIViewController+AttachChild.swift */,
 				897523662817DEF80070EBB6 /* UIView+Constraints.swift */,
 				897523672817DEF80070EBB6 /* String+Color.swift */,
 				897523682817DEF80070EBB6 /* UIView+ParentViewController.swift */,
-				8977F48328C99340008CC888 /* UINavigationController+FWSwizzle.h */,
-				8977F48428C99340008CC888 /* UINavigationController+FWSwizzle.m */,
-				899703B4296D89B600571B4F /* FWNavigatorUtils.swift */,
-				899703B6296D9C5C00571B4F /* AVPlayer+FWSwizzle.h */,
-				899703B7296D9C5C00571B4F /* AVPlayer+FWSwizzle.m */,
+				8953CF5D2993E0D200F7413E /* UINavigationController+FWSwizzle.swift */,
+				8953CF632993EF8200F7413E /* UIButton+FWSwizzle.swift */,
+				8953CF652993F13800F7413E /* FWPiPManager.swift */,
+				8953CF6A2993FAAB00F7413E /* FWSwizzleLoader.h */,
+				8953CF6B2993FAAB00F7413E /* FWSwizzleLoader.m */,
 			);
 			path = Utils;
 			sourceTree = "<group>";
@@ -314,23 +321,24 @@
 			buildActionMask = 2147483647;
 			files = (
 				8975238A2817DEF80070EBB6 /* UIView+ParentViewController.swift in Sources */,
-				8977F48528C99340008CC888 /* UINavigationController+FWSwizzle.m in Sources */,
-				899703B8296D9C5C00571B4F /* AVPlayer+FWSwizzle.m in Sources */,
 				8975239B2817DEF80070EBB6 /* FireworkSDKModule.swift in Sources */,
 				897523952817DEF80070EBB6 /* ShoppingModule.m in Sources */,
 				89335CA628E29D3A00B84BC7 /* TrackPurchaseParameters.swift in Sources */,
-				899703B5296D89B600571B4F /* FWNavigatorUtils.swift in Sources */,
 				897523A02817DEF80070EBB6 /* LiveStreamModule.m in Sources */,
 				8975238E2817DEF80070EBB6 /* FireworkSDK+Json.swift in Sources */,
+				8953CF5E2993E0D200F7413E /* UINavigationController+FWSwizzle.swift in Sources */,
 				89DF27E128A53A89003F3CCB /* RCTConvert+StoryBlock.swift in Sources */,
+				8953CF6C2993FAAB00F7413E /* FWSwizzleLoader.m in Sources */,
 				8975235F2817DEEE0070EBB6 /* VideoFeedConfiguration.swift in Sources */,
 				897523612817DEEE0070EBB6 /* VideoPlayerConfiguration.swift in Sources */,
 				897523972817DEF80070EBB6 /* Product.swift in Sources */,
 				89DF27DD28A53A77003F3CCB /* StoryBlock.swift in Sources */,
 				89DF27DF28A53A77003F3CCB /* StoryBlockManager.m in Sources */,
+				8953CF642993EF8200F7413E /* UIButton+FWSwizzle.swift in Sources */,
 				897523932817DEF80070EBB6 /* FWNavigatorModule.m in Sources */,
 				897523922817DEF80070EBB6 /* FWNavigatorModule.swift in Sources */,
 				897523872817DEF80070EBB6 /* UIViewController+AttachChild.swift in Sources */,
+				8953CF662993F13800F7413E /* FWPiPManager.swift in Sources */,
 				897523902817DEF80070EBB6 /* FWNavigatorProtocol.swift in Sources */,
 				897523882817DEF80070EBB6 /* UIView+Constraints.swift in Sources */,
 				897523982817DEF80070EBB6 /* ShoppingModule.swift in Sources */,
@@ -346,7 +354,9 @@
 				8975235E2817DEEE0070EBB6 /* VideoFeedManager.swift in Sources */,
 				8975239D2817DEF80070EBB6 /* FireworkSDKModule+CTA.swift in Sources */,
 				89DF27DE28A53A77003F3CCB /* StoryBlockManager.swift in Sources */,
+				8953CF622993E44E00F7413E /* DispatchQueue+FWOnce.swift in Sources */,
 				897523892817DEF80070EBB6 /* String+Color.swift in Sources */,
+				8953CF602993E3B200F7413E /* FWSwizzleUtil.swift in Sources */,
 				897523622817DEEE0070EBB6 /* VideoFeedManager.m in Sources */,
 				897523912817DEF80070EBB6 /* FWNavigatorContainerViewController.swift in Sources */,
 				8975238F2817DEF80070EBB6 /* FireworkEventName.swift in Sources */,

package/ios/Modules/FWNavigatorModule/FWNavigatorModule.swift

@@ -142,20 +142,13 @@ class FWNavigatorModule: RCTEventEmitter, FWNavigator {
             } else if let presentedVC = RCTPresentedViewController(),
                 let presentingVC = presentedVC.presentingViewController,
                 presentingVC.presentingViewController == RCTKeyWindow()?.rootViewController {
-                let closeButton = self.getCloseButton(view: presentingVC.view)
-                if closeButton == nil {
-                    FWNavigatorUtils.shared.shouldDisablePlay = true
-                }
                 presentedVC.dismiss(animated: false) {
                     DispatchQueue.main.asyncAfter(wallDeadline: .now() + 0.1) {
-                        FWNavigatorUtils.shared.shouldDisablePlay = false
-                        if closeButton != nil {
-                            closeButton!.sendActions(for: .touchUpInside)
+                        if let closeButton = self.getCloseButton(view: presentingVC.view) {
+                            closeButton.sendActions(for: .touchUpInside)
                             resolver(true)
                         } else {
-                            NotificationCenter.default.post(name: gOnVideoTemporarilyReleasePipController, object: nil)
                             presentingVC.dismiss(animated: true) {
-                                NotificationCenter.default.post(name: gOnVideoRestorePipController, object: nil)
                                 resolver(true)
                             }
                         }
@@ -167,9 +160,7 @@ class FWNavigatorModule: RCTEventEmitter, FWNavigator {
                     closeButton.sendActions(for: .touchUpInside)
                     resolver(true)
                 } else {
-                    NotificationCenter.default.post(name: gOnVideoTemporarilyReleasePipController, object: nil)
                     presentedVC.dismiss(animated: true) {
-                        NotificationCenter.default.post(name: gOnVideoRestorePipController, object: nil)
                         resolver(true)
                     }
                 }

package/ios/Modules/FireworkSDKModule/FireworkSDKModule+EventTracking.swift

@@ -127,5 +127,7 @@ extension FireworkSDKModule: FireworkVideoFeedDelegate {
 
         sendEvent(
             withName: FWEventName.videoFeedClick.rawValue, body: ["info": eventDetails.jsObject])
+
+        FWPiPManager.shared.removeAllPiPControllers()
     }
 }

package/ios/Modules/FireworkSDKModule/FireworkSDKModule.swift

@@ -56,7 +56,7 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
             return
         }
 
-        var vpcConfig = RCTConvert.videoPlayerContentConfiguration(config)
+        let vpcConfig = RCTConvert.videoPlayerContentConfiguration(config)
 
         var feedContentConfig = VideoFeedContentConfiguration()
         if let vpcConfig = vpcConfig {

package/ios/Utils/DispatchQueue+FWOnce.swift

@@ -0,0 +1,32 @@
+//
+//  DispatchQueue+FWOnce.swift
+//
+//  Created by Jeff Zheng on 2022/3/1.
+//
+
+import Foundation
+
+extension DispatchQueue {
+    private static var _onceContainer = [String]()
+
+    /// Execute a block only once.
+    public class func fw_once(
+        file: String = #file, function: String = #function, line: Int = #line, block: () -> Void
+    ) {
+        let token = file + ":" + function + ":" + String(line)
+        fw_once(token: token, block: block)
+    }
+
+    /// Execute a block only once.
+    public class func fw_once(token: String, block: () -> Void) {
+        objc_sync_enter(self)
+        defer { objc_sync_exit(self) }
+
+        guard !_onceContainer.contains(token) else {
+            return
+        }
+
+        _onceContainer.append(token)
+        block()
+    }
+}

package/ios/Utils/FWPiPManager.swift

@@ -0,0 +1,24 @@
+//
+//  FWPiPManager.swift
+//
+//  Created by linjie jiang on 2023/2/8.
+//
+
+import Foundation
+import FireworkVideo
+
+class FWPiPManager {
+    static let shared = FWPiPManager()
+    // store the pipController corresponding to Video Feed or Story block being removed
+    var pipControllerList: [PictureInPictureController] = []
+
+    private init() {}
+
+    func addPiPController(_ pipController: PictureInPictureController) {
+        pipControllerList.append(pipController)
+    }
+
+    func removeAllPiPControllers() {
+        pipControllerList.removeAll()
+    }
+}

package/ios/Utils/FWSwizzleLoader.h

@@ -0,0 +1,15 @@
+//
+//  FWSwizzleLoader.h
+//
+//  Created by linjie jiang on 2023/2/8.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface FWSwizzleLoader : NSObject
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/Utils/FWSwizzleLoader.m

@@ -0,0 +1,17 @@
+//
+//  FWSwizzleLoader.m
+//
+//  Created by linjie jiang on 2023/2/8.
+//
+
+#import "FWSwizzleLoader.h"
+#import "react_native_firework_sdk-Swift.h"
+
+@implementation FWSwizzleLoader
+
++ (void)load {
+    [UINavigationController fw_swizzleMethods];
+    [UIButton fw_swizzleMethods];
+}
+
+@end

package/ios/Utils/FWSwizzleUtil.swift

@@ -0,0 +1,29 @@
+//
+//  FWSwizzleUtil.swift
+//
+//  Created by linjie jiang on 2023/2/7.
+//
+
+import Foundation
+
+class FWSwizzleUtil {
+    static func swizzleSelector(cls: AnyClass, orginalSelector: Selector, customSelector: Selector) {
+        guard let orginalMethod = class_getInstanceMethod(cls, orginalSelector) else { return }
+        guard let customMethod = class_getInstanceMethod(cls, customSelector) else { return }
+
+        if class_addMethod(
+            cls,
+            orginalSelector,
+            method_getImplementation(customMethod),
+            method_getTypeEncoding(customMethod)) {
+            class_replaceMethod(
+                cls,
+                customSelector,
+                method_getImplementation(orginalMethod),
+                method_getTypeEncoding(orginalMethod)
+            )
+        } else {
+            method_exchangeImplementations(orginalMethod, customMethod)
+        }
+    }
+}

package/ios/Utils/UIButton+FWSwizzle.swift

@@ -0,0 +1,33 @@
+//
+//  UIButton+FWSwizzle.swift
+//
+//  Created by linjie jiang on 2023/2/8.
+//
+
+import UIKit
+import FireworkVideo
+
+extension UIButton {
+    @objc public static func fw_swizzleMethods() {
+        DispatchQueue.fw_once {
+            FWSwizzleUtil.swizzleSelector(
+                cls: self,
+                orginalSelector: #selector(sendAction(_:to:for:)),
+                customSelector: #selector(fw_sendAction(_:to:for:))
+            )
+        }
+    }
+
+    @objc func fw_sendAction(_ action: Selector, to target: Any?, for event: UIEvent?) {
+        if let targetImage = self.image(for: .normal) {
+            let iOSSDKBundle = Bundle(for: FireworkVideoSDK.self)
+            let closeImage = UIImage(named: "closeX", in: iOSSDKBundle, compatibleWith: nil)
+            if targetImage.isEqual(closeImage) {
+                DispatchQueue.main.asyncAfter(wallDeadline: .now() + 0.1) {
+                    FWPiPManager.shared.removeAllPiPControllers()
+                }
+            }
+        }
+        self.fw_sendAction(action, to: target, for: event)
+    }
+}