react-native-tvos 0.81.5-0 → 0.81.5-2

package/Libraries/Components/TV/TVFocusGuideView.js

@@ -104,10 +104,12 @@ function TVFocusGuideView({
   const mergedRef = useMergeRefs(setLocalRef, ref);
 
   React.useEffect(() => {
-    if (destinationsProp !== null && destinationsProp !== undefined) {
+    if (focusable === false) {
+      setDestinations([]);
+    } else if (destinationsProp !== null && destinationsProp !== undefined) {
       setDestinations(destinationsProp); // $FlowFixMe[incompatible-call]
     }
-  }, [setDestinations, destinationsProp]);
+  }, [setDestinations, destinationsProp, focusable]);
 
   const enabledStyle = {display: enabled ? 'flex' : 'none'};
   const style = [styles.container, props.style, enabledStyle];
@@ -124,7 +126,7 @@ function TVFocusGuideView({
       style={style}
       ref={mergedRef}
       collapsable={false}
-      autoFocus={autoFocus}
+      autoFocus={focusable === false ? true : autoFocus}
       // tvOS only prop
       isTVSelectable={tvOSSelectable}
       // Android TV only prop

package/Libraries/Core/ReactNativeVersion.js

@@ -18,5 +18,5 @@ export const version: $ReadOnly<{
   major: 0,
   minor: 81,
   patch: 5,
-  prerelease: '0',
+  prerelease: '2',
 };

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(81),
                   RCTVersionPatch: @(5),
-                  RCTVersionPrerelease: @"0",
+                  RCTVersionPrerelease: @"2",
                   };
   });
   return __rnVersion;

package/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm

@@ -1160,7 +1160,6 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
   // `autoFocus`
   if (oldViewProps.autoFocus != newViewProps.autoFocus) {
     _autoFocus = newViewProps.autoFocus;
-    [self handleFocusGuide];
   }
 
   _trapFocusUp = newViewProps.trapFocusUp;
@@ -1222,7 +1221,7 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
       [self requestFocusSelf];
     }
   }
-
+  [self handleFocusGuide];
 #endif
 
 }

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.81.5-0
+VERSION_NAME=0.81.5-2
 react.internal.publishingGroup=io.github.react-native-tvos
 
 android.useAndroidX=true

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt

@@ -15,6 +15,6 @@ public object ReactNativeVersion {
     "major" to 0,
     "minor" to 81,
     "patch" to 5,
-    "prerelease" to "0"
+    "prerelease" to "2"
   )
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt

@@ -413,7 +413,7 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
   // that. This method will eventually replace requestFocusInternal()
   private fun requestFocusProgrammatically(): Boolean {
     val focused = super.requestFocus(FOCUS_DOWN, null)
-    if (isInTouchMode && showSoftInputOnFocus) {
+    if (showSoftInputOnFocus) {
       showSoftKeyboard()
     } else {
       if (isKeyboardOpened) {

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.kt

@@ -1403,7 +1403,13 @@ public open class ReactViewGroup public constructor(context: Context?) :
     if (isFocusDestinationsSet) {
       val destination = findDestinationView()
 
-      if (destination != null && requestFocusViewOrAncestor(destination)) {
+      // Destination is set but there's no such element on the tree
+      // Just skip it to prevent cyclic issues.
+      if (destination == null) {
+        return false
+      }
+
+      if (destination.requestFocus()) {
         return true
       }
     }
@@ -1427,9 +1433,7 @@ public open class ReactViewGroup public constructor(context: Context?) :
       }
 
       // Try moving the focus to the first focusable element otherwise.
-      if (moveFocusToFirstFocusable(this)) {
-        return true
-      }
+      return moveFocusToFirstFocusable(this)
     }
 
     return super.requestFocus(direction, previouslyFocusedRect)
@@ -1553,21 +1557,5 @@ public open class ReactViewGroup public constructor(context: Context?) :
     fun setViewClipped(view: View, clipped: Boolean) {
       view.setTag(R.id.view_clipped, clipped)
     }
-
-    private fun requestFocusViewOrAncestor(destination: View): Boolean {
-      var v: View? = destination
-      while (v != null) {
-        if (v.requestFocus()) {
-          return true
-        }
-        val parent = v.parent
-        v = if (parent is View) {
-          parent
-        } else {
-          null
-        }
-      }
-      return false
-    }
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.kt

@@ -108,7 +108,7 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
       view.isFocusable = false
       view.descendantFocusability = ViewGroup.FOCUS_BLOCK_DESCENDANTS
     } else {
-      view.descendantFocusability = ViewGroup.FOCUS_BEFORE_DESCENDANTS
+      view.descendantFocusability = ViewGroup.FOCUS_AFTER_DESCENDANTS
     }
   }
 
@@ -395,8 +395,7 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
     } else {
       view.setOnClickListener(null)
       view.isClickable = false
-      // Don't set view.setFocusable(false) because we might still want it to be focusable for
-      // accessibility reasons
+      view.isFocusable = false
     }
     // This is required to handle Android TV/ Fire TV Devices that are Touch Enabled as well as LeanBack
     // https://developer.android.com/reference/android/view/View#requestFocus(int,%20android.graphics.Rect)

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -22,7 +22,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 81;
   int32_t Patch = 5;
-  std::string_view Prerelease = "0";
+  std::string_view Prerelease = "2";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.81.5-0",
+  "version": "0.81.5-2",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -198,7 +198,7 @@
     "whatwg-fetch": "^3.0.0",
     "ws": "^6.2.3",
     "yargs": "^17.6.2",
-    "@react-native-tvos/virtualized-lists": "0.81.5-0"
+    "@react-native-tvos/virtualized-lists": "0.81.5-2"
   },
   "codegenConfig": {
     "libraries": [