react-native-tvos 0.79.3-0 → 0.80.0-0

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

@@ -12,10 +12,11 @@ import static com.facebook.infer.annotation.ThreadConfined.UI;
 
 import android.view.View;
 import androidx.annotation.AnyThread;
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 import com.facebook.common.logging.FLog;
+import com.facebook.infer.annotation.Assertions;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.infer.annotation.ThreadConfined;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactSoftExceptionLogger;
@@ -45,11 +46,11 @@ import java.util.concurrent.CopyOnWriteArrayList;
  * Class responsible for actually dispatching view updates enqueued via {@link
  * FabricUIManager#scheduleMountItem} on the UI thread.
  */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class MountingManager {
   public static final String TAG = MountingManager.class.getSimpleName();
   private static final int MAX_STOPPED_SURFACE_IDS_LENGTH = 15;
 
-  @NonNull
   private final ConcurrentHashMap<Integer, SurfaceMountingManager> mSurfaceIdToManager =
       new ConcurrentHashMap<>(); // any thread
 
@@ -58,10 +59,10 @@ public class MountingManager {
   @Nullable private SurfaceMountingManager mMostRecentSurfaceMountingManager;
   @Nullable private SurfaceMountingManager mLastQueriedSurfaceMountingManager;
 
-  @NonNull private final JSResponderHandler mJSResponderHandler = new JSResponderHandler();
-  @NonNull private final ViewManagerRegistry mViewManagerRegistry;
-  @NonNull private final MountItemExecutor mMountItemExecutor;
-  @NonNull private final RootViewManager mRootViewManager = new RootViewManager();
+  private final JSResponderHandler mJSResponderHandler = new JSResponderHandler();
+  private final ViewManagerRegistry mViewManagerRegistry;
+  private final MountItemExecutor mMountItemExecutor;
+  private final RootViewManager mRootViewManager = new RootViewManager();
 
   public interface MountItemExecutor {
     @UiThread
@@ -70,8 +71,7 @@ public class MountingManager {
   }
 
   public MountingManager(
-      @NonNull ViewManagerRegistry viewManagerRegistry,
-      @NonNull MountItemExecutor mountItemExecutor) {
+      ViewManagerRegistry viewManagerRegistry, MountItemExecutor mountItemExecutor) {
     mViewManagerRegistry = viewManagerRegistry;
     mMountItemExecutor = mountItemExecutor;
   }
@@ -116,7 +116,7 @@ public class MountingManager {
 
   @AnyThread
   public void attachRootView(
-      final int surfaceId, @NonNull final View rootView, ThemedReactContext themedReactContext) {
+      final int surfaceId, final View rootView, ThemedReactContext themedReactContext) {
     SurfaceMountingManager surfaceMountingManager =
         getSurfaceManagerEnforced(surfaceId, "attachView");
 
@@ -136,6 +136,7 @@ public class MountingManager {
       // Maximum number of stopped surfaces to keep track of
       while (mStoppedSurfaceIds.size() >= MAX_STOPPED_SURFACE_IDS_LENGTH) {
         Integer staleStoppedId = mStoppedSurfaceIds.get(0);
+        Assertions.assertNotNull(staleStoppedId);
         mSurfaceIdToManager.remove(staleStoppedId.intValue());
         mStoppedSurfaceIds.remove(staleStoppedId);
         FLog.d(TAG, "Removing stale SurfaceMountingManager: [%d]", staleStoppedId.intValue());
@@ -175,7 +176,6 @@ public class MountingManager {
     return surfaceMountingManager;
   }
 
-  @NonNull
   public SurfaceMountingManager getSurfaceManagerEnforced(int surfaceId, String context) {
     SurfaceMountingManager surfaceMountingManager = getSurfaceManager(surfaceId);
 
@@ -250,7 +250,6 @@ public class MountingManager {
     return null;
   }
 
-  @NonNull
   @AnyThread
   public SurfaceMountingManager getSurfaceManagerForViewEnforced(int reactTag) {
     SurfaceMountingManager surfaceMountingManager = getSurfaceManagerForView(reactTag);
@@ -276,7 +275,7 @@ public class MountingManager {
   }
 
   public void receiveCommand(
-      int surfaceId, int reactTag, @NonNull String commandId, @Nullable ReadableArray commandArgs) {
+      int surfaceId, int reactTag, String commandId, @Nullable ReadableArray commandArgs) {
     UiThreadUtil.assertOnUiThread();
     getSurfaceManagerEnforced(surfaceId, "receiveCommand:string")
         .receiveCommand(reactTag, commandId, commandArgs);
@@ -357,15 +356,15 @@ public class MountingManager {
    */
   @AnyThread
   public long measure(
-      @NonNull ReactContext context,
-      @NonNull String componentName,
-      @NonNull ReadableMap localData,
-      @NonNull ReadableMap props,
-      @NonNull ReadableMap state,
+      ReactContext context,
+      String componentName,
+      ReadableMap localData,
+      ReadableMap props,
+      ReadableMap state,
       float width,
-      @NonNull YogaMeasureMode widthMode,
+      YogaMeasureMode widthMode,
       float height,
-      @NonNull YogaMeasureMode heightMode,
+      YogaMeasureMode heightMode,
       @Nullable float[] attachmentsPositions) {
 
     return mViewManagerRegistry
@@ -400,15 +399,15 @@ public class MountingManager {
    */
   @AnyThread
   public long measureMapBuffer(
-      @NonNull ReactContext context,
-      @NonNull String componentName,
-      @NonNull MapBuffer localData,
-      @NonNull MapBuffer props,
+      ReactContext context,
+      String componentName,
+      MapBuffer localData,
+      MapBuffer props,
       @Nullable MapBuffer state,
       float width,
-      @NonNull YogaMeasureMode widthMode,
+      YogaMeasureMode widthMode,
       float height,
-      @NonNull YogaMeasureMode heightMode,
+      YogaMeasureMode heightMode,
       @Nullable float[] attachmentsPositions) {
 
     return mViewManagerRegistry

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

@@ -462,7 +462,7 @@ public class SurfaceMountingManager {
     // TODO: throw exception here?
     if (parentViewState == null) {
       ReactSoftExceptionLogger.logSoftException(
-          MountingManager.TAG,
+          ReactSoftExceptionLogger.Categories.SURFACE_MOUNTING_MANAGER_MISSING_VIEWSTATE,
           new IllegalStateException(
               "Unable to find viewState for tag: [" + parentTag + "] for removeViewAt"));
       return;
@@ -656,7 +656,7 @@ public class SurfaceMountingManager {
       @Nullable EventEmitterWrapper eventEmitterWrapper,
       boolean isLayoutable) {
     Systrace.beginSection(
-        Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
+        Systrace.TRACE_TAG_REACT,
         "SurfaceMountingManager::createViewUnsafe(" + componentName + ")");
     try {
       ReactStylesDiffMap propMap = new ReactStylesDiffMap(props);
@@ -676,7 +676,7 @@ public class SurfaceMountingManager {
         viewState.mViewManager = viewManager;
       }
     } finally {
-      Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
+      Systrace.endSection(Systrace.TRACE_TAG_REACT);
     }
   }
 
@@ -833,9 +833,16 @@ public class SurfaceMountingManager {
       parent.requestLayout();
     }
 
-    ViewState parentViewState = getViewState(parentTag);
+    // TODO T212247085: Make this non-nullable again after rolling out
+    // disableMountItemReorderingAndroid
+    ViewState parentViewState = getNullableViewState(parentTag);
     IViewGroupManager<?> parentViewManager = null;
-    if (parentViewState.mViewManager != null) {
+    if (parentViewState == null) {
+      ReactSoftExceptionLogger.logSoftException(
+          ReactSoftExceptionLogger.Categories.SURFACE_MOUNTING_MANAGER_MISSING_VIEWSTATE,
+          new ReactNoCrashSoftException(
+              "Unable to find viewState for tag: " + parentTag + " for updateLayout"));
+    } else if (parentViewState.mViewManager != null) {
       parentViewManager = (IViewGroupManager) parentViewState.mViewManager;
     }
     if (parentViewManager == null || !parentViewManager.needsCustomLayoutForChildren()) {

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

@@ -7,7 +7,7 @@
 
 package com.facebook.react.fabric.mounting.mountitems
 
-public interface BatchMountItem : MountItem {
+internal interface BatchMountItem : MountItem {
   /** @return if the BatchMountItem contains any MountItem */
-  public fun isBatchEmpty(): Boolean
+  fun isBatchEmpty(): Boolean
 }

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

@@ -14,13 +14,13 @@ import androidx.annotation.UiThread
  * DispatchIntCommandMountItem}, we can delete this interface too. It provides a set of common
  * operations to simplify generic operations on all types of ViewCommands.
  */
-public abstract class DispatchCommandMountItem : MountItem {
+internal abstract class DispatchCommandMountItem : MountItem {
   private var numRetries: Int = 0
 
   @UiThread
-  public fun incrementRetries() {
+  fun incrementRetries() {
     numRetries++
   }
 
-  @UiThread public fun getRetries(): Int = numRetries
+  @UiThread fun getRetries(): Int = numRetries
 }

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

@@ -0,0 +1,335 @@
+/*
+ * 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.proguard.annotations.DoNotStripAny
+import com.facebook.react.bridge.ReactMarker
+import com.facebook.react.bridge.ReactMarkerConstants
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.fabric.FabricUIManager
+import com.facebook.react.fabric.events.EventEmitterWrapper
+import com.facebook.react.fabric.mounting.MountingManager
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
+import com.facebook.react.uimanager.StateWrapper
+import com.facebook.systrace.Systrace
+import java.util.Locale
+
+/**
+ * This class represents a batch of [MountItem]s, represented directly as int buffers to remove the
+ * need for actual MountItem instances.
+ *
+ * An IntBufferBatchMountItem batch contains an array of ints, indicating the mount actions that
+ * should be taken, and a size; as well as an array of Objects, and a corresponding array size, for
+ * any data that cannot be passed as a raw int.
+ *
+ * The purpose of encapsulating the array of MountItems this way, is to reduce the amount of
+ * allocations in C++ and JNI round-trips.
+ */
+@DoNotStripAny
+internal class IntBufferBatchMountItem(
+    private val surfaceId: Int,
+    private val intBuffer: IntArray,
+    private val objBuffer: Array<Any?>,
+    private val commitNumber: Int
+) : BatchMountItem {
+  private val intBufferLen = intBuffer.size
+  private val objBufferLen = objBuffer.size
+
+  private fun beginMarkers(reason: String) {
+    Systrace.beginSection(Systrace.TRACE_TAG_REACT, "IntBufferBatchMountItem::$reason")
+
+    if (commitNumber > 0) {
+      ReactMarker.logFabricMarker(
+          ReactMarkerConstants.FABRIC_BATCH_EXECUTION_START, null, commitNumber)
+    }
+  }
+
+  private fun endMarkers() {
+    if (commitNumber > 0) {
+      ReactMarker.logFabricMarker(
+          ReactMarkerConstants.FABRIC_BATCH_EXECUTION_END, null, commitNumber)
+    }
+
+    Systrace.endSection(Systrace.TRACE_TAG_REACT)
+  }
+
+  override fun execute(mountingManager: MountingManager) {
+    val surfaceMountingManager = mountingManager.getSurfaceManager(surfaceId)
+    if (surfaceMountingManager == null) {
+      FLog.e(
+          TAG, "Skipping batch of MountItems; no SurfaceMountingManager found for [%d].", surfaceId)
+      return
+    }
+    if (surfaceMountingManager.isStopped()) {
+      FLog.e(TAG, "Skipping batch of MountItems; was stopped [%d].", surfaceId)
+      return
+    }
+    if (ReactNativeFeatureFlags.enableFabricLogs()) {
+      FLog.d(TAG, "Executing IntBufferBatchMountItem on surface [%d]", surfaceId)
+    }
+
+    beginMarkers("mountViews")
+    var i = 0
+    var j = 0
+    while (i < intBufferLen) {
+      val rawType = intBuffer[i++]
+      val type = rawType and INSTRUCTION_FLAG_MULTIPLE.inv()
+      val numInstructions =
+          (if ((rawType and INSTRUCTION_FLAG_MULTIPLE) != 0) intBuffer[i++] else 1)
+
+      val args = arrayOf("numInstructions", numInstructions.toString())
+
+      Systrace.beginSection(
+          Systrace.TRACE_TAG_REACT,
+          "IntBufferBatchMountItem::mountInstructions::" + nameForInstructionString(type),
+          args,
+          args.size)
+      for (k in 0 until numInstructions) {
+        when (type) {
+          INSTRUCTION_CREATE -> {
+            val componentName = (objBuffer[j++] as String?).orEmpty()
+            val fabricComponentName =
+                FabricNameComponentMapping.getFabricComponentName(componentName)
+            surfaceMountingManager.createView(
+                fabricComponentName,
+                intBuffer[i++],
+                objBuffer[j++] as ReadableMap?,
+                objBuffer[j++] as StateWrapper?,
+                objBuffer[j++] as EventEmitterWrapper?,
+                intBuffer[i++] == 1)
+          }
+          INSTRUCTION_DELETE -> surfaceMountingManager.deleteView(intBuffer[i++])
+          INSTRUCTION_INSERT -> {
+            val tag = intBuffer[i++]
+            val parentTag = intBuffer[i++]
+            surfaceMountingManager.addViewAt(parentTag, tag, intBuffer[i++])
+          }
+          INSTRUCTION_REMOVE ->
+              surfaceMountingManager.removeViewAt(intBuffer[i++], intBuffer[i++], intBuffer[i++])
+          INSTRUCTION_UPDATE_PROPS ->
+              surfaceMountingManager.updateProps(intBuffer[i++], objBuffer[j++] as ReadableMap?)
+          INSTRUCTION_UPDATE_STATE ->
+              surfaceMountingManager.updateState(intBuffer[i++], objBuffer[j++] as StateWrapper?)
+          INSTRUCTION_UPDATE_LAYOUT -> {
+            val reactTag = intBuffer[i++]
+            val parentTag = intBuffer[i++]
+            val x = intBuffer[i++]
+            val y = intBuffer[i++]
+            val width = intBuffer[i++]
+            val height = intBuffer[i++]
+            val displayType = intBuffer[i++]
+            val layoutDirection = intBuffer[i++]
+            surfaceMountingManager.updateLayout(
+                reactTag, parentTag, x, y, width, height, displayType, layoutDirection)
+          }
+          INSTRUCTION_UPDATE_PADDING ->
+              surfaceMountingManager.updatePadding(
+                  intBuffer[i++], intBuffer[i++], intBuffer[i++], intBuffer[i++], intBuffer[i++])
+          INSTRUCTION_UPDATE_OVERFLOW_INSET -> {
+            val reactTag = intBuffer[i++]
+            val overflowInsetLeft = intBuffer[i++]
+            val overflowInsetTop = intBuffer[i++]
+            val overflowInsetRight = intBuffer[i++]
+            val overflowInsetBottom = intBuffer[i++]
+
+            surfaceMountingManager.updateOverflowInset(
+                reactTag,
+                overflowInsetLeft,
+                overflowInsetTop,
+                overflowInsetRight,
+                overflowInsetBottom)
+          }
+          INSTRUCTION_UPDATE_EVENT_EMITTER -> {
+            val eventEmitterWrapper = objBuffer[j++] as EventEmitterWrapper?
+            if (eventEmitterWrapper != null) {
+              surfaceMountingManager.updateEventEmitter(intBuffer[i++], eventEmitterWrapper)
+            }
+          }
+          else -> {
+            throw IllegalArgumentException(
+                "Invalid type argument to IntBufferBatchMountItem: $type at index: $i")
+          }
+        }
+      }
+      Systrace.endSection(Systrace.TRACE_TAG_REACT)
+    }
+    endMarkers()
+  }
+
+  override fun getSurfaceId(): Int = surfaceId
+
+  override fun isBatchEmpty(): Boolean = intBufferLen == 0
+
+  override fun toString(): String {
+    try {
+      val s = StringBuilder()
+      s.append(String.format(Locale.ROOT, "IntBufferBatchMountItem [surface:%d]:\n", surfaceId))
+      var i = 0
+      var j = 0
+      while (i < intBufferLen) {
+        val rawType = intBuffer[i++]
+        val type = rawType and INSTRUCTION_FLAG_MULTIPLE.inv()
+        val numInstructions =
+            (if ((rawType and INSTRUCTION_FLAG_MULTIPLE) != 0) intBuffer[i++] else 1)
+        for (k in 0 until numInstructions) {
+          when (type) {
+            INSTRUCTION_CREATE -> {
+              val componentName = (objBuffer[j++] as String?).orEmpty()
+              val fabricComponentName =
+                  FabricNameComponentMapping.getFabricComponentName(componentName)
+
+              j += 3
+              s.append(
+                  String.format(
+                      Locale.ROOT,
+                      "CREATE [%d] - layoutable:%d - %s\n",
+                      intBuffer[i++],
+                      intBuffer[i++],
+                      fabricComponentName))
+            }
+            INSTRUCTION_DELETE ->
+                s.append(String.format(Locale.ROOT, "DELETE [%d]\n", intBuffer[i++]))
+            INSTRUCTION_INSERT ->
+                s.append(
+                    String.format(
+                        Locale.ROOT,
+                        "INSERT [%d]->[%d] @%d\n",
+                        intBuffer[i++],
+                        intBuffer[i++],
+                        intBuffer[i++]))
+            INSTRUCTION_REMOVE ->
+                s.append(
+                    String.format(
+                        Locale.ROOT,
+                        "REMOVE [%d]->[%d] @%d\n",
+                        intBuffer[i++],
+                        intBuffer[i++],
+                        intBuffer[i++]))
+            INSTRUCTION_UPDATE_PROPS -> {
+              val props = objBuffer[j++]
+              val propsString =
+                  if (FabricUIManager.IS_DEVELOPMENT_ENVIRONMENT) (props?.toString() ?: "<null>")
+                  else "<hidden>"
+              s.append(
+                  String.format(
+                      Locale.ROOT, "UPDATE PROPS [%d]: %s\n", intBuffer[i++], propsString))
+            }
+            INSTRUCTION_UPDATE_STATE -> {
+              val state: StateWrapper? = objBuffer[j++] as StateWrapper?
+              val stateString =
+                  if (FabricUIManager.IS_DEVELOPMENT_ENVIRONMENT) (state?.toString() ?: "<null>")
+                  else "<hidden>"
+              s.append(
+                  String.format(
+                      Locale.ROOT, "UPDATE STATE [%d]: %s\n", intBuffer[i++], stateString))
+            }
+            INSTRUCTION_UPDATE_LAYOUT ->
+                s.append(
+                    String.format(
+                        Locale.ROOT,
+                        "UPDATE LAYOUT [%d]->[%d]: x:%d y:%d w:%d h:%d displayType:%d" +
+                            " layoutDirection:%d\n",
+                        intBuffer[i++],
+                        intBuffer[i++],
+                        intBuffer[i++],
+                        intBuffer[i++],
+                        intBuffer[i++],
+                        intBuffer[i++],
+                        intBuffer[i++],
+                        intBuffer[i++]))
+            INSTRUCTION_UPDATE_PADDING ->
+                s.append(
+                    String.format(
+                        Locale.ROOT,
+                        "UPDATE PADDING [%d]: top:%d right:%d bottom:%d left:%d\n",
+                        intBuffer[i++],
+                        intBuffer[i++],
+                        intBuffer[i++],
+                        intBuffer[i++],
+                        intBuffer[i++]))
+            INSTRUCTION_UPDATE_OVERFLOW_INSET ->
+                s.append(
+                    String.format(
+                        Locale.ROOT,
+                        "UPDATE OVERFLOWINSET [%d]: left:%d top:%d right:%d bottom:%d\n",
+                        intBuffer[i++],
+                        intBuffer[i++],
+                        intBuffer[i++],
+                        intBuffer[i++],
+                        intBuffer[i++]))
+            INSTRUCTION_UPDATE_EVENT_EMITTER -> {
+              j += 1
+              s.append(String.format(Locale.ROOT, "UPDATE EVENTEMITTER [%d]\n", intBuffer[i++]))
+            }
+            else -> {
+              FLog.e(TAG, "String so far: $s")
+              throw IllegalArgumentException(
+                  "Invalid type argument to IntBufferBatchMountItem: $type at index: $i")
+            }
+          }
+        }
+      }
+      return s.toString()
+    } catch (e: Exception) {
+      // Generally, this only happens during development when a malformed buffer is sent through.
+      // In these cases, we print the buffers to assist in debugging.
+      // This should never happen in production, but if it does... it'd still be helpful to know.
+      FLog.e(TAG, "Caught exception trying to print", e)
+
+      val ss = StringBuilder()
+      var ii = 0
+      while (ii < intBufferLen) {
+        ss.append(intBuffer[ii])
+        ss.append(", ")
+        ii++
+      }
+      FLog.e(TAG, ss.toString())
+
+      var jj = 0
+      while (jj < objBufferLen) {
+        FLog.e(TAG, if (objBuffer[jj] != null) objBuffer[jj].toString() else "null")
+        jj++
+      }
+
+      return ""
+    }
+  }
+
+  companion object {
+    val TAG: String = IntBufferBatchMountItem::class.java.simpleName
+
+    const val INSTRUCTION_FLAG_MULTIPLE: Int = 1
+
+    const val INSTRUCTION_CREATE: Int = 2
+    const val INSTRUCTION_DELETE: Int = 4
+    const val INSTRUCTION_INSERT: Int = 8
+    const val INSTRUCTION_REMOVE: Int = 16
+    const val INSTRUCTION_UPDATE_PROPS: Int = 32
+    const val INSTRUCTION_UPDATE_STATE: Int = 64
+    const val INSTRUCTION_UPDATE_LAYOUT: Int = 128
+    const val INSTRUCTION_UPDATE_EVENT_EMITTER: Int = 256
+    const val INSTRUCTION_UPDATE_PADDING: Int = 512
+    const val INSTRUCTION_UPDATE_OVERFLOW_INSET: Int = 1024
+
+    private fun nameForInstructionString(type: Int): String =
+        when (type) {
+          INSTRUCTION_CREATE -> "CREATE"
+          INSTRUCTION_DELETE -> "DELETE"
+          INSTRUCTION_INSERT -> "INSERT"
+          INSTRUCTION_REMOVE -> "REMOVE"
+          INSTRUCTION_UPDATE_PROPS -> "UPDATE_PROPS"
+          INSTRUCTION_UPDATE_STATE -> "UPDATE_STATE"
+          INSTRUCTION_UPDATE_LAYOUT -> "UPDATE_LAYOUT"
+          INSTRUCTION_UPDATE_PADDING -> "UPDATE_PADDING"
+          INSTRUCTION_UPDATE_OVERFLOW_INSET -> "UPDATE_OVERFLOW_INSET"
+          INSTRUCTION_UPDATE_EVENT_EMITTER -> "UPDATE_EVENT_EMITTER"
+          else -> "UNKNOWN"
+        }
+  }
+}

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

@@ -13,9 +13,9 @@ import com.facebook.proguard.annotations.DoNotStripAny
 import com.facebook.react.fabric.mounting.MountingManager
 
 @DoNotStripAny
-public interface MountItem {
+internal interface MountItem {
   /** Execute this [MountItem] into the operation queue received by parameter. */
-  @UiThread public fun execute(mountingManager: MountingManager)
+  @UiThread fun execute(mountingManager: MountingManager)
 
-  @AnyThread public fun getSurfaceId(): Int
+  @AnyThread fun getSurfaceId(): Int
 }

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

@@ -12,10 +12,10 @@ import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.StateWrapper
 
 /** Factory class that expose creation of [MountItem] */
-public object MountItemFactory {
+internal object MountItemFactory {
   /** @return a [DispatchCommandMountItem] for commands identified by an int */
   @JvmStatic
-  public fun createDispatchCommandMountItem(
+  fun createDispatchCommandMountItem(
       surfaceId: Int,
       reactTag: Int,
       commandId: Int,
@@ -25,7 +25,7 @@ public object MountItemFactory {
 
   /** @return a [DispatchCommandMountItem] for commands identified by a String */
   @JvmStatic
-  public fun createDispatchCommandMountItem(
+  fun createDispatchCommandMountItem(
       surfaceId: Int,
       reactTag: Int,
       commandId: String,
@@ -35,7 +35,7 @@ public object MountItemFactory {
 
   /** @return a [MountItem] that will control the execution of an AccessibilityEvent */
   @JvmStatic
-  public fun createSendAccessibilityEventMountItem(
+  fun createSendAccessibilityEventMountItem(
       surfaceId: Int,
       reactTag: Int,
       eventType: Int
@@ -43,7 +43,7 @@ public object MountItemFactory {
 
   /** @return a [MountItem] that will be used to preallocate views */
   @JvmStatic
-  public fun createPreAllocateViewMountItem(
+  fun createPreAllocateViewMountItem(
       surfaceId: Int,
       reactTag: Int,
       component: String,
@@ -55,7 +55,7 @@ public object MountItemFactory {
 
   /** @return a [MountItem] that will be used to destroy views */
   @JvmStatic
-  public fun createDestroyViewMountItem(surfaceId: Int, reactTag: Int): MountItem =
+  fun createDestroyViewMountItem(surfaceId: Int, reactTag: Int): MountItem =
       DestroyUnmountedViewMountItem(surfaceId, reactTag)
 
   /**
@@ -63,7 +63,7 @@ public object MountItemFactory {
    *   the int[] and Object[] received by parameter
    */
   @JvmStatic
-  public fun createIntBufferBatchMountItem(
+  fun createIntBufferBatchMountItem(
       surfaceId: Int,
       intBuf: IntArray,
       objBuf: Array<Any?>,

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

@@ -7,6 +7,7 @@
 
 package com.facebook.react.fabric.mounting.mountitems
 
+import com.facebook.react.bridge.ReactNoCrashSoftException
 import com.facebook.react.bridge.ReactSoftExceptionLogger
 import com.facebook.react.bridge.RetryableMountingLayerException
 import com.facebook.react.fabric.mounting.MountingManager
@@ -30,7 +31,7 @@ internal class SendAccessibilityEventMountItem(
       // due to race conditions (like the view disappearing after the event is
       // queued and before it executes), we log a soft exception and continue along.
       // Other categories of errors will still cause a hard crash.
-      ReactSoftExceptionLogger.logSoftException(TAG, e)
+      ReactSoftExceptionLogger.logSoftException(TAG, ReactNoCrashSoftException(e))
     }
   }
 

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

@@ -23,7 +23,7 @@ public interface TaskInterface<TResult> {
    * @return true if the task completed (has a result, an error, or was cancelled). false otherwise.
    */
   @Throws(InterruptedException::class)
-  public fun waitForCompletion(duration: Long, timeUnit: TimeUnit?): Boolean
+  public fun waitForCompletion(duration: Long, timeUnit: TimeUnit): Boolean
 
   /** @return The result of the task, if set. null otherwise. */
   public fun getResult(): TResult?