react-native-tvos 0.87.1-0 → 0.88.0-0rc2

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

@@ -27,6 +27,7 @@ import android.view.accessibility.AccessibilityEvent;
 import androidx.annotation.AnyThread;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
+import androidx.annotation.VisibleForTesting;
 import androidx.core.view.ViewCompat.FocusDirection;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
@@ -65,6 +66,7 @@ import com.facebook.react.fabric.mounting.mountitems.DispatchCommandMountItem;
 import com.facebook.react.fabric.mounting.mountitems.MountItem;
 import com.facebook.react.fabric.mounting.mountitems.MountItemFactory;
 import com.facebook.react.fabric.mounting.mountitems.PrefetchResourcesMountItem;
+import com.facebook.react.fabric.mounting.mountitems.PullTransactionMountItem;
 import com.facebook.react.fabric.mounting.mountitems.SynchronousMountItem;
 import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags;
@@ -565,12 +567,12 @@ public class FabricUIManager
             mTextEffectRegistry);
   }
 
-  public int getColor(int surfaceId, String[] resourcePaths) {
+  public @Nullable Integer getColor(int surfaceId, String[] resourcePaths) {
     ThemedReactContext context =
         mMountingManager.getSurfaceManagerEnforced(surfaceId, "getColor").getContext();
     // Surface may have been stopped
     if (context == null) {
-      return 0;
+      return null;
     }
 
     for (String resourcePath : resourcePaths) {
@@ -579,7 +581,9 @@ public class FabricUIManager
         return color;
       }
     }
-    return 0;
+    // Null (explicit miss), not 0, so native can tell an unresolved color from
+    // one that resolves to transparent black (ARGB 0).
+    return null;
   }
 
   /**
@@ -934,7 +938,8 @@ public class FabricUIManager
       long layoutEndTime,
       long finishTransactionStartTime,
       long finishTransactionEndTime,
-      int affectedLayoutNodesCount) {
+      int affectedLayoutNodesCount,
+      boolean synchronous) {
     // When Binding.cpp calls scheduleMountItems during a commit phase, it always calls with
     // a BatchMountItem. No other sites call into this with a BatchMountItem, and Binding.cpp only
     // calls scheduleMountItems with a BatchMountItem.
@@ -948,8 +953,9 @@ public class FabricUIManager
     } else {
       shouldSchedule = mountItem != null;
     }
-    // In case of sync rendering, this could be called on the UI thread. Otherwise,
-    // it should ~always be called on the JS thread.
+    // In the push model, this is ~always called on the JS thread, or on the UI
+    // thread in case of sync rendering.
+    // In the pull model, this is always called on the UI thread, at pull time.
     for (UIManagerListener listener : mListeners) {
       listener.didScheduleMountItems(this);
     }
@@ -964,16 +970,28 @@ public class FabricUIManager
 
     if (shouldSchedule) {
       Assertions.assertNotNull(mountItem, "MountItem is null");
-      mMountItemDispatcher.addMountItem(mountItem);
-      if (UiThreadUtil.isOnUiThread()) {
-        Runnable runnable =
-            new GuardedRunnable(mReactApplicationContext) {
-              @Override
-              public void runGuarded() {
-                mMountItemDispatcher.tryDispatchMountItems();
-              }
-            };
-        runnable.run();
+      if (synchronous) {
+        if (mMountingManager.isWaitingForViewAttach(mountItem.getSurfaceId())) {
+          // Regular mount items are still being deferred into the surface's attach queue.
+          // Executing this batch inline would run it ahead of the preallocations queued there.
+          mMountItemDispatcher.addMountItem(mountItem);
+        } else {
+          // Pull model: we are already on the UI thread, inside the dispatcher's loop executing
+          // a PullTransactionMountItem. We don't schedule the item, we execute it directly.
+          mountItem.execute(mMountingManager);
+        }
+      } else {
+        mMountItemDispatcher.addMountItem(mountItem);
+        if (UiThreadUtil.isOnUiThread()) {
+          Runnable runnable =
+              new GuardedRunnable(mReactApplicationContext) {
+                @Override
+                public void runGuarded() {
+                  mMountItemDispatcher.tryDispatchMountItems();
+                }
+              };
+          runnable.run();
+        }
       }
     }
 
@@ -1009,6 +1027,26 @@ public class FabricUIManager
     }
   }
 
+  /**
+   * Pull model: called from C++ via JNI (usually on the commit thread) to signal that a transaction
+   * is available for {@code surfaceId}. Enqueues a PullTransactionMountItem so the UI thread pulls
+   * and applies the transaction itself, preserving mount-item ordering.
+   */
+  @SuppressWarnings("unused")
+  @AnyThread
+  @ThreadConfined(ANY)
+  @VisibleForTesting
+  void onTransactionAvailable(int surfaceId) {
+    FabricUIManagerBinding binding = mBinding;
+    if (binding == null) {
+      return;
+    }
+    mMountItemDispatcher.addMountItem(new PullTransactionMountItem(surfaceId, binding));
+    if (UiThreadUtil.isOnUiThread()) {
+      mMountItemDispatcher.tryDispatchMountItems();
+    }
+  }
+
   @SuppressWarnings("unused")
   @AnyThread
   @ThreadConfined(ANY)

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

