react-native-tvos 0.83.2-0 → 0.84.0-0

package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsProvider.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<06c6740fe7d613f235ae791da750bd52>>
+ * @generated SignedSource<<8e68f8be2e5f35422ae866390c76f670>>
  */
 
 /**
@@ -28,14 +28,16 @@ class ReactNativeFeatureFlagsProvider {
   virtual bool commonTestFlag() = 0;
   virtual bool cdpInteractionMetricsEnabled() = 0;
   virtual bool cxxNativeAnimatedEnabled() = 0;
-  virtual bool cxxNativeAnimatedRemoveJsSync() = 0;
   virtual bool disableEarlyViewCommandExecution() = 0;
-  virtual bool disableFabricCommitInCXXAnimated() = 0;
+  virtual bool disableImageViewPreallocationAndroid() = 0;
   virtual bool disableMountItemReorderingAndroid() = 0;
   virtual bool disableOldAndroidAttachmentMetricsWorkarounds() = 0;
+  virtual bool disableSubviewClippingAndroid() = 0;
   virtual bool disableTextLayoutManagerCacheAndroid() = 0;
+  virtual bool disableViewPreallocationAndroid() = 0;
   virtual bool enableAccessibilityOrder() = 0;
   virtual bool enableAccumulatedUpdatesInRawPropsAndroid() = 0;
+  virtual bool enableAndroidAntialiasedBorderRadiusClipping() = 0;
   virtual bool enableAndroidLinearText() = 0;
   virtual bool enableAndroidTextMeasurementOptimizations() = 0;
   virtual bool enableBridgelessArchitecture() = 0;
@@ -45,12 +47,14 @@ class ReactNativeFeatureFlagsProvider {
   virtual bool enableDoubleMeasurementFixAndroid() = 0;
   virtual bool enableEagerMainQueueModulesOnIOS() = 0;
   virtual bool enableEagerRootViewAttachment() = 0;
+  virtual bool enableExclusivePropsUpdateAndroid() = 0;
   virtual bool enableFabricLogs() = 0;
   virtual bool enableFabricRenderer() = 0;
   virtual bool enableFontScaleChangesUpdatingLayout() = 0;
   virtual bool enableIOSTextBaselineOffsetPerLine() = 0;
   virtual bool enableIOSViewClipToPaddingBox() = 0;
   virtual bool enableImagePrefetchingAndroid() = 0;
+  virtual bool enableImagePrefetchingJNIBatchingAndroid() = 0;
   virtual bool enableImagePrefetchingOnUiThreadAndroid() = 0;
   virtual bool enableImmediateUpdateModeForContentOffsetChanges() = 0;
   virtual bool enableImperativeFocus() = 0;
@@ -65,7 +69,6 @@ class ReactNativeFeatureFlagsProvider {
   virtual bool enableNetworkEventReporting() = 0;
   virtual bool enablePreparedTextLayout() = 0;
   virtual bool enablePropsUpdateReconciliationAndroid() = 0;
-  virtual bool enableResourceTimingAPI() = 0;
   virtual bool enableSwiftUIBasedFilters() = 0;
   virtual bool enableViewCulling() = 0;
   virtual bool enableViewRecycling() = 0;
@@ -73,13 +76,13 @@ class ReactNativeFeatureFlagsProvider {
   virtual bool enableViewRecyclingForScrollView() = 0;
   virtual bool enableViewRecyclingForText() = 0;
   virtual bool enableViewRecyclingForView() = 0;
-  virtual bool enableVirtualViewClippingWithoutScrollViewClipping() = 0;
   virtual bool enableVirtualViewContainerStateExperimental() = 0;
   virtual bool enableVirtualViewDebugFeatures() = 0;
   virtual bool enableVirtualViewRenderState() = 0;
   virtual bool enableVirtualViewWindowFocusDetection() = 0;
   virtual bool enableWebPerformanceAPIsByDefault() = 0;
   virtual bool fixMappingOfEventPrioritiesBetweenFabricAndReact() = 0;
+  virtual bool fixTextClippingAndroid15useBoundsForWidth() = 0;
   virtual bool fuseboxAssertSingleHostState() = 0;
   virtual bool fuseboxEnabledRelease() = 0;
   virtual bool fuseboxNetworkInspectionEnabled() = 0;
@@ -90,17 +93,17 @@ class ReactNativeFeatureFlagsProvider {
   virtual double preparedTextCacheSize() = 0;
   virtual bool preventShadowTreeCommitExhaustion() = 0;
   virtual bool shouldPressibilityUseW3CPointerEventsForHover() = 0;
+  virtual bool shouldResetClickableWhenRecyclingView() = 0;
+  virtual bool shouldResetOnClickListenerWhenRecyclingView() = 0;
+  virtual bool shouldSetEnabledBasedOnAccessibilityState() = 0;
+  virtual bool shouldSetIsClickableByDefault() = 0;
   virtual bool shouldTriggerResponderTransferOnScrollAndroid() = 0;
   virtual bool skipActivityIdentityAssertionOnHostPause() = 0;
-  virtual bool sweepActiveTouchOnChildNativeGesturesAndroid() = 0;
   virtual bool traceTurboModulePromiseRejectionsOnAndroid() = 0;
   virtual bool updateRuntimeShadowNodeReferencesOnCommit() = 0;
   virtual bool useAlwaysAvailableJSErrorHandling() = 0;
   virtual bool useFabricInterop() = 0;
-  virtual bool useNativeEqualsInNativeReadableArrayAndroid() = 0;
-  virtual bool useNativeTransformHelperAndroid() = 0;
   virtual bool useNativeViewConfigsInBridgelessMode() = 0;
-  virtual bool useOptimizedEventBatchingOnAndroid() = 0;
   virtual bool useRawPropsJsiValue() = 0;
   virtual bool useShadowNodeStateOnClone() = 0;
   virtual bool useSharedAnimatedBackend() = 0;

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h

@@ -38,7 +38,6 @@ enum TurboModuleMethodValueKind {
  */
 TurboModuleMethodValueKind getTurboModuleMethodValueKind(jsi::Runtime &rt, const jsi::Value *value);
 
