react-native-firework-sdk 1.7.0 → 1.8.0

package/ios/Modules/FWNavigatorModule/FWNavigatorModule.swift

@@ -7,6 +7,14 @@
 
 import FireworkVideo
 
+private struct PlayerInfo {
+    enum PlayerMode: Int {
+        case fullscreen, floating
+    }
+    var playerVC: PlayerViewController
+    var mode: PlayerMode
+}
+
 @objc(FWNavigatorModule)
 class FWNavigatorModule: RCTEventEmitter, FWNavigator {
     override func supportedEvents() -> [String]! {
@@ -17,6 +25,10 @@ class FWNavigatorModule: RCTEventEmitter, FWNavigator {
         return true
     }
 
+    override var methodQueue: DispatchQueue {
+        return DispatchQueue.main
+    }
+
     // swiftlint:disable function_body_length
 
     @objc(pushNativeContainer:resolver:rejecter:)
@@ -34,77 +46,170 @@ class FWNavigatorModule: RCTEventEmitter, FWNavigator {
                 ])
         #endif
 
-        DispatchQueue.main.async {
-            guard let props = props as? [String: Any] else {
-                resolver(false)
-                return
-            }
+        guard let props = props as? [String: Any] else {
+            resolver(false)
+            return
+        }
 
-            guard let appComponentName = gAppComponentName, appComponentName.count > 0 else {
-                resolver(false)
-                return
-            }
+        guard let appComponentName = gAppComponentName, appComponentName.count > 0 else {
+            resolver(false)
+            return
+        }
 
-            guard let presentedVC = RCTPresentedViewController() else {
-                resolver(false)
-                return
-            }
+        guard let presentedVC = RCTPresentedViewController() else {
+            resolver(false)
+            return
+        }
 
-            #if DEBUG
-                self.sendEvent(
-                    withName: FWEventName.logMessage.rawValue,
-                    body: [
-                        "message":
-                            "[iOS] Before creating containerViewController \(formatter.string(from: Date()))"
-                    ])
-            #endif
+        #if DEBUG
+            self.sendEvent(
+                withName: FWEventName.logMessage.rawValue,
+                body: [
+                    "message":
+                        "[iOS] Before creating containerViewController \(formatter.string(from: Date()))"
+                ])
+        #endif
+
+        let containerViewController = FWNavigatorContainerViewController()
 
-            let containerViewController = FWNavigatorContainerViewController()
+        #if DEBUG
+            self.sendEvent(
+                withName: FWEventName.logMessage.rawValue,
+                body: [
+                    "message":
+                        "[iOS] After creating containerViewController \(formatter.string(from: Date()))"
+                ])
+        #endif
+
+        containerViewController.moduleName = appComponentName
+        containerViewController.properties = props
+        containerViewController.modalPresentationStyle = .fullScreen
+        if presentedVC.modalPresentationStyle == .custom,
+            let presentingVC = presentedVC.presentingViewController,
+            presentingVC is FireworkVideo.PlayerViewController
+        {
+            containerViewController.modalPresentationStyle = .overFullScreen
+        }
+
+        #if DEBUG
+            self.sendEvent(
+                withName: FWEventName.logMessage.rawValue,
+                body: [
+                    "message":
+                        "[iOS] Present containerViewController \(formatter.string(from: Date()))"
+                ])
+        #endif
 
+        presentedVC.present(containerViewController, animated: true) {
             #if DEBUG
                 self.sendEvent(
                     withName: FWEventName.logMessage.rawValue,
                     body: [
                         "message":
-                            "[iOS] After creating containerViewController \(formatter.string(from: Date()))"
+                            "[iOS] Finish presenting containerViewController \(formatter.string(from: Date()))"
                     ])
             #endif
 
-            containerViewController.moduleName = appComponentName
-            containerViewController.properties = props
-            containerViewController.modalPresentationStyle = .fullScreen
-            if presentedVC.modalPresentationStyle == .custom,
-                let presentingVC = presentedVC.presentingViewController,
-                presentingVC is FireworkVideo.PlayerViewController
-            {
-                containerViewController.modalPresentationStyle = .overFullScreen
+            resolver(true)
+        }
+    }
+
+    // swiftlint:enable function_body_length
+
+    @objc(popNativeContainer:rejecter:)
+    func popNativeContainer(
+        _ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock
+    ) {
+        if let navigatorContainerVC = RCTPresentedViewController()
+            as? FWNavigatorContainerViewController,
+            navigatorContainerVC.presentingViewController != nil {
+            navigatorContainerVC.dismiss(animated: true) {
+                resolver(true)
+            }
+        } else if let cartViewController = gCartViewController {
+            cartViewController.navigationController?.popViewController(animated: true)
+            gCartViewController = nil
+            resolver(true)
+        } else if let presentedVC = RCTPresentedViewController(),
+                  FWNavigatorModule.isIOSSDKViewController(presentedVC),
+                  let presentingVC = presentedVC.presentingViewController,
+                  presentingVC.presentingViewController == RCTKeyWindow()?.rootViewController,
+                  FWNavigatorModule.isIOSSDKViewController(presentingVC) {
+            presentedVC.dismiss(animated: false) {
+                DispatchQueue.main.asyncAfter(wallDeadline: .now() + 0.1) {
+                    if let closeButton = FWNavigatorModule.getExitButton(view: presentingVC.view) {
+                        closeButton.sendActions(for: .touchUpInside)
+                        resolver(true)
+                    } else {
+                        presentingVC.dismiss(animated: true) {
+                            resolver(true)
+                        }
+                    }
+                }
             }
+        } else if let rootVC = RCTKeyWindow()?.rootViewController,
+                    let presentedVC = rootVC.presentedViewController,
+                  FWNavigatorModule.isIOSSDKViewController(presentedVC) {
+            if let closeButton = FWNavigatorModule.getExitButton(view: presentedVC.view) {
+                closeButton.sendActions(for: .touchUpInside)
+                resolver(true)
+            } else {
+                presentedVC.dismiss(animated: true) {
+                    resolver(true)
+                }
+            }
+        } else {
+            resolver(false)
+        }
+    }
 
-            #if DEBUG
-                self.sendEvent(
-                    withName: FWEventName.logMessage.rawValue,
-                    body: [
-                        "message":
-                            "[iOS] Present containerViewController \(formatter.string(from: Date()))"
-                    ])
-            #endif
+    @objc(canPopNativeContainer:rejecter:)
+    func canPopNativeContainer(
+        _ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock
+    ) {
+        if let presentedVC = RCTPresentedViewController(),
+            presentedVC.presentingViewController != nil {
+            resolver(true)
+        } else if gCartViewController != nil {
+            resolver(true)
+        } else {
+            resolver(false)
+        }
+    }
 
-            presentedVC.present(containerViewController, animated: true) {
-                #if DEBUG
-                    self.sendEvent(
-                        withName: FWEventName.logMessage.rawValue,
-                        body: [
-                            "message":
-                                "[iOS] Finish presenting containerViewController \(formatter.string(from: Date()))"
-                        ])
-                #endif
+    @objc(startFloatingPlayer:rejecter:)
+    func startFloatingPlayer(
+        _ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock
+    ) {
+        guard let playerInfo = FWNavigatorModule.getPlayerInfo() else {
+            resolver(false)
+            return
+        }
 
+        if playerInfo.mode == .fullscreen {
+            do {
+                try playerInfo.playerVC.startPictureInPicture()
                 resolver(true)
+            } catch {
+                resolver(false)
             }
+        } else {
+            // current player is already in floating mode.
+            resolver(false)
         }
     }
 
-    func getCloseButton(view: UIView) -> UIButton? {
+    @objc(stopFloatingPlayer:rejecter:)
+    func stopFloatingPlayer(
+        _ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock
+    ) {
+        let result = FWNavigatorModule.stopFloatingPlayer()
+        resolver(result)
+    }
+}
+
+extension FWNavigatorModule {
+    private static func getExitButton(view: UIView) -> UIButton? {
         if let button = view as? UIButton, let targetImage = button.image(for: .normal) {
             let iOSSDKBundle = Bundle(for: FireworkVideoSDK.self)
             if targetImage.isEqual(UIImage(named: "closeX", in: iOSSDKBundle, compatibleWith: nil))
@@ -114,7 +219,7 @@ class FWNavigatorModule: RCTEventEmitter, FWNavigator {
         }
 
         for subview in view.subviews {
-            if let result = getCloseButton(view: subview) {
+            if let result = getExitButton(view: subview) {
                 return result
             }
         }
@@ -122,67 +227,108 @@ class FWNavigatorModule: RCTEventEmitter, FWNavigator {
         return nil
     }
 
-    // swiftlint:enable function_body_length
-
-    @objc(popNativeContainer:rejecter:)
-    func popNativeContainer(
-        _ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock
-    ) {
-        DispatchQueue.main.async {
-            if let navigatorContainerVC = RCTPresentedViewController()
-                as? FWNavigatorContainerViewController,
-                navigatorContainerVC.presentingViewController != nil {
-                navigatorContainerVC.dismiss(animated: true) {
-                    resolver(true)
-                }
-            } else if let cartViewController = gCartViewController {
-                cartViewController.navigationController?.popViewController(animated: true)
-                gCartViewController = nil
-                resolver(true)
-            } else if let presentedVC = RCTPresentedViewController(),
-                let presentingVC = presentedVC.presentingViewController,
-                presentingVC.presentingViewController == RCTKeyWindow()?.rootViewController {
-                presentedVC.dismiss(animated: false) {
-                    DispatchQueue.main.asyncAfter(wallDeadline: .now() + 0.1) {
-                        if let closeButton = self.getCloseButton(view: presentingVC.view) {
-                            closeButton.sendActions(for: .touchUpInside)
-                            resolver(true)
-                        } else {
-                            presentingVC.dismiss(animated: true) {
-                                resolver(true)
-                            }
-                        }
+    private static func getWindowList() -> [UIWindow] {
+        var windowList: [UIWindow] = []
+        if #available(iOS 13.0, *) {
+            for scene in UIApplication.shared.connectedScenes {
+                if let currentSene = scene as? UIWindowScene {
+                    for window in currentSene.windows {
+                        windowList.append(window)
                     }
                 }
-            } else if let rootVC = RCTKeyWindow()?.rootViewController,
-                        let presentedVC = rootVC.presentedViewController {
-                if let closeButton = self.getCloseButton(view: presentedVC.view) {
-                    closeButton.sendActions(for: .touchUpInside)
-                    resolver(true)
-                } else {
-                    presentedVC.dismiss(animated: true) {
-                        resolver(true)
-                    }
+            }
+        } else {
+            for window in UIApplication.shared.windows {
+                windowList.append(window)
+            }
+        }
+
+        return windowList
+    }
+
+    private static func getFurthestAncestorController(_ controller: UIViewController) -> UIViewController {
+        guard let parentVC = controller.parent else {
+            return controller
+        }
+
+        return getFurthestAncestorController(parentVC)
+    }
+
+    private static func getPlayerViewController(_ viewController: UIViewController) -> PlayerViewController? {
+        if let playerVC = viewController as? PlayerViewController {
+            return playerVC
+        }
+
+        for childVC in viewController.children {
+            if let playerVC = getPlayerViewController(childVC) {
+                return playerVC
+            }
+        }
+
+        return nil
+    }
+
+    private static func getPlayerInfo() -> PlayerInfo? {
+        let windowList: [UIWindow] = getWindowList()
+
+        if let floatingPlayerWindow = windowList.first(where: { window in
+            NSStringFromClass(type(of: window)) == "FireworkVideo.FloatingPlayerController"
+        }) {
+            if let rootVC = floatingPlayerWindow.rootViewController,
+               let playerVC = getPlayerViewController(rootVC) {
+                return PlayerInfo(playerVC: playerVC, mode: .floating)
+            }
+            return nil
+        }
+
+        if let keyWindow = windowList.first(where: { window in
+            return window.isKeyWindow
+        }) {
+            if let rootVC = keyWindow.rootViewController,
+               let presentedVC = rootVC.presentedViewController {
+                let furthestAncestorController = getFurthestAncestorController(presentedVC)
+
+                if let playerVC = getPlayerViewController(furthestAncestorController) {
+                    return PlayerInfo(playerVC: playerVC, mode: .fullscreen)
                 }
-            } else {
-                resolver(false)
             }
+
+            return nil
+        }
+
+        return nil
+    }
+
+    private static func isIOSSDKViewController(_ controller: UIViewController?) -> Bool {
+        guard let controller = controller else {
+            return false
         }
+
+        let iOSSDKBundle = Bundle(for: FireworkVideoSDK.self)
+        if Bundle(for: type(of: controller)) == iOSSDKBundle {
+            return true
+        }
+
+        return isIOSSDKViewController(controller.parent)
     }
+}
 
-    @objc(canPopNativeContainer:rejecter:)
-    func canPopNativeContainer(
-        _ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock
-    ) {
-        DispatchQueue.main.async {
-            if let presentedVC = RCTPresentedViewController(),
-                presentedVC.presentingViewController != nil {
-                resolver(true)
-            } else if gCartViewController != nil {
-                resolver(true)
-            } else {
-                resolver(false)
+extension FWNavigatorModule {
+    static func stopFloatingPlayer() -> Bool {
+        guard let playerInfo = self.getPlayerInfo() else {
+            return false
+        }
+
+        if playerInfo.mode == .floating {
+            do {
+                try playerInfo.playerVC.stopPictureInPicture()
+                return true
+            } catch {
+                return false
             }
+        } else {
+            // current player is in fullscreen player
+            return false
         }
     }
 }

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

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

package/ios/Modules/FireworkSDKModule/FireworkSDKModule.swift

@@ -30,6 +30,10 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
         return true
     }
 
+    override var methodQueue: DispatchQueue {
+        return DispatchQueue.main
+    }
+
     @objc(initializeSDK:)
     func initializeSDK(_ userId: String? = nil) {
         #if DEBUG
@@ -42,12 +46,10 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
             sendEvent(withName: FWEventName.logMessage.rawValue, body: ["message": message])
         #endif
 
-        DispatchQueue.main.async {
-            FireworkVideoSDK.initializeSDK(delegate: self, userID: userId)
-            FireworkVideoSDK.ctaDelegate = self
-            FireworkVideoSDK.eventTracking.videoPlaybackDelegate = self
-            FireworkVideoSDK.eventTracking.feedDelegate = self
-        }
+        FireworkVideoSDK.initializeSDK(delegate: self, userID: userId)
+        FireworkVideoSDK.ctaDelegate = self
+        FireworkVideoSDK.eventTracking.videoPlaybackDelegate = self
+        FireworkVideoSDK.eventTracking.feedDelegate = self
     }
 
     @objc(openVideoPlayer:config:)
@@ -67,14 +69,12 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
             feedContentConfig.adBadge = adBadge
         }
 
-        DispatchQueue.main.async {
-            guard let presentedVC = RCTPresentedViewController() else {
-                return
-            }
+        guard let presentedVC = RCTPresentedViewController() else {
+            return
+        }
 
-            VideoFeedViewController.openVideoPlayer(with: urlString, feedContentConfig, presentedVC) { _ in
+        VideoFeedViewController.openVideoPlayer(with: urlString, feedContentConfig, presentedVC) { _ in
 
-            }
         }
     }
 

package/ios/Modules/LiveStream/LiveStreamModule.swift

@@ -19,11 +19,13 @@ class LiveStreamModule: RCTEventEmitter, FireworkLiveStreamEventDelegate {
         return true
     }
 
+    override var methodQueue: DispatchQueue {
+        return DispatchQueue.main
+    }
+
     @objc
     func initialize() {
-        DispatchQueue.main.async {
-            FireworkVideoSDK.eventTracking.liveStreamEventDelegate = self
-        }
+        FireworkVideoSDK.eventTracking.liveStreamEventDelegate = self
     }
     func fireworkLiveStreamUserDidJoin(_ liveStream: LiveStreamEventDetails) {
         sendEvent(

package/ios/Modules/Shopping/ProductInfoViewConfiguration.swift

@@ -8,12 +8,17 @@
 import Foundation
 
 struct ProductInfoViewConfiguration: Codable {
-    var addToCartButton: ButtonConfiguration?
+    var addToCartButton: AddToCartButtonConfiguration?
+    var linkButton: LinkButtonConfiguration?
 
-    struct ButtonConfiguration: Codable {
+    struct AddToCartButtonConfiguration: Codable {
         var backgroundColor: String?
         var textColor: String?
         var fontSize: Double?
+        var iOSFontInfo: FontInfo?
     }
 
+    struct LinkButtonConfiguration: Codable {
+        var isHidden: Bool?
+    }
 }

package/ios/Modules/Shopping/ShoppingModule.m

@@ -13,10 +13,10 @@ _RCT_EXTERN_REMAP_METHOD(init, initialize, NO)
 RCT_EXTERN_METHOD(setCartIconVisible:(BOOL)visible)
 RCT_EXTERN_METHOD(setCartItemCount:(int)itemCounts)
 RCT_EXTERN_METHOD(updateVideoProducts:(NSArray *)products cbId:(nonnull NSNumber *)cbId)
-RCT_EXTERN_METHOD(updateProductViewConfig:(NSDictionary *)config cbId:(nonnull NSNumber *)cbId)
 RCT_EXTERN_METHOD(updateAddToCartStatus:(NSString *)res tips:(nullable NSString *)tips cbId:(nonnull NSNumber *)cbId)
 RCT_EXTERN_METHOD(jumpToCartPage:(nonnull NSNumber *)cbId props:(NSDictionary *)props)
 RCT_EXTERN_METHOD(setCustomClickCartIconEnabled:(BOOL)enabled resolver: (RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
+RCT_EXTERN_METHOD(setProductInfoViewConfiguration:(NSDictionary *)config)
 RCT_EXTERN_METHOD(clearCallbackId:(nonnull NSNumber *)cbId eventName:(nonnull NSString *)name)
 
 @end