react-native 0.84.0-nightly-20251114-dd6805dec → 0.84.0-nightly-20251116-d52b9d2f8

package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsAccessor.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<<acef1e4ac15cf78463831e3aeb35b641>>
+ * @generated SignedSource<<fb735bdc4e4085fd415f21894340dd75>>
  */
 
 /**
@@ -46,6 +46,7 @@ class ReactNativeFeatureFlagsAccessor {
   bool disableViewPreallocationAndroid();
   bool enableAccessibilityOrder();
   bool enableAccumulatedUpdatesInRawPropsAndroid();
+  bool enableAndroidAntialiasedBorderRadiusClipping();
   bool enableAndroidLinearText();
   bool enableAndroidTextMeasurementOptimizations();
   bool enableBridgelessArchitecture();
@@ -131,7 +132,7 @@ class ReactNativeFeatureFlagsAccessor {
   std::unique_ptr<ReactNativeFeatureFlagsProvider> currentProvider_;
   bool wasOverridden_;
 
-  std::array<std::atomic<const char*>, 88> accessedFeatureFlags_;
+  std::array<std::atomic<const char*>, 89> accessedFeatureFlags_;
 
   std::atomic<std::optional<bool>> commonTestFlag_;
   std::atomic<std::optional<bool>> cdpInteractionMetricsEnabled_;
@@ -147,6 +148,7 @@ class ReactNativeFeatureFlagsAccessor {
   std::atomic<std::optional<bool>> disableViewPreallocationAndroid_;
   std::atomic<std::optional<bool>> enableAccessibilityOrder_;
   std::atomic<std::optional<bool>> enableAccumulatedUpdatesInRawPropsAndroid_;
+  std::atomic<std::optional<bool>> enableAndroidAntialiasedBorderRadiusClipping_;
   std::atomic<std::optional<bool>> enableAndroidLinearText_;
   std::atomic<std::optional<bool>> enableAndroidTextMeasurementOptimizations_;
   std::atomic<std::optional<bool>> enableBridgelessArchitecture_;

package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.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<<18c966119a9b6123aea3b088e0eaf98b>>
+ * @generated SignedSource<<e5affd56757a5b815ac0a16305d1a82d>>
  */
 
 /**
@@ -83,6 +83,10 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider {
     return false;
   }
 
+  bool enableAndroidAntialiasedBorderRadiusClipping() override {
+    return false;
+  }
+
   bool enableAndroidLinearText() override {
     return false;
   }

package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDynamicProvider.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<<152ea11685f3770782035b08831ef04d>>
+ * @generated SignedSource<<c345dba878d470a42fcff41aac490083>>
  */
 
 /**
@@ -171,6 +171,15 @@ class ReactNativeFeatureFlagsDynamicProvider : public ReactNativeFeatureFlagsDef
     return ReactNativeFeatureFlagsDefaults::enableAccumulatedUpdatesInRawPropsAndroid();
   }
 
+  bool enableAndroidAntialiasedBorderRadiusClipping() override {
+    auto value = values_["enableAndroidAntialiasedBorderRadiusClipping"];
+    if (!value.isNull()) {
+      return value.getBool();
+    }
+
+    return ReactNativeFeatureFlagsDefaults::enableAndroidAntialiasedBorderRadiusClipping();
+  }
+
   bool enableAndroidLinearText() override {
     auto value = values_["enableAndroidLinearText"];
     if (!value.isNull()) {

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<<2fe890d6419dc1aaa9aa2d69a6e96bed>>
+ * @generated SignedSource<<3e8df9a7ff492fee6b5755c1691e150c>>
  */
 
 /**
@@ -39,6 +39,7 @@ class ReactNativeFeatureFlagsProvider {
   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;

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;
 
 /**

package/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.cpp

@@ -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<<3235f8d2413da4e9f10c7d8ff78bfeb8>>
+ * @generated SignedSource<<0cdf0b920d8c8a083781028ff0490bf3>>
  */
 
 /**
@@ -114,6 +114,11 @@ bool NativeReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid(
   return ReactNativeFeatureFlags::enableAccumulatedUpdatesInRawPropsAndroid();
 }
 
+bool NativeReactNativeFeatureFlags::enableAndroidAntialiasedBorderRadiusClipping(
+    jsi::Runtime& /*runtime*/) {
+  return ReactNativeFeatureFlags::enableAndroidAntialiasedBorderRadiusClipping();
+}
+
 bool NativeReactNativeFeatureFlags::enableAndroidLinearText(
     jsi::Runtime& /*runtime*/) {
   return ReactNativeFeatureFlags::enableAndroidLinearText();

package/ReactCommon/react/nativemodule/featureflags/NativeReactNativeFeatureFlags.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<<9a7d4159c54f9ccc3e0d3cc461b66b7e>>
+ * @generated SignedSource<<dc1786ebed10af9cf4343d88b6336960>>
  */
 
 /**
@@ -64,6 +64,8 @@ class NativeReactNativeFeatureFlags
 
   bool enableAccumulatedUpdatesInRawPropsAndroid(jsi::Runtime& runtime);
 
+  bool enableAndroidAntialiasedBorderRadiusClipping(jsi::Runtime& runtime);
+
   bool enableAndroidLinearText(jsi::Runtime& runtime);
 
   bool enableAndroidTextMeasurementOptimizations(jsi::Runtime& runtime);

package/ReactCommon/react/renderer/components/image/ImageProps.cpp

@@ -98,7 +98,7 @@ ImageProps::ImageProps(
                     rawProps,
                     "resizeMethod",
                     sourceProps.resizeMethod,
-                    {})),
+                    {"auto"})),
       resizeMultiplier(
           ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
               ? sourceProps.resizeMultiplier
@@ -107,7 +107,7 @@ ImageProps::ImageProps(
                     rawProps,
                     "resizeMultiplier",
                     sourceProps.resizeMultiplier,
-                    {})),
+                    1)),
       shouldNotifyLoadEvents(
           ReactNativeFeatureFlags::enableCppPropsIteratorSetter()
               ? sourceProps.shouldNotifyLoadEvents

package/ReactCommon/react/renderer/components/image/ImageProps.h

@@ -33,8 +33,8 @@ class ImageProps final : public ViewProps {
   EdgeInsets capInsets{};
   SharedColor tintColor{};
   std::string internal_analyticTag{};
-  std::string resizeMethod{};
-  Float resizeMultiplier{};
+  std::string resizeMethod{"auto"};
+  Float resizeMultiplier{1.f};
   bool shouldNotifyLoadEvents{};
   SharedColor overlayColor{};
   Float fadeDuration{};

package/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp

@@ -65,7 +65,12 @@ void ImageShadowNode::updateStateIfNeeded() {
       imageProps.fadeDuration,
       imageProps.progressiveRenderingEnabled,
       imageProps.loadingIndicatorSource,
-      imageProps.internal_analyticTag
+      imageProps.internal_analyticTag,
+      Size{
+          .width =
+              layoutMetrics_.frame.size.width * layoutMetrics_.pointScaleFactor,
+          .height = layoutMetrics_.frame.size.height *
+              layoutMetrics_.pointScaleFactor}
 #endif
   );
 
@@ -85,7 +90,9 @@ void ImageShadowNode::updateStateIfNeeded() {
          (uri.starts_with("content://") || uri.starts_with("file://")));
     // If we would resize but have no dimensions, skip creating the request
     if (shouldResize &&
-        (newImageSource.size.width == 0 || newImageSource.size.height == 0)) {
+        (newImageSource.size.width == 0 || newImageSource.size.height == 0 ||
+         layoutMetrics_.frame.size.width == 0 ||
+         layoutMetrics_.frame.size.height == 0)) {
       // Keep the old state - don't create a new image request
       return;
     }

package/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageRequestParams.h

@@ -30,7 +30,8 @@ class ImageRequestParams {
       Float fadeDuration,
       bool progressiveRenderingEnabled,
       ImageSource loadingIndicatorSource,
-      std::string analyticTag)
+      std::string analyticTag,
+      Size size)
       : blurRadius(blurRadius),
         defaultSource(std::move(defaultSource)),
         resizeMode(resizeMode),
@@ -42,7 +43,8 @@ class ImageRequestParams {
         fadeDuration(fadeDuration),
         progressiveRenderingEnabled(progressiveRenderingEnabled),
         loadingIndicatorSource(std::move(loadingIndicatorSource)),
-        analyticTag(std::move(analyticTag))
+        analyticTag(std::move(analyticTag)),
+        size(size)
   {
   }
 
@@ -58,6 +60,7 @@ class ImageRequestParams {
   bool progressiveRenderingEnabled{};
   ImageSource loadingIndicatorSource{};
   std::string analyticTag{};
+  Size size{};
 
   bool operator==(const ImageRequestParams &rhs) const
   {
@@ -73,7 +76,8 @@ class ImageRequestParams {
                this->fadeDuration,
                this->progressiveRenderingEnabled,
                this->loadingIndicatorSource,
-               this->analyticTag) ==
+               this->analyticTag,
+               this->size) ==
         std::tie(
                rhs.blurRadius,
                rhs.defaultSource,
@@ -86,7 +90,8 @@ class ImageRequestParams {
                rhs.fadeDuration,
                rhs.progressiveRenderingEnabled,
                rhs.loadingIndicatorSource,
-               rhs.analyticTag);
+               rhs.analyticTag,
+               rhs.size);
   }
 
   bool operator!=(const ImageRequestParams &rhs) const

package/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/conversions.h

@@ -24,8 +24,8 @@ constexpr MapBuffer::Key IS_KEY_DEFAULT_SRC = 1;
 constexpr MapBuffer::Key IS_KEY_RESIZE_MODE = 2;
 constexpr MapBuffer::Key IS_KEY_RESIZE_METHOD = 3;
 constexpr MapBuffer::Key IS_KEY_BLUR_RADIUS = 4;
-constexpr MapBuffer::Key IS_KEY_VIEW_WIDTH = 5;
-constexpr MapBuffer::Key IS_KEY_VIEW_HEIGHT = 6;
+constexpr MapBuffer::Key IS_KEY_IMAGE_WIDTH = 5;
+constexpr MapBuffer::Key IS_KEY_IMAGE_HEIGHT = 6;
 constexpr MapBuffer::Key IS_KEY_RESIZE_MULTIPLIER = 7;
 constexpr MapBuffer::Key IS_KEY_SHOULD_NOTIFY_LOAD_EVENTS = 8;
 constexpr MapBuffer::Key IS_KEY_OVERLAY_COLOR = 9;
@@ -35,16 +35,20 @@ constexpr MapBuffer::Key IS_KEY_PROGRESSIVE_RENDERING_ENABLED = 12;
 constexpr MapBuffer::Key IS_KEY_LOADING_INDICATOR_SRC = 13;
 constexpr MapBuffer::Key IS_KEY_ANALYTIC_TAG = 14;
 constexpr MapBuffer::Key IS_KEY_TAG = 15;
+constexpr MapBuffer::Key IS_KEY_VIEW_WIDTH = 16;
+constexpr MapBuffer::Key IS_KEY_VIEW_HEIGHT = 17;
 
 inline void serializeImageSource(MapBufferBuilder &builder, const ImageSource &imageSource)
 {
   builder.putString(IS_KEY_URI, imageSource.uri);
-  builder.putInt(IS_KEY_VIEW_WIDTH, static_cast<int32_t>(imageSource.size.width));
-  builder.putInt(IS_KEY_VIEW_HEIGHT, static_cast<int32_t>(imageSource.size.height));
+  builder.putInt(IS_KEY_IMAGE_WIDTH, static_cast<int32_t>(imageSource.size.width));
+  builder.putInt(IS_KEY_IMAGE_HEIGHT, static_cast<int32_t>(imageSource.size.height));
 }
 
 inline void serializeImageRequestParams(MapBufferBuilder &builder, const ImageRequestParams &imageRequestParams)
 {
+  builder.putInt(IS_KEY_VIEW_WIDTH, static_cast<int32_t>(imageRequestParams.size.width));
+  builder.putInt(IS_KEY_VIEW_HEIGHT, static_cast<int32_t>(imageRequestParams.size.height));
   builder.putString(IS_KEY_DEFAULT_SRC, imageRequestParams.defaultSource.uri);
   builder.putInt(IS_KEY_RESIZE_MODE, to_underlying(imageRequestParams.resizeMode));
   builder.putString(IS_KEY_RESIZE_METHOD, imageRequestParams.resizeMethod);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.84.0-nightly-20251114-dd6805dec",
+  "version": "0.84.0-nightly-20251116-d52b9d2f8",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -160,13 +160,13 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.7.0",
-    "@react-native/assets-registry": "0.84.0-nightly-20251114-dd6805dec",
-    "@react-native/codegen": "0.84.0-nightly-20251114-dd6805dec",
-    "@react-native/community-cli-plugin": "0.84.0-nightly-20251114-dd6805dec",
-    "@react-native/gradle-plugin": "0.84.0-nightly-20251114-dd6805dec",
-    "@react-native/js-polyfills": "0.84.0-nightly-20251114-dd6805dec",
-    "@react-native/normalize-colors": "0.84.0-nightly-20251114-dd6805dec",
-    "@react-native/virtualized-lists": "0.84.0-nightly-20251114-dd6805dec",
+    "@react-native/assets-registry": "0.84.0-nightly-20251116-d52b9d2f8",
+    "@react-native/codegen": "0.84.0-nightly-20251116-d52b9d2f8",
+    "@react-native/community-cli-plugin": "0.84.0-nightly-20251116-d52b9d2f8",
+    "@react-native/gradle-plugin": "0.84.0-nightly-20251116-d52b9d2f8",
+    "@react-native/js-polyfills": "0.84.0-nightly-20251116-d52b9d2f8",
+    "@react-native/normalize-colors": "0.84.0-nightly-20251116-d52b9d2f8",
+    "@react-native/virtualized-lists": "0.84.0-nightly-20251116-d52b9d2f8",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -176,7 +176,7 @@
     "commander": "^12.0.0",
     "flow-enums-runtime": "^0.0.6",
     "glob": "^7.1.1",
-    "hermes-compiler": "0.14.0-commitly-202511080502-bbebefee2",
+    "hermes-compiler": "0.14.0-commitly-202511160156-8b7dd3e16",
     "invariant": "^2.2.4",
     "jest-environment-node": "^29.7.0",
     "memoize-one": "^5.0.0",

package/sdks/hermes-engine/version.properties

@@ -1,2 +1,2 @@
-HERMES_VERSION_NAME=0.14.0-commitly-202511080502-bbebefee2
+HERMES_VERSION_NAME=0.14.0-commitly-202511160156-8b7dd3e16
 HERMES_V1_VERSION_NAME=250829098.0.3

package/src/private/featureflags/ReactNativeFeatureFlags.js

@@ -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<<312e7dcaaaf8bade0acf80d15e8eedee>>
+ * @generated SignedSource<<d9337b8c6a6d759ce9bd2ff95f2ba2e2>>
  * @flow strict
  * @noformat
  */
@@ -65,6 +65,7 @@ export type ReactNativeFeatureFlags = $ReadOnly<{
   disableViewPreallocationAndroid: Getter<boolean>,
   enableAccessibilityOrder: Getter<boolean>,
   enableAccumulatedUpdatesInRawPropsAndroid: Getter<boolean>,
+  enableAndroidAntialiasedBorderRadiusClipping: Getter<boolean>,
   enableAndroidLinearText: Getter<boolean>,
   enableAndroidTextMeasurementOptimizations: Getter<boolean>,
   enableBridgelessArchitecture: Getter<boolean>,
@@ -281,6 +282,10 @@ export const enableAccessibilityOrder: Getter<boolean> = createNativeFlagGetter(
  * When enabled, Android will accumulate updates in rawProps to reduce the number of mounting instructions for cascading re-renders.
  */
 export const enableAccumulatedUpdatesInRawPropsAndroid: Getter<boolean> = createNativeFlagGetter('enableAccumulatedUpdatesInRawPropsAndroid', false);
+/**
+ * Enable antialiased border radius clipping for Android API 28 and below using manual masking with Porter-Duff compositing
+ */
+export const enableAndroidAntialiasedBorderRadiusClipping: Getter<boolean> = createNativeFlagGetter('enableAndroidAntialiasedBorderRadiusClipping', false);
 /**
  * Enables linear text rendering on Android wherever subpixel text rendering is enabled
  */

package/src/private/featureflags/specs/NativeReactNativeFeatureFlags.js

@@ -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<<d5e09e0d1f62767dcc810d3295e1b724>>
+ * @generated SignedSource<<0de9df853ee6af976b4e15f55e6b9b26>>
  * @flow strict
  * @noformat
  */
@@ -39,6 +39,7 @@ export interface Spec extends TurboModule {
   +disableViewPreallocationAndroid?: () => boolean;
   +enableAccessibilityOrder?: () => boolean;
   +enableAccumulatedUpdatesInRawPropsAndroid?: () => boolean;
+  +enableAndroidAntialiasedBorderRadiusClipping?: () => boolean;
   +enableAndroidLinearText?: () => boolean;
   +enableAndroidTextMeasurementOptimizations?: () => boolean;
   +enableBridgelessArchitecture?: () => boolean;

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

@@ -1,212 +0,0 @@
-/*
- * 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.
- */
-
-#include "TurboCxxModule.h"
-
-#include <vector>
-
-#include <ReactCommon/TurboModuleUtils.h>
-#include <glog/logging.h>
-#include <jsi/JSIDynamic.h>
-
-using namespace facebook;
-using namespace facebook::xplat::module;
-
-namespace facebook::react {
-
-namespace {
-CxxModule::Callback makeTurboCxxModuleCallback(
-    std::weak_ptr<CallbackWrapper> weakWrapper) {
-  return [weakWrapper, wrapperWasCalled = false](
-             const std::vector<folly::dynamic>& args) mutable {
-    if (wrapperWasCalled) {
-      LOG(FATAL) << "callback arg cannot be called more than once";
-    }
-
-    auto strongWrapper = weakWrapper.lock();
-    if (!strongWrapper) {
-      return;
-    }
-
-    strongWrapper->jsInvoker().invokeAsync(
-        [weakWrapper, args](jsi::Runtime& rt) {
-          auto strongWrapper2 = weakWrapper.lock();
-          if (!strongWrapper2) {
-            return;
-          }
-
-          std::vector<jsi::Value> innerArgs;
-          innerArgs.reserve(args.size());
-          for (auto& a : args) {
-            innerArgs.push_back(jsi::valueFromDynamic(rt, a));
-          }
-          strongWrapper2->callback().call(
-              rt, (const jsi::Value*)innerArgs.data(), innerArgs.size());
-
-          strongWrapper2->destroy();
-        });
-
-    wrapperWasCalled = true;
-  };
-}
-} // namespace
-
-TurboCxxModule::TurboCxxModule(
-    std::unique_ptr<CxxModule> cxxModule,
-    std::shared_ptr<CallInvoker> jsInvoker)
-    : TurboModule(cxxModule->getName(), std::move(jsInvoker)),
-      cxxMethods_(cxxModule->getMethods()),
-      cxxModule_(std::move(cxxModule)) {}
-
-jsi::Value TurboCxxModule::create(
-    jsi::Runtime& runtime,
-    const jsi::PropNameID& propName) {
-  std::string propNameUtf8 = propName.utf8(runtime);
-
-  if (propNameUtf8 == "getConstants") {
-    // This is special cased because `getConstants()` is already a part of
-    // CxxModule.
-    return jsi::Function::createFromHostFunction(
-        runtime,
-        propName,
-        0,
-        [this](
-            jsi::Runtime& rt,
-            const jsi::Value& /*thisVal*/,
-            const jsi::Value* /*args*/,
-            size_t /*count*/) {
-          jsi::Object result(rt);
-          auto constants = cxxModule_->getConstants();
-          for (auto& pair : constants) {
-            result.setProperty(
-                rt, pair.first.c_str(), jsi::valueFromDynamic(rt, pair.second));
-          }
-          return result;
-        });
-  } else {
-    for (auto& method : cxxMethods_) {
-      if (method.name == propNameUtf8) {
-        return jsi::Function::createFromHostFunction(
-            runtime,
-            propName,
-            0,
-            [this, propNameUtf8](
-                jsi::Runtime& rt,
-                const jsi::Value& /*thisVal*/,
-                const jsi::Value* args,
-                size_t count) {
-              return invokeMethod(rt, propNameUtf8, args, count);
-            });
-      }
-    }
-  }
-
-  return jsi::Value::undefined();
-}
-
-std::vector<jsi::PropNameID> TurboCxxModule::getPropertyNames(
-    jsi::Runtime& runtime) {
-  std::vector<jsi::PropNameID> result;
-  result.reserve(cxxMethods_.size() + 1);
-  result.push_back(jsi::PropNameID::forUtf8(runtime, "getConstants"));
-  for (auto& cxxMethod : cxxMethods_) {
-    result.push_back(jsi::PropNameID::forUtf8(runtime, cxxMethod.name));
-  }
-  return result;
-}
-
-jsi::Value TurboCxxModule::invokeMethod(
-    jsi::Runtime& runtime,
-    const std::string& methodName,
-    const jsi::Value* args,
-    size_t count) {
-  auto it = cxxMethods_.begin();
-  for (; it != cxxMethods_.end(); it++) {
-    auto method = *it;
-    if (method.name == methodName) {
-      break;
-    }
-  }
-
-  if (it == cxxMethods_.end()) {
-    throw std::runtime_error(
-        "Function '" + methodName + "' cannot be found on cxxmodule: " + name_);
-  }
-
-  auto method = *it;
-
-  if (method.syncFunc) {
-    auto innerArgs = folly::dynamic::array();
-    for (size_t i = 0; i < count; i++) {
-      innerArgs.push_back(jsi::dynamicFromValue(runtime, args[i]));
-    }
-    return jsi::valueFromDynamic(
-        runtime, method.syncFunc(std::move(innerArgs)));
-  } else if (method.func && !method.isPromise) {
-    // Async method.
-    CxxModule::Callback first;
-    CxxModule::Callback second;
-
-    if (count < method.callbacks) {
-      throw std::invalid_argument(
-          "Expected " + std::to_string(method.callbacks) +
-          " callbacks, but only " + std::to_string(count) +
-          " parameters provided");
-    }
-
-    if (method.callbacks == 1) {
-      auto wrapper = CallbackWrapper::createWeak(
-          args[count - 1].getObject(runtime).getFunction(runtime),
-          runtime,
-          jsInvoker_);
-      first = makeTurboCxxModuleCallback(wrapper);
-    } else if (method.callbacks == 2) {
-      auto wrapper1 = CallbackWrapper::createWeak(
-          args[count - 2].getObject(runtime).getFunction(runtime),
-          runtime,
-          jsInvoker_);
-      auto wrapper2 = CallbackWrapper::createWeak(
-          args[count - 1].getObject(runtime).getFunction(runtime),
-          runtime,
-          jsInvoker_);
-      first = makeTurboCxxModuleCallback(wrapper1);
-      second = makeTurboCxxModuleCallback(wrapper2);
-    }
-
-    auto innerArgs = folly::dynamic::array();
-    for (size_t i = 0; i < count - method.callbacks; i++) {
-      innerArgs.push_back(jsi::dynamicFromValue(runtime, args[i]));
-    }
-
-    method.func(std::move(innerArgs), first, second);
-  } else if (method.isPromise) {
-    return createPromiseAsJSIValue(
-        runtime,
-        [method, args, count, this](
-            jsi::Runtime& rt, std::shared_ptr<Promise> promise) {
-          auto resolveWrapper = CallbackWrapper::createWeak(
-              promise->resolve_.getFunction(rt), rt, jsInvoker_);
-          auto rejectWrapper = CallbackWrapper::createWeak(
-              promise->reject_.getFunction(rt), rt, jsInvoker_);
-          CxxModule::Callback resolve =
-              makeTurboCxxModuleCallback(resolveWrapper);
-          CxxModule::Callback reject =
-              makeTurboCxxModuleCallback(rejectWrapper);
-
-          auto innerArgs = folly::dynamic::array();
-          for (size_t i = 0; i < count; i++) {
-            innerArgs.push_back(jsi::dynamicFromValue(rt, args[i]));
-          }
-
-          method.func(std::move(innerArgs), resolve, reject);
-        });
-  }
-
-  return jsi::Value::undefined();
-}
-
-} // namespace facebook::react

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

@@ -1,40 +0,0 @@
-/*
- * 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.
- */
-
-#pragma once
-
-#include <memory>
-#include <vector>
-
-#include <cxxreact/CxxModule.h>
-
-#include "TurboModule.h"
-
-namespace facebook::react {
-
-/**
- * A helper class to convert the legacy CxxModule instance to a TurboModule
- * instance. This should be used only for migration purpose (to TurboModule),
- * since it's not very performant due to a lot of back-and-forth value
- * conversions between folly::dynamic and jsi::Value.
- */
-class JSI_EXPORT TurboCxxModule : public TurboModule {
- public:
-  TurboCxxModule(std::unique_ptr<facebook::xplat::module::CxxModule> cxxModule, std::shared_ptr<CallInvoker> jsInvoker);
-
-  facebook::jsi::Value create(facebook::jsi::Runtime &runtime, const facebook::jsi::PropNameID &propName) override;
-
-  std::vector<facebook::jsi::PropNameID> getPropertyNames(facebook::jsi::Runtime &runtime) override;
-
-  jsi::Value invokeMethod(jsi::Runtime &runtime, const std::string &methodName, const jsi::Value *args, size_t count);
-
- private:
-  std::vector<facebook::xplat::module::CxxModule::Method> cxxMethods_;
-  std::unique_ptr<facebook::xplat::module::CxxModule> cxxModule_;
-};
-
-} // namespace facebook::react