react-native-firework-sdk 2.3.0 → 2.4.0-beta.1

package/ios/FireworkSdk.xcodeproj/project.pbxproj

@@ -34,14 +34,10 @@
 		897523A02817DEF80070EBB6 /* (null) in Sources */ = {isa = PBXBuildFile; };
 		898873462A0A8E7E0089CD1C /* UIViewController+AttachChild.swift in Sources */ = {isa = PBXBuildFile; fileRef = 898873132A0A8E7E0089CD1C /* UIViewController+AttachChild.swift */; };
 		898873472A0A8E7E0089CD1C /* UIView+Constraints.swift in Sources */ = {isa = PBXBuildFile; fileRef = 898873142A0A8E7E0089CD1C /* UIView+Constraints.swift */; };
-		898873482A0A8E7E0089CD1C /* UINavigationController+FWSwizzle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 898873162A0A8E7E0089CD1C /* UINavigationController+FWSwizzle.swift */; };
 		898873492A0A8E7E0089CD1C /* String+Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 898873172A0A8E7E0089CD1C /* String+Color.swift */; };
-		8988734A2A0A8E7E0089CD1C /* FWSwizzleLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 898873182A0A8E7E0089CD1C /* FWSwizzleLoader.m */; };
-		8988734B2A0A8E7E0089CD1C /* FWSwizzleLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 898873192A0A8E7E0089CD1C /* FWSwizzleLoader.swift */; };
 		8988734D2A0A8E7E0089CD1C /* FWNavigatorModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8988731D2A0A8E7E0089CD1C /* FWNavigatorModule.swift */; };
 		8988734E2A0A8E7E0089CD1C /* FWNavigatorModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 8988731E2A0A8E7E0089CD1C /* FWNavigatorModule.m */; };
 		8988734F2A0A8E7E0089CD1C /* ShoppingModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 898873202A0A8E7E0089CD1C /* ShoppingModule.m */; };
-		898873502A0A8E7E0089CD1C /* FWCartViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 898873212A0A8E7E0089CD1C /* FWCartViewController.swift */; };
 		898873512A0A8E7E0089CD1C /* ProductInfoViewConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 898873222A0A8E7E0089CD1C /* ProductInfoViewConfiguration.swift */; };
 		898873522A0A8E7E0089CD1C /* ShoppingCTAResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 898873232A0A8E7E0089CD1C /* ShoppingCTAResult.swift */; };
 		898873532A0A8E7E0089CD1C /* Product.swift in Sources */ = {isa = PBXBuildFile; fileRef = 898873242A0A8E7E0089CD1C /* Product.swift */; };
@@ -71,6 +67,7 @@
 		8988736B2A0A8E7E0089CD1C /* VideoFeed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 898873432A0A8E7E0089CD1C /* VideoFeed.swift */; };
 		8988736C2A0A8E7E0089CD1C /* VideoPlayerConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 898873442A0A8E7E0089CD1C /* VideoPlayerConfiguration.swift */; };
 		8988736D2A0A8E7E0089CD1C /* VideoFeedManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 898873452A0A8E7E0089CD1C /* VideoFeedManager.m */; };
+		89C4D6A62A494EB800EFB74A /* StoryBlockConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89C4D6A52A494EB800EFB74A /* StoryBlockConfiguration.swift */; };
 		89D6BBF929ACE2DC00C8AA2A /* (null) in Sources */ = {isa = PBXBuildFile; };
 		89DF27DD28A53A77003F3CCB /* (null) in Sources */ = {isa = PBXBuildFile; };
 		89DF27DE28A53A77003F3CCB /* (null) in Sources */ = {isa = PBXBuildFile; };
