react-native-tvos 0.75.4-0 → 0.76.0-0

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.java

@@ -44,7 +44,6 @@ import com.facebook.react.fabric.Binding;
 import com.facebook.react.fabric.BindingImpl;
 import com.facebook.react.fabric.ComponentFactory;
 import com.facebook.react.fabric.FabricUIManager;
-import com.facebook.react.fabric.ReactNativeConfig;
 import com.facebook.react.fabric.events.EventBeatManager;
 import com.facebook.react.interfaces.exceptionmanager.ReactJsExceptionHandler;
 import com.facebook.react.internal.AndroidChoreographerProvider;
@@ -90,17 +89,13 @@ final class ReactInstance {
 
   @DoNotStrip private final HybridData mHybridData;
 
-  private final ReactHostDelegate mDelegate;
   private final BridgelessReactContext mBridgelessReactContext;
-  private final List<ReactPackage> mReactPackages;
-
   private final ReactQueueConfiguration mQueueConfiguration;
   private final TurboModuleManager mTurboModuleManager;
   private final FabricUIManager mFabricUIManager;
   private final JavaTimerManager mJavaTimerManager;
   private final BridgelessViewManagerResolver mViewManagerResolver;
-
-  private JavaScriptContextHolder mJavaScriptContextHolder;
+  private final JavaScriptContextHolder mJavaScriptContextHolder;
 
   static {
     loadLibraryIfNeeded();
@@ -117,7 +112,6 @@ final class ReactInstance {
       boolean useDevSupport,
       @Nullable ReactHostInspectorTarget reactHostInspectorTarget) {
     mBridgelessReactContext = bridgelessReactContext;
-    mDelegate = delegate;
 
     Systrace.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "ReactInstance.initialize");
 
@@ -125,13 +119,10 @@ final class ReactInstance {
      * Prepare the ReactInstance by installing JSI bindings, initializing Fabric + TurboModules, and
      * loading the JS bundle.
      */
-    MessageQueueThreadSpec nativeModulesSpec =
-        MessageQueueThreadSpec.newBackgroundThreadSpec("v_native");
     ReactQueueConfigurationSpec spec =
-        ReactQueueConfigurationSpec.builder()
-            .setJSQueueThreadSpec(MessageQueueThreadSpec.newBackgroundThreadSpec("v_js"))
-            .setNativeModulesQueueThreadSpec(nativeModulesSpec)
-            .build();
+        new ReactQueueConfigurationSpec(
+            MessageQueueThreadSpec.newBackgroundThreadSpec("v_native"),
+            MessageQueueThreadSpec.newBackgroundThreadSpec("v_js"));
     mQueueConfiguration = ReactQueueConfigurationImpl.create(spec, exceptionHandler);
     FLog.d(TAG, "Calling initializeMessageQueueThreads()");
     mBridgelessReactContext.initializeMessageQueueThreads(mQueueConfiguration);
@@ -152,8 +143,8 @@ final class ReactInstance {
             ReactChoreographer.getInstance(),
             devSupportManager);
 
-    JSRuntimeFactory jsRuntimeFactory = mDelegate.getJsRuntimeFactory();
-    BindingsInstaller bindingsInstaller = mDelegate.getBindingsInstaller();
+    JSRuntimeFactory jsRuntimeFactory = delegate.getJsRuntimeFactory();
+    BindingsInstaller bindingsInstaller = delegate.getBindingsInstaller();
     // Notify JS if profiling is enabled
     boolean isProfiling =
         Systrace.isTracing(Systrace.TRACE_TAG_REACT_APPS | Systrace.TRACE_TAG_REACT_JS_VM_CALLS);
@@ -165,7 +156,7 @@ final class ReactInstance {
             nativeModulesMessageQueueThread,
             mJavaTimerManager,
             jsTimerExecutor,
-            new ReactJsExceptionHandlerImpl(nativeModulesMessageQueueThread),
+            new ReactJsExceptionHandlerImpl(exceptionHandler),
             bindingsInstaller,
             isProfiling,
             reactHostInspectorTarget);
@@ -176,20 +167,20 @@ final class ReactInstance {
     Systrace.beginSection(
         Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "ReactInstance.initialize#initTurboModules");
 
-    mReactPackages = new ArrayList<>();
-    mReactPackages.add(
+    List<ReactPackage> reactPackages = new ArrayList<>();
+    reactPackages.add(
         new CoreReactPackage(
             bridgelessReactContext.getDevSupportManager(),
             bridgelessReactContext.getDefaultHardwareBackBtnHandler()));
     if (useDevSupport) {
-      mReactPackages.add(new DebugCorePackage());
+      reactPackages.add(new DebugCorePackage());
     }
-    mReactPackages.addAll(mDelegate.getReactPackages());
+    reactPackages.addAll(delegate.getReactPackages());
 
     TurboModuleManagerDelegate turboModuleManagerDelegate =
-        mDelegate
+        delegate
             .getTurboModuleManagerDelegateBuilder()
-            .setPackages(mReactPackages)
+            .setPackages(reactPackages)
             .setReactApplicationContext(mBridgelessReactContext)
             .build();
 
@@ -209,7 +200,7 @@ final class ReactInstance {
         Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "ReactInstance.initialize#initFabric");
 
     mViewManagerResolver =
-        new BridgelessViewManagerResolver(mReactPackages, mBridgelessReactContext);
+        new BridgelessViewManagerResolver(reactPackages, mBridgelessReactContext);
 
     // Initialize function for JS's UIManager.hasViewManagerConfig()
     ComponentNameResolverBinding.install(
@@ -278,8 +269,6 @@ final class ReactInstance {
             new ViewManagerRegistry(mViewManagerResolver),
             eventBeatManager);
 
-    ReactNativeConfig config = mDelegate.getReactNativeConfig();
-
     // Misc initialization that needs to be done before Fabric init
     DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(mBridgelessReactContext);
 
@@ -290,7 +279,7 @@ final class ReactInstance {
         mFabricUIManager,
         eventBeatManager,
         componentFactory,
-        config);
+        delegate.getReactNativeConfig());
 
     // Initialize the FabricUIManager
     mFabricUIManager.initialize();
@@ -300,9 +289,20 @@ final class ReactInstance {
   }
 
   void initializeEagerTurboModules() {
-    // Eagerly initialize TurboModules
-    for (String moduleName : mTurboModuleManager.getEagerInitModuleNames()) {
-      mTurboModuleManager.getModule(moduleName);
+    Runnable task =
+        () -> {
+          Systrace.beginSection(
+              Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "initializeEagerTurboModules");
+          // Eagerly initialize TurboModules
+          for (String moduleName : mTurboModuleManager.getEagerInitModuleNames()) {
+            mTurboModuleManager.getModule(moduleName);
+          }
+          Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
+        };
+    if (ReactNativeFeatureFlags.initEagerTurboModulesOnNativeModulesQueueAndroid()) {
+      mQueueConfiguration.getNativeModulesQueueThread().runOnQueue(task);
+    } else {
+      task.run();
     }
   }
 
@@ -318,30 +318,32 @@ final class ReactInstance {
   }
 
   private class ReactJsExceptionHandlerImpl implements ReactJsExceptionHandler {
-    private final MessageQueueThread mNativemodulesmessagequeuethread;
+    private final QueueThreadExceptionHandler mQueueThreadExceptionHandler;
 
-    ReactJsExceptionHandlerImpl(MessageQueueThread nativeModulesMessageQueueThread) {
-      this.mNativemodulesmessagequeuethread = nativeModulesMessageQueueThread;
+    ReactJsExceptionHandlerImpl(QueueThreadExceptionHandler queueThreadExceptionHandler) {
+      mQueueThreadExceptionHandler = queueThreadExceptionHandler;
     }
 
     @Override
     public void reportJsException(ParsedError error) {
       JavaOnlyMap data = StackTraceHelper.convertParsedError(error);
 
-      // Simulate async native module method call
-      mNativemodulesmessagequeuethread.runOnQueue(
-          () -> {
-            NativeExceptionsManagerSpec exceptionsManager =
-                (NativeExceptionsManagerSpec)
-                    Assertions.assertNotNull(
-                        mTurboModuleManager.getModule(NativeExceptionsManagerSpec.NAME));
-            exceptionsManager.reportException(data);
-          });
+      try {
+        NativeExceptionsManagerSpec exceptionsManager =
+            (NativeExceptionsManagerSpec)
+                Assertions.assertNotNull(
+                    mTurboModuleManager.getModule(NativeExceptionsManagerSpec.NAME));
+        exceptionsManager.reportException(data);
+      } catch (Exception e) {
+        // Sometimes (e.g: always with the default exception manager) the native module exceptions
+        // manager can throw. In those cases, call into the lower-level queue thread exceptions
+        // handler.
+        mQueueThreadExceptionHandler.handleException(e);
+      }
     }
   }
 
   public void loadJSBundle(JSBundleLoader bundleLoader) {
-    // Load the JS bundle
     Systrace.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "ReactInstance.loadJSBundle");
     bundleLoader.loadScript(
         new JSBundleLoaderDelegate() {
@@ -541,9 +543,9 @@ final class ReactInstance {
   }
 
   private static class BridgelessViewManagerResolver implements ViewManagerResolver {
-    private List<ReactPackage> mReactPackages;
-    private BridgelessReactContext mBridgelessReactContext;
-    private Map<String, ViewManager> mLazyViewManagerMap = new HashMap<>();
+    private final List<ReactPackage> mReactPackages;
+    private final BridgelessReactContext mBridgelessReactContext;
+    private final Map<String, ViewManager> mLazyViewManagerMap = new HashMap<>();
     private @Nullable Map<String, ViewManager> mEagerViewManagerMap = null;
 
     public BridgelessViewManagerResolver(

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceView.kt

@@ -139,7 +139,8 @@ public class ReactSurfaceView(context: Context?, private val surface: ReactSurfa
   override fun dispatchJSTouchEvent(event: MotionEvent) {
     val eventDispatcher = surface.eventDispatcher
     if (eventDispatcher != null) {
-      jsTouchDispatcher.handleTouchEvent(event, eventDispatcher)
+      jsTouchDispatcher.handleTouchEvent(
+          event, eventDispatcher, surface.reactHost.currentReactContext)
     } else {
       FLog.w(
           TAG, "Unable to dispatch touch events to JS as the React instance has not been attached")

package/ReactAndroid/src/main/java/com/facebook/react/runtime/hermes/HermesInstance.kt

@@ -13,13 +13,20 @@ import com.facebook.react.fabric.ReactNativeConfig
 import com.facebook.react.runtime.JSRuntimeFactory
 import com.facebook.soloader.SoLoader
 
-public class HermesInstance(reactNativeConfig: ReactNativeConfig?) :
-    JSRuntimeFactory(initHybrid(reactNativeConfig as Any?)) {
+public class HermesInstance(
+    reactNativeConfig: ReactNativeConfig?,
+    allocInOldGenBeforeTTI: Boolean
+) : JSRuntimeFactory(initHybrid(reactNativeConfig as Any?, allocInOldGenBeforeTTI)) {
 
-  public constructor() : this(null)
+  public constructor() : this(null, false)
 
   public companion object {
-    @JvmStatic @DoNotStrip protected external fun initHybrid(reactNativeConfig: Any?): HybridData
+    @JvmStatic
+    @DoNotStrip
+    protected external fun initHybrid(
+        reactNativeConfig: Any?,
+        allocInOldGenBeforeTTI: Boolean
+    ): HybridData
 
     init {
       SoLoader.loadLibrary("hermesinstancejni")

package/ReactAndroid/src/main/java/com/facebook/react/runtime/internal/bolts/Executors.kt

@@ -0,0 +1,44 @@
+/*
+ * 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.runtime.internal.bolts
+
+import com.facebook.react.bridge.UiThreadUtil
+import java.util.concurrent.Executor
+
+/**
+ * This was created because the helper methods in [java.util.concurrent.Executors] do not work as
+ * people would normally expect.
+ *
+ * Normally, you would think that a cached thread pool would create new threads when necessary,
+ * queue them when the pool is full, and kill threads when they've been inactive for a certain
+ * period of time. This is not how [java.util.concurrent.Executors.newCachedThreadPool] works.
+ *
+ * Instead, [java.util.concurrent.Executors.newCachedThreadPool] executes all tasks on a new or
+ * cached thread immediately because corePoolSize is 0, SynchronousQueue is a queue with size 0 and
+ * maxPoolSize is Integer.MAX_VALUE. This is dangerous because it can create an unchecked amount of
+ * threads.
+ */
+internal object Executors {
+  @JvmField public val UI_THREAD: Executor = UIThreadExecutor()
+  @JvmField public val IMMEDIATE: Executor = ImmediateExecutor()
+
+  private class UIThreadExecutor : Executor {
+    override fun execute(command: Runnable) {
+      UiThreadUtil.runOnUiThread(command)
+    }
+  }
+
+  /**
+   * An [java.util.concurrent.Executor] that schedules tasks to run asynchronously on the UI thread.
+   */
+  private class ImmediateExecutor : Executor {
+    override fun execute(command: Runnable) {
+      command.run()
+    }
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java

@@ -9,7 +9,7 @@ package com.facebook.react.shell;
 
 import android.annotation.SuppressLint;
 import androidx.annotation.Nullable;
-import com.facebook.react.TurboReactPackage;
+import com.facebook.react.BaseReactPackage;
 import com.facebook.react.ViewManagerOnDemandReactPackage;
 import com.facebook.react.animated.NativeAnimatedModule;
 import com.facebook.react.bridge.ModuleSpec;
@@ -48,6 +48,7 @@ import com.facebook.react.views.drawer.ReactDrawerLayoutManager;
 import com.facebook.react.views.image.ReactImageManager;
 import com.facebook.react.views.modal.ReactModalHostManager;
 import com.facebook.react.views.progressbar.ReactProgressBarViewManager;
+import com.facebook.react.views.safeareaview.ReactSafeAreaViewManager;
 import com.facebook.react.views.scroll.ReactHorizontalScrollContainerViewManager;
 import com.facebook.react.views.scroll.ReactHorizontalScrollViewManager;
 import com.facebook.react.views.scroll.ReactScrollViewManager;
@@ -93,7 +94,7 @@ import javax.inject.Provider;
       VibrationModule.class,
       WebSocketModule.class,
     })
-public class MainReactPackage extends TurboReactPackage implements ViewManagerOnDemandReactPackage {
+public class MainReactPackage extends BaseReactPackage implements ViewManagerOnDemandReactPackage {
 
   private MainPackageConfig mConfig;
   private @Nullable Map<String, ModuleSpec> mViewManagers;
@@ -169,6 +170,7 @@ public class MainReactPackage extends TurboReactPackage implements ViewManagerOn
     viewManagers.add(new ReactProgressBarViewManager());
     viewManagers.add(new ReactScrollViewManager());
     viewManagers.add(new ReactSwitchManager());
+    viewManagers.add(new ReactSafeAreaViewManager());
     viewManagers.add(new SwipeRefreshLayoutManager());
 
     // Native equivalents
@@ -209,6 +211,7 @@ public class MainReactPackage extends TurboReactPackage implements ViewManagerOn
           ReactHorizontalScrollContainerViewManager::new);
       appendMap(
           viewManagers, ReactProgressBarViewManager.REACT_CLASS, ReactProgressBarViewManager::new);
+      appendMap(viewManagers, ReactSafeAreaViewManager.REACT_CLASS, ReactSafeAreaViewManager::new);
       appendMap(viewManagers, ReactScrollViewManager.REACT_CLASS, ReactScrollViewManager::new);
       appendMap(viewManagers, ReactSwitchManager.REACT_CLASS, ReactSwitchManager::new);
       appendMap(

package/ReactAndroid/src/main/java/com/facebook/react/soloader/OpenSourceMergedSoMapping.kt

@@ -0,0 +1,119 @@
+/*
+ * 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.soloader
+
+import com.facebook.soloader.ExternalSoMapping
+
+/**
+ * This class is a manually created MergedSoMapping.
+ *
+ * It's used to support so-merging for React Native OSS.
+ *
+ * When adding a new library that contains a JNI_OnLoad method, you need to make sure you add a new
+ * entry in the [invokeJniOnload] method, the [mapLibName] method as well as a new external function
+ * that will take care of calling the JNI_OnLoad method.
+ */
+public object OpenSourceMergedSoMapping : ExternalSoMapping {
+
+  override public fun mapLibName(input: String): String =
+      when (input) {
+        "fabricjni",
+        "jsinspector",
+        "mapbufferjni",
+        "react_devsupportjni",
+        "react_featureflagsjni",
+        "react_newarchdefaults",
+        "reactnativeblob",
+        "reactnativejni",
+        "rninstance",
+        "turbomodulejsijni",
+        "uimanagerjni",
+        "yoga" -> {
+          "reactnative"
+        }
+        "hermes_executor",
+        "hermesinstancejni",
+        "jsijniprofiler" -> {
+          "hermestooling"
+        }
+        "jscexecutor",
+        "jscruntime",
+        "jscinstance" -> {
+          "jsctooling"
+        }
+        else -> input
+      }
+
+  override public fun invokeJniOnload(libraryName: String): Unit {
+    when (libraryName) {
+      "fabricjni" -> libfabricjni_so()
+      "hermes_executor" -> libhermes_executor_so()
+      "hermesinstancejni" -> libhermesinstancejni_so()
+      "hermestooling" -> libhermestooling_so()
+      "jscexecutor" -> libjscexecutor_so()
+      "jscinstance" -> libjscinstance_so()
+      "jscruntime" -> libjscruntime_so()
+      "jsctooling" -> libjsctooling_so()
+      "jsijniprofiler" -> libjsijniprofiler_so()
+      "jsinspector" -> libjsinspector_so()
+      "mapbufferjni" -> libmapbufferjni_so()
+      "react_devsupportjni" -> libreact_devsupportjni_so()
+      "react_featureflagsjni" -> libreact_featureflagsjni_so()
+      "react_newarchdefaults" -> libreact_newarchdefaults_so()
+      "reactnative" -> libreactnative_so()
+      "reactnativeblob" -> libreactnativeblob_so()
+      "reactnativejni" -> libreactnativejni_so()
+      "rninstance" -> librninstance_so()
+      "turbomodulejsijni" -> libturbomodulejsijni_so()
+      "uimanagerjni" -> libuimanagerjni_so()
+      "yoga" -> libyoga_so()
+    }
+  }
+
+  public external fun libfabricjni_so(): Int
+
+  public external fun libhermes_executor_so(): Int
+
+  public external fun libhermesinstancejni_so(): Int
+
+  public external fun libhermestooling_so(): Int
+
+  public external fun libjscexecutor_so(): Int
+
+  public external fun libjscinstance_so(): Int
+
+  public external fun libjscruntime_so(): Int
+
+  public external fun libjsctooling_so(): Int
+
+  public external fun libjsijniprofiler_so(): Int
+
+  public external fun libjsinspector_so(): Int
+
+  public external fun libmapbufferjni_so(): Int
+
+  public external fun libreact_devsupportjni_so(): Int
+
+  public external fun libreact_featureflagsjni_so(): Int
+
+  public external fun libreact_newarchdefaults_so(): Int
+
+  public external fun libreactnative_so(): Int
+
+  public external fun libreactnativeblob_so(): Int
+
+  public external fun libreactnativejni_so(): Int
+
+  public external fun librninstance_so(): Int
+
+  public external fun libturbomodulejsijni_so(): Int
+
+  public external fun libuimanagerjni_so(): Int
+
+  public external fun libyoga_so(): Int
+}