react-native-firework-sdk 2.8.6 → 2.9.0

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

@@ -0,0 +1,33 @@
+package com.fireworksdk.bridge.models
+
+import org.json.JSONObject
+
+object FWPlayerButtonConfigurationDeserializer {
+
+  private const val VIDEO_DETAIL_BUTTON_KEY = "videoDetailButton"
+  private const val CLOSE_BUTTON_KEY = "closeButton"
+  private const val MUTE_BUTTON_KEY = "muteButton"
+  private const val UNMUTE_BUTTON_KEY = "unmuteButton"
+  private const val PLAY_BUTTON_KEY = "playButton"
+  private const val PAUSE_BUTTON_KEY = "pauseButton"
+
+  fun deserialize(responseJson: JSONObject?): FWPlayerButtonConfigurationModel? {
+    responseJson ?: return null
+
+    val videoDetailButtonJsonObject = responseJson.optJSONObject(VIDEO_DETAIL_BUTTON_KEY)
+    val closeButtonJsonObject = responseJson.optJSONObject(CLOSE_BUTTON_KEY)
+    val muteButtonJsonObject = responseJson.optJSONObject(MUTE_BUTTON_KEY)
+    val unmuteButtonJsonObject = responseJson.optJSONObject(UNMUTE_BUTTON_KEY)
+    val playButtonJsonObject = responseJson.optJSONObject(PLAY_BUTTON_KEY)
+    val pauseButtonJsonObject = responseJson.optJSONObject(PAUSE_BUTTON_KEY)
+
+    return FWPlayerButtonConfigurationModel(
+      videoDetailButton = FWButtonInfoDeserializer.deserialize(videoDetailButtonJsonObject),
+      closeButton = FWButtonInfoDeserializer.deserialize(closeButtonJsonObject),
+      muteButton = FWButtonInfoDeserializer.deserialize(muteButtonJsonObject),
+      unmuteButton = FWButtonInfoDeserializer.deserialize(unmuteButtonJsonObject),
+      playButton = FWButtonInfoDeserializer.deserialize(playButtonJsonObject),
+      pauseButton = FWButtonInfoDeserializer.deserialize(pauseButtonJsonObject),
+    )
+  }
+}

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

@@ -0,0 +1,10 @@
+package com.fireworksdk.bridge.models
+
+data class FWPlayerButtonConfigurationModel(
+  val videoDetailButton: FWButtonInfoModel? = null,
+  val closeButton: FWButtonInfoModel? = null,
+  val muteButton: FWButtonInfoModel? = null,
+  val unmuteButton: FWButtonInfoModel? = null,
+  val playButton: FWButtonInfoModel? = null,
+  val pauseButton: FWButtonInfoModel? = null,
+)

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

@@ -0,0 +1,25 @@
+package com.fireworksdk.bridge.models
+
+import org.json.JSONObject
+
+object FWPlayerButtonConfigurationSerializer {
+
+  private const val VIDEO_DETAIL_BUTTON_KEY = "videoDetailButton"
+  private const val CLOSE_BUTTON_KEY = "closeButton"
+  private const val MUTE_BUTTON_KEY = "muteButton"
+  private const val UNMUTE_BUTTON_KEY = "unmuteButton"
+  private const val PLAY_BUTTON_KEY = "playButton"
+  private const val PAUSE_BUTTON_KEY = "pauseButton"
+
+  fun serialize(model: FWPlayerButtonConfigurationModel?): JSONObject? {
+    model ?: return null
+    val jsonObject = JSONObject()
+    jsonObject.put(VIDEO_DETAIL_BUTTON_KEY, FWButtonInfoSerializer.serialize(model.videoDetailButton))
+    jsonObject.put(CLOSE_BUTTON_KEY, FWButtonInfoSerializer.serialize(model.closeButton))
+    jsonObject.put(MUTE_BUTTON_KEY, FWButtonInfoSerializer.serialize(model.muteButton))
+    jsonObject.put(UNMUTE_BUTTON_KEY, FWButtonInfoSerializer.serialize(model.unmuteButton))
+    jsonObject.put(PLAY_BUTTON_KEY, FWButtonInfoSerializer.serialize(model.playButton))
+    jsonObject.put(PAUSE_BUTTON_KEY, FWButtonInfoSerializer.serialize(model.pauseButton))
+    return jsonObject
+  }
+}

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