@@ -94,17 +91,12 @@
 		1F6F718A2771B48100224AF3 /* FireworkSdk-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "FireworkSdk-Bridging-Header.h"; 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>"; };
-		898873112A0A8E7E0089CD1C /* FWSwizzleLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FWSwizzleLoader.h; sourceTree = "<group>"; };
 		898873132A0A8E7E0089CD1C /* UIViewController+AttachChild.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewController+AttachChild.swift"; sourceTree = "<group>"; };
 		898873142A0A8E7E0089CD1C /* UIView+Constraints.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Constraints.swift"; sourceTree = "<group>"; };
-		898873162A0A8E7E0089CD1C /* UINavigationController+FWSwizzle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UINavigationController+FWSwizzle.swift"; sourceTree = "<group>"; };
 		898873172A0A8E7E0089CD1C /* String+Color.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Color.swift"; sourceTree = "<group>"; };
-		898873182A0A8E7E0089CD1C /* FWSwizzleLoader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FWSwizzleLoader.m; sourceTree = "<group>"; };
-		898873192A0A8E7E0089CD1C /* FWSwizzleLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FWSwizzleLoader.swift; sourceTree = "<group>"; };
 		8988731D2A0A8E7E0089CD1C /* FWNavigatorModule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FWNavigatorModule.swift; sourceTree = "<group>"; };
 		8988731E2A0A8E7E0089CD1C /* FWNavigatorModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FWNavigatorModule.m; sourceTree = "<group>"; };
 		898873202A0A8E7E0089CD1C /* ShoppingModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShoppingModule.m; sourceTree = "<group>"; };
-		898873212A0A8E7E0089CD1C /* FWCartViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FWCartViewController.swift; sourceTree = "<group>"; };
 		898873222A0A8E7E0089CD1C /* ProductInfoViewConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProductInfoViewConfiguration.swift; sourceTree = "<group>"; };
 		898873232A0A8E7E0089CD1C /* ShoppingCTAResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShoppingCTAResult.swift; sourceTree = "<group>"; };
 		898873242A0A8E7E0089CD1C /* Product.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Product.swift; sourceTree = "<group>"; };
@@ -134,6 +126,7 @@
 		898873432A0A8E7E0089CD1C /* VideoFeed.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoFeed.swift; sourceTree = "<group>"; };
 		898873442A0A8E7E0089CD1C /* VideoPlayerConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoPlayerConfiguration.swift; sourceTree = "<group>"; };
 		898873452A0A8E7E0089CD1C /* VideoFeedManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VideoFeedManager.m; sourceTree = "<group>"; };
+		89C4D6A52A494EB800EFB74A /* StoryBlockConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoryBlockConfiguration.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -163,10 +156,7 @@
 		898873102A0A8E7E0089CD1C /* Utils */ = {
 			isa = PBXGroup;
 			children = (
-				898873112A0A8E7E0089CD1C /* FWSwizzleLoader.h */,
 				898873122A0A8E7E0089CD1C /* Extensions */,
-				898873182A0A8E7E0089CD1C /* FWSwizzleLoader.m */,
-				898873192A0A8E7E0089CD1C /* FWSwizzleLoader.swift */,
 			);
 			path = Utils;
 			sourceTree = "<group>";
@@ -176,20 +166,11 @@
 			children = (
 				898873132A0A8E7E0089CD1C /* UIViewController+AttachChild.swift */,
 				898873142A0A8E7E0089CD1C /* UIView+Constraints.swift */,
-				898873152A0A8E7E0089CD1C /* Swizzle */,
 				898873172A0A8E7E0089CD1C /* String+Color.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
 		};
-		898873152A0A8E7E0089CD1C /* Swizzle */ = {
-			isa = PBXGroup;
-			children = (
-				898873162A0A8E7E0089CD1C /* UINavigationController+FWSwizzle.swift */,
-			);
-			path = Swizzle;
-			sourceTree = "<group>";
-		};
 		8988731A2A0A8E7E0089CD1C /* Modules */ = {
 			isa = PBXGroup;
 			children = (
@@ -214,7 +195,6 @@
 			isa = PBXGroup;
 			children = (
 				898873202A0A8E7E0089CD1C /* ShoppingModule.m */,
-				898873212A0A8E7E0089CD1C /* FWCartViewController.swift */,
 				898873222A0A8E7E0089CD1C /* ProductInfoViewConfiguration.swift */,
 				898873232A0A8E7E0089CD1C /* ShoppingCTAResult.swift */,
 				898873242A0A8E7E0089CD1C /* Product.swift */,
@@ -296,6 +276,7 @@
 				898873432A0A8E7E0089CD1C /* VideoFeed.swift */,
 				898873442A0A8E7E0089CD1C /* VideoPlayerConfiguration.swift */,
 				898873452A0A8E7E0089CD1C /* VideoFeedManager.m */,
+				89C4D6A52A494EB800EFB74A /* StoryBlockConfiguration.swift */,
 			);
 			path = Components;
 			sourceTree = "<group>";
@@ -357,7 +338,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8988734B2A0A8E7E0089CD1C /* FWSwizzleLoader.swift in Sources */,
 				898873572A0A8E7E0089CD1C /* FireworkSDKModule+EventTracking.swift in Sources */,
 				8988734F2A0A8E7E0089CD1C /* ShoppingModule.m in Sources */,
 				898873612A0A8E7E0089CD1C /* RCTConvert+Shopping.swift in Sources */,
@@ -368,7 +348,6 @@
 				8988736C2A0A8E7E0089CD1C /* VideoPlayerConfiguration.swift in Sources */,
 				8988734D2A0A8E7E0089CD1C /* FWNavigatorModule.swift in Sources */,
 				898873692A0A8E7E0089CD1C /* StoryBlockManager.m in Sources */,
-				898873482A0A8E7E0089CD1C /* UINavigationController+FWSwizzle.swift in Sources */,
 				897523A02817DEF80070EBB6 /* (null) in Sources */,
 				8988735E2A0A8E7E0089CD1C /* FontInfo.swift in Sources */,
 				8975238E2817DEF80070EBB6 /* (null) in Sources */,
@@ -391,8 +370,8 @@
 				898873542A0A8E7E0089CD1C /* ShoppingModule.swift in Sources */,
 				898873622A0A8E7E0089CD1C /* RCTConvert+VideoFeed.swift in Sources */,
 				89DF27DF28A53A77003F3CCB /* (null) in Sources */,
+				89C4D6A62A494EB800EFB74A /* StoryBlockConfiguration.swift in Sources */,
 				897523932817DEF80070EBB6 /* (null) in Sources */,
-				8988734A2A0A8E7E0089CD1C /* FWSwizzleLoader.m in Sources */,
 				897523922817DEF80070EBB6 /* (null) in Sources */,
 				897523872817DEF80070EBB6 /* (null) in Sources */,
 				897523902817DEF80070EBB6 /* (null) in Sources */,
@@ -409,7 +388,6 @@
 				898873672A0A8E7E0089CD1C /* AdConfiguration.swift in Sources */,
 				8988735F2A0A8E7E0089CD1C /* RCTConvert+StoryBlock.swift in Sources */,
 				8975239E2817DEF80070EBB6 /* (null) in Sources */,
-				898873502A0A8E7E0089CD1C /* FWCartViewController.swift in Sources */,
 				897523962817DEF80070EBB6 /* (null) in Sources */,
 				8988735B2A0A8E7E0089CD1C /* FireworkSDKModule.m in Sources */,
 				8988736A2A0A8E7E0089CD1C /* VideoFeedConfiguration.swift in Sources */,

package/ios/FireworkVideoUI/FireworkVideoUI/Sources/AppLanguage/AppLanguageManager.swift

@@ -32,14 +32,17 @@ public class AppLanguageManager {
         return LanguageUtil.getLanguageCode(language)
     }
 
+    private var enableAutoHorizontalFlip: Bool = true
+
     /// Get current app language.
     public private(set) var appLanguage: String? {
         didSet {
             if appLanguage != nil {
                 AppLanguageManager.swizzelMethods()
-                LayoutFlipManager.shared.enableHorizontalFlip = shouldHorizontalFlip
             }
 
+            LayoutFlipManager.shared.enableHorizontalFlip = shouldHorizontalFlip
+
             if appLanguage != oldValue {
                 NotificationCenter.default.post(name: NotificationName.AppLanguageChanged, object: nil)
             }
@@ -70,6 +73,10 @@ public class AppLanguageManager {
     }
 
     var shouldHorizontalFlip: Bool {
+        guard enableAutoHorizontalFlip else {
+            return false
+        }
+
         guard let appLanguageCode = appLanguageCode else {
             return false
         }
@@ -125,9 +132,13 @@ public class AppLanguageManager {
     ///
     /// - Parameters:
     ///    - language: app language. We will use system langauge when language is nil.
+    ///    - enableAutoHorizontalFlip: Specifies if auto horizontal flip is enabled based
+    ///                                on app and system language. Defaults to true.
     /// - Returns: The result of changing app language.
     @discardableResult
-    public func changeAppLanguage(_ language: String?) -> Bool {
+    public func changeAppLanguage(_ language: String?, _ enableAutoHorizontalFlip: Bool = true) -> Bool {
+        self.enableAutoHorizontalFlip = enableAutoHorizontalFlip
+
         guard let language = language, language.count > 0 else {
             appLanguage = nil
             UserDefaults.standard.removeObject(forKey: appLanguageStorageKey)

package/ios/FireworkVideoUI/FireworkVideoUI/Sources/AppLanguage/Extensions/UIKit/UIImageView+AppLanguage.swift

@@ -7,17 +7,6 @@
 import UIKit
 import FireworkVideo
 
-private let FWImageNamesWithDirections: [String] = [
-    "shopping-cart",
-    "left-arrow",
-    "right-arrow",
-    "speaker-unmute",
-    "speaker-mute",
-    "mute",
-    "mute-off",
-    "mute-on"
-]
-
 extension UIImageView {
     static func swizzleImageViewMethodsForAppLanguage() {
         Swizzle.swizzleSelector(
@@ -60,29 +49,6 @@ extension UIImageView {
             return false
         }
 
-        if AppLanguageManager.shared.shouldHorizontalFlip, self.isIOSSDKView {
-            let iOSSDKBundle = Bundle(for: FireworkVideoSDK.self)
-
-            for imageName in FWImageNamesWithDirections {
-                let targetImage = UIImage(named: imageName, in: iOSSDKBundle, compatibleWith: nil)
-                if image.isEqual(targetImage) {
-                    return true
-                }
-
-                if let cgImage = image.cgImage,
-                   let targetCgImage = targetImage?.cgImage,
-                   cgImage == targetCgImage {
-                    return true
-                }
-
-                if let ciImage = image.ciImage,
-                   let targetCiImage = targetImage?.ciImage,
-                   ciImage == targetCiImage {
-                    return true
-                }
-            }
-        }
-
         if AppLanguageManager.shared.shouldHorizontalFlip,
            image.flipsForRightToLeftLayoutDirection == true,
            self.isIOSSDKView {

package/ios/FireworkVideoUI/Podfile

@@ -6,7 +6,7 @@ target 'FireworkVideoUI' do
   use_frameworks!
 
   # Pods for FireworkVideoUI
-  pod 'FireworkVideo', '1.9.0'
+  pod 'FireworkVideo', '1.11.0'
 
   target 'FireworkVideoUITests' do
     # Pods for testing

package/ios/FireworkVideoUI/Podfile.lock

@@ -1,16 +1,16 @@
 PODS:
-  - FireworkVideo (1.9.0)
+  - FireworkVideo (1.11.0)
 
 DEPENDENCIES:
-  - FireworkVideo (= 1.9.0)
+  - FireworkVideo (= 1.11.0)
 
 SPEC REPOS:
   trunk:
     - FireworkVideo
 
 SPEC CHECKSUMS:
-  FireworkVideo: 77edd3eb890c09a0656c8599bee874a38aefec53
+  FireworkVideo: d37d9b94d8bc8069c42a3f06b4b9da97ea3b7e60
 
-PODFILE CHECKSUM: fc28c17eb5d44ab66c794e84553cdc6abe3b5426
+PODFILE CHECKSUM: 19727e7fd482efd91e8a58ce9db72b1ded933875
 
 COCOAPODS: 1.12.1

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

@@ -13,6 +13,7 @@ extension RCTConvert {
     static func videoPlayerContentConfiguration(_ config: [String: AnyObject])
         -> VideoPlayerContentConfiguration? {
         let videoPlayerConfig = RCTConvert.videoPlayerConfiguration(config)
+
         let finalConfig = VideoFeed.convertToVideoPlayerContentConfiguration(videoPlayerConfig)
 
         return finalConfig

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

@@ -14,7 +14,8 @@ extension StoryBlockSourceType {
             "channel": .channel,
             "playlist": .playlist,
             "dynamicContent": .dynamicContent,
-            "hashtagPlaylist": .hashtagPlaylist
+            "hashtagPlaylist": .hashtagPlaylist,
+            "sku": .sku
         ]
     }
 }
@@ -28,4 +29,18 @@ extension RCTConvert {
 
         return StoryBlockSourceType.sourceTypeMapper[rType] ?? .discover
     }
+
+    public static func storyBlockConfiguration(_ config: [String: AnyObject]?)
+        -> StoryBlockConfiguration? {
+        guard let rConfig = config else {
+            return nil
+        }
+
+        let jsonData = try? JSONSerialization.data(withJSONObject: rConfig, options: .prettyPrinted)
+        guard let rJsonData = jsonData else {
+            return nil
+        }
+
+        return try? JSONDecoder().decode(StoryBlockConfiguration.self, from: rJsonData)
+    }
 }

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

@@ -16,7 +16,8 @@ extension VideFeedSourceType {
             "playlist": .playlist,
             "playlistGroup": .playlistGroup,
             "dynamicContent": .dynamicContent,
-            "hashtagPlaylist": .hashtagPlaylist
+            "hashtagPlaylist": .hashtagPlaylist,
+            "sku": .sku
         ]
     }
 }

package/ios/Modules/FireworkSDKModule/FireworkSDKModule.swift

@@ -87,8 +87,8 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
         guard let urlString = URL.init(string: url) else {
             return
         }
-
-        let vpcConfig = RCTConvert.videoPlayerContentConfiguration(config)
+        let videoPlayerConfig = RCTConvert.videoPlayerConfiguration(config)
+        let vpcConfig = VideoFeed.convertToVideoPlayerContentConfiguration(videoPlayerConfig)
 
         var feedContentConfig = VideoFeedContentConfiguration()
         if let vpcConfig = vpcConfig {
@@ -103,9 +103,13 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
             return
         }
 
-        VideoFeedViewController.openVideoPlayer(with: urlString, feedContentConfig, presentedVC) { _ in
+        VideoFeedViewController.openVideoPlayer(
+            with: urlString,
+            feedContentConfig,
+            presentedVC,
+            videoPlayerConfig?.enablePictureInPicture ?? true) { _ in
 
-        }
+            }
     }
 
     @objc(setCustomCTAClickEnabled:)

package/ios/Modules/Shopping/ShoppingModule.swift

@@ -11,7 +11,7 @@ import FireworkVideo
 import Foundation
 
 @objc(ShoppingModule)
-class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate, CartViewControllerProviding {
+class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate {
 
     private var productInfoViewConfigurator: (Int, ProductInfoViewConfigurable)?
     private var shoppingCTAHandlerMap: [Int: ShoppingCTAHandler] = [:]
@@ -47,7 +47,7 @@ class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate, CartViewCo
     func initializeSDK(_ resolver: RCTPromiseResolveBlock,
                        rejecter: RCTPromiseRejectBlock) {
         FireworkVideoSDK.shopping.shoppingDelegate = self
-        FireworkVideoSDK.shopping.cartViewControllerProvider = self
+        FireworkVideoSDK.shopping.cartAction = .custom
         resolver([:])
     }
 
@@ -291,11 +291,12 @@ class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate, CartViewCo
         return customClickLinkButtonEnabled
     }
 
-    // MARK: - CartViewControllerProviding
-    func cartViewController(for video: VideoDetails) -> FireworkVideo.CartViewController {
+    func fireworkShopping(
+        _ fireworkShopping: FireworkVideoShopping,
+        didTapCartIconForVideo videoDetails: VideoDetails
+    ) {
         sendEvent(
             withName: ShoppingEventName.clickCartIcon.rawValue, body: [:])
-        return FWCartViewController()
     }
 }
 

package/ios/react_native_firework_sdk.h

@@ -9,6 +9,5 @@
 #define react_native_firework_sdk_h
 
 #import <React/RCTConvert.h>
-#import "FWSwizzleLoader.h"
 
 #endif /* react_native_firework_sdk_h */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-firework-sdk",
-  "version": "2.3.0",
+  "version": "2.4.0-beta.1",
   "description": "Firework React Native SDK",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -31,7 +31,7 @@
     "test": "jest",
     "typescript": "tsc --noEmit",
     "lint": "eslint \"**/*.{js,ts,tsx}\"",
-    "prepare": "bob build",
+    "build": "bob build",
     "generate-doc": "rm -rf docs && npx typedoc",
     "prettier": "npx prettier --write \"{src,example}/**/*.{ts,tsx}\""
   },

package/react-native-firework-sdk.podspec

@@ -35,5 +35,5 @@ fi
 
   s.static_framework = true
   s.dependency 'React-Core'
-  s.dependency 'FireworkVideo', '1.10.0'
+  s.dependency 'FireworkVideo', '1.11.0'
 end

package/src/FireworkSDK.ts

@@ -13,7 +13,6 @@ import type {
 import type SDKInitOptions from './models/SDKInitOptions';
 import type { VideoLaunchBehavior } from './models/SDKInitOptions';
 import type TrackPurchaseParameters from './models/TrackPurchaseParameters';
-import type VideoPlayerConfiguration from './models/VideoPlayerConfiguration';
 import FireworkSDKModule, {
   FireworkSDKModuleEventEmitter,
 } from './modules/FireworkSDKModule';
@@ -22,6 +21,7 @@ import ShoppingModule from './modules/ShoppingModule';
 import FWLoggerUtil from './utils/FWLoggerUtil';
 import VideoShopping from './VideoShopping';
 import FWGlobalState from './utils/FWGlobalState';
+import type OpenVideoPlayerConfiguration from './models/OpenVideoPlayerConfiguration';
 
 export type SDKInitCallback = (event: SDKInitEvent) => Promise<void> | void;
 export type CustomCTAClickCallback = (
@@ -256,7 +256,7 @@ class FireworkSDK {
    */
   public async openVideoPlayer(
     url: string,
-    config?: VideoPlayerConfiguration
+    config?: OpenVideoPlayerConfiguration
   ): Promise<void> {
     if (!FWGlobalState.getInstance().sdkInitCalled) {
       await FWGlobalState.getInstance().sdkInitCalledPromise;

package/src/components/StoryBlock.tsx

@@ -23,6 +23,7 @@ import type AdConfiguration from '../models/AdConfiguration';
 import type FWError from '../models/FWError';
 import { FWEventName } from '../models/FWEventName';
 import type { StoryBlockConfiguration } from '../models/StoryBlockConfiguration';
+import type StoryBlockNativeConfiguration from '../models/StoryBlockNativeConfiguration';
 import type { StoryBlockSource } from '../models/StoryBlockSource';
 import { FireworkSDKModuleEventEmitter } from '../modules/FireworkSDKModule';
 import FWGlobalState from '../utils/FWGlobalState';
@@ -73,10 +74,18 @@ export interface IStoryBlockProps {
    * Non-UTF-8 characters are not allowed. If using boolean predicates, the expression needs to be wrapped with parenthesis.
    */
   hashtagFilterExpression?: string;
+  /**
+   * Product ids used to generate the sku feed
+   */
+  productIds?: string[];
   /**
    * Specifies if Picture in Picture is enabled. Only supported on iOS.
    */
   enablePictureInPicture?: boolean;
+  /**
+   * The corner radius of story block.
+   */
+  cornerRadius?: number;
   /**
    * Ad configuration of the feed. Only supported on iOS.
    */
@@ -157,7 +166,7 @@ const StoryBlock: ForwardRefRenderFunction<
 
   const generateVastAttributesString = () => {
     const { adConfiguration } = props;
-    const vastAttributes = adConfiguration?.vastAttributes ?? '';
+    const vastAttributes = adConfiguration?.vastAttributes;
     if (!vastAttributes) {
       return '';
     }
@@ -173,53 +182,67 @@ const StoryBlock: ForwardRefRenderFunction<
     return resultString;
   };
 
+  const getStoryBlockConfiguration: () =>
+    | StoryBlockNativeConfiguration
+    | undefined = () => {
+    const { storyBlockConfiguration, enablePictureInPicture } = props;
+    let resultStoryBlockConfiguration:
+      | StoryBlockNativeConfiguration
+      | undefined = storyBlockConfiguration;
+    if (typeof enablePictureInPicture === 'boolean') {
+      if (!resultStoryBlockConfiguration) {
+        resultStoryBlockConfiguration = {};
+      }
+      resultStoryBlockConfiguration = {
+        ...resultStoryBlockConfiguration,
+        enablePictureInPicture,
+      };
+    }
+    return resultStoryBlockConfiguration;
+  };
+  const storyBlockConfiguration = getStoryBlockConfiguration();
+
   const generateKey = (): string => {
-    const gShareBaseURL = FireworkSDK.getInstance().shareBaseURL ?? '';
-    const appLanguage = FireworkSDK.getInstance().appLanguage ?? '';
-    const videoLaunchBehavior =
-      FireworkSDK.getInstance().videoLaunchBehavior ?? '';
-    const adBadgeConfiguration =
-      FireworkSDK.getInstance().adBadgeConfiguration ?? {};
-    const adBadgeTextType = adBadgeConfiguration.badgeTextType ?? '';
-    const backgroundColorOfAdBadge = adBadgeConfiguration.backgroundColor ?? '';
-    const textColorOfAdBadge = adBadgeConfiguration.textColor ?? '';
+    const gShareBaseURL = FireworkSDK.getInstance().shareBaseURL;
+    const appLanguage = FireworkSDK.getInstance().appLanguage;
+    const videoLaunchBehavior = FireworkSDK.getInstance().videoLaunchBehavior;
+    const adBadgeConfiguration = FireworkSDK.getInstance().adBadgeConfiguration;
+    const adBadgeTextType = adBadgeConfiguration?.badgeTextType;
+    const backgroundColorOfAdBadge = adBadgeConfiguration?.backgroundColor;
+    const textColorOfAdBadge = adBadgeConfiguration?.textColor;
     const androidFontIsCustomOfAdBadge =
-      adBadgeConfiguration.androidFontInfo?.isCustom?.toString() ?? '';
+      adBadgeConfiguration?.androidFontInfo?.isCustom;
     const androidFontTypefaceNameOfAdBadge =
-      adBadgeConfiguration.androidFontInfo?.typefaceName ?? '';
+      adBadgeConfiguration?.androidFontInfo?.typefaceName;
 
     const {
       source,
-      channel = '',
-      playlist = '',
-      hashtagFilterExpression = '',
-      enablePictureInPicture = false,
+      channel,
+      playlist,
+      hashtagFilterExpression,
+      productIds,
+      enablePictureInPicture,
+      cornerRadius,
       adConfiguration,
-      storyBlockConfiguration,
     } = props;
     const dynamicContentParametersString =
       generateDynamicContentParametersString();
 
-    const videoCompleteAction =
-      storyBlockConfiguration?.videoCompleteAction ?? '';
-    const showShareButton =
-      storyBlockConfiguration?.showShareButton?.toString() ?? '';
-    const showPlaybackButton =
-      storyBlockConfiguration?.showPlaybackButton?.toString() ?? '';
-    const showBranding =
-      storyBlockConfiguration?.showBranding?.toString() ?? '';
-    const ctaDelayType = storyBlockConfiguration?.ctaDelay?.type ?? '';
-    const ctaDelayValue =
-      storyBlockConfiguration?.ctaDelay?.value?.toFixed(5) ?? '';
+    const videoCompleteAction = storyBlockConfiguration?.videoCompleteAction;
+    const showShareButton = storyBlockConfiguration?.showShareButton;
+    const showPlaybackButton = storyBlockConfiguration?.showPlaybackButton;
+    const showBranding = storyBlockConfiguration?.showBranding;
+    const ctaDelayType = storyBlockConfiguration?.ctaDelay?.type;
+    const ctaDelayValue = storyBlockConfiguration?.ctaDelay?.value?.toFixed(5);
     const ctaHighlightDelayType =
-      storyBlockConfiguration?.ctaHighlightDelay?.type ?? '';
+      storyBlockConfiguration?.ctaHighlightDelay?.type;
     const ctaHighlightDelayValue =
-      storyBlockConfiguration?.ctaHighlightDelay?.value?.toFixed(5) ?? '';
-    const shareBaseURL = storyBlockConfiguration?.shareBaseURL ?? '';
-    const ctaWidth = storyBlockConfiguration?.ctaWidth ?? '';
+      storyBlockConfiguration?.ctaHighlightDelay?.value?.toFixed(5);
+    const shareBaseURL = storyBlockConfiguration?.shareBaseURL;
+    const ctaWidth = storyBlockConfiguration?.ctaWidth;
 
-    const requiresAds = adConfiguration?.requiresAds?.toString() ?? '';
-    const adsFetchTimeout = adConfiguration?.adsFetchTimeout ?? 10;
+    const requiresAds = adConfiguration?.requiresAds;
+    const adsFetchTimeout = adConfiguration?.adsFetchTimeout;
     const vastAttributesString = generateVastAttributesString();
 
     let key = `gShareBaseURL:${gShareBaseURL}`;
@@ -240,7 +263,9 @@ const StoryBlock: ForwardRefRenderFunction<
     key += `_playlist:${playlist}`;
     key += `_dynamicContentParameters:${dynamicContentParametersString}`;
     key += `_hashtagFilterExpression:${hashtagFilterExpression}`;
+    key += `productIds:${productIds?.join(',')}`;
     key += `_enablePictureInPicture:${enablePictureInPicture}`;
+    key += `_cornerRadius:${cornerRadius}`;
 
     key += `_shareBaseURL:${shareBaseURL}`;
     if (Platform.OS === 'android') {
@@ -386,12 +411,16 @@ const StoryBlock: ForwardRefRenderFunction<
   if (!sdkInitCalled) {
     return null;
   }
-
+  const { style, cornerRadius, ...otherProps } = props;
   return (
     <FWStoryBlock
       ref={nativeComponentRef}
       key={key}
-      {...props}
+      {...otherProps}
+      cornerRadius={cornerRadius}
+      style={Object.assign({ borderRadius: cornerRadius }, style)}
+      storyBlockConfiguration={storyBlockConfiguration}
+      enablePictureInPicture={undefined}
       onStoryBlockLoadFinished={handleStoryBlockLoadFinished}
       onStoryBlockFullScreenStateChanged={
         handleStoryBlockFullScreenStateChanged