react-native-tvos 0.76.6-0 → 0.77.0-0

package/ReactAndroid/src/main/java/com/facebook/react/fabric/SurfaceHandlerBinding.java

@@ -10,17 +10,13 @@ package com.facebook.react.fabric;
 import static com.facebook.react.fabric.mounting.LayoutMetricsConversions.getMaxSize;
 import static com.facebook.react.fabric.mounting.LayoutMetricsConversions.getMinSize;
 
-import androidx.annotation.IntDef;
 import com.facebook.infer.annotation.Nullsafe;
-import com.facebook.jni.HybridData;
-import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.jni.HybridClassBase;
 import com.facebook.react.bridge.NativeMap;
 import com.facebook.react.interfaces.fabric.SurfaceHandler;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 
 @Nullsafe(Nullsafe.Mode.LOCAL)
-public class SurfaceHandlerBinding implements SurfaceHandler {
+public class SurfaceHandlerBinding extends HybridClassBase implements SurfaceHandler {
   static {
     FabricSoLoader.staticInit();
   }
@@ -32,59 +28,20 @@ public class SurfaceHandlerBinding implements SurfaceHandler {
   public static final int DISPLAY_MODE_SUSPENDED = 1;
   public static final int DISPLAY_MODE_HIDDEN = 2;
 
-  @Retention(RetentionPolicy.SOURCE)
-  @IntDef({DISPLAY_MODE_VISIBLE, DISPLAY_MODE_SUSPENDED, DISPLAY_MODE_HIDDEN})
-  public @interface DisplayModeTypeDef {}
-
-  @DoNotStrip private final HybridData mHybridData;
-
-  private static native HybridData initHybrid(int surfaceId, String moduleName);
+  private native void initHybrid(int surfaceId, String moduleName);
 
   public SurfaceHandlerBinding(String moduleName) {
-    mHybridData = initHybrid(NO_SURFACE_ID, moduleName);
-  }
-
-  @Override
-  public int getSurfaceId() {
-    return getSurfaceIdNative();
-  }
-
-  private native int getSurfaceIdNative();
-
-  @Override
-  public void setSurfaceId(int surfaceId) {
-    setSurfaceIdNative(surfaceId);
-  }
-
-  private native void setSurfaceIdNative(int surfaceId);
-
-  @Override
-  public String getModuleName() {
-    return getModuleNameNative();
+    initHybrid(NO_SURFACE_ID, moduleName);
   }
 
-  private native String getModuleNameNative();
-
   @Override
-  public void start() {
-    startNative();
-  }
-
-  private native void startNative();
+  public native int getSurfaceId();
 
   @Override
-  public void stop() {
-    stopNative();
-  }
-
-  private native void stopNative();
+  public native String getModuleName();
 
   @Override
-  public boolean isRunning() {
-    return isRunningNative();
-  }
-
-  private native boolean isRunningNative();
+  public native boolean isRunning();
 
   @Override
   public void setLayoutConstraints(
@@ -119,16 +76,12 @@ public class SurfaceHandlerBinding implements SurfaceHandler {
       float pixelDensity);
 
   @Override
-  public void setProps(NativeMap props) {
-    setPropsNative(props);
-  }
-
-  private native void setPropsNative(NativeMap props);
+  public native void setProps(NativeMap props);
 
   @Override
   public void setMountable(boolean mountable) {
-    setDisplayModeNative(mountable ? DISPLAY_MODE_VISIBLE : DISPLAY_MODE_SUSPENDED);
+    setDisplayMode(mountable ? DISPLAY_MODE_VISIBLE : DISPLAY_MODE_SUSPENDED);
   }
 
-  private native void setDisplayModeNative(@DisplayModeTypeDef int mode);
+  private native void setDisplayMode(int mode);
 }

package/ReactAndroid/src/main/java/com/facebook/react/fabric/events/EventEmitterWrapper.java

@@ -10,7 +10,7 @@ package com.facebook.react.fabric.events;
 import android.annotation.SuppressLint;
 import androidx.annotation.Nullable;
 import com.facebook.infer.annotation.Nullsafe;
-import com.facebook.jni.HybridData;
+import com.facebook.jni.HybridClassBase;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.NativeMap;
 import com.facebook.react.bridge.WritableMap;
@@ -24,18 +24,13 @@ import com.facebook.react.uimanager.events.EventCategoryDef;
 @Nullsafe(Nullsafe.Mode.LOCAL)
 @DoNotStrip
 @SuppressLint("MissingNativeLoadLibrary")
-public class EventEmitterWrapper {
-
+public class EventEmitterWrapper extends HybridClassBase {
   static {
     FabricSoLoader.staticInit();
   }
 
-  @DoNotStrip private final HybridData mHybridData;
-
   @DoNotStrip
-  private EventEmitterWrapper(HybridData hybridData) {
-    mHybridData = hybridData;
-  }
+  private EventEmitterWrapper() {}
 
   private native void dispatchEvent(
       String eventName, @Nullable NativeMap params, @EventCategoryDef int category);
@@ -81,15 +76,8 @@ public class EventEmitterWrapper {
   }
 
   public synchronized void destroy() {
-    if (mHybridData != null) {
-      mHybridData.resetNative();
-    }
-  }
-
-  private boolean isValid() {
-    if (mHybridData != null) {
-      return mHybridData.isValid();
+    if (isValid()) {
+      resetNative();
     }
-    return false;
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/fabric/events/FabricEventEmitter.kt

@@ -17,6 +17,7 @@ import com.facebook.react.uimanager.events.TouchEvent
 import com.facebook.systrace.Systrace
 
 public class FabricEventEmitter(private val uiManager: FabricUIManager) : RCTModernEventEmitter {
+  @Deprecated("Deprecated in Java")
   public override fun receiveEvent(reactTag: Int, eventName: String, params: WritableMap?): Unit {
     receiveEvent(ViewUtil.NO_SURFACE_ID, reactTag, eventName, params)
   }
@@ -49,6 +50,7 @@ public class FabricEventEmitter(private val uiManager: FabricUIManager) : RCTMod
   }
 
   /** Touches are dispatched by [.receiveTouches] */
+  @Deprecated("Deprecated in Java")
   public override fun receiveTouches(
       eventName: String,
       touches: WritableArray,
@@ -57,6 +59,7 @@ public class FabricEventEmitter(private val uiManager: FabricUIManager) : RCTMod
     throw UnsupportedOperationException("EventEmitter#receiveTouches is not supported by Fabric")
   }
 
+  @Deprecated("Deprecated in Java")
   public override fun receiveTouches(event: TouchEvent): Unit {
     // Calls are expected to go via TouchesHelper
     throw UnsupportedOperationException("EventEmitter#receiveTouches is not supported by Fabric")

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountItemDispatcher.java

@@ -21,6 +21,7 @@ import com.facebook.react.bridge.ReactIgnorableMountingException;
 import com.facebook.react.bridge.ReactNoCrashSoftException;
 import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.RetryableMountingLayerException;
+import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.fabric.mounting.mountitems.DispatchCommandMountItem;
 import com.facebook.react.fabric.mounting.mountitems.MountItem;
 import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
@@ -50,10 +51,24 @@ public class MountItemDispatcher {
   private final ConcurrentLinkedQueue<MountItem> mPreMountItems = new ConcurrentLinkedQueue<>();
 
   private boolean mInDispatch = false;
-  private int mReDispatchCounter = 0;
   private long mBatchedExecutionTime = 0L;
   private long mRunStartTime = 0L;
 
+  private long mLastFrameTimeNanos = 0L;
+  private boolean mIsPremountScheduled = false;
+  private final Runnable mPremountRunnable =
+      () -> {
+        mIsPremountScheduled = false;
+
+        if (mPreMountItems.isEmpty()) {
+          // Avoid starting systrace if there are no pre mount items.
+          return;
+        }
+
+        long deadline = mLastFrameTimeNanos + (FRAME_TIME_NS / 2);
+        dispatchPreMountItemsImpl(deadline);
+      };
+
   public MountItemDispatcher(MountingManager mountingManager, ItemDispatchListener listener) {
     mMountingManager = mountingManager;
     mItemDispatchListener = listener;
@@ -101,60 +116,19 @@ public class MountItemDispatcher {
       return;
     }
 
-    if (ReactNativeFeatureFlags.forceBatchingMountItemsOnAndroid()) {
-      mInDispatch = true;
-
-      try {
-        boolean didDispatchItems = true;
-        // Dispatch as many mount items as we find. Some mount items might
-        // trigger state updates that trigger more mount items. This will
-        // process them correctly.
-        while (didDispatchItems) {
-          didDispatchItems = dispatchMountItems();
-        }
-      } finally {
-        mInDispatch = false;
-      }
-
-      // We call didDispatchMountItems regardless of whether we actually dispatched anything, since
-      // NativeAnimatedModule relies on this for executing any animations that may have been
-      // scheduled
-      mItemDispatchListener.didDispatchMountItems();
-    } else {
-      final boolean didDispatchItems;
-      try {
-        didDispatchItems = dispatchMountItems();
-      } catch (Throwable e) {
-        mReDispatchCounter = 0;
-        throw e;
-      } finally {
-        // Clean up after running dispatchMountItems - even if an exception was thrown
-        mInDispatch = false;
-      }
-
-      // We call didDispatchMountItems regardless of whether we actually dispatched anything, since
-      // NativeAnimatedModule relies on this for executing any animations that may have been
-      // scheduled
-      mItemDispatchListener.didDispatchMountItems();
-
-      // Decide if we want to try reentering
-      if (mReDispatchCounter < 10 && didDispatchItems) {
-        // Executing twice in a row is normal. Only log after that point.
-        if (mReDispatchCounter > 2) {
-          ReactSoftExceptionLogger.logSoftException(
-              TAG,
-              new ReactNoCrashSoftException(
-                  "Re-dispatched "
-                      + mReDispatchCounter
-                      + " times. This indicates setState (?) is likely being called too many times"
-                      + " during mounting."));
-        }
+    mInDispatch = true;
 
-        mReDispatchCounter++;
-        tryDispatchMountItems();
-      }
-      mReDispatchCounter = 0;
+    try {
+      dispatchMountItems();
+    } finally {
+      // Clean up after running dispatchMountItems - even if an exception was thrown
+      mInDispatch = false;
     }
+
+    // We call didDispatchMountItems regardless of whether we actually dispatched anything, since
+    // NativeAnimatedModule relies on this for executing any animations that may have been
+    // scheduled
+    mItemDispatchListener.didDispatchMountItems();
   }
 
   @UiThread
@@ -194,10 +168,8 @@ public class MountItemDispatcher {
    */
   @UiThread
   @ThreadConfined(UI)
-  private boolean dispatchMountItems() {
-    if (mReDispatchCounter == 0) {
-      mBatchedExecutionTime = 0;
-    }
+  private void dispatchMountItems() {
+    mBatchedExecutionTime = 0;
 
     mRunStartTime = SystemClock.uptimeMillis();
 
@@ -206,7 +178,7 @@ public class MountItemDispatcher {
     List<MountItem> mountItemsToDispatch = getAndResetMountItems();
 
     if (mountItemsToDispatch == null && viewCommandMountItemsToDispatch == null) {
-      return false;
+      return;
     }
 
     mItemDispatchListener.willMountItems(mountItemsToDispatch);
@@ -322,8 +294,6 @@ public class MountItemDispatcher {
     }
 
     mItemDispatchListener.didMountItems(mountItemsToDispatch);
-
-    return true;
   }
 
   /*
@@ -335,11 +305,25 @@ public class MountItemDispatcher {
   @UiThread
   @ThreadConfined(UI)
   public void dispatchPreMountItems(long frameTimeNanos) {
+    mLastFrameTimeNanos = frameTimeNanos;
+
     if (mPreMountItems.isEmpty()) {
       // Avoid starting systrace if there are no pre mount items.
       return;
     }
 
+    if (ReactNativeFeatureFlags.enablePreciseSchedulingForPremountItemsOnAndroid()) {
+      if (!mIsPremountScheduled) {
+        mIsPremountScheduled = true;
+        UiThreadUtil.getUiThreadHandler().post(mPremountRunnable);
+      }
+    } else {
+      long deadline = mLastFrameTimeNanos + FRAME_TIME_NS / 2;
+      dispatchPreMountItemsImpl(deadline);
+    }
+  }
+
+  private void dispatchPreMountItemsImpl(long deadline) {
     Systrace.beginSection(
         Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "MountItemDispatcher::premountViews");
 
@@ -347,10 +331,9 @@ public class MountItemDispatcher {
     // reentering during dispatchPreMountItems
     mInDispatch = true;
 
-    long frameTimeDeadline = frameTimeNanos + FRAME_TIME_NS / 2;
     try {
       while (true) {
-        if (System.nanoTime() > frameTimeDeadline) {
+        if (System.nanoTime() > deadline) {
           break;
         }
 

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java

@@ -232,19 +232,13 @@ public class SurfaceMountingManager {
             ((ReactRoot) rootView).setRootViewTag(mSurfaceId);
           }
 
-          if (!ReactNativeFeatureFlags.forceBatchingMountItemsOnAndroid()) {
-            mRootViewAttached = true;
-          }
-
           executeMountItemsOnViewAttach();
 
-          if (ReactNativeFeatureFlags.forceBatchingMountItemsOnAndroid()) {
-            // By doing this after `executeMountItemsOnViewAttach`, we ensure
-            // that any operations scheduled while processing this queue are
-            // also added to the queue, instead of being processed immediately
-            // through the queue in `MountItemDispatcher`.
-            mRootViewAttached = true;
-          }
+          // By doing this after `executeMountItemsOnViewAttach`, we ensure
+          // that any operations scheduled while processing this queue are
+          // also added to the queue, instead of being processed immediately
+          // through the queue in `MountItemDispatcher`.
+          mRootViewAttached = true;
         };
 
     if (UiThreadUtil.isOnUiThread()) {
@@ -411,7 +405,7 @@ public class SurfaceMountingManager {
 
     try {
       getViewGroupManager(parentViewState).addView(parentView, view, index);
-    } catch (IllegalStateException e) {
+    } catch (IllegalStateException | IndexOutOfBoundsException e) {
       // Wrap error with more context for debugging
       throw new IllegalStateException(
           "addViewAt: failed to insert view ["
@@ -806,12 +800,10 @@ public class SurfaceMountingManager {
       throw new IllegalStateException("Unable to find View for tag: " + reactTag);
     }
 
-    if (ReactNativeFeatureFlags.setAndroidLayoutDirection()) {
-      viewToUpdate.setLayoutDirection(
-          layoutDirection == 1
-              ? View.LAYOUT_DIRECTION_LTR
-              : layoutDirection == 2 ? View.LAYOUT_DIRECTION_RTL : View.LAYOUT_DIRECTION_INHERIT);
-    }
+    viewToUpdate.setLayoutDirection(
+        layoutDirection == 1
+            ? View.LAYOUT_DIRECTION_LTR
+            : layoutDirection == 2 ? View.LAYOUT_DIRECTION_RTL : View.LAYOUT_DIRECTION_INHERIT);
 
     // Even though we have exact dimensions, we still call measure because some platform views (e.g.
     // Switch) assume that method will always be called before onLayout and onDraw. They use it to

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/DestroyUnmountedViewMountItem.kt

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and 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.fabric.mounting.mountitems
+
+import com.facebook.react.fabric.mounting.MountingManager
+
+/**
+ * Destroyes the view asociated to the [reactTag] if exists. This MountItem is meant to be used ONLY
+ * for views that were preallcated but never mounted on the screen.
+ */
+internal class DestroyUnmountedViewMountItem(
+    private val _surfaceId: Int,
+    private val reactTag: Int
+) : MountItem {
+
+  public override fun execute(mountingManager: MountingManager) {
+    val surfaceMountingManager = mountingManager.getSurfaceManager(_surfaceId)
+    if (surfaceMountingManager == null) {
+      return
+    }
+    surfaceMountingManager.deleteView(reactTag)
+  }
+
+  public override fun getSurfaceId(): Int = _surfaceId
+}

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/FabricNameComponentMapping.kt

@@ -7,12 +7,7 @@
 
 package com.facebook.react.fabric.mounting.mountitems
 
-/**
- * Utility class for Fabric components, this will be removed
- *
- * TODO T97384889: remove this class when the component names are unified between JS - Android -
- * iOS - C++
- */
+/** Utility class for Fabric components, this will be removed */
 internal object FabricNameComponentMapping {
   private val componentNames: Map<String, String> =
       mapOf(
@@ -23,7 +18,7 @@ internal object FabricNameComponentMapping {
           "Slider" to "RCTSlider",
           "ModalHostView" to "RCTModalHostView",
           "Paragraph" to "RCTText",
-          "Text" to "RCText",
+          "Text" to "RCTText",
           "RawText" to "RCTRawText",
           "ActivityIndicatorView" to "AndroidProgressBar",
           "ShimmeringView" to "RKShimmeringView",
@@ -39,7 +34,6 @@ internal object FabricNameComponentMapping {
   /** @return the name of component in the Fabric environment */
   @JvmStatic
   fun getFabricComponentName(componentName: String): String {
-    val component = componentNames[componentName]
-    return component ?: componentName
+    return componentNames[componentName] ?: componentName
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/IntBufferBatchMountItem.java

@@ -13,6 +13,8 @@ import static com.facebook.react.fabric.mounting.mountitems.FabricNameComponentM
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.ReactMarker;
+import com.facebook.react.bridge.ReactMarkerConstants;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.fabric.events.EventEmitterWrapper;
 import com.facebook.react.fabric.mounting.MountingManager;
@@ -70,6 +72,25 @@ final class IntBufferBatchMountItem implements BatchMountItem {
     mObjBufferLen = mObjBuffer.length;
   }
 
+  private void beginMarkers(String reason) {
+    Systrace.beginSection(
+        Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "IntBufferBatchMountItem::" + reason);
+
+    if (mCommitNumber > 0) {
+      ReactMarker.logFabricMarker(
+          ReactMarkerConstants.FABRIC_BATCH_EXECUTION_START, null, mCommitNumber);
+    }
+  }
+
+  private void endMarkers() {
+    if (mCommitNumber > 0) {
+      ReactMarker.logFabricMarker(
+          ReactMarkerConstants.FABRIC_BATCH_EXECUTION_END, null, mCommitNumber);
+    }
+
+    Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
+  }
+
   @Override
   public void execute(MountingManager mountingManager) {
     SurfaceMountingManager surfaceMountingManager = mountingManager.getSurfaceManager(mSurfaceId);
@@ -88,6 +109,7 @@ final class IntBufferBatchMountItem implements BatchMountItem {
       FLog.d(TAG, "Executing IntBufferBatchMountItem on surface [%d]", mSurfaceId);
     }
 
+    beginMarkers("mountViews");
     int i = 0, j = 0;
     while (i < mIntBufferLen) {
       int rawType = mIntBuffer[i++];
@@ -131,15 +153,9 @@ final class IntBufferBatchMountItem implements BatchMountItem {
           int width = mIntBuffer[i++];
           int height = mIntBuffer[i++];
           int displayType = mIntBuffer[i++];
-
-          if (ReactNativeFeatureFlags.setAndroidLayoutDirection()) {
-            int layoutDirection = mIntBuffer[i++];
-            surfaceMountingManager.updateLayout(
-                reactTag, parentTag, x, y, width, height, displayType, layoutDirection);
-          } else {
-            surfaceMountingManager.updateLayout(
-                reactTag, parentTag, x, y, width, height, displayType, 0);
-          }
+          int layoutDirection = mIntBuffer[i++];
+          surfaceMountingManager.updateLayout(
+              reactTag, parentTag, x, y, width, height, displayType, layoutDirection);
         } else if (type == INSTRUCTION_UPDATE_PADDING) {
           surfaceMountingManager.updatePadding(
               mIntBuffer[i++], mIntBuffer[i++], mIntBuffer[i++], mIntBuffer[i++], mIntBuffer[i++]);
@@ -166,6 +182,7 @@ final class IntBufferBatchMountItem implements BatchMountItem {
       }
       Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
     }
+    endMarkers();
   }
 
   @Override
@@ -228,8 +245,7 @@ final class IntBufferBatchMountItem implements BatchMountItem {
             int w = mIntBuffer[i++];
             int h = mIntBuffer[i++];
             int displayType = mIntBuffer[i++];
-            int layoutDirection =
-                ReactNativeFeatureFlags.setAndroidLayoutDirection() ? mIntBuffer[i++] : 0;
+            int layoutDirection = mIntBuffer[i++];
             s.append(
                 String.format(
                     "UPDATE LAYOUT [%d]->[%d]: x:%d y:%d w:%d h:%d displayType:%d layoutDirection:"

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/MountItemFactory.kt

@@ -53,6 +53,11 @@ public object MountItemFactory {
   ): MountItem =
       PreAllocateViewMountItem(surfaceId, reactTag, component, props, stateWrapper, isLayoutable)
 
+  /** @return a [MountItem] that will be used to destroy views */
+  @JvmStatic
+  public fun createDestroyViewMountItem(surfaceId: Int, reactTag: Int): MountItem =
+      DestroyUnmountedViewMountItem(surfaceId, reactTag)
+
   /**
    * @return a [MountItem] that will be read and execute a collection of MountItems serialized in
    *   the int[] and Object[] received by parameter

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/PreAllocateViewMountItem.kt

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and 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.fabric.mounting.mountitems
+
+import com.facebook.common.logging.FLog
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.fabric.FabricUIManager
+import com.facebook.react.fabric.mounting.MountingManager
+import com.facebook.react.fabric.mounting.mountitems.FabricNameComponentMapping.getFabricComponentName
+import com.facebook.react.uimanager.StateWrapper
+
+/** [MountItem] that is used to pre-allocate views for JS components. */
+internal class PreAllocateViewMountItem(
+    private val surfaceId: Int,
+    private val reactTag: Int,
+    component: String,
+    private val props: ReadableMap?,
+    private val stateWrapper: StateWrapper?,
+    private val isLayoutable: Boolean
+) : MountItem {
+  private val fabricComponentName = getFabricComponentName(component)
+
+  override fun getSurfaceId(): Int = surfaceId
+
+  override fun execute(mountingManager: MountingManager) {
+    val surfaceMountingManager = mountingManager.getSurfaceManager(surfaceId)
+    if (surfaceMountingManager == null) {
+      FLog.e(
+          FabricUIManager.TAG,
+          "Skipping View PreAllocation; no SurfaceMountingManager found for [$surfaceId]")
+      return
+    }
+    surfaceMountingManager.preallocateView(
+        fabricComponentName, reactTag, props, stateWrapper, isLayoutable)
+  }
+
+  override fun toString(): String {
+    val result =
+        StringBuilder("PreAllocateViewMountItem [")
+            .append(reactTag)
+            .append("] - component: ")
+            .append(fabricComponentName)
+            .append(" surfaceId: ")
+            .append(surfaceId)
+            .append(" isLayoutable: ")
+            .append(isLayoutable)
+
+    if (FabricUIManager.IS_DEVELOPMENT_ENVIRONMENT) {
+      result
+          .append(" props: ")
+          .append(props?.toString() ?: "<null>")
+          .append(" state: ")
+          .append(stateWrapper?.toString() ?: "<null>")
+    }
+
+    return result.toString()
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler.kt

@@ -8,6 +8,8 @@
 package com.facebook.react.interfaces.exceptionmanager
 
 import com.facebook.proguard.annotations.DoNotStripAny
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableNativeMap
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import java.util.ArrayList
 
@@ -18,32 +20,40 @@ public fun interface ReactJsExceptionHandler {
   public interface ParsedError {
     @DoNotStripAny
     public interface StackFrame {
-      public val fileName: String
+      public val file: String?
       public val methodName: String
-      public val lineNumber: Int
-      public val columnNumber: Int
+      public val lineNumber: Int?
+      public val column: Int?
     }
 
-    public val frames: List<StackFrame>
     public val message: String
-    public val exceptionId: Int
+    public val originalMessage: String?
+    public val name: String?
+    public val componentStack: String?
+    public val stack: List<StackFrame>
+    public val id: Int
     public val isFatal: Boolean
+    public val extraData: ReadableMap
   }
 
   @DoNotStripAny
   private data class ParsedStackFrameImpl(
-      override val fileName: String,
+      override val file: String?,
       override val methodName: String,
-      override val lineNumber: Int,
-      override val columnNumber: Int,
+      override val lineNumber: Int?,
+      override val column: Int?,
   ) : ParsedError.StackFrame
 
   @DoNotStripAny
   private data class ParsedErrorImpl(
-      override val frames: ArrayList<ParsedStackFrameImpl>,
       override val message: String,
-      override val exceptionId: Int,
+      override val originalMessage: String?,
+      override val name: String?,
+      override val componentStack: String?,
+      override val stack: ArrayList<ParsedStackFrameImpl>,
+      override val id: Int,
       override val isFatal: Boolean,
+      override val extraData: ReadableNativeMap,
   ) : ParsedError
 
   public fun reportJsException(errorMap: ParsedError)