-class TurboCxxModule;
 class TurboModuleBinding;
 
 /**
@@ -144,7 +143,13 @@ class JSI_EXPORT TurboModule : public jsi::HostObject {
 /**
  * An app/platform-specific provider function to get an instance of a module
  * given a name.
+ *
+ * @deprecated Use TurboModuleProviderFunctionTypeWithRuntime instead.
+ * Remove after React Native 0.84 is released.
  */
-using TurboModuleProviderFunctionType = std::function<std::shared_ptr<TurboModule>(const std::string &name)>;
+using TurboModuleProviderFunctionType [[deprecated("Use TurboModuleProviderFunctionTypeWithRuntime instead")]] =
+    std::function<std::shared_ptr<TurboModule>(const std::string &name)>;
+using TurboModuleProviderFunctionTypeWithRuntime =
+    std::function<std::shared_ptr<TurboModule>(jsi::Runtime &runtime, const std::string &name)>;
 
 } // namespace facebook::react

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp

@@ -19,24 +19,25 @@ namespace facebook::react {
 
 class BridgelessNativeModuleProxy : public jsi::HostObject {
   TurboModuleBinding turboBinding_;
-  std::unique_ptr<TurboModuleBinding> legacyBinding_;
+  std::optional<TurboModuleBinding> legacyBinding_;
 
  public:
   BridgelessNativeModuleProxy(
       jsi::Runtime& runtime,
-      TurboModuleProviderFunctionType&& moduleProvider,
-      TurboModuleProviderFunctionType&& legacyModuleProvider,
+      TurboModuleProviderFunctionTypeWithRuntime&& moduleProvider,
+      TurboModuleProviderFunctionTypeWithRuntime&& legacyModuleProvider,
       std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection)
       : turboBinding_(
             runtime,
             std::move(moduleProvider),
             longLivedObjectCollection),
         legacyBinding_(
-            legacyModuleProvider ? std::make_unique<TurboModuleBinding>(
-                                       runtime,
-                                       std::move(legacyModuleProvider),
-                                       longLivedObjectCollection)
-                                 : nullptr) {}
+            legacyModuleProvider
+                ? std::make_optional<TurboModuleBinding>(TurboModuleBinding(
+                      runtime,
+                      std::move(legacyModuleProvider),
+                      longLivedObjectCollection))
+                : std::nullopt) {}
 
   jsi::Value get(jsi::Runtime& runtime, const jsi::PropNameID& name) override {
     /**
@@ -88,7 +89,7 @@ class BridgelessNativeModuleProxy : public jsi::HostObject {
 
 TurboModuleBinding::TurboModuleBinding(
     jsi::Runtime& runtime,
-    TurboModuleProviderFunctionType&& moduleProvider,
+    TurboModuleProviderFunctionTypeWithRuntime&& moduleProvider,
     std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection)
     : runtime_(runtime),
       moduleProvider_(std::move(moduleProvider)),
@@ -99,6 +100,25 @@ void TurboModuleBinding::install(
     TurboModuleProviderFunctionType&& moduleProvider,
     TurboModuleProviderFunctionType&& legacyModuleProvider,
     std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection) {
+  install(
+      runtime,
+      [moduleProvider = std::move(moduleProvider)](
+          jsi::Runtime& runtime, const std::string& name) {
+        return moduleProvider(name);
+      },
+      legacyModuleProvider == nullptr
+          ? (TurboModuleProviderFunctionTypeWithRuntime) nullptr
+          : [legacyModuleProvider = std::move(legacyModuleProvider)](
+                jsi::Runtime& runtime,
+                const std::string& name) { return legacyModuleProvider(name); },
+      longLivedObjectCollection);
+}
+
+void TurboModuleBinding::install(
+    jsi::Runtime& runtime,
+    TurboModuleProviderFunctionTypeWithRuntime&& moduleProvider,
+    TurboModuleProviderFunctionTypeWithRuntime&& legacyModuleProvider,
+    std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection) {
   // TODO(T208105802): We can get this information from the native side!
   auto isBridgeless = runtime.global().hasProperty(runtime, "RN$Bridgeless");
 
@@ -153,7 +173,7 @@ jsi::Value TurboModuleBinding::getModule(
   std::shared_ptr<TurboModule> module;
   {
     TraceSection s("TurboModuleBinding::moduleProvider", "module", moduleName);
-    module = moduleProvider_(moduleName);
+    module = moduleProvider_(runtime, moduleName);
   }
   if (module) {
     TurboModuleWithJSIBindings::installJSIBindings(module, runtime);

package/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h

@@ -21,28 +21,39 @@ class BridgelessNativeModuleProxy;
 /**
  * Represents the JavaScript binding for the TurboModule system.
  */
-class TurboModuleBinding {
+class TurboModuleBinding final {
  public:
   /*
    * Installs TurboModuleBinding into JavaScript runtime.
    * Thread synchronization must be enforced externally.
+   *
+   * @deprecated Use the overload that takes
+   * TurboModuleProviderFunctionTypeWithRuntime instead.
+   * Remove after React Native 0.84 is released.
    */
+  [[deprecated("Use the overload that takes TurboModuleProviderFunctionTypeWithRuntime instead")]]
   static void install(
       jsi::Runtime &runtime,
       TurboModuleProviderFunctionType &&moduleProvider,
       TurboModuleProviderFunctionType &&legacyModuleProvider = nullptr,
       std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection = nullptr);
 
-  TurboModuleBinding(
+  static void install(
       jsi::Runtime &runtime,
-      TurboModuleProviderFunctionType &&moduleProvider,
-      std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection);
+      TurboModuleProviderFunctionTypeWithRuntime &&moduleProvider,
+      TurboModuleProviderFunctionTypeWithRuntime &&legacyModuleProvider = nullptr,
+      std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection = nullptr);
 
-  virtual ~TurboModuleBinding();
+  ~TurboModuleBinding();
 
  private:
   friend BridgelessNativeModuleProxy;
 
+  TurboModuleBinding(
+      jsi::Runtime &runtime,
+      TurboModuleProviderFunctionTypeWithRuntime &&moduleProvider,
+      std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection);
+
   /**
    * A lookup function exposed to JS to get an instance of a TurboModule
    * for the given name.
@@ -50,7 +61,7 @@ class TurboModuleBinding {
   jsi::Value getModule(jsi::Runtime &runtime, const std::string &moduleName) const;
 
   jsi::Runtime &runtime_;
-  TurboModuleProviderFunctionType moduleProvider_;
+  TurboModuleProviderFunctionTypeWithRuntime moduleProvider_;
   std::shared_ptr<LongLivedObjectCollection> longLivedObjectCollection_;
 };
 

package/ReactCommon/react/nativemodule/core/iostests/RCTTurboModuleTests.mm

@@ -58,7 +58,6 @@ class StubNativeMethodCallInvoker : public NativeMethodCallInvoker {
       .jsInvoker = nullptr,
       .nativeMethodCallInvoker = std::make_shared<StubNativeMethodCallInvoker>(),
       .isSyncModule = false,
-      .shouldVoidMethodsExecuteSync = true,
   };
   module_ = std::make_unique<ObjCTurboModule>(params);
 }

package/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTInteropTurboModule.mm

@@ -600,10 +600,6 @@ jsi::Value ObjCInteropTurboModule::convertReturnIdToJSIValue(
     TurboModuleMethodValueKind returnType,
     id result)
 {
-  std::string methodJsSignature = name_ + "." + methodNameCStr + "()";
-  std::string errorPrefix =
-      methodJsSignature + ": Error while converting return Objective C value to JavaScript type. ";
-
   if (returnType == VoidKind) {
     return jsi::Value::undefined();
   }
@@ -617,6 +613,7 @@ jsi::Value ObjCInteropTurboModule::convertReturnIdToJSIValue(
     return returnValue;
   }
 
+  std::string methodJsSignature = name_ + "." + methodNameCStr + "()";
   throw jsi::JSError(runtime, methodJsSignature + "Objective C type was unsupported.");
 }
 

package/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.h

@@ -58,7 +58,6 @@ class JSI_EXPORT ObjCTurboModule : public TurboModule {
     std::shared_ptr<CallInvoker> jsInvoker;
     std::shared_ptr<NativeMethodCallInvoker> nativeMethodCallInvoker;
     bool isSyncModule;
-    bool shouldVoidMethodsExecuteSync;
   };
 
   ObjCTurboModule(const InitParams &params);
@@ -128,9 +127,6 @@ class JSI_EXPORT ObjCTurboModule : public TurboModule {
   // Does the NativeModule dispatch async methods to the JS thread?
   const bool isSyncModule_;
 
-  // Should void methods execute synchronously?
-  const bool shouldVoidMethodsExecuteSync_;
-
   /**
    * TODO(ramanpreet):
    * Investigate an optimization that'll let us get rid of this NSMutableDictionary.

package/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.mm

@@ -199,7 +199,7 @@ id convertJSIValueToObjCObject(
     return convertJSIObjectToNSDictionary(runtime, o, jsInvoker, useNSNull);
   }
 
-  throw std::runtime_error("Unsupported jsi::Value kind");
+  throw jsi::JSError(runtime, "Unsupported jsi::Value kind");
 }
 
 static jsi::Value createJSRuntimeError(jsi::Runtime &runtime, const std::string &message)
@@ -268,24 +268,17 @@ ObjCTurboModule::createPromise(jsi::Runtime &runtime, const std::string &methodN
           jsi::PropNameID::forAscii(runtime, "fn"),
           2,
           [invokeCopy, jsInvoker = jsInvoker_, moduleName = name_, methodName](
-              jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *args, size_t count) {
-            // FIXME: do not allocate this upfront
-            std::string moduleMethod = moduleName + "." + methodName + "()";
-
+              jsi::Runtime &rt, const jsi::Value &, const jsi::Value *args, size_t count) {
             if (count != 2) {
-              throw std::invalid_argument(
-                  moduleMethod + ": Promise must pass constructor function two args. Passed " + std::to_string(count) +
-                  " args.");
-            }
-            if (!invokeCopy) {
-              return jsi::Value::undefined();
+              throw jsi::JSError(
+                  rt,
+                  moduleName + "." + methodName + "(): Promise must pass constructor function two args. Passed " +
+                      std::to_string(count) + " args.");
             }
 
             __block BOOL resolveWasCalled = NO;
-            __block std::optional<AsyncCallback<>> resolve(
-                {rt, args[0].getObject(rt).getFunction(rt), std::move(jsInvoker)});
-            __block std::optional<AsyncCallback<>> reject(
-                {rt, args[1].getObject(rt).getFunction(rt), std::move(jsInvoker)});
+            __block std::optional<AsyncCallback<>> resolve({rt, args[0].getObject(rt).getFunction(rt), jsInvoker});
+            __block std::optional<AsyncCallback<>> reject({rt, args[1].getObject(rt).getFunction(rt), jsInvoker});
             __block std::shared_ptr<std::mutex> mutex = std::make_shared<std::mutex>();
 
             RCTPromiseResolveBlock resolveBlock = ^(id result) {
@@ -306,12 +299,14 @@ ObjCTurboModule::createPromise(jsi::Runtime &runtime, const std::string &methodN
               }
 
               if (alreadyResolved) {
-                RCTLogError(@"%s: Tried to resolve a promise more than once.", moduleMethod.c_str());
+                RCTLogError(
+                    @"%s.%s(): Tried to resolve a promise more than once.", moduleName.c_str(), methodName.c_str());
                 return;
-              }
-
-              if (alreadyRejected) {
-                RCTLogError(@"%s: Tried to resolve a promise after it's already been rejected.", moduleMethod.c_str());
+              } else if (alreadyRejected) {
+                RCTLogError(
+                    @"%s.%s(): Tried to resolve a promise after it's already been rejected.",
+                    moduleName.c_str(),
+                    methodName.c_str());
                 return;
               }
 
@@ -339,16 +334,16 @@ ObjCTurboModule::createPromise(jsi::Runtime &runtime, const std::string &methodN
 
               if (alreadyResolved) {
                 RCTLogError(
-                    @"%s: Tried to reject a promise after it's already been resolved. Message: %s",
-                    moduleMethod.c_str(),
+                    @"%s.%s() Tried to reject a promise after it's already been resolved. Message: %s",
+                    moduleName.c_str(),
+                    methodName.c_str(),
                     message.UTF8String);
                 return;
-              }
-
-              if (alreadyRejected) {
+              } else if (alreadyRejected) {
                 RCTLogError(
-                    @"%s: Tried to reject a promise more than once. Message: %s",
-                    moduleMethod.c_str(),
+                    @"%s.%s() Tried to reject a promise more than once. Message: %s",
+                    moduleName.c_str(),
+                    methodName.c_str(),
                     message.UTF8String);
                 return;
               }
@@ -461,11 +456,7 @@ void ObjCTurboModule::performVoidMethodInvocation(
       return;
     }
 
-    if (shouldVoidMethodsExecuteSync_) {
-      TurboModulePerfLogger::syncMethodCallExecutionStart(moduleName, methodName);
-    } else {
-      TurboModulePerfLogger::asyncMethodCallExecutionStart(moduleName, methodName, asyncCallCounter);
-    }
+    TurboModulePerfLogger::asyncMethodCallExecutionStart(moduleName, methodName, asyncCallCounter);
 
     @try {
       [inv invokeWithTarget:strongModule];
@@ -475,26 +466,18 @@ void ObjCTurboModule::performVoidMethodInvocation(
       [retainedObjectsForInvocation removeAllObjects];
     }
 
-    if (shouldVoidMethodsExecuteSync_) {
-      TurboModulePerfLogger::syncMethodCallExecutionEnd(moduleName, methodName);
-    } else {
-      TurboModulePerfLogger::asyncMethodCallExecutionEnd(moduleName, methodName, asyncCallCounter);
-    }
+    TurboModulePerfLogger::asyncMethodCallExecutionEnd(moduleName, methodName, asyncCallCounter);
 
     return;
   };
 
-  if (shouldVoidMethodsExecuteSync_) {
-    nativeMethodCallInvoker_->invokeSync(methodNameStr, [&]() -> void { block(); });
-  } else {
-    asyncCallCounter = getUniqueId();
-    TurboModulePerfLogger::asyncMethodCallDispatch(moduleName, methodName);
-    nativeMethodCallInvoker_->invokeAsync(methodNameStr, [moduleName, methodNameStr, block]() -> void {
-      TraceSection s(
-          "RCTTurboModuleAsyncMethodInvocation", "module", moduleName, "method", methodNameStr, "returnType", "void");
-      block();
-    });
-  }
+  asyncCallCounter = getUniqueId();
+  TurboModulePerfLogger::asyncMethodCallDispatch(moduleName, methodName);
+  nativeMethodCallInvoker_->invokeAsync(methodNameStr, [moduleName, methodNameStr, block]() -> void {
+    TraceSection s(
+        "RCTTurboModuleAsyncMethodInvocation", "module", moduleName, "method", methodNameStr, "returnType", "void");
+    block();
+  });
 }
 
 jsi::Value ObjCTurboModule::convertReturnIdToJSIValue(
@@ -539,9 +522,9 @@ jsi::Value ObjCTurboModule::convertReturnIdToJSIValue(
       break;
     }
     case FunctionKind:
-      throw std::runtime_error("convertReturnIdToJSIValue: FunctionKind is not supported yet.");
+      throw jsi::JSError(runtime, "convertReturnIdToJSIValue: FunctionKind is not supported yet.");
     case PromiseKind:
-      throw std::runtime_error("convertReturnIdToJSIValue: PromiseKind wasn't handled properly.");
+      throw jsi::JSError(runtime, "convertReturnIdToJSIValue: PromiseKind wasn't handled properly.");
   }
 
   return returnValue;
@@ -723,22 +706,27 @@ NSInvocation *ObjCTurboModule::createMethodInvocation(
     NSMutableArray *retainedObjectsForInvocation)
 {
   const char *moduleName = name_.c_str();
-  const NSObject<RCTBridgeModule> *module = instance_;
-
   if (isSync) {
     TurboModulePerfLogger::syncMethodCallArgConversionStart(moduleName, methodName);
   } else {
     TurboModulePerfLogger::asyncMethodCallArgConversionStart(moduleName, methodName);
   }
 
+  const NSObject<RCTBridgeModule> *module = instance_;
   NSMethodSignature *methodSignature = [module methodSignatureForSelector:selector];
+  if (count > methodSignature.numberOfArguments - 2) {
+    throw jsi::JSError(
+        runtime,
+        name_ + "." + methodName + " called with too many arguments, expected up to " +
+            std::to_string(methodSignature.numberOfArguments - 2) + ", got " + std::to_string(count));
+  }
+
   NSInvocation *inv = [NSInvocation invocationWithMethodSignature:methodSignature];
   [inv setSelector:selector];
 
   for (size_t i = 0; i < count; i++) {
     const jsi::Value &arg = args[i];
     const std::string objCArgType = [methodSignature getArgumentTypeAtIndex:i + 2];
-
     setInvocationArg(runtime, methodName, objCArgType, arg, i, inv, retainedObjectsForInvocation);
   }
 
@@ -757,19 +745,14 @@ bool ObjCTurboModule::isMethodSync(TurboModuleMethodValueKind returnType)
     return true;
   }
 
-  if (returnType == VoidKind && shouldVoidMethodsExecuteSync_) {
-    return true;
-  }
-
-  return !(returnType == VoidKind || returnType == PromiseKind);
+  return returnType != VoidKind && returnType != PromiseKind;
 }
 
 ObjCTurboModule::ObjCTurboModule(const InitParams &params)
     : TurboModule(params.moduleName, params.jsInvoker),
       instance_(params.instance),
       nativeMethodCallInvoker_(params.nativeMethodCallInvoker),
-      isSyncModule_(params.isSyncModule),
-      shouldVoidMethodsExecuteSync_(params.shouldVoidMethodsExecuteSync)
+      isSyncModule_(params.isSyncModule)
 {
 }
 

package/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm

@@ -21,7 +21,6 @@
 #import <React/RCTCallInvoker.h>
 #import <React/RCTCallInvokerModule.h>
 #import <React/RCTConstants.h>
-#import <React/RCTCxxModule.h>
 #import <React/RCTDevMenuConfigurationDecorator.h>
 #import <React/RCTInitializing.h>
 #import <React/RCTLog.h>
@@ -30,9 +29,7 @@
 #import <React/RCTUtils.h>
 #import <ReactCommon/CxxTurboModuleUtils.h>
 #import <ReactCommon/RCTTurboModuleWithJSIBindings.h>
-#import <ReactCommon/TurboCxxModule.h>
 #import <ReactCommon/TurboModulePerfLogger.h>
-#import <react/featureflags/ReactNativeFeatureFlags.h>
 
 using namespace facebook;
 using namespace facebook::react;
@@ -387,24 +384,12 @@ typedef struct {
   }
 
   /**
-   * Step 2d: If the moduleClass is a legacy CxxModule, return a TurboCxxModule instance that
-   * wraps CxxModule.
-   */
-  Class moduleClass = [module class];
-  if ([moduleClass isSubclassOfClass:RCTCxxModule.class]) {
-    // Use TurboCxxModule compat class to wrap the CxxModule instance.
-    // This is only for migration convenience, despite less performant.
-    auto turboModule = std::make_shared<TurboCxxModule>([((RCTCxxModule *)module) createModule], _jsInvoker);
-    _turboModuleCache.insert({moduleName, turboModule});
-    return turboModule;
-  }
-
-  /**
-   * Step 2e: Return an exact sub-class of ObjC TurboModule
+   * Step 3: Return an exact sub-class of ObjC TurboModule
    *
    * Use respondsToSelector: below to infer conformance to @protocol(RCTTurboModule). Using conformsToProtocol: is
    * expensive.
    */
+  Class moduleClass = [module class];
   if ([module respondsToSelector:@selector(getTurboModule:)]) {
     ObjCTurboModule::InitParams params = {
         .moduleName = moduleName,
@@ -412,7 +397,6 @@ typedef struct {
         .jsInvoker = _jsInvoker,
         .nativeMethodCallInvoker = nativeMethodCallInvoker,
         .isSyncModule = methodQueue == RCTJSThread,
-        .shouldVoidMethodsExecuteSync = (bool)RCTTurboModuleSyncVoidMethodsEnabled(),
     };
 
     auto turboModule = [(id<RCTTurboModule>)module getTurboModule:params];
@@ -467,15 +451,6 @@ typedef struct {
   std::shared_ptr<NativeMethodCallInvoker> nativeMethodCallInvoker =
       std::make_shared<LegacyModuleNativeMethodCallInvoker>(methodQueue, [self _requiresMainQueueSetup:moduleClass]);
 
-  // If module is a legacy cxx module, return TurboCxxModule
-  if ([moduleClass isSubclassOfClass:RCTCxxModule.class]) {
-    // Use TurboCxxModule compat class to wrap the CxxModule instance.
-    // This is only for migration convenience, despite less performant.
-    auto turboModule = std::make_shared<TurboCxxModule>([((RCTCxxModule *)module) createModule], _jsInvoker);
-    _legacyModuleCache.insert({moduleName, turboModule});
-    return turboModule;
-  }
-
   // Create interop module
   ObjCTurboModule::InitParams params = {
       .moduleName = moduleName,
@@ -483,7 +458,6 @@ typedef struct {
       .jsInvoker = _jsInvoker,
       .nativeMethodCallInvoker = std::move(nativeMethodCallInvoker),
       .isSyncModule = methodQueue == RCTJSThread,
-      .shouldVoidMethodsExecuteSync = (bool)RCTTurboModuleSyncVoidMethodsEnabled(),
   };
 
   auto turboModule = std::make_shared<ObjCInteropTurboModule>(params);
@@ -496,7 +470,7 @@ typedef struct {
 - (BOOL)_isTurboModule:(const char *)moduleName
 {
   Class moduleClass = [self _getModuleClassFromName:moduleName];
-  return moduleClass != nil && (isTurboModuleClass(moduleClass) && ![moduleClass isSubclassOfClass:RCTCxxModule.class]);
+  return moduleClass != nil && isTurboModuleClass(moduleClass);
 }
 
 - (BOOL)_isLegacyModule:(const char *)moduleName
@@ -507,7 +481,7 @@ typedef struct {
 
 - (BOOL)_isLegacyModuleClass:(Class)moduleClass
 {
-  return moduleClass != nil && (!isTurboModuleClass(moduleClass) || [moduleClass isSubclassOfClass:RCTCxxModule.class]);
+  return moduleClass != nil && !isTurboModuleClass(moduleClass);
 }
 
 - (id<RCTModuleProvider>)_moduleProviderForName:(const char *)moduleName
@@ -718,7 +692,7 @@ typedef struct {
       } else if (_bridgeProxy) {
         [(id)module setValue:_bridgeProxy forKey:@"bridge"];
       }
-    } @catch (NSException *exception) {
+    } @catch (NSException *) {
       RCTLogError(
           @"%@ has no setter or ivar for its bridge, which is not "
            "permitted. You must either @synthesize the bridge property, "
@@ -766,7 +740,7 @@ typedef struct {
 
       @try {
         [(id)module setValue:methodQueue forKey:@"methodQueue"];
-      } @catch (NSException *exception) {
+      } @catch (NSException *) {
         RCTLogError(
             @"%@ has no setter or ivar for its methodQueue, which is not "
              "permitted. You must either @synthesize the methodQueue property, "
@@ -942,8 +916,8 @@ typedef struct {
    * aren't any strong references to it in ObjC. Hence, we give
    * __turboModuleProxy a strong reference to TurboModuleManager.
    */
-  auto turboModuleProvider = [self,
-                              runtime = &runtime](const std::string &name) -> std::shared_ptr<react::TurboModule> {
+  auto turboModuleProvider =
+      [self](jsi::Runtime &runtime, const std::string &name) -> std::shared_ptr<react::TurboModule> {
     auto moduleName = name.c_str();
 
     TurboModulePerfLogger::moduleJSRequireBeginningStart(moduleName);
@@ -957,7 +931,7 @@ typedef struct {
      * Additionally, if a TurboModule with the name `name` isn't found, then we
      * trigger an assertion failure.
      */
-    auto turboModule = [self provideTurboModule:moduleName runtime:runtime];
+    auto turboModule = [self provideTurboModule:moduleName runtime:&runtime];
 
     if (moduleWasNotInitialized && [self moduleIsInitialized:moduleName]) {
       [self->_bridge.performanceLogger markStopForTag:RCTPLTurboModuleSetup];
@@ -972,7 +946,8 @@ typedef struct {
   };
 
   if (RCTTurboModuleInteropEnabled()) {
-    auto legacyModuleProvider = [self](const std::string &name) -> std::shared_ptr<react::TurboModule> {
+    auto legacyModuleProvider =
+        [self](jsi::Runtime & /*runtime*/, const std::string &name) -> std::shared_ptr<react::TurboModule> {
       auto moduleName = name.c_str();
 
       TurboModulePerfLogger::moduleJSRequireBeginningStart(moduleName);