react-native 0.74.0-rc.3 → 0.74.0-rc.5

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

@@ -26,8 +26,8 @@ class JSIModuleRegistry {
     return Assertions.assertNotNull(jsiModuleHolder.getJSIModule());
   }
 
-  public void registerModules(List<JSIModuleSpec> jsiModules) {
-    for (JSIModuleSpec spec : jsiModules) {
+  public <T extends JSIModule> void registerModules(List<JSIModuleSpec<T>> jsiModules) {
+    for (JSIModuleSpec<T> spec : jsiModules) {
       mModules.put(spec.getJSIModuleType(), new JSIModuleHolder(spec));
     }
   }

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

@@ -7,7 +7,7 @@
 
 package com.facebook.react.bridge;
 
-interface NativeArrayInterface {
+public interface NativeArrayInterface {
   @Override
   String toString();
 }

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

@@ -57,6 +57,7 @@ import com.facebook.react.fabric.events.EventEmitterWrapper;
 import com.facebook.react.fabric.events.FabricEventEmitter;
 import com.facebook.react.fabric.internal.interop.InteropUIBlockListener;
 import com.facebook.react.fabric.interop.UIBlock;
+import com.facebook.react.fabric.interop.UIBlockViewResolver;
 import com.facebook.react.fabric.mounting.MountItemDispatcher;
 import com.facebook.react.fabric.mounting.MountingManager;
 import com.facebook.react.fabric.mounting.SurfaceMountingManager;
@@ -99,7 +100,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  */
 @SuppressLint("MissingNativeLoadLibrary")
 @DoNotStripAny
-public class FabricUIManager implements UIManager, LifecycleEventListener {
+public class FabricUIManager implements UIManager, LifecycleEventListener, UIBlockViewResolver {
   public static final String TAG = FabricUIManager.class.getSimpleName();
 
   // The IS_DEVELOPMENT_ENVIRONMENT variable is used to log extra data when running fabric in a

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

@@ -37,6 +37,9 @@ internal class InteropUIBlockListener : UIManagerListener {
   }
 
   override fun willMountItems(uiManager: UIManager) {
+    if (beforeUIBlocks.isEmpty()) {
+      return
+    }
     beforeUIBlocks.forEach {
       if (uiManager is UIBlockViewResolver) {
         it.execute(uiManager)
@@ -46,6 +49,9 @@ internal class InteropUIBlockListener : UIManagerListener {
   }
 
   override fun didMountItems(uiManager: UIManager) {
+    if (afterUIBlocks.isEmpty()) {
+      return
+    }
     afterUIBlocks.forEach {
       if (uiManager is UIBlockViewResolver) {
         it.execute(uiManager)
@@ -54,9 +60,9 @@ internal class InteropUIBlockListener : UIManagerListener {
     afterUIBlocks.clear()
   }
 
-  override fun willDispatchViewUpdates(uiManager: UIManager) = Unit
+  override fun didDispatchMountItems(uiManager: UIManager) = didMountItems(uiManager)
 
-  override fun didDispatchMountItems(uiManager: UIManager) = Unit
+  override fun willDispatchViewUpdates(uiManager: UIManager) = willMountItems(uiManager)
 
   override fun didScheduleMountItems(uiManager: UIManager) = Unit
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -18,5 +18,5 @@ public class ReactNativeVersion {
       "major", 0,
       "minor", 74,
       "patch", 0,
-      "prerelease", "rc.3");
+      "prerelease", "rc.5");
 }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt

@@ -0,0 +1,201 @@
+/*
+ * 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.runtime
+
+import android.content.res.AssetManager
+import com.facebook.proguard.annotations.DoNotStrip
+import com.facebook.react.bridge.CatalystInstance
+import com.facebook.react.bridge.JSIModule
+import com.facebook.react.bridge.JSIModuleSpec
+import com.facebook.react.bridge.JSIModuleType
+import com.facebook.react.bridge.JavaScriptContextHolder
+import com.facebook.react.bridge.JavaScriptModule
+import com.facebook.react.bridge.NativeArray
+import com.facebook.react.bridge.NativeArrayInterface
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.NativeModuleRegistry
+import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener
+import com.facebook.react.bridge.RuntimeExecutor
+import com.facebook.react.bridge.RuntimeScheduler
+import com.facebook.react.bridge.UIManager
+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
+import com.facebook.react.turbomodule.core.interfaces.NativeMethodCallInvokerHolder
+
+@DoNotStrip
+@DeprecatedInNewArchitecture
+public class BridgelessCatalystInstance(private val reactHost: ReactHostImpl) : CatalystInstance {
+
+  override fun handleMemoryPressure(level: Int) {
+    throw UnsupportedOperationException("Unimplemented method 'handleMemoryPressure'")
+  }
+
+  override fun loadScriptFromAssets(
+      assetManager: AssetManager,
+      assetURL: String,
+      loadSynchronously: Boolean
+  ) {
+    throw UnsupportedOperationException("Unimplemented method 'loadScriptFromAssets'")
+  }
+
+  override fun loadScriptFromFile(fileName: String, sourceURL: String, loadSynchronously: Boolean) {
+    throw UnsupportedOperationException("Unimplemented method 'loadScriptFromFile'")
+  }
+
+  override fun loadSplitBundleFromFile(fileName: String, sourceURL: String) {
+    throw UnsupportedOperationException("Unimplemented method 'loadSplitBundleFromFile'")
+  }
+
+  override fun setSourceURLs(deviceURL: String, remoteURL: String) {
+    throw UnsupportedOperationException("Unimplemented method 'setSourceURLs'")
+  }
+
+  override fun runJSBundle() {
+    throw UnsupportedOperationException("Unimplemented method 'runJSBundle'")
+  }
+
+  override fun hasRunJSBundle(): Boolean {
+    throw UnsupportedOperationException("Unimplemented method 'hasRunJSBundle'")
+  }
+
+  override fun getSourceURL(): String? {
+    throw UnsupportedOperationException("Unimplemented method 'getSourceURL'")
+  }
+
+  @DoNotStrip
+  override fun invokeCallback(callbackID: Int, arguments: NativeArrayInterface) {
+    throw UnsupportedOperationException("Unimplemented method 'invokeCallback'")
+  }
+
+  override fun callFunction(module: String, method: String, arguments: NativeArray) {
+    throw UnsupportedOperationException("Unimplemented method 'callFunction'")
+  }
+
+  override fun destroy() {
+    throw UnsupportedOperationException("Unimplemented method 'destroy'")
+  }
+
+  override fun isDestroyed(): Boolean {
+    throw UnsupportedOperationException("Unimplemented method 'isDestroyed'")
+  }
+
+  @VisibleForTesting
+  override fun initialize() {
+    throw UnsupportedOperationException("Unimplemented method 'initialize'")
+  }
+
+  override fun getReactQueueConfiguration(): ReactQueueConfiguration {
+    throw UnsupportedOperationException("Unimplemented method 'getReactQueueConfiguration'")
+  }
+
+  override fun <T : JavaScriptModule> getJSModule(jsInterface: Class<T>): T {
+    throw UnsupportedOperationException("Unimplemented method 'getJSModule'")
+  }
+
+  override fun <T : NativeModule> hasNativeModule(nativeModuleInterface: Class<T>): Boolean {
+    throw UnsupportedOperationException("Unimplemented method 'hasNativeModule'")
+  }
+
+  override fun <T : NativeModule> getNativeModule(nativeModuleInterface: Class<T>): T? {
+    throw UnsupportedOperationException("Unimplemented method 'getNativeModule'")
+  }
+
+  override fun getNativeModule(moduleName: String): NativeModule? {
+    throw UnsupportedOperationException("Unimplemented method 'getNativeModule'")
+  }
+
+  @Deprecated(
+      message =
+          "getJSIModule(JSIModuleType moduleType) is deprecated and will be deleted in the future. Please use ReactInstanceEventListener to subscribe for react instance events instead.")
+  override fun getJSIModule(moduleType: JSIModuleType): JSIModule {
+    throw UnsupportedOperationException("Unimplemented method 'getJSIModule'")
+  }
+
+  override fun getNativeModules(): Collection<NativeModule> {
+    throw UnsupportedOperationException("Unimplemented method 'getNativeModules'")
+  }
+
+  override fun extendNativeModules(modules: NativeModuleRegistry) {
+    throw UnsupportedOperationException("Unimplemented method 'extendNativeModules'")
+  }
+
+  override fun addBridgeIdleDebugListener(listener: NotThreadSafeBridgeIdleDebugListener) {
+    throw UnsupportedOperationException("Unimplemented method 'addBridgeIdleDebugListener'")
+  }
+
+  override fun removeBridgeIdleDebugListener(listener: NotThreadSafeBridgeIdleDebugListener) {
+    throw UnsupportedOperationException("Unimplemented method 'removeBridgeIdleDebugListener'")
+  }
+
+  override fun registerSegment(segmentId: Int, path: String) {
+    throw UnsupportedOperationException("Unimplemented method 'registerSegment'")
+  }
+
+  @VisibleForTesting
+  override fun setGlobalVariable(propName: String, jsonValue: String) {
+    throw UnsupportedOperationException("Unimplemented method 'setGlobalVariable'")
+  }
+
+  @Deprecated(message = "This API is unsupported in the New Architecture.")
+  override fun getJavaScriptContextHolder(): JavaScriptContextHolder {
+    throw UnsupportedOperationException("Unimplemented method 'getJavaScriptContextHolder'")
+  }
+
+  override fun getRuntimeExecutor(): RuntimeExecutor {
+    throw UnsupportedOperationException("Unimplemented method 'getRuntimeExecutor'")
+  }
+
+  override fun getRuntimeScheduler(): RuntimeScheduler {
+    throw UnsupportedOperationException("Unimplemented method 'getRuntimeScheduler'")
+  }
+
+  @Deprecated(message = "This API is unsupported in the New Architecture.")
+  override fun <T : JSIModule> addJSIModules(jsiModules: List<JSIModuleSpec<T>>) {
+    throw UnsupportedOperationException("Unimplemented method 'addJSIModules'")
+  }
+
+  override fun getJSCallInvokerHolder(): CallInvokerHolder? {
+    return reactHost.getJSCallInvokerHolder()
+  }
+
+  override fun getNativeMethodCallInvokerHolder(): NativeMethodCallInvokerHolder {
+    throw UnsupportedOperationException("Unimplemented method 'getNativeMethodCallInvokerHolder'")
+  }
+
+  @Deprecated(
+      message =
+          "setTurboModuleManager(JSIModule getter) is deprecated and will be deleted in the future. Please use setTurboModuleRegistry(TurboModuleRegistry turboModuleRegistry) instead.",
+      replaceWith = ReplaceWith("setTurboModuleRegistry(turboModuleRegistry)"))
+  override fun setTurboModuleManager(getter: JSIModule) {
+    throw UnsupportedOperationException("Unimplemented method 'setTurboModuleManager'")
+  }
+
+  @DeprecatedInNewArchitecture(
+      message =
+          "This method will be deprecated later as part of Stable APIs with bridge removal and not encouraged usage.")
+  override fun setTurboModuleRegistry(turboModuleRegistry: TurboModuleRegistry) {
+    throw UnsupportedOperationException("Unimplemented method 'setTurboModuleRegistry'")
+  }
+
+  @DeprecatedInNewArchitecture(
+      message =
+          "This method will be deprecated later as part of Stable APIs with bridge removal and not encouraged usage.")
+  override fun setFabricUIManager(fabricUIManager: UIManager) {
+    throw UnsupportedOperationException("Unimplemented method 'setFabricUIManager'")
+  }
+
+  @DeprecatedInNewArchitecture(
+      message =
+          "This method will be deprecated later as part of Stable APIs with bridge removal and not encouraged usage.")
+  override fun getFabricUIManager(): UIManager {
+    throw UnsupportedOperationException("Unimplemented method 'getFabricUIManager'")
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.java

@@ -8,6 +8,7 @@
 package com.facebook.react.runtime;
 
 import android.content.Context;
+import android.util.Log;
 import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
@@ -18,8 +19,6 @@ import com.facebook.react.bridge.JavaScriptModuleRegistry;
 import com.facebook.react.bridge.NativeArray;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactNoCrashBridgeNotAllowedSoftException;
-import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.RuntimeExecutor;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.WritableNativeArray;
@@ -84,11 +83,10 @@ class BridgelessReactContext extends ReactApplicationContext implements EventDis
 
   @Override
   public CatalystInstance getCatalystInstance() {
-    ReactSoftExceptionLogger.logSoftExceptionVerbose(
+    Log.w(
         TAG,
-        new ReactNoCrashBridgeNotAllowedSoftException(
-            "getCatalystInstance() cannot be called when the bridge is disabled"));
-    throw new UnsupportedOperationException("There is no Catalyst instance in bridgeless mode.");
+        "[WARNING] Bridgeless doesn't support CatalystInstance. Accessing an API that's not part of the new architecture is not encouraged usage.");
+    return new BridgelessCatalystInstance(mReactHost);
   }
 
   @Override

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java

@@ -16,6 +16,8 @@ import static java.lang.Boolean.TRUE;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
+import android.nfc.NfcAdapter;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -55,11 +57,13 @@ import com.facebook.react.fabric.FabricUIManager;
 import com.facebook.react.interfaces.TaskInterface;
 import com.facebook.react.interfaces.exceptionmanager.ReactJsExceptionHandler;
 import com.facebook.react.interfaces.fabric.ReactSurface;
+import com.facebook.react.modules.appearance.AppearanceModule;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.runtime.internal.bolts.Continuation;
 import com.facebook.react.runtime.internal.bolts.Task;
 import com.facebook.react.runtime.internal.bolts.TaskCompletionSource;
+import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.BlackHoleEventDispatcher;
 import com.facebook.react.uimanager.events.EventDispatcher;
@@ -601,6 +605,20 @@ public class ReactHostImpl implements ReactHost {
     return null;
   }
 
+  /* package */
+  @Nullable
+  CallInvokerHolder getJSCallInvokerHolder() {
+    final ReactInstance reactInstance = mReactInstanceTaskRef.get().getResult();
+    if (reactInstance != null) {
+      return reactInstance.getJSCallInvokerHolder();
+    }
+    ReactSoftExceptionLogger.logSoftException(
+        TAG,
+        new ReactNoCrashSoftException(
+            "Tried to get JSCallInvokerHolder while instance is not ready"));
+    return null;
+  }
+
   /**
    * To be called when the host activity receives an activity result.
    *
@@ -632,6 +650,67 @@ public class ReactHostImpl implements ReactHost {
             "Tried to access onActivityResult while context is not ready"));
   }
 
+  /* To be called when focus has changed for the hosting window. */
+  @ThreadConfined(UI)
+  @Override
+  public void onWindowFocusChange(boolean hasFocus) {
+    final String method = "onWindowFocusChange(hasFocus = \"" + hasFocus + "\")";
+    log(method);
+
+    ReactContext currentContext = getCurrentReactContext();
+    if (currentContext != null) {
+      currentContext.onWindowFocusChange(hasFocus);
+    }
+    ReactSoftExceptionLogger.logSoftException(
+        TAG,
+        new ReactNoCrashSoftException(
+            "Tried to access onWindowFocusChange while context is not ready"));
+  }
+
+  /* This method will give JS the opportunity to receive intents via Linking.
+   *
+   * @param intent The incoming intent
+   */
+  @ThreadConfined(UI)
+  @Override
+  public void onNewIntent(Intent intent) {
+    log("onNewIntent()");
+
+    ReactContext currentContext = getCurrentReactContext();
+    if (currentContext != null) {
+      String action = intent.getAction();
+      Uri uri = intent.getData();
+
+      if (uri != null
+          && (Intent.ACTION_VIEW.equals(action)
+              || NfcAdapter.ACTION_NDEF_DISCOVERED.equals(action))) {
+        DeviceEventManagerModule deviceEventManagerModule =
+            currentContext.getNativeModule(DeviceEventManagerModule.class);
+        if (deviceEventManagerModule != null) {
+          deviceEventManagerModule.emitNewIntentReceived(uri);
+        }
+      }
+      currentContext.onNewIntent(getCurrentActivity(), intent);
+    }
+    ReactSoftExceptionLogger.logSoftException(
+        TAG,
+        new ReactNoCrashSoftException("Tried to access onNewIntent while context is not ready"));
+  }
+
+  @ThreadConfined(UI)
+  @Override
+  public void onConfigurationChanged(Context updatedContext) {
+    ReactContext currentReactContext = getCurrentReactContext();
+    if (currentReactContext != null) {
+      AppearanceModule appearanceModule =
+          currentReactContext.getNativeModule(AppearanceModule.class);
+
+      if (appearanceModule != null) {
+        appearanceModule.onConfigurationChanged(updatedContext);
+      }
+    }
+  }
+
   @Nullable
   JavaScriptContextHolder getJavaScriptContextHolder() {
     final ReactInstance reactInstance = mReactInstanceTaskRef.get().getResult();

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.java

@@ -475,7 +475,7 @@ final class ReactInstance {
 
   private native void loadJSBundleFromAssets(AssetManager assetManager, String assetURL);
 
-  private native CallInvokerHolderImpl getJSCallInvokerHolder();
+  /* package */ native CallInvokerHolderImpl getJSCallInvokerHolder();
 
   private native NativeMethodCallInvokerHolderImpl getNativeMethodCallInvokerHolder();
 

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java

@@ -53,16 +53,32 @@ public final class ViewManagerRegistry implements ComponentCallbacks2 {
    * @return the {@link ViewManager} registered to the className received as a parameter
    */
   public synchronized ViewManager get(String className) {
+    // 1. Try to get the manager without the prefix.
     ViewManager viewManager = mViewManagers.get(className);
     if (viewManager != null) {
       return viewManager;
     }
+
+    // 2. Try to get the manager with the RCT prefix.
+    String rctViewManagerName = "RCT" + className;
+    viewManager = mViewManagers.get(rctViewManagerName);
+    if (viewManager != null) {
+      return viewManager;
+    }
     if (mViewManagerResolver != null) {
+      // 1. Try to get the manager without the prefix.
       viewManager = getViewManagerFromResolver(className);
       if (viewManager != null) return viewManager;
+
+      // 2. Try to get the manager with the RCT prefix.
+      viewManager = getViewManagerFromResolver(rctViewManagerName);
+      if (viewManager != null) return viewManager;
+
       throw new IllegalViewOperationException(
-          "ViewManagerResolver returned null for "
+          "ViewManagerResolver returned null for either "
               + className
+              + " or "
+              + rctViewManagerName
               + ", existing names are: "
               + mViewManagerResolver.getViewManagerNames());
     }

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java

@@ -807,7 +807,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
       // more information.
 
       if (!mScroller.isFinished() && mScroller.getCurrX() != mScroller.getFinalX()) {
-        int scrollRange = computeHorizontalScrollRange() - getWidth();
+        int scrollRange = Math.max(computeHorizontalScrollRange() - getWidth(), 0);
         if (scrollX >= scrollRange) {
           mScroller.abortAnimation();
           scrollX = scrollRange;

package/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java

@@ -62,6 +62,8 @@ public class TextAttributeProps implements EffectiveTextAttributeProvider {
   public static final short TA_KEY_ROLE = 26;
   public static final short TA_KEY_TEXT_TRANSFORM = 27;
 
+  public static final int UNSET = -1;
+
   private static final String PROP_SHADOW_OFFSET = "textShadowOffset";
   private static final String PROP_SHADOW_OFFSET_WIDTH = "width";
   private static final String PROP_SHADOW_OFFSET_HEIGHT = "height";

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -18,7 +18,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 74;
   int32_t Patch = 0;
-  std::string_view Prerelease = "rc.3";
+  std::string_view Prerelease = "rc.5";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImagePrimitivesConversions.h

@@ -48,10 +48,10 @@ inline static NSURL *NSURLFromImageSource(const facebook::react::ImageSource &im
 {
   // `NSURL` has a history of crashing with bad input, so let's be safe.
   @try {
-    NSString *urlString = [NSString stringWithCString:imageSource.uri.c_str() encoding:NSASCIIStringEncoding];
+    NSString *urlString = [NSString stringWithUTF8String:imageSource.uri.c_str()];
 
     if (!imageSource.bundle.empty()) {
-      NSString *bundle = [NSString stringWithCString:imageSource.bundle.c_str() encoding:NSASCIIStringEncoding];
+      NSString *bundle = [NSString stringWithUTF8String:imageSource.bundle.c_str()];
       urlString = [NSString stringWithFormat:@"%@.bundle/%@", bundle, urlString];
     }
 

package/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.mm

@@ -6,7 +6,6 @@
  */
 
 #import "RCTInstance.h"
-#import <React/RCTBridgeProxy.h>
 
 #import <memory>
 
@@ -16,6 +15,8 @@
 #import <React/RCTBridge.h>
 #import <React/RCTBridgeModule.h>
 #import <React/RCTBridgeModuleDecorator.h>
+#import <React/RCTBridgeProxy+Cxx.h>
+#import <React/RCTBridgeProxy.h>
 #import <React/RCTComponentViewFactory.h>
 #import <React/RCTConstants.h>
 #import <React/RCTCxxUtils.h>
@@ -256,6 +257,7 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
   RuntimeExecutor bufferedRuntimeExecutor = _reactInstance->getBufferedRuntimeExecutor();
   timerManager->setRuntimeExecutor(bufferedRuntimeExecutor);
 
+  auto jsCallInvoker = make_shared<BridgelessJSCallInvoker>(bufferedRuntimeExecutor);
   RCTBridgeProxy *bridgeProxy =
       [[RCTBridgeProxy alloc] initWithViewRegistry:_bridgeModuleDecorator.viewRegistry_DEPRECATED
           moduleRegistry:_bridgeModuleDecorator.moduleRegistry
@@ -274,14 +276,14 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
             }
           }
           runtime:_reactInstance->getJavaScriptContext()];
+  bridgeProxy.jsCallInvoker = jsCallInvoker;
   [RCTBridge setCurrentBridge:(RCTBridge *)bridgeProxy];
 
   // Set up TurboModules
-  _turboModuleManager = [[RCTTurboModuleManager alloc]
-        initWithBridgeProxy:bridgeProxy
-      bridgeModuleDecorator:_bridgeModuleDecorator
-                   delegate:self
-                  jsInvoker:std::make_shared<BridgelessJSCallInvoker>(bufferedRuntimeExecutor)];
+  _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridgeProxy:bridgeProxy
+                                                     bridgeModuleDecorator:_bridgeModuleDecorator
+                                                                  delegate:self
+                                                                 jsInvoker:jsCallInvoker];
   _turboModuleManager.runtimeHandler = self;
 
 #if RCT_DEV