react-native 0.83.0-nightly-20251003-aab0d3397 → 0.83.0-nightly-20251006-07f40ec6b

package/Libraries/Core/ReactNativeVersion.js

@@ -29,7 +29,7 @@ export default class ReactNativeVersion {
   static major: number = 0;
   static minor: number = 83;
   static patch: number = 0;
-  static prerelease: string | null = 'nightly-20251003-aab0d3397';
+  static prerelease: string | null = 'nightly-20251006-07f40ec6b';
 
   static getVersionString(): string {
     return `${this.major}.${this.minor}.${this.patch}${this.prerelease != null ? `-${this.prerelease}` : ''}`;

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(83),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"nightly-20251003-aab0d3397",
+                  RCTVersionPrerelease: @"nightly-20251006-07f40ec6b",
                   };
   });
   return __rnVersion;

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.83.0-nightly-20251003-aab0d3397
+VERSION_NAME=0.83.0-nightly-20251006-07f40ec6b
 react.internal.publishingGroup=com.facebook.react
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

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

@@ -15,6 +15,6 @@ public object ReactNativeVersion {
     "major" to 0,
     "minor" to 83,
     "patch" to 0,
-    "prerelease" to "nightly-20251003-aab0d3397"
+    "prerelease" to "nightly-20251006-07f40ec6b"
   )
 }

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

@@ -528,11 +528,24 @@ public class ReactScrollView extends ScrollView
   }
 
   private void scrollToChild(View child) {
+    // Only scroll the nearest ReactScrollView ancestor into view, rather than the focused child.
+    // Nested ScrollView instances will handle scrolling the child into their respective viewports.
+    View parent = child;
+    View scrollViewAncestor = null;
+    while (parent != null && parent != this) {
+      if (parent instanceof ReactScrollView) {
+        scrollViewAncestor = parent;
+      }
+      parent = (View) parent.getParent();
+    }
+
+    View scrollIntoViewTarget = scrollViewAncestor != null ? scrollViewAncestor : child;
+
     Rect tempRect = new Rect();
-    child.getDrawingRect(tempRect);
+    scrollIntoViewTarget.getDrawingRect(tempRect);
 
     /* Offset from child's local coordinates to ScrollView coordinates */
-    offsetDescendantRectToMyCoords(child, tempRect);
+    offsetDescendantRectToMyCoords(scrollIntoViewTarget, tempRect);
 
     int scrollDelta = computeScrollDeltaToGetChildRectOnScreen(tempRect);
 

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -22,7 +22,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 83;
   int32_t Patch = 0;
-  std::string_view Prerelease = "nightly-20251003-aab0d3397";
+  std::string_view Prerelease = "nightly-20251006-07f40ec6b";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/hermes/executor/HermesExecutorFactory.cpp

@@ -15,11 +15,6 @@
 
 #include <hermes/inspector-modern/chrome/HermesRuntimeTargetDelegate.h>
 
-#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
-#include <hermes/inspector-modern/chrome/Registration.h>
-#include <hermes/inspector/RuntimeAdapter.h>
-#endif
-
 using namespace facebook::hermes;
 using namespace facebook::jsi;
 
@@ -27,43 +22,6 @@ namespace facebook::react {
 
 namespace {
 
-#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
-
-class HermesExecutorRuntimeAdapter
-    : public facebook::hermes::inspector_modern::RuntimeAdapter {
- public:
-  HermesExecutorRuntimeAdapter(
-      std::shared_ptr<HermesRuntime> runtime,
-      std::shared_ptr<MessageQueueThread> thread)
-      : runtime_(runtime), thread_(std::move(thread)) {}
-
-  virtual ~HermesExecutorRuntimeAdapter() = default;
-
-  HermesRuntime& getRuntime() override {
-    return *runtime_;
-  }
-
-  void tickleJs() override {
-    thread_->runOnQueue(
-        [weakRuntime = std::weak_ptr<HermesRuntime>(runtime_)]() {
-          auto runtime = weakRuntime.lock();
-          if (!runtime) {
-            return;
-          }
-          jsi::Function func =
-              runtime->global().getPropertyAsFunction(*runtime, "__tickleJs");
-          func.call(*runtime);
-        });
-  }
-
- private:
-  std::shared_ptr<HermesRuntime> runtime_;
-
-  std::shared_ptr<MessageQueueThread> thread_;
-};
-
-#endif // defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
-
 struct ReentrancyCheck {
 // This is effectively a very subtle and complex assert, so only
 // include it in builds which would include asserts.
@@ -147,42 +105,17 @@ class DecoratedRuntime : public jsi::WithRuntimeDecorator<ReentrancyCheck> {
       const std::string& debuggerName)
       : jsi::WithRuntimeDecorator<ReentrancyCheck>(*runtime, reentrancyCheck_),
         runtime_(std::move(runtime)) {
-#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
-    enableDebugger_ = enableDebugger;
-    if (enableDebugger_) {
-      std::shared_ptr<HermesRuntime> rt(runtime_, &hermesRuntime);
-      auto adapter =
-          std::make_unique<HermesExecutorRuntimeAdapter>(rt, jsQueue);
-      debugToken_ = facebook::hermes::inspector_modern::chrome::enableDebugging(
-          std::move(adapter), debuggerName);
-    }
-#else
     (void)jsQueue;
-#endif // HERMES_ENABLE_DEBUGGER
   }
 
-  ~DecoratedRuntime() {
-#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
-    if (enableDebugger_) {
-      facebook::hermes::inspector_modern::chrome::disableDebugging(debugToken_);
-    }
-#endif // HERMES_ENABLE_DEBUGGER
-  }
+  ~DecoratedRuntime() {}
 
  private:
   // runtime_ is a potentially decorated Runtime.
   // hermesRuntime is a reference to a HermesRuntime managed by runtime_.
-  //
-  // HermesExecutorRuntimeAdapter requirements are kept, because the
-  // dtor will disable debugging on the HermesRuntime before the
-  // member managing it is destroyed.
 
   std::shared_ptr<Runtime> runtime_;
   ReentrancyCheck reentrancyCheck_;
-#if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)
-  bool enableDebugger_;
-  facebook::hermes::inspector_modern::chrome::DebugSessionToken debugToken_;
-#endif // HERMES_ENABLE_DEBUGGER
 };
 
 } // namespace

package/ReactCommon/jsinspector-modern/tests/InspectorMocks.h

@@ -97,6 +97,7 @@ class MockInspectorPackagerConnectionDelegate
             executor_.add(callback);
           }
         }));
