react-native-firework-sdk 2.12.0 → 2.13.0

package/android/build.gradle

@@ -5,7 +5,6 @@ buildscript {
   repositories {
     google()
     mavenCentral()
-    mavenLocal()
   }
 
   dependencies {
@@ -35,6 +34,7 @@ android {
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault('minSdkVersion')
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
+    manifestPlaceholders["fw_player_launch_mode"] = getExtOrDefault('fwPlayerLaunchMode')
   }
 
   // LOG_LEVEL: VERBOSE(2), DEBUG(3), INFO(4), WARN(5), ERROR(6), ASSERT(7)
@@ -61,9 +61,9 @@ android {
 }
 
 repositories {
+  mavenLocal()
   mavenCentral()
   google()
-  mavenLocal()
 
   maven {
     setUrl("https://s01.oss.sonatype.org/content/repositories/snapshots/")
@@ -144,5 +144,6 @@ dependencies {
   def fireworkSdkVersion = getExtOrDefault('fwNativeVersion')
   implementation "com.firework:sdk:$fireworkSdkVersion"
   implementation "com.firework.feature:uiKit:$fireworkSdkVersion"
+  implementation "com.firework.feature.player:pager:$fireworkSdkVersion"
 }
 

package/android/gradle.properties

@@ -1,8 +1,9 @@
-android.useAndroidX=true
 android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536M
-FireworkSDK_kotlinVersion=1.6.10
+FireworkSDK_kotlinVersion=1.8.22
 FireworkSDK_minSdkVersion=21
 FireworkSDK_compileSdkVersion=33
 FireworkSDK_targetSdkVersion=33
-FireworkSDK_fwNativeVersion=6.9.3
+FireworkSDK_fwPlayerLaunchMode=singleTask
+FireworkSDK_fwNativeVersion=6.10.2

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
   package="com.fireworksdk.bridge">
 
   <uses-permission android:name="android.permission.INTERNET" />
@@ -23,6 +24,19 @@
       android:name="Firework:RecyclerViewRequestLayoutEnable"
       android:value="true" />
 
+    <activity
+      android:name="com.firework.player.pager.PlayerActivity"
+      android:autoRemoveFromRecents="true"
+      android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+      android:exported="true"
+      android:launchMode="${fw_player_launch_mode}"
+      android:screenOrientation="portrait"
+      android:supportsPictureInPicture="true"
+      android:theme="@style/FwPlayerPagerPlayerActivity"
+      android:windowSoftInputMode="adjustPan"
+      tools:replace="android:launchMode"
+      tools:targetApi="n" />
+
   </application>
 
 </manifest>

package/android/src/main/java/com/fireworksdk/bridge/FWInitializationProvider.kt

@@ -14,6 +14,7 @@ class FWInitializationProvider: ContentProvider() {
 
   var application: Application? = null
   var resumedActivity by weakProperty<Activity?>()
+  var mainActivity by weakProperty<Activity?>()
 
   override fun onCreate(): Boolean {
     sInstance = this
@@ -36,6 +37,9 @@ class FWInitializationProvider: ContentProvider() {
 
           override fun onActivityResumed(activity: Activity) {
             resumedActivity = activity
+            if (mainActivity == null) { // only set once
+              mainActivity = activity
+            }
           }
 
           override fun onActivityPaused(activity: Activity) {

package/android/src/main/java/com/fireworksdk/bridge/components/storyblock/StoryBlockFragment.kt

@@ -119,8 +119,7 @@ class StoryBlockFragment : FWBaseFragment() {
       childFragmentManager,
       viewLifecycleOwner,
       viewOptionsBuilder.build(),
-      FWGlobalDataUtil.pauseWhenNotVisible,
-      videoFeedPropsModel?.videoPlayerConfiguration?.countdownTimerConfiguration?.isHidden == false
+      FWGlobalDataUtil.pauseWhenNotVisible
     )
     isStoryBlockInitializer = true
 

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

@@ -5,4 +5,5 @@ import com.fireworksdk.bridge.models.enums.FWVideoPlayerLogoOption
 data class FWVideoPlayerLogoConfigurationModel(
   val option: FWVideoPlayerLogoOption?,
   val encodedId: String?,
+  val isClickable: Boolean?
 )

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

@@ -7,16 +7,19 @@ object FWVideoPlayerLogoConfigurationModelDeserializer {
 
   private const val OPTION_KEY = "option"
   private const val ENCODED_ID_KEY = "encodedId"
+  private const val IS_CLICKABLE = "isClickable"
 
   fun deserialize(responseJson: JSONObject?): FWVideoPlayerLogoConfigurationModel? {
     responseJson ?: return null
 
     val option = if (responseJson.has(OPTION_KEY)) responseJson.optString(OPTION_KEY) else null
     val encodedId = if (responseJson.has(ENCODED_ID_KEY)) responseJson.optString(ENCODED_ID_KEY) else null
+    val isClickable = if (responseJson.has(IS_CLICKABLE)) responseJson.optBoolean(IS_CLICKABLE) else null
 
     return FWVideoPlayerLogoConfigurationModel(
       option = if (!option.isNullOrBlank()) FWVideoPlayerLogoOption.deserialize(option) else null,
       encodedId = encodedId,
+      isClickable = isClickable
     )
   }
 

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

@@ -7,12 +7,14 @@ object FWVideoPlayerLogoConfigurationModelSerializer {
 
   private const val OPTION_KEY = "option"
   private const val ENCODED_ID_KEY = "encodedId"
+  private const val IS_CLICKABLE = "isClickable"
 
   fun serialize(model: FWVideoPlayerLogoConfigurationModel?): JSONObject? {
     model ?: return null
     val jsonObject = JSONObject()
     jsonObject.put(OPTION_KEY, FWVideoPlayerLogoOption.serialize(model.option))
     jsonObject.put(ENCODED_ID_KEY, model.encodedId)
+    jsonObject.put(IS_CLICKABLE, model.isClickable)
     return jsonObject
   }
 }

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

@@ -11,4 +11,6 @@ interface FWNavigatorInterface {
   fun canPopNativeContainer(promise: Promise)
   fun startFloatingPlayer(promise: Promise)
   fun stopFloatingPlayer(promise: Promise)
+  fun bringRNContainerToTop(promise: Promise)
+  fun bringRNContainerToBottom(promise: Promise)
 }

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

@@ -1,7 +1,9 @@
 package com.fireworksdk.bridge.reactnative.module
 
 import android.app.Activity
+import android.content.Intent
 import com.facebook.react.bridge.*
+import com.firework.player.pager.PlayerActivity
 import com.firework.sdk.FireworkSdk
 import com.fireworksdk.bridge.FWInitializationProvider
 import com.fireworksdk.bridge.reactnative.models.FWNavigatorInterface
@@ -85,6 +87,30 @@ class FWNavigatorModule(
     promise.resolve(true)
   }
 
+  @ReactMethod
+  override fun bringRNContainerToTop(promise: Promise) {
+    // reorder MainActivity to front
+    val mainActivity = FWInitializationProvider.INSTANCE.mainActivity
+    mainActivity?.let { mActivity ->
+      val resumedActivity = FWInitializationProvider.INSTANCE.resumedActivity
+      resumedActivity?.let { rActivity ->
+        rActivity.startActivity(
+          Intent(rActivity, mActivity::class.java)
+          .addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
+        )
+      }
+    }
+  }
+
+  @ReactMethod
+  override fun bringRNContainerToBottom(promise: Promise) {
+    // reorder PlayerActivity to front
+    val mainActivity = FWInitializationProvider.INSTANCE.mainActivity
+    mainActivity?.let {
+      it.startActivity(PlayerActivity.getIntentForReorderToFront(it))
+    }
+  }
+
   @ReactMethod
   fun addListener(eventName: String?, promise: Promise) {
     // Set up any upstream listeners or background tasks as necessary

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

@@ -186,7 +186,7 @@ class FireworkSDKModule(
     val videoPlaybackDetails = FWModelUtils.convertPlayerEvent2PlaybackDetails(event)
     when (event) {
       is PlayerLifecycleAnalyticsEvent.OnStarted -> {
-        if (event.videoInfo.isAd) {
+        if (event.videoInfo?.isAd == true) {
           FWEventUtils.sendVideoPlaybackEvent(reactApplicationContext, FWVideoPlaybackSubEventName.AdStart.rawValue, videoPlaybackDetails)
         } else {
           FWEventUtils.sendVideoPlaybackEvent(reactApplicationContext, FWVideoPlaybackSubEventName.Start.rawValue, videoPlaybackDetails)
@@ -199,7 +199,7 @@ class FireworkSDKModule(
       is PlayerLifecycleAnalyticsEvent.OnIdle -> {}
       is PlayerLifecycleAnalyticsEvent.OnRepeat -> {}
       is PlayerLifecycleAnalyticsEvent.OnEnded -> {
-        if (event.videoInfo.isAd) {
+        if (event.videoInfo?.isAd == true) {
           FWEventUtils.sendVideoPlaybackEvent(reactApplicationContext, FWVideoPlaybackSubEventName.AdEnd.rawValue, videoPlaybackDetails)
         } else {
           FWEventUtils.sendVideoPlaybackEvent(reactApplicationContext, FWVideoPlaybackSubEventName.Complete.rawValue, videoPlaybackDetails)

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

@@ -5,6 +5,7 @@ import android.content.Context
 import android.graphics.Typeface
 import android.graphics.drawable.GradientDrawable
 import com.firework.common.PlayerMode
+import com.firework.common.Theme
 import com.firework.common.ad.AdBadgeOption
 import com.firework.common.ad.AdBadgeTextType
 import com.firework.common.ad.AdOption
@@ -14,6 +15,7 @@ import com.firework.common.feed.FeedLayout
 import com.firework.common.feed.FeedResource
 import com.firework.common.feed.FeedTitlePosition
 import com.firework.common.player.CloseButtonOption
+import com.firework.common.player.LivestreamCountDownOption
 import com.firework.common.player.MuteButtonOption
 import com.firework.common.player.PlaybackButtonOption
 import com.firework.common.player.PlayerUiOption
@@ -22,6 +24,7 @@ import com.firework.common.widget.WidgetImage
 import com.firework.viewoptions.*
 import com.fireworksdk.bridge.FWInitializationProvider
 import com.fireworksdk.bridge.models.*
+import com.fireworksdk.bridge.models.enums.FWAppearanceMode
 import com.fireworksdk.bridge.models.enums.FWBadgeTextType
 import com.fireworksdk.bridge.models.enums.FWCtaDelayType
 import com.fireworksdk.bridge.models.enums.FWGradientDrawableOrientation
@@ -52,6 +55,7 @@ object FWConfigUtil {
     val adBadgeOptionBuilder = getDefaultAdBadgeOptionBuilder()
     val ctaOptionBuilder = getDefaultCtaOptionBuilder()
     val adOptionBuilder = getDefaultAdOptionBuilder()
+    val countDownOptionBuilder = getDefaultPlayerCountdownTimerOptionBuilder()
 
     when (videoFeedPropsModel.source) {
       FWVideoFeedSource.Discover -> {
@@ -397,16 +401,27 @@ object FWConfigUtil {
 
     val logoConfigOption = videoFeedPropsModel.videoPlayerConfiguration?.videoPlayerLogoConfiguration?.option
     val logoConfigChannelId = videoFeedPropsModel.videoPlayerConfiguration?.videoPlayerLogoConfiguration?.encodedId
+    val isLogoClickable = videoFeedPropsModel.videoPlayerConfiguration?.videoPlayerLogoConfiguration?.isClickable ?: true
     when {
       logoConfigOption == FWVideoPlayerLogoOption.Creator && !logoConfigChannelId.isNullOrBlank() -> {
-        playerOptionBuilder.logoConfig(LogoConfig.Logo.CreatorLogo(logoConfigChannelId))
+        playerOptionBuilder.logoConfig(LogoConfig.Logo.CreatorLogo(logoConfigChannelId, isLogoClickable))
       }
       logoConfigOption == FWVideoPlayerLogoOption.ChannelAggregator && !logoConfigChannelId.isNullOrBlank() -> {
-        playerOptionBuilder.logoConfig(LogoConfig.Logo.AggregatorLogo(logoConfigChannelId))
+        playerOptionBuilder.logoConfig(LogoConfig.Logo.AggregatorLogo(logoConfigChannelId, isLogoClickable))
       }
       else -> {}
     }
 
+    val countdownTimerAppearance = videoFeedPropsModel.videoPlayerConfiguration?.countdownTimerConfiguration?.appearance
+    val isCountdownTimerHidden = videoFeedPropsModel.videoPlayerConfiguration?.countdownTimerConfiguration?.isHidden ?: true
+    countDownOptionBuilder.isHidden(isCountdownTimerHidden)
+    when (countdownTimerAppearance) {
+      FWAppearanceMode.Light -> countDownOptionBuilder.theme(Theme.LIGHT)
+      FWAppearanceMode.Dark -> countDownOptionBuilder.theme(Theme.DARK)
+      else -> {}
+    }
+    playerOptionBuilder.livestreamCountDownOption(countDownOptionBuilder.build())
+
     return ViewOptions.Builder()
       .layoutOption(layoutOptionBuilder.build())
       .titleOption(titleOptionBuilder.build())
@@ -437,6 +452,10 @@ object FWConfigUtil {
     return PlayerUiOption.Builder()
   }
 
+  private fun getDefaultPlayerCountdownTimerOptionBuilder(): LivestreamCountDownOption.Builder {
+    return LivestreamCountDownOption.Builder()
+  }
+
   private fun getDefaultVideoDetailsOptionBuilder(): VideoDetailsOption.Builder {
     return VideoDetailsOption.Builder()
   }

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

@@ -36,15 +36,15 @@ object FWModelUtils {
 
   fun convertPlayerEvent2PlaybackDetails(event: PlayerLifecycleAnalyticsEvent): FWVideoPlaybackDetails {
     return FWVideoPlaybackDetails(
-      badge = event.videoInfo.badge,
-      caption = event.videoInfo.caption,
-      duration = event.videoInfo.duration,
-      hasCta = event.videoInfo.hasCta,
-      playerHeight = event.videoInfo.playerHeight,
-      playerWidth = event.videoInfo.playerWidth,
-      id = event.videoInfo.id,
+      badge = event.videoInfo?.badge,
+      caption = event.videoInfo?.caption,
+      duration = event.videoInfo?.duration,
+      hasCta = event.videoInfo?.hasCta,
+      playerHeight = event.videoInfo?.playerHeight,
+      playerWidth = event.videoInfo?.playerWidth,
+      id = event.videoInfo?.id,
       progress = event.progress,
-      feedId = event.videoInfo.feedId,
+      feedId = event.videoInfo?.feedId,
     )
   }
 
@@ -61,4 +61,4 @@ object FWModelUtils {
     )
   }
 
-}
+}

package/ios/Components/StoryBlock.swift

@@ -123,7 +123,7 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate, PictureInPict
         self.storyBlockVC = storyBlockVC
         updateStoryBlockVCConfiguration()
 
-        storyBlockVC.isPictureInPictureEnabled = storyBlockConfiguration?.enablePictureInPicture ?? true
+        storyBlockVC.isPictureInPictureEnabled = storyBlockConfiguration?.enablePictureInPicture ?? false
         storyBlockVC.pictureInPictureDelegate = self
         storyBlockVC.delegate = self
 
@@ -243,10 +243,10 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate, PictureInPict
             }
         }
 
-//        if let showPlaybackButton = config.showPlaybackButton {
-//            resultConfig.fullScreenPlayerView.playbackButton.isHidden = !showPlaybackButton
-//        }
-//
+        if let showPlaybackButton = config.showPlaybackButton {
+            resultConfig.fullScreenPlayerView.playbackButton.isHidden = !showPlaybackButton
+        }
+
 //        if let showMuteButton = config.showMuteButton {
 //            resultConfig.fullScreenPlayerView.muteButton.isHidden = !showMuteButton
 //        }
@@ -356,9 +356,6 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate, PictureInPict
         if let replayBadgeConfiguration = config.replayBadgeConfiguration {
             resultConfig.replayBadge.isHidden = replayBadgeConfiguration.isHidden
             resultConfig.fullScreenPlayerView.replayBadge.isHidden = replayBadgeConfiguration.isHidden
-        } else {
-            resultConfig.replayBadge.isHidden = false
-            resultConfig.fullScreenPlayerView.replayBadge.isHidden = false
         }
 
         if let countdownTimerConfiguration = config.countdownTimerConfiguration {

package/ios/Components/VideoFeed.swift

@@ -208,7 +208,7 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate, PictureInPictur
             feedVC.viewConfiguration = viewConfiguration
         }
 
-        feedVC.isPictureInPictureEnabled = playerViewConfig?.enablePictureInPicture ?? true
+        feedVC.isPictureInPictureEnabled = playerViewConfig?.enablePictureInPicture ?? false
 
         feedVC.delegate = self
         feedVC.pictureInPictureDelegate = self
@@ -537,8 +537,6 @@ extension VideoFeed {
 
         if let replayBadgeConfiguration = config.replayBadgeConfiguration {
             vpcConfig.replayBadge.isHidden = replayBadgeConfiguration.isHidden
-        } else {
-            vpcConfig.replayBadge.isHidden = false
         }
 
         if let countdownTimerConfiguration = config.countdownTimerConfiguration {
@@ -570,8 +568,6 @@ extension VideoFeed {
 
         if let replayBadge = feedViewConfig?.replayBadge {
             videoConfig.replayBadge.isHidden = replayBadge.isHidden
-        } else {
-            videoConfig.replayBadge.isHidden = false
         }
 
         return videoConfig

package/ios/FireworkSdk.xcodeproj/project.pbxproj

@@ -74,6 +74,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 */; };
+		89C105652BAD2C1D00E47CDD /* UIWindowScene+Swizzle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89C105642BAD2C1D00E47CDD /* UIWindowScene+Swizzle.swift */; };
 		89C4D6A62A494EB800EFB74A /* StoryBlockConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89C4D6A52A494EB800EFB74A /* StoryBlockConfiguration.swift */; };
 		89C6791A2A736C80000C1A71 /* ButtonInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89C679192A736C80000C1A71 /* ButtonInfo.swift */; };
 		89D6BBF929ACE2DC00C8AA2A /* (null) in Sources */ = {isa = PBXBuildFile; };
@@ -141,6 +142,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>"; };
+		89C105642BAD2C1D00E47CDD /* UIWindowScene+Swizzle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIWindowScene+Swizzle.swift"; sourceTree = "<group>"; };
 		89C4D6A52A494EB800EFB74A /* StoryBlockConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoryBlockConfiguration.swift; sourceTree = "<group>"; };
 		89C679192A736C80000C1A71 /* ButtonInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonInfo.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -181,6 +183,7 @@
 		898873122A0A8E7E0089CD1C /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
+				89C105642BAD2C1D00E47CDD /* UIWindowScene+Swizzle.swift */,
 				898873132A0A8E7E0089CD1C /* UIViewController+AttachChild.swift */,
 				898873142A0A8E7E0089CD1C /* UIView+Constraints.swift */,
 				898873172A0A8E7E0089CD1C /* String+Color.swift */,
@@ -425,6 +428,7 @@
 				8988736B2A0A8E7E0089CD1C /* VideoFeed.swift in Sources */,
 				891F4AF62A67E12800A9E8DA /* FWRNContainerViewController.swift in Sources */,
 				898873522A0A8E7E0089CD1C /* ShoppingCTAResult.swift in Sources */,
+				89C105652BAD2C1D00E47CDD /* UIWindowScene+Swizzle.swift in Sources */,
 				89C6791A2A736C80000C1A71 /* ButtonInfo.swift in Sources */,
 				8975239D2817DEF80070EBB6 /* (null) in Sources */,
 				898873562A0A8E7E0089CD1C /* SDKInitOptions.swift in Sources */,

package/ios/Modules/FireworkSDKModule/FireworkSDKModule.swift

@@ -39,6 +39,8 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
             self.initializeSDK(Self.cachedSDKInitOptions, true)
         }
 
+        UIWindowScene.swizzleMethods()
+
         _ = AppLanguageManager.shared
         NotificationCenter.default.addObserver(
             self, selector: #selector(Self.onAppLanguageChanged),

package/ios/Utils/Extensions/UIWindowScene+Swizzle.swift

@@ -0,0 +1,33 @@
+//
+//  UIWindowScene+Swizzle.swift
+//  react-native-firework-sdk
+//
+//  Created by linjie jiang on 3/22/24.
+//
+
+import UIKit
+import FireworkVideoUI
+
+extension UIWindowScene {
+    static func swizzleMethods() {
+        #if DEBUG
+        Swizzle.swizzleSelector(
+            cls: self,
+            originalSelector: #selector(getter: UIWindowScene.windows),
+            customSelector: #selector(UIWindowScene.fw_windows)
+        )
+        #endif
+    }
+
+    @objc func fw_windows() -> [UIWindow] {
+        let windowList = self.fw_windows().filter { window in
+            let typeName = String(describing: type(of: window))
+            if typeName == "SKHiddenWindow" {
+                return false
+            }
+            return true
+        }
+
+        return windowList
+    }
+}

package/lib/commonjs/components/VideoFeed.js

@@ -62,7 +62,7 @@ class VideoFeed extends _react.default.Component {
 
       let reactTag = (0, _reactNative.findNodeHandle)(nativeNodeHandle);
 
-      _FWLoggerUtil.default.log(`StoryBlock refresh commandId: ${commandId} nativeNodeHandle: ${nativeNodeHandle} reactTag: ${reactTag}`);
+      _FWLoggerUtil.default.log(`VideoFeed refresh commandId: ${commandId} nativeNodeHandle: ${nativeNodeHandle} reactTag: ${reactTag}`);
 
       if (!nativeNodeHandle || !reactTag) {
         return;
@@ -72,8 +72,6 @@ class VideoFeed extends _react.default.Component {
     });
 
     _defineProperty(this, "_onVideoFeedLoadFinished", event => {
-      _FWLoggerUtil.default.log(`VideoFeed _onVideoFeedLoadFinished ${JSON.stringify(event.nativeEvent)}`);
-
       const {
         onVideoFeedLoadFinished,
         onVideoFeedEmpty
@@ -94,19 +92,30 @@ class VideoFeed extends _react.default.Component {
             error.reason = reason;
           }
 
-          onVideoFeedLoadFinished(error);
-
           if (_reactNative.Platform.OS === 'android') {
+            if (!this._loaded) {
+              onVideoFeedLoadFinished(error);
+            }
+
             if (action === _FWNativeErrorAction.FWNativeErrorAction.loadingFirstPage || !this._loaded) {
               onVideoFeedEmpty === null || onVideoFeedEmpty === void 0 ? void 0 : onVideoFeedEmpty(error);
             }
           } else {
+            onVideoFeedLoadFinished(error);
+
             if (!this._loaded) {
               onVideoFeedEmpty === null || onVideoFeedEmpty === void 0 ? void 0 : onVideoFeedEmpty(error);
             }
           }
         } else {
-          onVideoFeedLoadFinished();
+          if (_reactNative.Platform.OS === 'android') {
+            if (!this._loaded) {
+              onVideoFeedLoadFinished();
+            }
+          } else {
+            onVideoFeedLoadFinished();
+          }
+
           this._loaded = true;
         }
       }