react-native-tvos 0.85.2-0 → 0.86.0-0rc2

package/ReactAndroid/build.gradle.kts

@@ -279,6 +279,11 @@ val preparePrefab by
                           "../ReactCommon/react/renderer/animationbackend/",
                           "react/renderer/animationbackend/",
                       ),
+                      // react_renderer_viewtransition
+                      Pair(
+                          "../ReactCommon/react/renderer/viewtransition/",
+                          "react/renderer/viewtransition/",
+                      ),
                   ),
               ),
               PrefabPreprocessingEntry(
@@ -291,11 +296,10 @@ val preparePrefab by
       outputDir.set(prefabHeadersDir)
     }
 
-val createNativeDepsDirectories by
-    tasks.registering {
-      downloadsDir.mkdirs()
-      thirdPartyNdkDir.mkdirs()
-    }
+val createNativeDepsDirectories by tasks.registering {
+  downloadsDir.mkdirs()
+  thirdPartyNdkDir.mkdirs()
+}
 
 val downloadBoostDest = File(downloadsDir, "boost_${BOOST_VERSION}.tar.gz")
 val downloadBoost by
@@ -436,23 +440,21 @@ val prepareGlog by
     }
 
 // Tasks used by Fantom to download the Native 3p dependencies used.
-val prepareNative3pDependencies by
-    tasks.registering {
-      dependsOn(
-          prepareBoost,
-          prepareDoubleConversion,
-          prepareFastFloat,
-          prepareFmt,
-          prepareFolly,
-          prepareGlog,
-      )
-    }
+val prepareNative3pDependencies by tasks.registering {
+  dependsOn(
+      prepareBoost,
+      prepareDoubleConversion,
+      prepareFastFloat,
+      prepareFmt,
+      prepareFolly,
+      prepareGlog,
+  )
+}
 
-val prepareKotlinBuildScriptModel by
-    tasks.registering {
-      // This task is run when Gradle Sync is running.
-      // We create it here so we can let it depend on preBuild inside the android{}
-    }
+val prepareKotlinBuildScriptModel by tasks.registering {
+  // This task is run when Gradle Sync is running.
+  // We create it here so we can let it depend on preBuild inside the android{}
+}
 
 // As ReactAndroid builds from source, the codegen needs to be built before it can be invoked.
 // This is not the case for users of React Native, as we ship a compiled version of the codegen.