@@ -85,6 +85,8 @@ internal class FabricUIManagerBinding : HybridClassBase() {
 
   external fun reportMount(surfaceId: Int)
 
+  external fun pullAndExecuteTransaction(surfaceId: Int)
+
   external fun mergeReactRevision(surfaceId: Int)
 
   fun register(

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

@@ -69,7 +69,7 @@ public class FabricUIManagerProviderImpl(
     } else {
       throw IllegalStateException(
           "Unable to register FabricUIManager with CatalystInstance, runtimeExecutor and" +
-              " runtimeScheduler must not be null"
+              " runtimeScheduler must not be null",
       )
     }
 

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

@@ -129,13 +129,12 @@ internal class ViewTransitionSnapshotManager(
     // and the partial result gets stretched to fill the pseudo-element.
     val windowWidth = window.decorView.width
     val windowHeight = window.decorView.height
-    val clampedRect =
-        Rect(
-            viewRect.left.coerceAtLeast(0),
-            viewRect.top.coerceAtLeast(0),
-            viewRect.right.coerceAtMost(windowWidth),
-            viewRect.bottom.coerceAtMost(windowHeight),
-        )
+    val clampedRect = Rect(
+        viewRect.left.coerceAtLeast(0),
+        viewRect.top.coerceAtLeast(0),
+        viewRect.right.coerceAtMost(windowWidth),
+        viewRect.bottom.coerceAtMost(windowHeight),
+    )
 
     if (clampedRect.isEmpty) {
       // Entirely off-screen — nothing to capture.

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

@@ -64,15 +64,14 @@ internal class MountingManager(
       reactContext: ThemedReactContext?,
       rootView: View?,
   ): SurfaceMountingManager {
-    val surfaceMountingManager =
-        SurfaceMountingManager(
-            surfaceId,
-            jsResponderHandler,
-            viewManagerRegistry,
-            rootViewManager,
-            mountItemExecutor,
-            checkNotNull(reactContext),
-        )
+    val surfaceMountingManager = SurfaceMountingManager(
+        surfaceId,
+        jsResponderHandler,
+        viewManagerRegistry,
+        rootViewManager,
+        mountItemExecutor,
+        checkNotNull(reactContext),
+    )
 
     // There could technically be a race condition here if addRootView is called twice from
     // different threads, though this is (probably) extremely unlikely, and likely an error.
@@ -84,7 +83,7 @@ internal class MountingManager(
       logSoftException(
           TAG,
           IllegalStateException(
-              "Called startSurface more than once for the SurfaceId [$surfaceId]"
+              "Called startSurface more than once for the SurfaceId [$surfaceId]",
           ),
       )
     }
@@ -151,7 +150,7 @@ internal class MountingManager(
   fun getSurfaceManagerEnforced(surfaceId: Int, context: String): SurfaceMountingManager =
       getSurfaceManager(surfaceId)
           ?: throw RetryableMountingLayerException(
-              ("Unable to find SurfaceMountingManager for surfaceId: [$surfaceId]. Context: $context")
+              ("Unable to find SurfaceMountingManager for surfaceId: [$surfaceId]. Context: $context"),
           )
 
   fun surfaceIsStopped(surfaceId: Int): Boolean {
@@ -208,7 +207,7 @@ internal class MountingManager(
   fun getSurfaceManagerForViewEnforced(reactTag: Int): SurfaceMountingManager =
       getSurfaceManagerForView(reactTag)
           ?: throw RetryableMountingLayerException(
-              "Unable to find SurfaceMountingManager for tag: [$reactTag]"
+              "Unable to find SurfaceMountingManager for tag: [$reactTag]",
           )
 
   fun getViewExists(reactTag: Int): Boolean = getSurfaceManagerForView(reactTag) != null

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

@@ -147,7 +147,7 @@ internal constructor(
               ReactSoftExceptionLogger.logSoftException(
                   TAG,
                   IllegalViewOperationException(
-                      "Race condition in addRootView detected. Trying to set an id of [$surfaceId] on the RootView, but that id has already been set. "
+                      "Race condition in addRootView detected. Trying to set an id of [$surfaceId] on the RootView, but that id has already been set. ",
                   ),
               )
             } else if (rootView.id != View.NO_ID) {
@@ -163,7 +163,7 @@ internal constructor(
               ReactSoftExceptionLogger.logSoftException(
                   TAG,
                   IllegalViewOperationException(
-                      "Trying to add a root view with an explicit id already set. React Native uses the id field to track react tags and will overwrite this field. If that is fine, explicitly overwrite the id field to View.NO_ID before calling addRootView."
+                      "Trying to add a root view with an explicit id already set. React Native uses the id field to track react tags and will overwrite this field. If that is fine, explicitly overwrite the id field to View.NO_ID before calling addRootView.",
                   ),
               )
             }
@@ -341,7 +341,7 @@ internal constructor(
       ReactSoftExceptionLogger.logSoftException(
           TAG,
           IllegalStateException(
-              "addViewAt: cannot insert view [$tag] into parent [$parentTag]: View already has a parent: [$actualParentId] Parent: ${currParentView.javaClass.simpleName} View: ${view.javaClass.simpleName}"
+              "addViewAt: cannot insert view [$tag] into parent [$parentTag]: View already has a parent: [$actualParentId] Parent: ${currParentView.javaClass.simpleName} View: ${view.javaClass.simpleName}",
           ),
       )
 
@@ -407,7 +407,7 @@ internal constructor(
       ReactSoftExceptionLogger.logSoftException(
           TAG,
           IllegalViewOperationException(
-              "removeViewAt tried to remove a React View that was actually reused. This indicates a bug in the Differ (specifically instruction ordering). [$tag]"
+              "removeViewAt tried to remove a React View that was actually reused. This indicates a bug in the Differ (specifically instruction ordering). [$tag]",
           ),
       )
       return
@@ -418,7 +418,7 @@ internal constructor(
       ReactSoftExceptionLogger.logSoftException(
           ReactSoftExceptionLogger.Categories.SURFACE_MOUNTING_MANAGER_MISSING_VIEWSTATE,
           ReactNoCrashSoftException(
-              "Unable to find viewState for tag: [$parentTag] for removeViewAt"
+              "Unable to find viewState for tag: [$parentTag] for removeViewAt",
           ),
       )
       return
@@ -427,10 +427,13 @@ internal constructor(
     val parentView = parentViewState.view
     checkNotNull(parentView) { "Unable to find parentView for tag $parentTag" }
     if (parentView !is ViewGroup) {
-      val message =
-          "Unable to remove a view from a a non-ViewGroup ${parentView.javaClass.simpleName} when removing [$tag] from parent [$parentTag]"
-      FLog.e(TAG, message)
-      throw IllegalStateException(message)
+      ReactSoftExceptionLogger.logSoftException(
+          TAG,
+          ReactNoCrashSoftException(
+              "Unable to remove a view from a non-ViewGroup ${parentView.javaClass.simpleName} when removing [$tag] from parent [$parentTag]",
+          ),
+      )
+      return
     }
 
     if (SHOW_CHANGED_VIEW_HIERARCHIES) {
@@ -483,7 +486,7 @@ internal constructor(
       ReactSoftExceptionLogger.logSoftException(
           TAG,
           ReactNoCrashSoftException(
-              "Tried to remove view [$tag] of parent [$parentTag] at index $index, but got view tag $actualTag - actual index of view: $tagActualIndex"
+              "Tried to remove view [$tag] of parent [$parentTag] at index $index, but got view tag $actualTag - actual index of view: $tagActualIndex",
           ),
       )
       actualIndex = tagActualIndex
@@ -705,7 +708,7 @@ internal constructor(
     val viewState =
         getNullableViewState(reactTag)
             ?: throw RetryableMountingLayerException(
-                "Unable to find viewState for tag $reactTag for commandId $commandId"
+                "Unable to find viewState for tag $reactTag for commandId $commandId",
             )
 
     // It's not uncommon for JS to send events as/after a component is being removed from the
@@ -734,7 +737,7 @@ internal constructor(
     val viewState =
         getNullableViewState(reactTag)
             ?: throw RetryableMountingLayerException(
-                "Unable to find viewState for tag $reactTag for commandId $commandId"
+                "Unable to find viewState for tag $reactTag for commandId $commandId",
             )
 
     // It's not uncommon for JS to send events as/after a component is being removed from the
@@ -766,7 +769,7 @@ internal constructor(
       ReactSoftExceptionLogger.logSoftException(
           ReactSoftExceptionLogger.Categories.SURFACE_MOUNTING_MANAGER_MISSING_VIEWSTATE,
           ReactNoCrashSoftException(
-              "Unable to find viewState for tag $reactTag for sendAccessibilityEvent"
+              "Unable to find viewState for tag $reactTag for sendAccessibilityEvent",
           ),
       )
       return
@@ -908,7 +911,7 @@ internal constructor(
       ReactSoftExceptionLogger.logSoftException(
           ReactSoftExceptionLogger.Categories.SURFACE_MOUNTING_MANAGER_MISSING_VIEWSTATE,
           ReactNoCrashSoftException(
-              "Unable to find viewState for tag $reactTag for updateOverflowInset"
+              "Unable to find viewState for tag $reactTag for updateOverflowInset",
           ),
       )
       return
@@ -1018,7 +1021,7 @@ internal constructor(
       ReactSoftExceptionLogger.logSoftException(
           ReactSoftExceptionLogger.Categories.SURFACE_MOUNTING_MANAGER_MISSING_VIEWSTATE,
           ReactNoCrashSoftException(
-              "Unable to find viewState for tag $reactTag for setJSResponder"
+              "Unable to find viewState for tag $reactTag for setJSResponder",
           ),
       )
       return
@@ -1033,7 +1036,7 @@ internal constructor(
 
     if (viewState.isRoot) {
       SoftAssertions.assertUnreachable(
-          "Cannot block native responder on [$reactTag] that is a root view"
+          "Cannot block native responder on [$reactTag] that is a root view",
       )
     }
     jsResponderHandler.setJSResponder(initialReactTag, view.parent)
@@ -1133,7 +1136,7 @@ internal constructor(
     val state = getNullableViewState(reactTag)
     return state?.view
         ?: throw IllegalViewOperationException(
-            "Unable to find view for tag $reactTag. Surface $surfaceId stopped: $isStopped, rootViewAttached: $isRootViewAttached"
+            "Unable to find view for tag $reactTag. Surface $surfaceId stopped: $isStopped, rootViewAttached: $isRootViewAttached",
         )
   }
 
@@ -1194,7 +1197,7 @@ internal constructor(
               viewState.pendingEventQueue
                   ?: LinkedList<PendingViewEvent>().also { viewState.pendingEventQueue = it }
           queue.add(
-              PendingViewEvent(eventName, params, eventCategory, canCoalesceEvent, eventTimestamp)
+              PendingViewEvent(eventName, params, eventCategory, canCoalesceEvent, eventTimestamp),
           )
           return
         }
@@ -1305,7 +1308,7 @@ internal constructor(
             val outputType = outputReadableMap.getType(propKey)
             assert(
                 (outputType == ReadableType.Array || outputType == ReadableType.Null) &&
-                    propValue is List<*>
+                    propValue is List<*>,
             )
             val array = WritableNativeArray()
             for (item in propValue as List<*>) {
@@ -1327,7 +1330,7 @@ internal constructor(
             val outputType = outputReadableMap.getType(propKey)
             assert(
                 (outputType == ReadableType.Number || outputType == ReadableType.Null) &&
-                    propValue is Number
+                    propValue is Number,
             )
             outputReadableMap.putDouble(propKey, (propValue as Number).toDouble())
           }

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

@@ -9,28 +9,27 @@ package com.facebook.react.fabric.mounting.mountitems
 
 /** Utility class for Fabric components, this will be removed */
 internal object FabricNameComponentMapping {
-  private val componentNames: Map<String, String> =
-      mapOf(
-          // TODO T97384889: unify component names between JS - Android - iOS - C++
-          "View" to "RCTView",
-          "Image" to "RCTImageView",
-          "ScrollView" to "RCTScrollView",
-          "Slider" to "RCTSlider",
-          "ModalHostView" to "RCTModalHostView",
-          "Paragraph" to "RCTText",
-          "SelectableParagraph" to "RCTSelectableText",
-          "Text" to "RCTText",
-          "RawText" to "RCTRawText",
-          "ActivityIndicatorView" to "AndroidProgressBar",
-          "ShimmeringView" to "RKShimmeringView",
-          "TemplateView" to "RCTTemplateView",
-          "AxialGradientView" to "RCTAxialGradientView",
-          "Video" to "RCTVideo",
-          "Map" to "RCTMap",
-          "WebView" to "RCTWebView",
-          "Keyframes" to "RCTKeyframes",
-          "ImpressionTrackingView" to "RCTImpressionTrackingView",
-      )
+  private val componentNames: Map<String, String> = mapOf(
+      // TODO T97384889: unify component names between JS - Android - iOS - C++
+      "View" to "RCTView",
+      "Image" to "RCTImageView",
+      "ScrollView" to "RCTScrollView",
+      "Slider" to "RCTSlider",
+      "ModalHostView" to "RCTModalHostView",
+      "Paragraph" to "RCTText",
+      "SelectableParagraph" to "RCTSelectableText",
+      "Text" to "RCTText",
+      "RawText" to "RCTRawText",
+      "ActivityIndicatorView" to "AndroidProgressBar",
+      "ShimmeringView" to "RKShimmeringView",
+      "TemplateView" to "RCTTemplateView",
+      "AxialGradientView" to "RCTAxialGradientView",
+      "Video" to "RCTVideo",
+      "Map" to "RCTMap",
+      "WebView" to "RCTWebView",
+      "Keyframes" to "RCTKeyframes",
+      "ImpressionTrackingView" to "RCTImpressionTrackingView",
+  )
 
   /** @return the name of component in the Fabric environment */
   @JvmStatic

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

@@ -178,7 +178,7 @@ internal class IntBufferBatchMountItem(
           }
           else -> {
             throw IllegalArgumentException(
-                "Invalid type argument to IntBufferBatchMountItem: $type at index: $i"
+                "Invalid type argument to IntBufferBatchMountItem: $type at index: $i",
             )
           }
         }
@@ -218,7 +218,7 @@ internal class IntBufferBatchMountItem(
                       intBuffer[i++],
                       intBuffer[i++],
                       fabricComponentName,
-                  )
+                  ),
               )
             }
             INSTRUCTION_DELETE ->
@@ -231,7 +231,7 @@ internal class IntBufferBatchMountItem(
                         intBuffer[i++],
                         intBuffer[i++],
                         intBuffer[i++],
-                    )
+                    ),
                 )
             INSTRUCTION_REMOVE ->
                 s.append(
@@ -241,7 +241,7 @@ internal class IntBufferBatchMountItem(
                         intBuffer[i++],
                         intBuffer[i++],
                         intBuffer[i++],
-                    )
+                    ),
                 )
             INSTRUCTION_UPDATE_PROPS -> {
               val props = objBuffer[j++]
@@ -249,7 +249,12 @@ internal class IntBufferBatchMountItem(
                   if (FabricUIManager.IS_DEVELOPMENT_ENVIRONMENT) (props?.toString() ?: "<null>")
                   else "<hidden>"
               s.append(
-                  String.format(Locale.ROOT, "UPDATE PROPS [%d]: %s\n", intBuffer[i++], propsString)
+                  String.format(
+                      Locale.ROOT,
+                      "UPDATE PROPS [%d]: %s\n",
+                      intBuffer[i++],
+                      propsString,
+                  ),
               )
             }
             INSTRUCTION_UPDATE_STATE -> {
@@ -258,7 +263,12 @@ internal class IntBufferBatchMountItem(
                   if (FabricUIManager.IS_DEVELOPMENT_ENVIRONMENT) (state?.toString() ?: "<null>")
                   else "<hidden>"
               s.append(
-                  String.format(Locale.ROOT, "UPDATE STATE [%d]: %s\n", intBuffer[i++], stateString)
+                  String.format(
+                      Locale.ROOT,
+                      "UPDATE STATE [%d]: %s\n",
+                      intBuffer[i++],
+                      stateString,
+                  ),
               )
             }
             INSTRUCTION_UPDATE_LAYOUT ->
@@ -275,7 +285,7 @@ internal class IntBufferBatchMountItem(
                         intBuffer[i++],
                         intBuffer[i++],
                         intBuffer[i++],
-                    )
+                    ),
                 )
             INSTRUCTION_UPDATE_PADDING ->
                 s.append(
@@ -287,7 +297,7 @@ internal class IntBufferBatchMountItem(
                         intBuffer[i++],
                         intBuffer[i++],
                         intBuffer[i++],
-                    )
+                    ),
                 )
             INSTRUCTION_UPDATE_OVERFLOW_INSET ->
                 s.append(
@@ -299,7 +309,7 @@ internal class IntBufferBatchMountItem(
                         intBuffer[i++],
                         intBuffer[i++],
                         intBuffer[i++],
-                    )
+                    ),
                 )
             INSTRUCTION_UPDATE_EVENT_EMITTER -> {
               j += 1
@@ -308,7 +318,7 @@ internal class IntBufferBatchMountItem(
             else -> {
               FLog.e(TAG, "String so far: $s")
               throw IllegalArgumentException(
-                  "Invalid type argument to IntBufferBatchMountItem: $type at index: $i"
+                  "Invalid type argument to IntBufferBatchMountItem: $type at index: $i",
               )
             }
           }

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

@@ -0,0 +1,33 @@
+/*
+ * 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.proguard.annotations.DoNotStripAny
+import com.facebook.react.fabric.FabricUIManagerBinding
+import com.facebook.react.fabric.mounting.MountingManager
+
+/**
+ * Pull model mount item. Enqueued (on the commit thread) when C++ notifies that a transaction is
+ * available for a surface. When it executes on the UI thread it asks C++ to pull the surface's
+ * pending transaction and apply it synchronously, so the diff + batch construction happens on the
+ * UI thread instead of the commit thread (matching iOS).
+ */
+@DoNotStripAny
+internal class PullTransactionMountItem(
+    private val surfaceId: Int,
+    private val binding: FabricUIManagerBinding,
+) : MountItem {
+
+  override fun execute(mountingManager: MountingManager) {
+    binding.pullAndExecuteTransaction(surfaceId)
+  }
+
+  override fun getSurfaceId(): Int = surfaceId
+
+  override fun toString(): String = "PullTransactionMountItem [surfaceId: $surfaceId]"
+}

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

@@ -28,14 +28,8 @@ internal class SynchronousMountItem(private val reactTag: Int, private val props
   }
 
   override fun toString(): String {
-    // NOTE: Intentionally written as an early return rather than assigning the result of an
-    // `if` expression to a local `val`. The latter shape triggers a crash in the Android lint
-    // K2 UAST analyzer (resolveSyntheticJavaPropertyAccessorCall) while resolving the local
-    // variable's `if`-expression initializer, failing `lintVitalAnalyzeRelease`.
-    if (!IS_DEVELOPMENT_ENVIRONMENT) {
-      return "SYNC UPDATE PROPS [$reactTag]: <hidden>"
-    }
-    return "SYNC UPDATE PROPS [$reactTag]: ${props.toHashMap()}"
+    val propsString = if (IS_DEVELOPMENT_ENVIRONMENT) props.toHashMap().toString() else "<hidden>"
+    return "SYNC UPDATE PROPS [$reactTag]: $propsString"
   }
 
   override fun getSurfaceId(): Int = View.NO_ID

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

@@ -33,7 +33,9 @@ internal fun interface ReactJsExceptionHandler {
     val stack: List<StackFrame>
     val id: Int
     val isFatal: Boolean
-    val extraData: ReadableMap
+    // Nullable: native marshalling may fail or the error may carry none (see
+    // JReactExceptionManager.cpp).
+    val extraData: ReadableMap?
   }
 
   @DoNotStripAny
@@ -53,7 +55,7 @@ internal fun interface ReactJsExceptionHandler {
       override val stack: ArrayList<ProcessedErrorStackFrameImpl>,
       override val id: Int,
       override val isFatal: Boolean,
-      override val extraData: ReadableNativeMap,
+      override val extraData: ReadableNativeMap?,
   ) : ProcessedError
 
   fun reportJsException(errorMap: ProcessedError)