@applicaster/zapp-react-native-utils 15.0.0-rc.99 → 15.1.0-rc.2

package/appUtils/contextKeysManager/__tests__/getKeys/success.test.ts

@@ -1,11 +1,6 @@
-import { NativeModules } from "react-native";
 import { ContextKeysManager } from "../..";
 
 describe("Context Keys Manager - getKeys", () => {
-  beforeEach(() => {
-    delete NativeModules.ContextResolverBridge;
-  });
-
   it("returns value if found by getKey", async () => {
     // setup
     const keys = ["namespace.key"];
@@ -170,47 +165,4 @@ describe("Context Keys Manager - getKeys", () => {
     expect(getKey).toHaveBeenCalledTimes(2);
     expect(getKey.mock.calls).toEqual([[keys[0]], [keys[1]]]);
   });
-
-  it("returns values from native bridge when available", async () => {
-    // setup
-    const keys = ["namespace.key1", "namespace.key2"];
-
-    const contextObj = [
-      { key: keys[0], required: true },
-      { key: keys[1], required: false },
-    ];
-
-    const resolved = {
-      [keys[0]]: "value1",
-      [keys[1]]: "value2",
-    };
-
-    const reactNative = require("react-native");
-
-    const bridgeMock = {
-      resolveContextKeys: jest.fn().mockResolvedValue(resolved),
-    };
-
-    reactNative.__setContextResolverBridgeMock(bridgeMock);
-
-    const contextManager = new ContextKeysManager({});
-    const getKey = jest.spyOn(contextManager, "getKey");
-
-    // run
-    const result = await contextManager.getKeys(keys, contextObj);
-
-    // verify
-    const map = new Map();
-    map.set(keys[0], "value1");
-    map.set(keys[1], "value2");
-
-    expect(result).toEqual(map);
-
-    expect(bridgeMock.resolveContextKeys).toHaveBeenCalledWith({
-      [keys[0]]: true,
-      [keys[1]]: false,
-    });
-
-    expect(getKey).not.toHaveBeenCalled();
-  });
 });

package/appUtils/contextKeysManager/contextResolver.ts

@@ -1,10 +1,8 @@
 import { ContextKeysManager } from "./index";
-import { get, values } from "@applicaster/zapp-react-native-utils/utils";
+import * as R from "ramda";
+import * as _ from "lodash";
 import { useScreenStateStore } from "../../reactHooks/navigation/useScreenStateStore";
 
-const contextKeyPattern = /@{([^/]+)\/([^}]*)}/;
-const contextVariablePattern = /@\{([^}]*)\}/g;
-
 export interface IResolver {
   resolve: (string) => Promise<string | number | object>;
 }
@@ -22,7 +20,7 @@ export class EntryResolver implements IResolver {
       return this.entry;
     }
 
-    return get(this.entry, key.split("."));
+    return R.view(R.lensPath(key.split(".")), this.entry);
   }
 }
 
@@ -41,7 +39,7 @@ export class ScreenStateResolver implements IResolver {
     }
 
     if (key.includes(".")) {
-      return get(screenState, key.split("."));
+      return R.view(R.lensPath(key.split(".")), screenState);
     }
 
     return screenState?.[key];
