react-native-firework-sdk 2.16.1 → 2.17.0-beta.2

package/src/components/StoryBlock.tsx

@@ -1,5 +1,5 @@
 import type { ForwardRefRenderFunction } from 'react';
-import React, {
+import {
   forwardRef,
   useEffect,
   useImperativeHandle,
@@ -10,11 +10,11 @@ import React, {
 
 import {
   findNodeHandle,
-  NativeSyntheticEvent,
+  type NativeSyntheticEvent,
   Platform,
-  StyleProp,
+  type StyleProp,
   UIManager,
-  ViewStyle,
+  type ViewStyle,
 } from 'react-native';
 
 import FireworkSDK from '../FireworkSDK';
@@ -273,7 +273,7 @@ const StoryBlock: ForwardRefRenderFunction<
     let resultString = '';
     const sortedKeyList = Object.keys(dynamicContentParameters).sort();
     for (const key of sortedKeyList) {
-      const value = dynamicContentParameters[key];
+      const value = dynamicContentParameters[key] ?? [];
       const valueString = value.join(',');
       if (resultString.length > 0) {
         resultString += '_';
@@ -463,52 +463,49 @@ const StoryBlock: ForwardRefRenderFunction<
 
   console.log('story block key', key);
 
-  useImperativeHandle(
-    forwardedRef,
-    () => {
-      const sendCommand = (command: string) => {
-        const nativeNodeHandle = findNodeHandle(nativeComponentRef.current);
+  useImperativeHandle(forwardedRef, () => {
+    const sendCommand = (command: string) => {
+      const nativeNodeHandle = findNodeHandle(nativeComponentRef.current);
 
-        let commandId: string | number =
-          UIManager.getViewManagerConfig(NativeComponentName).Commands[command];
-        if (Platform.OS === 'android') {
-          commandId = commandId.toString();
+      let commandId: string | number =
+        UIManager.getViewManagerConfig(NativeComponentName).Commands[command] ??
+        '';
+      if (Platform.OS === 'android') {
+        commandId = commandId.toString();
+      }
+      let reactTag: number | null = findNodeHandle(nativeNodeHandle);
+      FWLoggerUtil.log(
+        `StoryBlock sendCommand: ${command} commandId: ${commandId} nativeNodeHandle: ${nativeNodeHandle} reactTag: ${reactTag}`
+      );
+      if (!nativeNodeHandle || !reactTag) {
+        return;
+      }
+      UIManager.dispatchViewManagerCommand(reactTag, commandId, []);
+    };
+    return {
+      play: () => {
+        sendCommand('play');
+      },
+      pause: () => {
+        sendCommand('pause');
+      },
+      openFullscreen: () => {
+        sendCommand('openFullscreen');
+      },
+      onViewportEntered: () => {
+        if (Platform.OS !== 'ios') {
+          return;
         }
-        let reactTag: number | null = findNodeHandle(nativeNodeHandle);
-        FWLoggerUtil.log(
-          `StoryBlock sendCommand: ${command} commandId: ${commandId} nativeNodeHandle: ${nativeNodeHandle} reactTag: ${reactTag}`
-        );
-        if (!nativeNodeHandle || !reactTag) {
+        sendCommand('onViewportEntered');
+      },
+      onViewportLeft: () => {
+        if (Platform.OS !== 'ios') {
           return;
         }
-        UIManager.dispatchViewManagerCommand(reactTag, commandId, []);
-      };
-      return {
-        play: () => {
-          sendCommand('play');
-        },
-        pause: () => {
-          sendCommand('pause');
-        },
-        openFullscreen: () => {
-          sendCommand('openFullscreen');
-        },
-        onViewportEntered: () => {
-          if (Platform.OS !== 'ios') {
-            return;
-          }
-          sendCommand('onViewportEntered');
-        },
-        onViewportLeft: () => {
-          if (Platform.OS !== 'ios') {
-            return;
-          }
-          sendCommand('onViewportLeft');
-        },
-      };
-    },
-    []
-  );
+        sendCommand('onViewportLeft');
+      },
+    };
+  }, []);
 
   useEffect(() => {
     const subscriptionOfShareBaseURLUpdated =
@@ -600,7 +597,7 @@ const StoryBlock: ForwardRefRenderFunction<
           viewId,
           UIManager.getViewManagerConfig(
             NativeComponentName
-          ).Commands.create.toString(),
+          ).Commands.create?.toString() ?? '',
           [viewId]
         );
       }, 500);

package/src/components/VideoFeed.tsx

@@ -1,13 +1,13 @@
 import React from 'react';
 
 import {
-  EmitterSubscription,
+  type EmitterSubscription,
   findNodeHandle,
-  NativeSyntheticEvent,
+  type NativeSyntheticEvent,
   Platform,
-  StyleProp,
+  type StyleProp,
   UIManager,
-  ViewStyle,
+  type ViewStyle,
 } from 'react-native';
 
 import FireworkSDK from '../FireworkSDK';
@@ -158,7 +158,8 @@ class VideoFeed extends React.Component<IVideoFeedProps, IVideoFeedState> {
     const nativeNodeHandle = findNodeHandle(this._nativeComponentRef.current);
 
     let commandId: string | number =
-      UIManager.getViewManagerConfig(NativeComponentName).Commands.refresh;
+      UIManager.getViewManagerConfig(NativeComponentName).Commands.refresh ??
+      '';
     if (Platform.OS === 'android') {
       commandId = commandId.toString();
     }
@@ -604,7 +605,7 @@ class VideoFeed extends React.Component<IVideoFeedProps, IVideoFeedState> {
     let resultString = '';
     const sortedKeyList = Object.keys(dynamicContentParameters).sort();
     for (const key of sortedKeyList) {
-      const value = dynamicContentParameters[key];
+      const value = dynamicContentParameters[key] ?? [];
       const valueString = value.join(',');
       if (resultString.length > 0) {
         resultString += '_';

package/src/{index.ts → index.tsx}

@@ -124,6 +124,20 @@ import VideoShopping from './VideoShopping';
 export default FireworkSDK;
 
 export {
+  FireworkSDK,
+  FWComponentType,
+  FWNavigator,
+  LiveStream,
+  LiveStreamChatEventName,
+  LiveStreamEventName,
+  LivestreamPlayerDesignVersion,
+  StoryBlock,
+  VideoFeed,
+  VideoFeedUtil,
+  VideoPlaybackEventName,
+  VideoShopping,
+};
+export type {
   AdBadgeConfiguration,
   AdBadgeTextType,
   AdConfiguration,
@@ -143,10 +157,7 @@ export {
   CustomTapProductCardEvent,
   DataTrackingLevel,
   FeedItemDetails,
-  FireworkSDK,
-  FWComponentType,
   FWError,
-  FWNavigator,
   GradientDrawable,
   GradientDrawableOrientation,
   IOSFontInfo,
@@ -156,14 +167,10 @@ export {
   IStoryBlockProps,
   IVideoFeedProps,
   LinkButtonConfiguration,
-  LiveStream,
   LiveStreamChatEvent,
-  LiveStreamChatEventName,
   LiveStreamEvent,
   LiveStreamEventDetails,
-  LiveStreamEventName,
   LiveStreamMessageDetails,
-  LivestreamPlayerDesignVersion,
   MarkInitCalledOptions,
   onLiveStreamChatEventCallback,
   onLiveStreamEventCallback,
@@ -192,14 +199,12 @@ export {
   ShoppingCTACallback,
   ShoppingCTAEvent,
   ShoppingCTAResult,
-  StoryBlock,
   StoryBlockConfiguration,
   StoryBlockSource,
   TrackPurchaseParameters,
   UpdateProductDetailsCallback,
   UpdateProductDetailsEvent,
   VastAttribute,
-  VideoFeed,
   VideoFeedClickCallback,
   VideoFeedClickEvent,
   VideoFeedConfiguration,
@@ -209,12 +214,10 @@ export {
   VideoFeedSource,
   VideoFeedTitleConfiguration,
   VideoFeedTitlePosition,
-  VideoFeedUtil,
   VideoLaunchBehavior,
   VideoPlaybackCallback,
   VideoPlaybackDetails,
   VideoPlaybackEvent,
-  VideoPlaybackEventName,
   VideoPlayerButtonConfiguration,
   VideoPlayerCompleteAction,
   VideoPlayerConfiguration,
@@ -227,5 +230,4 @@ export {
   VideoPlayerLogoOption,
   VideoPlayerSize,
   VideoPlayerStyle,
-  VideoShopping,
 };

package/src/models/VideoPlayerLogoConfiguration.ts

@@ -1,3 +1,10 @@
+// Specifies the logo option
+// Only supported on iOS.
+export type VideoPlayerLogoOption =
+  | 'disabled'
+  | 'creator'
+  | 'channelAggregator';
+
 // Specifies the configuration of the media's logo on the player
 // Only supported on iOS.
 export interface VideoPlayerLogoConfiguration {
@@ -21,10 +28,3 @@ export interface VideoPlayerLogoConfiguration {
    */
   isClickable?: boolean;
 }
-
-// Specifies the logo option
-// Only supported on iOS.
-export type VideoPlayerLogoOption =
-  | 'disabled'
-  | 'creator'
-  | 'channelAggregator';

package/src/modules/FWNavigatorModule.ts

@@ -1,4 +1,8 @@
-import { NativeEventEmitter, NativeModule, NativeModules } from 'react-native';
+import {
+  NativeEventEmitter,
+  type NativeModule,
+  NativeModules,
+} from 'react-native';
 
 import { LINKING_ERROR } from '../constants/FWErrorMessage';
 import type PushRNContainerParams from '../models/PushRNContainerParams';

package/src/modules/FireworkSDKModule.ts

@@ -1,12 +1,16 @@
-import { NativeEventEmitter, NativeModule, NativeModules } from 'react-native';
+import {
+  NativeEventEmitter,
+  type NativeModule,
+  NativeModules,
+} from 'react-native';
 
 import { LINKING_ERROR } from '../constants/FWErrorMessage';
 import type AdBadgeConfiguration from '../models/AdBadgeConfiguration';
 import type SDKInitOptions from '../models/SDKInitOptions';
 import type TrackPurchaseParameters from '../models/TrackPurchaseParameters';
 import type VideoPlayerNativeConfiguration from '../models/VideoPlayerNativeConfiguration';
-import type { DataTrackingLevel } from 'src/models/DataTrackingLevel';
-import type LivestreamPlayerDesignVersion from 'src/models/LivestreamPlayerDesignVersion';
+import type { DataTrackingLevel } from '../models/DataTrackingLevel';
+import type LivestreamPlayerDesignVersion from '../models/LivestreamPlayerDesignVersion';
 
 const FireworkSDKModule = NativeModules.FireworkSDK
   ? NativeModules.FireworkSDK

package/src/modules/LiveStreamModule.ts

@@ -1,4 +1,8 @@
-import { NativeEventEmitter, NativeModule, NativeModules } from 'react-native';
+import {
+  NativeEventEmitter,
+  type NativeModule,
+  NativeModules,
+} from 'react-native';
 
 import { LINKING_ERROR } from '../constants/FWErrorMessage';
 

package/src/modules/ShoppingModule.ts

@@ -1,4 +1,8 @@
-import { NativeEventEmitter, NativeModule, NativeModules } from 'react-native';
+import {
+  NativeEventEmitter,
+  type NativeModule,
+  NativeModules,
+} from 'react-native';
 
 import { LINKING_ERROR } from '../constants/FWErrorMessage';
 import type Product from '../models/Product';

package/src/utils/FWGlobalState.ts

@@ -1,4 +1,4 @@
-import type { FWComponentType } from 'src/models/FWComponentType';
+import type { FWComponentType } from '../models/FWComponentType';
 
 class FWGlobalState {
   private static _instance?: FWGlobalState;

package/android/.idea/codeStyles/Project.xml

@@ -1,124 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/android/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

package/android/gradlew

@@ -1,185 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-exec "$JAVACMD" "$@"