@applicaster/zapp-react-native-utils 13.0.0-alpha.8532113155 → 13.0.0-alpha.8620112557

package/appUtils/platform/platformUtils.ts

@@ -77,12 +77,6 @@ export class ClosedCaptioningManager {
 
   private constructor() {
     this.initialize();
-
-    window["vizioDebug"] = {
-      setCCEnabled: (isCCEnabled: boolean) => {
-        this.ccState$.next(isCCEnabled);
-      },
-    };
   }
 
   static getInstance(): ClosedCaptioningManager {

package/focusManager/FocusManager.ts

@@ -227,7 +227,14 @@ class FocusManager {
 
       const nextNextFocus = FocusManager.getNextFocusable(direction, nextFocus);
 
-      FocusManager.instance.setFocus(nextNextFocus, options);
+      if (!nextNextFocus) {
+        const nextNextFocusForParent =
+          FocusManager.instance.getNextFocusableForParent(direction, nextFocus);
+
+        FocusManager.instance.setFocus(nextNextFocusForParent, options);
+      } else {
+        FocusManager.instance.setFocus(nextNextFocus, options);
+      }
     } else {
       FocusManager.instance.setFocusLocal(nextFocus);
 
@@ -307,9 +314,26 @@ class FocusManager {
     return FocusManager.getNextFocusable(direction);
   }
 
-  getNextFocusableForParent(direction) {
+  getNextFocusableForParent(
+    direction,
+    focusable?: FocusManager.TouchableReactRef
+  ) {
+    const focusableId = focusable
+      ? getFocusableId(focusable)
+      : FocusManager.instance.focusedId;
+
     const focusDirection = toFocusDirection(direction);
-    const parentNode = this.tree.findParent(FocusManager.instance.focusedId);
+    const parentNode = this.tree.findParent(focusableId);
+
+    const parentNodeParent = this.tree.findParent(parentNode?.id);
+
+    const hasNextFocusable = this.tree.find(
+      parentNode?.component?.current?.props[focusDirection]
+    );
+
+    if (!hasNextFocusable) {
+      return parentNodeParent?.component?.current?.props[focusDirection];
+    }
 
     return parentNode?.component?.current?.props[focusDirection];
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-utils",
-  "version": "13.0.0-alpha.8532113155",
+  "version": "13.0.0-alpha.8620112557",
   "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.8532113155",
+    "@applicaster/applicaster-types": "13.0.0-alpha.8620112557",
     "buffer": "^5.2.1",
     "camelize": "^1.0.0",
     "create-react-context": "^0.2.3",