react-native-tvos 0.83.2-0 → 0.84.0-0

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

@@ -8,19 +8,113 @@
 #pragma once
 
 #include <fbjni/fbjni.h>
+
 #include <jsinspector-modern/HostTarget.h>
 #include <react/jni/InspectorNetworkRequestListener.h>
 #include <react/jni/JExecutor.h>
+
+#include <mutex>
+#include <optional>
 #include <string>
+#include <vector>
 
 namespace facebook::react {
 
+struct JTracingState : public jni::JavaClass<JTracingState> {
+  static constexpr auto kJavaDescriptor = "Lcom/facebook/react/devsupport/inspector/TracingState;";
+};
+
+namespace {
+
+enum class TracingState {
+  Disabled,
+  EnabledInBackgroundMode,
+  EnabledInCDPMode,
+};
+
+jni::local_ref<JTracingState::javaobject> convertCPPTracingStateToJava(TracingState tracingState)
+{
+  auto tracingStateClass = jni::findClassLocal("com/facebook/react/devsupport/inspector/TracingState");
+  auto valueOfMethod = tracingStateClass->getStaticMethod<JTracingState(jstring)>("valueOf");
+
+  switch (tracingState) {
+    case TracingState::Disabled:
+      return valueOfMethod(tracingStateClass, jni::make_jstring("DISABLED").get());
+
+    case TracingState::EnabledInBackgroundMode:
+      return valueOfMethod(tracingStateClass, jni::make_jstring("ENABLED_IN_BACKGROUND_MODE").get());
+
+    case TracingState::EnabledInCDPMode:
+      return valueOfMethod(tracingStateClass, jni::make_jstring("ENABLED_IN_CDP_MODE").get());
+
+    default:
+      jni::throwNewJavaException("java/lang/IllegalStateException", "Unexpected new TracingState.");
+  }
+}
+
+} // namespace
+
 struct JTaskInterface : public jni::JavaClass<JTaskInterface> {
   static constexpr auto kJavaDescriptor = "Lcom/facebook/react/interfaces/TaskInterface;";
 };
 
-struct JTracingState : public jni::JavaClass<JTracingState> {
-  static constexpr auto kJavaDescriptor = "Lcom/facebook/react/devsupport/TracingState;";
+struct JTracingStateListener : public jni::JavaClass<JTracingStateListener> {
+  static constexpr auto kJavaDescriptor = "Lcom/facebook/react/devsupport/inspector/TracingStateListener;";
+
+  void onStateChanged(TracingState tracingState, bool screenshotsEnabled) const
+  {
+    static auto method =
+        javaClassStatic()->getMethod<void(jni::local_ref<JTracingState::javaobject>, jboolean)>("onStateChanged");
+    return method(self(), convertCPPTracingStateToJava(tracingState), static_cast<jboolean>(screenshotsEnabled));
+  }
+};
+
+struct JFrameTimingSequence : public jni::JavaClass<JFrameTimingSequence> {
+  static constexpr auto kJavaDescriptor = "Lcom/facebook/react/devsupport/inspector/FrameTimingSequence;";
+
+  uint64_t getId() const
+  {
+    auto field = javaClassStatic()->getField<jint>("id");
+    return static_cast<uint64_t>(getFieldValue(field));
+  }
+
+  uint64_t getThreadId() const
+  {
+    auto field = javaClassStatic()->getField<jint>("threadId");
+    return static_cast<uint64_t>(getFieldValue(field));
+  }
+
+  HighResTimeStamp getBeginDrawingTimestamp() const
+  {
+    auto field = javaClassStatic()->getField<jlong>("beginDrawingTimestamp");
+    return HighResTimeStamp::fromChronoSteadyClockTimePoint(
+        std::chrono::steady_clock::time_point(std::chrono::nanoseconds(getFieldValue(field))));
+  }
+
+  HighResTimeStamp getCommitTimestamp() const
+  {
+    auto field = javaClassStatic()->getField<jlong>("commitTimestamp");
+    return HighResTimeStamp::fromChronoSteadyClockTimePoint(
+        std::chrono::steady_clock::time_point(std::chrono::nanoseconds(getFieldValue(field))));
+  }
+
+  HighResTimeStamp getEndDrawingTimestamp() const
+  {
+    auto field = javaClassStatic()->getField<jlong>("endDrawingTimestamp");
+    return HighResTimeStamp::fromChronoSteadyClockTimePoint(
+        std::chrono::steady_clock::time_point(std::chrono::nanoseconds(getFieldValue(field))));
+  }
+
+  std::optional<std::string> getScreenshot() const
+  {
+    auto field = javaClassStatic()->getField<jstring>("screenshot");
+    auto javaScreenshot = getFieldValue(field);
+    if (javaScreenshot) {
+      auto jstring = jni::static_ref_cast<jni::JString>(javaScreenshot);
+      return jstring->toStdString();
+    }
+    return std::nullopt;
+  }
 };
 
 struct JReactHostImpl : public jni::JavaClass<JReactHostImpl> {
@@ -55,6 +149,65 @@ struct JReactHostImpl : public jni::JavaClass<JReactHostImpl> {
   }
 };
 
+/**
+ * A callback that will be invoked when tracing state has changed.
+ */
+using TracingStateListener = std::function<void(TracingState state, bool screenshotsCategoryEnabled)>;
+
+class TracingDelegate : public jsinspector_modern::HostTargetTracingDelegate {
+ public:
+  void onTracingStarted(jsinspector_modern::tracing::Mode tracingMode, bool screenshotsCategoryEnabled) override;
+  void onTracingStopped() override;
+
+  /**
+   * A synchronous way to get the current tracing state.
+   * Could be called from any thread.
+   */
+  TracingState getTracingState();
+  /**
+   * Register a listener that will be notified when the tracing state changes.
+   * Could be called from any thread.
+   */
+  size_t registerTracingStateListener(TracingStateListener listener);
+  /**
+   * Unregister previously registered listener with the id returned from
+   * TracingDelegate::registerTracingStateListener().
+   */
+  void unregisterTracingStateListener(size_t subscriptionId);
+
+ private:
+  /**
+   * Covers read / write operations on tracingState_ and subscriptions_.
+   */
+  std::mutex mutex_;
+  /**
+   * Since HostInspectorTarget creates HostTarget, the default value is Disabled.
+   * However, the TracingDelegate is subscribed at the construction of HostTarget, so it will be notified as early as
+   * possible.
+   */
+  TracingState tracingState_ = TracingState::Disabled;
+  /**
+   * Map of subscription ID to listener.
+   */
+  std::unordered_map<size_t, TracingStateListener> subscriptions_;
+  /**
+   * A counter for generating unique subscription IDs.
+   */
+  uint64_t nextSubscriptionId_ = 0;
+  /**
+   * Returns a collection of listeners that are subscribed at the time of the call.
+   * Expected to be only called with mutex_ locked.
+   */
+  std::vector<TracingStateListener> copySubscribedListeners();
+  /**
+   * Notifies specified listeners about the state change.
+   */
+  void notifyListeners(
+      const std::vector<TracingStateListener> &listeners,
+      TracingState state,
+      bool screenshotsCategoryEnabled);
+};
+
 class JReactHostInspectorTarget : public jni::HybridClass<JReactHostInspectorTarget>,
                                   public jsinspector_modern::HostTargetDelegate {
  public:
@@ -70,14 +223,6 @@ class JReactHostInspectorTarget : public jni::HybridClass<JReactHostInspectorTar
   static void registerNatives();
   void sendDebuggerResumeCommand();
 
-  /**
-   * 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();
   /**
    * Starts a background trace recording for this HostTarget.
    *
@@ -99,6 +244,31 @@ class JReactHostInspectorTarget : public jni::HybridClass<JReactHostInspectorTar
 
   jsinspector_modern::HostTarget *getInspectorTarget();
 
+  /**
+   * Get the current tracing state. Could be called from any thread.
+   */
+  jni::local_ref<JTracingState::javaobject> getTracingState();
+
+  /**
+   * Register a listener that will be notified when the tracing state changes.
+   * Could be called from any thread.
+   *
+   * \return A unique subscription ID to use for unregistering the listener.
+   */
+  jlong registerTracingStateListener(jni::alias_ref<JTracingStateListener::javaobject> listener);
+
+  /**
+   * Unregister a previously registered tracing state listener.
+   *
+   * \param subscriptionId The subscription ID returned from JReactHostInspectorTarget::registerTracingStateListener.
+   */
+  void unregisterTracingStateListener(jlong subscriptionId);
+
+  /**
+   * Propagate frame timings information to the Inspector's Tracing subsystem.
+   */
+  void recordFrameTimings(jni::alias_ref<JFrameTimingSequence::javaobject> frameTimingSequence);
+
   // HostTargetDelegate methods
   jsinspector_modern::HostTargetMetadata getMetadata() override;
   void onReload(const PageReloadRequest &request) override;
@@ -107,8 +277,9 @@ class JReactHostInspectorTarget : public jni::HybridClass<JReactHostInspectorTar
   void loadNetworkResource(
       const jsinspector_modern::LoadNetworkResourceRequest &params,
       jsinspector_modern::ScopedExecutor<jsinspector_modern::NetworkRequestListener> executor) override;
-  std::optional<jsinspector_modern::tracing::TraceRecordingState>
-  unstable_getTraceRecordingThatWillBeEmittedOnInitialization() override;
+  std::optional<jsinspector_modern::tracing::HostTracingProfile>
+  unstable_getHostTracingProfileThatWillBeEmittedOnInitialization() override;
+  jsinspector_modern::HostTargetTracingDelegate *getTracingDelegate() override;
 
  private:
   JReactHostInspectorTarget(
@@ -126,20 +297,23 @@ class JReactHostInspectorTarget : public jni::HybridClass<JReactHostInspectorTar
   std::optional<int> inspectorPageId_;
 
   /**
-   * Stops previously started trace recording and returns the captured trace.
+   * Stops previously started trace recording and returns the captured HostTracingProfile.
    */
-  jsinspector_modern::tracing::TraceRecordingState stopTracing();
+  jsinspector_modern::tracing::HostTracingProfile stopTracing();
   /**
-   * Stashes previously recorded trace recording state that will be emitted when
+   * Stashes previously recorded HostTracingProfile 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);
+  void stashTracingProfile(jsinspector_modern::tracing::HostTracingProfile &&hostTracingProfile);
+  /**
+   * Previously recorded HostTracingProfile that will be emitted when CDP session is created.
+   */
+  std::optional<jsinspector_modern::tracing::HostTracingProfile> stashedTracingProfile_;
   /**
-   * Previously recorded trace recording state that will be emitted when
-   * CDP session is created.
+   * Encapsulates the logic around tracing for this HostInspectorTarget.
    */
-  std::optional<jsinspector_modern::tracing::TraceRecordingState> stashedTraceRecordingState_;
+  std::unique_ptr<TracingDelegate> tracingDelegate_;
 
   friend HybridBase;
 };

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/tracing/PerformanceTracerCxxInterop.cpp

@@ -200,7 +200,7 @@ jint PerformanceTracerCxxInterop::subscribeToTracingStateChanges(
               onTracingStateChangedMethod(
                   callback, static_cast<jboolean>(isTracing));
             });
-          } catch (const std::exception& e) {
+          } catch (const std::exception&) {
           }
         }
       });

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

