@applicaster/zapp-react-native-utils 12.0.0-alpha.5350212300 → 12.0.0-alpha.5400461972

package/reactHooks/navigation/index.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-use-before-define */
 /* eslint max-len: off */
 
-import React, { useEffect, useMemo } from "react";
+import React, { useContext, useEffect, useMemo } from "react";
 import { BackHandler, InteractionManager, NativeModules } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
@@ -31,6 +31,7 @@ import { isTV } from "@applicaster/zapp-react-native-utils/reactUtils";
 import { useNavbarState } from "../screen";
 import { useNavigation } from "./useNavigation";
 import { useModalStore } from "../../modalState";
+import { ScreenDataContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenDataContext";
 
 export { useNavigation } from "./useNavigation";
 
@@ -146,16 +147,8 @@ export const useRoute = (): {
   pathname: string;
 } => {
   const pathname = usePathname() || "";
-
-  /**
-   * compose `useRoute()` output data
-   */
-  const composeRouteData = (screenData: VariousScreenData) => ({
-    screenData,
-    pathname,
-  });
-
   const navigator = useNavigation();
+  const screenDataContext = legacyScreenData(useContext(ScreenDataContext));
 
   const { plugins, contentTypes, rivers } = usePickFromState([
     "plugins",
@@ -163,10 +156,11 @@ export const useRoute = (): {
     "contentTypes",
   ]);
 
-  const currentStack = navigator.getStackForPathname(pathname);
   const { modalState } = useModalStore();
   const hookModalState = useZappHooksModalState();
+
   const modalScreenData = modalState.screen;
+
   const hookModalScreenData = hookModalState.state.screenData?.payload;
 
   const videoModalScreenData =
@@ -183,15 +177,6 @@ export const useRoute = (): {
       plugins
     );
 
-  const currentRouteScreenData = legacyScreenData(
-    {
-      screen: currentStack?.state?.screen ?? navigator.data?.screen ?? {},
-      entry: currentStack?.state?.entry ?? {},
-    } as NavigationScreenData,
-
-    plugins
-  );
-
   // There are 4 route scenarios
   // For regular screens take date from navigator stack.
   // is path is model grab screenData from modal state
@@ -200,63 +185,30 @@ export const useRoute = (): {
   // if path is hook grab screenData from screenData
 
   if (isModalPathname(pathname)) {
-    return composeRouteData(modalScreenData ?? ({} as ZappEntry));
+    const screenData = modalScreenData ?? ({} as ZappEntry);
+
+    return { screenData, pathname };
   }
 
   if (isVideoModalPathname(pathname)) {
-    return composeRouteData(videoModalScreenData as LegacyNavigationScreenData);
+    const screenData = videoModalScreenData as LegacyNavigationScreenData;
+
+    return { screenData, pathname };
   }
 
   if (isHookModalPathname(pathname)) {
-    return composeRouteData(hookModalScreenData);
+    const screenData = hookModalScreenData;
+
+    return { screenData, pathname };
   }
 
   if (isHookPathname(pathname)) {
-    /**
-     * HACK
-     *
-     * This condition relies on hacky approach to get the current hook screen data
-     * using navigator.screenData for some cases.
-     * This is used when hook is in sequence.
-     */
-
-    // case 1: stack not yet updated in navigator context, but navigator.screenData is updated already.
-    if (!currentStack) {
-      return composeRouteData(navigator.screenData);
-    }
-
-    const isValidHookInCurrentRouteScreenData =
-      "hookPlugin" in currentRouteScreenData &&
-      !!currentRouteScreenData.hookPlugin?.module;
-
-    let screenData;
-
-    // case 2: stack has valid hook data
-    if (isValidHookInCurrentRouteScreenData) {
-      screenData = currentRouteScreenData;
-    }
-
-    const navigatorScreenData = navigator.screenData as NavigatorEntry;
-
-    // case 3: current hookPlugin is missing weight, but navigator.screenData has weight, use navigator.screenData
-    if (
-      screenData.hookPlugin.identifier ===
-        navigatorScreenData?.hookPlugin?.identifier &&
-      !screenData.hookPlugin?.weight &&
-      navigatorScreenData?.hookPlugin?.weight
-    ) {
-      screenData = navigator.screenData;
-    }
-
-    return composeRouteData(screenData);
+    return { screenData: screenDataContext, pathname };
   }
 
-  // case 1: stack not yet updated in navigator context, but navigator.screenData is updated already.
-  if (!currentStack) {
-    return composeRouteData(navigator.screenData);
-  }
+  const screenData = screenDataContext;
 
-  return composeRouteData(currentRouteScreenData);
+  return { screenData, pathname };
 };
 
 type Callbacks = Partial<{
@@ -496,18 +448,3 @@ export const useIsScreenActive = () => {
 
   return pathname === currentRoute;
 };
-
-type Return = (prefix: string) => string;
-
-export const useUniqueRouteSuffix = (): Return => {
-  const pathname = usePathname();
-  const { currentRoute } = useNavigation();
-
-  const suffix = `currentRoute:${currentRoute}_pathname:${pathname}`;
-
-  const withUniqueRouteSuffix = React.useCallback((prefix: string) => {
-    return `${prefix}___${suffix}`;
-  }, []);
-
-  return withUniqueRouteSuffix;
-};

package/reactHooks/screen/useScreenContext.ts

@@ -5,7 +5,7 @@ import { useNestedNavigationContext } from "@applicaster/zapp-react-native-ui-co
 import { useNavigation } from "../navigation/useNavigation";
 
 import { ScreenContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenContext";
-import { ScreenDataContext } from "@applicaster/zapp-react-native-ui-components/Components/Layout/TV";
+import { ScreenDataContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenDataContext";
 
 export function useScreenContextV2() {
   return useContext(ScreenContext);
@@ -45,8 +45,8 @@ export function useSetNavbarState() {
 
 export function useScreenContext(): NavigationScreenData {
   const navigator = useNavigation();
-
-  const screenData = useContext(ScreenDataContext);
+  // Cover cases where screenContext is used before navigation is initialized
+  const screenData = useContext(ScreenDataContext) || navigator.data;
 
   const modalScreenData = navigator?.modalData;
 

package/reactUtils/helpers.tsx

@@ -7,7 +7,7 @@ export const isAnyNil = R.any(R.isNil);
 
 export const isNilOrEmpty = R.either(R.isNil, R.isEmpty);
 
-export const isNotEmpty = R.both(isNotNil, R.complement(R.isEmpty));
+export const isNotEmpty = R.complement(R.isEmpty);
 
 export const withoutNil = R.reject(R.isNil);
 

package/types.ts

@@ -5,3 +5,7 @@ export type ManifestField<T> = {
   group?: boolean;
   fields?: ManifestField<any>[];
 };
+
+export enum ENDPOINT_TAGS {
+  allow_missing_keys = "allow_missing_keys",
+}

package/appUtils/focusManager/utils/index.ts

@@ -1,65 +0,0 @@
-import { isNotNil } from "@applicaster/zapp-react-native-utils/reactUtils/helpers";
-import { find, last, startsWith } from "ramda";
-
-// run check each 300 ms
-// run this check too often could lead to performance penalty on low-end devices
-const HOW_OFTEN_TO_CHECK_CONDITION = 300; //ms
-
-type Props = {
-  maxTimeout: number;
-  conditionFn: () => boolean;
-};
-
-export const waitUntil = ({ maxTimeout, conditionFn }: Props) => {
-  let interval;
-  return new Promise((resolve, reject) => {
-    interval = setInterval(() => {
-      if (conditionFn()) {
-        clearInterval(interval);
-        resolve(undefined);
-      }
-    }, HOW_OFTEN_TO_CHECK_CONDITION);
-
-    setTimeout(() => {
-      reject();
-    }, maxTimeout);
-  });
-};
-
-export const waitForActiveScreen = (currentRoute: string, focusableTree) => {
-  const isActiveScreenAvailableToFocus = (): boolean => {
-    const routes = focusableTree.root.children;
-
-    const route = find((route) => route.id === currentRoute, routes);
-    return isNotNil(route);
-  };
-
-  return waitUntil({
-    maxTimeout: 2500, //ms
-    conditionFn: isActiveScreenAvailableToFocus,
-  });
-};
-
-export const getActiveScreen = (focusableTree) => {
-  return last(focusableTree.root.children);
-};
-
-export const getContentNode = (focusableTree) => {
-  const content = find(
-    (child) => startsWith("content", child.id),
-    getActiveScreen(focusableTree)?.children
-  );
-
-  return content;
-};
-
-export const waitForContent = (focusableTree) => {
-  const contentHasAnyChildren = (): boolean => {
-    return getContentNode(focusableTree)?.children.length > 0;
-  };
-
-  return waitUntil({
-    maxTimeout: 2500, //ms
-    conditionFn: contentHasAnyChildren,
-  });
-};