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

package/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

@@ -80,7 +80,6 @@ import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.SurfaceDelegateFactory;
 import com.facebook.react.common.annotations.StableReactNativeAPI;
 import com.facebook.react.common.annotations.VisibleForTesting;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.devsupport.DevSupportManagerFactory;
 import com.facebook.react.devsupport.InspectorFlags;
 import com.facebook.react.devsupport.ReactInstanceDevHelper;
@@ -93,6 +92,7 @@ import com.facebook.react.devsupport.interfaces.DevSupportManager.PausedInDebugg
 import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
 import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager;
 import com.facebook.react.devsupport.interfaces.RedBoxHandler;
+import com.facebook.react.interfaces.TaskInterface;
 import com.facebook.react.internal.AndroidChoreographerProvider;
 import com.facebook.react.internal.ChoreographerProvider;
 import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
@@ -355,7 +355,7 @@ public class ReactInstanceManager {
         Activity currentActivity = getCurrentActivity();
         if (currentActivity != null) {
           ReactRootView rootView = new ReactRootView(currentActivity);
-          boolean isFabric = ReactFeatureFlags.enableFabricRenderer;
+          boolean isFabric = ReactNativeFeatureFlags.enableFabricRenderer();
           rootView.setIsFabric(isFabric);
           rootView.startReactApplication(ReactInstanceManager.this, appKey, new Bundle());
           return rootView;
@@ -370,6 +370,23 @@ public class ReactInstanceManager {
           ((ReactRootView) rootView).unmountReactApplication();
         }
       }
+
+      @Override
+      public void reload(String s) {
+        // no-op not implemented for Bridge Mode
+      }
+
+      @Override
+      public TaskInterface<Boolean> loadBundle(JSBundleLoader bundleLoader) {
+        // no-op not implemented for Bridge Mode
+        return null;
+      }
+
+      @Override
+      public ReactContext getCurrentReactContext() {
+        // no-op not implemented for Bridge Mode
+        return null;
+      }
     };
   }
 