+    EXPECT_CALL(*this, scheduleCallback(_, _)).Times(AnyNumber());
   }
 
   // InspectorPackagerConnectionDelegate methods
@@ -168,6 +169,15 @@ class MockRuntimeTargetDelegate : public RuntimeTargetDelegate {
       collectSamplingProfile,
       (),
       (override));
+
+  inline MockRuntimeTargetDelegate() {
+    using namespace testing;
+
+    // Silence "uninteresting mock function call" warnings for methods that
+    // don't have side effects.
+
+    EXPECT_CALL(*this, supportsConsole()).Times(AnyNumber());
+  }
 };
 
 class MockRuntimeAgentDelegate : public RuntimeAgentDelegate {

package/ReactCommon/jsinspector-modern/tests/InspectorPackagerConnectionTest.cpp

@@ -49,6 +49,8 @@ class InspectorPackagerConnectionTestBase : public testing::Test {
           socket->getDelegate().didOpen();
           return std::move(socket);
         });
+    EXPECT_CALL(*packagerConnectionDelegate(), connectWebSocket(_, _))
+        .Times(AnyNumber());
   }
 
   void TearDown() override {

package/ReactCommon/jsinspector-modern/tests/JsiIntegrationTest.h

@@ -47,9 +47,8 @@ class JsiIntegrationPortableTestBase : public ::testing::Test,
  protected:
   Executor executor_;
 
-  JsiIntegrationPortableTestBase()
-      : inspectorFlagsGuard_{EngineAdapter::getInspectorFlagOverrides()},
-        engineAdapter_{executor_} {}
+  JsiIntegrationPortableTestBase(InspectorFlagOverrides overrides = {})
+      : inspectorFlagsGuard_(overrides), engineAdapter_{executor_} {}
 
   void SetUp() override {
     // NOTE: Using SetUp() so we can call virtual methods like