@@ -63,16 +61,21 @@ export const resolveObjectValues = async (
 
   const resolvedEntries = await Promise.all(
     entries.map(async ([key, value]) => {
-      if (typeof value !== "string" || !value.startsWith("@")) {
+      if (typeof value !== "string") {
         return [key, value];
       }
 
-      const regex = contextKeyPattern;
+      if (!value.startsWith("@")) {
+        return [key, value];
+      }
+
+      const regex = /@{([^/]+)\/([^}]*)}/;
 
       const match = (value as string).match(regex);
 
       if (match) {
-        const [_, contextResolverName, compositeKey] = match;
+        const contextResolverName = match[1];
+        const compositeKey = match[2];
 
         const resolver = exResolvers[contextResolverName] || exResolvers.ctx;
         const resolvedValue = await resolver.resolve(compositeKey);
@@ -87,50 +90,18 @@ export const resolveObjectValues = async (
   return Object.fromEntries(resolvedEntries);
 };
 
-// Simple memoization cache
-const extractAtValuesCache = new Map<any, string[]>();
-
-const flatMapDeep = <T, U>(arr: T[], fn: (value: T) => U | U[]): U[] => {
-  const result: U[] = [];
+export const extractAtValues = _.memoize((input: any): string[] => {
+  return _.flatMapDeep(input, (value: any) => {
+    if (_.isString(value)) {
+      const matches = value.match(/@\{([^}]*)\}/g);
 
-  const flatten = (items: any) => {
-    for (const item of items) {
-      if (Array.isArray(item)) {
-        flatten(item);
-      } else {
-        result.push(item);
-      }
+      return matches ? matches.map((match) => match.slice(2, -1)) : [];
     }
-  };
-
-  flatten(arr.map(fn));
 
-  return result;
-};
-
-export const extractAtValues = (input: any): string[] => {
-  if (extractAtValuesCache.has(input)) {
-    return extractAtValuesCache.get(input)!;
-  }
-
-  const result = flatMapDeep(
-    Array.isArray(input) ? input : [input],
-    (value: any) => {
-      if (typeof value === "string") {
-        const matches = value.match(contextVariablePattern);
-
-        return matches ? matches.map((match) => match.slice(2, -1)) : [];
-      }
-
-      if (typeof value === "object" && value !== null) {
-        return extractAtValues(values(value));
-      }
-
-      return [];
+    if (_.isObject(value)) {
+      return extractAtValues(_.values(value));
     }
-  );
 
-  extractAtValuesCache.set(input, result);
-
-  return result;
-};
+    return [];
+  });
+});

package/appUtils/contextKeysManager/index.ts

@@ -1,4 +1,4 @@
-import { isNil } from "@applicaster/zapp-react-native-utils/utils";
+import * as R from "ramda";
 
 import { StorageLevel, StorageType } from "./consts";
 import {
@@ -13,7 +13,6 @@ import {
   localStorage as LocalStorage,
   secureStorage as SecureStorage,
 } from "./storage";
-import { NativeModules } from "react-native";
 
 export { StorageLevel };
 
@@ -155,65 +154,11 @@ export class ContextKeysManager {
   }
 
   public async getKeys(
-    keys: Array<KeyName>,
-    contextObj?: { key: string; required?: boolean }[]
+    keys: Array<KeyName>
   ): Promise<Map<KeyName, ValueOrNothing>> {
-    if (NativeModules.ContextResolverBridge) {
-      const keysObj: Record<string, boolean> = {};
+    const values = await Promise.all(keys.map((key) => this.getKey(key)));
 
-      const requiredByKey = new Map(
-        contextObj?.map((item) => [item.key, item.required ?? false]) ?? []
-      );
-
-      let hasResolvableKeys = false;
-
-      const normalizedKeys: Array<{
-        original: KeyName;
-        normalized: string | null;
-      }> = [];
-
-      for (const key of keys) {
-        const {
-          isValid: isValidKey,
-          key: parsedKey,
-          namespace: parsedNamespace,
-        } = this.parseKey(key);
-
-        if (!isValidKey) {
-          normalizedKeys.push({ original: key, normalized: null });
-          continue;
-        }
-
-        const normalized = buildNamespaceKey(parsedKey, parsedNamespace);
-
-        keysObj[normalized] = requiredByKey.get(normalized) ?? false;
-        hasResolvableKeys = true;
-        normalizedKeys.push({ original: key, normalized });
-      }
-
-      if (!hasResolvableKeys) {
-        return new Map(
-          normalizedKeys.map(({ original }) => [original, NOTHING])
-        );
-      }
-
-      const res =
-        await NativeModules.ContextResolverBridge.resolveContextKeys(keysObj);
-
-      const resolved = res ?? {};
-
-      return new Map(
-        normalizedKeys.map(({ original, normalized }) => {
-          if (!normalized) return [original, NOTHING];
-
-          return [original, resolved[normalized] ?? NOTHING];
-        })
-      );
-    } else {
-      const values = await Promise.all(keys.map((key) => this.getKey(key)));
-
-      return new Map(keys.map((key, index) => [key, values[index]]));
-    }
+    return new Map(R.zip(keys, values));
   }
 
   public async getKey(key: KeyName): Promise<ValueOrNothing> {
@@ -236,7 +181,7 @@ export class ContextKeysManager {
       parsedNamespace
     );
 
-    if (!isNil(resultByReference)) {
+    if (!R.isNil(resultByReference)) {
       return resultByReference;
     }
 
@@ -247,7 +192,7 @@ export class ContextKeysManager {
         parsedNamespace
       );
 
-      if (!isNil(resultFromSessionStorage)) {
+      if (!R.isNil(resultFromSessionStorage)) {
         return resultFromSessionStorage;
       }
 
@@ -256,7 +201,7 @@ export class ContextKeysManager {
         parsedNamespace
       );
 
-      if (!isNil(resultFromLocalStorage)) {
+      if (!R.isNil(resultFromLocalStorage)) {
         return resultFromLocalStorage;
       }
 
@@ -265,7 +210,7 @@ export class ContextKeysManager {
         parsedNamespace
       );
 
-      if (!isNil(resultFromSecureStorage)) {
+      if (!R.isNil(resultFromSecureStorage)) {
         return resultFromSecureStorage;
       }
 
@@ -330,7 +275,7 @@ export class ContextKeysManager {
       keysProp.map((keyProp) => this.setKey(keyProp))
     );
 
-    return new Map(keys.map((key, index) => [key, values[index]]));
+    return new Map(R.zip(keys, values));
   }
 
   // when succeed saving - return true
@@ -439,7 +384,7 @@ export class ContextKeysManager {
   public async removeKeys(keys: KeyName[]): Promise<Map<KeyName, boolean>> {
     const values = await Promise.all(keys.map((key) => this.removeKey(key)));
 
-    return new Map(keys.map((key, index) => [key, values[index]]));
+    return new Map(R.zip(keys, values));
   }
   // REMOVE
 }

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

@@ -71,9 +71,6 @@ exports[`focusManagerIOS should be defined 1`] = `
   "invokeHandler": [Function],
   "isChildOf": [Function],
   "isFocusOn": [Function],
-  "isFocusOnContent": [Function],
-  "isFocusOnMenu": [Function],
-  "isFocusOnTabsScreenContent": [Function],
   "isGroupItemFocused": [Function],
   "moveFocus": [Function],
   "on": [Function],

package/appUtils/focusManager/index.ios.ts

@@ -4,11 +4,7 @@ import * as R from "ramda";
 import {
   isCurrentFocusOn,
   isChildOf as isChildOfUtils,
-  isPartOfMenu,
-  isPartOfContent,
-  isPartOfTabsScreenContent,
-} from "../focusManagerAux/utils/index.ios";
-
+} from "../focusManagerAux/utils";
 import { Tree } from "./treeDataStructure/Tree";
 import { findFocusableNode } from "./treeDataStructure/Utils";
 import { subscriber } from "../../functionUtils";
@@ -192,15 +188,9 @@ export const focusManager = (function () {
   function register({ id, component }) {
     const { isGroup = false } = component;
 
-    if (isGroup) {
-      registerGroup(id, component);
-    } else {
-      registerItem(id, component);
-    }
+    emitRegistered(id);
 
-    const groupId = component?.props?.groupId;
-
-    emitRegistered({ id, groupId, isGroup });
+    return isGroup ? registerGroup(id, component) : registerItem(id, component);
   }
 
   function unregister(id, { group = false } = {}) {
@@ -283,9 +273,7 @@ export const focusManager = (function () {
   function setFocus(
     id: string,
     direction?: FocusManager.IOS.Direction,
-    options?: Partial<{
-      groupFocusedChanged: boolean;
-    }>,
+    options?: Partial<{ groupFocusedChanged: boolean }>,
     callback?: any
   ) {
     blur(direction);
@@ -424,30 +412,6 @@ export const focusManager = (function () {
     return id && isCurrentFocusOn(id, currentFocusNode);
   }
 
-  function isFocusOnMenu(): boolean {
-    const currentFocusable = getCurrentFocus();
-
-    return isPartOfMenu(focusableTree, currentFocusable?.props?.id);
-  }
-
-  function isFocusOnContent(): boolean {
-    const currentFocusable = getCurrentFocus();
-
-    return isPartOfContent(focusableTree, currentFocusable?.props?.id);
-  }
-
-  function isFocusOnTabsScreenContent(
-    screenPickerContentContainerId: string
-  ): boolean {
-    const currentFocusable = getCurrentFocus();
-
-    return isPartOfTabsScreenContent(
-      focusableTree,
-      screenPickerContentContainerId,
-      currentFocusable?.props?.id
-    );
-  }
-
   function isChildOf(childId, parentId): boolean {
     return isChildOfUtils(focusableTree, childId, parentId);
   }
@@ -474,9 +438,6 @@ export const focusManager = (function () {
     isGroupItemFocused,
     getPreferredFocusChild,
     isFocusOn,
-    isFocusOnMenu,
-    isFocusOnContent,
-    isFocusOnTabsScreenContent,
     isChildOf,
   };
 })();

package/appUtils/focusManagerAux/utils/index.ts

@@ -13,7 +13,7 @@ import {
 
 import {
   getFocusableId,
-  SCREEN_PICKER_CONTAINER,
+  isTabsScreenContentContainerId,
 } from "@applicaster/zapp-react-native-utils/screenPickerUtils";
 
 // run check each 300 ms
@@ -24,8 +24,6 @@ const isTopMenu = (node) => startsWith(QUICK_BRICK_NAVBAR, node?.id);
 const isContent = (node) => startsWith(QUICK_BRICK_CONTENT, node?.id);
 const isRoot = (node) => node?.id === "root";
 
-const isScrenPicker = (node) => startsWith(SCREEN_PICKER_CONTAINER, node?.id);
-
 type Props = {
   maxTimeout: number;
   conditionFn: () => boolean;
@@ -102,7 +100,7 @@ export const getNavbarNode = (focusableTree) => {
 
 export const waitForContent = (focusableTree) => {
   const contentHasAnyChildren = (): boolean => {
-    const countOfChildren = pathOr<number>(
+    const countOfChildren = pathOr(
       0,
       ["children", "length"],
       getContentNode(focusableTree)
@@ -136,7 +134,7 @@ export const isTabsScreenOnContentFocused = (node) => {
     return false;
   }
 
-  if (isScrenPicker(node)) {
+  if (isTabsScreenContentContainerId(node?.id)) {
     return true;
   }
 

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

@@ -1,9 +1,7 @@
-import { ReplaySubject, Subject } from "rxjs";
-import { filter, switchMap, take, withLatestFrom, map } from "rxjs/operators";
-
+import { ReplaySubject } from "rxjs";
+import { filter } from "rxjs/operators";
 import { BUTTON_PREFIX } from "@applicaster/zapp-react-native-ui-components/Components/MasterCell/DefaultComponents/tv/TvActionButtons/const";
 import { focusManager } from "@applicaster/zapp-react-native-utils/appUtils/focusManager/index.ios";
-import { isPartOfMenu, isPartOfContent } from "./index.ios";
 
 type FocusableID = string;
 type RegistrationEvent = {
@@ -11,25 +9,6 @@ type RegistrationEvent = {
   registered: boolean;
 };
 
-let focusableViewRegistrationSubject$ = new Subject<{
-  id: FocusableID;
-  groupId: FocusableID;
-}>();
-
-let focusableGroupRegistrationSubject$ = new ReplaySubject<{
-  id: FocusableID;
-}>();
-
-let focusableNativeViewRegistrationSubject$ = new Subject<{
-  id: FocusableID;
-  groupId: FocusableID;
-}>();
-
-let focusableNativeGroupRegistrationSubject$ = new ReplaySubject<{
-  id: FocusableID;
-  groupId: FocusableID;
-}>();
-
 const isFocusableButton = (id: Option<FocusableID>): boolean =>
   id && id.includes?.(BUTTON_PREFIX);
 
@@ -43,189 +22,14 @@ export const focusableButtonsRegistration$ = (focusableGroupId: string) =>
     )
   );
 
-export const resetFocusableRegistration = () => {
-  // complete the old subject so subscribers are notified and resources are freed
-  if (!focusableViewRegistrationSubject$.closed) {
-    focusableViewRegistrationSubject$.complete();
-  }
-
-  if (!focusableGroupRegistrationSubject$.closed) {
-    focusableGroupRegistrationSubject$.complete();
-  }
-
-  if (!focusableNativeViewRegistrationSubject$.closed) {
-    focusableNativeViewRegistrationSubject$.complete();
-  }
-
-  if (!focusableNativeGroupRegistrationSubject$.closed) {
-    focusableNativeGroupRegistrationSubject$.complete();
-  }
-
-  focusableViewRegistrationSubject$ = new Subject<{
-    id: FocusableID;
-    groupId: FocusableID;
-  }>();
-
-  focusableGroupRegistrationSubject$ = new ReplaySubject<{
-    id: FocusableID;
-  }>();
-
-  focusableNativeViewRegistrationSubject$ = new Subject<{
-    id: FocusableID;
-    groupId: FocusableID;
-  }>();
-
-  focusableNativeGroupRegistrationSubject$ = new ReplaySubject<{
-    id: FocusableID;
-    groupId: FocusableID;
-  }>();
-};
-
-const focusableNativeViewRegistration = ({ focusableView, focusableGroup }) => {
-  return focusableNativeViewRegistrationSubject$.pipe(
-    filter(
-      (focusableNativeView) => focusableNativeView.id === focusableView.id
-    ),
-    take(1),
-    switchMap((focusableNativeView) =>
-      // start waiting registration of its parent FocusableNativeGroup
-      focusableNativeGroupRegistrationSubject$.pipe(
-        filter(
-          (focusableNativeGroup) =>
-            focusableNativeGroup.id === focusableNativeView.groupId
-        ),
-        take(1),
-        map((focusableNativeGroup) => ({
-          focusableNativeGroup,
-          focusableNativeView,
-          focusableView,
-          focusableGroup,
-        }))
-      )
-    )
-  );
-};
-
-export const firstFocusableViewRegistrationFactory = () =>
-  focusableViewRegistrationSubject$.pipe(
-    take(1), // we care about only first FocusableView registration
-    switchMap((focusableView) =>
-      // start waiting registration of its parent FocusableGroup
-      focusableGroupRegistrationSubject$.pipe(
-        filter((focusableGroup) => focusableGroup.id === focusableView.groupId),
-        take(1),
-        map((focusableGroup) => ({
-          focusableView,
-          focusableGroup,
-        }))
-      )
-    ),
-    // start waiting registration for FocusableNativeView and its parent FocusableNativeGroup
-    switchMap(({ focusableView, focusableGroup }) =>
-      focusableNativeViewRegistration({
-        focusableView,
-        focusableGroup,
-      })
-    )
-  );
-
-// registration on RN level(into RN focusManager)
-export const emitRegistered = ({
-  id,
-  groupId,
-  isGroup,
-}: {
-  id: Option<FocusableID>;
-  groupId: Option<FocusableID>;
-  isGroup: boolean;
-}): void => {
+export const emitRegistered = (id: Option<FocusableID>): void => {
   if (isFocusableButton(id)) {
     registeredSubject$.next({ id, registered: true });
   }
-
-  if (isGroup && id) {
-    focusableGroupRegistrationSubject$.next({ id });
-  }
-
-  if (!isGroup && id && groupId) {
-    focusableViewRegistrationSubject$.next({ id, groupId });
-  }
 };
 
-// unregistration on RN level(into RN focusManager)
 export const emitUnregistered = (id: Option<FocusableID>): void => {
   if (isFocusableButton(id)) {
     registeredSubject$.next({ id, registered: false });
   }
 };
-
-// registration focusableNativeView and focusableNativeGroup
-export const emitNativeRegistered = ({
-  id,
-  groupId,
-  isGroup,
-}: {
-  id: Option<FocusableID>;
-  groupId: Option<FocusableID>;
-  isGroup: boolean;
-}): void => {
-  if (!isGroup && id && groupId) {
-    focusableNativeViewRegistrationSubject$.next({ id, groupId });
-  }
-
-  if (isGroup && id && groupId) {
-    focusableNativeGroupRegistrationSubject$.next({ id, groupId });
-  }
-};
-
-// /////
-
-const focusedSubject$ = new Subject<FocusableID>();
-
-const focused$ = focusedSubject$.asObservable();
-
-export const emitFocused = (id: FocusableID): void => {
-  focusedSubject$.next(id);
-};
-
-export const topMenuItemFocused$ = focused$.pipe(
-  filter((id) => id && isPartOfMenu(focusManager.focusableTree, id))
-);
-
-export const contentFocused$ = focused$.pipe(
-  filter((id) => {
-    const isContent = isPartOfContent(focusManager.focusableTree, id);
-
-    return id && isContent;
-  })
-);
-
-const createFocusableRegistry = () => {
-  const subject$ = new ReplaySubject<FocusableID | undefined>(1);
-
-  return {
-    observable$: subject$.asObservable(),
-    register: (id: FocusableID) => {
-      // save focusable_id on registration
-      subject$.next(id);
-    },
-    unregister: () => {
-      // reset focusable_id on unregistration
-      subject$.next(undefined);
-    },
-  };
-};
-
-/// HOME_TOP_MENU_ITEM
-export const HomeTopMenuItemRegistry = createFocusableRegistry();
-
-export const homeTopMenuItemFocused$ = topMenuItemFocused$.pipe(
-  withLatestFrom(HomeTopMenuItemRegistry.observable$),
-  filter(([id, homeId]) => id === homeId)
-);
-
-/// SCREEN_PICKER
-export const ScreenPickerContentContainerRegistry = createFocusableRegistry();
-
-/// SEARCH_INPUT
-export const SearchInputRegistry = createFocusableRegistry();

package/appUtils/keyCodes/keys/keys.web.ts

@@ -10,7 +10,10 @@ import { Platform } from "react-native";
  * platformKeys[Platform.OS] should only include keys
  * that are unique to that platform, i.e. Exit: { keyCode: 10182 }
  */
-export const KEYS = Object.assign(platformKeys.web, platformKeys[Platform.OS]);
+export const KEYS = Object.assign(
+  platformKeys["web"],
+  platformKeys[Platform.OS]
+);
 
 export const ARROW_KEYS = [
   KEYS.ArrowUp,

package/appUtils/localizationsHelper.ts

@@ -85,6 +85,10 @@ export const toDayJSLocaleMap = (code) => {
     tt: null,
     "es-LA": "es",
     "en-UK": "en-gb",
+    "en-ZA": null,
+    "en-NG": null,
+    "en-ZW": null,
+    "en-ZM": null,
   };
 
   if (map[code] === null) {