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

package/Libraries/Core/ReactNativeVersion.js

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

package/React/Base/RCTVersion.m

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

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

@@ -1148,13 +1148,11 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
     if (context.nextFocusedView == self) {
         [self becomeFirstResponder];
         [self addSwipeGestureRecognizers];
-        [self sendFocusNotification];
         // 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 sendBlurNotification];
         [self removeSwipeGestureRecognizers];
         [self resignFirstResponder];
         // If scrolling is enabled:
@@ -1263,16 +1261,6 @@ static inline UIViewAnimationOptions animationOptionsWithCurve(UIViewAnimationCu
     return [super shouldUpdateFocusInContext:context];
 }
 
-- (void)sendFocusNotification
-{
-    [[NSNotificationCenter defaultCenter] postNavigationFocusEventWithTag:@(self.tag) target:nil];
-}
-
-- (void)sendBlurNotification
-{
-    [[NSNotificationCenter defaultCenter] postNavigationBlurEventWithTag:@(self.tag) target:nil];
-}
-
 - (NSInteger)swipeVerticalInterval
 {
     RCTEnhancedScrollView *scrollView = (RCTEnhancedScrollView *)_scrollView;

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

@@ -265,16 +265,6 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
   [self handleFocusGuide];
 }
 
-- (void)sendFocusNotification:(__unused UIFocusUpdateContext *)context
-{
-    [[NSNotificationCenter defaultCenter] postNavigationFocusEventWithTag:@(self.tag) target:@(self.tag)];
-}
-
-- (void)sendBlurNotification:(__unused UIFocusUpdateContext *)context
-{
-    [[NSNotificationCenter defaultCenter] postNavigationBlurEventWithTag:@(self.tag) target:@(self.tag)];
-}
-
 - (void)sendSelectNotification
 {
   [[NSNotificationCenter defaultCenter] postNavigationPressEventWithType:RCTTVRemoteEventSelect keyAction:RCTTVRemoteEventKeyActionUp tag:@(self.tag) target:@(self.tag)];
@@ -596,7 +586,6 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
       [self enableDirectionalFocusGuides];
       [coordinator addCoordinatedAnimations:^(void){
           if (self->_eventEmitter) self->_eventEmitter->onFocus();
-          [self sendFocusNotification:context];
           [self addParallaxMotionEffects];
       } completion:^(void){}];
       // Without this check, onBlur would also trigger when `TVFocusGuideView` transfers focus to its children.
@@ -607,7 +596,6 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
       [coordinator addCoordinatedAnimations:^(void){
           [self removeParallaxMotionEffects];
           if (self->_eventEmitter) self->_eventEmitter->onBlur();
-          [self sendBlurNotification:context];
       } completion:^(void){}];
       [self resignFirstResponder];
     }

package/React/Views/RCTTVView.h

@@ -70,11 +70,17 @@
 
 /**
  * Send Focus Notifications to listeners
+ * @deprecated This method emits focus events to TVEventHandler, which is deprecated.
+ * Use onFocus/onBlur component props instead. Will be removed when old arch is removed.
+ * See: https://github.com/react-native-tvos/react-native-tvos/issues/1037
  */
 - (void)sendFocusNotification:(UIFocusUpdateContext *)context;
 
 /**
  * Send Blur Notifications to listeners
+ * @deprecated This method emits blur events to TVEventHandler, which is deprecated.
+ * Use onFocus/onBlur component props instead. Will be removed when old arch is removed.
+ * See: https://github.com/react-native-tvos/react-native-tvos/issues/1037
  */
 - (void)sendBlurNotification:(UIFocusUpdateContext *)context;
 

package/ReactAndroid/gradle.properties

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

package/ReactAndroid/hermes-engine/build.gradle.kts

@@ -151,28 +151,55 @@ val installCMake by
       )
     }
 
