react-native-tvos 0.77.2-0 → 0.77.2-2

package/Libraries/Core/ReactNativeVersion.js

@@ -17,7 +17,7 @@ const version: $ReadOnly<{
   major: 0,
   minor: 77,
   patch: 2,
-  prerelease: '0',
+  prerelease: '2',
 };
 
 module.exports = {version};

package/React/Base/RCTVersion.m

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

package/ReactAndroid/gradle.properties

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

package/ReactAndroid/publish.gradle

@@ -78,7 +78,8 @@ publishing {
         }
         maven {
             name = 'sonatypeRelease'
-            url = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
+            url = 'https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/'
+            // url = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
             credentials(PasswordCredentials) {
                 username = sonatypeUsername
                 password = sonatypePassword
@@ -86,7 +87,8 @@ publishing {
         }
         maven {
             name = 'sonatypeSnapshot'
-            url = 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
+            url = 'https://central.sonatype.com/repository/maven-snapshots/'
+            // url = 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
             credentials(PasswordCredentials) {
                 username = sonatypeUsername
                 password = sonatypePassword

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

@@ -18,5 +18,5 @@ public class ReactNativeVersion {
       "major", 0,
       "minor", 77,
       "patch", 2,
-      "prerelease", "0");
+      "prerelease", "2");
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java

@@ -154,7 +154,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
 
   @Override
   protected int computeScrollDeltaToGetChildRectOnScreen(Rect rect) {
-    if (mScrollEnabled) {
+    if (!mScrollEnabled) {
       return 0;
     }
     return super.computeScrollDeltaToGetChildRectOnScreen(rect);

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java

@@ -400,6 +400,14 @@ public class ReactScrollView extends ScrollView
     }
   }
 
+  @Override
+  protected int computeScrollDeltaToGetChildRectOnScreen(Rect rect) {
+    if (!mScrollEnabled) {
+      return 0;
+    }
+    return super.computeScrollDeltaToGetChildRectOnScreen(rect);
+  }
+
   @Override
   protected void onScrollChanged(int x, int y, int oldX, int oldY) {
     Systrace.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "ReactScrollView.onScrollChanged");

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

@@ -1209,22 +1209,6 @@ public class ReactViewGroup extends ViewGroup
     return null;
   }
 
-  private static boolean requestFocusViewOrAncestor(View destination) {
-    View v = destination;
-    while (v != null) {
-      if (v.requestFocus()) {
-        return true;
-      }
-      ViewParent parent = v.getParent();
-      if (parent instanceof View) {
-        v = (View) parent;
-      } else {
-        v = null;
-      }
-    }
-    return false;
-  }
-
   private boolean isFocusDestinationsSet() {
     return focusDestinations.length > 0;
   }
@@ -1381,7 +1365,13 @@ public class ReactViewGroup extends ViewGroup
     if (isFocusDestinationsSet()) {
       View 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 != null && destination.requestFocus()) {
         return true;
       }
     }
@@ -1406,9 +1396,7 @@ public class ReactViewGroup extends ViewGroup
       }
 
       // Try moving the focus to the first focusable element otherwise.
-      if (moveFocusToFirstFocusable(this)) {
-        return true;
-      }
+      return moveFocusToFirstFocusable(this);
     }
 
     return super.requestFocus(direction, previouslyFocusedRect);

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -18,7 +18,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 77;
   int32_t Patch = 2;
-  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.77.2-0",
+  "version": "0.77.2-2",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -118,7 +118,7 @@
     "@react-native/gradle-plugin": "0.77.2",
     "@react-native/js-polyfills": "0.77.2",
     "@react-native/normalize-colors": "0.77.2",
-    "@react-native-tvos/virtualized-lists": "0.77.2-0",
+    "@react-native-tvos/virtualized-lists": "0.77.2-2",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",