react-native-tvos 0.80.1-0 → 0.81.0-0

package/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactNativeHost.kt

@@ -5,11 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+@file:Suppress("DEPRECATION")
+
 package com.facebook.react.defaults
 
 import android.app.Application
 import android.content.Context
-import com.facebook.react.JSEngineResolutionAlgorithm
 import com.facebook.react.ReactHost
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackageTurboModuleManagerDelegate
@@ -18,7 +19,6 @@ import com.facebook.react.bridge.UIManagerProvider
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.fabric.ComponentFactory
 import com.facebook.react.fabric.FabricUIManagerProviderImpl
-import com.facebook.react.runtime.JSCInstance
 import com.facebook.react.runtime.JSRuntimeFactory
 import com.facebook.react.runtime.hermes.HermesInstance
 import com.facebook.react.uimanager.ViewManagerRegistry
@@ -72,13 +72,6 @@ protected constructor(
         null
       }
 
-  override fun getJSEngineResolutionAlgorithm(): JSEngineResolutionAlgorithm? =
-      when (isHermesEnabled) {
-        true -> JSEngineResolutionAlgorithm.HERMES
-        false -> JSEngineResolutionAlgorithm.JSC
-        null -> null
-      }
-
   override fun clear() {
     super.clear()
     DefaultReactHost.invalidate()
@@ -99,11 +92,13 @@ protected constructor(
    * Returns whether the user wants to use Hermes.
    *
    * If true, the app will load the Hermes engine, and fail if not found. If false, the app will
-   * load the JSC engine, and fail if not found. If null, the app will attempt to load JSC first and
-   * fallback to Hermes if not found.
+   * load the JSC engine, and fail if not found.
    */
-  protected open val isHermesEnabled: Boolean?
-    get() = null
+  @Deprecated(
+      "Setting isHermesEnabled inside `ReactNativeHost` is deprecated and this field will be ignored. If this field is set to true, you can safely remove it. If this field is set to false, please follow the setup on https://github.com/react-native-community/javascriptcore to continue using JSC",
+      ReplaceWith(""))
+  protected open val isHermesEnabled: Boolean
+    get() = true
 
   /**
    * Converts this [ReactNativeHost] (bridge-mode) to a [ReactHost] (bridgeless-mode).
@@ -115,8 +110,7 @@ protected constructor(
       context: Context,
       jsRuntimeFactory: JSRuntimeFactory? = null
   ): ReactHost {
-    val concreteJSRuntimeFactory =
-        jsRuntimeFactory ?: if (isHermesEnabled == false) JSCInstance() else HermesInstance()
+    val concreteJSRuntimeFactory = jsRuntimeFactory ?: HermesInstance()
     return DefaultReactHost.getDefaultReactHost(
         context,
         packages,

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.kt

@@ -45,7 +45,7 @@ import com.facebook.react.packagerconnection.RequestHandler
  * manager is responsible for enabling/disabling dev support in case when app is backgrounded or
  * when all the views has been detached from the instance (through `setDevSupportEnabled` method).
  */
-@LegacyArchitecture
+@LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR)
 public class BridgeDevSupportManager(
     applicationContext: Context,
     reactInstanceManagerHelper: ReactInstanceDevHelper,
@@ -92,7 +92,7 @@ public class BridgeDevSupportManager(
 
   private companion object {
     init {
-      assertLegacyArchitecture("BridgeDevSupportManager", LegacyArchitectureLogLevel.WARNING)
+      assertLegacyArchitecture("BridgeDevSupportManager", LegacyArchitectureLogLevel.ERROR)
     }
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevLoadingViewImplementation.kt

@@ -107,9 +107,6 @@ public class DefaultDevLoadingViewImplementation(
     }
   }
 
-  private val context: Context?
-    get() = reactInstanceDevHelper.currentActivity
-
   public companion object {
     private var isEnabled = true
 

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevSupportManagerFactory.kt

@@ -101,13 +101,9 @@ internal class DefaultDevSupportManagerFactory : DevSupportManagerFactory {
       pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager?,
       useDevSupport: Boolean
   ): DevSupportManager =
-      if (!useDevSupport) {
-        if (ReactBuildConfig.UNSTABLE_ENABLE_FUSEBOX_RELEASE) {
-          PerftestDevSupportManager(applicationContext)
-        } else {
-          ReleaseDevSupportManager()
-        }
-      } else {
+      if (ReactBuildConfig.UNSTABLE_ENABLE_FUSEBOX_RELEASE) {
+        PerftestDevSupportManager(applicationContext)
+      } else if (useDevSupport) {
         BridgelessDevSupportManager(
             applicationContext,
             reactInstanceManagerHelper,
@@ -120,6 +116,8 @@ internal class DefaultDevSupportManagerFactory : DevSupportManagerFactory {
             surfaceDelegateFactory,
             devLoadingViewManager,
             pausedInDebuggerOverlayManager)
+      } else {
+        ReleaseDevSupportManager()
       }
 
   private companion object {

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevInternalSettings.kt

@@ -75,10 +75,6 @@ internal class DevInternalSettings(applicationContext: Context, private val list
 
   override var isDeviceDebugEnabled: Boolean = ReactBuildConfig.DEBUG
 
-  @Deprecated(
-      "Legacy sampling profiler is no longer supported - This field will be removed in React Native 0.77")
-  override var isStartSamplingProfilerOnInit: Boolean = false
-
   // Not supported.
   override fun addMenuItem(title: String) = Unit
 

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.kt

@@ -465,9 +465,7 @@ public abstract class DevSupportManagerBase(
     devOptionsDialog?.show()
 
     val reactContext = currentReactContext
-    if (reactContext != null) {
-      reactContext.getJSModule(RCTNativeAppEventEmitter::class.java).emit("RCTDevMenuShown", null)
-    }
+    reactContext?.getJSModule(RCTNativeAppEventEmitter::class.java)?.emit("RCTDevMenuShown", null)
   }
 
   override fun onNewReactContextCreated(reactContext: ReactContext) {

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DoubleTapReloadRecognizer.kt

@@ -14,8 +14,9 @@ import android.view.View
 import android.widget.EditText
 
 /**
- * A class allows recognizing double key tap of "R", used to reload JS in [AbstractReactActivity],
- * [RedBoxDialogSurfaceDelegate] and [com.facebook.react.ReactActivity].
+ * A class allows recognizing double key tap of "R", used to reload JS in
+ * [com.facebook.react.ReactDelegate], [RedBoxDialogSurfaceDelegate] and
+ * [com.facebook.react.ReactActivity].
  */
 public class DoubleTapReloadRecognizer {
   private var doRefresh = false

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/FpsView.kt

@@ -33,7 +33,7 @@ internal class FpsView(reactContext: ReactContext?) : FrameLayout(reactContext!!
     textView = findViewById<View>(R.id.fps_text) as TextView
     frameCallback = FpsDebugFrameCallback(reactContext!!)
     fpsMonitorRunnable = FPSMonitorRunnable()
-    setCurrentFPS(0.0, 0.0, 0, 0)
+    setCurrentFPS(0.0, 0.0, 0, 0, frameCallback.isRunningOnFabric)
   }
 
   override fun onAttachedToWindow() {
@@ -53,16 +53,21 @@ internal class FpsView(reactContext: ReactContext?) : FrameLayout(reactContext!!
       currentFPS: Double,
       currentJSFPS: Double,
       droppedUIFrames: Int,
-      total4PlusFrameStutters: Int
+      total4PlusFrameStutters: Int,
+      runningOnFabric: Boolean
   ) {
-    val fpsString =
+    var fpsString =
         String.format(
             Locale.US,
-            "UI: %.1f fps\n%d dropped so far\n%d stutters (4+) so far\nJS: %.1f fps",
+            "UI: %.1f fps\n%d dropped so far\n%d stutters (4+) so far",
             currentFPS,
             droppedUIFrames,
-            total4PlusFrameStutters,
-            currentJSFPS)
+            total4PlusFrameStutters)
+    if (!runningOnFabric) {
+      // The JS FPS is only relevant for the legacy architecture, as Fabric we don't use
+      // BridgeIdleDebugListener to track JS frame drops.
+      fpsString += String.format(Locale.US, "\nJS: %.1f fps", currentJSFPS)
+    }
     textView.text = fpsString
     FLog.d(ReactConstants.TAG, fpsString)
   }
@@ -80,7 +85,11 @@ internal class FpsView(reactContext: ReactContext?) : FrameLayout(reactContext!!
       totalFramesDropped += frameCallback.expectedNumFrames - frameCallback.numFrames
       total4PlusFrameStutters += frameCallback.get4PlusFrameStutters()
       setCurrentFPS(
-          frameCallback.fps, frameCallback.jsFPS, totalFramesDropped, total4PlusFrameStutters)
+          frameCallback.fps,
+          frameCallback.jsFPS,
+          totalFramesDropped,
+          total4PlusFrameStutters,
+          frameCallback.isRunningOnFabric)
       frameCallback.reset()
       postDelayed(this, UPDATE_INTERVAL_MS.toLong())
     }

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.kt

@@ -76,7 +76,7 @@ internal class PackagerStatusCheck {
                 if (PACKAGER_OK_STATUS != bodyString) {
                   FLog.e(
                       ReactConstants.TAG,
-                      "Got unexpected response from packager when requesting status: ${bodyString}")
+                      "Got unexpected response from packager when requesting status: $bodyString")
                   callback.onPackagerStatusFetched(false)
                   return
                 }

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.kt

@@ -223,7 +223,7 @@ public object StackTraceHelper {
    * @property file the file this stack frame points to. JS traces return the full path to the file
    *   here, while Java traces only return the file name (the path is not known).
    * @property fileName the name of the file this frame points to. For JS traces this is different
-   *   from [.getFile] in that it only returns the file name, not the full path. For Java traces
+   *   from [getFile] in that it only returns the file name, not the full path. For Java traces
    *   there is no difference.
    * @property method the name of the method this frame points to.
    * @property line the line number this frame points to in the file returned by [file]

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

@@ -10,7 +10,7 @@ package com.facebook.react.devsupport.interfaces
 /**
  * Callback class for custom options that may appear in [DevSupportManager] developer options menu.
  * In case when option registered for this handler is selected from the menu, the instance method
- * [.onOptionSelected] will be triggered.
+ * [onOptionSelected] will be triggered.
  */
 public fun interface DevOptionHandler {
   /**

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

@@ -16,7 +16,7 @@ import android.text.SpannedString
  * implementation should be passed by setRedBoxHandler in ReactInstanceManager.
  */
 public interface RedBoxHandler {
-  /** Callback interface for [.reportRedbox]. */
+  /** Callback interface for [reportRedbox]. */
   public interface ReportCompletedListener {
     public fun onReportSuccess(spannedString: SpannedString?)
 

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

@@ -22,16 +22,16 @@ public interface StackFrame {
   /** Get the name of the method this frame points to. */
   public val method: String
 
-  /** Get the line number this frame points to in the file returned by [.getFile]. */
+  /** Get the line number this frame points to in the file returned by [getFile]. */
   public val line: Int
 
-  /** Get the column this frame points to in the file returned by [.getFile]. */
+  /** Get the column this frame points to in the file returned by [getFile]. */
   public val column: Int
 
   /**
    * Get just the name of the file this frame points to.
    *
-   * For JS traces this is different from [.getFile] in that it only returns the file name, not the
+   * For JS traces this is different from [getFile] in that it only returns the file name, not the
    * full path. For Java traces there is no difference.
    */
   public val fileName: String?

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

@@ -22,14 +22,13 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Point;
 import android.os.SystemClock;
-import android.text.Layout;
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
 import androidx.annotation.AnyThread;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 import androidx.core.util.Preconditions;
-import androidx.core.view.ViewCompat.FocusRealDirection;
+import androidx.core.view.ViewCompat.FocusDirection;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.infer.annotation.Nullsafe;
@@ -51,7 +50,6 @@ import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.UIManagerListener;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.annotations.UnstableReactNativeAPI;
 import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.common.mapbuffer.ReadableMapBuffer;
@@ -81,6 +79,7 @@ import com.facebook.react.uimanager.RootViewUtil;
 import com.facebook.react.uimanager.StateWrapper;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIManagerHelper;
+import com.facebook.react.uimanager.ViewManager;
 import com.facebook.react.uimanager.ViewManagerPropertyUpdater;
 import com.facebook.react.uimanager.ViewManagerRegistry;
 import com.facebook.react.uimanager.events.BatchEventDispatchedListener;
@@ -90,6 +89,8 @@ import com.facebook.react.uimanager.events.FabricEventDispatcher;
 import com.facebook.react.uimanager.events.RCTEventEmitter;
 import com.facebook.react.uimanager.events.SynchronousEventReceiver;
 import com.facebook.react.views.text.PreparedLayout;
+import com.facebook.react.views.text.ReactTextViewManager;
+import com.facebook.react.views.text.ReactTextViewManagerCallback;
 import com.facebook.react.views.text.TextLayoutManager;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -275,7 +276,7 @@ public class FabricUIManager
    *     view, returns null if no view could be found
    */
   public @Nullable Integer findNextFocusableElement(
-      int parentTag, int focusedTag, @FocusRealDirection int direction) {
+      int parentTag, int focusedTag, @FocusDirection int direction) {
     if (mBinding == null) {
       return null;
     }
@@ -295,6 +296,12 @@ public class FabricUIManager
       case View.FOCUS_LEFT:
         generalizedDirection = 3;
         break;
+      case View.FOCUS_FORWARD:
+        generalizedDirection = 4;
+        break;
+      case View.FOCUS_BACKWARD:
+        generalizedDirection = 5;
+        break;
       default:
         return null;
     }
@@ -358,7 +365,10 @@ public class FabricUIManager
       final SurfaceHandlerBinding surfaceHandler,
       final Context context,
       final @Nullable View rootView) {
-    final int rootTag = ReactRootViewTagGenerator.getNextRootViewTag();
+    final int rootTag =
+        rootView instanceof ReactRoot
+            ? ((ReactRoot) rootView).getRootViewTag()
+            : ReactRootViewTagGenerator.getNextRootViewTag();
 
     ThemedReactContext reactContext =
         new ThemedReactContext(
@@ -520,40 +530,20 @@ public class FabricUIManager
       ReadableMapBuffer paragraphAttributes,
       float width,
       float height) {
+    ViewManager textViewManager = mViewManagerRegistry.get(ReactTextViewManager.REACT_CLASS);
+
     return (NativeArray)
         TextLayoutManager.measureLines(
             mReactApplicationContext,
             attributedString,
             paragraphAttributes,
             PixelUtil.toPixelFromDIP(width),
-            PixelUtil.toPixelFromDIP(height));
+            PixelUtil.toPixelFromDIP(height),
+            textViewManager instanceof ReactTextViewManagerCallback
+                ? (ReactTextViewManagerCallback) textViewManager
+                : null);
   }
 
-  @SuppressWarnings("unused")
-  private long measure(
-      int rootTag,
-      String componentName,
-      ReadableMap localData,
-      ReadableMap props,
-      ReadableMap state,
-      float minWidth,
-      float maxWidth,
-      float minHeight,
-      float maxHeight) {
-    return measure(
-        rootTag,
-        componentName,
-        localData,
-        props,
-        state,
-        minWidth,
-        maxWidth,
-        minHeight,
-        maxHeight,
-        null);
-  }
-
-  @SuppressWarnings("unused")
   public int getColor(int surfaceId, String[] resourcePaths) {
     ThemedReactContext context =
         mMountingManager.getSurfaceManagerEnforced(surfaceId, "getColor").getContext();
@@ -571,8 +561,13 @@ public class FabricUIManager
     return 0;
   }
 
-  @SuppressWarnings("unused")
-  private long measure(
+  /**
+   * Calls the measure() function on a specific view manager. This may be used for implementing
+   * custom Fabric ShadowNodes
+   */
+  @AnyThread
+  @ThreadConfined(ANY)
+  public long measure(
       int surfaceId,
       String componentName,
       ReadableMap localData,
@@ -581,9 +576,7 @@ public class FabricUIManager
       float minWidth,
       float maxWidth,
       float minHeight,
-      float maxHeight,
-      @Nullable float[] attachmentsPositions) {
-
+      float maxHeight) {
     ReactContext context;
     if (surfaceId > 0) {
       SurfaceMountingManager surfaceMountingManager =
@@ -608,16 +601,16 @@ public class FabricUIManager
         getYogaMeasureMode(minWidth, maxWidth),
         getYogaSize(minHeight, maxHeight),
         getYogaMeasureMode(minHeight, maxHeight),
-        attachmentsPositions);
+        null);
   }
 
-  @SuppressWarnings("unused")
-  private long measureMapBuffer(
+  @AnyThread
+  @ThreadConfined(ANY)
+  @UnstableReactNativeAPI
+  public long measureText(
       int surfaceId,
-      String componentName,
-      ReadableMapBuffer localData,
-      ReadableMapBuffer props,
-      @Nullable ReadableMapBuffer state,
+      ReadableMapBuffer attributedString,
+      ReadableMapBuffer paragraphAttributes,
       float minWidth,
       float maxWidth,
       float minHeight,
@@ -627,7 +620,7 @@ public class FabricUIManager
     ReactContext context;
     if (surfaceId > 0) {
       SurfaceMountingManager surfaceMountingManager =
-          mMountingManager.getSurfaceManagerEnforced(surfaceId, "measure");
+          mMountingManager.getSurfaceManagerEnforced(surfaceId, "measureText");
       if (surfaceMountingManager.isStopped()) {
         return 0;
       }
@@ -638,49 +631,53 @@ public class FabricUIManager
       context = mReactApplicationContext;
     }
 
-    // TODO: replace ReadableNativeMap -> ReadableMapBuffer
-    return mMountingManager.measureMapBuffer(
+    ViewManager textViewManager = mViewManagerRegistry.get(ReactTextViewManager.REACT_CLASS);
+
+    return TextLayoutManager.measureText(
         context,
-        componentName,
-        localData,
-        props,
-        state,
+        attributedString,
+        paragraphAttributes,
         getYogaSize(minWidth, maxWidth),
         getYogaMeasureMode(minWidth, maxWidth),
         getYogaSize(minHeight, maxHeight),
         getYogaMeasureMode(minHeight, maxHeight),
+        textViewManager instanceof ReactTextViewManagerCallback
+            ? (ReactTextViewManagerCallback) textViewManager
+            : null,
         attachmentsPositions);
   }
 
   @AnyThread
   @ThreadConfined(ANY)
-  public PreparedLayout prepareLayout(
+  @UnstableReactNativeAPI
+  public PreparedLayout prepareTextLayout(
       int surfaceId,
       ReadableMapBuffer attributedString,
       ReadableMapBuffer paragraphAttributes,
+      float minWidth,
       float maxWidth,
+      float minHeight,
       float maxHeight) {
     SurfaceMountingManager surfaceMountingManager =
-        mMountingManager.getSurfaceManagerEnforced(surfaceId, "prepareLayout");
-    Layout layout =
-        TextLayoutManager.createLayout(
-            Preconditions.checkNotNull(surfaceMountingManager.getContext()),
-            attributedString,
-            paragraphAttributes,
-            PixelUtil.toPixelFromDIP(maxWidth),
-            PixelUtil.toPixelFromDIP(maxHeight),
-            null /* T219881133: Migrate away from ReactTextViewManagerCallback */);
-
-    int maximumNumberOfLines =
-        paragraphAttributes.contains(TextLayoutManager.PA_KEY_MAX_NUMBER_OF_LINES)
-            ? paragraphAttributes.getInt(TextLayoutManager.PA_KEY_MAX_NUMBER_OF_LINES)
-            : ReactConstants.UNSET;
+        mMountingManager.getSurfaceManagerEnforced(surfaceId, "prepareTextLayout");
+    ViewManager textViewManager = mViewManagerRegistry.get(ReactTextViewManager.REACT_CLASS);
 
-    return new PreparedLayout(layout, maximumNumberOfLines);
+    return TextLayoutManager.createPreparedLayout(
+        Preconditions.checkNotNull(surfaceMountingManager.getContext()),
+        attributedString,
+        paragraphAttributes,
+        getYogaSize(minWidth, maxWidth),
+        getYogaMeasureMode(minWidth, maxWidth),
+        getYogaSize(minHeight, maxHeight),
+        getYogaMeasureMode(minHeight, maxHeight),
+        textViewManager instanceof ReactTextViewManagerCallback
+            ? (ReactTextViewManagerCallback) textViewManager
+            : null);
   }
 
   @AnyThread
   @ThreadConfined(ANY)
+  @UnstableReactNativeAPI
   public float[] measurePreparedLayout(
       PreparedLayout preparedLayout,
       float minWidth,
@@ -1325,7 +1322,7 @@ public class FabricUIManager
     @UiThread
     @ThreadConfined(UI)
     @Override
-    public void willMountItems(@Nullable List<MountItem> mountItems) {
+    public void willMountItems(@Nullable List<? extends MountItem> mountItems) {
       for (UIManagerListener listener : mListeners) {
         listener.willMountItems(FabricUIManager.this);
       }
@@ -1334,7 +1331,7 @@ public class FabricUIManager
     @UiThread
     @ThreadConfined(UI)
     @Override
-    public void didMountItems(@Nullable List<MountItem> mountItems) {
+    public void didMountItems(@Nullable List<? extends MountItem> mountItems) {
       for (UIManagerListener listener : mListeners) {
         listener.didMountItems(FabricUIManager.this);
       }

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

@@ -37,11 +37,12 @@ internal class LongStreamingStats {
     }
 
     len++
-    if (len == 1) {
-      average = n.toDouble()
-    } else {
-      average = (average / (len / (len - 1))) + (n / len)
-    }
+    average =
+        if (len == 1) {
+          n.toDouble()
+        } else {
+          (average / (len / (len - 1))) + (n / len)
+        }
 
     max = (if (n > max) n else max)
   }

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

@@ -18,7 +18,7 @@ import com.facebook.react.uimanager.events.BatchEventDispatchedListener
  */
 @DoNotStrip
 @SuppressLint("MissingNativeLoadLibrary")
-internal final class EventBeatManager() : HybridClassBase(), BatchEventDispatchedListener {
+internal class EventBeatManager : HybridClassBase(), BatchEventDispatchedListener {
   init {
     initHybrid()
   }

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

@@ -16,7 +16,9 @@ import com.facebook.react.uimanager.events.RCTModernEventEmitter
 import com.facebook.systrace.Systrace
 
 internal class FabricEventEmitter(private val uiManager: FabricUIManager) : RCTModernEventEmitter {
-  @Deprecated("Deprecated in Java")
+  @Deprecated(
+      "Use receiveEvent with surfaceId instead.",
+      ReplaceWith("receiveEvent(surfaceId, targetTag, eventName, params)"))
   override fun receiveEvent(targetTag: Int, eventName: String, params: WritableMap?): Unit {
     receiveEvent(ViewUtil.NO_SURFACE_ID, targetTag, eventName, params)
   }
@@ -47,7 +49,7 @@ internal class FabricEventEmitter(private val uiManager: FabricUIManager) : RCTM
     }
   }
 
-  /** Touches are dispatched by [.receiveTouches] */
+  /** Touches are dispatched by [receiveTouches] */
   @Deprecated("Deprecated in Java")
   override fun receiveTouches(
       eventName: String,

package/ReactAndroid/src/main/java/com/facebook/react/fabric/internal/interop/InteropUiBlockListener.kt

@@ -9,6 +9,7 @@
 
 package com.facebook.react.fabric.internal.interop
 
+import androidx.annotation.VisibleForTesting
 import com.facebook.react.bridge.UIManager
 import com.facebook.react.bridge.UIManagerListener
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
@@ -24,9 +25,9 @@ import com.facebook.react.fabric.interop.UIBlockViewResolver
  */
 @OptIn(UnstableReactNativeAPI::class)
 internal class InteropUIBlockListener : UIManagerListener {
+  @VisibleForTesting internal val beforeUIBlocks: MutableList<UIBlock> = mutableListOf()
 
-  internal val beforeUIBlocks: MutableList<UIBlock> = mutableListOf()
-  internal val afterUIBlocks: MutableList<UIBlock> = mutableListOf()
+  @VisibleForTesting internal val afterUIBlocks: MutableList<UIBlock> = mutableListOf()
 
   @Synchronized
   fun prependUIBlock(block: UIBlock) {
@@ -39,27 +40,37 @@ internal class InteropUIBlockListener : UIManagerListener {
   }
 
   override fun willMountItems(uiManager: UIManager) {
-    if (beforeUIBlocks.isEmpty()) {
+    if (uiManager !is UIBlockViewResolver) {
       return
     }
-    beforeUIBlocks.forEach {
-      if (uiManager is UIBlockViewResolver) {
-        it.execute(uiManager)
-      }
-    }
-    beforeUIBlocks.clear()
+
+    // avoid ConcurrentModificationException by iterating over a copy
+    val blocks =
+        synchronized(this) {
+          if (beforeUIBlocks.isEmpty()) {
+            return
+          }
+          beforeUIBlocks.toList().also { beforeUIBlocks.clear() }
+        }
+
+    blocks.forEach { block -> block.execute(uiManager) }
   }
 
   override fun didMountItems(uiManager: UIManager) {
-    if (afterUIBlocks.isEmpty()) {
+    if (uiManager !is UIBlockViewResolver) {
       return
     }
-    afterUIBlocks.forEach {
-      if (uiManager is UIBlockViewResolver) {
-        it.execute(uiManager)
-      }
-    }
-    afterUIBlocks.clear()
+
+    // avoid ConcurrentModificationException by iterating over a copy
+    val blocks =
+        synchronized(this) {
+          if (afterUIBlocks.isEmpty()) {
+            return
+          }
+          afterUIBlocks.toList().also { afterUIBlocks.clear() }
+        }
+
+    blocks.forEach { block -> block.execute(uiManager) }
   }
 
   override fun didDispatchMountItems(uiManager: UIManager) = didMountItems(uiManager)