@applicaster/zapp-react-native-utils 15.0.0-alpha.3564837831 → 15.0.0-alpha.4043532513

package/analyticsUtils/analyticsMapper.ts

@@ -63,10 +63,14 @@ class StateHolder {
     return value as string;
   }
 
+  public get analyticsCustomPropertiesConsumed(): boolean {
+    return this._cap !== undefined;
+  }
+
   private acp(prefix: string, suffix: string): string | null {
     if (this._cap === undefined) {
-      this._cap = this.pluckedParams[prefix]
-        ? JSON.parse(this.pluckedParams[prefix])
+      this._cap = this.event.params[prefix]
+        ? JSON.parse(this.event.params[prefix])
         : null;
 
       delete this.pluckedParams[prefix];
@@ -254,6 +258,10 @@ export class Mapper {
 
     let params = resultParams.size ? Object.fromEntries(resultParams) : {};
 
+    if (state.analyticsCustomPropertiesConsumed) {
+      delete params[sourceType.analyticsCustomProperties];
+    }
+
     // deal with the remaining params
     if (!isEmptyOrNil(state.pluckedParams)) {
       if (rule.strategy) {

package/appUtils/focusManager/__tests__/__snapshots__/focusManager.test.js.snap

@@ -73,7 +73,7 @@ exports[`focusManagerIOS should be defined 1`] = `
   "isFocusOn": [Function],
   "isFocusOnContent": [Function],
   "isFocusOnMenu": [Function],
-  "isFocusOnTabsScreen": [Function],
+  "isFocusOnTabsScreenContent": [Function],
   "isGroupItemFocused": [Function],
   "moveFocus": [Function],
   "on": [Function],

package/appUtils/focusManager/index.ios.ts

@@ -6,7 +6,7 @@ import {
   isChildOf as isChildOfUtils,
   isPartOfMenu,
   isPartOfContent,
-  isPartOfTabsScreen,
+  isPartOfTabsScreenContent,
 } from "../focusManagerAux/utils/index.ios";
 
 import { Tree } from "./treeDataStructure/Tree";
@@ -17,7 +17,6 @@ import { findChild } from "./utils";
 import {
   emitRegistered,
   emitUnregistered,
-  emitWillFocused,
 } from "../focusManagerAux/utils/utils.ios";
 
 const { FocusableManagerModule } = NativeModules;
@@ -292,8 +291,6 @@ export const focusManager = (function () {
     blur(direction);
     currentFocus = id;
 
-    emitWillFocused(id);
-
     // Extract groupFocusedChanged with a default value of false
     let groupFocusedChanged = false;
 
@@ -439,12 +436,14 @@ export const focusManager = (function () {
     return isPartOfContent(focusableTree, currentFocusable?.props?.id);
   }
 
-  function isFocusOnTabsScreen(tabsScreenContainerId: string): boolean {
+  function isFocusOnTabsScreenContent(
+    screenPickerContentContainerId: string
+  ): boolean {
     const currentFocusable = getCurrentFocus();
 
-    return isPartOfTabsScreen(
+    return isPartOfTabsScreenContent(
       focusableTree,
-      tabsScreenContainerId,
+      screenPickerContentContainerId,
       currentFocusable?.props?.id
     );
   }
@@ -477,7 +476,7 @@ export const focusManager = (function () {
     isFocusOn,
     isFocusOnMenu,
     isFocusOnContent,
-    isFocusOnTabsScreen,
+    isFocusOnTabsScreenContent,
     isChildOf,
   };
 })();

package/appUtils/focusManagerAux/utils/index.ios.ts

@@ -9,9 +9,9 @@ const isNavBar = (node) => startsWith(QUICK_BRICK_NAVBAR, node?.id);
 const isContent = (node) => startsWith(QUICK_BRICK_CONTENT, node?.id);
 const isRoot = (node) => node?.id === "root";
 
-export const isPartOfTabsScreen = (
+export const isPartOfTabsScreenContent = (
   focusableTree,
-  tabsScreenContainerId,
+  screenPickerContentContainerId,
   id
 ) => {
   const node = focusableTree.findInTree(id);
@@ -32,13 +32,13 @@ export const isPartOfTabsScreen = (
     return false;
   }
 
-  if (node?.id === tabsScreenContainerId) {
+  if (node?.id === screenPickerContentContainerId) {
     return true;
   }
 
-  return isPartOfTabsScreen(
+  return isPartOfTabsScreenContent(
     focusableTree,
-    tabsScreenContainerId,
+    screenPickerContentContainerId,
     node.parent?.id
   );
 };

package/appUtils/focusManagerAux/utils/utils.ios.ts

@@ -178,34 +178,27 @@ export const emitNativeRegistered = ({
   }
 };
 
-// Focusable has been focused
-const willFocusedSubject$ = new Subject<FocusableID>();
-const didFocusedSubject$ = new Subject<FocusableID>();
+// /////
 
-export const willFocused$ = willFocusedSubject$.asObservable();
+const focusedSubject$ = new Subject<FocusableID>();
 
-export const didFocused$ = didFocusedSubject$.asObservable();
+const focused$ = focusedSubject$.asObservable();
 
-export const emitWillFocused = (id: FocusableID): void => {
-  willFocusedSubject$.next(id);
+export const emitFocused = (id: FocusableID): void => {
+  focusedSubject$.next(id);
 };
 
-export const emitDidFocused = (id: FocusableID): void => {
-  didFocusedSubject$.next(id);
-};
-
-export const topMenuItemDidFocused$ = didFocused$.pipe(
+export const topMenuItemFocused$ = focused$.pipe(
   filter((id) => id && isPartOfMenu(focusManager.focusableTree, id))
 );
 
-export const contentDidFocused$ = didFocused$.pipe(
+export const contentFocused$ = focused$.pipe(
   filter((id) => {
     const isContent = isPartOfContent(focusManager.focusableTree, id);
 
     return id && isContent;
   })
 );
-// Focusable has been focused
 
 const createFocusableRegistry = () => {
   const subject$ = new ReplaySubject<FocusableID | undefined>(1);
@@ -226,17 +219,13 @@ const createFocusableRegistry = () => {
 /// HOME_TOP_MENU_ITEM
 export const HomeTopMenuItemRegistry = createFocusableRegistry();
 
-export const homeTopMenuItemDidFocused$ = topMenuItemDidFocused$.pipe(
+export const homeTopMenuItemFocused$ = topMenuItemFocused$.pipe(
   withLatestFrom(HomeTopMenuItemRegistry.observable$),
   filter(([id, homeId]) => id === homeId)
 );
 
-/// TABS SCREEN
-export const TabsScreenContentContainerRegistry = createFocusableRegistry();
-
-export const TabsScreenScreenSelectorContainerRegistry =
-  createFocusableRegistry();
-/// TABS SCREEN
+/// SCREEN_PICKER
+export const ScreenPickerContentContainerRegistry = createFocusableRegistry();
 
 /// SEARCH_INPUT
 export const SearchInputRegistry = createFocusableRegistry();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-utils",
-  "version": "15.0.0-alpha.3564837831",
+  "version": "15.0.0-alpha.4043532513",
   "description": "Applicaster Zapp React Native utilities package",
   "main": "index.js",
   "types": "index.d.ts",
@@ -27,13 +27,13 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "15.0.0-alpha.3564837831",
+    "@applicaster/applicaster-types": "15.0.0-alpha.4043532513",
     "buffer": "^5.2.1",
     "camelize": "^1.0.0",
     "dayjs": "^1.11.10",
+    "handlebars": "4.7.8",
     "memoizee": "0.4.15",
-    "prop-types": "^15.0.0",
-    "react-native-handlebars": "^5.0.0-alpha.1"
+    "prop-types": "^15.0.0"
   },
   "peerDependencies": {
     "@applicaster/zapp-pipes-v2-client": "*",

package/stringUtils/index.ts

@@ -4,7 +4,7 @@ declare const global;
 import * as R from "ramda";
 import camelize from "camelize";
 // @ts-ignore
-import Handlebars from "react-native-handlebars";
+import Handlebars from "handlebars";
 
 global.Buffer = global.Buffer || require("buffer").Buffer;