@applicaster/zapp-react-native-utils 12.0.0-alpha.4837064762 → 12.0.0-alpha.4945500007

package/appUtils/focusManager/index.ts

@@ -1,6 +1,4 @@
 import * as R from "ramda";
-import { isNilOrEmpty } from "@applicaster/zapp-react-native-utils/reactUtils/helpers";
-
 import { Tree } from "./treeDataStructure/Tree";
 import { findFocusableNode, findPriorityItem } from "./treeDataStructure/Utils";
 import { subscriber } from "../../functionUtils";
@@ -19,22 +17,6 @@ const isFocusEnabled = (focusableItem): boolean => {
   return true;
 };
 
-const waitUntil = (conditionFn) => {
-  let interval;
-  return new Promise((resolve, reject) => {
-    interval = setInterval(() => {
-      if (conditionFn()) {
-        clearInterval(interval);
-        resolve(undefined);
-      }
-    }, 1000);
-
-    setTimeout(() => {
-      reject();
-    }, 2500);
-  });
-};
-
 /**
  * The focusManager is meant to keep references of focusables elements in the UI, and provide
  * ways to assign the focus to one of the focusables.
@@ -64,7 +46,7 @@ export const focusManager = (function () {
   let lastFocusedId = null;
   let initialFocusOnContent = null;
   let focusDisabled = false;
-  let focusAutoEnabled = false;
+  let focusAutoEnabled = true;
   const eventHandler = subscriber();
 
   function disableAutomaticFocus() {
@@ -111,7 +93,7 @@ export const focusManager = (function () {
       !currentFocusable.isGroup &&
       currentFocusable.isMounted()
     ) {
-      currentFocusable.blur(direction);
+      currentFocusable.blur(currentFocusable, direction);
       currentFocusable.hasLostFocus(getCurrentFocus(), direction);
     }
   }
@@ -244,41 +226,31 @@ export const focusManager = (function () {
 
     logger.log({ message: "setInitialFocus", data: { preferredFocus } });
 
-    if (isNilOrEmpty(preferredFocus)) {
-      return;
-    }
-
-    const focusCandidate = preferredFocus[0];
-    const focusableItem = focusCandidate.component;
-
-    const currentFocusedId = R.path(["props", "id"], getCurrentFocus());
-    const nextFocusedId = R.path(["props", "id"], focusableItem);
+    if (preferredFocus && preferredFocus.length > 0) {
+      const focusCandidate = preferredFocus[0];
+      const focusableItem = focusCandidate.component;
+
+      if (
+        focusableItem &&
+        !focusableItem.isGroup &&
+        isFocusEnabled(focusableItem)
+      ) {
+        if (initialFocusOnContent) {
+          blur();
+          initialFocusOnContent = false;
+        }
 
-    if (currentFocusedId === nextFocusedId) {
-      // we are going to move focus to the same node(already focused) -> nothing to do
-      return;
-    }
+        logger.log({
+          message: "setInitialFocus – currentFocusNode",
+          data: {
+            focusableItem,
+          },
+        });
 
-    if (
-      focusableItem &&
-      !focusableItem.isGroup &&
-      isFocusEnabled(focusableItem)
-    ) {
-      if (initialFocusOnContent) {
-        blur();
-        initialFocusOnContent = false;
+        currentFocusNode = focusCandidate;
+        focusableItem.willReceiveFocus(focusableItem, null);
+        focusableItem && setFocus(focusCandidate.id, null);
       }
-
-      logger.log({
-        message: "setInitialFocus – currentFocusNode",
-        data: {
-          focusableItem,
-        },
-      });
-
-      currentFocusNode = focusCandidate;
-      focusableItem.willReceiveFocus(focusableItem, null);
-      focusableItem && setFocus(focusCandidate.id, null);
     }
   }
 
@@ -351,8 +323,6 @@ export const focusManager = (function () {
    * @returns {React.Component} the registered component
    */
   function registerGroup(id, component) {
-    // console.log("debug_2", "FM registerGroup", { id, component });
-
     focusableTree.addNode({ id, component });
 
     return component;
@@ -368,8 +338,6 @@ export const focusManager = (function () {
    * @returns {React.Component} the registered component
    */
   function registerItem(id, component) {
-    // console.log("debug_2", "FM registerItem", { id, component });
-
     focusableTree.addNode({ id, component });
 
     if (!currentFocusNode && id === lastFocusedId && !id.includes("menu")) {
@@ -386,8 +354,6 @@ export const focusManager = (function () {
    * @param {String} id of the group to unregister
    */
   function unregisterGroup(id) {
-    // console.log("debug_2", "FM unregisterGroup", { id });
-
     focusableTree.findAndRemoveNode(id);
   }
 
@@ -399,8 +365,6 @@ export const focusManager = (function () {
    * @param {String} id of the Focusable to unregister
    */
   function unregisterItem(id) {
-    // console.log("debug_2", "FM unregisterItem", { id });
-
     focusableTree.findAndRemoveNode(id);
 
     if (currentFocusNode && currentFocusNode.id === id) {
@@ -439,8 +403,6 @@ export const focusManager = (function () {
   }
 
   function setupInitialFocus(id: string, focusOnContent?: boolean) {
-    console.log("debug_2", "FM - setupInitialFocus", { id, focusOnContent });
-
     if (focusOnContent) {
       initialFocusOnContent = focusOnContent;
     } else {
@@ -448,62 +410,6 @@ export const focusManager = (function () {
     }
   }
 
-  function setFocusOnMenu() {
-    const activeScreen = R.last(focusableTree.root.children);
-    const navbar = R.find(
-      (child) => R.startsWith("navbar", child.id),
-      activeScreen.children
-    );
-
-    const selectedMenuItemId = R.find(
-      (child) => child.component.props.selected,
-      navbar?.children || []
-    )?.id;
-
-    if (selectedMenuItemId) {
-      // set focus on selected menu item
-      setFocus(selectedMenuItemId);
-      return;
-    }
-
-    const firstMenuItemId = R.path(["children", 0, "id"], navbar);
-
-    if (firstMenuItemId) {
-      // set focus on first menu item
-      setFocus(firstMenuItemId);
-    }
-  }
-
-  function setFocusOnContent() {
-    // we need to put focus on content here
-    // For doing it we have to wait registration of first focusable node into focusableTree
-    // this is the temporary hack with waiting until content node starts having children
-    const getContentNode = () => {
-      const activeScreen = R.last(focusableTree.root.children);
-      const content = R.find(
-        (child) => R.startsWith("content", child.id),
-        activeScreen.children
-      );
-
-      return content;
-    };
-
-    const contentHasAnyChildren = () => {
-      return getContentNode()?.children.length > 0;
-    };
-
-    waitUntil(contentHasAnyChildren)
-      .then(() => {
-        const content = getContentNode();
-
-        setInitialFocus(content);
-      })
-      .catch(() => {
-        // we failed to wait any content, put focus on menu as a last chance
-        setFocusOnMenu();
-      });
-  }
-
   /**
    * moves the focus in a provided direction
    * @public
@@ -516,13 +422,6 @@ export const focusManager = (function () {
       currentFocusNode.component.willLoseFocus(currentFocusNode, direction);
       const nextFocusable = findFocusableNode(direction, currentFocusNode);
 
-      console.log("debug_2", "FM moveFocus", {
-        direction: direction?.value,
-        currentFocusNode,
-        focusableTree,
-        nextFocusable,
-      });
-
       if (nextFocusable?.component?.isMounted?.()) {
         const nextRect = nextFocusable.component.getRect();
 
@@ -619,7 +518,5 @@ export const focusManager = (function () {
     enableAutomaticFocus,
     getGroupRootById,
     isGroupItemFocused,
-    setFocusOnMenu,
-    setFocusOnContent,
   };
 })();

package/appUtils/focusManager/treeDataStructure/Utils/index.js

@@ -1,4 +1,4 @@
-import { allPass, pathOr, startsWith, isNil } from "ramda";
+import * as R from "ramda";
 import { isNilOrEmpty } from "@applicaster/zapp-react-native-utils/reactUtils/helpers";
 
 import { rejectItemByPath } from "../../../../objectUtils";
@@ -143,49 +143,7 @@ const hasChildren = (target) =>
 
 const hasComponent = (target) => !!target?.component;
 
-const hasComponentAndChildren = allPass([hasComponent, hasChildren]);
-
-const positiveOrZero = (value) => value >= 0;
-
-const excludeFromFocusSearching = pathOr(false, [
-  "component",
-  "props",
-  "excludeFromFocusSearching",
-]);
-
-// const isAllScreens = all(excludeFromFocusSearching);
-
-const isNavBar = (target) => startsWith("navbar", target?.id);
-
-const ignoreMenuIfMultipleTargets = (nodes) => {
-  if (nodes.length > 1 && nodes.map((n) => n?.target?.id).includes("navbar")) {
-    return nodes.filter((n) => !isNavBar(n?.target));
-  }
-
-  return nodes;
-};
-
-const toDistance = ({ target, direction, comparisonRect }) => {
-  const componentRect = target.component?.getRect();
-
-  const orientationDistance = measureDistance(
-    direction,
-    comparisonRect,
-    componentRect
-  );
-
-  if (orientationDistance === -1) {
-    // ignores offscreen targets when moving up/down
-    return null;
-  }
-
-  const euclidDistance = measureEuclidianDistanceToCenter(
-    comparisonRect,
-    componentRect
-  );
-
-  return orientationDistance > 0 ? euclidDistance : orientationDistance;
-};
+const hasComponentAndChildren = R.allPass([hasComponent, hasChildren]);
 
 /**
  * Get target in shortest distance in specified direction
@@ -215,32 +173,52 @@ export function getTargetInDirection(
 
   const distances = targets
     .filter(hasComponentAndChildren)
-    .filter((target) => !excludeFromFocusSearching(target))
-    .map((target) => ({
-      distance: toDistance({ target, direction, comparisonRect }),
-      target,
-    }))
-    .filter(({ distance }) => positiveOrZero(distance));
+    .map((target) => {
+      const componentRect = target.component?.getRect();
+
+      const distance = measureDistance(
+        direction,
+        comparisonRect,
+        componentRect
+      );
+
+      if (distance === -1) {
+        // ignores offscreen targets when moving up/down
+        return null;
+      }
 
-  // if (isAllScreens(targets)) {
-  //   return last(targets);
-  // }
+      const orientationDistance = measureDistance(
+        direction,
+        comparisonRect,
+        componentRect
+      );
+
+      const euclidDistance = measureEuclidianDistanceToCenter(
+        comparisonRect,
+        componentRect
+      );
+
+      return {
+        distance:
+          orientationDistance > 0 ? euclidDistance : orientationDistance,
+        target,
+      };
+    })
+    .filter((obj) => obj && obj.distance >= 0);
 
   const match = distances
     .sort((a, b) => a.distance - b.distance) // sorts the distances
     .filter(ignoreMenuIfMultipleTargets)[0]; // filters out multiple targets if necessary // gets the first element
 
-  // console.log("debug_2", "FM getTargetInDirection", {
-  //   direction: direction?.value,
-  //   currentNode,
-  //   targetNodes,
-  //   targets,
-  //   comparisonRect,
-  //   distances,
-  //   match,
-  // });
-
-  return match?.target;
+  return distances && distances.length > 0 ? match.target : null;
+}
+
+function ignoreMenuIfMultipleTargets(nodes) {
+  if (nodes.length > 1 && nodes.map((n) => n?.target?.id).includes("navbar")) {
+    return nodes.filter((n) => n?.target?.id !== "navbar");
+  }
+
+  return nodes;
 }
 
 /**
@@ -331,36 +309,3 @@ export function hasPriorityInDirection(direction, component) {
 
   return (prioritiseFocusOn & mappedDirection) > 0;
 }
-
-export const getNodeBeforeRoot = (node) => {
-  if (isNil(node)) {
-    return undefined;
-  }
-
-  if (node.parent.id === "root") {
-    return node;
-  }
-
-  return getNodeBeforeRoot(node.parent);
-};
-
-export const isAllowedToMoveTo = (currentNode, nextNode) => {
-  const screenForCurrentNode = getNodeBeforeRoot(currentNode);
-  const screenForNextNode = getNodeBeforeRoot(nextNode);
-
-  return screenForCurrentNode.id === screenForNextNode.id;
-
-  // console.log("debug_2", "isAllowedToMoveTo", {
-  //   nodeBeforeRoot,
-  // });
-
-  // if (nodeBeforeRoot?.id === "navbar") {
-  //   return true;
-  // }
-
-  // if (nodeBeforeRoot?.component?.props?.isActive) {
-  //   return true;
-  // }
-
-  // return false;
-};

package/headersUtils/index.ts

@@ -28,5 +28,6 @@ export const getAppDataHeaders = (screenId: string) => {
     "x-applicaster-signed-device-info-token": appData.signedDeviceInfoToken,
     "x-applicaster-device-make": appData.deviceMake,
     "x-applicaster-device-model": appData.deviceModel,
+    "x-applicaster-uuid": appData?.uuid,
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-utils",
-  "version": "12.0.0-alpha.4837064762",
+  "version": "12.0.0-alpha.4945500007",
   "description": "Applicaster Zapp React Native utilities package",
   "main": "index.js",
   "types": "index.d.ts",
@@ -28,7 +28,7 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "12.0.0-alpha.4837064762",
+    "@applicaster/applicaster-types": "12.0.0-alpha.4945500007",
     "buffer": "^5.2.1",
     "camelize": "^1.0.0",
     "create-react-context": "^0.2.3",

package/reactHooks/navigation/index.ts

@@ -496,18 +496,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,6 @@ 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";
 
 export function useScreenContextV2() {
   return useContext(ScreenContext);
@@ -46,8 +45,8 @@ export function useSetNavbarState() {
 export function useScreenContext(): NavigationScreenData {
   const navigator = useNavigation();
 
-  const screenData = useContext(ScreenDataContext);
-
+  const screenKey = useMemo(() => navigator?.key, [navigator]);
+  const screenData = useMemo(() => navigator?.data, [screenKey]);
   const modalScreenData = navigator?.modalData;
 
   const isModal = useModalNavigationContext();

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/stringUtils/index.ts

@@ -152,3 +152,8 @@ export function objectToCamelCase(obj) {
 export function isString(value: unknown): value is string {
   return typeof value === "string" || value instanceof String;
 }
+
+/** Checks if a value is a non-empty string */
+export function isNotEmptyString(value: unknown): value is string {
+  return isString(value) && value.length > 0;
+}