@applicaster/zapp-react-native-utils 13.0.0-alpha.1400045041 → 13.0.0-alpha.1411904511

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

@@ -33,7 +33,6 @@ exports[`focusManager should be defined 1`] = `
   "recoverFocus": [Function],
   "register": [Function],
   "removeHandler": [Function],
-  "resetFocus": [Function],
   "setFocus": [Function],
   "setInitialFocus": [Function],
   "unregister": [Function],

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

@@ -1,6 +1,5 @@
 import { focusManager } from "../index.ts";
 import { focusManager as focusManagerIOS } from "../index.ios.ts";
-import { findFirstFocusableItem } from "../utils";
 
 describe("focusManagerIOS", () => {
   it("should be defined", () => {
@@ -9,67 +8,6 @@ describe("focusManagerIOS", () => {
   });
 });
 
-const focusableTree = {
-  root: {
-    children: [
-      {
-        children: [
-          {
-            children: [
-              {
-                children: [],
-                component: {
-                  isGroup: true,
-                },
-                id: "route/1/1",
-              },
-              {
-                children: [],
-                component: {
-                  isGroup: true,
-                },
-                id: "route/1/2",
-              },
-            ],
-            component: {
-              isGroup: true,
-            },
-            id: "route/1",
-          },
-          {
-            children: [
-              {
-                children: [],
-                component: {
-                  isGroup: true,
-                },
-                id: "route/2/1",
-              },
-              {
-                children: [],
-                component: {
-                  isGroup: false,
-                },
-                id: "route/2/2",
-              },
-            ],
-            component: {
-              isGroup: true,
-            },
-            id: "route/2",
-          },
-        ],
-        component: {
-          isGroup: true,
-        },
-        id: "/river/1234",
-      },
-    ],
-    component: null,
-    id: "root",
-  },
-};
-
 describe("focusManager", () => {
   it("should be defined", () => {
     expect(focusManager).toBeDefined();
@@ -107,24 +45,4 @@ describe("focusManager", () => {
   it("placeholder test", () => {
     expect(true).toBe(true);
   });
-
-  it("findFirstFocusableItem returns focusableItem", () => {
-    const expectedItemId =
-      focusableTree.root.children[0].children[1].children[1].id;
-
-    const focusableItem = findFirstFocusableItem(focusableTree.root.children);
-
-    expect(
-      focusableItem !== undefined && expectedItemId === focusableItem.id
-    ).toBe(true);
-  });
-
-  it("findFirstFocusableItem does not return focusableItem", () => {
-    focusableTree.root.children[0].children[1].children[1].component.isGroup =
-      true;
-
-    const focusableItem = findFirstFocusableItem(focusableTree.root.children);
-
-    expect(focusableItem === undefined).toBe(true);
-  });
 });

package/appUtils/focusManager/__tests__/index.test.ts

@@ -30,7 +30,6 @@ describe("focusManager", () => {
       "isGroupItemFocused",
       "recoverFocus",
       "isCurrentFocusOnTheTopScreen",
-      "resetFocus",
     ];
 
     expectedMethods.forEach((method) => {

package/appUtils/focusManager/index.ts

@@ -13,7 +13,6 @@ import {
 import { subscriber } from "../../functionUtils";
 import { coreLogger } from "../../logger";
 import { ACTION } from "./utils/enums";
-import { findFirstFocusableItem } from "./utils";
 
 const logger = coreLogger.addSubsystem("focusManager");
 
@@ -493,29 +492,20 @@ export const focusManager = (function () {
     return haveSameParentBeforeRoot(currentFocusNode, R.last(routes));
   }
 
-  function resetFocus() {
+  function recoverFocus() {
     if (!isCurrentFocusOnTheTopScreen()) {
-      // We've failed to set focused node on the new screen => run focus reset
+      // We've failed to set focused node on the new screen => run focus recovery
       setInitialFocus();
     }
   }
 
-  /**
-   * sets the focus on first focusable item
-   * @public
-   */
-  function recoverFocus() {
-    const focusableItem = findFirstFocusableItem(focusableTree.root.children);
-    focusableItem && setFocus(focusableItem.id);
-  }
-
   /**
    * moves the focus in a provided direction
    * @public
    * @param {Object} direction of the scroll
    */
   function moveFocus(direction) {
-    if (!isCurrentFocusOnTheTopScreen() && currentFocusNode) {
+    if (!isCurrentFocusOnTheTopScreen()) {
       // We are opening new screen. We need to ignore movement of focus.
       return false;
     }
@@ -538,8 +528,6 @@ export const focusManager = (function () {
       } else {
         currentFocusNode.component.failedLostFocus(currentFocusNode, direction);
       }
-    } else {
-      recoverFocus();
     }
   }
 
@@ -584,6 +572,5 @@ export const focusManager = (function () {
     isGroupItemFocused,
     recoverFocus,
     isCurrentFocusOnTheTopScreen,
-    resetFocus,
   };
 })();

package/appUtils/focusManager/utils/index.ts

@@ -98,17 +98,3 @@ export const waitForContent = (focusableTree) => {
     conditionFn: contentHasAnyChildren,
   });
 };
-
-export const findFirstFocusableItem = (items) => {
-  for (const item of items) {
-    if (!item.component.isGroup) {
-      return item;
-    } else {
-      if (item.children) {
-        const focusableItem = findFirstFocusableItem(item.children);
-
-        if (focusableItem) return focusableItem;
-      }
-    }
-  }
-};

package/appUtils/focusManagerAux/index.ts

@@ -54,7 +54,7 @@ export async function setFocusOnContent(currentRoute: string) {
   // For doing it we have to wait registration of first focusable node into focusableTree
   // we wait until content node starts having children
 
-  const { setInitialFocus, focusableTree, getCurrentFocus } = focusManager;
+  const { setInitialFocus, focusableTree } = focusManager;
 
   try {
     await waitForActiveScreen(currentRoute, focusableTree);
@@ -71,6 +71,6 @@ export async function setFocusOnContent(currentRoute: string) {
       );
     }
   } catch (error) {
-    !getCurrentFocus() && setFocusOnContent(currentRoute);
+    setFocusOnContent(currentRoute);
   }
 }

package/appUtils/keyCodes/index.ts

@@ -1,5 +1,3 @@
-import * as R from "ramda";
-
 // more keys can be added here. Simply make sure
 // the key matches the code value
 
@@ -34,12 +32,18 @@ export function keyCode(key) {
   keyCode(keyEvent).matchesAny("Enter", "Backspace", KEYS.ArrowLeft, ...)
   */
 
-  const matches = R.compose(
-    R.either(R.eqProps("code", key), R.eqProps("keyCode", key)),
-    R.when(R.is(String), R.prop(R.__, KEYS))
-  );
+  const matches = (compareKey) => {
+    // If compareKey is a string, look it up in KEYS object
+    const keyToCompare =
+      typeof compareKey === "string" ? KEYS[compareKey] : compareKey;
+
+    // Compare either code or keyCode properties
+    return (
+      keyToCompare?.code === key.code || keyToCompare?.keyCode === key.keyCode
+    );
+  };
 
-  const matchesAny = (...args) => R.any(matches, args);
+  const matchesAny = (...args) => args.some(matches);
 
   const direction = () =>
     matchesAny(...ARROW_KEYS) ? directionHelper(key) : null;

package/appUtils/playerManager/index.ts

@@ -452,7 +452,7 @@ export class PlayerManager {
     if (this.castingReceiver) {
       this.castingReceiver.closeNativePlayer();
     } else {
-      this.getActivePlayer().closeNativePlayer();
+      this.getActivePlayer()?.closeNativePlayer();
       this.invokeHandler("close");
     }
   }

package/manifestUtils/sharedConfiguration/screenPicker/stylesFields.js

@@ -24,7 +24,7 @@ const componentConfigurationFields = [
     initial_value: "vertical",
     options: [
       { text: "Vertical", value: "vertical" },
-      { text: "Horizontal (Beta)", value: "horizontal" },
+      { text: "Horizontal", value: "horizontal" },
     ],
   },
   {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-utils",
-  "version": "13.0.0-alpha.1400045041",
+  "version": "13.0.0-alpha.1411904511",
   "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": "13.0.0-alpha.1400045041",
+    "@applicaster/applicaster-types": "13.0.0-alpha.1411904511",
     "buffer": "^5.2.1",
     "camelize": "^1.0.0",
     "dayjs": "^1.11.10",

package/reactHooks/app/useAppState.ts

@@ -14,10 +14,10 @@ export function useAppState(returnIsActive) {
   };
 
   React.useEffect(() => {
-    AppState.addEventListener("change", setAppState);
+    const unsubscribe = AppState.addEventListener("change", setAppState);
 
     return () => {
-      AppState.removeEventListener("change", setAppState);
+      unsubscribe.remove();
     };
   }, []);