@@ -793,12 +810,10 @@ public class ReactInstanceManager {
     synchronized (mAttachedReactRoots) {
       synchronized (mReactContextLock) {
         if (mCurrentReactContext != null) {
-          if (ReactNativeFeatureFlags.destroyFabricSurfacesInReactInstanceManager()) {
-            for (ReactRoot reactRoot : mAttachedReactRoots) {
-              // Fabric surfaces must be cleaned up when React Native is destroyed.
-              if (reactRoot.getUIManagerType() == UIManagerType.FABRIC) {
-                detachRootViewFromInstance(reactRoot, mCurrentReactContext);
-              }
+          for (ReactRoot reactRoot : mAttachedReactRoots) {
+            // Fabric surfaces must be cleaned up when React Native is destroyed.
+            if (reactRoot.getUIManagerType() == UIManagerType.FABRIC) {
+              detachRootViewFromInstance(reactRoot, mCurrentReactContext);
             }
           }
 
@@ -943,22 +958,23 @@ public class ReactInstanceManager {
   @ThreadConfined(UI)
   public void attachRootView(ReactRoot reactRoot) {
     UiThreadUtil.assertOnUiThread();
+    synchronized (mAttachedReactRoots) {
+      // Calling clearReactRoot is necessary to initialize the Id on reactRoot
+      // This is necessary independently if the RN Bridge has been initialized or not.
+      // Ideally reactRoot should be initialized with id == NO_ID
+      if (mAttachedReactRoots.add(reactRoot)) {
+        clearReactRoot(reactRoot);
+      } else {
+        FLog.e(ReactConstants.TAG, "ReactRoot was attached multiple times");
+      }
 
-    // Calling clearReactRoot is necessary to initialize the Id on reactRoot
-    // This is necessary independently if the RN Bridge has been initialized or not.
-    // Ideally reactRoot should be initialized with id == NO_ID
-    if (mAttachedReactRoots.add(reactRoot)) {
-      clearReactRoot(reactRoot);
-    } else {
-      FLog.e(ReactConstants.TAG, "ReactRoot was attached multiple times");
-    }
-
-    // If react context is being created in the background, JS application will be started
-    // automatically when creation completes, as reactRoot is part of the attached
-    // reactRoot list.
-    ReactContext currentContext = getCurrentReactContext();
-    if (mCreateReactContextThread == null && currentContext != null) {
-      attachRootViewToInstance(reactRoot);
+      // If react context is being created in the background, JS application will be started
+      // automatically when creation completes, as reactRoot is part of the attached
+      // reactRoot list.
+      ReactContext currentContext = getCurrentReactContext();
+      if (mCreateReactContextThread == null && currentContext != null) {
+        attachRootViewToInstance(reactRoot);
+      }
     }
   }
 
@@ -1393,14 +1409,14 @@ public class ReactInstanceManager {
             new RuntimeException(
                 "detachRootViewFromInstance called with ReactRootView with invalid id"));
       }
+
+      clearReactRoot(reactRoot);
     } else {
       reactContext
           .getCatalystInstance()
           .getJSModule(AppRegistry.class)
           .unmountApplicationComponentAtRootTag(reactRoot.getRootViewTag());
     }
-
-    clearReactRoot(reactRoot);
   }
 
   @ThreadConfined(UI)
@@ -1470,7 +1486,7 @@ public class ReactInstanceManager {
     // architecture so it will always be there.
     catalystInstance.getRuntimeScheduler();
 
-    if (ReactFeatureFlags.useTurboModules && mTMMDelegateBuilder != null) {
+    if (ReactNativeFeatureFlags.useTurboModules() && mTMMDelegateBuilder != null) {
       TurboModuleManagerDelegate tmmDelegate =
           mTMMDelegateBuilder
               .setPackages(mPackages)
@@ -1520,7 +1536,7 @@ public class ReactInstanceManager {
   private NativeModuleRegistry processPackages(
       ReactApplicationContext reactContext, List<ReactPackage> packages) {
     NativeModuleRegistryBuilder nativeModuleRegistryBuilder =
-        new NativeModuleRegistryBuilder(reactContext, this);
+        new NativeModuleRegistryBuilder(reactContext);
 
     ReactMarker.logMarker(PROCESS_PACKAGES_START);
 

package/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java

@@ -8,7 +8,6 @@
 package com.facebook.react;
 
 import static com.facebook.react.ReactInstanceManager.initializeSoLoaderIfNecessary;
-import static com.facebook.react.modules.systeminfo.AndroidInfoHelpers.getFriendlyDeviceName;
 
 import android.app.Activity;
 import android.app.Application;
@@ -37,6 +36,7 @@ import com.facebook.react.internal.ChoreographerProvider;
 import com.facebook.react.jscexecutor.JSCExecutor;
 import com.facebook.react.jscexecutor.JSCExecutorFactory;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
+import com.facebook.react.modules.systeminfo.AndroidInfoHelpers;
 import com.facebook.react.packagerconnection.RequestHandler;
 import java.util.ArrayList;
 import java.util.List;
@@ -339,7 +339,7 @@ public class ReactInstanceManagerBuilder {
     // We use the name of the device and the app for debugging & metrics
     //noinspection ConstantConditions
     String appName = mApplication.getPackageName();
-    String deviceName = getFriendlyDeviceName();
+    String deviceName = AndroidInfoHelpers.getFriendlyDeviceName();
 
     return new ReactInstanceManager(
         mApplication,

package/ReactAndroid/src/main/java/com/facebook/react/ReactPackage.kt

@@ -0,0 +1,53 @@
+/*
+ * 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
+
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.common.annotations.DeprecatedInNewArchitecture
+import com.facebook.react.common.annotations.StableReactNativeAPI
+import com.facebook.react.uimanager.UIManagerModule
+import com.facebook.react.uimanager.ViewManager
+
+/**
+ * Main interface for providing additional capabilities to the catalyst framework by couple of
+ * different means:
+ * 1. Registering new native modules
+ * 1. Registering new JS modules that may be accessed from native modules or from other parts of the
+ *    native code (requiring JS modules from the package doesn't mean it will automatically be
+ *    included as a part of the JS bundle, so there should be a corresponding piece of code on JS
+ *    side that will require implementation of that JS module so that it gets bundled)
+ * 1. Registering custom native views (view managers) and custom event types
+ * 1. Registering natively packaged assets/resources (e.g. images) exposed to JS
+ *
+ * TODO(6788500, 6788507): Implement support for adding custom views, events and resources
+ */
+public interface ReactPackage {
+
+  /**
+   * @param reactContext react application context that can be used to create modules
+   * @return list of native modules to register with the newly created catalyst instance This method
+   *   is deprecated in the new Architecture of React Native.
+   */
+  @DeprecatedInNewArchitecture(message = "Migrate to BaseReactPackage and implement getModule")
+  public fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule>
+
+  /** @return a list of view managers that should be registered with [UIManagerModule] */
+  public fun createViewManagers(
+      reactContext: ReactApplicationContext
+  ): List<ViewManager<in Nothing, in Nothing>>
+
+  /**
+   * Given a module name, it returns an instance of [NativeModule] for the name
+   *
+   * @param name name of the Native Module
+   * @param reactContext [ReactApplicationContext] context for this
+   */
+  @StableReactNativeAPI
+  public fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? = null
+}

package/ReactAndroid/src/main/java/com/facebook/react/ReactPackageHelper.kt

@@ -0,0 +1,43 @@
+/*
+ * 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
+
+import com.facebook.common.logging.FLog
+import com.facebook.react.bridge.ModuleHolder
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.common.ReactConstants
+
+internal object ReactPackageHelper {
+
+  /**
+   * A helper method to iterate over a list of Native Modules and convert them to an iterable.
+   *
+   * @param reactPackage
+   * @param reactApplicationContext
+   * @param reactInstanceManager
+   * @return
+   */
+  fun getNativeModuleIterator(
+      reactPackage: ReactPackage,
+      reactApplicationContext: ReactApplicationContext
+  ): Iterable<ModuleHolder> {
+    FLog.d(
+        ReactConstants.TAG,
+        "${reactPackage.javaClass.simpleName} is not a LazyReactPackage, falling back to old version.")
+    val nativeModules = reactPackage.createNativeModules(reactApplicationContext)
+    return Iterable {
+      object : Iterator<ModuleHolder> {
+        var position = 0
+
+        override fun next(): ModuleHolder = ModuleHolder(nativeModules[position++])
+
+        override fun hasNext(): Boolean = position < nativeModules.size
+      }
+    }
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/ReactPackageTurboModuleManagerDelegate.java

@@ -14,7 +14,6 @@ import com.facebook.react.bridge.CxxModuleWrapper;
 import com.facebook.react.bridge.ModuleSpec;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.internal.turbomodule.core.TurboModuleManagerDelegate;
 import com.facebook.react.module.annotations.ReactModule;
@@ -37,7 +36,7 @@ public abstract class ReactPackageTurboModuleManagerDelegate extends TurboModule
       new HashMap<>();
 
   private final boolean mShouldEnableLegacyModuleInterop =
-      ReactFeatureFlags.enableBridgelessArchitecture
+      ReactNativeFeatureFlags.enableBridgelessArchitecture()
           && ReactNativeFeatureFlags.useTurboModuleInterop();
 
   // Lazy Props

package/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java

@@ -8,13 +8,16 @@
 package com.facebook.react;
 
 import static com.facebook.infer.annotation.ThreadConfined.UI;
+import static com.facebook.react.uimanager.BlendModeHelper.needsIsolatedLayer;
 import static com.facebook.react.uimanager.common.UIManagerType.DEFAULT;
 import static com.facebook.react.uimanager.common.UIManagerType.FABRIC;
 import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
 
 import android.content.Context;
+import android.graphics.BlendMode;
 import android.graphics.Canvas;
 import android.graphics.Insets;
+import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.os.Build;
@@ -65,6 +68,7 @@ import com.facebook.react.uimanager.RootView;
 import com.facebook.react.uimanager.RootViewUtil;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.common.UIManagerType;
+import com.facebook.react.uimanager.common.ViewUtil;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.modules.core.ReactAndroidHWInputDeviceHelper;
 import com.facebook.systrace.Systrace;
@@ -291,6 +295,30 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
     }
   }
 
+  @Override
+  protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
+
+    BlendMode mixBlendMode = null;
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
+        && ViewUtil.getUIManagerType(this) == UIManagerType.FABRIC
+        && needsIsolatedLayer(this)) {
+      mixBlendMode = (BlendMode) child.getTag(R.id.mix_blend_mode);
+      if (mixBlendMode != null) {
+        Paint p = new Paint();
+        p.setBlendMode(mixBlendMode);
+        canvas.saveLayer(0, 0, getWidth(), getHeight(), p);
+      }
+    }
+
+    boolean result = super.drawChild(canvas, child, drawingTime);
+
+    if (mixBlendMode != null) {
+      canvas.restore();
+    }
+
+    return result;
+  }
+
   @Override
   public boolean dispatchKeyEvent(KeyEvent ev) {
     if (!hasActiveReactContext() || !isViewAttachedToReactInstance()) {

package/ReactAndroid/src/main/java/com/facebook/react/TurboReactPackage.kt

@@ -0,0 +1,13 @@
+/*
+ * 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
+
+@Deprecated(
+    message = "Use BaseReactPackage instead",
+    replaceWith = ReplaceWith(expression = "BaseReactPackage"))
+public abstract class TurboReactPackage : BaseReactPackage() {}

package/ReactAndroid/src/main/java/com/facebook/react/{ViewManagerOnDemandReactPackage.java → ViewManagerOnDemandReactPackage.kt}

@@ -5,24 +5,24 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react;
+package com.facebook.react
 
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.uimanager.ViewManager;
-import java.util.Collection;
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ViewManager
 
 public interface ViewManagerOnDemandReactPackage {
   /**
    * Provides a list of names of ViewManagers with which these modules can be accessed from JS.
    * Typically, this is ViewManager.getName().
    */
-  Collection<String> getViewManagerNames(ReactApplicationContext reactContext);
+  public fun getViewManagerNames(reactContext: ReactApplicationContext): Collection<String>
 
   /**
    * Creates and returns a ViewManager with a specific name {@param viewManagerName}. It's up to an
    * implementing package how to interpret the name.
    */
-  @Nullable
-  ViewManager createViewManager(ReactApplicationContext reactContext, String viewManagerName);
+  public fun createViewManager(
+      reactContext: ReactApplicationContext,
+      viewManagerName: String
+  ): ViewManager<in Nothing, in Nothing>?
 }

package/ReactAndroid/src/main/java/com/facebook/react/animated/EventAnimationDriver.kt

@@ -24,6 +24,7 @@ internal class EventAnimationDriver(
     private val eventPath: List<String>,
     @JvmField internal var valueNode: ValueAnimatedNode
 ) : RCTModernEventEmitter {
+  @Deprecated("Deprecated in Java")
   override fun receiveEvent(targetReactTag: Int, eventName: String, event: WritableMap?) =
       receiveEvent(-1, targetReactTag, eventName, event)
 
@@ -36,6 +37,7 @@ internal class EventAnimationDriver(
       // We assume this event can't be coalesced. `customCoalesceKey` has no meaning in Fabric.
       receiveEvent(surfaceId, targetTag, eventName, false, 0, event, EventCategoryDef.UNSPECIFIED)
 
+  @Deprecated("Deprecated in Java")
   override fun receiveTouches(
       eventName: String,
       touches: WritableArray,
@@ -44,6 +46,7 @@ internal class EventAnimationDriver(
     throw UnsupportedOperationException("receiveTouches is not support by native animated events")
   }
 
+  @Deprecated("Deprecated in Java")
   override fun receiveTouches(touchEvent: TouchEvent) {
     throw UnsupportedOperationException("receiveTouches is not support by native animated events")
   }

package/ReactAndroid/src/main/java/com/facebook/react/animated/InterpolationAnimatedNode.kt

@@ -130,7 +130,7 @@ public class InterpolationAnimatedNode(config: ReadableMap) : ValueAnimatedNode(
       val outputRange = arrayOfNulls<DoubleArray>(size)
 
       // Match the first pattern into a List, since we don't know its length yet
-      var m = numericPattern.matcher(array.getString(0))
+      var m = numericPattern.matcher(array.getString(0) ?: "")
       val firstOutputRange: MutableList<Double> = ArrayList()
       while (m.find()) {
         firstOutputRange.add(m.group().toDouble())
@@ -143,7 +143,7 @@ public class InterpolationAnimatedNode(config: ReadableMap) : ValueAnimatedNode(
       for (i in 1 until size) {
         val outputArr = DoubleArray(firstOutputRangeArr.size)
         var j = 0
-        m = numericPattern.matcher(array.getString(i))
+        m = numericPattern.matcher(array.getString(i) ?: "")
         while (m.find() && j < firstOutputRangeArr.size) {
           outputArr[j++] = m.group().toDouble()
         }

package/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.java

@@ -26,7 +26,6 @@ import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.common.UIManagerType;
-import com.facebook.react.uimanager.common.ViewUtil;
 import com.facebook.react.uimanager.events.Event;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.uimanager.events.EventDispatcherListener;
@@ -92,7 +91,8 @@ public class NativeAnimatedNodesManager implements EventDispatcherListener {
 
     UIManager uiManager = UIManagerHelper.getUIManager(mReactApplicationContext, uiManagerType);
     if (uiManager != null) {
-      uiManager.<EventDispatcher>getEventDispatcher().addListener(this);
+      EventDispatcher eventDispatcher = (EventDispatcher) uiManager.getEventDispatcher();
+      eventDispatcher.addListener(this);
       if (uiManagerType == UIManagerType.FABRIC) {
         mEventListenerInitializedForFabric = true;
       } else {
@@ -557,7 +557,6 @@ public class NativeAnimatedNodesManager implements EventDispatcherListener {
   @UiThread
   public void removeAnimatedEventFromView(
       int viewTag, String eventHandlerName, int animatedValueTag) {
-
     String eventName = normalizeEventName(eventHandlerName);
 
     ListIterator<EventAnimationDriver> it = mEventDrivers.listIterator();
@@ -570,6 +569,11 @@ public class NativeAnimatedNodesManager implements EventDispatcherListener {
         break;
       }
     }
+
+    if (eventName.equals("topScroll")) {
+      // Handle the custom topScrollEnded event sent by the ScrollViews when the user stops dragging
+      removeAnimatedEventFromView(viewTag, "topScrollEnded", animatedValueTag);
+    }
   }
 
   @Override
@@ -591,36 +595,24 @@ public class NativeAnimatedNodesManager implements EventDispatcherListener {
 
   @UiThread
   private void handleEvent(Event event) {
-    if (!mEventDrivers.isEmpty()) {
-      // If the event has a different name in native convert it to it's JS name.
-      // TODO T64216139 Remove dependency of UIManagerModule when the Constants are not in Native
-      // anymore
-      if (mReactApplicationContext == null) {
-        return;
-      }
-      UIManager uiManager =
-          UIManagerHelper.getUIManager(
-              mReactApplicationContext,
-              ViewUtil.getUIManagerType(event.getViewTag(), event.getSurfaceId()));
-      if (uiManager == null) {
-        return;
-      }
+    if (mEventDrivers.isEmpty()) {
+      return;
+    }
 
-      boolean foundAtLeastOneDriver = false;
-      Event.EventAnimationDriverMatchSpec matchSpec = event.getEventAnimationDriverMatchSpec();
-      for (EventAnimationDriver driver : mEventDrivers) {
-        if (matchSpec.match(driver.viewTag, driver.eventName)) {
-          foundAtLeastOneDriver = true;
-          stopAnimationsForNode(driver.valueNode);
-          event.dispatchModern(driver);
-          mRunUpdateNodeList.add(driver.valueNode);
-        }
+    boolean foundAtLeastOneDriver = false;
+    Event.EventAnimationDriverMatchSpec matchSpec = event.getEventAnimationDriverMatchSpec();
+    for (EventAnimationDriver driver : mEventDrivers) {
+      if (matchSpec.match(driver.viewTag, driver.eventName)) {
+        foundAtLeastOneDriver = true;
+        stopAnimationsForNode(driver.valueNode);
+        event.dispatchModern(driver);
+        mRunUpdateNodeList.add(driver.valueNode);
       }
+    }
 
-      if (foundAtLeastOneDriver) {
-        updateNodes(mRunUpdateNodeList);
-        mRunUpdateNodeList.clear();
-      }
+    if (foundAtLeastOneDriver) {
+      updateNodes(mRunUpdateNodeList);
+      mRunUpdateNodeList.clear();
     }
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/animated/ObjectAnimatedNode.kt

@@ -45,7 +45,9 @@ internal class ObjectAnimatedNode(
         ReadableType.String -> result.pushString(source.getString(i))
         ReadableType.Map -> {
           val map = source.getMap(i)
-          if (map.hasKey(NODE_TAG_KEY) && map.getType(NODE_TAG_KEY) == ReadableType.Number) {
+          if (map != null &&
+              map.hasKey(NODE_TAG_KEY) &&
+              map.getType(NODE_TAG_KEY) == ReadableType.Number) {
             val node = nativeAnimatedNodesManager.getNodeById(map.getInt(NODE_TAG_KEY))
             requireNotNull(node) { "Mapped value node does not exist" }
             if (node is ValueAnimatedNode) {

package/ReactAndroid/src/main/java/com/facebook/react/animated/TransformAnimatedNode.kt

@@ -19,15 +19,15 @@ internal class TransformAnimatedNode(
     config: ReadableMap,
     private val nativeAnimatedNodesManager: NativeAnimatedNodesManager
 ) : AnimatedNode() {
-  private val transformConfigs: MutableList<TransformConfig>
+  private val transformConfigs: List<TransformConfig>
 
   init {
     val transforms = config.getArray("transforms")
     transformConfigs =
-        if (transforms == null) mutableListOf()
+        if (transforms == null) emptyList()
         else
-            MutableList<TransformConfig>(transforms.size()) { i ->
-              val transformConfigMap = transforms.getMap(i)
+            List<TransformConfig>(transforms.size()) { i ->
+              val transformConfigMap = checkNotNull(transforms.getMap(i))
               val property = transformConfigMap.getString("property")
               val type = transformConfigMap.getString("type")
               if (type == "animated") {
@@ -46,7 +46,7 @@ internal class TransformAnimatedNode(
 
   public fun collectViewUpdates(propsMap: JavaOnlyMap) {
     val transforms =
-        MutableList<JavaOnlyMap>(transformConfigs.size) { i ->
+        List<JavaOnlyMap>(transformConfigs.size) { i ->
           val transformConfig = transformConfigs[i]
           val transform =
               if (transformConfig is AnimatedTransformConfig) {

package/ReactAndroid/src/main/java/com/facebook/react/bridge/AssertionException.kt

@@ -0,0 +1,14 @@
+/*
+ * 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.bridge
+
+/**
+ * Like [AssertionError] but extends RuntimeException so that it may be caught by a
+ * [JSExceptionHandler]. See that class for more details. Used in conjunction with [SoftAssertions].
+ */
+public class AssertionException(message: String) : RuntimeException(message)

package/ReactAndroid/src/main/java/com/facebook/react/bridge/BridgeReactContext.java

@@ -21,6 +21,7 @@ import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.annotations.DeprecatedInNewArchitecture;
 import com.facebook.react.common.annotations.FrameworkAPI;
 import com.facebook.react.common.annotations.UnstableReactNativeAPI;
+import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder;
 import java.util.Collection;
 
@@ -31,6 +32,7 @@ import java.util.Collection;
  * BridgeReactContext.
  */
 @DeprecatedInNewArchitecture
+@VisibleForTesting
 public class BridgeReactContext extends ReactApplicationContext {
   @DoNotStrip
   public interface RCTDeviceEventEmitter extends JavaScriptModule {

package/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.kt

@@ -9,7 +9,6 @@ package com.facebook.react.bridge
 
 import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.queue.ReactQueueConfiguration
-import com.facebook.react.common.annotations.DeprecatedInNewArchitecture
 import com.facebook.react.common.annotations.VisibleForTesting
 import com.facebook.react.internal.turbomodule.core.interfaces.TurboModuleRegistry
 import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder
@@ -20,6 +19,9 @@ import com.facebook.react.turbomodule.core.interfaces.NativeMethodCallInvokerHol
  * the invocation of JavaScript methods and lets a set of Java APIs be invocable from JavaScript as
  * well.
  */
+@Deprecated(
+    message =
+        "This class is deprecated, please to migrate to new architecture using [com.facebook.react.defaults.DefaultReactHost] instead.")
 @DoNotStrip
 public interface CatalystInstance : MemoryPressureListener, JSInstance, JSBundleLoaderDelegate {
   public fun runJSBundle()
@@ -117,21 +119,18 @@ public interface CatalystInstance : MemoryPressureListener, JSInstance, JSBundle
    */
   public val nativeMethodCallInvokerHolder: NativeMethodCallInvokerHolder
 
-  @DeprecatedInNewArchitecture(
+  @Deprecated(
       message =
-          "This method will be deprecated later as part of Stable APIs with bridge removal and not" +
-              " encouraged usage.")
+          "This method is deprecated, please to migrate to new architecture using [com.facebook.react.defaults.DefaultReactHost] instead.")
   public fun setTurboModuleRegistry(turboModuleRegistry: TurboModuleRegistry)
 
-  @DeprecatedInNewArchitecture(
+  @Deprecated(
       message =
-          "This method will be deprecated later as part of Stable APIs with bridge removal and not" +
-              " encouraged usage.")
+          "This method is deprecated, please to migrate to new architecture using [com.facebook.react.defaults.DefaultReactHost] instead.")
   public fun setFabricUIManager(fabricUIManager: UIManager)
 
-  @DeprecatedInNewArchitecture(
+  @Deprecated(
       message =
-          "This method will be deprecated later as part of Stable APIs with bridge removal and not" +
-              " encouraged usage.")
+          "This method is deprecated, please to migrate to new architecture using [com.facebook.react.defaults.DefaultReactHost] instead.")
   public fun getFabricUIManager(): UIManager?
 }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java

@@ -26,7 +26,7 @@ import com.facebook.react.bridge.queue.ReactQueueConfigurationImpl;
 import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.annotations.VisibleForTesting;
-import com.facebook.react.config.ReactFeatureFlags;
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.internal.turbomodule.core.interfaces.TurboModuleRegistry;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.turbomodule.core.CallInvokerHolderImpl;
@@ -459,7 +459,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
   }
 
   private TurboModuleRegistry getTurboModuleRegistry() {
-    if (ReactFeatureFlags.useTurboModules) {
+    if (ReactNativeFeatureFlags.useTurboModules()) {
       return Assertions.assertNotNull(
           mTurboModuleRegistry,
           "TurboModules are enabled, but mTurboModuleRegistry hasn't been set.");