react-native-tvos 0.81.4-0 → 0.82.0-0

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

@@ -19,7 +19,9 @@ namespace facebook::react {
 
 class Instance;
 
-struct JReflectMethod : public jni::JavaClass<JReflectMethod> {
+struct [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] JReflectMethod
+    : public jni::JavaClass<JReflectMethod> {
   static constexpr auto kJavaDescriptor = "Ljava/lang/reflect/Method;";
 
   jmethodID getMethodID() {
@@ -29,12 +31,15 @@ struct JReflectMethod : public jni::JavaClass<JReflectMethod> {
   }
 };
 
-struct JBaseJavaModule : public jni::JavaClass<JBaseJavaModule> {
+struct [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] JBaseJavaModule
+    : public jni::JavaClass<JBaseJavaModule> {
   static constexpr auto kJavaDescriptor =
       "Lcom/facebook/react/bridge/BaseJavaModule;";
 };
 
-class MethodInvoker {
+class [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] MethodInvoker {
  public:
   MethodInvoker(
       jni::alias_ref<JReflectMethod::javaobject> method,

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

@@ -20,7 +20,9 @@ namespace facebook::react {
 
 class MessageQueueThread;
 
-class ModuleHolder : public jni::JavaClass<ModuleHolder> {
+class [[deprecated(
+    "This API will be removed along with the legacy architecture.")]] ModuleHolder
+    : public jni::JavaClass<ModuleHolder> {
  public:
   static auto constexpr kJavaDescriptor =
       "Lcom/facebook/react/bridge/ModuleHolder;";
@@ -30,6 +32,7 @@ class ModuleHolder : public jni::JavaClass<ModuleHolder> {
       const std::string& moduleName) const;
 };
 
+[[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>

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

@@ -5,8 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <string>
-
 #include <glog/logging.h>
 
 #include <fb/glog_init.h>
@@ -15,7 +13,6 @@
 #include "CatalystInstanceImpl.h"
 #include "CxxModuleWrapperBase.h"
 #include "InspectorNetworkRequestListener.h"
-#include "JInspector.h"
 #include "JavaScriptExecutorHolder.h"
 #include "ReactInstanceManagerInspectorTarget.h"
 
@@ -40,10 +37,12 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
     FLAGS_minloglevel = 0;
 #endif
 #ifndef RCT_FIT_RM_OLD_RUNTIME
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     CatalystInstanceImpl::registerNatives();
+#pragma clang diagnostic pop
 #endif
     CxxModuleWrapperBase::registerNatives();
-    JInspector::registerNatives();
     ReactInstanceManagerInspectorTarget::registerNatives();
     InspectorNetworkRequestListener::registerNatives();
   });

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

@@ -53,7 +53,7 @@ void ReactInstanceManagerInspectorTarget::TargetDelegate::loadNetworkResource(
 }
 
 ReactInstanceManagerInspectorTarget::ReactInstanceManagerInspectorTarget(
-    jni::alias_ref<ReactInstanceManagerInspectorTarget::jhybridobject> jobj,
+    jni::alias_ref<ReactInstanceManagerInspectorTarget::jhybridobject> /*jobj*/,
     jni::alias_ref<JExecutor::javaobject> javaExecutor,
     jni::alias_ref<ReactInstanceManagerInspectorTarget::TargetDelegate>
         delegate)

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

@@ -30,7 +30,8 @@ void addDynamicToJArray(
       break;
     }
     case folly::dynamic::Type::BOOL: {
-      (*jarray)[index] = JBoolean::valueOf(dyn.getBool());
+      (*jarray)[index] =
+          JBoolean::valueOf(static_cast<unsigned char>(dyn.getBool()));
       break;
     }
     case folly::dynamic::Type::INT64: {
@@ -104,7 +105,7 @@ local_ref<JArrayClass<jobject>> ReadableNativeMap::importTypes() {
 local_ref<ReadableNativeMap::jhybridobject>
 ReadableNativeMap::createWithContents(folly::dynamic&& map) {
   if (map.isNull()) {
-    return local_ref<jhybridobject>(nullptr);
+    return {nullptr};
   }
 
   if (!map.isObject()) {

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

@@ -61,7 +61,7 @@ void WritableNativeMap::putString(std::string key, alias_ref<jstring> val) {
 void WritableNativeMap::putNativeArray(
     std::string key,
     ReadableNativeArray* otherArray) {
-  if (!otherArray) {
+  if (otherArray == nullptr) {
     putNull(std::move(key));
     return;
   }
@@ -72,7 +72,7 @@ void WritableNativeMap::putNativeArray(
 void WritableNativeMap::putNativeMap(
     std::string key,
     ReadableNativeMap* otherMap) {
-  if (!otherMap) {
+  if (otherMap == nullptr) {
     putNull(std::move(key));
     return;
   }
@@ -84,7 +84,7 @@ void WritableNativeMap::mergeNativeMap(ReadableNativeMap* other) {
   throwIfConsumed();
   other->throwIfConsumed();
 
-  for (auto sourceIt : other->map_.items()) {
+  for (const auto& sourceIt : other->map_.items()) {
     map_[sourceIt.first] = sourceIt.second;
   }
 }

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

@@ -37,8 +37,8 @@ struct WritableNativeMap
   void putInt(std::string key, int val);
   void putLong(std::string key, jlong val);
   void putString(std::string key, jni::alias_ref<jstring> val);
-  void putNativeArray(std::string key, ReadableNativeArray* val);
-  void putNativeMap(std::string key, ReadableNativeMap* val);
+  void putNativeArray(std::string key, ReadableNativeArray* otherArray);
+  void putNativeMap(std::string key, ReadableNativeMap* otherMap);
   void mergeNativeMap(ReadableNativeMap* other);
 
   static void registerNatives();

package/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JWritableMapBuffer.cpp

@@ -38,7 +38,7 @@ MapBuffer JWritableMapBuffer::getMapBuffer() {
 
     if (value->isInstanceOf(booleanClass)) {
       auto element = jni::static_ref_cast<jni::JBoolean>(value);
-      builder.putBool(key, element->value());
+      builder.putBool(key, element->value() != 0u);
     } else if (value->isInstanceOf(integerClass)) {
       auto element = jni::static_ref_cast<jni::JInteger>(value);
       builder.putInt(key, element->value());

package/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultComponentsRegistry.cpp

@@ -23,11 +23,12 @@ std::function<void(std::shared_ptr<const ComponentDescriptorProviderRegistry>)>
         registerCodegenComponentDescriptorsFromEntryPoint{};
 
 void DefaultComponentsRegistry::setRegistryRunction(
-    jni::alias_ref<jclass>,
+    jni::alias_ref<jclass> /*unused*/,
     ComponentFactory* delegate) {
   delegate
       ->buildRegistryFunction = [](const EventDispatcher::Weak& eventDispatcher,
-                                   const ContextContainer::Shared&
+                                   const std::shared_ptr<
+                                       const ContextContainer>&
                                        contextContainer) {
     ComponentDescriptorParameters params{
         .eventDispatcher = eventDispatcher,

package/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.cpp

@@ -39,7 +39,7 @@ std::function<std::shared_ptr<TurboModule>(
 
 jni::local_ref<DefaultTurboModuleManagerDelegate::jhybriddata>
 DefaultTurboModuleManagerDelegate::initHybrid(
-    jni::alias_ref<jclass> jClass,
+    jni::alias_ref<jclass> /*jClass*/,
     jni::alias_ref<jni::JList<CxxReactPackage::javaobject>::javaobject>
         cxxReactPackages) {
   return makeCxxInstance(cxxReactPackages);
@@ -57,7 +57,7 @@ std::shared_ptr<TurboModule> DefaultTurboModuleManagerDelegate::getTurboModule(
     const std::shared_ptr<CallInvoker>& jsInvoker) {
   for (const auto& cxxReactPackage : cxxReactPackages_) {
     auto cppPart = cxxReactPackage->cthis();
-    if (cppPart) {
+    if (cppPart != nullptr) {
       auto module = cppPart->getModule(name, jsInvoker);
       if (module) {
         return module;

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

@@ -10,7 +10,7 @@
 #include "DefaultComponentsRegistry.h"
 #include "DefaultTurboModuleManagerDelegate.h"
 
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* /*unused*/) {
   return facebook::jni::initialize(vm, [] {
     facebook::react::DefaultTurboModuleManagerDelegate::registerNatives();
     facebook::react::DefaultComponentsRegistry::registerNatives();

package/ReactAndroid/src/main/jni/react/reactnativeblob/BlobCollector.cpp

@@ -9,7 +9,7 @@
 
 #include <fbjni/fbjni.h>
 #include <memory>
-#include <mutex>
+#include <utility>
 
 using namespace facebook;
 
@@ -20,8 +20,8 @@ static constexpr auto kBlobModuleJavaDescriptor =
 
 BlobCollector::BlobCollector(
     jni::global_ref<jobject> blobModule,
-    const std::string& blobId)
-    : blobModule_(blobModule), blobId_(blobId) {}
+    std::string blobId)
+    : blobModule_(std::move(blobModule)), blobId_(std::move(blobId)) {}
 
 BlobCollector::~BlobCollector() {
   jni::ThreadScope::WithClassLoader([&] {
@@ -41,7 +41,7 @@ size_t BlobCollector::getBlobLength() {
 }
 
 void BlobCollector::nativeInstall(
-    jni::alias_ref<jclass>,
+    jni::alias_ref<jclass> /*unused*/,
     jni::alias_ref<jobject> blobModule,
     jlong jsContextNativePointer) {
   auto& runtime = *((jsi::Runtime*)jsContextNativePointer);
@@ -55,9 +55,9 @@ void BlobCollector::nativeInstall(
           1,
           [blobModuleRef](
               jsi::Runtime& rt,
-              const jsi::Value& thisVal,
+              const jsi::Value& /*thisVal*/,
               const jsi::Value* args,
-              size_t count) {
+              size_t /*count*/) {
             auto blobId = args[0].asString(rt).utf8(rt);
             auto blobCollector =
                 std::make_shared<BlobCollector>(blobModuleRef, blobId);

package/ReactAndroid/src/main/jni/react/reactnativeblob/BlobCollector.h

@@ -15,7 +15,7 @@ namespace facebook::react {
 class BlobCollector : public jni::HybridClass<BlobCollector>,
                       public jsi::HostObject {
  public:
-  BlobCollector(jni::global_ref<jobject> blobModule, const std::string& blobId);
+  BlobCollector(jni::global_ref<jobject> blobModule, std::string blobId);
   ~BlobCollector();
 
   size_t getBlobLength();

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

@@ -9,7 +9,7 @@
 
 #include "BlobCollector.h"
 
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) {
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* /*unused*/) {
   return facebook::jni::initialize(
       vm, [] { facebook::react::BlobCollector::registerNatives(); });
 }

package/ReactAndroid/src/main/jni/react/runtime/hermes/jni/CMakeLists.txt

@@ -19,7 +19,7 @@ target_include_directories(hermesinstancejni PRIVATE .)
 target_merge_so(hermesinstancejni)
 
 target_link_libraries(hermesinstancejni
-        hermes-engine::libhermes
+        hermes-engine::hermesvm
         jsitooling
         fbjni
         bridgelesshermes
@@ -29,4 +29,8 @@ target_link_libraries(hermesinstancejni
 target_compile_reactnative_options(hermesinstancejni PRIVATE)
 if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
   target_compile_options(hermesinstancejni PRIVATE -DHERMES_ENABLE_DEBUGGER=1)
+
+  if (HERMES_V1_ENABLED)
+        target_compile_options(hermesinstancejni PRIVATE -DHERMES_V1_ENABLED=1)
+  endif()
 endif ()

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

@@ -9,7 +9,7 @@
 
 #include "JHermesInstance.h"
 
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* /*unused*/) {
   return facebook::jni::initialize(
       vm, [] { facebook::react::JHermesInstance::registerNatives(); });
 }

package/ReactAndroid/src/main/jni/react/runtime/jni/CMakeLists.txt

@@ -19,6 +19,10 @@ add_library(rninstance
 target_compile_reactnative_options(rninstance PRIVATE)
 if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
   target_compile_options(rninstance PRIVATE -DHERMES_ENABLE_DEBUGGER=1)
+
+  if (HERMES_V1_ENABLED)
+        target_compile_options(rninstance PRIVATE -DHERMES_V1_ENABLED=1)
+  endif()
 endif ()
 
 target_merge_so(rninstance)

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

@@ -17,9 +17,11 @@ using namespace facebook::react::jsinspector_modern;
 
 namespace facebook::react {
 JReactHostInspectorTarget::JReactHostInspectorTarget(
+    alias_ref<JReactHostInspectorTarget::javaobject> jobj,
     alias_ref<JReactHostImpl> reactHostImpl,
     alias_ref<JExecutor::javaobject> executor)
-    : javaReactHostImpl_(make_global(makeJWeakReference(reactHostImpl))),
+    : jobj_(make_global(jobj)),
+      javaReactHostImpl_(make_global(makeJWeakReference(reactHostImpl))),
       inspectorExecutor_([javaExecutor =
                               // Use a SafeReleaseJniRef because this lambda may
                               // be copied to arbitrary threads.
@@ -62,10 +64,10 @@ JReactHostInspectorTarget::~JReactHostInspectorTarget() {
 
 local_ref<JReactHostInspectorTarget::jhybriddata>
 JReactHostInspectorTarget::initHybrid(
-    alias_ref<JReactHostInspectorTarget::jhybridobject> self,
+    alias_ref<JReactHostInspectorTarget::jhybridobject> jobj,
     jni::alias_ref<JReactHostImpl> reactHostImpl,
     jni::alias_ref<JExecutor::javaobject> javaExecutor) {
-  return makeCxxInstance(reactHostImpl, javaExecutor);
+  return makeCxxInstance(jobj, reactHostImpl, javaExecutor);
 }
 
 void JReactHostInspectorTarget::sendDebuggerResumeCommand() {
@@ -78,15 +80,6 @@ void JReactHostInspectorTarget::sendDebuggerResumeCommand() {
   }
 }
 
-void JReactHostInspectorTarget::registerNatives() {
-  registerHybrid({
-      makeNativeMethod("initHybrid", JReactHostInspectorTarget::initHybrid),
-      makeNativeMethod(
-          "sendDebuggerResumeCommand",
-          JReactHostInspectorTarget::sendDebuggerResumeCommand),
-  });
-}
-
 jsinspector_modern::HostTargetMetadata
 JReactHostInspectorTarget::getMetadata() {
   jsinspector_modern::HostTargetMetadata metadata = {
@@ -114,7 +107,7 @@ JReactHostInspectorTarget::getMetadata() {
   return metadata;
 }
 
-void JReactHostInspectorTarget::onReload(const PageReloadRequest& request) {
+void JReactHostInspectorTarget::onReload(const PageReloadRequest& /*request*/) {
   if (auto javaReactHostImplStrong = javaReactHostImpl_->get()) {
     javaReactHostImplStrong->reload("CDP Page.reload");
   }
@@ -127,6 +120,17 @@ void JReactHostInspectorTarget::onSetPausedInDebuggerMessage(
   }
 }
 
+void JReactHostInspectorTarget::unstable_onPerfMonitorUpdate(
+    const PerfMonitorUpdateRequest& request) {
+  static auto method = javaClassStatic()->getMethod<void(jint, jint, jint)>(
+      "handleNativePerfMonitorMetricUpdate");
+  method(
+      jobj_,
+      request.activeInteraction.duration,
+      static_cast<jint>(request.activeInteraction.responsivenessScore),
+      request.activeInteraction.ttl);
+}
+
 void JReactHostInspectorTarget::loadNetworkResource(
     const jsinspector_modern::LoadNetworkResourceRequest& params,
     jsinspector_modern::ScopedExecutor<
@@ -143,4 +147,71 @@ void JReactHostInspectorTarget::loadNetworkResource(
 HostTarget* JReactHostInspectorTarget::getInspectorTarget() {
   return inspectorTarget_ ? inspectorTarget_.get() : nullptr;
 }
+
+bool JReactHostInspectorTarget::startBackgroundTrace() {
+  if (inspectorTarget_) {
+    return inspectorTarget_->startTracing(tracing::Mode::Background);
+  } else {
+    jni::throwNewJavaException(
+        "java/lang/IllegalStateException",
+        "Cannot start Tracing session while the Fusebox backend is not enabled.");
+  }
+}
+
+tracing::TraceRecordingState JReactHostInspectorTarget::stopTracing() {
+  if (inspectorTarget_) {
+    return inspectorTarget_->stopTracing();
+  } else {
+    jni::throwNewJavaException(
+        "java/lang/IllegalStateException",
+        "Cannot stop Tracing session while the Fusebox backend is not enabled.");
+  }
+}
+
+void JReactHostInspectorTarget::stopAndStashBackgroundTrace() {
+  auto capturedTrace = inspectorTarget_->stopTracing();
+  stashTraceRecordingState(std::move(capturedTrace));
+}
+
+void JReactHostInspectorTarget::stopAndDiscardBackgroundTrace() {
+  inspectorTarget_->stopTracing();
+}
+
+void JReactHostInspectorTarget::stashTraceRecordingState(
+    tracing::TraceRecordingState&& state) {
+  stashedTraceRecordingState_ = std::move(state);
+}
+
+std::optional<tracing::TraceRecordingState> JReactHostInspectorTarget::
+    unstable_getTraceRecordingThatWillBeEmittedOnInitialization() {
+  auto state = std::move(stashedTraceRecordingState_);
+  stashedTraceRecordingState_.reset();
+  return state;
+}
+
+void JReactHostInspectorTarget::registerNatives() {
+  registerHybrid({
+      makeNativeMethod("initHybrid", JReactHostInspectorTarget::initHybrid),
+      makeNativeMethod(
+          "sendDebuggerResumeCommand",
+          JReactHostInspectorTarget::sendDebuggerResumeCommand),
+      makeNativeMethod(
+          "startBackgroundTrace",
+          JReactHostInspectorTarget::startBackgroundTrace),
+      makeNativeMethod(
+          "stopAndStashBackgroundTrace",
+          JReactHostInspectorTarget::stopAndStashBackgroundTrace),
+      makeNativeMethod(
+          "stopAndDiscardBackgroundTrace",
+          JReactHostInspectorTarget::stopAndDiscardBackgroundTrace),
+      makeNativeMethod(
+          "tracingStateAsInt", JReactHostInspectorTarget::tracingState),
+  });
+}
+
+jint JReactHostInspectorTarget::tracingState() {
+  auto state = inspectorTarget_->tracingState();
+  return static_cast<jint>(state);
+}
+
 } // namespace facebook::react

package/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.h

@@ -20,6 +20,11 @@ struct JTaskInterface : public jni::JavaClass<JTaskInterface> {
       "Lcom/facebook/react/interfaces/TaskInterface;";
 };
 
+struct JTracingState : public jni::JavaClass<JTracingState> {
+  static constexpr auto kJavaDescriptor =
+      "Lcom/facebook/react/devsupport/TracingState;";
+};
+
 struct JReactHostImpl : public jni::JavaClass<JReactHostImpl> {
   static constexpr auto kJavaDescriptor =
       "Lcom/facebook/react/runtime/ReactHostImpl;";
@@ -70,29 +75,59 @@ class JReactHostInspectorTarget
   ~JReactHostInspectorTarget() override;
 
   static jni::local_ref<JReactHostInspectorTarget::jhybriddata> initHybrid(
-      jni::alias_ref<JReactHostInspectorTarget::jhybridobject> jThis,
+      jni::alias_ref<JReactHostInspectorTarget::jhybridobject> jobj,
       jni::alias_ref<JReactHostImpl> reactHost,
       jni::alias_ref<JExecutor::javaobject> javaExecutor);
 
   static void registerNatives();
   void sendDebuggerResumeCommand();
 
+  /**
+   * Starts a background trace recording for this HostTarget.
+   *
+   * \return false if already tracing, true otherwise.
+   */
+  bool startBackgroundTrace();
+  /**
+   * Stops previously started trace recording and stashes the captured trace,
+   * which will be emitted the next time CDP session is created.
+   */
+  void stopAndStashBackgroundTrace();
+  /**
+   * Get the state of the background trace: running, stopped, or disabled
+   * Background tracing will be disabled if there is no metro connection or if
+   * there is a CDP initiate trace in progress.
+   *
+   * \return the background trace state
+   */
+  jint tracingState();
+  /**
+   * Stops previously started trace recording and discards the captured trace.
+   */
+  void stopAndDiscardBackgroundTrace();
+
   jsinspector_modern::HostTarget* getInspectorTarget();
 
   // HostTargetDelegate methods
   jsinspector_modern::HostTargetMetadata getMetadata() override;
   void onReload(const PageReloadRequest& request) override;
   void onSetPausedInDebuggerMessage(
-      const OverlaySetPausedInDebuggerMessageRequest&) override;
+      const OverlaySetPausedInDebuggerMessageRequest& request) override;
+  void unstable_onPerfMonitorUpdate(
+      const jsinspector_modern::PerfMonitorUpdateRequest& request) override;
   void loadNetworkResource(
       const jsinspector_modern::LoadNetworkResourceRequest& params,
       jsinspector_modern::ScopedExecutor<
           jsinspector_modern::NetworkRequestListener> executor) override;
+  std::optional<jsinspector_modern::tracing::TraceRecordingState>
+  unstable_getTraceRecordingThatWillBeEmittedOnInitialization() override;
 
  private:
   JReactHostInspectorTarget(
+      jni::alias_ref<JReactHostInspectorTarget::javaobject> jobj,
       jni::alias_ref<JReactHostImpl> reactHostImpl,
       jni::alias_ref<JExecutor::javaobject> javaExecutor);
+  jni::global_ref<JReactHostInspectorTarget::javaobject> jobj_;
   // This weak reference breaks the cycle between the C++ HostTarget and the
   // Java ReactHostImpl, preventing memory leaks in apps that create multiple
   // ReactHostImpls over time.
@@ -102,6 +137,24 @@ class JReactHostInspectorTarget
   std::shared_ptr<jsinspector_modern::HostTarget> inspectorTarget_;
   std::optional<int> inspectorPageId_;
 
+  /**
+   * Stops previously started trace recording and returns the captured trace.
+   */
+  jsinspector_modern::tracing::TraceRecordingState stopTracing();
+  /**
+   * Stashes previously recorded trace recording state that will be emitted when
+   * CDP session is created. Once emitted, the value will be cleared from this
+   * instance.
+   */
+  void stashTraceRecordingState(
+      jsinspector_modern::tracing::TraceRecordingState&& state);
+  /**
+   * Previously recorded trace recording state that will be emitted when
+   * CDP session is created.
+   */
+  std::optional<jsinspector_modern::tracing::TraceRecordingState>
+      stashedTraceRecordingState_;
+
   friend HybridBase;
 };
 } // namespace facebook::react

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

@@ -7,11 +7,13 @@
 
 #include "JavaTimerRegistry.h"
 
+#include <utility>
+
 namespace facebook::react {
 
 JavaTimerRegistry::JavaTimerRegistry(
     jni::global_ref<JJavaTimerManager::javaobject> javaTimerManager)
-    : javaTimerManager_(javaTimerManager) {}
+    : javaTimerManager_(std::move(javaTimerManager)) {}
 
 void JavaTimerRegistry::createTimer(uint32_t timerID, double delayMS) {
   javaTimerManager_->createTimer(timerID, delayMS, /* repeat */ false);

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

@@ -12,14 +12,14 @@
 #include "TurboModuleManager.h"
 
 void jniEnableCppLogging(
-    facebook::jni::alias_ref<jclass> cls,
+    facebook::jni::alias_ref<jclass> /*cls*/,
     facebook::jni::alias_ref<
         facebook::react::JNativeModulePerfLogger::javaobject> perfLogger) {
   facebook::react::TurboModulePerfLogger::enableLogging(
       perfLogger->cthis()->get());
 }
 
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* /*unused*/) {
   return facebook::jni::initialize(vm, [] {
     // TODO: dvacca ramanpreet unify this with the way
     // "ComponentDescriptorFactory" is defined in Fabric

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

@@ -326,15 +326,13 @@ void TurboModuleManager::installJSIBindings(
     return; // Runtime doesn't exist when attached to Chrome debugger.
   }
 
-  cxxPart->runtimeExecutor_([cxxPart,
-                             javaPart = jni::make_global(javaPart),
+  cxxPart->runtimeExecutor_([javaPart = jni::make_global(javaPart),
                              shouldCreateLegacyModules](jsi::Runtime& runtime) {
     TurboModuleBinding::install(
         runtime,
-        cxxPart->createTurboModuleProvider(javaPart, &runtime),
-        shouldCreateLegacyModules
-            ? cxxPart->createLegacyModuleProvider(javaPart)
-            : nullptr);
+        createTurboModuleProvider(javaPart, &runtime),
+        shouldCreateLegacyModules ? createLegacyModuleProvider(javaPart)
+                                  : nullptr);
   });
 }
 

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

@@ -10,7 +10,7 @@
 #include "ComponentNameResolverBinding.h"
 #include "UIConstantsProviderBinding.h"
 
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* /*unused*/) {
   return facebook::jni::initialize(vm, [] {
     facebook::react::ComponentNameResolverBinding::registerNatives();
     facebook::react::UIConstantsProviderBinding::registerNatives();

package/ReactAndroid/src/main/res/devsupport/values/strings.xml

@@ -10,6 +10,9 @@
   <string name="catalyst_change_bundle_location_cancel" project="catalyst" translatable="false">Cancel</string>
   <string name="catalyst_open_debugger_error" project="catalyst" translatable="false">Failed to open DevTools. Please check that the dev server is running and reload the app.</string>
   <string name="catalyst_debug_open" project="catalyst" translatable="false">Open DevTools</string>
+  <string name="catalyst_performance_background" project="catalyst" translatable="false">Finish performance trace</string>
+  <string name="catalyst_performance_disabled" project="catalyst" translatable="false">Start performance trace</string>
+  <string name="catalyst_performance_cdp" project="catalyst" translatable="false">Performance tracing disabled</string>
   <string name="catalyst_debug_open_disabled" project="catalyst" translatable="false">Connect to the bundler to debug JavaScript</string>
   <string name="catalyst_debug_connecting" project="catalyst" translatable="false">Connecting to debugger...</string>
   <string name="catalyst_debug_error" project="catalyst" translatable="false">Failed to connect to debugger!</string>
@@ -29,6 +32,6 @@
   <string name="catalyst_report_button" project="catalyst" translatable="false">Report</string>
   <string name="catalyst_loading_from_url" project="catalyst" translatable="false">Loading from %1$s…</string>
   <string name="catalyst_sample_profiler_toggle" project="catalyst" translatable="false">Toggle Sampling Profiler</string>
-  <string name="catalyst_dev_menu_header" project="catalyst" translatable="false">React Native Dev Menu (%1$s)</string>
+  <string name="catalyst_dev_menu_header" project="catalyst" translatable="false">React Native Dev Menu</string>
   <string name="catalyst_dev_menu_sub_header" project="catalyst" translatable="false">Running %1$s</string>
 </resources>

package/ReactAndroid/src/main/res/views/uimanager/values-am/strings.xml

@@ -3,4 +3,5 @@
 <!-- @generated -->
 <!-- FB Locale: am_ET -->
 <resources exclude-from-buck-resource-map="true">
+    <string name="link_description" gender="unknown">አገናኝ</string>
 </resources>

package/ReactCommon/React-Fabric.podspec

@@ -146,6 +146,7 @@ Pod::Spec.new do |s|
     ss.source_files         = podspec_sources("react/renderer/scheduler/**/*.{m,mm,cpp,h}", "react/renderer/scheduler/**/*.h")
     ss.header_dir           = "react/renderer/scheduler"
 
+    ss.dependency             "React-performancecdpmetrics"
     ss.dependency             "React-performancetimeline"
     ss.dependency             "React-Fabric/observers/events"
   end

package/ReactCommon/React-FabricComponents.podspec

@@ -149,6 +149,12 @@ Pod::Spec.new do |s|
       sss.header_dir           = "react/renderer/components/virtualview"
     end
 
+     ss.subspec "virtualviewexperimental" do |sss|
+      sss.source_files         = "react/renderer/components/virtualviewexperimental/**/*.{m,mm,cpp,h}"
+      sss.exclude_files        = "react/renderer/components/virtualviewexperimental/tests"
+      sss.header_dir           = "react/renderer/components/virtualviewexperimental"
+    end
+
     # Legacy header paths for backwards compat
     ss.subspec "rncore" do |sss|
       sss.source_files         = podspec_sources("react/renderer/components/rncore/**/*.h", "react/renderer/components/rncore/**/*.h")