react-native-tvos 0.84.0-0rc5 → 0.84.1-0

package/Libraries/Core/ReactNativeVersion.js

@@ -28,8 +28,8 @@
 export default class ReactNativeVersion {
   static major: number = 0;
   static minor: number = 84;
-  static patch: number = 0;
-  static prerelease: string | null = '0rc5';
+  static patch: number = 1;
+  static prerelease: string | null = '0';
 
   static getVersionString(): string {
     return `${this.major}.${this.minor}.${this.patch}${this.prerelease != null ? `-${this.prerelease}` : ''}`;

package/README.md

@@ -94,64 +94,26 @@ See the [Building Expo apps for TV](https://docs.expo.dev/guides/building-for-tv
 
 Using Expo's [continuous native generation (CNG)](https://docs.expo.dev/workflow/continuous-native-generation/) model, projects created this way can be used to build either mobile or TV apps, taking advantage of the full support for both mobile and TV platforms in this repo.
 
-### Project creation using the React Native Community CLI
+### Creating a new project with the Community CLI
 
-As of React Native 0.75.x, the template that used to reside in the `react-native` core package has been moved to a [new community repo](https://github.com/react-native-community/template) and will be maintained there. To support developers that wish to continue using the community CLI, we have created a [new TV template repository](https://github.com/react-native-tvos/template-tv) and will maintain a TV port of this template.
+We maintain [template-tv](https://github.com/react-native-tvos/template-tv), a TV-specific template for developers using the React Native Community CLI. This project extends the Community CLI with `run-tvos`, `build-tvos`, and `log-tvos` commands for tvOS development.
 
-> _Note:_ The new TV template will only build apps for Apple TV and Android TV. Multiple platform targets are no longer supported in React Native app Podfiles.
-
-To create a new project for RNTV 0.81:
+> [!NOTE]
+> This template only supports Apple TV and Android TV. Multiple platform targets are no longer supported in React Native app Podfiles.
 
+**Quick start:**
 ```sh
-# 
-# Init an app called 'TVTest', note that you must not be in a node module (directory with node_modules sub-directory) for this to work
-$ npx @react-native-community/cli@latest init TVTest --template @react-native-tvos/template-tv
-                                                          
-               ######                ######               
-             ###     ####        ####     ###             
-            ##          ###    ###          ##            
-            ##             ####             ##            
-            ##             ####             ##            
-            ##           ##    ##           ##            
-            ##         ###      ###         ##            
-             ##  ########################  ##             
-          ######    ###            ###    ######          
-      ###     ##    ##              ##    ##     ###      
-   ###         ## ###      ####      ### ##         ###   
-  ##           ####      ########      ####           ##  
- ##             ###     ##########     ###             ## 
-  ##           ####      ########      ####           ##  
-   ###         ## ###      ####      ### ##         ###   
-      ###     ##    ##              ##    ##     ###      
-          ######    ###            ###    ######          
-             ##  ########################  ##             
-            ##         ###      ###         ##            
-            ##           ##    ##           ##            
-            ##             ####             ##            
-            ##             ####             ##            
-            ##          ###    ###          ##            
-             ###     ####        ####     ###             
-               ######                ######               
-                                                          
-
-              Welcome to React Native 0.81!                
-                 Learn once, write anywhere               
-
-✔ Downloading template
-✔ Copying template
-✔ Processing template
-✔ Installing dependencies
-✔ Do you want to install CocoaPods now? Only needed if you run your project in Xcode directly … yes
-✔ Installing Ruby Gems
-✔ Installing CocoaPods dependencies  (this may take a few minutes)
-.
-.
-.
-$ cd TVTest
-# Now build and start the app in the tvOS Simulator - this will only work on a macOS machine.
-npx react-native run-ios --simulator "Apple TV"
-# This command builds and starts the app in an Android TV emulator (needs to be created in advance).
-npx react-native run:android --device tv_api_31
+# Initialize a new app called 'TVTest'
+# This command should be run outside of any existing node project
+npx @react-native-community/cli@latest init TVTest --template @react-native-tvos/template-tv
+
+cd TVTest
+
+# Build and run on tvOS Simulator (macOS only, requires Apple TV simulator)
+npx react-native run-tvos --simulator "Apple TV"
+
+# Build and run on Android TV emulator (requires Android TV emulator)
+npx react-native run-android --device tv_api_31
 ```
 
 ## How to support TV specific file extensions

package/React/Base/RCTVersion.m

@@ -23,8 +23,8 @@ NSDictionary* RCTGetReactNativeVersion(void)
     __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(84),
-                  RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"0rc5",
+                  RCTVersionPatch: @(1),
+                  RCTVersionPrerelease: @"0",
                   };
   });
   return __rnVersion;

package/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm

@@ -1139,6 +1139,16 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
 #pragma mark Apple TV swipe and focus handling
 
 #if TARGET_OS_TV
+- (void)sendFocusEvent
+{
+  self->_eventEmitter->onFocus();
+}
+
+- (void)sendBlurEvent
+{
+  self->_eventEmitter->onBlur();
+}
+
 - (void)didUpdateFocusInContext:(UIFocusUpdateContext *)context
        withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator
 {
@@ -1148,11 +1158,13 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
     if (context.nextFocusedView == self) {
         [self becomeFirstResponder];
         [self addSwipeGestureRecognizers];
+        [self sendFocusEvent];
         // if we enter the scroll view from different view then block first touch event since it is the event that triggered the focus
         _blockFirstTouch = (unsigned long)context.focusHeading != 0;
         [self addArrowsListeners];
     } else if (context.previouslyFocusedView == self) {
         [self removeArrowsListeners];
+        [self sendBlurEvent];
         [self removeSwipeGestureRecognizers];
         [self resignFirstResponder];
         // If scrolling is enabled:

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

@@ -88,6 +88,7 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
   NSArray* _focusDestinations;
   id<UIFocusItem> _previouslyFocusedItem;
   RCTSwiftUIContainerViewWrapper *_swiftUIWrapper;
+  BOOL _shouldFocusOnMount;
 }
 
 #ifdef RCT_DYNAMIC_FRAMEWORKS
@@ -113,6 +114,8 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
     _tvParallaxProperties.pressMagnification = 1.0f;
     _tvParallaxProperties.pressDuration = 0.3f;
     _tvParallaxProperties.pressDelay = 0.0f;
+    
+    _shouldFocusOnMount = false;
 #else
     self.multipleTouchEnabled = YES;
 #endif
@@ -170,6 +173,15 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
 
 #pragma mark - Apple TV methods
 
+- (void)didMoveToWindow {
+  [super didMoveToWindow];
+
+  if (self->_shouldFocusOnMount) {
+    self->_shouldFocusOnMount = false;
+    [self focusSelf];
+  }
+}
+
 - (RCTSurfaceHostingProxyRootView *)containingRootView
 {
   UIView *rootview = self;
@@ -205,10 +217,8 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
   if (!focusedSync) {
     // `focusSelf` function relies on `rootView` which may not be present on the first render.
     // `focusSelf` fails and returns `false` in that case. We try re-executing the same action
-    // by putting it to the main queue to make sure it runs after UI creation is completed.
-    dispatch_async(dispatch_get_main_queue(), ^{
-      [self focusSelf];
-    });
+    // when the view has moved to the window. This is tracked by the `_shouldFocusOnMount` flag.
+    self->_shouldFocusOnMount = true;
   }
 }
 

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.84.0-0rc5
+VERSION_NAME=0.84.1-0
 react.internal.publishingGroup=io.github.react-native-tvos
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

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

@@ -14,7 +14,7 @@ public object ReactNativeVersion {
   public val VERSION: Map<String, Any?> = mapOf(
     "major" to 0,
     "minor" to 84,
-    "patch" to 0,
-    "prerelease" to "0rc5"
+    "patch" to 1,
+    "prerelease" to "0"
   )
 }

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -14,15 +14,15 @@
 
 #define REACT_NATIVE_VERSION_MAJOR 0
 #define REACT_NATIVE_VERSION_MINOR 84
-#define REACT_NATIVE_VERSION_PATCH 0
+#define REACT_NATIVE_VERSION_PATCH 1
 
 namespace facebook::react {
 
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 84;
-  int32_t Patch = 0;
-  std::string_view Prerelease = "0rc5";
+  int32_t Patch = 1;
+  std::string_view Prerelease = "0";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/hermes/inspector-modern/chrome/Registration.cpp

@@ -8,10 +8,13 @@
 #include "Registration.h"
 #include "ConnectionDemux.h"
 
-#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
+#if defined(HERMES_ENABLE_DEBUGGER)
 
-namespace facebook::hermes::inspector_modern::chrome {
+#include <hermes/hermes.h>
+
+#if !defined(HERMES_V1_ENABLED)
 
+namespace facebook::hermes::inspector_modern::chrome {
 namespace {
 
 ConnectionDemux& demux() {
@@ -34,4 +37,42 @@ void disableDebugging(DebugSessionToken session) {
 
 } // namespace facebook::hermes::inspector_modern::chrome
 
-#endif // defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
+#else
+
+namespace facebook::hermes::inspector_modern {
+class RuntimeAdapter {
+  // Backwards compatibility definition fallback for libraries that are compiled
+  // without `HERMES_V1_ENABLED` but are linked against React Native with
+  // `HERMES_V1_ENABLED` which doesn't provide this symbol.
+ public:
+  virtual ~RuntimeAdapter() = 0;
+  virtual HermesRuntime& getRuntime() = 0;
+  virtual void tickleJs();
+};
+
+namespace chrome {
+
+using DebugSessionToken = int;
+
+DebugSessionToken enableDebugging(
+    std::unique_ptr<RuntimeAdapter>,
+    const std::string&) {
+  // Backwards compatibility fallback for libraries that are compiled without
+  // `HERMES_V1_ENABLED` but are linked against React Native with
+  // `HERMES_V1_ENABLED` which doesn't provide this symbol.
+  return -1;
+};
+
+void disableDebugging(DebugSessionToken) {
+  // Backwards compatibility fallback for libraries that are compiled without
+  // `HERMES_V1_ENABLED` but are linked against React Native with
+  // `HERMES_V1_ENABLED` which doesn't provide this symbol.
+}
+
+} // namespace chrome
+
+} // namespace facebook::hermes::inspector_modern
+
+#endif // !defined(HERMES_V1_ENABLED)
+
+#endif // defined(HERMES_ENABLE_DEBUGGER)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.84.0-0rc5",
+  "version": "0.84.1-0",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -165,12 +165,12 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.7.0",
-    "@react-native/assets-registry": "0.84.0-rc.5",
-    "@react-native/codegen": "0.84.0-rc.5",
-    "@react-native/community-cli-plugin": "0.84.0-rc.5",
-    "@react-native/gradle-plugin": "0.84.0-rc.5",
-    "@react-native/js-polyfills": "0.84.0-rc.5",
-    "@react-native/normalize-colors": "0.84.0-rc.5",
+    "@react-native/assets-registry": "0.84.1",
+    "@react-native/codegen": "0.84.1",
+    "@react-native/community-cli-plugin": "0.84.1",
+    "@react-native/gradle-plugin": "0.84.1",
+    "@react-native/js-polyfills": "0.84.1",
+    "@react-native/normalize-colors": "0.84.1",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -179,7 +179,7 @@
     "base64-js": "^1.5.1",
     "commander": "^12.0.0",
     "flow-enums-runtime": "^0.0.6",
-    "hermes-compiler": "250829098.0.7",
+    "hermes-compiler": "250829098.0.9",
     "invariant": "^2.2.4",
     "jest-environment-node": "^29.7.0",
     "memoize-one": "^5.0.0",
@@ -198,7 +198,7 @@
     "whatwg-fetch": "^3.0.0",
     "ws": "^7.5.10",
     "yargs": "^17.6.2",
-    "@react-native-tvos/virtualized-lists": "0.84.0-0rc5"
+    "@react-native-tvos/virtualized-lists": "0.84.1-0"
   },
   "codegenConfig": {
     "libraries": [

package/react-native.config.js

@@ -136,4 +136,21 @@ if (android != null) {
   };
 }
 
+try {
+  const apple = require('@react-native-community/cli-platform-apple');
+  const tvosCommands = require('./tvosCommands');
+
+  config.commands.push(...tvosCommands);
+  config.platforms.tvos = {
+    projectConfig: apple.getProjectConfig({platformName: 'tvos'}),
+    dependencyConfig: apple.getDependencyConfig({platformName: 'tvos'}),
+  };
+} catch {
+  if (verbose) {
+    console.warn(
+      '@react-native-community/cli-platform-apple not found, the react-native.config.js may be unusable.',
+    );
+  }
+}
+
 module.exports = config;

package/sdks/.hermesv1version

@@ -1 +1 @@
-hermes-v250829098.0.8
+hermes-v250829098.0.9

package/sdks/hermes-engine/version.properties

@@ -1,2 +1,2 @@
-HERMES_VERSION_NAME=0.14.1
-HERMES_V1_VERSION_NAME=250829098.0.7
+HERMES_VERSION_NAME=0.15.1
+HERMES_V1_VERSION_NAME=250829098.0.9

package/settings.gradle.kts

@@ -47,8 +47,28 @@ buildscript {
   val properties = java.util.Properties()
   val propertiesToInherit = listOf("hermesV1Enabled", "react.hermesV1Enabled")
 
+  // We cannot assume that the node_modules are next to the android project, for example
+  // in monorepos, they might get hoisted.
+  // In a composite build, this included build can access the invoking (consumer) build
+  // via `gradle.parent`. We use its StartParameter to locate the app's `gradle.properties`:
+  // - `projectDir/gradle.properties` when Gradle is run with `-p <androidDir>`
+  // - `currentDir/gradle.properties` when run from the app android folder
+  // If neither exists, we keep the legacy RN fallback path below.
+
+  val parentGradle = gradle.parent
+  val parentProjectDir = parentGradle?.startParameter?.projectDir
+  val parentCurrentDir = parentGradle?.startParameter?.currentDir
+  val gradlePropertiesCandidates =
+      listOfNotNull(
+          parentProjectDir?.resolve("gradle.properties"),
+          parentCurrentDir?.resolve("gradle.properties"),
+          // Backward-compatible fallback for classic RN app layouts.
+          file("../../android/gradle.properties"),
+      )
+
   try {
-    file("../../android/gradle.properties").inputStream().use { properties.load(it) }
+    val propertiesFile = gradlePropertiesCandidates.firstOrNull { it.exists() }
+    propertiesFile?.inputStream()?.use { properties.load(it) }
 
     gradle.rootProject {
       propertiesToInherit.forEach { property ->

package/tvosCommands.js

@@ -0,0 +1,51 @@
+/**
+ * @flow
+ */
+
+let apple;
+try {
+  apple = require('@react-native-community/cli-platform-apple');
+} catch {
+  if (verbose) {
+    console.warn(
+      '@react-native-community/cli-platform-apple not found, the react-native.config.js may be unusable.'
+    );
+  }
+}
+
+const platformName = 'tvos';
+
+const run = {
+  name: `run-${platformName}`,
+  description: 'builds your app and starts it on a tvOS simulator or Apple TV device',
+  func: apple.createRun({platformName}),
+  examples: [
+    {
+      desc: 'Run on a specific simulator',
+      cmd: `npx react-native run-${platformName} --simulator "Apple TV"`,
+    },
+  ],
+  options: apple.getRunOptions({platformName}),
+};
+
+const log = {
+  name: `log-${platformName}`,
+  description: 'displays system logs from a connected tvOS device or simulator',
+  func: apple.createLog({platformName: platformName}),
+  options: apple.getLogOptions({platformName}),
+};
+
+const build = {
+  name: `build-${platformName}`,
+  description: 'builds your app for tvOS',
+  func: apple.createBuild({platformName}),
+  examples: [
+      {
+      desc: 'Build the app for all tvOS devices in Release mode',
+      cmd: `npx react-native build-${platformName} --mode "Release"`,
+      },
+  ],
+  options: apple.getBuildOptions({platformName}),
+};
+
+module.exports = [run, log, build];