react-native 0.83.0-rc.0 → 0.84.0-nightly-20251106-de5141a3d

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<<13ed11b5c260fae79048ea80745d22fe>>
+ * @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");
@@ -429,12 +435,6 @@ class ReactNativeFeatureFlagsJavaProvider
     return method(javaProvider_);
   }
 
-  bool sweepActiveTouchOnChildNativeGesturesAndroid() override {
-    static const auto method =
-        getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("sweepActiveTouchOnChildNativeGesturesAndroid");
-    return method(javaProvider_);
-  }
-
   bool traceTurboModulePromiseRejectionsOnAndroid() override {
     static const auto method =
         getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("traceTurboModulePromiseRejectionsOnAndroid");
@@ -477,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");
@@ -581,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();
@@ -866,11 +865,6 @@ bool JReactNativeFeatureFlagsCxxInterop::skipActivityIdentityAssertionOnHostPaus
   return ReactNativeFeatureFlags::skipActivityIdentityAssertionOnHostPause();
 }
 
-bool JReactNativeFeatureFlagsCxxInterop::sweepActiveTouchOnChildNativeGesturesAndroid(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
-  return ReactNativeFeatureFlags::sweepActiveTouchOnChildNativeGesturesAndroid();
-}
-
 bool JReactNativeFeatureFlagsCxxInterop::traceTurboModulePromiseRejectionsOnAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
   return ReactNativeFeatureFlags::traceTurboModulePromiseRejectionsOnAndroid();
@@ -906,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();
@@ -1011,6 +1000,9 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
       makeNativeMethod(
         "disableOldAndroidAttachmentMetricsWorkarounds",
         JReactNativeFeatureFlagsCxxInterop::disableOldAndroidAttachmentMetricsWorkarounds),
+      makeNativeMethod(
+        "disableSubviewClippingAndroid",
+        JReactNativeFeatureFlagsCxxInterop::disableSubviewClippingAndroid),
       makeNativeMethod(
         "disableTextLayoutManagerCacheAndroid",
         JReactNativeFeatureFlagsCxxInterop::disableTextLayoutManagerCacheAndroid),
@@ -1182,9 +1174,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
       makeNativeMethod(
         "skipActivityIdentityAssertionOnHostPause",
         JReactNativeFeatureFlagsCxxInterop::skipActivityIdentityAssertionOnHostPause),
-      makeNativeMethod(
-        "sweepActiveTouchOnChildNativeGesturesAndroid",
-        JReactNativeFeatureFlagsCxxInterop::sweepActiveTouchOnChildNativeGesturesAndroid),
       makeNativeMethod(
         "traceTurboModulePromiseRejectionsOnAndroid",
         JReactNativeFeatureFlagsCxxInterop::traceTurboModulePromiseRejectionsOnAndroid),
@@ -1206,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<<1e57bf8252c16fc10bbfcae08710af85>>
+ * @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>);
 
