react-native 0.84.0-nightly-20251105-5ec5cc3a3 → 0.84.0-nightly-20251107-f8198f662

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/FabricEventDispatcher.kt

@@ -7,14 +7,12 @@
 
 package com.facebook.react.uimanager.events
 
-import android.os.Handler
 import android.view.Choreographer
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactSoftExceptionLogger
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.modules.core.ReactChoreographer
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.common.UIManagerType
@@ -41,19 +39,6 @@ internal class FabricEventDispatcher(
   private val postEventDispatchListeners = CopyOnWriteArrayList<BatchEventDispatchedListener>()
   private val currentFrameCallback = ScheduleDispatchFrameCallback()
 
-  private var isDispatchScheduled = false
-  private val dispatchEventsRunnable = Runnable {
-    isDispatchScheduled = false
-    Systrace.beginSection(Systrace.TRACE_TAG_REACT, "BatchEventDispatchedListeners")
-    try {
-      for (listener in postEventDispatchListeners) {
-        listener.onBatchEventDispatched()
-      }
-    } finally {
-      Systrace.endSection(Systrace.TRACE_TAG_REACT)
-    }
-  }
-
   init {
     reactContext.addLifecycleEventListener(this)
     eventEmitter.registerFabricEventEmitter(fabricEventEmitter)
@@ -109,14 +94,7 @@ internal class FabricEventDispatcher(
   }
 
   private fun scheduleDispatchOfBatchedEvents() {
-    if (ReactNativeFeatureFlags.useOptimizedEventBatchingOnAndroid()) {
-      if (!isDispatchScheduled) {
-        isDispatchScheduled = true
-        uiThreadHandler.postAtFrontOfQueue(dispatchEventsRunnable)
-      }
-    } else {
-      currentFrameCallback.maybeScheduleDispatchOfBatchedEvents()
-    }
+    currentFrameCallback.maybeScheduleDispatchOfBatchedEvents()
   }
 
   /** Add a listener to this EventDispatcher. */
@@ -139,9 +117,7 @@ internal class FabricEventDispatcher(
 
   override fun onHostResume() {
     scheduleDispatchOfBatchedEvents()
-    if (!ReactNativeFeatureFlags.useOptimizedEventBatchingOnAndroid()) {
-      currentFrameCallback.resume()
-    }
+    currentFrameCallback.resume()
   }
 
   override fun onHostPause() {
@@ -165,12 +141,7 @@ internal class FabricEventDispatcher(
 
   private fun cancelDispatchOfBatchedEvents() {
     UiThreadUtil.assertOnUiThread()
-    if (ReactNativeFeatureFlags.useOptimizedEventBatchingOnAndroid()) {
-      isDispatchScheduled = false
-      uiThreadHandler.removeCallbacks(dispatchEventsRunnable)
-    } else {
-      currentFrameCallback.stop()
-    }
+    currentFrameCallback.stop()
   }
 
   private inner class ScheduleDispatchFrameCallback : Choreographer.FrameCallback {
@@ -229,8 +200,4 @@ internal class FabricEventDispatcher(
       }
     }
   }
-
-  private companion object {
-    private val uiThreadHandler: Handler = UiThreadUtil.getUiThreadHandler()
-  }
 }

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

@@ -291,6 +291,10 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
 
   @Override
   public void setRemoveClippedSubviews(boolean removeClippedSubviews) {
+    if (ReactNativeFeatureFlags.disableSubviewClippingAndroid()) {
+      return;
+    }
+
     if (removeClippedSubviews && mClippingRect == null) {
       mClippingRect = new Rect();
     }

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

@@ -719,6 +719,10 @@ public class ReactScrollView extends ScrollView
 
   @Override
   public void setRemoveClippedSubviews(boolean removeClippedSubviews) {
+    if (ReactNativeFeatureFlags.disableSubviewClippingAndroid()) {
+      return;
+    }
+
     if (removeClippedSubviews && mClippingRect == null) {
       mClippingRect = new Rect();
     }

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

@@ -49,6 +49,13 @@ internal class VirtualViewContainerStateExperimental(scrollView: ViewGroup) :
     }
   }
 
+  override fun remove(virtualView: VirtualView) {
+    super.remove(virtualView)
+    HPV.remove(virtualView.virtualViewID)
+    P.remove(virtualView.virtualViewID)
+    V.remove(virtualView.virtualViewID)
+  }
+
   /**
    * Perform mode update check on a single VirtualView. Does not check other VirtualViews in the
    * collection. Use carefully

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.kt

@@ -32,6 +32,7 @@ import com.facebook.react.bridge.UiThreadUtil.assertOnUiThread
 import com.facebook.react.bridge.UiThreadUtil.runOnUiThread
 import com.facebook.react.common.ReactConstants.TAG
 import com.facebook.react.config.ReactFeatureFlags
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.touch.OnInterceptTouchEventListener
 import com.facebook.react.touch.ReactHitSlopView
 import com.facebook.react.touch.ReactInterceptingViewGroup
@@ -362,8 +363,17 @@ public open class ReactViewGroup public constructor(context: Context?) :
   }
 
   override var removeClippedSubviews: Boolean
-    get() = _removeClippedSubviews
+    get() {
+      if (ReactNativeFeatureFlags.disableSubviewClippingAndroid()) {
+        return false
+      }
+      return _removeClippedSubviews
+    }
     set(newValue) {
+      if (ReactNativeFeatureFlags.disableSubviewClippingAndroid()) {
+        return
+      }
+
       if (newValue == _removeClippedSubviews) {
         return
       }

package/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp

@@ -166,34 +166,39 @@ void FabricUIManagerBinding::startSurface(
     return;
   }
 
-  auto layoutContext = LayoutContext{};
-  layoutContext.pointScaleFactor = pointScaleFactor_;
+  SurfaceHandler* surfaceHandler = nullptr;
+  {
+    std::unique_lock lock(surfaceHandlerRegistryMutex_);
+    auto [it, _] = surfaceHandlerRegistry_.try_emplace(
+        surfaceId,
+        std::in_place_index<0>,
+        moduleName->toStdString(),
+        surfaceId);
+    surfaceHandler = &std::get<SurfaceHandler>(it->second);
+  }
 
-  auto surfaceHandler = SurfaceHandler{moduleName->toStdString(), surfaceId};
-  surfaceHandler.setContextContainer(scheduler->getContextContainer());
+  surfaceHandler->setContextContainer(scheduler->getContextContainer());
   if (initialProps != nullptr) {
-    surfaceHandler.setProps(initialProps->consume());
+    surfaceHandler->setProps(initialProps->consume());
   }
-  surfaceHandler.constraintLayout({}, layoutContext);
 
-  scheduler->registerSurface(surfaceHandler);
+  auto layoutContext = LayoutContext{};
+  layoutContext.pointScaleFactor = pointScaleFactor_;
+  surfaceHandler->constraintLayout({}, layoutContext);
+
+  scheduler->registerSurface(*surfaceHandler);
 
   auto mountingManager = getMountingManager("startSurface");
   if (mountingManager != nullptr) {
     mountingManager->onSurfaceStart(surfaceId);
   }
 
-  surfaceHandler.start();
+  surfaceHandler->start();
 
   if (ReactNativeFeatureFlags::enableLayoutAnimationsOnAndroid()) {
-    surfaceHandler.getMountingCoordinator()->setMountingOverrideDelegate(
+    surfaceHandler->getMountingCoordinator()->setMountingOverrideDelegate(
         animationDriver_);
   }
-
-  {
-    std::unique_lock lock(surfaceHandlerRegistryMutex_);
-    surfaceHandlerRegistry_.emplace(surfaceId, std::move(surfaceHandler));
-  }
 }
 
 jint FabricUIManagerBinding::findNextFocusableElement(
@@ -338,31 +343,36 @@ void FabricUIManagerBinding::startSurfaceWithConstraints(
   constraints.layoutDirection =
       isRTL != 0 ? LayoutDirection::RightToLeft : LayoutDirection::LeftToRight;
 
-  auto surfaceHandler = SurfaceHandler{moduleName->toStdString(), surfaceId};
-  surfaceHandler.setContextContainer(scheduler->getContextContainer());
+  SurfaceHandler* surfaceHandler = nullptr;
+  {
+    std::unique_lock lock(surfaceHandlerRegistryMutex_);
+    auto [it, _] = surfaceHandlerRegistry_.try_emplace(
+        surfaceId,
+        std::in_place_index<0>,
+        moduleName->toStdString(),
+        surfaceId);
+    surfaceHandler = &std::get<SurfaceHandler>(it->second);
+  }
+
+  surfaceHandler->setContextContainer(scheduler->getContextContainer());
   if (initialProps != nullptr) {
-    surfaceHandler.setProps(initialProps->consume());
+    surfaceHandler->setProps(initialProps->consume());
   }
-  surfaceHandler.constraintLayout(constraints, context);
+  surfaceHandler->constraintLayout(constraints, context);
 
-  scheduler->registerSurface(surfaceHandler);
+  scheduler->registerSurface(*surfaceHandler);
 
   auto mountingManager = getMountingManager("startSurfaceWithConstraints");
   if (mountingManager != nullptr) {
     mountingManager->onSurfaceStart(surfaceId);
   }
 
-  surfaceHandler.start();
+  surfaceHandler->start();
 
   if (ReactNativeFeatureFlags::enableLayoutAnimationsOnAndroid()) {
-    surfaceHandler.getMountingCoordinator()->setMountingOverrideDelegate(
+    surfaceHandler->getMountingCoordinator()->setMountingOverrideDelegate(
         animationDriver_);
   }
-
-  {
-    std::unique_lock lock(surfaceHandlerRegistryMutex_);
-    surfaceHandlerRegistry_.emplace(surfaceId, std::move(surfaceHandler));
-  }
 }
 
 // Used by non-bridgeless+Fabric

package/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.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<<b83a74b94f72ed85c7a5323bb56a38a0>>
+ * @generated SignedSource<<0527dbb4a838be34b80d76b11d18cea0>>
  */
 
 /**
@@ -87,6 +87,12 @@ class ReactNativeFeatureFlagsJavaProvider
     return method(javaProvider_);
   }
 
+  bool disableSubviewClippingAndroid() override {
+    static const auto method =
+        getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("disableSubviewClippingAndroid");
+    return method(javaProvider_);
+  }
+
   bool disableTextLayoutManagerCacheAndroid() override {
     static const auto method =
         getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("disableTextLayoutManagerCacheAndroid");
@@ -471,12 +477,6 @@ class ReactNativeFeatureFlagsJavaProvider
     return method(javaProvider_);
   }
 
-  bool useOptimizedEventBatchingOnAndroid() override {
-    static const auto method =
-        getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("useOptimizedEventBatchingOnAndroid");
-    return method(javaProvider_);
-  }
-
   bool useRawPropsJsiValue() override {
     static const auto method =
         getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("useRawPropsJsiValue");
@@ -575,6 +575,11 @@ bool JReactNativeFeatureFlagsCxxInterop::disableOldAndroidAttachmentMetricsWorka
   return ReactNativeFeatureFlags::disableOldAndroidAttachmentMetricsWorkarounds();
 }
 
+bool JReactNativeFeatureFlagsCxxInterop::disableSubviewClippingAndroid(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
+  return ReactNativeFeatureFlags::disableSubviewClippingAndroid();
+}
+
 bool JReactNativeFeatureFlagsCxxInterop::disableTextLayoutManagerCacheAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
   return ReactNativeFeatureFlags::disableTextLayoutManagerCacheAndroid();
@@ -895,11 +900,6 @@ bool JReactNativeFeatureFlagsCxxInterop::useNativeViewConfigsInBridgelessMode(
   return ReactNativeFeatureFlags::useNativeViewConfigsInBridgelessMode();
 }
 
-bool JReactNativeFeatureFlagsCxxInterop::useOptimizedEventBatchingOnAndroid(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
-  return ReactNativeFeatureFlags::useOptimizedEventBatchingOnAndroid();
-}
-
 bool JReactNativeFeatureFlagsCxxInterop::useRawPropsJsiValue(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
   return ReactNativeFeatureFlags::useRawPropsJsiValue();
@@ -1000,6 +1000,9 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
       makeNativeMethod(
         "disableOldAndroidAttachmentMetricsWorkarounds",
         JReactNativeFeatureFlagsCxxInterop::disableOldAndroidAttachmentMetricsWorkarounds),
+      makeNativeMethod(
+        "disableSubviewClippingAndroid",
+        JReactNativeFeatureFlagsCxxInterop::disableSubviewClippingAndroid),
       makeNativeMethod(
         "disableTextLayoutManagerCacheAndroid",
         JReactNativeFeatureFlagsCxxInterop::disableTextLayoutManagerCacheAndroid),
@@ -1192,9 +1195,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
       makeNativeMethod(
         "useNativeViewConfigsInBridgelessMode",
         JReactNativeFeatureFlagsCxxInterop::useNativeViewConfigsInBridgelessMode),
-      makeNativeMethod(
-        "useOptimizedEventBatchingOnAndroid",
-        JReactNativeFeatureFlagsCxxInterop::useOptimizedEventBatchingOnAndroid),
       makeNativeMethod(
         "useRawPropsJsiValue",
         JReactNativeFeatureFlagsCxxInterop::useRawPropsJsiValue),

package/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.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<<6238eb0739467af8477aa8fa79a023bf>>
+ * @generated SignedSource<<a1deb0145d8c51d608903e1704e96b8d>>
  */
 
 /**
@@ -54,6 +54,9 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool disableOldAndroidAttachmentMetricsWorkarounds(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool disableSubviewClippingAndroid(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static bool disableTextLayoutManagerCacheAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
@@ -246,9 +249,6 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool useNativeViewConfigsInBridgelessMode(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool useOptimizedEventBatchingOnAndroid(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
   static bool useRawPropsJsiValue(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 

package/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp

@@ -164,8 +164,6 @@ void CatalystInstanceImpl::initializeBridge(
     jni::alias_ref<JavaMessageQueueThread::javaobject> nativeModulesQueue,
     jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject>
         javaModules,
-    jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject>
-        cxxModules,
     jni::alias_ref<ReactInstanceManagerInspectorTarget::javaobject>
         inspectorTarget) {
   set_react_native_logfunc(&log);
@@ -194,10 +192,7 @@ void CatalystInstanceImpl::initializeBridge(
   // stack.
 
   moduleRegistry_ = std::make_shared<ModuleRegistry>(buildNativeModuleList(
-      std::weak_ptr<Instance>(instance_),
-      javaModules,
-      cxxModules,
-      moduleMessageQueue_));
+      std::weak_ptr<Instance>(instance_), javaModules, moduleMessageQueue_));
 
   instance_->initializeBridge(
       std::make_unique<InstanceCallbackImpl>(callback),
@@ -211,14 +206,9 @@ void CatalystInstanceImpl::initializeBridge(
 
 void CatalystInstanceImpl::extendNativeModules(
     jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject>
-        javaModules,
-    jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject>
-        cxxModules) {
+        javaModules) {
   moduleRegistry_->registerModules(buildNativeModuleList(
-      std::weak_ptr<Instance>(instance_),
-      javaModules,
-      cxxModules,
-      moduleMessageQueue_));
+      std::weak_ptr<Instance>(instance_), javaModules, moduleMessageQueue_));
 }
 
 void CatalystInstanceImpl::jniSetSourceURL(const std::string& sourceURL) {

package/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h

@@ -60,12 +60,9 @@ class [[deprecated("This API will be removed along with the legacy architecture.
       jni::alias_ref<JavaMessageQueueThread::javaobject> jsQueue,
       jni::alias_ref<JavaMessageQueueThread::javaobject> nativeModulesQueue,
       jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject> javaModules,
-      jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject> cxxModules,
       jni::alias_ref<ReactInstanceManagerInspectorTarget::javaobject> inspectorTarget);
 
-  void extendNativeModules(
-      jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject> javaModules,
-      jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject> cxxModules);
+  void extendNativeModules(jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject> javaModules);
 
   /**
    * Sets the source URL of the underlying bridge without loading any JS code.

package/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapperBase.h

@@ -7,10 +7,6 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
-
-#include <cxxreact/CxxModule.h>
 #include <fbjni/fbjni.h>
 
 namespace facebook::react {
@@ -19,24 +15,4 @@ struct JNativeModule : jni::JavaClass<JNativeModule> {
   constexpr static const char *const kJavaDescriptor = "Lcom/facebook/react/bridge/NativeModule;";
 };
 
-/**
- * The C++ part of a CxxModuleWrapper is not a unique class, but it
- * must extend this base class.
- */
-class CxxModuleWrapperBase : public jni::HybridClass<CxxModuleWrapperBase, JNativeModule> {
- public:
-  constexpr static const char *const kJavaDescriptor = "Lcom/facebook/react/bridge/CxxModuleWrapperBase;";
-
-  static void registerNatives()
-  {
-    registerHybrid({makeNativeMethod("getName", CxxModuleWrapperBase::getName)});
-  }
-
-  // JNI method
-  virtual std::string getName() = 0;
-
-  // Called by ModuleRegistryBuilder
-  virtual std::unique_ptr<xplat::module::CxxModule> getModule() = 0;
-};
-
 } // namespace facebook::react

package/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.cpp

@@ -9,7 +9,6 @@
 
 #include <glog/logging.h>
 
-#include <cxxreact/CxxModule.h>
 #include <cxxreact/CxxNativeModule.h>
 #include <cxxreact/Instance.h>
 #include <cxxreact/JsArgumentHelpers.h>

package/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.cpp

@@ -24,30 +24,13 @@ std::string ModuleHolder::getName() const {
 
 xplat::module::CxxModule::Provider ModuleHolder::getProvider(
     const std::string& moduleName) const {
-  return [self = jni::make_global(self()), moduleName] {
-    static auto getModule =
-        ModuleHolder::javaClassStatic()->getMethod<JNativeModule::javaobject()>(
-            "getModule");
-    // This is the call which uses the lazy Java Provider to instantiate the
-    // Java CxxModuleWrapper which contains the CxxModule.
-    auto module = getModule(self);
-
-    CHECK(module->isInstanceOf(CxxModuleWrapperBase::javaClassStatic()))
-        << "NativeModule '" << moduleName << "' isn't a C++ module";
-
-    auto cxxModule =
-        jni::static_ref_cast<CxxModuleWrapperBase::javaobject>(module);
-    // Then, we grab the CxxModule from the wrapper, which is no longer needed.
-    return cxxModule->cthis()->getModule();
-  };
+  return [self = jni::make_global(self()), moduleName] { return nullptr; };
 }
 
 std::vector<std::unique_ptr<NativeModule>> buildNativeModuleList(
     std::weak_ptr<Instance> winstance,
     jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject>
         javaModules,
-    jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject>
-        cxxModules,
     std::shared_ptr<MessageQueueThread> moduleMessageQueue) {
   std::vector<std::unique_ptr<NativeModule>> modules;
   if (javaModules) {
@@ -57,17 +40,6 @@ std::vector<std::unique_ptr<NativeModule>> buildNativeModuleList(
               winstance, jm, moduleMessageQueue));
     }
   }
-  if (cxxModules) {
-    for (const auto& cm : *cxxModules) {
-      std::string moduleName = cm->getName();
-      modules.emplace_back(
-          std::make_unique<CxxNativeModule>(
-              winstance,
-              moduleName,
-              cm->getProvider(moduleName),
-              moduleMessageQueue));
-    }
-  }
   return modules;
 }
 

package/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.h

@@ -11,7 +11,7 @@
 #include <cxxreact/ModuleRegistry.h>
 #include <fbjni/fbjni.h>
 
-#include "CxxModuleWrapper.h"
+#include "CxxModuleWrapperBase.h"
 #include "JavaModuleWrapper.h"
 
 #ifndef RCT_REMOVE_LEGACY_ARCH
@@ -33,7 +33,6 @@ class [[deprecated("This API will be removed along with the legacy architecture.
 std::vector<std::unique_ptr<NativeModule>> buildNativeModuleList(
     std::weak_ptr<Instance> winstance,
     jni::alias_ref<jni::JCollection<JavaModuleWrapper::javaobject>::javaobject> javaModules,
-    jni::alias_ref<jni::JCollection<ModuleHolder::javaobject>::javaobject> cxxModules,
     std::shared_ptr<MessageQueueThread> moduleMessageQueue);
 } // namespace facebook::react
 

package/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp

@@ -11,7 +11,6 @@
 #include <fbjni/fbjni.h>
 
 #include "CatalystInstanceImpl.h"
-#include "CxxModuleWrapperBase.h"
 #include "InspectorNetworkRequestListener.h"
 #include "JavaScriptExecutorHolder.h"
 #include "ReactInstanceManagerInspectorTarget.h"
@@ -42,7 +41,6 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
     CatalystInstanceImpl::registerNatives();
 #pragma clang diagnostic pop
 #endif
-    CxxModuleWrapperBase::registerNatives();
     ReactInstanceManagerInspectorTarget::registerNatives();
     InspectorNetworkRequestListener::registerNatives();
   });

package/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.cpp

@@ -13,11 +13,12 @@
 #include <glog/logging.h>
 #include <jni.h>
 #include <jsi/jsi.h>
-#include <jsireact/JSIExecutor.h>
 #include <react/jni/JRuntimeExecutor.h>
 #include <react/jni/JSLogging.h>
 #include <react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h>
 #include <react/runtime/BridgelessNativeMethodCallInvoker.h>
+#include <react/runtime/JSRuntimeBindings.h>
+
 #include "JavaTimerRegistry.h"
 
 namespace facebook::react {

package/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp

@@ -17,10 +17,9 @@
 #include <ReactCommon/BindingsInstallerHolder.h>
 #include <ReactCommon/CxxTurboModuleUtils.h>
 #include <ReactCommon/JavaInteropTurboModule.h>
-#include <ReactCommon/TurboCxxModule.h>
 #include <ReactCommon/TurboModuleBinding.h>
 #include <ReactCommon/TurboModulePerfLogger.h>
-#include <react/jni/CxxModuleWrapper.h>
+#include <react/jni/CxxModuleWrapperBase.h>
 
 namespace facebook::react {
 
@@ -208,22 +207,6 @@ std::shared_ptr<TurboModule> TurboModuleManager::getTurboModule(
     return turboModule;
   }
 
-  static auto getTurboLegacyCxxModule =
-      javaPart->getClass()
-          ->getMethod<jni::alias_ref<CxxModuleWrapper::javaobject>(
-              const std::string&)>("getTurboLegacyCxxModule");
-  auto legacyCxxModule = getTurboLegacyCxxModule(javaPart.get(), name);
-  if (legacyCxxModule) {
-    TurboModulePerfLogger::moduleJSRequireEndingStart(moduleName);
-
-    auto turboModule = std::make_shared<react::TurboCxxModule>(
-        legacyCxxModule->cthis()->getModule(), jsCallInvoker_);
-    turboModuleCache_.insert({name, turboModule});
-
-    TurboModulePerfLogger::moduleJSRequireEndingEnd(moduleName);
-    return turboModule;
-  }
-
   return nullptr;
 }
 
@@ -260,23 +243,6 @@ std::shared_ptr<TurboModule> TurboModuleManager::getLegacyModule(
 
   TurboModulePerfLogger::moduleJSRequireBeginningEnd(moduleName);
 
-  static auto getLegacyCxxModule =
-      javaPart->getClass()
-          ->getMethod<jni::alias_ref<CxxModuleWrapper::javaobject>(
-              const std::string&)>("getLegacyCxxModule");
-  auto legacyCxxModule = getLegacyCxxModule(javaPart.get(), name);
-
-  if (legacyCxxModule) {
-    TurboModulePerfLogger::moduleJSRequireEndingStart(moduleName);
-
-    auto turboModule = std::make_shared<react::TurboCxxModule>(
-        legacyCxxModule->cthis()->getModule(), jsCallInvoker_);
-    legacyModuleCache_.insert({name, turboModule});
-
-    TurboModulePerfLogger::moduleJSRequireEndingEnd(moduleName);
-    return turboModule;
-  }
-
   static auto getLegacyJavaModule =
       javaPart->getClass()
           ->getMethod<jni::alias_ref<JNativeModule>(const std::string&)>(

package/ReactCommon/cxxreact/React-cxxreact.podspec

@@ -44,6 +44,7 @@ Pod::Spec.new do |s|
   s.dependency "React-logger", version
   s.dependency "React-debug", version
   s.dependency "React-timing", version
+  add_dependency(s, "React-utils", :additional_framework_paths => ["react/utils/platform/ios"])
 
   s.resource_bundles = {'React-cxxreact_privacy' => 'PrivacyInfo.xcprivacy'}
 

package/ReactCommon/cxxreact/ReactMarker.cpp

@@ -6,7 +6,6 @@
  */
 
 #include "ReactMarker.h"
-#include <cxxreact/JSExecutor.h>
 
 namespace facebook::react::ReactMarker {
 

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -22,7 +22,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 84;
   int32_t Patch = 0;
-  std::string_view Prerelease = "nightly-20251105-5ec5cc3a3";
+  std::string_view Prerelease = "nightly-20251107-f8198f662";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/jsiexecutor/CMakeLists.txt

@@ -20,7 +20,9 @@ target_link_libraries(jsireact
         reactperflogger
         folly_runtime
         glog
-        jsi)
+        jserrorhandler
+        jsi
+        jsitooling)
 
 target_compile_reactnative_options(jsireact PRIVATE)
 target_compile_options(jsireact PRIVATE -O3)