@@ -17,10 +17,10 @@
 #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/featureflags/ReactNativeFeatureFlags.h>
+#include <react/jni/CxxModuleWrapperBase.h>
 
 namespace facebook::react {
 
@@ -95,24 +95,20 @@ class JMethodDescriptor : public jni::JavaClass<JMethodDescriptor> {
 } // namespace
 
 TurboModuleManager::TurboModuleManager(
-    RuntimeExecutor runtimeExecutor,
     std::shared_ptr<CallInvoker> jsCallInvoker,
     std::shared_ptr<NativeMethodCallInvoker> nativeMethodCallInvoker,
     jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate)
-    : runtimeExecutor_(std::move(runtimeExecutor)),
-      jsCallInvoker_(std::move(jsCallInvoker)),
+    : jsCallInvoker_(std::move(jsCallInvoker)),
       nativeMethodCallInvoker_(std::move(nativeMethodCallInvoker)),
       delegate_(jni::make_global(delegate)) {}
 
 jni::local_ref<TurboModuleManager::jhybriddata> TurboModuleManager::initHybrid(
     jni::alias_ref<jhybridobject> /* unused */,
-    jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutor,
     jni::alias_ref<CallInvokerHolder::javaobject> jsCallInvokerHolder,
     jni::alias_ref<NativeMethodCallInvokerHolder::javaobject>
         nativeMethodCallInvokerHolder,
     jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate) {
   return makeCxxInstance(
-      runtimeExecutor->cthis()->get(),
       jsCallInvokerHolder->cthis()->getCallInvoker(),
       nativeMethodCallInvokerHolder->cthis()->getNativeMethodCallInvoker(),
       delegate);
@@ -126,10 +122,11 @@ void TurboModuleManager::registerNatives() {
   });
 }
 