@@ -24,5 +24,12 @@ data class FWProductInfoViewConfiguration(
   data class ProductCardConfiguration(
     val ctaButtonText: FWProductCardCtaButtonTextValue? = null,
     val theme: FWProductCardTheme? = null,
+    val cornerRadius: Int? = null,
+    val priceConfiguration: ProductCardPriceConfiguration? = null,
+    val isCtaButtonHidden: Boolean? = null,
+  )
+
+  data class ProductCardPriceConfiguration(
+    val isHidden: Boolean? = null,
   )
 }

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

@@ -20,6 +20,9 @@ object FWProductInfoViewConfigurationDeserializer {
 
   private const val CTA_BUTTON_TEXT_KEY = "ctaButtonText"
   private const val THEME_KEY = "theme"
+  private const val CORNER_RADIUS_KEY = "cornerRadius"
+  private const val PRICE_CONFIGURATION_KEY = "priceConfiguration"
+  private const val IS_CTA_BUTTON_HIDDEN_KEY = "isCtaButtonHidden"
 
   fun deserialize(responseJson: JSONObject?): FWProductInfoViewConfiguration? {
     responseJson ?: return null
@@ -66,11 +69,25 @@ object FWProductInfoViewConfigurationDeserializer {
 
     val ctaButtonTextString = if (productCardConfigJson.has(CTA_BUTTON_TEXT_KEY)) productCardConfigJson.optString(CTA_BUTTON_TEXT_KEY) else null
     val themeString = if (productCardConfigJson.has(THEME_KEY)) productCardConfigJson.optString(THEME_KEY) else null
+    val cornerRadius = if (productCardConfigJson.has(CORNER_RADIUS_KEY)) productCardConfigJson.optInt(CORNER_RADIUS_KEY) else null
+    val priceConfiguration = deserializeProductCardPriceConfiguration(productCardConfigJson.optJSONObject(PRICE_CONFIGURATION_KEY))
+    val isCtaButtonHidden = if (productCardConfigJson.has(IS_CTA_BUTTON_HIDDEN_KEY)) productCardConfigJson.optBoolean(IS_CTA_BUTTON_HIDDEN_KEY) else null
 
     return FWProductInfoViewConfiguration.ProductCardConfiguration(
       ctaButtonText = FWProductCardCtaButtonTextValue.deserialize(ctaButtonTextString),
       theme = FWProductCardTheme.deserialize(themeString),
+      cornerRadius = cornerRadius,
+      priceConfiguration = priceConfiguration,
+      isCtaButtonHidden = isCtaButtonHidden,
     )
   }
 
+  private fun deserializeProductCardPriceConfiguration(productCardPriceConfigurationJson: JSONObject?): FWProductInfoViewConfiguration.ProductCardPriceConfiguration {
+    productCardPriceConfigurationJson ?: return FWProductInfoViewConfiguration.ProductCardPriceConfiguration()
+    val isHidden = if (productCardPriceConfigurationJson.has(IS_HIDDEN_KEY)) productCardPriceConfigurationJson.optBoolean(IS_HIDDEN_KEY) else null
+
+    return FWProductInfoViewConfiguration.ProductCardPriceConfiguration(
+      isHidden = isHidden,
+    )
+  }
 }

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

@@ -18,6 +18,9 @@ object FWProductInfoViewConfigurationSerializer {
 
   private const val CTA_BUTTON_TEXT_KEY = "ctaButtonText"
   private const val THEME_KEY = "theme"
+  private const val CORNER_RADIUS_KEY = "cornerRadius"
+  private const val PRICE_CONFIGURATION_KEY = "priceConfiguration"
+  private const val IS_CTA_BUTTON_HIDDEN_KEY = "isCtaButtonHidden"
 
   fun serialize(model: FWProductInfoViewConfiguration?): JSONObject? {
     model ?: return null
@@ -50,6 +53,16 @@ object FWProductInfoViewConfigurationSerializer {
     val jsonObject = JSONObject()
     jsonObject.put(CTA_BUTTON_TEXT_KEY, model.ctaButtonText)
     jsonObject.put(THEME_KEY, model.theme)
+    jsonObject.put(CORNER_RADIUS_KEY, model.cornerRadius)
+    jsonObject.put(PRICE_CONFIGURATION_KEY, serializeProductCardPriceConfiguration(model.priceConfiguration))
+    jsonObject.put(IS_CTA_BUTTON_HIDDEN_KEY, model.isCtaButtonHidden)
+    return jsonObject
+  }
+
+  private fun serializeProductCardPriceConfiguration(model: FWProductInfoViewConfiguration.ProductCardPriceConfiguration?): JSONObject? {
+    model ?: return null
+    val jsonObject = JSONObject()
+    jsonObject.put(IS_HIDDEN_KEY, model.isHidden)
     return jsonObject
   }
 }

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

@@ -18,4 +18,5 @@ data class FWVideoFeedPropsModel(
   val dynamicContentParameters: Map<String, List<String>>? = null,
   val marginRight: Double? = null,
   val cornerRadius: Int? = null,
+  val adConfiguration: FWAdConfigurationModel? = null,
 )

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

@@ -17,6 +17,7 @@ object FWVideoFeedPropsModelDeserializer {
   private const val MODE_KEY = "mode"
   private const val MARGIN_RIGHT_KEY = "marginRight"
   private const val CORNER_RADIUS_KEY = "cornerRadius"
+  private const val AD_CONFIGURATION_KEY = "adConfiguration"
 
   private const val VIDEO_FEED_CONFIGURATION_KEY = "videoFeedConfiguration"
   private const val VIDEO_PLAYER_CONFIGURATION_KEY = "videoPlayerConfiguration"
@@ -81,6 +82,7 @@ object FWVideoFeedPropsModelDeserializer {
 
     val marginRight = if (responseJson.has(MARGIN_RIGHT_KEY)) responseJson.optDouble(MARGIN_RIGHT_KEY) else null
     val cornerRadius = if (!responseJson.isNull(CORNER_RADIUS_KEY)) responseJson.optInt(CORNER_RADIUS_KEY) else null
+    val adConfiguration = FWAdConfigurationDeserializer.deserialize(responseJson.optJSONObject(AD_CONFIGURATION_KEY))
 
     return FWVideoFeedPropsModel(
       source = if (!source.isNullOrBlank()) FWVideoFeedSource.deserialize(source) else null,
@@ -97,6 +99,7 @@ object FWVideoFeedPropsModelDeserializer {
       dynamicContentParameters = dynamicContentParameters,
       marginRight = marginRight,
       cornerRadius = cornerRadius,
+      adConfiguration = adConfiguration,
     )
   }
 }

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

@@ -18,6 +18,7 @@ object FWVideoFeedPropsModelSerializer {
   private const val MODE_KEY = "mode"
   private const val MARGIN_RIGHT_KEY = "marginRight"
   private const val CORNER_RADIUS_KEY = "cornerRadius"
+  private const val AD_CONFIGURATION_KEY = "adConfiguration"
 
   private const val VIDEO_FEED_CONFIGURATION_KEY = "videoFeedConfiguration"
   private const val VIDEO_PLAYER_CONFIGURATION_KEY = "videoPlayerConfiguration"
@@ -64,6 +65,7 @@ object FWVideoFeedPropsModelSerializer {
 
     jsonObject.put(MARGIN_RIGHT_KEY, model.marginRight)
     jsonObject.put(CORNER_RADIUS_KEY, model.cornerRadius)
+    jsonObject.put(AD_CONFIGURATION_KEY, FWAdConfigurationSerializer.serialize(model.adConfiguration))
 
     return jsonObject
   }

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

@@ -18,7 +18,9 @@ data class FWVideoPlayerConfigModel(
   val shareBaseUrl: String? = null,
   val ctaWidth: FWVideoPlayerCTAWidth? = null,
   val enablePictureInPicture: Boolean? = null,
-  ) {
+  val showVideoDetailTitle: Boolean? = null,
+  val buttonConfiguration: FWPlayerButtonConfigurationModel?
+) {
 
   data class FWCtaButtonStyleModel(
     val backgroundColor: String? = null,

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

@@ -20,6 +20,8 @@ object FWVideoPlayerConfigModelDeserializer {
   private const val SHARE_BASE_URL_KEY = "shareBaseURL"
   private const val CTA_WIDTH_KEY = "ctaWidth"
   private const val ENABLE_PIP_KEY = "enablePictureInPicture"
+  private const val SHOW_VIDEO_DETAIL_TITLE_KEY = "showVideoDetailTitle"
+  private const val BUTTON_CONFIGURATION_KEY = "buttonConfiguration"
 
   private const val BACKGROUND_COLOR_KEY = "backgroundColor"
   private const val FONT_SIZE_KEY = "fontSize"
@@ -43,6 +45,8 @@ object FWVideoPlayerConfigModelDeserializer {
     val shareBaseUrl = if (responseJson.has(SHARE_BASE_URL_KEY)) responseJson.optString(SHARE_BASE_URL_KEY) else null
     val ctaWidth = if (responseJson.has(CTA_WIDTH_KEY)) responseJson.optString(CTA_WIDTH_KEY) else null
     val enablePictureInPicture = if (responseJson.has(ENABLE_PIP_KEY)) responseJson.optBoolean(ENABLE_PIP_KEY) else null
+    val showVideoDetailTitle = if (responseJson.has(SHOW_VIDEO_DETAIL_TITLE_KEY)) responseJson.optBoolean(SHOW_VIDEO_DETAIL_TITLE_KEY) else null
+    val buttonConfigurationJsonObject = responseJson.optJSONObject(BUTTON_CONFIGURATION_KEY)
 
     return FWVideoPlayerConfigModel(
       playerStyle = if (!playerStyle.isNullOrBlank()) FWPlayerStyle.deserialize(playerStyle) else null,
@@ -56,7 +60,9 @@ object FWVideoPlayerConfigModelDeserializer {
       ctaHighlightDelay = ctaHighlightDelay,
       shareBaseUrl = shareBaseUrl,
       ctaWidth = if (!ctaWidth.isNullOrBlank()) FWVideoPlayerCTAWidth.deserialize(ctaWidth) else null,
-      enablePictureInPicture = enablePictureInPicture
+      enablePictureInPicture = enablePictureInPicture,
+      showVideoDetailTitle = showVideoDetailTitle,
+      buttonConfiguration = FWPlayerButtonConfigurationDeserializer.deserialize(buttonConfigurationJsonObject)
     )
   }
 

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

@@ -20,6 +20,8 @@ object FWVideoPlayerConfigModelSerializer {
   private const val SHARE_BASE_URL_KEY = "shareBaseURL"
   private const val CTA_WIDTH_KEY = "ctaWidth"
   private const val ENABLE_PIP_KEY = "enablePictureInPicture"
+  private const val SHOW_VIDEO_DETAIL_TITLE_KEY = "showVideoDetailTitle"
+  private const val BUTTON_CONFIGURATION_KEY = "buttonConfiguration"
 
   private const val BACKGROUND_COLOR_KEY = "backgroundColor"
   private const val FONT_SIZE_KEY = "fontSize"
@@ -43,6 +45,8 @@ object FWVideoPlayerConfigModelSerializer {
     jsonObject.put(SHARE_BASE_URL_KEY, model.shareBaseUrl)
     jsonObject.put(CTA_WIDTH_KEY, FWVideoPlayerCTAWidth.serialize(model.ctaWidth))
     jsonObject.put(ENABLE_PIP_KEY, model.enablePictureInPicture)
+    jsonObject.put(SHOW_VIDEO_DETAIL_TITLE_KEY, model.showVideoDetailTitle)
+    jsonObject.put(BUTTON_CONFIGURATION_KEY, FWPlayerButtonConfigurationSerializer.serialize(model.buttonConfiguration))
     return jsonObject
   }
 

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

@@ -0,0 +1,18 @@
+package com.fireworksdk.bridge.models.enums
+
+enum class FWErrorAction(val rawValue: String) {
+  LoadingFirstPage("loadingFirstPage"),
+  LoadingNextPage("loadingNextPage");
+
+  companion object {
+    fun deserialize(rawValue: String?): FWErrorAction? {
+      rawValue ?: return null
+      return FWErrorAction.values().first { it.rawValue == rawValue }
+    }
+
+    fun serialize(model: FWErrorAction?): String? {
+      model ?: return null
+      return model.rawValue
+    }
+  }
+}

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

@@ -16,6 +16,7 @@ enum class FWSDKInitSubEventName(val rawValue: String) {
 
 enum class FWFeedViewEventName(val rawValue: String) {
   VideoFeedLoadFinished("onVideoFeedLoadFinished"),
+  VideoFeedEmpty("onVideoFeedEmpty"),
 }
 
 enum class FWVideoPlaybackSubEventName(val rawValue: String) {
@@ -39,6 +40,7 @@ enum class FWVideoShoppingEventName(val rawValue: String) {
   UpdateProductDetails("fw:shopping:update-product-details"),
   WillDisplayProduct("fw:shopping:will-display-product"),
   CustomLinkButtonClick("fw:shopping:custom-link-button-click"),
+  CustomProductCardTap("fw:shopping:custom-product-card-tap"),
 }
 
 enum class FWLiveStreamEventName(val rawValue: String) {
@@ -50,5 +52,6 @@ enum class FWLiveStreamEventName(val rawValue: String) {
 
 enum class FWStoryBlockEventName(val rawValue: String) {
   StoryBlockLoadFinished("onStoryBlockLoadFinished"),
+  StoryBlockEmpty("onStoryBlockEmpty"),
   StoryBlockFullScreenStateChanged("onStoryBlockFullScreenStateChanged"),
 }

package/android/src/main/java/com/fireworksdk/bridge/reactnative/manager/FWStoryBlockManager.kt

@@ -10,6 +10,7 @@ import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
+import com.firework.error.storyblock.StoryBlockError
 import com.firework.storyblock.FeedLoadState
 import com.fireworksdk.bridge.components.storyblock.StoryBlockFragment
 import com.fireworksdk.bridge.components.storyblock.StoryBlockFrameLayout
@@ -18,9 +19,7 @@ import com.fireworksdk.bridge.models.enums.FWStoryBlockEventName
 import com.fireworksdk.bridge.models.enums.FWVideoFeedSource
 import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
 import com.fireworksdk.bridge.utils.FWFragmentUtil
-import com.fireworksdk.bridge.utils.FWGlobalDataUtil
 import com.fireworksdk.bridge.utils.FWLogUtils
-import com.fireworksdk.bridge.utils.FWStoryBlockUtil
 import org.json.JSONObject
 
 
@@ -48,7 +47,9 @@ class FWStoryBlockManager : ViewGroupManager<StoryBlockFrameLayout>() {
     map["create"] = COMMAND_CREATE
     map["play"] = COMMAND_PLAY
     map["pause"] = COMMAND_PAUSE
-    map["toggleFullScreen"] = COMMAND_TOGGLE_FULL_SCREEN
+    map["openFullscreen"] = COMMAND_OPEN_FULL_SCREEN
+    map["onViewportEntered"] = COMMAND_ON_VIEWPORT_ENTERED
+    map["onViewportLeft"] = COMMAND_ON_VIEWPORT_LEFT
     return map
   }
 
@@ -66,7 +67,9 @@ class FWStoryBlockManager : ViewGroupManager<StoryBlockFrameLayout>() {
       }
       COMMAND_PLAY -> root.storyBlockFragment?.play()
       COMMAND_PAUSE -> root.storyBlockFragment?.pause()
-      COMMAND_TOGGLE_FULL_SCREEN -> root.storyBlockFragment?.toggleFullScreen()
+      COMMAND_OPEN_FULL_SCREEN -> root.storyBlockFragment?.openFullscreen()
+      COMMAND_ON_VIEWPORT_ENTERED -> root.storyBlockFragment?.onViewportEntered()
+      COMMAND_ON_VIEWPORT_LEFT -> root.storyBlockFragment?.onViewportLeft()
       else -> {}
     }
   }
@@ -150,6 +153,16 @@ class FWStoryBlockManager : ViewGroupManager<StoryBlockFrameLayout>() {
     )
   }
 
+  @ReactProp(name = "adConfiguration")
+  fun setAdConfiguration(view: StoryBlockFrameLayout, config: ReadableMap?) {
+    val configMap = config?.toHashMap() ?: hashMapOf()
+    val jsonObject = JSONObject(configMap)
+    val adConfigurationModel = FWAdConfigurationDeserializer.deserialize(jsonObject)
+    view.videoFeedPropsModel = view.videoFeedPropsModel.copy(
+      adConfiguration = adConfigurationModel
+    )
+  }
+
   @ReactProp(name = "cornerRadius")
   fun setCornerRadius(view: StoryBlockFrameLayout, cornerRadius: Int?) {
     view.videoFeedPropsModel = view.videoFeedPropsModel.copy(
@@ -160,11 +173,9 @@ class FWStoryBlockManager : ViewGroupManager<StoryBlockFrameLayout>() {
   private fun setupLayout(view: View) {
     Choreographer.getInstance().postFrameCallback(object : Choreographer.FrameCallback {
       override fun doFrame(frameTimeNanos: Long) {
-        if (view.isAttachedToWindow) {
-          manuallyLayoutChildren(view)
-          view.viewTreeObserver.dispatchOnGlobalLayout()
-          Choreographer.getInstance().postFrameCallback(this)
-        }
+        manuallyLayoutChildren(view)
+        view.viewTreeObserver.dispatchOnGlobalLayout()
+        Choreographer.getInstance().postFrameCallback(this)
       }
     })
   }
@@ -180,32 +191,42 @@ class FWStoryBlockManager : ViewGroupManager<StoryBlockFrameLayout>() {
   private fun addStoryBlockListener(fragment: StoryBlockFragment, reactNativeViewId: Int) {
     fragment.setFeedLoadListener { feedLoadState ->
       when (feedLoadState) {
+        FeedLoadState.Loading -> {
+          FWLogUtils.d { "StoryBlock FeedViewState.Loading" }
+        }
         FeedLoadState.FeedLoaded -> {
           FWEventUtils.receiveStoryBlockLoadFinishedSuccessEvent(reactContext, reactNativeViewId)
         }
-        FeedLoadState.FeedLoadFailed -> {
+        FeedLoadState.EmptyFeed -> {
+          FWEventUtils.receiveStoryBlockEmptyEvent(reactContext, reactNativeViewId)
+        }
+        FeedLoadState.EndOfFeed -> {
+          FWEventUtils.receiveStoryBlockLoadFinishedSuccessEvent(reactContext, reactNativeViewId)
+        }
+        else -> {}
+      }
+    }
+
+    fragment.setOnErrorListener { error ->
+      when (error) {
+        is StoryBlockError.LoadingFailed -> {
           FWEventUtils.receiveStoryBlockLoadFinishedFailedEvent(
             reactContext,
             reactNativeViewId,
-            "FeedLoadFailed",
-            "FeedLoadFailed"
+            error.message,
+            error.message
           )
         }
-        else -> {}
-      }
-    }
 
-    fragment.setOnFullScreenStateChangedListener { isFullScreen ->
-      if (isFullScreen) {
-        FWStoryBlockUtil.addFullScreenStoryBlockFragment(fragment)
-      } else {
-        FWStoryBlockUtil.removeFullScreenStoryBlockFragment(fragment)
+        else -> {
+          FWEventUtils.receiveStoryBlockLoadFinishedFailedEvent(
+            reactContext,
+            reactNativeViewId,
+            null,
+            null
+          )
+        }
       }
-      FWEventUtils.receiveStoryBlockFullScreenStateChangedEvent(
-        reactContext,
-        reactNativeViewId,
-        isFullScreen
-      )
     }
   }
 
@@ -261,6 +282,7 @@ class FWStoryBlockManager : ViewGroupManager<StoryBlockFrameLayout>() {
     return MapBuilder.builder<String, Any>()
       .put(FWStoryBlockEventName.StoryBlockLoadFinished.rawValue, MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", FWStoryBlockEventName.StoryBlockLoadFinished.rawValue)))
       .put(FWStoryBlockEventName.StoryBlockFullScreenStateChanged.rawValue, MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", FWStoryBlockEventName.StoryBlockFullScreenStateChanged.rawValue)))
+      .put(FWStoryBlockEventName.StoryBlockEmpty.rawValue, MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", FWStoryBlockEventName.StoryBlockEmpty.rawValue)))
       .build()
   }
 
@@ -269,7 +291,9 @@ class FWStoryBlockManager : ViewGroupManager<StoryBlockFrameLayout>() {
     private const val COMMAND_CREATE = 1000000
     private const val COMMAND_PLAY = 1000001
     private const val COMMAND_PAUSE = 1000002
-    private const val COMMAND_TOGGLE_FULL_SCREEN = 1000003
+    private const val COMMAND_OPEN_FULL_SCREEN = 1000003
+    private const val COMMAND_ON_VIEWPORT_ENTERED = 1000004
+    private const val COMMAND_ON_VIEWPORT_LEFT = 1000005
   }
 
 }

package/android/src/main/java/com/fireworksdk/bridge/reactnative/manager/FWVideoFeedManager.kt

@@ -8,12 +8,15 @@ import com.facebook.react.uimanager.ThemedReactContext
 
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.common.MapBuilder
+import com.firework.error.videofeed.VideoFeedError
 import com.firework.videofeed.FeedItemClickListener
 import com.firework.videofeed.FeedViewState
 import com.fireworksdk.bridge.components.videofeed.FWVideoFeed
+import com.fireworksdk.bridge.models.FWAdConfigurationDeserializer
 import com.fireworksdk.bridge.models.FWVideoFeedConfigModelDeserializer
 import com.fireworksdk.bridge.models.FWVideoFeedItemDetailsModel
 import com.fireworksdk.bridge.models.FWVideoPlayerConfigModelDeserializer
+import com.fireworksdk.bridge.models.enums.FWErrorAction
 import com.fireworksdk.bridge.models.enums.FWFeedViewEventName
 import com.fireworksdk.bridge.models.enums.FWVideoFeedMode
 import com.fireworksdk.bridge.models.enums.FWVideoFeedSource
@@ -140,6 +143,16 @@ class FWVideoFeedManager : SimpleViewManager<FWVideoFeed>() {
     )
   }
 
+  @ReactProp(name = "adConfiguration")
+  fun setAdConfiguration(view: FWVideoFeed, config: ReadableMap?) {
+    val configMap = config?.toHashMap() ?: hashMapOf()
+    val jsonObject = JSONObject(configMap)
+    val adConfigurationModel = FWAdConfigurationDeserializer.deserialize(jsonObject)
+    view.videoFeedPropsModel = view.videoFeedPropsModel.copy(
+      adConfiguration = adConfigurationModel
+    )
+  }
+
   private fun addVideoFeedListener(reactContext: ThemedReactContext, videoFeed: FWVideoFeed?) {
     val videoFeedView = videoFeed?.videoFeedView
     videoFeedView ?: return
@@ -172,18 +185,43 @@ class FWVideoFeedManager : SimpleViewManager<FWVideoFeed>() {
           FWLogUtils.d { "FeedViewState.LoadData" }
           FWEventUtils.receiveVideoFeedLoadFinishedSuccessEvent(reactContext, videoFeed.id)
         }
-        is FeedViewState.ScrollToPosition -> {
-          FWLogUtils.d { "FeedViewState.ScrollToPosition" }
+        is FeedViewState.EmptyFeed -> {
+          FWLogUtils.d { "FeedViewState.EmptyFeed" }
+          FWEventUtils.receiveVideoFeedEmptyEvent(reactContext, videoFeed.id)
         }
-        is FeedViewState.OpenFeedElementAtIndex -> {
-          FWLogUtils.d { "FeedViewState.OpenFeedElementAtIndex" }
-        }
-        is FeedViewState.Error -> {
-          FWLogUtils.d { "FeedViewState.Error" }
-          FWEventUtils.receiveVideoFeedLoadFinishedFailedEvent(reactContext, videoFeed.id, feedViewState.message, feedViewState.message)
+        is FeedViewState.EndOfFeed -> {
+          FWLogUtils.d { "FeedViewState.EndOfFeed" }
+          FWEventUtils.receiveVideoFeedLoadFinishedSuccessEvent(reactContext, videoFeed.id)
         }
         else -> {}
       }}
+
+    videoFeed.setOnErrorListener { error ->
+      when (error) {
+        is VideoFeedError.LoadingFirstPageFailed -> {
+          FWEventUtils.receiveVideoFeedLoadFinishedFailedEvent(
+            reactContext,
+            videoFeed.id,
+            error.message,
+            error.message,
+            FWErrorAction.LoadingFirstPage.rawValue
+          )
+        }
+
+        is VideoFeedError.LoadingNextPageFailed -> {
+          FWEventUtils.receiveVideoFeedLoadFinishedFailedEvent(
+            reactContext,
+            videoFeed.id,
+            error.message,
+            error.message,
+            FWErrorAction.LoadingNextPage.rawValue
+          )
+        }
+
+        else -> {
+        }
+      }
+    }
   }
 
 
@@ -213,6 +251,7 @@ class FWVideoFeedManager : SimpleViewManager<FWVideoFeed>() {
   override fun getExportedCustomBubblingEventTypeConstants(): MutableMap<String, Any>? {
     return MapBuilder.builder<String, Any>()
       .put(FWFeedViewEventName.VideoFeedLoadFinished.rawValue, MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", FWFeedViewEventName.VideoFeedLoadFinished.rawValue)))
+      .put(FWFeedViewEventName.VideoFeedEmpty.rawValue, MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", FWFeedViewEventName.VideoFeedEmpty.rawValue)))
       .build()
   }
 

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

@@ -13,4 +13,5 @@ interface FWVideoShoppingInterface {
   fun setCartIconVisible(visible: Boolean?)
   fun setCartItemCount(count: Int?)
   fun setCustomClickLinkButtonEnabled(value: Boolean?, promise: Promise)
+  fun setCustomTapProductCardEnabled(value: Boolean?, promise: Promise)
 }

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

@@ -7,7 +7,6 @@ import com.fireworksdk.bridge.FWInitializationProvider
 import com.fireworksdk.bridge.reactnative.models.FWNavigatorInterface
 import com.fireworksdk.bridge.reactnative.pages.FWContainerActivity
 import com.fireworksdk.bridge.utils.FWLogUtils
-import com.fireworksdk.bridge.utils.FWStoryBlockUtil
 
 
 class FWNavigatorModule(
@@ -49,15 +48,6 @@ class FWNavigatorModule(
       return
     }
 
-    val currentStoryBlockFragment = FWStoryBlockUtil.getCurrentFullScreenStoryBlockFragment()
-    if (currentStoryBlockFragment?.activity == activity) {
-      UiThreadUtil.runOnUiThread {
-        currentStoryBlockFragment.toggleFullScreen()
-      }
-      promise.resolve(true)
-      return
-    }
-
     if (activity.javaClass.name.equals("com.firework.player.pager.PlayerActivity")) {
       UiThreadUtil.runOnUiThread {
         activity.finish()

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

@@ -15,6 +15,7 @@ import com.fireworksdk.bridge.models.enums.FWProductCardTheme
 import com.fireworksdk.bridge.models.enums.FWShoppingCtaResultRes
 import com.fireworksdk.bridge.reactnative.models.FWVideoShoppingInterface
 import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
+import com.fireworksdk.bridge.utils.FWCommonUtil
 import com.fireworksdk.bridge.utils.FWDateUtils
 import com.fireworksdk.bridge.utils.FWGlobalDataUtil
 import com.fireworksdk.bridge.utils.FWLogUtils
@@ -168,10 +169,28 @@ class FWVideoShoppingModule(
       else -> {}
     }
 
+    var productCardCornerRadius = FWCommonUtil.dpToPx(4.toFloat(), reactApplicationContext)
+    if (configModel.productCard?.cornerRadius != null) {
+      productCardCornerRadius = FWCommonUtil.dpToPx(configModel.productCard.cornerRadius.toFloat(), reactApplicationContext)
+    }
+
+    var isPriceVisible = true
+    if (configModel.productCard?.priceConfiguration?.isHidden != null) {
+      isPriceVisible = !configModel.productCard.priceConfiguration.isHidden
+    }
+
+    var isCtaVisible = true
+    if (configModel.productCard?.isCtaButtonHidden != null) {
+      isCtaVisible = !configModel.productCard.isCtaButtonHidden
+    }
+
     FireworkSdk.shopping.setShoppingViewOptions(
       ShoppingViewOptions(
         productCardsOptions = ProductCardsOptions(
           ctaButtonText = productCtaButtonText,
+          cornerRadius = productCardCornerRadius.toFloat(),
+          isPriceVisible = isPriceVisible,
+          isCtaVisible = isCtaVisible,
         ),
         productDetailsOptions = ProductDetailsOptions(
           linkButtonOptions = LinkButtonOptions(isVisible = !isLinkButtonHidden),
@@ -313,6 +332,29 @@ class FWVideoShoppingModule(
     promise.resolve(true)
   }
 
+  @ReactMethod
+  override fun setCustomTapProductCardEnabled(value: Boolean?, promise: Promise) {
+
+    if (value == true) {
+      FireworkSdk.shopping.setOnProductCardClickListener { productId, unitId, productWebUrl ->
+        FWLogUtils.d { "FWVideoShoppingModule productCardClick $productId $unitId $productWebUrl" }
+
+        FWEventUtils.sendProductCardClickEvent(
+          reactApplicationContext,
+          productWebUrl,
+          productId,
+          unitId,
+          callbackId
+        )
+      }
+    } else {
+      FireworkSdk.shopping.setOnProductCardClickListener(null)
+    }
+
+
+    promise.resolve(true)
+  }
+
   @ReactMethod
   fun addListener(eventName: String?) {
     // Set up any upstream listeners or background tasks as necessary

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

@@ -57,9 +57,11 @@ class FireworkSDKModule(
     val jsonObject = JSONObject(configMap)
     val sdkInitOptionsModel = FWSDKInitOptionsModelDeserializer.deserialize(jsonObject)
 
-    initSdk(sdkInitOptionsModel)
-    promise.resolve(Arguments.createMap())
-    FireworkSdk.analytics.register(this)
+    UiThreadUtil.runOnUiThread {
+      initSdk(sdkInitOptionsModel)
+      promise.resolve(Arguments.createMap())
+      FireworkSdk.analytics.register(this)
+    }
   }
 
   /**