@@ -687,6 +689,10 @@ tasks.withType<KotlinCompile>().configureEach {
   exclude("com/facebook/annotationprocessors/**")
   exclude("com/facebook/react/processing/**")
   exclude("com/facebook/react/module/processing/**")
+  // These are instrumentation tests that require a device/emulator and native test
+  // libraries not available in the OSS Gradle build (Buck-only).
+  exclude("com/facebook/react/fabric/FabricMountingManagerInstrumentationTest.kt")
+  exclude("com/facebook/react/fabric/FabricMountingManagerTestHelper.kt")
 }
 
 dependencies {
@@ -695,6 +701,7 @@ dependencies {
   api(libs.androidx.autofill)
   api(libs.androidx.swiperefreshlayout)
   api(libs.androidx.tracing)
+  api(libs.androidx.window)
 
   api(libs.fbjni)
   api(libs.fresco)

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.85.2-0
+VERSION_NAME=0.86.0-0rc2
 react.internal.publishingGroup=io.github.react-native-tvos
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

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

@@ -441,6 +441,17 @@ android {
   }
 
   prefab { create("hermesvm") { headers = prefabHeadersDir.absolutePath } }
+
+  // Mirror ReactAndroid's multi-variant publishing setup so consumers can
+  // pick a debug / debugOptimized / release variant of the hermes-engine
+  // AAR. Required by `apply(from = "../publish.gradle")` below, which uses
+  // `from components.default` and therefore needs a multi-variant component.
+  publishing {
+    multipleVariants {
+      withSourcesJar()
+      allVariants()
+    }
+  }
 }
 
 afterEvaluate {
@@ -460,3 +471,9 @@ tasks.withType<JavaCompile>().configureEach {
   options.compilerArgs.add("-Xlint:deprecation,unchecked")
   options.compilerArgs.add("-Werror")
 }
+
+/* Publishing Configuration */
+// Reuses the publish.gradle template applied to ReactAndroid; the file is
+// generated by the build-android-artifacts EAS workflow. Resulting artifact
+// coordinate: io.github.react-native-tvos:hermes-engine:<version>.
+apply(from = "../publish.gradle")

package/ReactAndroid/publish.gradle

@@ -3,25 +3,17 @@
  *
  * 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 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 isSnapshot = findProperty("isSnapshot")?.toBoolean()
+def signingKey = findProperty("SIGNING_KEY")
+def signingPwd = findProperty("SIGNING_PWD")
 
 def reactAndroidProjectDir = project(':packages:react-native:ReactAndroid').projectDir
-def mavenTempLocalUrl = 'file:///home/expo/workingdir/build/maven-local'
-// Rewritten when copying this to ReactAndroid/publish.gradle
+def mavenTempLocalUrl = "file:///tmp/maven-local"
 
 publishing {
     publications {
@@ -29,7 +21,7 @@ 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
                 }
             }
@@ -37,35 +29,35 @@ publishing {
             // We populate the publishing version using the project version,
             // appending -SNAPSHOT if on nightly or prerelase.
             if (isSnapshot) {
-                version = this.version + '-SNAPSHOT'
+                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"
                 }
             }
         }
@@ -73,36 +65,18 @@ publishing {
 
     repositories {
         maven {
-            name = 'mavenTempLocal'
+            name = "mavenTempLocal"
             url = mavenTempLocalUrl
         }
-        maven {
-            name = 'sonatypeRelease'
-            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
-            }
-        }
-        maven {
-            name = 'sonatypeSnapshot'
-            url = 'https://central.sonatype.com/repository/maven-snapshots/'
-            // 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')
+        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')
+        logger.info("Signing disabled as the PGP key was not found")
     }
 }

package/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/HermesSamplingProfiler.kt

@@ -8,8 +8,10 @@
 package com.facebook.hermes.instrumentation
 
 import com.facebook.soloader.SoLoader
+import com.facebook.soloader.annotation.SoLoaderLibrary
 
 /** Hermes sampling profiler static JSI API. */
+@SoLoaderLibrary("jsijniprofiler")
 public object HermesSamplingProfiler {
   init {
     SoLoader.loadLibrary("jsijniprofiler")

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

@@ -138,9 +138,7 @@ public class ReactActivityDelegate {
           if (mActivity != null) {
             Window window = mActivity.getWindow();
             if (window != null) {
-              if (WindowUtilKt.isEdgeToEdgeFeatureFlagOn()) {
-                WindowUtilKt.enableEdgeToEdge(window);
-              }
+              WindowUtilKt.updateEdgeToEdgeFeatureFlag(mActivity);
               if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && isWideColorGamutEnabled()) {
                 window.setColorMode(ActivityInfo.COLOR_MODE_WIDE_COLOR_GAMUT);
               }

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

@@ -60,6 +60,8 @@ internal class ReactAndroidHWInputDeviceHelper {
             KeyEvent.KEYCODE_DPAD_CENTER to "select",
             KeyEvent.KEYCODE_ENTER to "select",
             KeyEvent.KEYCODE_SPACE to "select",
+            KeyEvent.KEYCODE_MEDIA_PLAY to "play",
+            KeyEvent.KEYCODE_MEDIA_PAUSE to "pause",
             KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE to "playPause",
             KeyEvent.KEYCODE_MEDIA_REWIND to "rewind",
             KeyEvent.KEYCODE_MEDIA_FAST_FORWARD to "fastForward",

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

@@ -10,15 +10,11 @@ package com.facebook.react;
 import static com.facebook.infer.annotation.ThreadConfined.UI;
 import static com.facebook.react.bridge.ReactMarkerConstants.ATTACH_MEASURED_ROOT_VIEWS_END;
 import static com.facebook.react.bridge.ReactMarkerConstants.ATTACH_MEASURED_ROOT_VIEWS_START;
-import static com.facebook.react.bridge.ReactMarkerConstants.BUILD_NATIVE_MODULE_REGISTRY_END;
-import static com.facebook.react.bridge.ReactMarkerConstants.BUILD_NATIVE_MODULE_REGISTRY_START;
 import static com.facebook.react.bridge.ReactMarkerConstants.CHANGE_THREAD_PRIORITY;
 import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_VIEW_MANAGERS_END;
 import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_VIEW_MANAGERS_START;
 import static com.facebook.react.bridge.ReactMarkerConstants.PRE_SETUP_REACT_CONTEXT_END;
 import static com.facebook.react.bridge.ReactMarkerConstants.PRE_SETUP_REACT_CONTEXT_START;
-import static com.facebook.react.bridge.ReactMarkerConstants.PROCESS_PACKAGES_END;
-import static com.facebook.react.bridge.ReactMarkerConstants.PROCESS_PACKAGES_START;
 import static com.facebook.react.bridge.ReactMarkerConstants.REACT_CONTEXT_THREAD_END;
 import static com.facebook.react.bridge.ReactMarkerConstants.REACT_CONTEXT_THREAD_START;
 import static com.facebook.react.bridge.ReactMarkerConstants.SETUP_REACT_CONTEXT_END;
@@ -27,6 +23,7 @@ import static com.facebook.react.bridge.ReactMarkerConstants.VM_INIT;
 import static com.facebook.react.uimanager.common.UIManagerType.FABRIC;
 import static com.facebook.systrace.Systrace.TRACE_TAG_REACT;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -51,7 +48,6 @@ import com.facebook.react.bridge.JSBundleLoader;
 import com.facebook.react.bridge.JSExceptionHandler;
 import com.facebook.react.bridge.JavaScriptExecutor;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
-import com.facebook.react.bridge.NativeModuleRegistry;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactMarker;
@@ -81,7 +77,6 @@ import com.facebook.react.internal.AndroidChoreographerProvider;
 import com.facebook.react.internal.ChoreographerProvider;
 import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags;
 import com.facebook.react.modules.appearance.AppearanceModule;
-import com.facebook.react.modules.appregistry.AppRegistry;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.ReactChoreographer;
@@ -91,7 +86,6 @@ import com.facebook.react.uimanager.ReactRoot;
 import com.facebook.react.uimanager.ReactStage;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.ViewManager;
-import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper;
 import com.facebook.soloader.SoLoader;
 import com.facebook.systrace.Systrace;
@@ -593,12 +587,14 @@ public class ReactInstanceManager {
 
   /**
    * Call this from {@link Activity#onPause()}. This notifies any listening modules so they can do
-   * any necessary cleanup. The passed Activity is the current Activity being paused. This will
-   * always be the foreground activity that would be returned by {@link
-   * ReactContext#getCurrentActivity()}.
+   * any necessary cleanup. The passed Activity is the current Activity being paused. This is
+   * expected to be the foreground activity that would be returned by {@link
+   * ReactContext#getCurrentActivity()}. If the passed activity does not match the current activity,
+   * a warning will be logged instead of crashing.
    *
    * @param activity the activity being paused
    */
+  @SuppressLint("ReflectionMethodUse")
   @ThreadConfined(UI)
   public void onHostPause(@Nullable Activity activity) {
     if (mRequireActivity) {
@@ -612,15 +608,15 @@ public class ReactInstanceManager {
       }
       Assertions.assertCondition(mCurrentActivity != null);
     }
-    if (mCurrentActivity != null) {
-      Assertions.assertCondition(
-          activity == mCurrentActivity,
+    if (mCurrentActivity != null && activity != mCurrentActivity) {
+      FLog.w(
+          TAG,
           "Pausing an activity that is not the current activity, this is incorrect! "
               + "Current activity: "
               + mCurrentActivity.getClass().getSimpleName()
               + " "
               + "Paused activity: "
-              + activity.getClass().getSimpleName());
+              + (activity == null ? "null" : activity.getClass().getSimpleName()));
     }
     onHostPause();
   }
@@ -769,10 +765,7 @@ public class ReactInstanceManager {
       synchronized (mReactContextLock) {
         if (mCurrentReactContext != null) {
           for (ReactRoot reactRoot : mAttachedReactRoots) {
-            // Fabric surfaces must be cleaned up when React Native is destroyed.
-            if (reactRoot.getUIManagerType() == UIManagerType.FABRIC) {
-              detachRootViewFromInstance(reactRoot, mCurrentReactContext);
-            }
+            detachRootViewFromInstance(reactRoot, mCurrentReactContext);
           }
 
           mCurrentReactContext.destroy();
@@ -1273,9 +1266,7 @@ public class ReactInstanceManager {
 
     Systrace.beginSection(TRACE_TAG_REACT, "attachRootViewToInstance");
 
-    @Nullable
-    UIManager uiManager =
-        UIManagerHelper.getUIManager(mCurrentReactContext, reactRoot.getUIManagerType());
+    @Nullable UIManager uiManager = UIManagerHelper.getUIManager(mCurrentReactContext, FABRIC);
 
     // If we can't get a UIManager something has probably gone horribly wrong
     if (uiManager == null) {
@@ -1286,28 +1277,16 @@ public class ReactInstanceManager {
 
     @Nullable Bundle initialProperties = reactRoot.getAppProperties();
 
-    final int rootTag;
-    if (reactRoot.getUIManagerType() == FABRIC) {
-      rootTag =
-          uiManager.startSurface(
-              reactRoot.getRootViewGroup(),
-              reactRoot.getJSModuleName(),
-              initialProperties == null
-                  ? new WritableNativeMap()
-                  : Arguments.fromBundle(initialProperties),
-              reactRoot.getWidthMeasureSpec(),
-              reactRoot.getHeightMeasureSpec());
-      reactRoot.setShouldLogContentAppeared(true);
-    } else {
-      rootTag =
-          uiManager.addRootView(
-              reactRoot.getRootViewGroup(),
-              initialProperties == null
-                  ? new WritableNativeMap()
-                  : Arguments.fromBundle(initialProperties));
-      reactRoot.setRootViewTag(rootTag);
-      reactRoot.runApplication();
-    }
+    final int rootTag =
+        uiManager.startSurface(
+            reactRoot.getRootViewGroup(),
+            reactRoot.getJSModuleName(),
+            initialProperties == null
+                ? new WritableNativeMap()
+                : Arguments.fromBundle(initialProperties),
+            reactRoot.getWidthMeasureSpec(),
+            reactRoot.getHeightMeasureSpec());
+    reactRoot.setShouldLogContentAppeared(true);
 
     Systrace.beginAsyncSection(TRACE_TAG_REACT, "pre_rootView.onAttachedToReactInstance", rootTag);
     UiThreadUtil.runOnUiThread(
@@ -1328,36 +1307,28 @@ public class ReactInstanceManager {
       return;
     }
 
-    @UIManagerType int uiManagerType = reactRoot.getUIManagerType();
-    if (uiManagerType == UIManagerType.FABRIC) {
-      // Stop surface in Fabric.
-      // Calling FabricUIManager.stopSurface causes the C++ Binding.stopSurface
-      // to be called synchronously over the JNI, which causes an empty tree
-      // to be committed via the Scheduler, which will cause mounting instructions
-      // to be queued up and synchronously executed to delete and remove
-      // all the views in the hierarchy.
-      final int surfaceId = reactRoot.getRootViewTag();
-      if (surfaceId != View.NO_ID) {
-        UIManager uiManager = UIManagerHelper.getUIManager(reactContext, uiManagerType);
-        if (uiManager != null) {
-          uiManager.stopSurface(surfaceId);
-        } else {
-          FLog.w(ReactConstants.TAG, "Failed to stop surface, UIManager has already gone away");
-        }
+    // Stop surface in Fabric.
+    // Calling FabricUIManager.stopSurface causes the C++ Binding.stopSurface
+    // to be called synchronously over the JNI, which causes an empty tree
+    // to be committed via the Scheduler, which will cause mounting instructions
+    // to be queued up and synchronously executed to delete and remove
+    // all the views in the hierarchy.
+    final int surfaceId = reactRoot.getRootViewTag();
+    if (surfaceId != View.NO_ID) {
+      UIManager uiManager = UIManagerHelper.getUIManager(reactContext, FABRIC);
+      if (uiManager != null) {
+        uiManager.stopSurface(surfaceId);
       } else {
-        ReactSoftExceptionLogger.logSoftException(
-            TAG,
-            new RuntimeException(
-                "detachRootViewFromInstance called with ReactRootView with invalid id"));
+        FLog.w(ReactConstants.TAG, "Failed to stop surface, UIManager has already gone away");
       }
-
-      clearReactRoot(reactRoot);
     } else {
-      reactContext
-          .getCatalystInstance()
-          .getJSModule(AppRegistry.class)
-          .unmountApplicationComponentAtRootTag(reactRoot.getRootViewTag());
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          new RuntimeException(
+              "detachRootViewFromInstance called with ReactRootView with invalid id"));
     }
+
+    clearReactRoot(reactRoot);
   }
 
   @ThreadConfined(UI)
@@ -1392,45 +1363,4 @@ public class ReactInstanceManager {
         "ReactInstanceManager.createReactContext is unsupported. CatalystInstanceImpl has been"
             + " removed.");
   }
-
-  private NativeModuleRegistry processPackages(
-      ReactApplicationContext reactContext, List<ReactPackage> packages) {
-    NativeModuleRegistryBuilder nativeModuleRegistryBuilder =
-        new NativeModuleRegistryBuilder(reactContext);
-
-    ReactMarker.logMarker(PROCESS_PACKAGES_START);
-
-    synchronized (mPackages) {
-      for (ReactPackage reactPackage : packages) {
-        Systrace.beginSection(TRACE_TAG_REACT, "createAndProcessCustomReactPackage");
-        try {
-          processPackage(reactPackage, nativeModuleRegistryBuilder);
-        } finally {
-          Systrace.endSection(TRACE_TAG_REACT);
-        }
-      }
-    }
-    ReactMarker.logMarker(PROCESS_PACKAGES_END);
-
-    ReactMarker.logMarker(BUILD_NATIVE_MODULE_REGISTRY_START);
-    Systrace.beginSection(TRACE_TAG_REACT, "buildNativeModuleRegistry");
-    NativeModuleRegistry nativeModuleRegistry;
-    try {
-      nativeModuleRegistry = nativeModuleRegistryBuilder.build();
-    } finally {
-      Systrace.endSection(TRACE_TAG_REACT);
-      ReactMarker.logMarker(BUILD_NATIVE_MODULE_REGISTRY_END);
-    }
-
-    return nativeModuleRegistry;
-  }
-
-  private void processPackage(
-      ReactPackage reactPackage, NativeModuleRegistryBuilder nativeModuleRegistryBuilder) {
-    SystraceMessage.beginSection(TRACE_TAG_REACT, "processPackage")
-        .arg("className", reactPackage.getClass().getSimpleName())
-        .flush();
-    nativeModuleRegistryBuilder.processPackage(reactPackage);
-    SystraceMessage.endSection(TRACE_TAG_REACT).flush();
-  }
 }