react-native-tvos 0.79.7-0 → 0.79.7-1

package/Libraries/Components/TV/TVFocusGuideView.js

@@ -106,10 +106,12 @@ function TVFocusGuideView(
   });
 
   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];
@@ -126,7 +128,7 @@ function TVFocusGuideView(
       style={style}
       ref={_setNativeRef}
       collapsable={false}
-      autoFocus={autoFocus}
+      autoFocus={focusable === false ? true : autoFocus}
       // tvOS only prop
       isTVSelectable={tvOSSelectable}
       // Android TV only prop

package/Libraries/Core/ReactNativeVersion.js

@@ -17,5 +17,5 @@ export const version: $ReadOnly<{
   major: 0,
   minor: 79,
   patch: 7,
-  prerelease: '0',
+  prerelease: '1',
 };

package/React/Base/RCTVersion.m

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

package/ReactAndroid/gradle.properties

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

package/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt

@@ -168,7 +168,9 @@ public class ReactModalHostView(context: ThemedReactContext) :
   public override fun removeViewAt(index: Int) {
     UiThreadUtil.assertOnUiThread()
     val child = getChildAt(index)
-    dialogRootViewGroup.removeView(child)
+    if (child != null) {
+      dialogRootViewGroup.removeView(child)
+    }
   }
 
   public override fun addChildrenForAccessibility(outChildren: ArrayList<View>) {

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

@@ -409,7 +409,7 @@ public class ReactEditText extends AppCompatEditText {
   // that. This method will eventually replace requestFocusInternal()
   private boolean requestFocusProgramatically() {
     boolean focused = super.requestFocus(View.FOCUS_DOWN, null);
-    if (isInTouchMode() && getShowSoftInputOnFocus()) {
+    if (getShowSoftInputOnFocus()) {
       showSoftKeyboard();
     } else {
       if (isKeyboardOpened) {

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

@@ -692,6 +692,20 @@ public class ReactViewGroup extends ViewGroup
     return ViewUtil.getUIManagerType(getId()) == UIManagerType.FABRIC;
   }
 
+  @Override
+  public void removeView(View view) {
+    onViewRemoved(view);
+    recoverFocus(view);
+    super.removeView(view);
+  }
+
+  @Override
+  public void removeViewAt(int index) {
+    onViewRemoved(getChildAt(index));
+    recoverFocus(getChildAt(index));
+    super.removeViewAt(index);
+  }
+
   @Override
   public void onViewAdded(View child) {
     UiThreadUtil.assertOnUiThread();
@@ -855,6 +869,7 @@ public class ReactViewGroup extends ViewGroup
   /*package*/ void removeViewWithSubviewClippingEnabled(View view) {
     UiThreadUtil.assertOnUiThread();
 
+    recoverFocus(view);
     Assertions.assertCondition(mRemoveClippedSubviews);
     Assertions.assertNotNull(mClippingRect);
     View[] childArray = Assertions.assertNotNull(mAllChildren);

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

@@ -107,7 +107,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
     }
   }
 
@@ -363,8 +363,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
     }
   }
 

package/ReactCommon/cxxreact/ReactNativeVersion.h

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

package/package.json

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