react-native-firework-sdk 2.15.3 → 2.16.0

package/android/gradle.properties

@@ -6,4 +6,4 @@ FireworkSDK_minSdkVersion=21
 FireworkSDK_compileSdkVersion=33
 FireworkSDK_targetSdkVersion=33
 FireworkSDK_fwPlayerLaunchMode=singleTask
-FireworkSDK_fwNativeVersion=6.16.5
+FireworkSDK_fwNativeVersion=6.18.11

package/android/src/main/java/com/fireworksdk/bridge/components/videofeed/FWVideoFeed.kt

@@ -2,7 +2,6 @@ package com.fireworksdk.bridge.components.videofeed
 
 import android.content.Context
 import android.util.AttributeSet
-import android.view.ViewGroup
 import android.widget.FrameLayout
 import com.firework.error.FwErrorListener
 import com.firework.videofeed.FeedViewStateListener
@@ -29,7 +28,7 @@ class FWVideoFeed(
   init {
     FWLanguageUtil.getInstance(context).updateBaseContextLocale(context)
     videoFeedView.layoutDirection = LAYOUT_DIRECTION_LOCALE
-    addView(videoFeedView, LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT))
+    addView(videoFeedView, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
   }
 
   fun setVideoFeedLayoutParams(l: LayoutParams?) {

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

@@ -0,0 +1,7 @@
+package com.fireworksdk.bridge.models
+
+data class FWShoppingCustomCta(
+  val url: String,
+  val titleKey: String,
+  val title: String,
+)

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

@@ -12,6 +12,7 @@ data class FWVideoFeedConfigModel(
   val enableAutoplay: Boolean? = null,
   val gridColumns: Int? = null,
   val itemSpacing: Int? = null,
+  val aspectRatio: Double? = null,
 ) {
 
   data class FWTitleModel(

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

@@ -7,6 +7,7 @@ object FWVideoFeedConfigModelDeserializer {
 
   private const val BACKGROUND_COLOR_KEY = "backgroundColor"
   private const val CORNER_RADIUS_KEY = "cornerRadius"
+  private const val ASPECT_RATIO_KEY = "aspectRatio"
   private const val TITLE_KEY = "title"
   private const val TITLE_POSITION_KEY = "titlePosition"
   private const val PLAY_ICON_KEY = "playIcon"
@@ -29,6 +30,7 @@ object FWVideoFeedConfigModelDeserializer {
 
     val backgroundColor = if (responseJson.has(BACKGROUND_COLOR_KEY)) responseJson.optString(BACKGROUND_COLOR_KEY) else null
     val cornerRadius = if (!responseJson.isNull(CORNER_RADIUS_KEY)) responseJson.optInt(CORNER_RADIUS_KEY) else null
+    val aspectRatio = if (!responseJson.isNull(ASPECT_RATIO_KEY)) responseJson.optDouble(ASPECT_RATIO_KEY) else null
     val title = if (responseJson.has(TITLE_KEY)) deserializeTitle(responseJson.optJSONObject(TITLE_KEY)) else null
     val titlePosition = if (responseJson.has(TITLE_POSITION_KEY)) responseJson.optString(TITLE_POSITION_KEY) else null
     val playIcon = if (responseJson.has(PLAY_ICON_KEY)) deserializePlayIcon(responseJson.optJSONObject(PLAY_ICON_KEY)) else null
@@ -47,6 +49,7 @@ object FWVideoFeedConfigModelDeserializer {
       enableAutoplay = enableAutoplay,
       gridColumns = gridColumns,
       itemSpacing = itemSpacing,
+      aspectRatio = aspectRatio,
     )
   }
 

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

@@ -7,6 +7,7 @@ object FWVideoFeedConfigModelSerializer {
 
   private const val BACKGROUND_COLOR_KEY = "backgroundColor"
   private const val CORNER_RADIUS_KEY = "cornerRadius"
+  private const val ASPECT_RATIO_KEY = "aspectRatio"
   private const val TITLE_KEY = "title"
   private const val TITLE_POSITION_KEY = "titlePosition"
   private const val PLAY_ICON_KEY = "playIcon"
@@ -29,6 +30,7 @@ object FWVideoFeedConfigModelSerializer {
     val jsonObject = JSONObject()
     jsonObject.put(BACKGROUND_COLOR_KEY, model.backgroundColor)
     jsonObject.put(CORNER_RADIUS_KEY, model.cornerRadius)
+    jsonObject.put(ASPECT_RATIO_KEY, model.aspectRatio)
     jsonObject.put(TITLE_KEY, serializeTitle(model.title))
     jsonObject.put(TITLE_POSITION_KEY, FWVideoFeedTitlePosition.serialize(model.titlePosition))
     jsonObject.put(PLAY_ICON_KEY, serializePlayIcon(model.playIcon))

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

@@ -27,6 +27,7 @@ data class FWVideoPlayerConfigModel(
   val showFullScreenIcon: Boolean? = null,
   val enableAutoPlay: Boolean? = null,
   val enableAutoPause: Boolean? = null,
+  val enableSmallSizeInCompact: Boolean? = null
 ) {
 
   data class FWCtaButtonStyleModel(

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

@@ -38,6 +38,7 @@ object FWVideoPlayerConfigModelDeserializer {
   private const val SHOW_FULL_SCREEN_ICON = "enableFullScreen"
   private const val ENABLE_AUTOPLAY = "enableAutoplay"
   private const val ENABLE_AUTOPAUSE = "enableAutopause"
+  private const val ENABLE_SMALL_SIZE_IN_COMPACT = "enableSmallSizeInCompact"
 
   fun deserialize(responseJson: JSONObject?): FWVideoPlayerConfigModel? {
     responseJson ?: return null
@@ -66,6 +67,8 @@ object FWVideoPlayerConfigModelDeserializer {
       if (responseJson.has(ENABLE_AUTOPLAY)) responseJson.optBoolean(ENABLE_AUTOPLAY) else null
     val enableAutoPause =
       if (responseJson.has(ENABLE_AUTOPAUSE)) responseJson.optBoolean(ENABLE_AUTOPAUSE) else null
+    val enableSmallSizeInCompact =
+      if (responseJson.has(ENABLE_SMALL_SIZE_IN_COMPACT)) responseJson.optBoolean(ENABLE_SMALL_SIZE_IN_COMPACT) else null
 
     return FWVideoPlayerConfigModel(
       playerStyle = if (!playerStyle.isNullOrBlank()) FWPlayerStyle.deserialize(playerStyle) else null,
@@ -88,7 +91,8 @@ object FWVideoPlayerConfigModelDeserializer {
       cancelButtonStyle = FWActionButtonDeserializer.deserialize(cancelButtonStyleJsonObject),
       showFullScreenIcon = showFullScreenIcon,
       enableAutoPlay = enableAutoPlay,
-      enableAutoPause = enableAutoPause
+      enableAutoPause = enableAutoPause,
+      enableSmallSizeInCompact = enableSmallSizeInCompact
     )
   }
 

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

@@ -38,6 +38,7 @@ object FWVideoPlayerConfigModelSerializer {
   private const val SHOW_FULL_SCREEN_ICON = "enableFullScreen"
   private const val ENABLE_AUTOPLAY = "enableAutoplay"
   private const val ENABLE_AUTOPAUSE = "enableAutopause"
+  private const val ENABLE_SMALL_SIZE_IN_COMPACT = "enableSmallSizeInCompact"
 
 
   fun serialize(model: FWVideoPlayerConfigModel?): JSONObject? {
@@ -64,6 +65,7 @@ object FWVideoPlayerConfigModelSerializer {
     jsonObject.put(SHOW_FULL_SCREEN_ICON, model.showFullScreenIcon)
     jsonObject.put(ENABLE_AUTOPLAY, model.enableAutoPlay)
     jsonObject.put(ENABLE_AUTOPAUSE, model.enableAutoPause)
+    jsonObject.put(ENABLE_SMALL_SIZE_IN_COMPACT, model.enableSmallSizeInCompact)
     return jsonObject
   }
 

package/android/src/main/java/com/fireworksdk/bridge/models/enums/FWEventName.kt

@@ -7,6 +7,7 @@ enum class FWEventName(val rawValue: String) {
   VideoFeedClick("fw:video-feed-click"),
   LiveStream("fw:livestream"),
   LiveStreamChat("fw:livestream-chat"),
+  LiveStreamLinkInteractionClick("fw:livestream:custom-link-interaction-click"),
   LogMessage("fw:log-message"),
   CustomShareURL("fw:custom-share-url")
 }

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

@@ -289,8 +289,16 @@ class FWVideoShoppingModule(
       ctaHandler = Triple(callbackId, productId, unitId)
 
       val videoPlaybackDetails = FWModelUtils.convertVideoInfo2PlaybackDetails(videoInfo)
-
-      FWEventUtils.sendShoppingCtaButtonClickEvent(reactApplicationContext, productId, unitId, productWebUrl, videoPlaybackDetails, callbackId)
+      val customCtaDetails = FWModelUtils.convertVideoInfo2CustomCta(product)
+
+      FWEventUtils.sendShoppingCtaButtonClickEvent(
+        reactContext = reactApplicationContext,
+        productId = productId,
+        unitId = unitId,
+        url = productWebUrl,
+        info = videoPlaybackDetails,
+        customCta = customCtaDetails,
+        callbackId = callbackId)
     }
 
     FireworkSdk.shopping.setOnShoppingErrorListener(

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

@@ -90,6 +90,14 @@ object FWEventUtils {
     return contentMap
   }
 
+  private fun convertCustomCta2Map(info: FWShoppingCustomCta): WritableMap {
+    val contentMap = Arguments.createMap()
+    contentMap.putString("url", info.url)
+    contentMap.putString("titleKey", info.titleKey)
+    contentMap.putString("title", info.title)
+    return contentMap
+  }
+
   private fun convertVideoPlaybackDetails2Map(info: FWVideoPlaybackDetails?): WritableMap {
     val contentMap = Arguments.createMap()
     if (!info?.id.isNullOrBlank()) {
@@ -129,13 +137,24 @@ object FWEventUtils {
     return contentMap;
   }
 
-  fun sendShoppingCtaButtonClickEvent(reactContext: ReactContext, productId: String?, unitId: String?, url: String?, info: FWVideoPlaybackDetails?, callbackId: Int?) {
+  fun sendShoppingCtaButtonClickEvent(
+    reactContext: ReactContext,
+    productId: String?,
+    unitId: String?,
+    url: String?,
+    info: FWVideoPlaybackDetails?,
+    customCta: FWShoppingCustomCta?,
+    callbackId: Int?
+  ) {
     val eventMap = Arguments.createMap()
     eventMap.putString("productId", productId)
     eventMap.putString("unitId", unitId)
     eventMap.putString("url", url)
     eventMap.putInt("callbackId", callbackId?:0)
     eventMap.putMap("video", convertVideoPlaybackDetails2Map(info))
+    customCta?.let {
+      eventMap.putMap("customCTA", convertCustomCta2Map(it))
+    }
     sendEvent(reactContext, FWVideoShoppingEventName.CtaButtonClick.rawValue, eventMap)
   }
 

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

@@ -151,6 +151,11 @@ object FWConfigUtil {
         .roundedCornerRadius(FWCommonUtil.dpToPx(cornerRadius.toFloat(), context))
     }
 
+    val aspectRatio = videoFeedPropsModel.videoFeedConfiguration?.aspectRatio
+    if (aspectRatio != null && aspectRatio > 0) {
+      layoutOptionBuilder.aspectRatio(aspectRatio)
+    }
+
     val title = videoFeedPropsModel.videoFeedConfiguration?.title
     if (title != null) {
       val titleHidden = title.hidden
@@ -563,6 +568,8 @@ object FWConfigUtil {
       storyblockOptionBuilder.showFullScreenIcon(showFullScreenIcon)}
     videoFeedPropsModel.videoPlayerConfiguration?.enableAutoPause?.let { enableAutoPause ->
       storyblockOptionBuilder.enableAutoPause(enableAutoPause)}
+    videoFeedPropsModel.videoPlayerConfiguration?.enableSmallSizeInCompact?.let { enableSmallSizeInCompact ->
+      storyblockOptionBuilder.enableSmallSizeInCompact(enableSmallSizeInCompact)}
 
     playerOptionBuilder.shareUrlCustomCallBack(FWGlobalDataUtil.customShareUrlCallback)
 

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

@@ -5,7 +5,9 @@ import com.firework.analyticsevents.VideoType
 import com.firework.analyticsevents.cta.CtaButtonClickAnalyticsEvent
 import com.firework.analyticsevents.player.PlayerLifecycleAnalyticsEvent
 import com.firework.analyticsevents.share.ShareButtonAnalyticsEvent
+import com.firework.common.product.Product
 import com.fireworksdk.bridge.models.FWLiveStreamEventDetailsModel
+import com.fireworksdk.bridge.models.FWShoppingCustomCta
 import com.fireworksdk.bridge.models.FWVideoPlaybackDetails
 
 object FWModelUtils {
@@ -45,6 +47,21 @@ object FWModelUtils {
     )
   }
 
+  fun convertVideoInfo2CustomCta(product: Product?): FWShoppingCustomCta? {
+    val url = product?.customCTAUrl
+    val title = product?.customCTATitleTranslation
+    val titleKey = product?.customCTATitle
+    return if (!url.isNullOrBlank() && !titleKey.isNullOrBlank() && !title.isNullOrBlank() && product.isCustomCtaPrimary) {
+      FWShoppingCustomCta(
+        url = url,
+        titleKey = titleKey,
+        title = title,
+      )
+    } else {
+      null
+    }
+  }
+
   fun convertVideoInfo2LivestreamDetails(videoInfo: VideoInfo): FWLiveStreamEventDetailsModel {
     return FWLiveStreamEventDetailsModel(
       id = videoInfo.id,
@@ -101,4 +118,4 @@ object FWModelUtils {
     )
   }
 
-}
+}

package/ios/Components/StoryBlock.swift

@@ -79,7 +79,7 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate, PictureInPict
         case .sku:
             return .skuPlaylist(channelID: channel, productIDs: (productIds as? [String]) ?? [])
         case .singleContent:
-            return .singleContent(videoOrLiveStreamID: contentId)
+            return .singleContent(contentID: contentId)
         }
     }
     private var isInPip: Bool = false

package/ios/Components/VideoFeed.swift

@@ -105,7 +105,7 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate, PictureInPictur
         case .sku:
             return .skuPlaylist(channelID: channel, productIDs: (productIds as? [String]) ?? [])
         case .singleContent:
-            return .singleContent(videoOrLiveStreamID: contentId)
+            return .singleContent(contentID: contentId)
         }
     }
 

package/ios/Modules/FireworkSDKModule/FireworkSDKModule.swift

@@ -8,6 +8,7 @@
 
 import FireworkVideo
 import FireworkVideoUI
+import Network
 
 var gShareBaseURL: String?
 var gAdBadgeConfiguration: AdBadgeConfiguration?

package/ios/Modules/Shopping/ShoppingModule.swift

@@ -230,6 +230,18 @@ class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate {
         var body = item.jsObject
         body["callbackId"] = callbackId
         body["video"] = video.jsObject
+        if let product = item.product,
+           product.hasCustomPrimaryCTA,
+           let customCTA = product.customCTA,
+           let url = customCTA.url,
+           let title = customCTA.title,
+           let titleTranslation = customCTA.titleTranslation {
+            body["customCTA"] = [
+                "url": url,
+                "titleKey": title,
+                "title": titleTranslation
+            ]
+        }
         sendEvent(
             withName: ShoppingEventName.ctaButtonClick.rawValue,
             body: body)

package/lib/typescript/models/FWEvents.d.ts

@@ -46,6 +46,20 @@ export interface VideoPlaybackEvent {
 export interface VideoFeedClickEvent {
     info: FeedItemDetails;
 }
+export interface CustomCTA {
+    /**
+     * Action URL that is associated with this CTA
+     */
+    url: string;
+    /**
+     * The title key of the CTA, such as buy_now.
+     */
+    titleKey: string;
+    /**
+     * The title of the CTA, such as "Buy Now".
+     */
+    title: string;
+}
 export interface ShoppingCTAEvent {
     /**
      * The url for the product unit
@@ -63,6 +77,10 @@ export interface ShoppingCTAEvent {
      * The video playback details for the event.
      */
     video: VideoPlaybackDetails;
+    /**
+     * This property only has value when configuring a custom product primary CTA in the business portal.
+     */
+    customCTA?: CustomCTA;
 }
 export interface UpdateProductDetailsEvent {
     /**

package/lib/typescript/models/VideoPlayerConfiguration.d.ts

@@ -81,7 +81,6 @@ export default interface VideoPlayerConfiguration {
     replayBadgeConfiguration?: ReplayBadgeConfiguration;
     /**
      * Specifies countdown timer configuration.
-     * Only supported on iOS.
      */
     countdownTimerConfiguration?: CountdownTimerConfiguration;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-firework-sdk",
-  "version": "2.15.3",
+  "version": "2.16.0",
   "description": "Firework React Native SDK",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/react-native-firework-sdk.podspec

@@ -33,6 +33,6 @@ fi
   s.static_framework = true
 
   s.dependency 'React-Core'
-  s.dependency 'FireworkVideoUI', '0.2.14'
-  s.dependency 'FireworkVideo', '1.28.3'
+  s.dependency 'FireworkVideoUI', '0.2.15'
+  s.dependency 'FireworkVideo', '1.30.0'
 end

package/src/models/FWEvents.ts

@@ -55,6 +55,23 @@ export interface VideoFeedClickEvent {
   info: FeedItemDetails;
 }
 
+export interface CustomCTA {
+  /**
+   * Action URL that is associated with this CTA
+   */
+  url: string;
+
+  /**
+   * The title key of the CTA, such as buy_now.
+   */
+  titleKey: string;
+
+  /**
+   * The title of the CTA, such as "Buy Now".
+   */
+  title: string;
+}
+
 export interface ShoppingCTAEvent {
   /**
    * The url for the product unit
@@ -72,6 +89,11 @@ export interface ShoppingCTAEvent {
    * The video playback details for the event.
    */
   video: VideoPlaybackDetails;
+
+  /**
+   * This property only has value when configuring a custom product primary CTA in the business portal.
+   */
+  customCTA?: CustomCTA;
 }
 
 export interface UpdateProductDetailsEvent {

package/src/models/VideoPlayerConfiguration.ts

@@ -82,7 +82,6 @@ export default interface VideoPlayerConfiguration {
   replayBadgeConfiguration?: ReplayBadgeConfiguration;
   /**
    * Specifies countdown timer configuration.
-   * Only supported on iOS.
    */
   countdownTimerConfiguration?: CountdownTimerConfiguration;
 }