Fix unmount of ReactRootView for Fabric surfaces

Reviewed By: fkgozali

Differential Revision: D7114865

fbshipit-source-id: f0a1c47c983e610fe0dba3051ed8aa350ac052cc

Libraries/Renderer/shims/ReactFabric.js

@@ -9,6 +9,8 @@
  */
 'use strict';
 
+const BatchedBridge = require('BatchedBridge');
+
 // TODO @sema: Adjust types
 import type {ReactNativeType} from 'ReactNativeTypes';
 
@@ -20,4 +22,6 @@ if (__DEV__) {
   ReactFabric = require('ReactFabric-prod');
 }
 
+BatchedBridge.registerCallableModule('ReactFabric', ReactFabric);
+
 module.exports = (ReactFabric: ReactNativeType);

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

@@ -27,6 +27,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/modules/appregistry:appregistry"),
         react_native_target("java/com/facebook/react/modules/core:core"),
         react_native_target("java/com/facebook/react/modules/debug:debug"),
+        react_native_target("java/com/facebook/react/modules/fabric:fabric"),
         react_native_target("java/com/facebook/react/modules/debug:interfaces"),
         react_native_target("java/com/facebook/react/modules/deviceinfo:deviceinfo"),
         react_native_target("java/com/facebook/react/modules/systeminfo:systeminfo"),

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

@@ -71,6 +71,7 @@ import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
 import com.facebook.react.modules.appregistry.AppRegistry;
+import com.facebook.react.modules.fabric.ReactFabric;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.ReactChoreographer;
@@ -1033,8 +1034,14 @@ public class ReactInstanceManager {
       CatalystInstance catalystInstance) {
     Log.d(ReactConstants.TAG, "ReactInstanceManager.detachViewFromInstance()");
     UiThreadUtil.assertOnUiThread();
-    catalystInstance.getJSModule(AppRegistry.class)
+    if (rootView.isFabric()) {
+      catalystInstance.getJSModule(ReactFabric.class)
+        .unmountComponentAtNodeAndRemoveContainer(rootView.getId());
+    } else {
+      catalystInstance.getJSModule(AppRegistry.class)
         .unmountApplicationComponentAtRootTag(rootView.getId());
+    }
+
   }
 
   private void tearDownReactContext(ReactContext reactContext) {

ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerModule.java

@@ -2,6 +2,12 @@
 
 package com.facebook.react.fabric;
 
+import static android.view.View.MeasureSpec.AT_MOST;
+import static android.view.View.MeasureSpec.EXACTLY;
+import static android.view.View.MeasureSpec.UNSPECIFIED;
+
+import android.util.Log;
+import android.view.View;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.JavaOnlyArray;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -235,8 +241,7 @@ public class FabricUIManagerModule implements UIManager {
 
     int widthMeasureSpec = rootView.getWidthMeasureSpec();
     int heightMeasureSpec = rootView.getHeightMeasureSpec();
-    rootShadowNode.setStyleWidthAuto();
+    updateRootView(rootShadowNode, widthMeasureSpec, heightMeasureSpec);
-    rootShadowNode.setStyleHeightAuto();
 
     mRootShadowNodeRegistry.addNode(rootShadowNode);
     mUIViewOperationQueue.addRootView(rootTag, rootView, themedRootContext);
@@ -257,4 +262,39 @@ public class FabricUIManagerModule implements UIManager {
     return rootNode;
   }
 
+  /**
+   * Updates the styles of the {@link ReactShadowNode} based on the Measure specs received by
+   * parameters.
+   */
+  public void updateRootView(
+    ReactShadowNode rootCSSNode, int widthMeasureSpec, int heightMeasureSpec) {
+    int widthMode = View.MeasureSpec.getMode(widthMeasureSpec);
+    int widthSize = View.MeasureSpec.getSize(widthMeasureSpec);
+    switch (widthMode) {
+      case EXACTLY:
+        rootCSSNode.setStyleWidth(widthSize);
+        break;
+      case AT_MOST:
+        rootCSSNode.setStyleMaxWidth(widthSize);
+        break;
+      case UNSPECIFIED:
+        rootCSSNode.setStyleWidthAuto();
+        break;
+    }
+
+    int heightMode = View.MeasureSpec.getMode(heightMeasureSpec);
+    int heightSize = View.MeasureSpec.getSize(heightMeasureSpec);
+    switch (heightMode) {
+      case EXACTLY:
+        rootCSSNode.setStyleHeight(heightSize);
+        break;
+      case AT_MOST:
+        rootCSSNode.setStyleMaxHeight(heightSize);
+        break;
+      case UNSPECIFIED:
+        rootCSSNode.setStyleHeightAuto();
+        break;
+    }
+  }
+
 }

ReactAndroid/src/main/java/com/facebook/react/modules/fabric/BUCK

@@ -0,0 +1,14 @@
+load("//ReactNative:DEFS.bzl", "rn_android_library", "react_native_target")
+
+rn_android_library(
+    name = "fabric",
+    srcs = glob(["**/*.java"]),
+    provided_deps = [
+    ],
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        react_native_target("java/com/facebook/react/bridge:bridge"),
+    ],
+)

ReactAndroid/src/main/java/com/facebook/react/modules/fabric/ReactFabric.java

@@ -0,0 +1,18 @@
+package com.facebook.react.modules.fabric;
+
+import com.facebook.react.bridge.JavaScriptModule;
+
+/**
+ * JS module used to execute Fabric specific methods.
+ * Note: This is a temporary class that will be replaced when Fabric is fully integrated with the
+ * rest of the modules.
+ */
+public interface ReactFabric extends JavaScriptModule {
+
+  /**
+   * JS method used to unmount Fabric surfaces.
+   * @param rootTag {@link int} react tag of Root {@link com.facebook.react.uimanager.ReactShadowNode}
+   */
+  void unmountComponentAtNodeAndRemoveContainer(int rootTag);
+
+}

ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNodeImpl.java

@@ -222,7 +222,7 @@ public class ReactShadowNodeImpl implements ReactShadowNode<ReactShadowNodeImpl>
         "Tried to add child that already has a parent! Remove it from its parent first.");
     }
     if (mChildren == null) {
-      mChildren = new ArrayList<ReactShadowNodeImpl>(4);
+      mChildren = new ArrayList<>(4);
     }
     mChildren.add(i, child);
     child.mParent = this;