+fun configureBuildForHermesCommandLineArgs(
+    hermesBuildDir: File,
+    jsiDir: File,
+    enableDebugger: Boolean,
+): List<String> {
+  var cmakeCommandLine =
+      windowsAwareCommandLine(
+          cmakeBinaryPath,
+          // Suppress all warnings as this is the Hermes build and we can't fix them.
+          "--log-level=ERROR",
+          "-Wno-dev",
+          "-S",
+          ".",
+          "-B",
+          hermesBuildDir.toString(),
+          "-DJSI_DIR=" + jsiDir.absolutePath,
+          "-DCMAKE_BUILD_TYPE=Release",
+      )
+  if (enableDebugger) {
+    cmakeCommandLine = cmakeCommandLine + "-DHERMES_ENABLE_DEBUGGER=True"
+  }
+  if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+    cmakeCommandLine = cmakeCommandLine + "-GNMake Makefiles"
+  }
+  if (hermesV1Enabled) {
+    cmakeCommandLine = cmakeCommandLine + "-DHERMESVM_HEAP_HV_MODE=HEAP_HV_PREFER32"
+  }
+
+  return cmakeCommandLine
+}
+
+fun buildHermesCCommandLineArgs() =
+    listOf(
+        cmakeBinaryPath,
+        "--build",
+        hermesBuildDir.toString(),
+        "--target",
+        "hermesc",
+        "-j",
+        ndkBuildJobs,
+    )
+
 val configureBuildForHermes by
     tasks.registering(CustomExecTask::class) {
       dependsOn(installCMake)
       workingDir(hermesDir)
       inputs.dir(hermesDir)
       outputs.files(hermesBuildOutputFileTree)
-      var cmakeCommandLine =
-          windowsAwareCommandLine(
-              cmakeBinaryPath,
-              // Suppress all warnings as this is the Hermes build and we can't fix them.
-              "--log-level=ERROR",
-              "-Wno-dev",
-              "-S",
-              ".",
-              "-B",
-              hermesBuildDir.toString(),
-              "-DJSI_DIR=" + jsiDir.absolutePath,
-              "-DCMAKE_BUILD_TYPE=Release",
-          )
-      if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-        cmakeCommandLine = cmakeCommandLine + "-GNMake Makefiles"
-      }
+      val cmakeCommandLine = configureBuildForHermesCommandLineArgs(hermesBuildDir, jsiDir, false)
       commandLine(cmakeCommandLine)
       standardOutputFile.set(project.file("$buildDir/configure-hermesc.log"))
     }
@@ -183,22 +210,69 @@ val buildHermesC by
       workingDir(hermesDir)
       inputs.files(hermesBuildOutputFileTree)
       outputs.file(hermesCOutputBinary)
