diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index 67120d27bde..38daad20487 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -1260,7 +1260,6 @@ public class ReactInstanceManager { : Arguments.fromBundle(initialProperties), reactRoot.getWidthMeasureSpec(), reactRoot.getHeightMeasureSpec()); - reactRoot.setRootViewTag(rootTag); reactRoot.setShouldLogContentAppeared(true); } else { rootTag = diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java index 1114d8e1532..e0c37c31a24 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java @@ -62,6 +62,7 @@ import com.facebook.react.uimanager.JSTouchDispatcher; import com.facebook.react.uimanager.PixelUtil; import com.facebook.react.uimanager.ReactClippingProhibitedView; import com.facebook.react.uimanager.ReactRoot; +import com.facebook.react.uimanager.ReactRootViewTagGenerator; import com.facebook.react.uimanager.RootView; import com.facebook.react.uimanager.RootViewUtil; import com.facebook.react.uimanager.UIManagerHelper; @@ -131,6 +132,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot { } private void init() { + setRootViewTag(ReactRootViewTagGenerator.getNextRootViewTag()); setClipChildren(false); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java index dad32fe91ad..a46b984e9e7 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java @@ -265,8 +265,8 @@ public class FabricUIManager implements UIManager, LifecycleEventListener { new IllegalViewOperationException( "Do not call addRootView in Fabric; it is unsupported. Call startSurface instead.")); - final int rootTag = ReactRootViewTagGenerator.getNextRootViewTag(); ReactRoot reactRootView = (ReactRoot) rootView; + final int rootTag = reactRootView.getRootViewTag(); ThemedReactContext reactContext = new ThemedReactContext( @@ -322,7 +322,7 @@ public class FabricUIManager implements UIManager, LifecycleEventListener { final WritableMap initialProps, int widthMeasureSpec, int heightMeasureSpec) { - final int rootTag = ReactRootViewTagGenerator.getNextRootViewTag(); + final int rootTag = ((ReactRoot) rootView).getRootViewTag(); Context context = rootView.getContext(); ThemedReactContext reactContext = new ThemedReactContext(mReactApplicationContext, context, moduleName, rootTag);