react-native 0.69.1 → 0.70.0-rc.0

package/ReactAndroid/src/main/java/com/facebook/proguard/annotations/BUCK

@@ -17,6 +17,7 @@ rn_android_library(
     name = "annotations",
     srcs = glob(["*.java"]),
     autoglob = False,
+    language = "JAVA",
     proguard_config = "proguard_annotations.pro",
     visibility = [
         "PUBLIC",

package/ReactAndroid/src/main/java/com/facebook/react/BUCK

@@ -9,6 +9,7 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
         "supermodule:xplat/default/public.react_native.infra",
     ],
+    language = "JAVA",
     provided_deps = [
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:appcompat"),

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

@@ -14,6 +14,7 @@ import com.facebook.react.module.model.ReactModuleInfo;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.uimanager.ViewManager;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -89,18 +90,18 @@ public class CompositeReactPackage implements ViewManagerOnDemandReactPackage, R
 
   /** {@inheritDoc} */
   @Override
-  public List<String> getViewManagerNames(ReactApplicationContext reactContext) {
+  public Collection<String> getViewManagerNames(ReactApplicationContext reactContext) {
     Set<String> uniqueNames = new HashSet<>();
     for (ReactPackage reactPackage : mChildReactPackages) {
       if (reactPackage instanceof ViewManagerOnDemandReactPackage) {
-        List<String> names =
+        Collection<String> names =
             ((ViewManagerOnDemandReactPackage) reactPackage).getViewManagerNames(reactContext);
         if (names != null) {
           uniqueNames.addAll(names);
         }
       }
     }
-    return new ArrayList<>(uniqueNames);
+    return uniqueNames;
   }
 
   /** {@inheritDoc} */

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

@@ -0,0 +1,67 @@
+/*
+ * 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 androidx.annotation.NonNull;
+import com.facebook.jni.HybridData;
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.turbomodule.core.TurboModuleManagerDelegate;
+import com.facebook.soloader.SoLoader;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+@DoNotStrip
+public class CompositeReactPackageTurboModuleManagerDelegate
+    extends ReactPackageTurboModuleManagerDelegate {
+
+  private static volatile boolean sIsSoLibraryLoaded;
+
+  protected native HybridData initHybrid();
+
+  private final List<TurboModuleManagerDelegate> mDelegates;
+
+  private CompositeReactPackageTurboModuleManagerDelegate(
+      ReactApplicationContext context,
+      List<ReactPackage> packages,
+      List<TurboModuleManagerDelegate> delegates) {
+    super(context, packages);
+    mDelegates = delegates;
+    for (TurboModuleManagerDelegate delegate : delegates) {
+      addTurboModuleManagerDelegate(delegate);
+    }
+  }
+
+  private native void addTurboModuleManagerDelegate(TurboModuleManagerDelegate delegates);
+
+  public static class Builder extends ReactPackageTurboModuleManagerDelegate.Builder {
+    private final List<ReactPackageTurboModuleManagerDelegate.Builder> mDelegatesBuilder;
+
+    public Builder(@NonNull List<ReactPackageTurboModuleManagerDelegate.Builder> delegatesBuilder) {
+      mDelegatesBuilder = delegatesBuilder;
+    }
+
+    protected ReactPackageTurboModuleManagerDelegate build(
+        ReactApplicationContext context, List<ReactPackage> packages) {
+      List<TurboModuleManagerDelegate> delegates = new ArrayList<>();
+      for (ReactPackageTurboModuleManagerDelegate.Builder delegatesBuilder : mDelegatesBuilder) {
+        delegates.add(delegatesBuilder.build(context, Collections.<ReactPackage>emptyList()));
+      }
+      return new CompositeReactPackageTurboModuleManagerDelegate(context, packages, delegates);
+    }
+  }
+
+  protected synchronized void maybeLoadOtherSoLibraries() {
+    // Prevents issues with initializer interruptions. See T38996825 and D13793825 for more context.
+    if (!sIsSoLibraryLoaded) {
+      SoLoader.loadLibrary("turbomodulejsijni");
+      sIsSoLibraryLoaded = true;
+    }
+  }
+}

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

@@ -37,8 +37,8 @@ import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewManager;
 import com.facebook.react.uimanager.ViewManagerResolver;
 import com.facebook.systrace.Systrace;
+import java.util.Collection;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -184,7 +184,7 @@ public class CoreModulesPackage extends TurboReactPackage implements ReactPackag
               }
 
               @Override
-              public List<String> getViewManagerNames() {
+              public Collection<String> getViewManagerNames() {
                 return mReactInstanceManager.getViewManagerNames();
               }
             };

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

@@ -0,0 +1,18 @@
+/*
+ * 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;
+
+/**
+ * An enum that specifies the JS Engine to be used in the app Old Logic uses the legacy code
+ * JSC/HERMES loads the respective engine using the revamped logic
+ */
+public enum JSInterpreter {
+  OLD_LOGIC,
+  JSC,
+  HERMES
+}

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

@@ -143,9 +143,7 @@ public abstract class LazyReactPackage implements ReactPackage {
     List<NativeModule> modules = new ArrayList<>();
     for (ModuleSpec holder : getNativeModules(reactContext)) {
       NativeModule nativeModule;
-      SystraceMessage.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "createNativeModule")
-          .arg("module", holder.getType())
-          .flush();
+      SystraceMessage.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "createNativeModule").flush();
       ReactMarker.logMarker(ReactMarkerConstants.CREATE_MODULE_START, holder.getName());
       try {
         nativeModule = holder.getProvider().get();

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

@@ -54,12 +54,12 @@ import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.CatalystInstance;
 import com.facebook.react.bridge.CatalystInstanceImpl;
 import com.facebook.react.bridge.JSBundleLoader;
+import com.facebook.react.bridge.JSExceptionHandler;
 import com.facebook.react.bridge.JSIModulePackage;
 import com.facebook.react.bridge.JSIModuleType;
 import com.facebook.react.bridge.JavaJSExecutor;
 import com.facebook.react.bridge.JavaScriptExecutor;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
-import com.facebook.react.bridge.NativeModuleCallExceptionHandler;
 import com.facebook.react.bridge.NativeModuleRegistry;
 import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener;
 import com.facebook.react.bridge.ProxyJavaScriptExecutor;
@@ -159,7 +159,7 @@ public class ReactInstanceManager {
   private final JavaScriptExecutorFactory mJavaScriptExecutorFactory;
 
   // See {@code ReactInstanceManagerBuilder} for description of all flags here.
-  private @Nullable List<String> mViewManagerNames = null;
+  private @Nullable Collection<String> mViewManagerNames = null;
   private final @Nullable JSBundleLoader mBundleLoader;
   private final @Nullable String mJSMainModulePath; /* path to JS bundle root on Metro */
   private final List<ReactPackage> mPackages;
@@ -182,7 +182,7 @@ public class ReactInstanceManager {
   // while true any spawned create thread should wait for proper clean up before initializing
   private volatile Boolean mHasStartedDestroying = false;
   private final MemoryPressureRouter mMemoryPressureRouter;
-  private final @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
+  private final @Nullable JSExceptionHandler mJSExceptionHandler;
   private final @Nullable JSIModulePackage mJSIModulePackage;
   private final @Nullable ReactPackageTurboModuleManagerDelegate.Builder mTMMDelegateBuilder;
   private List<ViewManager> mViewManagers;
@@ -226,7 +226,7 @@ public class ReactInstanceManager {
       @Nullable NotThreadSafeBridgeIdleDebugListener bridgeIdleDebugListener,
       LifecycleState initialLifecycleState,
       @Nullable UIImplementationProvider mUIImplementationProvider,
-      NativeModuleCallExceptionHandler nativeModuleCallExceptionHandler,
+      JSExceptionHandler jSExceptionHandler,
       @Nullable RedBoxHandler redBoxHandler,
       boolean lazyViewManagersEnabled,
       @Nullable DevBundleDownloadListener devBundleDownloadListener,
@@ -268,7 +268,7 @@ public class ReactInstanceManager {
     mBridgeIdleDebugListener = bridgeIdleDebugListener;
     mLifecycleState = initialLifecycleState;
     mMemoryPressureRouter = new MemoryPressureRouter(applicationContext);
-    mNativeModuleCallExceptionHandler = nativeModuleCallExceptionHandler;
+    mJSExceptionHandler = jSExceptionHandler;
     mTMMDelegateBuilder = tmmDelegateBuilder;
     synchronized (mPackages) {
       PrinterHolder.getPrinter()
@@ -962,9 +962,9 @@ public class ReactInstanceManager {
     return null;
   }
 
-  public @Nullable List<String> getViewManagerNames() {
+  public Collection<String> getViewManagerNames() {
     Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "ReactInstanceManager.getViewManagerNames");
-    List<String> viewManagerNames = mViewManagerNames;
+    Collection<String> viewManagerNames = mViewManagerNames;
     if (viewManagerNames != null) {
       return viewManagerNames;
     }
@@ -972,7 +972,7 @@ public class ReactInstanceManager {
     synchronized (mReactContextLock) {
       context = (ReactApplicationContext) getCurrentReactContext();
       if (context == null || !context.hasActiveReactInstance()) {
-        return null;
+        return Collections.emptyList();
       }
     }
 
@@ -985,7 +985,7 @@ public class ReactInstanceManager {
               .arg("Package", reactPackage.getClass().getSimpleName())
               .flush();
           if (reactPackage instanceof ViewManagerOnDemandReactPackage) {
-            List<String> names =
+            Collection<String> names =
                 ((ViewManagerOnDemandReactPackage) reactPackage).getViewManagerNames(context);
             if (names != null) {
               uniqueNames.addAll(names);
@@ -994,7 +994,7 @@ public class ReactInstanceManager {
           SystraceMessage.endSection(TRACE_TAG_REACT_JAVA_BRIDGE).flush();
         }
         Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
-        mViewManagerNames = new ArrayList<>(uniqueNames);
+        mViewManagerNames = uniqueNames;
       }
       return mViewManagerNames;
     }
@@ -1331,11 +1331,9 @@ public class ReactInstanceManager {
     ReactMarker.logMarker(CREATE_REACT_CONTEXT_START, jsExecutor.getName());
     final ReactApplicationContext reactContext = new ReactApplicationContext(mApplicationContext);
 
-    NativeModuleCallExceptionHandler exceptionHandler =
-        mNativeModuleCallExceptionHandler != null
-            ? mNativeModuleCallExceptionHandler
-            : mDevSupportManager;
-    reactContext.setNativeModuleCallExceptionHandler(exceptionHandler);
+    JSExceptionHandler exceptionHandler =
+        mJSExceptionHandler != null ? mJSExceptionHandler : mDevSupportManager;
+    reactContext.setJSExceptionHandler(exceptionHandler);
 
     NativeModuleRegistry nativeModuleRegistry = processPackages(reactContext, mPackages, false);
 
@@ -1345,7 +1343,7 @@ public class ReactInstanceManager {
             .setJSExecutor(jsExecutor)
             .setRegistry(nativeModuleRegistry)
             .setJSBundleLoader(jsBundleLoader)
-            .setNativeModuleCallExceptionHandler(exceptionHandler);
+            .setJSExceptionHandler(exceptionHandler);
 
     ReactMarker.logMarker(CREATE_CATALYST_INSTANCE_START);
     // CREATE_CATALYST_INSTANCE_END is in JSCExecutor.cpp

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

@@ -18,9 +18,9 @@ import com.facebook.hermes.reactexecutor.HermesExecutor;
 import com.facebook.hermes.reactexecutor.HermesExecutorFactory;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.JSBundleLoader;
+import com.facebook.react.bridge.JSExceptionHandler;
 import com.facebook.react.bridge.JSIModulePackage;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
-import com.facebook.react.bridge.NativeModuleCallExceptionHandler;
 import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener;
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.common.SurfaceDelegateFactory;
@@ -53,7 +53,7 @@ public class ReactInstanceManagerBuilder {
   private boolean mRequireActivity;
   private @Nullable LifecycleState mInitialLifecycleState;
   private @Nullable UIImplementationProvider mUIImplementationProvider;
-  private @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler;
+  private @Nullable JSExceptionHandler mJSExceptionHandler;
   private @Nullable Activity mCurrentActivity;
   private @Nullable DefaultHardwareBackBtnHandler mDefaultHardwareBackBtnHandler;
   private @Nullable RedBoxHandler mRedBoxHandler;
@@ -66,6 +66,7 @@ public class ReactInstanceManagerBuilder {
   private @Nullable Map<String, RequestHandler> mCustomPackagerCommandHandlers;
   private @Nullable ReactPackageTurboModuleManagerDelegate.Builder mTMMDelegateBuilder;
   private @Nullable SurfaceDelegateFactory mSurfaceDelegateFactory;
+  private JSInterpreter jsInterpreter = JSInterpreter.OLD_LOGIC;
 
   /* package protected */ ReactInstanceManagerBuilder() {}
 
@@ -125,6 +126,31 @@ public class ReactInstanceManagerBuilder {
     return this;
   }
 
+  /**
+   * Sets the jsEngine as JSC or HERMES as per the setJsEngineAsHermes call Uses the enum {@link
+   * JSInterpreter}
+   *
+   * @param jsInterpreter
+   */
+  private void setJSEngine(JSInterpreter jsInterpreter) {
+    this.jsInterpreter = jsInterpreter;
+  }
+
+  /**
+   * Utility setter to set the required JSEngine as HERMES or JSC Defaults to OLD_LOGIC if not
+   * called by the host app
+   *
+   * @param hermesEnabled hermesEnabled = true sets the JS Engine as HERMES and JSC otherwise
+   */
+  public ReactInstanceManagerBuilder setJsEngineAsHermes(boolean hermesEnabled) {
+    if (hermesEnabled) {
+      setJSEngine(JSInterpreter.HERMES);
+    } else {
+      setJSEngine(JSInterpreter.JSC);
+    }
+    return this;
+  }
+
   /**
    * Path to your app's main module on Metro. This is used when reloading JS during development. All
    * paths are relative to the root folder the packager is serving files from. Examples: {@code
@@ -227,9 +253,8 @@ public class ReactInstanceManagerBuilder {
    * DevSupportManager} will be used, which shows a redbox in dev mode and rethrows (crashes the
    * app) in prod mode.
    */
-  public ReactInstanceManagerBuilder setNativeModuleCallExceptionHandler(
-      NativeModuleCallExceptionHandler handler) {
-    mNativeModuleCallExceptionHandler = handler;
+  public ReactInstanceManagerBuilder setJSExceptionHandler(JSExceptionHandler handler) {
+    mJSExceptionHandler = handler;
     return this;
   }
 
@@ -331,7 +356,7 @@ public class ReactInstanceManagerBuilder {
         mBridgeIdleDebugListener,
         Assertions.assertNotNull(mInitialLifecycleState, "Initial lifecycle state was not set"),
         mUIImplementationProvider,
-        mNativeModuleCallExceptionHandler,
+        mJSExceptionHandler,
         mRedBoxHandler,
         mLazyViewManagersEnabled,
         mDevBundleDownloadListener,
@@ -345,41 +370,35 @@ public class ReactInstanceManagerBuilder {
 
   private JavaScriptExecutorFactory getDefaultJSExecutorFactory(
       String appName, String deviceName, Context applicationContext) {
-    try {
-      // If JSC is included, use it as normal
-      initializeSoLoaderIfNecessary(applicationContext);
-      JSCExecutor.loadLibrary();
-      return new JSCExecutorFactory(appName, deviceName);
-    } catch (UnsatisfiedLinkError jscE) {
-      // https://github.com/facebook/hermes/issues/78 shows that
-      // people who aren't trying to use Hermes are having issues.
-      // https://github.com/facebook/react-native/issues/25923#issuecomment-554295179
-      // includes the actual JSC error in at least one case.
-      //
-      // So, if "__cxa_bad_typeid" shows up in the jscE exception
-      // message, then we will assume that's the failure and just
-      // throw now.
-
-      if (jscE.getMessage().contains("__cxa_bad_typeid")) {
-        throw jscE;
-      }
 
-      // Otherwise use Hermes
+    // Relying solely on try catch block and loading jsc even when
+    // project is using hermes can lead to launch-time crashes especially in
+    // monorepo architectures and hybrid apps using both native android
+    // and react native.
+    // So we can use the value of enableHermes received by the constructor
+    // to decide which library to load at launch
+
+    // if nothing is specified, use old loading method
+    // else load the required engine
+    if (jsInterpreter == JSInterpreter.OLD_LOGIC) {
       try {
+        // If JSC is included, use it as normal
+        initializeSoLoaderIfNecessary(applicationContext);
+        JSCExecutor.loadLibrary();
+        return new JSCExecutorFactory(appName, deviceName);
+      } catch (UnsatisfiedLinkError jscE) {
+        if (jscE.getMessage().contains("__cxa_bad_typeid")) {
+          throw jscE;
+        }
         HermesExecutor.loadLibrary();
         return new HermesExecutorFactory();
-      } catch (UnsatisfiedLinkError hermesE) {
-        // If we get here, either this is a JSC build, and of course
-        // Hermes failed (since it's not in the APK), or it's a Hermes
-        // build, and Hermes had a problem.
-
-        // We suspect this is a JSC issue (it's the default), so we
-        // will throw that exception, but we will print hermesE first,
-        // since it could be a Hermes issue and we don't want to
-        // swallow that.
-        hermesE.printStackTrace();
-        throw jscE;
       }
+    } else if (jsInterpreter == JSInterpreter.HERMES) {
+      HermesExecutor.loadLibrary();
+      return new HermesExecutorFactory();
+    } else {
+      JSCExecutor.loadLibrary();
+      return new JSCExecutorFactory(appName, deviceName);
     }
   }
 }

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

@@ -74,6 +74,7 @@ public abstract class ReactNativeHost {
             .setDevSupportManagerFactory(getDevSupportManagerFactory())
             .setRequireActivity(getShouldRequireActivity())
             .setSurfaceDelegateFactory(getSurfaceDelegateFactory())
+            .setLazyViewManagersEnabled(getLazyViewManagersEnabled())
             .setRedBoxHandler(getRedBoxHandler())
             .setJavaScriptExecutorFactory(getJavaScriptExecutorFactory())
             .setUIImplementationProvider(getUIImplementationProvider())
@@ -135,6 +136,16 @@ public abstract class ReactNativeHost {
     return true;
   }
 
+  /**
+   * Returns whether view managers should be created lazily. See {@link
+   * ViewManagerOnDemandReactPackage} for details.
+   *
+   * @experimental
+   */
+  public boolean getLazyViewManagersEnabled() {
+    return false;
+  }
+
   /**
    * Return the {@link SurfaceDelegateFactory} used by NativeModules to get access to a {@link
    * SurfaceDelegate} to interact with a surface. By default in the mobile platform the {@link

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

@@ -338,7 +338,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
     super.requestChildFocus(child, focused);
   }
 
-  private void dispatchJSPointerEvent(MotionEvent event) {
+  protected void dispatchJSPointerEvent(MotionEvent event) {
     if (mReactInstanceManager == null
         || !mIsAttachedToInstance
         || mReactInstanceManager.getCurrentReactContext() == null) {
@@ -361,7 +361,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
     }
   }
 
-  private void dispatchJSTouchEvent(MotionEvent event) {
+  protected void dispatchJSTouchEvent(MotionEvent event) {
     if (mReactInstanceManager == null
         || !mIsAttachedToInstance
         || mReactInstanceManager.getCurrentReactContext() == null) {

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

@@ -10,15 +10,14 @@ package com.facebook.react;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
-import java.util.List;
+import java.util.Collection;
 
 public interface ViewManagerOnDemandReactPackage {
   /**
    * Provides a list of names of ViewManagers with which these modules can be accessed from JS.
    * Typically, this is ViewManager.getName().
    */
-  @Nullable
-  List<String> getViewManagerNames(ReactApplicationContext reactContext);
+  Collection<String> getViewManagerNames(ReactApplicationContext reactContext);
   /**
    * Creates and returns a ViewManager with a specific name {@param viewManagerName}. It's up to an
    * implementing package how to interpret the name.

package/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK

@@ -11,6 +11,7 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
         "supermodule:xplat/default/public.react_native.infra",
     ],
+    language = "JAVA",
     provided_deps = [
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),