react-native 0.66.0-rc.4 → 0.67.0-rc.1

package/ReactAndroid/src/main/java/com/facebook/react/common/SurfaceDelegateFactory.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) Facebook, Inc. and its 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.common;
+
+/**
+ * Factory to create a {@link SurfaceDelegate}. The moduleName is needed to help the factory decide
+ * which surface to return {@link SurfaceDelegate} that the given module should use to interact
+ * with.
+ */
+public interface SurfaceDelegateFactory {
+  /**
+   * Create a {@link SurfaceDelegate} instance which is used to interact with a surface of platform
+   * the app is running in.
+   *
+   * @param moduleName the module name that will be using the surface
+   * @return {@link SurfaceDelegate} instance
+   */
+  SurfaceDelegate createSurfaceDelegate(String moduleName);
+}

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/BUCK

@@ -11,12 +11,6 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/common/mapbuffer",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     fbandroid_allow_jni_merging = True,
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     platforms = ANDROID,

package/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java

@@ -25,6 +25,12 @@ public class ReactFeatureFlags {
    */
   public static volatile boolean useTurboModules = false;
 
+  /**
+   * Should this application use the new (Fabric) Renderer? If yes, all rendering in this app will
+   * use Fabric instead of the legacy renderer.
+   */
+  public static volatile boolean enableFabricRenderer = false;
+
   /**
    * After TurboModules and Fabric are enabled, we need to ensure that the legacy NativeModule isn't
    * isn't used. So, turn this flag on to trigger warnings whenever the legacy NativeModule system
@@ -66,6 +72,8 @@ public class ReactFeatureFlags {
 
   public static boolean enableRuntimeScheduler = false;
 
+  public static boolean enableRuntimeSchedulerInTurboModule = false;
+
   /** Enables a more aggressive cleanup during destruction of ReactContext */
   public static boolean enableReactContextCleanupFix = false;
 
@@ -89,4 +97,12 @@ public class ReactFeatureFlags {
   public static boolean enableLockFreeEventDispatcher = false;
 
   public static boolean enableAggressiveEventEmitterCleanup = false;
+
+  public static boolean insertZReorderBarriersOnViewGroupChildren = true;
+
+  public static boolean enableScrollViewSnapToAlignmentProp = true;
+
+  public static boolean useDispatchUniqueForCoalescableEvents = false;
+
+  public static boolean useUpdatedTouchPreprocessing = false;
 }

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

@@ -57,6 +57,7 @@ rn_android_library(
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
+        react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/modules/debug:interfaces"),
     ],
 )

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java

@@ -22,6 +22,7 @@ import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.ReactConstants;
+import com.facebook.react.common.SurfaceDelegateFactory;
 import com.facebook.react.common.futures.SimpleSettableFuture;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
 import com.facebook.react.devsupport.interfaces.DevOptionHandler;