@@ -225,9 +228,6 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool skipActivityIdentityAssertionOnHostPause(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
-  static bool sweepActiveTouchOnChildNativeGesturesAndroid(
-    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
-
   static bool traceTurboModulePromiseRejectionsOnAndroid(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
@@ -249,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/JSLoader.cpp

@@ -72,7 +72,7 @@ loadScriptFromAssets(AAssetManager* manager, const std::string& assetName) {
       }
 
       auto buf = std::make_unique<JSBigBufferString>(script->size());
-      memcpy(buf->data(), script->c_str(), script->size());
+      memcpy(buf->mutableData(), script->c_str(), script->size());
       return buf;
     }
   }

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

@@ -10,11 +10,12 @@
 #include <string>
 
 #include <android/asset_manager.h>
-#include <cxxreact/JSExecutor.h>
 #include <fbjni/fbjni.h>
 
 namespace facebook::react {
 
+class JSBigString;
+
 struct JAssetManager : jni::JavaClass<JAssetManager> {
   static constexpr auto kJavaDescriptor = "Landroid/content/res/AssetManager;";
 };

package/ReactAndroid/src/main/res/devsupport/drawable/ic_perf_issue.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M80,880L80,160Q80,127 103.5,103.5Q127,80 160,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,640Q880,673 856.5,696.5Q833,720 800,720L240,720L80,880ZM480,600Q497,600 508.5,588.5Q520,577 520,560Q520,543 508.5,531.5Q497,520 480,520Q463,520 451.5,531.5Q440,543 440,560Q440,577 451.5,588.5Q463,600 480,600ZM440,440L520,440L520,200L440,200L440,440Z"/>
+</vector>

package/ReactCommon/cxxreact/JSBigString.h

@@ -10,6 +10,8 @@
 #include <memory>
 #include <string>
 
+#include <jsi/jsi.h>
+
 #ifndef RN_EXPORT
 #ifdef _MSC_VER
 #define RN_EXPORT
@@ -27,15 +29,17 @@ namespace facebook::react {
 // large string needs to be curried into a std::function<>, which must
 // by CopyConstructible.
 
-class JSBigString {
+class JSBigString : public facebook::jsi::Buffer {
  public:
   JSBigString() = default;
 
-  // Not copyable
+  // Not copyable or movable
   JSBigString(const JSBigString &) = delete;
   JSBigString &operator=(const JSBigString &) = delete;
+  JSBigString(JSBigString &&) = delete;
+  JSBigString &operator=(JSBigString &&) = delete;
 
-  virtual ~JSBigString() = default;
+  ~JSBigString() override = default;
 
   virtual bool isAscii() const = 0;
 
@@ -43,7 +47,12 @@ class JSBigString {
   virtual const char *c_str() const = 0;
 
   // Length of the c_str without the NULL byte.
-  virtual size_t size() const = 0;
+  size_t size() const override = 0;
+
+  const uint8_t *data() const final
+  {
+    return reinterpret_cast<const uint8_t *>(c_str());
+  }
 };
 
 // Concrete JSBigString implementation which holds a std::string
@@ -105,7 +114,7 @@ class RN_EXPORT JSBigBufferString : public JSBigString {
     return m_size;
   }
 
-  char *data()
+  char *mutableData()
   {
     return m_data;
   }

package/ReactCommon/cxxreact/JSIndexedRAMBundle.cpp

@@ -60,8 +60,8 @@ void JSIndexedRAMBundle::init() {
       "header size must exactly match the input file format");
 
   readBundle(reinterpret_cast<char*>(header), sizeof(header));
-  const size_t numTableEntries = folly::Endian::little(header[1]);
-  const size_t startupCodeSize = folly::Endian::little(header[2]);
+  size_t numTableEntries = folly::Endian::little(header[1]);
+  std::streamsize startupCodeSize = folly::Endian::little(header[2]);
 
   // allocate memory for meta data and lookup table.
   m_table = ModuleTable(numTableEntries);
@@ -73,7 +73,7 @@ void JSIndexedRAMBundle::init() {
   // read the startup code
   m_startupCode = std::make_unique<JSBigBufferString>(startupCodeSize - 1);
 
-  readBundle(m_startupCode->data(), startupCodeSize - 1);
+  readBundle(m_startupCode->mutableData(), startupCodeSize - 1);
 }
 
 JSIndexedRAMBundle::Module JSIndexedRAMBundle::getModule(
@@ -109,8 +109,7 @@ std::string JSIndexedRAMBundle::getModuleCode(const uint32_t id) const {
   return ret;
 }
 
-void JSIndexedRAMBundle::readBundle(char* buffer, const std::streamsize bytes)
-    const {
+void JSIndexedRAMBundle::readBundle(char* buffer, std::streamsize bytes) const {
   if (!m_bundle->read(buffer, bytes)) {
     if ((m_bundle->rdstate() & std::ios::eofbit) != 0) {
       throw std::ios_base::failure("Unexpected end of RAM Bundle file");

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/ReactNativeVersion.h

@@ -13,16 +13,16 @@
 #include <string_view>
 
 #define REACT_NATIVE_VERSION_MAJOR 0
-#define REACT_NATIVE_VERSION_MINOR 83
+#define REACT_NATIVE_VERSION_MINOR 84
 #define REACT_NATIVE_VERSION_PATCH 0
 
 namespace facebook::react {
 
 constexpr struct {
   int32_t Major = 0;
-  int32_t Minor = 83;
+  int32_t Minor = 84;
   int32_t Patch = 0;
-  std::string_view Prerelease = "rc.0";
+  std::string_view Prerelease = "nightly-20251106-de5141a3d";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/jsiexecutor/React-jsiexecutor.podspec

@@ -37,6 +37,7 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern')
   add_dependency(s, "React-jsinspectorcdp", :framework_name => 'jsinspector_moderncdp')
   add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing')
+  add_dependency(s, "React-utils", :additional_framework_paths => ["react/utils/platform/ios"])
   if use_hermes()
     s.dependency 'hermes-engine'
   end

package/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp

@@ -168,8 +168,7 @@ void JSIExecutor::loadBundle(
     ReactMarker::logTaggedMarker(
         ReactMarker::RUN_JS_BUNDLE_START, scriptName.c_str());
   }
-  runtime_->evaluateJavaScript(
-      std::make_unique<BigStringBuffer>(std::move(script)), sourceURL);
+  runtime_->evaluateJavaScript(std::move(script), sourceURL);
   flush();
   if (hasLogger) {
     ReactMarker::logTaggedMarker(
@@ -212,7 +211,7 @@ void JSIExecutor::registerBundle(
           "Empty bundle registered with ID " + tag + " from " + bundlePath);
     }
     runtime_->evaluateJavaScript(
-        std::make_unique<BigStringBuffer>(std::move(script)),
+        std::move(script),
         JSExecutor::getSyntheticBundlePath(bundleId, bundlePath));
   }
   ReactMarker::logTaggedMarker(

package/ReactCommon/jsiexecutor/jsireact/JSIExecutor.h

@@ -49,7 +49,7 @@ namespace facebook::react {
 using JSIScopedTimeoutInvoker =
     std::function<void(const std::function<void()> &invokee, std::function<std::string()> errorMessageProducer)>;
 
-class BigStringBuffer : public jsi::Buffer {
+class [[deprecated("JSBigString implements jsi::Buffer directly")]] BigStringBuffer : public jsi::Buffer {
  public:
   BigStringBuffer(std::unique_ptr<const JSBigString> script) : script_(std::move(script)) {}
 
@@ -60,7 +60,7 @@ class BigStringBuffer : public jsi::Buffer {
 
   const uint8_t *data() const override
   {
-    return reinterpret_cast<const uint8_t *>(script_->c_str());
+    return script_->data();
   }
 
  private:

package/ReactCommon/jsinspector-modern/PerfMonitorV2.cpp

@@ -21,7 +21,15 @@ void PerfMonitorUpdateHandler::handlePerfIssueAdded(
     delegate_.unstable_onPerfIssueAdded(
         PerfIssuePayload{
             .name = payload["name"].asString(),
-            .severity = payload["severity"].asString(),
+            .severity = payload["severity"].isNull()
+                ? std::nullopt
+                : std::make_optional(payload["severity"].asString()),
+            .description = payload["description"].isNull()
+                ? std::nullopt
+                : std::make_optional(payload["description"].asString()),
+            .learnMoreUrl = payload["learnMoreUrl"].isNull()
+                ? std::nullopt
+                : std::make_optional(payload["learnMoreUrl"].asString()),
         });
   }
 }

package/ReactCommon/jsinspector-modern/PerfMonitorV2.h

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <optional>
 #include <string>
 
 namespace facebook::react::jsinspector_modern {
@@ -15,7 +16,9 @@ class HostTargetDelegate;
 
 struct PerfIssuePayload {
   std::string name;
-  std::string severity;
+  std::optional<std::string> severity;
+  std::optional<std::string> description;
+  std::optional<std::string> learnMoreUrl;
 };
 
 /**

package/ReactCommon/jsinspector-modern/TracingAgent.cpp

@@ -26,12 +26,8 @@ const uint16_t TRACE_EVENT_CHUNK_SIZE = 1000;
 /**
  * The maximum number of ProfileChunk trace events
  * that will be sent in a single CDP Tracing.dataCollected message.
- * TODO(T219394401): Increase the size once we manage the queue on OkHTTP
- side
- * properly and avoid WebSocket disconnections when sending a message larger
- * than 16MB.
  */
-const uint16_t PROFILE_TRACE_EVENT_CHUNK_SIZE = 1;
+const uint16_t PROFILE_TRACE_EVENT_CHUNK_SIZE = 10;
 
 } // namespace
 
@@ -53,7 +49,6 @@ TracingAgent::~TracingAgent() {
 
 bool TracingAgent::handleRequest(const cdp::PreparsedRequest& req) {
   if (req.method == "Tracing.start") {
-    // @cdp Tracing.start support is experimental.
     if (sessionState_.isDebuggerDomainEnabled) {
       frontendChannel_(
           cdp::jsonError(
@@ -81,7 +76,6 @@ bool TracingAgent::handleRequest(const cdp::PreparsedRequest& req) {
 
     return true;
   } else if (req.method == "Tracing.end") {
-    // @cdp Tracing.end support is experimental.
     auto state = hostTargetController_.stopTracing();
 
     sessionState_.hasPendingTraceRecording = false;

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

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "JsiIntegrationTest.h"
+#include "TracingTest.h"
 #include "engines/JsiIntegrationTestHermesEngineAdapter.h"
 
 #include <folly/executors/QueuedImmediateExecutor.h>
@@ -31,13 +31,13 @@ struct NetworkReporterTestParams {
  */
 template <typename Params>
   requires std::convertible_to<Params, NetworkReporterTestParams>
-class NetworkReporterTestBase : public JsiIntegrationPortableTestBase<
+class NetworkReporterTestBase : public TracingTestBase<
                                     JsiIntegrationTestHermesEngineAdapter,
                                     folly::QueuedImmediateExecutor>,
                                 public WithParamInterface<Params> {
  protected:
   NetworkReporterTestBase()
-      : JsiIntegrationPortableTestBase({
+      : TracingTestBase({
             .networkInspectionEnabled = true,
             .enableNetworkEventReporting =
                 WithParamInterface<Params>::GetParam()
@@ -68,58 +68,6 @@ class NetworkReporterTestBase : public JsiIntegrationPortableTestBase<
         urlMatcher);
   }
 
-  void startTracing() {
-    this->expectMessageFromPage(JsonEq(R"({
-                                          "id": 1,
-                                          "result": {}
-                                        })"));
-
-    this->toPage_->sendMessage(R"({
-                                  "id": 1,
-                                  "method": "Tracing.start"
-                                })");
-  }
-
-  /**
-   * Helper method to end tracing and collect all trace events from potentially
-   * multiple chunked Tracing.dataCollected messages.
-   * \returns A vector containing all collected trace events
-   */
-  std::vector<folly::dynamic> endTracingAndCollectEvents() {
-    InSequence s;
-
-    this->expectMessageFromPage(JsonEq(R"({
-                                          "id": 1,
-                                          "result": {}
-                                        })"));
-
-    std::vector<folly::dynamic> allTraceEvents;
-
-    EXPECT_CALL(
-        fromPage(),
-        onMessage(JsonParsed(AtJsonPtr("/method", "Tracing.dataCollected"))))
-        .Times(AtLeast(1))
-        .WillRepeatedly(Invoke([&allTraceEvents](const std::string& message) {
-          auto parsedMessage = folly::parseJson(message);
-          auto& events = parsedMessage.at("params").at("value");
-          allTraceEvents.insert(
-              allTraceEvents.end(),
-              std::make_move_iterator(events.begin()),
-              std::make_move_iterator(events.end()));
-        }));
-
-    this->expectMessageFromPage(JsonParsed(AllOf(
-        AtJsonPtr("/method", "Tracing.tracingComplete"),
-        AtJsonPtr("/params/dataLossOccurred", false))));
-
-    this->toPage_->sendMessage(R"({
-                                  "id": 1,
-                                  "method": "Tracing.end"
-                                })");
-
-    return allTraceEvents;
-  }
-
  private:
   std::optional<std::string> getScriptUrlById(const std::string& scriptId) {
     auto it = scriptUrlsById_.find(scriptId);

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

@@ -0,0 +1,82 @@
+/*
+ * 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 "JsiIntegrationTest.h"
+
+#include <folly/dynamic.h>
+#include <folly/json.h>
+#include <gmock/gmock.h>
+#include <vector>
+
+#include "FollyDynamicMatchers.h"
+
+namespace facebook::react::jsinspector_modern {
+
+/**
+ * Base test class providing tracing-related test utilities for tests.
+ */
+template <typename EngineAdapter, typename Executor>
+class TracingTestBase : public JsiIntegrationPortableTestBase<EngineAdapter, Executor> {
+ protected:
+  using JsiIntegrationPortableTestBase<EngineAdapter, Executor>::JsiIntegrationPortableTestBase;
+
+  /**
+   * Helper method to start tracing via Tracing.start CDP command.
+   */
+  void startTracing()
+  {
+    this->expectMessageFromPage(JsonEq(R"({
+                                          "id": 1,
+                                          "result": {}
+                                        })"));
+
+    this->toPage_->sendMessage(R"({
+                                  "id": 1,
+                                  "method": "Tracing.start"
+                                })");
+  }
+
+  /**
+   * Helper method to end tracing and collect all trace events from potentially
+   * multiple chunked Tracing.dataCollected messages.
+   * \returns A vector containing all collected trace events
+   */
+  std::vector<folly::dynamic> endTracingAndCollectEvents()
+  {
+    testing::InSequence s;
+
+    this->expectMessageFromPage(JsonEq(R"({
+                                          "id": 1,
+                                          "result": {}
+                                        })"));
+
+    std::vector<folly::dynamic> allTraceEvents;
+
+    EXPECT_CALL(this->fromPage(), onMessage(JsonParsed(AtJsonPtr("/method", "Tracing.dataCollected"))))
+        .Times(testing::AtLeast(1))
+        .WillRepeatedly(testing::Invoke([&allTraceEvents](const std::string &message) {
+          auto parsedMessage = folly::parseJson(message);
+          auto &events = parsedMessage.at("params").at("value");
+          allTraceEvents.insert(
+              allTraceEvents.end(), std::make_move_iterator(events.begin()), std::make_move_iterator(events.end()));
+        }));
+
+    this->expectMessageFromPage(JsonParsed(
+        testing::AllOf(AtJsonPtr("/method", "Tracing.tracingComplete"), AtJsonPtr("/params/dataLossOccurred", false))));
+
+    this->toPage_->sendMessage(R"({
+                                  "id": 1,
+                                  "method": "Tracing.end"
+                                })");
+
+    return allTraceEvents;
+  }
+};
+
+} // namespace facebook::react::jsinspector_modern