@applicaster/zapp-react-native-utils 13.0.0-rc.13 → 13.0.0-rc.131

package/alertUtils/index.ts

@@ -1,148 +1 @@
-import { Alert } from "react-native";
-import { isWeb } from "@applicaster/zapp-react-native-utils/reactUtils";
-import { confirmationDialogStore } from "@applicaster/zapp-react-native-ui-components/Contexts/ConfirmDialogState";
-
-// #region "Alert Dialog"
-
-const globalAny: any = global;
-
-const showWebAlertDialog = ({ message, completion }: AlertWebDialog) => {
-  globalAny?.alert?.(message);
-  completion?.();
-};
-
-const showNativeAlertDialog = ({
-  title,
-  message,
-  okButtonText,
-  completion,
-}: AlertDialogType) => {
-  Alert.alert(title, message, [
-    {
-      text: okButtonText,
-      onPress: completion,
-    },
-  ]);
-};
-
-export const showAlertDialog = ({
-  title,
-  message,
-  okButtonText,
-  completion,
-}: AlertDialogType) => {
-  if (isWeb()) {
-    showWebAlertDialog({ message, completion });
-  } else {
-    showNativeAlertDialog({
-      title,
-      message,
-      okButtonText,
-      completion,
-    });
-  }
-};
-
-// #endregion "Alert Dialog"
-
-// #region "Confirmation Dialog"
-
-const showWebDialog = ({
-  message,
-  confirmCompletion,
-  cancelCompletion,
-}: WebConfirmationDialog) => {
-  const isConfirmed = globalAny?.confirm?.(message);
-
-  if (isConfirmed) {
-    confirmCompletion?.();
-  } else {
-    cancelCompletion?.();
-  }
-};
-
-const showNativeDialog = ({
-  title,
-  message,
-  okButtonText,
-  cancelButtonText,
-  confirmCompletion,
-  cancelCompletion,
-}: ConfirmationDialog) => {
-  Alert.alert(title, message, [
-    {
-      text: cancelButtonText,
-      onPress: cancelCompletion,
-    },
-    {
-      text: okButtonText,
-      style: "destructive",
-      onPress: confirmCompletion,
-    },
-  ]);
-};
-
-const handleCustomDialog = (data) => {
-  const {
-    showDialog,
-    hideDialog,
-    setConfirmAction,
-    setCancelAction,
-    setMessages,
-  } = confirmationDialogStore.getState();
-
-  setMessages(data.messages);
-
-  if (data?.cancelCompletion) {
-    setCancelAction(() => {
-      data.cancelCompletion();
-      hideDialog();
-    });
-  }
-
-  if (data?.confirmCompletion) {
-    setConfirmAction(() => {
-      data.confirmCompletion();
-      hideDialog();
-    });
-  }
-
-  showDialog();
-};
-
-export const showConfirmationDialog = ({
-  title,
-  message,
-  okButtonText,
-  cancelButtonText,
-  confirmCompletion,
-  cancelCompletion,
-}: CustomConfirmationDialog): void => {
-  if (isWeb()) {
-    if (cancelCompletion) {
-      handleCustomDialog({
-        messages: {
-          title,
-          message,
-          okButtonText,
-          cancelButtonText,
-        },
-        confirmCompletion,
-        cancelCompletion,
-      });
-    } else {
-      showWebDialog({ message, confirmCompletion, cancelCompletion });
-    }
-  } else {
-    showNativeDialog({
-      title,
-      message,
-      okButtonText,
-      cancelButtonText,
-      confirmCompletion,
-      cancelCompletion,
-    });
-  }
-};
-
-// #endregion "Confirmation Dialog"
+export { showAlertDialog, showConfirmationDialog } from "./alert";

package/analyticsUtils/AnalyticPlayerListener.ts

@@ -14,7 +14,7 @@ export class AnalyticPlayerListener
   static analyticsListenerID = "analytics-listener";
   private analyticsTracker: PlayerAnalyticsTracker;
   private player: Player;
-
+  private isSeeking: boolean = false;
   private onVideoLoadCalled; // android only
 
   constructor(props: Props) {
@@ -40,10 +40,27 @@ export class AnalyticPlayerListener
   };
 
   onPlayerPause = (event) => {
+    if (this.player?.seekController?.isSeeking()) {
+      this.isSeeking = true;
+
+      return;
+    }
+
     this.handleAnalyticEvent(PLAYBACK_EVENT.pause, event);
   };
 
   onPlayerResume = (event) => {
+    if (this.player?.seekController?.isSeeking()) {
+      return;
+    }
+
+    if (this.isSeeking) {
+      // Fallback due to player resume event been async and arriving with delays
+      this.isSeeking = false;
+
+      return;
+    }
+
     this.handleAnalyticEvent(PLAYBACK_EVENT.play, event);
   };
 

