react-native-firework-sdk 2.2.1 → 2.2.2

package/src/FireworkSDK.ts

@@ -76,25 +76,18 @@ class FireworkSDK {
     return this._shareBaseURL;
   }
   public set shareBaseURL(value: string | undefined) {
-    FireworkSDKModule.setShareBaseURL(value ?? '').then(() => {
-      this.updateInternalShareBaseURL(value);
-    });
+    this.updateInternalShareBaseURL(value);
+    FireworkSDKModule.setShareBaseURL(value ?? '');
   }
   private _shareBaseURL: string | undefined;
 
   /**
-   * Get the configuration for ad badges. Only supported on iOS.
+   * The configuration for ad badges.
    */
-  public getAdBadgeConfiguration(): AdBadgeConfiguration | undefined {
+  public get adBadgeConfiguration(): AdBadgeConfiguration | undefined {
     return this._adBadgeConfiguration;
   }
-  /**
-   * Set the configuration for ad badges. Only supported on iOS.
-   */
-  public async setAdBadgeConfiguration(
-    value: AdBadgeConfiguration | undefined
-  ): Promise<void> {
-    await FireworkSDKModule.setAdBadgeConfiguration(value ?? {});
+  public set adBadgeConfiguration(value: AdBadgeConfiguration | undefined) {
     const valueHasChanged =
       this._adBadgeConfiguration?.badgeTextType !== value?.badgeTextType ||
       this._adBadgeConfiguration?.backgroundColor !== value?.backgroundColor ||
@@ -103,6 +96,7 @@ class FireworkSDK {
     if (valueHasChanged) {
       this.eventEmitter.emit(FWEventName.AdBadgeConfigurationUpdated);
     }
+    FireworkSDKModule.setAdBadgeConfiguration(value ?? {});
   }
   private _adBadgeConfiguration: AdBadgeConfiguration | undefined;
 
@@ -230,15 +224,13 @@ class FireworkSDK {
    */
   public async init(options?: SDKInitOptions): Promise<void> {
     FWLoggerUtil.log('Call FireworkSDK init method');
-
-    FireworkSDKModule.init(options).then(() => {
-      const videoLaunchBehaviorUpdated =
-        this._videoLaunchBehavior !== options?.videoLaunchBehavior;
-      this._videoLaunchBehavior = options?.videoLaunchBehavior;
-      if (videoLaunchBehaviorUpdated) {
-        this.eventEmitter.emit(FWEventName.VideoLaunchBehaviorUpdated);
-      }
-    });
+    const videoLaunchBehaviorUpdated =
+      this._videoLaunchBehavior !== options?.videoLaunchBehavior;
+    this._videoLaunchBehavior = options?.videoLaunchBehavior;
+    if (videoLaunchBehaviorUpdated) {
+      this.eventEmitter.emit(FWEventName.VideoLaunchBehaviorUpdated);
+    }
+    FireworkSDKModule.init(options);
     ShoppingModule.init();
     LiveStreamModule.init();
   }
@@ -290,7 +282,6 @@ class FireworkSDK {
 
   private updateInternalShareBaseURL(shareBaseURL?: string) {
     const shareBaseURLChanged = this._shareBaseURL !== shareBaseURL;
-    console.log('updateInternalShareBaseURL shareBaseURL', shareBaseURL);
     this._shareBaseURL = shareBaseURL;
     if (shareBaseURLChanged) {
       this.eventEmitter.emit(FWEventName.ShareBaseURLUpdated);

package/src/components/StoryBlock.tsx

@@ -153,7 +153,9 @@ const StoryBlock: ForwardRefRenderFunction<
         FWEventName.AppLanguageUpdated,
         () => {
           FWLoggerUtil.log('Receive FWEventName.AppLanguageUpdated');
-          forceUpdate();
+          if (Platform.OS === 'android') {
+            forceUpdate();
+          }
         }
       );
 
@@ -251,45 +253,50 @@ const StoryBlock: ForwardRefRenderFunction<
   };
 
   const generateKey = (): string => {
+    const gShareBaseURL = FireworkSDK.getInstance().shareBaseURL ?? '';
+    const appLanguage = FireworkSDK.getInstance().appLanguage ?? '';
+    const adBadgeConfiguration =
+      FireworkSDK.getInstance().adBadgeConfiguration ?? {};
+    const adBadgeTextType = adBadgeConfiguration.badgeTextType ?? '';
+    const backgroundColorOfAdBadge = adBadgeConfiguration.backgroundColor ?? '';
+    const textColorOfAdBadge = adBadgeConfiguration.textColor ?? '';
+    const videoLaunchBehavior =
+      FireworkSDK.getInstance().videoLaunchBehavior ?? 'default';
+
     const {
       source,
       channel = '',
       playlist = '',
+      hashtagFilterExpression = '',
       enablePictureInPicture = false,
       adConfiguration,
-      hashtagFilterExpression = '',
     } = props;
-
-    const gShareBaseURL = FireworkSDK.getInstance().shareBaseURL ?? '';
-    const videoLaunchBehavior =
-      FireworkSDK.getInstance().videoLaunchBehavior ?? 'default';
-    const adBadgeConfiguration =
-      FireworkSDK.getInstance().getAdBadgeConfiguration() ?? {};
-    const adBadgeTextType = adBadgeConfiguration.badgeTextType ?? '';
-    const backgroundColorOfAdBadge = adBadgeConfiguration.backgroundColor ?? '';
-    const textColorOfAdBadge = adBadgeConfiguration.textColor ?? '';
     const dynamicContentParametersString =
       generateDynamicContentParametersString();
-    const appLanguage = FireworkSDK.getInstance().appLanguage ?? '';
+
     const requiresAds = adConfiguration?.requiresAds ?? false;
     const adsFetchTimeout = adConfiguration?.adsFetchTimeout ?? 10;
     const vastAttributesString = generateVastAttributesString();
 
-    let key = `source:${source}`;
-    key += `_channel:${channel}`;
-    key += `_playlist:${playlist}`;
-    key += `_gShareBaseURL:${gShareBaseURL}`;
-    key += `_videoLaunchBehavior:${videoLaunchBehavior}`;
+    let key = `gShareBaseURL:${gShareBaseURL}`;
+    if (Platform.OS === 'ios') {
+      key += `_appLanguage:${appLanguage}`;
+    }
     key += `_adBadgeTextType:${adBadgeTextType}`;
     key += `_backgroundColorOfAdBadge:${backgroundColorOfAdBadge}`;
     key += `_textColorOfAdBadge:${textColorOfAdBadge}`;
+    key += `_videoLaunchBehavior:${videoLaunchBehavior}`;
+
+    key += `_source:${source}`;
+    key += `_channel:${channel}`;
+    key += `_playlist:${playlist}`;
     key += `_dynamicContentParameters:${dynamicContentParametersString}`;
+    key += `_hashtagFilterExpression:${hashtagFilterExpression}`;
     key += `_enablePictureInPicture:${enablePictureInPicture}`;
-    key += `_appLanguage:${appLanguage}`;
+
     key += `_requiresAds:${requiresAds}`;
     key += `_adsFetchTimeout:${adsFetchTimeout}`;
     key += `_vastAttributes:${vastAttributesString}`;
-    key += `_hashtagFilterExpression:${hashtagFilterExpression}`;
 
     return key;
   };

package/src/components/VideoFeed.tsx

@@ -62,6 +62,10 @@ export interface IVideoFeedProps {
    * One of three available display modes. Defaults to row.
    */
   mode?: VideoFeedMode;
+  /**
+   * Specifies if Picture in Picture is enabled.
+   */
+  enablePictureInPicture?: boolean;
   /**
    * Configuration of the feed.
    */
@@ -74,10 +78,6 @@ export interface IVideoFeedProps {
    * Ad configuration of the feed. Only supported on iOS.
    */
   adConfiguration?: AdConfiguration;
-  /**
-   * Specifies if Picture in Picture is enabled.
-   */
-  enablePictureInPicture?: boolean;
   /**
    * The feed loading result callback. It means loading successfully when error equals to undefined. Only supported on iOS.
    */
@@ -177,15 +177,18 @@ class VideoFeed extends React.Component<IVideoFeedProps> {
         }
       );
     this._subscriptions.push(subscriptionOfVideoLaunchBehaviorUpdated);
-    const subscriptionOfAppLanguageUpdated =
-      FireworkSDKModuleEventEmitter.addListener(
-        FWEventName.AppLanguageUpdated,
-        () => {
-          FWLoggerUtil.log('Receive FWEventName.AppLanguageUpdated');
-          this.setState({});
-        }
-      );
-    this._subscriptions.push(subscriptionOfAppLanguageUpdated);
+
+    if (Platform.OS === 'ios') {
+      const subscriptionOfAppLanguageUpdated =
+        FireworkSDKModuleEventEmitter.addListener(
+          FWEventName.AppLanguageUpdated,
+          () => {
+            FWLoggerUtil.log('Receive FWEventName.AppLanguageUpdated');
+            this.setState({});
+          }
+        );
+      this._subscriptions.push(subscriptionOfAppLanguageUpdated);
+    }
   }
 
   /**
@@ -208,65 +211,78 @@ class VideoFeed extends React.Component<IVideoFeedProps> {
    */
   render() {
     FWLoggerUtil.log(`VideoFeed render ${JSON.stringify(this.props)}`);
+    const gShareBaseURL = FireworkSDK.getInstance().shareBaseURL ?? '';
+    const appLanguage = FireworkSDK.getInstance().appLanguage ?? '';
+    const adBadgeConfiguration =
+      FireworkSDK.getInstance().adBadgeConfiguration ?? {};
+    const adBadgeTextType = adBadgeConfiguration.badgeTextType ?? '';
+    const backgroundColorOfAdBadge = adBadgeConfiguration.backgroundColor ?? '';
+    const textColorOfAdBadge = adBadgeConfiguration.textColor ?? '';
+    const videoLaunchBehavior =
+      FireworkSDK.getInstance().videoLaunchBehavior ?? 'default';
 
     const {
       source,
       channel = '',
       playlist = '',
       playlistGroup = '',
+      hashtagFilterExpression = '',
       mode = 'row',
-      adConfiguration,
       enablePictureInPicture = false,
-      hashtagFilterExpression = '',
+      adConfiguration,
+      videoPlayerConfiguration,
     } = this.props;
+    const dynamicContentParametersString =
+      this._generateDynamicContentParametersString();
+
     const videoFeedConfiguration = this._getVideoFeedConfiguration();
     const titleHidden = videoFeedConfiguration?.title?.hidden ?? false;
     const titlePosition = videoFeedConfiguration?.titlePosition ?? 'nested';
-    const gShareBaseURL = FireworkSDK.getInstance().shareBaseURL ?? '';
-    const adBadgeConfiguration =
-      FireworkSDK.getInstance().getAdBadgeConfiguration() ?? {};
-    const adBadgeTextType = adBadgeConfiguration.badgeTextType ?? '';
-    const backgroundColorOfAdBadge = adBadgeConfiguration.backgroundColor ?? '';
-    const textColorOfAdBadge = adBadgeConfiguration.textColor ?? '';
-    const dynamicContentParametersString =
-      this._generateDynamicContentParametersString();
     const enableAutoplay = videoFeedConfiguration?.enableAutoplay ?? false;
-
     const gridColumns = videoFeedConfiguration?.gridColumns ?? 2;
+    const showAdBadge = videoFeedConfiguration?.showAdBadge ?? false;
+
+    const shareBaseURL = videoPlayerConfiguration?.shareBaseURL ?? '';
+
     const requiresAds = adConfiguration?.requiresAds ?? false;
     const adsFetchTimeout = adConfiguration?.adsFetchTimeout ?? 10;
     const vastAttributesString = this._generateVastAttributesString();
-    const showAdBadge = videoFeedConfiguration?.showAdBadge ?? false;
-    const videoLaunchBehavior =
-      FireworkSDK.getInstance().videoLaunchBehavior ?? 'default';
-    const appLanguage = FireworkSDK.getInstance().appLanguage ?? '';
-    let key = `source:${source}`;
+
+    let key = `gShareBaseURL:${gShareBaseURL}`;
+    if (Platform.OS === 'ios') {
+      key += `_appLanguage:${appLanguage}`;
+    }
+    key += `_adBadgeTextType:${adBadgeTextType}`;
+    key += `_backgroundColorOfAdBadge:${backgroundColorOfAdBadge}`;
+    key += `_textColorOfAdBadge:${textColorOfAdBadge}`;
+    key += `_videoLaunchBehavior:${videoLaunchBehavior}`;
+
+    key += `_source:${source}`;
     key += `_channel:${channel}`;
     key += `_playlist:${playlist}`;
     key += `_playlistGroup:${playlistGroup}`;
+    key += `_dynamicContentParameters:${dynamicContentParametersString}`;
+    key += `_hashtagFilterExpression:${hashtagFilterExpression}`;
     key += `_mode:${mode}`;
+    key += `_enablePictureInPicture:${enablePictureInPicture}`;
+
     key += `_titleHidden:${titleHidden}`;
     key += `_titlePosition:${titlePosition}`;
-    key += `_gShareBaseURL:${gShareBaseURL}`;
-    key += `_adBadgeTextType:${adBadgeTextType}`;
-    key += `_backgroundColorOfAdBadge:${backgroundColorOfAdBadge}`;
-    key += `_textColorOfAdBadge:${textColorOfAdBadge}`;
-    key += `_dynamicContentParameters:${dynamicContentParametersString}`;
     key += `_enableAutoplay:${enableAutoplay}`;
-    key += `_enablePictureInPicture:${enablePictureInPicture}`;
     key += `_gridColumns:${gridColumns}`;
+    key += `_showAdBadge:${showAdBadge}`;
+
+    key += `_shareBaseURL:${shareBaseURL}`;
+
     key += `_requiresAds:${requiresAds}`;
     key += `_adsFetchTimeout:${adsFetchTimeout}`;
     key += `_vastAttributes:${vastAttributesString}`;
-    key += `_showAdBadge:${showAdBadge}`;
-    key += `_videoLaunchBehavior:${videoLaunchBehavior}`;
-    key += `_appLanguage:${appLanguage}`;
-    key += `_hashtagFilterExpression:${hashtagFilterExpression}`;
 
     return (
       <FWVideoFeed
         key={key}
         {...this.props}
+        videoFeedConfiguration={videoFeedConfiguration}
         ref={this._nativeComponentRef}
         onVideoFeedLoadFinished={this._onVideoFeedLoadFinished}
         mode={mode}