+      val cmakeCommandLine = buildHermesCCommandLineArgs()
+      commandLine(cmakeCommandLine)
+      standardOutputFile.set(project.file("$buildDir/build-hermesc.log"))
+      errorOutputFile.set(project.file("$buildDir/build-hermesc.error.log"))
+    }
+
+val prepareHeadersForPrefab by
+    tasks.registering(Copy::class) {
+      dependsOn(buildHermesC)
+      from("$hermesDir/API")
+      from("$hermesDir/public")
+      include("**/*.h")
+      exclude("jsi/**")
+      into(prefabHeadersDir)
+    }
+
+val buildHermesLib by
+    tasks.registering(CustomExecTask::class) {
+      dependsOn(buildHermesC)
+      workingDir(hermesDir)
+      inputs.files(hermesBuildOutputFileTree)
       commandLine(
           cmakeBinaryPath,
           "--build",
           hermesBuildDir.toString(),
           "--target",
-          "hermesc",
+          "hermesvm",
           "-j",
           ndkBuildJobs,
       )
+      standardOutputFile.set(project.file("$buildDir/build-hermes-lib.log"))
+      errorOutputFile.set(project.file("$buildDir/build-hermes-lib.error.log"))
+    }
+
+// The repeated tasks below named "*WithDebugger" are required by Fantom.
+// Hermes V1 by default builds with the debugger disabled, while Fantom needs
+// it to be enabled as it does a debug build of React Native.
+val configureBuildForHermesWithDebugger by
+    tasks.registering(CustomExecTask::class) {
+      dependsOn(installCMake)
+      workingDir(hermesDir)
+      inputs.dir(hermesDir)
+      outputs.files(hermesBuildOutputFileTree)
+      val cmakeCommandLine = configureBuildForHermesCommandLineArgs(hermesBuildDir, jsiDir, true)
+      commandLine(cmakeCommandLine)
+      standardOutputFile.set(project.file("$buildDir/configure-hermesc.log"))
+    }
+
+val buildHermesCWithDebugger by
+    tasks.registering(CustomExecTask::class) {
+      dependsOn(configureBuildForHermesWithDebugger)
+      workingDir(hermesDir)
+      inputs.files(hermesBuildOutputFileTree)
+      outputs.file(hermesCOutputBinary)
+      val cmakeCommandLine = buildHermesCCommandLineArgs()
+      commandLine(cmakeCommandLine)
       standardOutputFile.set(project.file("$buildDir/build-hermesc.log"))
       errorOutputFile.set(project.file("$buildDir/build-hermesc.error.log"))
     }
 
-val prepareHeadersForPrefab by
+val prepareHeadersForPrefabWithDebugger by
     tasks.registering(Copy::class) {
-      dependsOn(buildHermesC)
+      dependsOn(buildHermesCWithDebugger)
       from("$hermesDir/API")
       from("$hermesDir/public")
       include("**/*.h")
@@ -206,9 +280,9 @@ val prepareHeadersForPrefab by
       into(prefabHeadersDir)
     }
 
