react-native-tvos 0.73.7-0 → 0.73.7-2

package/Libraries/Core/ReactNativeVersion.js

@@ -1,17 +1,23 @@
 /**
- * @generated by scripts/set-rn-version.js
- *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
  * @flow strict
+ * @generated by scripts/releases/set-rn-version.js
  */
 
-exports.version = {
+const version: $ReadOnly<{
+  major: number,
+  minor: number,
+  patch: number,
+  prerelease: string | null,
+}> = {
   major: 0,
   minor: 73,
   patch: 7,
-  prerelease: '0',
+  prerelease: '2',
 };
+
+module.exports = {version};

package/README.md

@@ -202,6 +202,8 @@ class Game2048 extends React.Component {
   - `enableTVPanGesture`/`disableTVPanGesture`: Methods to enable and disable detection of finger touches that pan across the touch surface of the Siri remote. See `TVEventHandlerExample` in the `RNTester` app for a demo.
   - `enableGestureHandlersCancelTouches`/`disableGestureHandlersCancelTouches`: Methods to turn on and turn off cancellation of touches by the gesture handlers in `RCTTVRemoteHandler` (see #366). Cancellation of touches is turned on (enabled) by default in 0.69 and earlier releases.
 
+- Accessibility: We have an additional `accessibilityFocus` [accessibility action](https://reactnative.dev/docs/accessibility#accessibility-actions) on Android that you can use for detecting focus changes on every *accessible* element (like a regular `Text`) when `TalkBack` is enabled.
+
 - _TVFocusGuideView_: This component provides support for Apple's `UIFocusGuide` API and is implemented in the same way for Android TV, to help ensure that focusable controls can be navigated to, even if they are not directly in line with other controls.  An example is provided in `RNTester` that shows two different ways of using this component.
 
   | Prop | Value | Description | 

package/React/Base/RCTVersion.m

@@ -1,10 +1,10 @@
 /**
- * @generated by scripts/set-rn-version.js
- *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
+ *
+ * @generated by scripts/releases/set-rn-version.js
  */
 
 #import "RCTVersion.h"
@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(73),
                   RCTVersionPatch: @(7),
-                  RCTVersionPrerelease: @"0",
+                  RCTVersionPrerelease: @"2",
                   };
   });
   return __rnVersion;

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.73.7-0
+VERSION_NAME=0.73.7-2
 
 # react.internal.publishingGroup=com.facebook.react
 # For TV use this group

package/ReactAndroid/publish.gradle

@@ -3,18 +3,25 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
+ *
+ * This file is modified from the original Meta source to work in the
+ * `react-native-ci` project.
  */
+/* groovylint-disable CompileStatic, DuplicateStringLiteral, LineLength, NestedBlockDepth, NoDef, UnusedVariable, VariableTypeRequired */
 
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
-def isNightly = findProperty("isNightly")?.toBoolean()
-def signingKey = findProperty("SIGNING_KEY")
-def signingPwd = findProperty("SIGNING_PWD")
+def isSnapshot = false
+// Rewritten when copying this to ReactAndroid/publish.gradle
+def signingKey = findProperty('SIGNING_KEY')
+def signingPwd = findProperty('SIGNING_PWD')
+def sonatypeUsername = findProperty('SONATYPE_USERNAME')
+def sonatypePassword = findProperty('SONATYPE_PASSWORD')
 
 def reactAndroidProjectDir = project(':packages:react-native:ReactAndroid').projectDir
-def androidOutputUrl = "file://${reactAndroidProjectDir}/../android"
-def mavenTempLocalUrl = "file:///tmp/maven-local"
+def mavenTempLocalUrl = 'file:///var/folders/xp/yw_lp59x05d2mp0g0n2f_d240000gn/T/eas-build-workingdir/build/maven_local'
+// Rewritten when copying this to ReactAndroid/publish.gradle
 
 publishing {
     publications {
@@ -22,43 +29,43 @@ publishing {
             afterEvaluate {
                 // We do a multi variant release, so for Android libraries
                 // we publish `components.release`
-                if (plugins.hasPlugin("com.android.library")) {
+                if (plugins.hasPlugin('com.android.library')) {
                     from components.default
                 }
             }
 
             // We populate the publishing version using the project version,
-            // appending -SNAPSHOT if on nightly.
-            if (isNightly) {
-                version = this.version + "-SNAPSHOT"
+            // appending -SNAPSHOT if on nightly or prerelase.
+            if (isSnapshot) {
+                version = this.version + '-SNAPSHOT'
             } else {
                 version = this.version
             }
 
             pom {
-                name = "react-native"
-                description = "A framework for building native apps with React"
-                url = "https://github.com/facebook/react-native"
+                name = 'react-native'
+                description = 'A framework for building native apps with React'
+                url = 'https://github.com/facebook/react-native'
 
                 developers {
                     developer {
-                        id = "facebook"
-                        name = "Facebook"
+                        id = 'facebook'
+                        name = 'Facebook'
                     }
                 }
 
                 licenses {
                     license {
-                        name = "MIT License"
-                        url = "https://github.com/facebook/react-native/blob/HEAD/LICENSE"
-                        distribution = "repo"
+                        name = 'MIT License'
+                        url = 'https://github.com/facebook/react-native/blob/HEAD/LICENSE'
+                        distribution = 'repo'
                     }
                 }
 
                 scm {
-                    url = "https://github.com/facebook/react-native.git"
-                    connection = "scm:git:https://github.com/facebook/react-native.git"
-                    developerConnection = "scm:git:git@github.com:facebook/react-native.git"
+                    url = 'https://github.com/facebook/react-native.git'
+                    connection = 'scm:git:https://github.com/facebook/react-native.git'
+                    developerConnection = 'scm:git:git@github.com:facebook/react-native.git'
                 }
             }
         }
@@ -66,35 +73,34 @@ publishing {
 
     repositories {
         maven {
-            name = "npm"
-            url = androidOutputUrl
+            name = 'mavenTempLocal'
+            url = mavenTempLocalUrl
         }
         maven {
-            name = "mavenTempLocal"
-            url = mavenTempLocalUrl
+            name = 'sonatypeRelease'
+            url = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
+            credentials(PasswordCredentials) {
+                username = sonatypeUsername
+                password = sonatypePassword
+            }
+        }
+        maven {
+            name = 'sonatypeSnapshot'
+            url = 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
+            credentials(PasswordCredentials) {
+                username = sonatypeUsername
+                password = sonatypePassword
+            }
         }
     }
 
-//     if (signingKey && signingPwd) {
-//         logger.info("PGP Key found - Signing enabled")
-//         signing {
-//             useInMemoryPgpKeys(signingKey, signingPwd)
-//             sign(publishing.publications.release)
-//         }
-//     } else {
-//         logger.info("Signing disabled as the PGP key was not found")
-//     }
-
-// For the TV repo, we sign manually for now, using the gpg command line tool.
-// Properties that need to be set:
-//
-// signing.gnupg.executable=gpg
-// signing.gnupg.useLegacyGpg=true
-// signing.gnupg.keyName=(your key ID)
-// signing.keyId=(your key ID)
-// signing.secretKeyRingFile=(file with your exported secret keys)
-    signing {
-      useGpgCmd()
-      sign(publishing.publications.release)
+    if (signingKey && signingPwd) {
+        logger.info('PGP Key found - Signing enabled')
+        signing {
+            useInMemoryPgpKeys(signingKey, signingPwd)
+            sign(publishing.publications.release)
+        }
+    } else {
+        logger.info('Signing disabled as the PGP key was not found')
     }
 }

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

@@ -1,10 +1,10 @@
 /**
- * @generated by scripts/set-rn-version.js
- *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
+ *
+ * @generated by scripts/releases/set-rn-version.js
  */
 
 package com.facebook.react.modules.systeminfo;
@@ -18,5 +18,5 @@ public class ReactNativeVersion {
       "major", 0,
       "minor", 73,
       "patch", 7,
-      "prerelease", "0");
+      "prerelease", "2");
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.java

@@ -76,6 +76,7 @@ public class ReactAccessibilityDelegate extends ExploreByTouchHelper {
     sActionIdMap.put("decrement", AccessibilityActionCompat.ACTION_SCROLL_BACKWARD.getId());
     sActionIdMap.put("expand", AccessibilityActionCompat.ACTION_EXPAND.getId());
     sActionIdMap.put("collapse", AccessibilityActionCompat.ACTION_COLLAPSE.getId());
+    sActionIdMap.put("accessibilityFocus", AccessibilityActionCompat.ACTION_ACCESSIBILITY_FOCUS.getId());
   }
 
   private final View mView;
@@ -602,6 +603,7 @@ public class ReactAccessibilityDelegate extends ExploreByTouchHelper {
       final AccessibilityRole accessibilityRole =
           (AccessibilityRole) host.getTag(R.id.accessibility_role);
       final ReadableMap accessibilityValue = (ReadableMap) host.getTag(R.id.accessibility_value);
+
       if (accessibilityRole == AccessibilityRole.ADJUSTABLE
           && (action == AccessibilityActionCompat.ACTION_SCROLL_FORWARD.getId()
               || action == AccessibilityActionCompat.ACTION_SCROLL_BACKWARD.getId())) {
@@ -610,6 +612,13 @@ public class ReactAccessibilityDelegate extends ExploreByTouchHelper {
         }
         return super.performAccessibilityAction(host, action, args);
       }
+
+      // When checking the accessibility focus action, we don't want to intercept the native event
+      // otherwise it would intercept the change of focus
+      if (action == AccessibilityActionCompat.ACTION_ACCESSIBILITY_FOCUS.getId()) {
+        return super.performAccessibilityAction(host, action, args);
+      }
+
       return true;
     }
     return super.performAccessibilityAction(host, action, args);

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

@@ -89,8 +89,6 @@ public class ReactModalHostView extends ViewGroup implements LifecycleEventListe
   private boolean mPropertyRequiresNewDialog;
   private @Nullable DialogInterface.OnShowListener mOnShowListener;
   private @Nullable OnRequestCloseListener mOnRequestCloseListener;
-  private final ReactAndroidHWInputDeviceHelper mAndroidHWInputDeviceHelper =
-    new ReactAndroidHWInputDeviceHelper();
 
   public ReactModalHostView(ThemedReactContext context) {
     super(context);
@@ -304,7 +302,7 @@ public class ReactModalHostView extends ViewGroup implements LifecycleEventListe
           public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
             // Modal needs to send the key event to its own TV event handler
             // https://github.com/react-native-tvos/react-native-tvos/issues/609
-            mAndroidHWInputDeviceHelper.handleKeyEvent(event, mHostView.mReactContext);
+            mHostView.mAndroidHWInputDeviceHelper.handleKeyEvent(event, mHostView.mReactContext);
             if (event.getAction() == KeyEvent.ACTION_UP) {
               // We need to stop the BACK button and ESCAPE key from closing the dialog by default
               // so we capture that event and instead inform JS so that it can make the decision as

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

@@ -8,6 +8,8 @@
 package com.facebook.react.views.view;
 
 import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.pm.PackageManager;
 import android.graphics.Rect;
 import android.os.Build;
 import android.util.Log;
@@ -81,6 +83,14 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
   @ReactProp(name = "accessible")
   public void setAccessible(ReactViewGroup view, boolean accessible) {
     view.setFocusable(accessible);
+    // 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)
+    // ** A view will not actually take focus if it is not focusable (isFocusable() returns false), **
+    // ** or if it is focusable and it is not focusable in touch mode (isFocusableInTouchMode()) **
+    // ** while the device is in touch mode.  **
+    if (hasTouchScreen(view.getContext())) {
+      view.setFocusableInTouchMode(accessible);
+    }
   }
 
   @ReactProp(name = "hasTVPreferredFocus")
@@ -432,6 +442,14 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
     root.setFocusDestinations(fd);
   }
 
+  /**
+   * Utility function to help capture Android TV/ Fire TV Devices with Touch Support
+   */
+  private boolean hasTouchScreen(Context context) {
+    PackageManager pm = context.getPackageManager();
+    return pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN);
+  }
+
   @ReactProp(name = "autoFocus")
   public void setAutoFocusTV(ReactViewGroup view, boolean autoFocus) {
     view.setAutoFocusTV(autoFocus);

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by scripts/set-rn-version.js
+ * @generated by scripts/releases/set-rn-version.js
  */
 
 #pragma once
@@ -18,7 +18,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 73;
   int32_t Patch = 7;
-  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.73.7-0",
+  "version": "0.73.7-2",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -103,7 +103,7 @@
     "@react-native/gradle-plugin": "0.73.4",
     "@react-native/js-polyfills": "0.73.1",
     "@react-native/normalize-colors": "0.73.2",
-    "@react-native-tvos/virtualized-lists": "0.73.7-0",
+    "@react-native-tvos/virtualized-lists": "0.73.7-2",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -153,4 +153,4 @@
   "devDependencies": {
     "react-native-core": "npm:react-native@0.73.7"
   }
-}
+}

package/sdks/.hermesversion

@@ -1 +1 @@
-hermes-2024-04-19-RNv0.73.5-81ba94ffcf874e378f78579e8a5733e65a2a1b48
+hermes-2024-02-20-RNv0.73.5-18f99ace4213052c5e7cdbcd39ee9766cd5df7e4

package/template/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "expo": "^50.0.2",
     "react": "18.2.0",
-    "react-native": "npm:react-native-tvos@0.73.7-0"
+    "react-native": "npm:react-native-tvos@0.73.7-1"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

package/ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.java

@@ -1,98 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react;
-
-import android.view.KeyEvent;
-import android.view.View;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-import com.facebook.react.common.MapBuilder;
-import java.util.Map;
-
-/** Responsible for dispatching events specific for hardware inputs. */
-public class ReactAndroidHWInputDeviceHelper {
-
-  /**
-   * Contains a mapping between handled KeyEvents and the corresponding navigation event that should
-   * be fired when the KeyEvent is received.
-   */
-  private static final Map<Integer, String> KEY_EVENTS_ACTIONS =
-      MapBuilder.<Integer, String>builder()
-          .put(KeyEvent.KEYCODE_DPAD_CENTER, "select")
-          .put(KeyEvent.KEYCODE_ENTER, "select")
-          .put(KeyEvent.KEYCODE_SPACE, "select")
-          .put(KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, "playPause")
-          .put(KeyEvent.KEYCODE_MEDIA_REWIND, "rewind")
-          .put(KeyEvent.KEYCODE_MEDIA_FAST_FORWARD, "fastForward")
-          .put(KeyEvent.KEYCODE_MEDIA_STOP, "stop")
-          .put(KeyEvent.KEYCODE_MEDIA_NEXT, "next")
-          .put(KeyEvent.KEYCODE_MEDIA_PREVIOUS, "previous")
-          .put(KeyEvent.KEYCODE_DPAD_UP, "up")
-          .put(KeyEvent.KEYCODE_DPAD_RIGHT, "right")
-          .put(KeyEvent.KEYCODE_DPAD_DOWN, "down")
-          .put(KeyEvent.KEYCODE_DPAD_LEFT, "left")
-          .put(KeyEvent.KEYCODE_INFO, "info")
-          .put(KeyEvent.KEYCODE_MENU, "menu")
-          .build();
-
-  /**
-   * We keep a reference to the last focused view id so that we can send it as a target for key
-   * events and be able to send a blur event when focus changes.
-   */
-  private int mLastFocusedViewId = View.NO_ID;
-
-  private final ReactRootView mReactRootView;
-
-  ReactAndroidHWInputDeviceHelper(ReactRootView mReactRootView) {
-    this.mReactRootView = mReactRootView;
-  }
-
-  /** Called from {@link ReactRootView}. This is the main place the key events are handled. */
-  public void handleKeyEvent(KeyEvent ev) {
-    int eventKeyCode = ev.getKeyCode();
-    int eventKeyAction = ev.getAction();
-    if ((eventKeyAction == KeyEvent.ACTION_UP || eventKeyAction == KeyEvent.ACTION_DOWN)
-        && KEY_EVENTS_ACTIONS.containsKey(eventKeyCode)) {
-      dispatchEvent(KEY_EVENTS_ACTIONS.get(eventKeyCode), mLastFocusedViewId, eventKeyAction);
-    }
-  }
-
-  /** Called from {@link ReactRootView} when focused view changes. */
-  public void onFocusChanged(View newFocusedView) {
-    if (mLastFocusedViewId == newFocusedView.getId()) {
-      return;
-    }
-    if (mLastFocusedViewId != View.NO_ID) {
-      dispatchEvent("blur", mLastFocusedViewId);
-    }
-    mLastFocusedViewId = newFocusedView.getId();
-    dispatchEvent("focus", newFocusedView.getId());
-  }
-
-  /** Called from {@link ReactRootView} when the whole view hierarchy looses focus. */
-  public void clearFocus() {
-    if (mLastFocusedViewId != View.NO_ID) {
-      dispatchEvent("blur", mLastFocusedViewId);
-    }
-    mLastFocusedViewId = View.NO_ID;
-  }
-
-  private void dispatchEvent(String eventType, int targetViewId) {
-    dispatchEvent(eventType, targetViewId, -1);
-  }
-
-  private void dispatchEvent(String eventType, int targetViewId, int eventKeyAction) {
-    WritableMap event = new WritableNativeMap();
-    event.putString("eventType", eventType);
-    event.putInt("eventKeyAction", eventKeyAction);
-    if (targetViewId != View.NO_ID) {
-      event.putInt("tag", targetViewId);
-    }
-    mReactRootView.sendEvent("onHWKeyEvent", event);
-  }
-}