Add ReactMarkerConstants.CONTENT_APPEARED support on Android

facebook · Mar 22, 2024 · b3e2a3e · b3e2a3e
1 parent ad9f0b0
commit b3e2a3e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
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
@@ -432,10 +432,8 @@ public void run() {
 
     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/...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java b/...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java
@@ -387,7 +387,9 @@ public DevSupportManager getDevSupportManager() {
   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/.../react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceView.java b/.../react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceView.java
@@ -189,6 +189,11 @@ public void setIsFabric(boolean isFabric) {
     return UIManagerType.FABRIC;
   }
 
+  @Override
+  public String getJSModuleName() {
+    return mSurface.getModuleName();
+  }
+
   @Override
   protected void dispatchJSTouchEvent(MotionEvent event) {
     if (mJSTouchDispatcher == null) {