react-native-firework-sdk 2.1.0 → 2.2.0

package/ios/Components/StoryBlockManager.swift

@@ -7,10 +7,14 @@
 
 import FireworkVideo
 import Foundation
+#if canImport(FireworkVideoUI)
+import FireworkVideoUI
+#endif
 
 @objc(StoryBlockManager)
 class StoryBlockManager: RCTViewManager, StoryBlockViewDelegate {
     override func view() -> UIView! {
+        _ = AppLanguageManager.shared
         let storyBlock = StoryBlock()
         storyBlock.delegate = self
 

package/ios/Components/VideoFeed.swift

@@ -9,6 +9,9 @@
 
 import FireworkVideo
 import UIKit
+#if canImport(FireworkVideoUI)
+import FireworkVideoUI
+#endif
 
 @objc
 public enum VideoFeedMode: Int {
@@ -17,7 +20,7 @@ public enum VideoFeedMode: Int {
 
 @objc
 public enum VideFeedSourceType: Int {
-    case discover, channel, playlist, playlistGroup, dynamicContent
+    case discover, channel, playlist, playlistGroup, dynamicContent, hashtagPlaylist
 }
 
 public protocol VideoFeedViewDelegate: AnyObject {
@@ -36,6 +39,7 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
     @objc public var playlist: String = ""
     @objc public var playlistGroup: String = ""
     @objc public var dynamicContentParameters: NSDictionary = NSDictionary()
+    @objc public var hashtagFilterExpression: String = ""
     @objc public var mode: VideoFeedMode = .row
     @objc public var feedViewConfig: VideoFeedConfiguration? {
         didSet {
@@ -76,6 +80,8 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
         case .dynamicContent:
             let parameters = dynamicContentParameters as? [String: [String]]
             return .dynamicContent(channelID: channel, parameters: parameters ?? [:])
+        case .hashtagPlaylist:
+            return .hashtagPlaylist(channelID: channel, filterExpression: hashtagFilterExpression)
         }
     }
 
@@ -137,7 +143,7 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
     }
 
     private func embed() {
-        guard let parentVC = fwParentViewController else {
+        guard let parentVC = parentViewController else {
             return
         }
         guard self.feedVC == nil else {
@@ -188,10 +194,6 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
             feedVC.isPictureInPictureEnabled = true
         }
 
-        if FWAppLanguageManager.shared.shouldHorizontalFlip {
-            feedVC.view.fwrtl_viewType = FWRTLViewTypeFlip
-        }
-
         feedVC.delegate = self
         self.feedVC = feedVC
         parentVC.attachChild(feedVC, to: self)
@@ -347,8 +349,10 @@ extension VideoFeed {
             vpcConfig.videoDetail.fireworkAttribution.isHidden = !showBranding
         }
 
-        if let shareBaseUrl = gShareBaseURL {
-            vpcConfig.shareButton.behavior.baseURL = URL(string: shareBaseUrl)
+        if let shareBaseURL = config.shareBaseURL {
+            vpcConfig.shareButton.behavior.baseURL = URL(string: shareBaseURL)
+        } else if let shareBaseURL = gShareBaseURL {
+            vpcConfig.shareButton.behavior.baseURL = URL(string: shareBaseURL)
         }
 
         if let ctaDelay = config.ctaDelay,

package/ios/Components/VideoFeedManager.m

@@ -28,6 +28,7 @@ RCT_EXPORT_VIEW_PROPERTY(channel, NSString)
 RCT_EXPORT_VIEW_PROPERTY(playlist, NSString)
 RCT_EXPORT_VIEW_PROPERTY(playlistGroup, NSString)
 RCT_EXPORT_VIEW_PROPERTY(dynamicContentParameters, NSDictionary)
+RCT_EXPORT_VIEW_PROPERTY(hashtagFilterExpression, NSString)
 
 RCT_CUSTOM_VIEW_PROPERTY(mode, VideoFeedMode, VideoFeed) {
     if (json) {

package/ios/Components/VideoFeedManager.swift

@@ -8,11 +8,15 @@
 
 import FireworkVideo
 import Foundation
+#if canImport(FireworkVideoUI)
+import FireworkVideoUI
+#endif
 
 @objc(VideoFeedManager)
 class VideoFeedManager: RCTViewManager, VideoFeedViewDelegate {
 
     override func view() -> UIView! {
+        _ = AppLanguageManager.shared
         let videFeed = VideoFeed()
         videFeed.delegate = self
 

package/ios/Components/VideoPlayerConfiguration.swift

@@ -18,6 +18,7 @@ public class VideoPlayerConfiguration: NSObject, Codable {
     var showBranding: Bool?
     var ctaDelay: VideoPlayerCTADelay?
     var ctaHighlightDelay: VideoPlayerCTADelay?
+    var shareBaseURL: String?
 
     public enum VideoPlayerStyle: String, Codable {
         case full, fit