diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java index 766836fd0b1..fabafa7af7b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java @@ -432,10 +432,8 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot { if (mShouldLogContentAppeared) { mShouldLogContentAppeared = false; - - if (mJSModuleName != null) { - ReactMarker.logMarker(ReactMarkerConstants.CONTENT_APPEARED, mJSModuleName, mRootViewTag); - } + String jsModuleName = getJSModuleName(); + ReactMarker.logMarker(ReactMarkerConstants.CONTENT_APPEARED, jsModuleName, mRootViewTag); } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java index 054c36a260e..0fa7f77afcb 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java @@ -378,7 +378,9 @@ public class ReactHostImpl implements ReactHost { public ReactSurface createSurface( Context context, String moduleName, @Nullable Bundle initialProps) { ReactSurfaceImpl surface = new ReactSurfaceImpl(context, moduleName, initialProps); - surface.attachView(new ReactSurfaceView(context, surface)); + ReactSurfaceView surfaceView = new ReactSurfaceView(context, surface); + surfaceView.setShouldLogContentAppeared(true); + surface.attachView(surfaceView); surface.attach(this); return surface; } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceView.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceView.java index f261cafec7c..f9b3f245dc2 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceView.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceView.java @@ -189,6 +189,11 @@ public class ReactSurfaceView extends ReactRootView { return UIManagerType.FABRIC; } + @Override + public String getJSModuleName() { + return mSurface.moduleName; + } + @Override protected void dispatchJSTouchEvent(MotionEvent event) { if (mJSTouchDispatcher == null) {