@@ -71,7 +72,8 @@ public final class BridgeDevSupportManager extends DevSupportManagerBase {
       @Nullable RedBoxHandler redBoxHandler,
       @Nullable DevBundleDownloadListener devBundleDownloadListener,
       int minNumShakes,
-      @Nullable Map<String, RequestHandler> customPackagerCommandHandlers) {
+      @Nullable Map<String, RequestHandler> customPackagerCommandHandlers,
+      @Nullable SurfaceDelegateFactory surfaceDelegateFactory) {
     super(
         applicationContext,
         reactInstanceManagerHelper,
@@ -80,7 +82,8 @@ public final class BridgeDevSupportManager extends DevSupportManagerBase {
         redBoxHandler,
         devBundleDownloadListener,
         minNumShakes,
-        customPackagerCommandHandlers);
+        customPackagerCommandHandlers,
+        surfaceDelegateFactory);
 
     if (getDevSettings().isStartSamplingProfilerOnInit()) {
       // Only start the profiler. If its already running, there is an error

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevSupportManagerFactory.java

@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) Facebook, Inc. and its 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.devsupport;
+
+import android.content.Context;
+import androidx.annotation.Nullable;
+import com.facebook.react.common.SurfaceDelegateFactory;
+import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
+import com.facebook.react.devsupport.interfaces.DevSupportManager;
+import com.facebook.react.packagerconnection.RequestHandler;
+import java.lang.reflect.Constructor;
+import java.util.Map;
+
+/**
+ * A simple factory that creates instances of {@link DevSupportManager} implementations. Uses
+ * reflection to create BridgeDevSupportManager if it exists. This allows ProGuard to strip that
+ * class and its dependencies in release builds. If the class isn't found, {@link
+ * DisabledDevSupportManager} is returned instead.
+ */
+public class DefaultDevSupportManagerFactory implements DevSupportManagerFactory {
+
+  private static final String DEVSUPPORT_IMPL_PACKAGE = "com.facebook.react.devsupport";
+  private static final String DEVSUPPORT_IMPL_CLASS = "BridgeDevSupportManager";
+
+  public DevSupportManager create(
+      Context applicationContext,
+      ReactInstanceDevHelper reactInstanceDevHelper,
+      @Nullable String packagerPathForJSBundleName,
+      boolean enableOnCreate,
+      int minNumShakes) {
+
+    return create(
+        applicationContext,
+        reactInstanceDevHelper,
+        packagerPathForJSBundleName,
+        enableOnCreate,
+        null,
+        null,
+        minNumShakes,
+        null,
+        null);
+  }
+
+  @Override
+  public DevSupportManager create(
+      Context applicationContext,
+      ReactInstanceDevHelper reactInstanceManagerHelper,
+      @Nullable String packagerPathForJSBundleName,
+      boolean enableOnCreate,
+      @Nullable RedBoxHandler redBoxHandler,
+      @Nullable DevBundleDownloadListener devBundleDownloadListener,
+      int minNumShakes,
+      @Nullable Map<String, RequestHandler> customPackagerCommandHandlers,
+      @Nullable SurfaceDelegateFactory surfaceDelegateFactory) {
+    if (!enableOnCreate) {
+      return new DisabledDevSupportManager();
+    }
+    try {
+      // ProGuard is surprisingly smart in this case and will keep a class if it detects a call to
+      // Class.forName() with a static string. So instead we generate a quasi-dynamic string to
+      // confuse it.
+      String className =
+          new StringBuilder(DEVSUPPORT_IMPL_PACKAGE)
+              .append(".")
+              .append(DEVSUPPORT_IMPL_CLASS)
+              .toString();
+      Class<?> devSupportManagerClass = Class.forName(className);
+      Constructor constructor =
+          devSupportManagerClass.getConstructor(
+              Context.class,
+              ReactInstanceDevHelper.class,
+              String.class,
+              boolean.class,
+              RedBoxHandler.class,
+              DevBundleDownloadListener.class,
+              int.class,
+              Map.class,
+              SurfaceDelegateFactory.class);
+      return (DevSupportManager)
+          constructor.newInstance(
+              applicationContext,
+              reactInstanceManagerHelper,
+              packagerPathForJSBundleName,
+              true,
+              redBoxHandler,
+              devBundleDownloadListener,
+              minNumShakes,
+              customPackagerCommandHandlers,
+              surfaceDelegateFactory);
+    } catch (Exception e) {
+      throw new RuntimeException(
+          "Requested enabled DevSupportManager, but BridgeDevSupportManager class was not found"
+              + " or could not be created",
+          e);
+    }
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java

@@ -41,6 +41,8 @@ import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.DebugServerException;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.ShakeDetector;
+import com.facebook.react.common.SurfaceDelegate;
+import com.facebook.react.common.SurfaceDelegateFactory;
 import com.facebook.react.devsupport.DevServerHelper.PackagerCommandListener;
 import com.facebook.react.devsupport.interfaces.BundleLoadCallback;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
@@ -118,6 +120,7 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
   private @Nullable Map<String, RequestHandler> mCustomPackagerCommandHandlers;
 
   private @Nullable Activity currentActivity;
+  private @Nullable final SurfaceDelegateFactory mSurfaceDelegateFactory;
 
   public DevSupportManagerBase(
       Context applicationContext,
@@ -127,7 +130,8 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
       @Nullable RedBoxHandler redBoxHandler,
       @Nullable DevBundleDownloadListener devBundleDownloadListener,
       int minNumShakes,
-      @Nullable Map<String, RequestHandler> customPackagerCommandHandlers) {
+      @Nullable Map<String, RequestHandler> customPackagerCommandHandlers,
+      @Nullable SurfaceDelegateFactory surfaceDelegateFactory) {
     mReactInstanceDevHelper = reactInstanceDevHelper;
     mApplicationContext = applicationContext;
     mJSAppBundleName = packagerPathForJSBundleName;
@@ -202,7 +206,8 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
 
     mRedBoxHandler = redBoxHandler;
     mDevLoadingViewController = new DevLoadingViewController(reactInstanceDevHelper);
-  }
+    mSurfaceDelegateFactory = surfaceDelegateFactory;
+  };
 
   protected abstract String getUniqueTag();
 
@@ -345,16 +350,21 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
           @Override
           public void run() {
             Activity context = mReactInstanceDevHelper.getCurrentActivity();
-            if (mRedBoxDialog == null || context != currentActivity) {
-              if (context == null || context.isFinishing()) {
-                FLog.e(
-                    ReactConstants.TAG,
-                    "Unable to launch redbox because react activity "
-                        + "is not available, here is the error that redbox would've displayed: "
-                        + message);
-                return;
-              }
+            if (context != null && !context.isFinishing() && currentActivity != context) {
               currentActivity = context;
+              // Create a new RedBox when currentActivity get updated
+              mRedBoxDialog =
+                  new RedBoxDialog(currentActivity, DevSupportManagerBase.this, mRedBoxHandler);
+            }
+            if (currentActivity == null || currentActivity.isFinishing()) {
+              FLog.e(
+                  ReactConstants.TAG,
+                  "Unable to launch redbox because react activity "
+                      + "is not available, here is the error that redbox would've displayed: "
+                      + message);
+              return;
+            }
+            if (mRedBoxDialog == null) {
               mRedBoxDialog =
                   new RedBoxDialog(currentActivity, DevSupportManagerBase.this, mRedBoxHandler);
             }
@@ -1199,4 +1209,18 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
       DevSupportManager.PackagerLocationCustomizer packagerLocationCustomizer) {
     mPackagerLocationCustomizer = packagerLocationCustomizer;
   }
+
+  @Override
+  public @Nullable Activity getCurrentActivity() {
+    return mReactInstanceDevHelper.getCurrentActivity();
+  }
+
+  @Override
+  public @Nullable SurfaceDelegate createSurfaceDelegate(String moduleName) {
+    if (mSurfaceDelegateFactory == null) {
+      return null;
+    }
+
+    return mSurfaceDelegateFactory.createSurfaceDelegate(moduleName);
+  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java

@@ -9,42 +9,14 @@ package com.facebook.react.devsupport;
 
 import android.content.Context;
 import androidx.annotation.Nullable;
+import com.facebook.react.common.SurfaceDelegateFactory;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.react.packagerconnection.RequestHandler;
-import java.lang.reflect.Constructor;
 import java.util.Map;
 
-/**
- * A simple factory that creates instances of {@link DevSupportManager} implementations. Uses
- * reflection to create BridgeDevSupportManager if it exists. This allows ProGuard to strip that
- * class and its dependencies in release builds. If the class isn't found, {@link
- * DisabledDevSupportManager} is returned instead.
- */
-public class DevSupportManagerFactory {
-
-  private static final String DEVSUPPORT_IMPL_PACKAGE = "com.facebook.react.devsupport";
-  private static final String DEVSUPPORT_IMPL_CLASS = "BridgeDevSupportManager";
-
-  public static DevSupportManager create(
-      Context applicationContext,
-      ReactInstanceDevHelper reactInstanceDevHelper,
-      @Nullable String packagerPathForJSBundleName,
-      boolean enableOnCreate,
-      int minNumShakes) {
-
-    return create(
-        applicationContext,
-        reactInstanceDevHelper,
-        packagerPathForJSBundleName,
-        enableOnCreate,
-        null,
-        null,
-        minNumShakes,
-        null);
-  }
-
-  public static DevSupportManager create(
+public interface DevSupportManagerFactory {
+  DevSupportManager create(
       Context applicationContext,
       ReactInstanceDevHelper reactInstanceManagerHelper,
       @Nullable String packagerPathForJSBundleName,
@@ -52,45 +24,6 @@ public class DevSupportManagerFactory {
       @Nullable RedBoxHandler redBoxHandler,
       @Nullable DevBundleDownloadListener devBundleDownloadListener,
       int minNumShakes,
-      @Nullable Map<String, RequestHandler> customPackagerCommandHandlers) {
-    if (!enableOnCreate) {
-      return new DisabledDevSupportManager();
-    }
-    try {
-      // ProGuard is surprisingly smart in this case and will keep a class if it detects a call to
-      // Class.forName() with a static string. So instead we generate a quasi-dynamic string to
-      // confuse it.
-      String className =
-          new StringBuilder(DEVSUPPORT_IMPL_PACKAGE)
-              .append(".")
-              .append(DEVSUPPORT_IMPL_CLASS)
-              .toString();
-      Class<?> devSupportManagerClass = Class.forName(className);
-      Constructor constructor =
-          devSupportManagerClass.getConstructor(
-              Context.class,
-              ReactInstanceDevHelper.class,
-              String.class,
-              boolean.class,
-              RedBoxHandler.class,
-              DevBundleDownloadListener.class,
-              int.class,
-              Map.class);
-      return (DevSupportManager)
-          constructor.newInstance(
-              applicationContext,
-              reactInstanceManagerHelper,
-              packagerPathForJSBundleName,
-              true,
-              redBoxHandler,
-              devBundleDownloadListener,
-              minNumShakes,
-              customPackagerCommandHandlers);
-    } catch (Exception e) {
-      throw new RuntimeException(
-          "Requested enabled DevSupportManager, but BridgeDevSupportManager class was not found"
-              + " or could not be created",
-          e);
-    }
-  }
+      @Nullable Map<String, RequestHandler> customPackagerCommandHandlers,
+      @Nullable SurfaceDelegateFactory surfaceDelegateFactory);
 }

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java

@@ -7,11 +7,13 @@
 
 package com.facebook.react.devsupport;
 
+import android.app.Activity;
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.DefaultNativeModuleCallExceptionHandler;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.common.SurfaceDelegate;
 import com.facebook.react.devsupport.interfaces.BundleLoadCallback;
 import com.facebook.react.devsupport.interfaces.DevOptionHandler;
 import com.facebook.react.devsupport.interfaces.DevSplitBundleCallback;
@@ -175,4 +177,14 @@ public class DisabledDevSupportManager implements DevSupportManager {
   public void handleException(Exception e) {
     mDefaultNativeModuleCallExceptionHandler.handleException(e);
   }
+
+  @Override
+  public @Nullable Activity getCurrentActivity() {
+    return null;
+  }
+
+  @Override
+  public @Nullable SurfaceDelegate createSurfaceDelegate(String moduleName) {
+    return null;
+  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxDialogSurfaceDelegate.java

@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) Facebook, Inc. and its 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.devsupport;
+
+import android.app.Activity;
+import android.view.View;
+import android.view.ViewGroup;
+import androidx.annotation.Nullable;
+import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.common.SurfaceDelegate;
+import com.facebook.react.devsupport.interfaces.DevSupportManager;
+import com.facebook.react.util.RNLog;
+
+/**
+ * The implementation of SurfaceDelegate with {@link Activity}. This is the default SurfaceDelegate
+ * for Mobile.
+ */
+public class LogBoxDialogSurfaceDelegate implements SurfaceDelegate {
+
+  private @Nullable View mReactRootView;
+  private @Nullable LogBoxDialog mDialog;
+  private final DevSupportManager mDevSupportManager;
+
+  LogBoxDialogSurfaceDelegate(DevSupportManager devSupportManager) {
+    mDevSupportManager = devSupportManager;
+  }
+
+  @Override
+  public void createContentView(String appKey) {
+    Assertions.assertCondition(
+        appKey.equals("LogBox"), "This surface manager can only create LogBox React application");
+    mReactRootView = mDevSupportManager.createRootView("LogBox");
+    if (mReactRootView == null) {
+      RNLog.e("Unable to launch logbox because react was unable to create the root view");
+    }
+  }
+
+  @Override
+  public boolean isContentViewReady() {
+    return mReactRootView != null;
+  }
+
+  @Override
+  public void destroyContentView() {
+    if (mReactRootView != null) {
+      mDevSupportManager.destroyRootView(mReactRootView);
+      mReactRootView = null;
+    }
+  }
+
+  @Override
+  public void show() {
+    if (isSurfaceVisible() || !isContentViewReady()) {
+      return;
+    }
+
+    final @Nullable Activity context = mDevSupportManager.getCurrentActivity();
+    if (context == null || context.isFinishing()) {
+      RNLog.e(
+          "Unable to launch logbox because react activity "
+              + "is not available, here is the error that logbox would've displayed: ");
+      return;
+    }
+
+    mDialog = new LogBoxDialog(context, mReactRootView);
+    mDialog.setCancelable(false);
+    mDialog.show();
+  }
+
+  @Override
+  public void hide() {
+    if (!isSurfaceVisible()) {
+      return;
+    }
+
+    if (mReactRootView != null && mReactRootView.getParent() != null) {
+      ((ViewGroup) mReactRootView.getParent()).removeView(mReactRootView);
+    }
+
+    mDialog.dismiss();
+    mDialog = null;
+  }
+
+  private boolean isSurfaceVisible() {
+    return mDialog != null;
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.java

@@ -7,16 +7,13 @@
 
 package com.facebook.react.devsupport;
 
-import android.app.Activity;
-import android.view.View;
-import android.view.ViewGroup;
 import androidx.annotation.Nullable;
 import com.facebook.fbreact.specs.NativeLogBoxSpec;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.UiThreadUtil;
+import com.facebook.react.common.SurfaceDelegate;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.react.module.annotations.ReactModule;
-import com.facebook.react.util.RNLog;
 
 @ReactModule(name = LogBoxModule.NAME)
 public class LogBoxModule extends NativeLogBoxSpec {
@@ -24,24 +21,30 @@ public class LogBoxModule extends NativeLogBoxSpec {
   public static final String NAME = "LogBox";
 
   private final DevSupportManager mDevSupportManager;
-  private @Nullable View mReactRootView;
-  private @Nullable LogBoxDialog mLogBoxDialog;
+  private final SurfaceDelegate mSurfaceDelegate;
 
+  /**
+   * LogBoxModule can be rendered in different surface. By default, it will use LogBoxDialog to wrap
+   * the content of logs. In other platform (for example VR), a surfaceDelegate can be provided so
+   * that the content can be wrapped in custom surface.
+   */
   public LogBoxModule(ReactApplicationContext reactContext, DevSupportManager devSupportManager) {
     super(reactContext);
 
     mDevSupportManager = devSupportManager;
 
+    @Nullable SurfaceDelegate surfaceDelegate = devSupportManager.createSurfaceDelegate(NAME);
+    if (surfaceDelegate != null) {
+      mSurfaceDelegate = surfaceDelegate;
+    } else {
+      mSurfaceDelegate = new LogBoxDialogSurfaceDelegate(devSupportManager);
+    }
+
     UiThreadUtil.runOnUiThread(
         new Runnable() {
           @Override
           public void run() {
-            if (mReactRootView == null && mDevSupportManager != null) {
-              mReactRootView = mDevSupportManager.createRootView("LogBox");
-              if (mReactRootView == null) {
-                RNLog.e("Unable to launch logbox because react was unable to create the root view");
-              }
-            }
+            mSurfaceDelegate.createContentView("LogBox");
           }
         });
   }
@@ -53,26 +56,17 @@ public class LogBoxModule extends NativeLogBoxSpec {
 
   @Override
   public void show() {
-    if (mReactRootView != null) {
-      UiThreadUtil.runOnUiThread(
-          new Runnable() {
-            @Override
-            public void run() {
-              if (mLogBoxDialog == null && mReactRootView != null) {
-                Activity context = getCurrentActivity();
-                if (context == null || context.isFinishing()) {
-                  RNLog.e(
-                      "Unable to launch logbox because react activity "
-                          + "is not available, here is the error that logbox would've displayed: ");
-                  return;
-                }
-                mLogBoxDialog = new LogBoxDialog(context, mReactRootView);
-                mLogBoxDialog.setCancelable(false);
-                mLogBoxDialog.show();
-              }
-            }
-          });
+    if (!mSurfaceDelegate.isContentViewReady()) {
+      return;
     }
+
+    UiThreadUtil.runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            mSurfaceDelegate.show();
+          }
+        });
   }
 
   @Override
@@ -81,13 +75,7 @@ public class LogBoxModule extends NativeLogBoxSpec {
         new Runnable() {
           @Override
           public void run() {
-            if (mLogBoxDialog != null) {
-              if (mReactRootView != null && mReactRootView.getParent() != null) {
-                ((ViewGroup) mReactRootView.getParent()).removeView(mReactRootView);
-              }
-              mLogBoxDialog.dismiss();
-              mLogBoxDialog = null;
-            }
+            mSurfaceDelegate.hide();
           }
         });
   }
@@ -98,10 +86,7 @@ public class LogBoxModule extends NativeLogBoxSpec {
         new Runnable() {
           @Override
           public void run() {
-            if (mReactRootView != null) {
-              mDevSupportManager.destroyRootView(mReactRootView);
-              mReactRootView = null;
-            }
+            mSurfaceDelegate.destroyContentView();
           }
         });
   }

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java

@@ -7,11 +7,13 @@
 
 package com.facebook.react.devsupport.interfaces;
 
+import android.app.Activity;
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.NativeModuleCallExceptionHandler;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.common.SurfaceDelegate;
 import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
 import java.io.File;
 
@@ -107,4 +109,16 @@ public interface DevSupportManager extends NativeModuleCallExceptionHandler {
   }
 
   void setPackagerLocationCustomizer(PackagerLocationCustomizer packagerLocationCustomizer);
+
+  @Nullable
+  Activity getCurrentActivity();
+
+  /**
+   * Create the surface delegate that the provided module should use to interact with
+   *
+   * @param moduleName the module name that helps decide which surface it should interact with
+   * @return a {@link SurfaceDelegate} instance
+   */
+  @Nullable
+  SurfaceDelegate createSurfaceDelegate(String moduleName);
 }