-val buildHermesLib by
+val buildHermesLibWithDebugger by
     tasks.registering(CustomExecTask::class) {
-      dependsOn(buildHermesC)
+      dependsOn(buildHermesCWithDebugger)
       workingDir(hermesDir)
       inputs.files(hermesBuildOutputFileTree)
       commandLine(
@@ -349,7 +423,10 @@ android {
     java.srcDirs("$hermesDir/lib/Platform/Intl/java", "$hermesDir/lib/Platform/Unicode/java")
   }
 
-  buildFeatures { prefab = true }
+  buildFeatures {
+    prefab = true
+    prefabPublishing = true
+  }
 
   dependencies {
     implementation(libs.fbjni)
@@ -372,6 +449,8 @@ afterEvaluate {
     // download/unzip Hermes from Github then.
     tasks.getByName("configureBuildForHermes").dependsOn(unzipHermes)
     tasks.getByName("prepareHeadersForPrefab").dependsOn(unzipHermes)
+    tasks.getByName("configureBuildForHermesWithDebugger").dependsOn(unzipHermes)
+    tasks.getByName("prepareHeadersForPrefabWithDebugger").dependsOn(unzipHermes)
   }
   tasks.getByName("preBuild").dependsOn(buildHermesC)
   tasks.getByName("preBuild").dependsOn(prepareHeadersForPrefab)

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.kt

@@ -644,7 +644,7 @@ public class NetworkingModule(
                     reactApplicationContext,
                     requestId,
                     devToolsRequestId,
-                    url,
+                    response.request().url().toString(),
                     response,
                 )
 

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

@@ -15,6 +15,6 @@ public object ReactNativeVersion {
     "major" to 0,
     "minor" to 84,
     "patch" to 0,
-    "prerelease" to "0rc0"
+    "prerelease" to "0rc5"
   )
 }

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

@@ -109,13 +109,13 @@ public open class ReactViewManager : ReactClippingViewManager<ReactViewGroup>()
 
   @ReactProp(name = "tvFocusable")
   public open fun setTvFocusable(view: ReactViewGroup, focusable: Boolean) {
-    setFocusable(view, focusable)
     if (!focusable) {
       view.isFocusable = false
       view.descendantFocusability = ViewGroup.FOCUS_BLOCK_DESCENDANTS
     } else {
       view.descendantFocusability = ViewGroup.FOCUS_AFTER_DESCENDANTS
     }
+    setFocusable(view, focusable)
   }
 
   @ReactProp(name = ViewProps.ACCESSIBILITY_ORDER)

package/ReactAndroid/src/main/jni/react/hermes/reactexecutor/CMakeLists.txt

@@ -27,8 +27,4 @@ target_link_libraries(
 target_compile_reactnative_options(hermes_executor PRIVATE)
 if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
   target_compile_options(hermes_executor PRIVATE -DHERMES_ENABLE_DEBUGGER=1)
-
-  if (HERMES_V1_ENABLED)
-        target_compile_options(hermes_executor PRIVATE -DHERMES_V1_ENABLED=1)
-  endif()
 endif()

package/ReactAndroid/src/main/jni/react/runtime/hermes/jni/CMakeLists.txt

@@ -29,8 +29,4 @@ target_link_libraries(hermesinstancejni
 target_compile_reactnative_options(hermesinstancejni PRIVATE)
 if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
   target_compile_options(hermesinstancejni PRIVATE -DHERMES_ENABLE_DEBUGGER=1)
-
-  if (HERMES_V1_ENABLED)
-        target_compile_options(hermesinstancejni PRIVATE -DHERMES_V1_ENABLED=1)
-  endif()
 endif ()

package/ReactAndroid/src/main/jni/react/runtime/jni/CMakeLists.txt

@@ -19,10 +19,6 @@ add_library(rninstance
 target_compile_reactnative_options(rninstance PRIVATE)
 if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
   target_compile_options(rninstance PRIVATE -DHERMES_ENABLE_DEBUGGER=1)
-
-  if (HERMES_V1_ENABLED)
-        target_compile_options(rninstance PRIVATE -DHERMES_V1_ENABLED=1)
-  endif()
 endif ()
 
 target_merge_so(rninstance)

package/ReactCommon/cmake-utils/react-native-flags.cmake

@@ -32,4 +32,7 @@ function(target_compile_reactnative_options target_name scope)
   if(ANDROID)
     target_compile_definitions(${target_name} ${scope} RN_SERIALIZABLE_STATE)
   endif()
+  if(HERMES_V1_ENABLED)
+    target_compile_definitions(${target_name} ${scope} HERMES_V1_ENABLED=1)
+  endif()
 endfunction()

package/ReactCommon/cxxreact/ReactNativeVersion.h

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

package/ReactCommon/hermes/executor/CMakeLists.txt

@@ -32,10 +32,6 @@ if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
                 PRIVATE
                 -DHERMES_ENABLE_DEBUGGER=1
         )
-
-        if (HERMES_V1_ENABLED)
-                target_compile_options(hermes_executor_common PRIVATE -DHERMES_V1_ENABLED=1)
-        endif()
 else()
         target_compile_options(
                 hermes_executor_common

package/ReactCommon/hermes/executor/HermesExecutorFactory.cpp

@@ -13,6 +13,8 @@
 #include <jsi/decorator.h>
 #include <jsinspector-modern/InspectorFlags.h>
 
+#include <thread>
+
 #include <hermes/inspector-modern/chrome/HermesRuntimeTargetDelegate.h>
 
 #if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)

package/ReactCommon/hermes/inspector-modern/CMakeLists.txt

@@ -23,10 +23,6 @@ if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
                 PRIVATE
                 -DHERMES_ENABLE_DEBUGGER=1
         )
-
-        if (HERMES_V1_ENABLED)
-                target_compile_options(hermes_inspector_modern PRIVATE -DHERMES_V1_ENABLED=1)
-        endif()
 endif()
 
 target_include_directories(hermes_inspector_modern PUBLIC ${REACT_COMMON_DIR})