@applicaster/zapp-react-native-utils 13.0.0-alpha.1436249127 → 13.0.0-alpha.1486614302

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,
 }