package/analyticsUtils/__tests__/__snapshots__/analyticsManagerNoModule.test.js.snap

@@ -1,24 +1,24 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`AnalyticsManager - with undefined Native Module doesn't crash when calling the methods 1`] = `
-Array [
-  Array [
-    Object {
+[
+  [
+    {
       "message": "Analytics Bridge is missing - no event will be sent",
     },
   ],
-  Array [
-    Object {
+  [
+    {
       "message": "Analytics Bridge is missing - no event will be sent",
     },
   ],
-  Array [
-    Object {
+  [
+    {
       "message": "Analytics Bridge is missing - no event will be sent",
     },
   ],
-  Array [
-    Object {
+  [
+    {
       "message": "Analytics Bridge is missing - no event will be sent",
     },
   ],

package/analyticsUtils/currentScreenProperities.ts

@@ -72,12 +72,14 @@ const mappedScreenPropertiesScreen = (
   screenData
 ): AnalyticsScreenProperties => {
   return {
-    screen_name: screenData?.targetScreen?.name,
+    screen_name: screenData?.targetScreen?.name || screenData?.name,
     screen_entry_title: screenData?.title,
     screen_entry_id: R.isNil(screenData?.type) ? null : screenData?.id,
-    screen_layout_id: screenData?.targetScreen?.id,
-    screen_type: screenData?.targetScreen?.type,
-    home_screen: screenData?.targetScreen?.home,
+    screen_layout_id: screenData?.targetScreen?.id || screenData?.id,
+    screen_type: screenData?.targetScreen?.type || screenData?.type,
+    home_screen: !R.isNil(screenData?.targetScreen?.home)
+      ? screenData?.targetScreen?.home
+      : screenData?.home,
   };
 };
 

package/analyticsUtils/helpers/hooks.ts

@@ -2,7 +2,7 @@ import * as R from "ramda";
 import * as React from "react";
 
 import { isTV } from "@applicaster/zapp-react-native-utils/reactUtils";
-import { useScreenContext } from "@applicaster/zapp-react-native-utils/reactHooks/screen";
+import { useScreenContext } from "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenContext";
 
 import { getAnalyticsScreenPropertiesFromScreenData } from "@applicaster/zapp-react-native-utils/analyticsUtils/currentScreenProperities";
 import { useAnalytics } from "@applicaster/zapp-react-native-utils/analyticsUtils";

package/appUtils/HooksManager/Hook.ts

@@ -16,7 +16,7 @@ const BASE_HOOK_PROPERTIES = ["screen_id", "identifier", "weight"];
  * @returns {number} index
  */
 const hookState: (
-  arg0: typeof HOOKS_EVENTS[keyof typeof HOOKS_EVENTS]
+  arg0: (typeof HOOKS_EVENTS)[keyof typeof HOOKS_EVENTS]
 ) => number = R.indexOf(R.__, R.values(HOOKS_EVENTS));
 
 /**
@@ -62,9 +62,13 @@ export class Hook implements HookInterface {
    * @param {Array<Any>} args variadic arguments to invoke the handler with
    */
   setStateAndNotify(
-    event: typeof HOOKS_EVENTS[keyof typeof HOOKS_EVENTS],
+    event: (typeof HOOKS_EVENTS)[keyof typeof HOOKS_EVENTS],
     ...args
   ) {
+    if (this.state === hookState(HOOKS_EVENTS.CANCEL)) {
+      return;
+    }
+
     this.state = hookState(event);
     this.manager.subscriber.invokeHandler(event, ...args);
   }

package/appUtils/HooksManager/__tests__/__snapshots__/hook.test.js.snap

@@ -2,27 +2,27 @@
 
 exports[`Hook Hook Properties has all the hook properties 1`] = `
 Hook {
-  "advertising": Object {},
-  "general": Object {
+  "advertising": {},
+  "general": {
     "allow_screen_plugin_presentation": true,
     "is_flow_blocker": true,
   },
-  "hooks": Array [],
+  "hooks": [],
   "id": "A1234",
   "identifier": "hook_screen",
   "lastHook": true,
-  "manager": Object {
+  "manager": {
     "executeHook": [MockFunction],
     "presentScreenHook": [MockFunction],
-    "subscriber": Object {
+    "subscriber": {
       "invokeHandler": [MockFunction],
     },
   },
   "name": "Hook Screen",
-  "navigations": Array [],
+  "navigations": [],
   "screen_id": "A1234",
   "state": 0,
-  "styles": Object {},
+  "styles": {},
   "type": "hook_screen",
   "weight": 1,
 }