-TurboModuleProviderFunctionType TurboModuleManager::createTurboModuleProvider(
-    jni::alias_ref<jhybridobject> javaPart,
-    jsi::Runtime* runtime) {
-  return [runtime, weakJavaPart = jni::make_weak(javaPart)](
+TurboModuleProviderFunctionTypeWithRuntime
+TurboModuleManager::createTurboModuleProvider(
+    jni::alias_ref<jhybridobject> javaPart) {
+  return [weakJavaPart = jni::make_weak(javaPart)](
+             jsi::Runtime& runtime,
              const std::string& name) -> std::shared_ptr<TurboModule> {
     auto javaPart = weakJavaPart.lockLocal();
     if (!javaPart) {
@@ -141,7 +138,7 @@ TurboModuleProviderFunctionType TurboModuleManager::createTurboModuleProvider(
       return nullptr;
     }
 
-    return cxxPart->getTurboModule(javaPart, name, *runtime);
+    return cxxPart->getTurboModule(javaPart, name, runtime);
   };
 }
 
@@ -177,11 +174,24 @@ std::shared_ptr<TurboModule> TurboModuleManager::getTurboModule(
     return turboModule;
   }
 
+  // TODO(T248203434): Remove this workaround once fixed in fbjni
+  // NOTE: We use jstring instead of std::string for the method signature to
+  // work around a bug in fbjni's exception handling. When a Java method throws
+  // an exception, fbjni's JMethod::operator() needs to check for pending
+  // exceptions via FACEBOOK_JNI_THROW_PENDING_EXCEPTION(). However, if we pass
+  // std::string, fbjni creates a temporary local_ref<JString> for the argument.
+  // C++ destroys temporaries at the end of the full-expression, which happens
+  // AFTER the JNI call returns but BEFORE the exception check. The destructor
+  // calls JNI functions (GetObjectRefType) while there's a pending exception,
+  // which violates JNI rules and causes ART's CheckJNI to abort the process.
+  //
+  // By pre-converting to jstring here, we control the lifetime of the
+  // local_ref<JString> so it extends past the exception check.
   static auto getTurboJavaModule =
-      javaPart->getClass()
-          ->getMethod<jni::alias_ref<JTurboModule>(const std::string&)>(
-              "getTurboJavaModule");
-  auto moduleInstance = getTurboJavaModule(javaPart.get(), name);
+      javaPart->getClass()->getMethod<jni::alias_ref<JTurboModule>(jstring)>(
+          "getTurboJavaModule");
+  auto jname = jni::make_jstring(name);
+  auto moduleInstance = getTurboJavaModule(javaPart.get(), jname.get());
   if (moduleInstance) {
     TurboModulePerfLogger::moduleJSRequireEndingStart(moduleName);
     JavaTurboModule::InitParams params = {
@@ -208,28 +218,22 @@ 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;
 }
 
-TurboModuleProviderFunctionType TurboModuleManager::createLegacyModuleProvider(
+TurboModuleProviderFunctionTypeWithRuntime
+TurboModuleManager::createLegacyModuleProvider(
     jni::alias_ref<jhybridobject> javaPart) {
+  bool shouldCreateLegacyModules =
+      ReactNativeFeatureFlags::enableBridgelessArchitecture() &&
+      ReactNativeFeatureFlags::useTurboModuleInterop();
+
+  if (!shouldCreateLegacyModules) {
+    return nullptr;
+  }
+
   return [weakJavaPart = jni::make_weak(javaPart)](
+             jsi::Runtime& /*runtime*/,
              const std::string& name) -> std::shared_ptr<TurboModule> {
     auto javaPart = weakJavaPart.lockLocal();
     if (!javaPart) {
@@ -260,28 +264,24 @@ 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;
-  }
-
+  // TODO(T248203434): Remove this workaround once fixed in fbjni
+  // NOTE: We use jstring instead of std::string for the method signature to
+  // work around a bug in fbjni's exception handling. When a Java method throws
+  // an exception, fbjni's JMethod::operator() needs to check for pending
+  // exceptions via FACEBOOK_JNI_THROW_PENDING_EXCEPTION(). However, if we pass
+  // std::string, fbjni creates a temporary local_ref<JString> for the argument.
+  // C++ destroys temporaries at the end of the full-expression, which happens
+  // AFTER the JNI call returns but BEFORE the exception check. The destructor
+  // calls JNI functions (GetObjectRefType) while there's a pending exception,
+  // which violates JNI rules and causes ART's CheckJNI to abort the process.
+  //
+  // By pre-converting to jstring here, we control the lifetime of the
+  // local_ref<JString> so it extends past the exception check.
   static auto getLegacyJavaModule =
-      javaPart->getClass()
-          ->getMethod<jni::alias_ref<JNativeModule>(const std::string&)>(
-              "getLegacyJavaModule");
-  auto moduleInstance = getLegacyJavaModule(javaPart.get(), name);
+      javaPart->getClass()->getMethod<jni::alias_ref<JNativeModule>(jstring)>(
+          "getLegacyJavaModule");
+  auto jname = jni::make_jstring(name);
+  auto moduleInstance = getLegacyJavaModule(javaPart.get(), jname.get());
 
   if (moduleInstance) {
     TurboModulePerfLogger::moduleJSRequireEndingStart(moduleName);
@@ -320,20 +320,19 @@ std::shared_ptr<TurboModule> TurboModuleManager::getLegacyModule(
 
 void TurboModuleManager::installJSIBindings(
     jni::alias_ref<jhybridobject> javaPart,
-    bool shouldCreateLegacyModules) {
+    jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutor) {
   auto cxxPart = javaPart->cthis();
   if (cxxPart == nullptr || !cxxPart->jsCallInvoker_) {
     return; // Runtime doesn't exist when attached to Chrome debugger.
   }
 
-  cxxPart->runtimeExecutor_([javaPart = jni::make_global(javaPart),
-                             shouldCreateLegacyModules](jsi::Runtime& runtime) {
-    TurboModuleBinding::install(
-        runtime,
-        createTurboModuleProvider(javaPart, &runtime),
-        shouldCreateLegacyModules ? createLegacyModuleProvider(javaPart)
-                                  : nullptr);
-  });
+  runtimeExecutor->cthis()->get()(
+      [javaPart = jni::make_global(javaPart)](jsi::Runtime& runtime) {
+        TurboModuleBinding::install(
+            runtime,
+            createTurboModuleProvider(javaPart),
+            createLegacyModuleProvider(javaPart));
+      });
 }
 
 } // namespace facebook::react

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

@@ -27,7 +27,6 @@ class TurboModuleManager : public jni::HybridClass<TurboModuleManager> {
   static auto constexpr kJavaDescriptor = "Lcom/facebook/react/internal/turbomodule/core/TurboModuleManager;";
   static jni::local_ref<jhybriddata> initHybrid(
       jni::alias_ref<jhybridobject> /* unused */,
-      jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutor,
       jni::alias_ref<CallInvokerHolder::javaobject> jsCallInvokerHolder,
       jni::alias_ref<NativeMethodCallInvokerHolder::javaobject> nativeMethodCallInvokerHolder,
       jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate);
@@ -52,20 +51,19 @@ class TurboModuleManager : public jni::HybridClass<TurboModuleManager> {
   ModuleCache legacyModuleCache_;
 
   explicit TurboModuleManager(
-      RuntimeExecutor runtimeExecutor,
       std::shared_ptr<CallInvoker> jsCallInvoker,
       std::shared_ptr<NativeMethodCallInvoker> nativeMethodCallInvoker,
       jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate);
 
-  static void installJSIBindings(jni::alias_ref<jhybridobject> javaPart, bool shouldCreateLegacyModules);
-
-  static TurboModuleProviderFunctionType createTurboModuleProvider(
+  static void installJSIBindings(
       jni::alias_ref<jhybridobject> javaPart,
-      jsi::Runtime *runtime);
+      jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutor);
+
+  static TurboModuleProviderFunctionTypeWithRuntime createTurboModuleProvider(jni::alias_ref<jhybridobject> javaPart);
   std::shared_ptr<TurboModule>
   getTurboModule(jni::alias_ref<jhybridobject> javaPart, const std::string &name, jsi::Runtime &runtime);
 
-  static TurboModuleProviderFunctionType createLegacyModuleProvider(jni::alias_ref<jhybridobject> javaPart);
+  static TurboModuleProviderFunctionTypeWithRuntime createLegacyModuleProvider(jni::alias_ref<jhybridobject> javaPart);
   std::shared_ptr<TurboModule> getLegacyModule(jni::alias_ref<jhybridobject> javaPart, const std::string &name);
 };
 

package/ReactAndroid/src/main/jni/third-party/folly/CMakeLists.txt

@@ -43,6 +43,7 @@ SET(folly_runtime_SRC
         folly/json/json_pointer.cpp
         folly/json/json.cpp
         folly/lang/CString.cpp
+        folly/lang/Exception.cpp
         folly/lang/SafeAssert.cpp
         folly/lang/ToAscii.cpp
         folly/memory/detail/MallocImpl.cpp

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/ReactAndroid/src/main/res/devsupport/layout/dev_loading_view.xml

@@ -1,17 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<TextView
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:background="#404040"
-  android:ellipsize="end"
-  android:gravity="center"
-  android:paddingTop="5dp"
-  android:paddingBottom="5dp"
-  android:paddingStart="8dp"
-  android:paddingEnd="8dp"
-  android:maxLines="1"
-  android:textColor="@android:color/white"
-  android:textSize="12sp"
-  />
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:background="#404040"
+    >
+
+    <TextView
+        android:id="@+id/loading_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_gravity="center_vertical"
+        android:gravity="center"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:textSize="12sp"
+        android:fontFamily="sans-serif"
+        />
+
+    <Button
+        android:id="@+id/dismiss_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="10dp"
+        android:minWidth="0dp"
+        android:minHeight="0dp"
+        android:text="@string/catalyst_loading_dismiss"
+        android:textAllCaps="false"
+        android:textSize="11sp"
+        android:fontFamily="sans-serif"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:paddingTop="3dp"
+        android:paddingBottom="3dp"
+        />
+
+</LinearLayout>

package/ReactAndroid/src/main/res/devsupport/layout/fps_view.xml

@@ -8,9 +8,9 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_margin="3dp"
+      android:layout_gravity="top|right"
       android:background="#a4141823"
       android:gravity="right"
-      android:layout_gravity="top|right"
       android:padding="3dp"
       android:textColor="@android:color/white"
       android:textSize="11sp"

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

@@ -36,4 +36,5 @@
   <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</string>
   <string name="catalyst_dev_menu_sub_header" project="catalyst" translatable="false">Running %1$s</string>
+  <string name="catalyst_loading_dismiss" project="catalyst" translatable="false">Dismiss ✕</string>
 </resources>

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

@@ -6,8 +6,24 @@
     <string name="link_description" gender="unknown">लिङ्क</string>
     <string name="image_description" gender="unknown">फोटो</string>
     <string name="imagebutton_description" gender="unknown">बटन, फोटो</string>
+    <string name="header_description" gender="unknown">शीर्षक</string>
     <string name="combobox_description" gender="unknown">कम्बो बक्स</string>
     <string name="menu_description" gender="unknown">मेनु</string>
+    <string name="menubar_description" gender="unknown">मेनु बार</string>
+    <string name="menuitem_description" gender="unknown">मेनु वस्तु</string>
+    <string name="progressbar_description" gender="unknown">प्रोगेस बार</string>
+    <string name="radiogroup_description" gender="unknown">रेडियो समूह</string>
+    <string name="scrollbar_description" gender="unknown">स्क्रोल बार</string>
+    <string name="spinbutton_description" gender="unknown">स्पिन बटन</string>
+    <string name="rn_tab_description" gender="unknown">टयाब</string>
+    <string name="timer_description" gender="unknown">टाइमर</string>
+    <string name="toolbar_description" gender="unknown">टुल बार</string>
+    <string name="summary_description" gender="unknown">सारांश</string>
+    <string name="state_busy_description" gender="unknown">व्यस्त</string>
+    <string name="state_expanded_description" gender="unknown">विस्तार गरियो</string>
+    <string name="state_collapsed_description" gender="unknown">कोल्याप्स गरिएको</string>
+    <string name="state_unselected_description" gender="unknown">चयन हटाइयो</string>
     <string name="state_on_description" gender="unknown">अन</string>
     <string name="state_off_description" gender="unknown">अफ</string>
+    <string name="state_mixed_description" gender="unknown">मिक्स गरिएको</string>
 </resources>