react-native-tvos 0.77.0-0rc5 → 0.78.0-0

package/ReactCommon/react/renderer/observers/mutation/MutationObserverManager.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "MutationObserverManager.h"
-#include <cxxreact/SystraceSection.h>
+#include <cxxreact/TraceSection.h>
 #include <utility>
 #include "MutationObserver.h"
 
@@ -19,7 +19,7 @@ void MutationObserverManager::observe(
     ShadowNode::Shared shadowNode,
     bool observeSubtree,
     const UIManager& uiManager) {
-  SystraceSection s("MutationObserverManager::observe");
+  TraceSection s("MutationObserverManager::observe");
 
   auto surfaceId = shadowNode->getSurfaceId();
 
@@ -39,7 +39,7 @@ void MutationObserverManager::observe(
 void MutationObserverManager::unobserve(
     MutationObserverId mutationObserverId,
     const ShadowNode& shadowNode) {
-  SystraceSection s("MutationObserverManager::unobserve");
+  TraceSection s("MutationObserverManager::unobserve");
 
   auto surfaceId = shadowNode.getSurfaceId();
 
@@ -71,7 +71,7 @@ void MutationObserverManager::unobserve(
 void MutationObserverManager::connect(
     UIManager& uiManager,
     std::function<void(std::vector<MutationRecord>&)> onMutations) {
-  SystraceSection s("MutationObserverManager::connect");
+  TraceSection s("MutationObserverManager::connect");
 
   // Fail-safe in case the caller doesn't guarantee consistency.
   if (commitHookRegistered_) {
@@ -85,7 +85,7 @@ void MutationObserverManager::connect(
 }
 
 void MutationObserverManager::disconnect(UIManager& uiManager) {
-  SystraceSection s("MutationObserverManager::disconnect");
+  TraceSection s("MutationObserverManager::disconnect");
 
   // Fail-safe in case the caller doesn't guarantee consistency.
   if (!commitHookRegistered_) {
@@ -115,7 +115,7 @@ void MutationObserverManager::runMutationObservations(
     const ShadowTree& shadowTree,
     const RootShadowNode& oldRootShadowNode,
     const RootShadowNode& newRootShadowNode) {
-  SystraceSection s("MutationObserverManager::runMutationObservations");
+  TraceSection s("MutationObserverManager::runMutationObservations");
 
   auto surfaceId = shadowTree.getSurfaceId();
 

package/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp

@@ -11,12 +11,14 @@
 #include "SchedulerPriorityUtils.h"
 
 #include <cxxreact/ErrorUtils.h>
-#include <cxxreact/SystraceSection.h>
+#include <cxxreact/TraceSection.h>
 #include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <utility>
 
 namespace facebook::react {
 
+extern const char RuntimeSchedulerKey[] = "RuntimeScheduler";
+
 namespace {
 std::unique_ptr<RuntimeSchedulerBase> getRuntimeSchedulerImplementation(
     RuntimeExecutor runtimeExecutor,

package/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.h

@@ -24,6 +24,8 @@ using SurfaceId = int32_t;
 using RuntimeSchedulerTaskErrorHandler =
     std::function<void(jsi::Runtime& runtime, jsi::JSError& error)>;
 
+extern const char RuntimeSchedulerKey[];
+
 // This is a temporary abstract class for RuntimeScheduler forks to implement
 // (and use them interchangeably).
 class RuntimeSchedulerBase {

package/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Legacy.cpp

@@ -8,7 +8,7 @@
 #include "RuntimeScheduler_Legacy.h"
 #include "SchedulerPriorityUtils.h"
 
-#include <cxxreact/SystraceSection.h>
+#include <cxxreact/TraceSection.h>
 #include <react/renderer/consistency/ScopedShadowTreeRevisionLock.h>
 #include <utility>
 
@@ -25,13 +25,13 @@ RuntimeScheduler_Legacy::RuntimeScheduler_Legacy(
       onTaskError_(std::move(onTaskError)) {}
 
 void RuntimeScheduler_Legacy::scheduleWork(RawCallback&& callback) noexcept {
-  SystraceSection s("RuntimeScheduler::scheduleWork");
+  TraceSection s("RuntimeScheduler::scheduleWork");
 
   runtimeAccessRequests_ += 1;
 
   runtimeExecutor_(
       [this, callback = std::move(callback)](jsi::Runtime& runtime) {
-        SystraceSection s2("RuntimeScheduler::scheduleWork callback");
+        TraceSection s2("RuntimeScheduler::scheduleWork callback");
         runtimeAccessRequests_ -= 1;
         {
           ScopedShadowTreeRevisionLock revisionLock(
@@ -45,7 +45,7 @@ void RuntimeScheduler_Legacy::scheduleWork(RawCallback&& callback) noexcept {
 std::shared_ptr<Task> RuntimeScheduler_Legacy::scheduleTask(
     SchedulerPriority priority,
     jsi::Function&& callback) noexcept {
-  SystraceSection s(
+  TraceSection s(
       "RuntimeScheduler::scheduleTask",
       "priority",
       serialize(priority),
@@ -65,7 +65,7 @@ std::shared_ptr<Task> RuntimeScheduler_Legacy::scheduleTask(
 std::shared_ptr<Task> RuntimeScheduler_Legacy::scheduleTask(
     SchedulerPriority priority,
     RawCallback&& callback) noexcept {
-  SystraceSection s(
+  TraceSection s(
       "RuntimeScheduler::scheduleTask",
       "priority",
       serialize(priority),
@@ -119,7 +119,7 @@ RuntimeSchedulerTimePoint RuntimeScheduler_Legacy::now() const noexcept {
 
 void RuntimeScheduler_Legacy::executeNowOnTheSameThread(
     RawCallback&& callback) {
-  SystraceSection s("RuntimeScheduler::executeNowOnTheSameThread");
+  TraceSection s("RuntimeScheduler::executeNowOnTheSameThread");
 
   static thread_local jsi::Runtime* runtimePtr = nullptr;
 
@@ -127,7 +127,7 @@ void RuntimeScheduler_Legacy::executeNowOnTheSameThread(
     runtimeAccessRequests_ += 1;
     executeSynchronouslyOnSameThread_CAN_DEADLOCK(
         runtimeExecutor_, [this, &callback](jsi::Runtime& runtime) {
-          SystraceSection s2(
+          TraceSection s2(
               "RuntimeScheduler::executeNowOnTheSameThread callback");
 
           runtimeAccessRequests_ -= 1;
@@ -153,7 +153,7 @@ void RuntimeScheduler_Legacy::executeNowOnTheSameThread(
 }
 
 void RuntimeScheduler_Legacy::callExpiredTasks(jsi::Runtime& runtime) {
-  SystraceSection s("RuntimeScheduler::callExpiredTasks");
+  TraceSection s("RuntimeScheduler::callExpiredTasks");
 
   auto previousPriority = currentPriority_;
   try {
@@ -181,7 +181,7 @@ void RuntimeScheduler_Legacy::callExpiredTasks(jsi::Runtime& runtime) {
 void RuntimeScheduler_Legacy::scheduleRenderingUpdate(
     SurfaceId /*surfaceId*/,
     RuntimeSchedulerRenderingUpdate&& renderingUpdate) {
-  SystraceSection s("RuntimeScheduler::scheduleRenderingUpdate");
+  TraceSection s("RuntimeScheduler::scheduleRenderingUpdate");
 
   if (renderingUpdate != nullptr) {
     renderingUpdate();
@@ -217,7 +217,7 @@ void RuntimeScheduler_Legacy::scheduleWorkLoopIfNecessary() {
 }
 
 void RuntimeScheduler_Legacy::startWorkLoop(jsi::Runtime& runtime) {
-  SystraceSection s("RuntimeScheduler::startWorkLoop");
+  TraceSection s("RuntimeScheduler::startWorkLoop");
 
   auto previousPriority = currentPriority_;
   isPerformingWork_ = true;
@@ -249,7 +249,7 @@ void RuntimeScheduler_Legacy::executeTask(
     jsi::Runtime& runtime,
     const std::shared_ptr<Task>& task,
     bool didUserCallbackTimeout) {
-  SystraceSection s(
+  TraceSection s(
       "RuntimeScheduler::executeTask",
       "priority",
       serialize(task->priority),

package/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.cpp

@@ -8,7 +8,7 @@
 #include "RuntimeScheduler_Modern.h"
 #include "SchedulerPriorityUtils.h"
 
-#include <cxxreact/SystraceSection.h>
+#include <cxxreact/TraceSection.h>
 #include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/consistency/ScopedShadowTreeRevisionLock.h>
 #include <react/timing/primitives.h>
@@ -39,14 +39,14 @@ RuntimeScheduler_Modern::RuntimeScheduler_Modern(
       onTaskError_(std::move(onTaskError)) {}
 
 void RuntimeScheduler_Modern::scheduleWork(RawCallback&& callback) noexcept {
-  SystraceSection s("RuntimeScheduler::scheduleWork");
+  TraceSection s("RuntimeScheduler::scheduleWork");
   scheduleTask(SchedulerPriority::ImmediatePriority, std::move(callback));
 }
 
 std::shared_ptr<Task> RuntimeScheduler_Modern::scheduleTask(
     SchedulerPriority priority,
     jsi::Function&& callback) noexcept {
-  SystraceSection s(
+  TraceSection s(
       "RuntimeScheduler::scheduleTask",
       "priority",
       serialize(priority),
@@ -65,7 +65,7 @@ std::shared_ptr<Task> RuntimeScheduler_Modern::scheduleTask(
 std::shared_ptr<Task> RuntimeScheduler_Modern::scheduleTask(
     SchedulerPriority priority,
     RawCallback&& callback) noexcept {
-  SystraceSection s(
+  TraceSection s(
       "RuntimeScheduler::scheduleTask",
       "priority",
       serialize(priority),
@@ -84,7 +84,7 @@ std::shared_ptr<Task> RuntimeScheduler_Modern::scheduleTask(
 std::shared_ptr<Task> RuntimeScheduler_Modern::scheduleIdleTask(
     jsi::Function&& callback,
     RuntimeSchedulerTimeout customTimeout) noexcept {
-  SystraceSection s(
+  TraceSection s(
       "RuntimeScheduler::scheduleIdleTask",
       "customTimeout",
       customTimeout.count(),
@@ -104,7 +104,7 @@ std::shared_ptr<Task> RuntimeScheduler_Modern::scheduleIdleTask(
 std::shared_ptr<Task> RuntimeScheduler_Modern::scheduleIdleTask(
     RawCallback&& callback,
     RuntimeSchedulerTimeout customTimeout) noexcept {
-  SystraceSection s(
+  TraceSection s(
       "RuntimeScheduler::scheduleIdleTask",
       "customTimeout",
       customTimeout.count(),
@@ -146,7 +146,7 @@ RuntimeSchedulerTimePoint RuntimeScheduler_Modern::now() const noexcept {
 
 void RuntimeScheduler_Modern::executeNowOnTheSameThread(
     RawCallback&& callback) {
-  SystraceSection s("RuntimeScheduler::executeNowOnTheSameThread");
+  TraceSection s("RuntimeScheduler::executeNowOnTheSameThread");
 
   static thread_local jsi::Runtime* runtimePtr = nullptr;
 
@@ -166,8 +166,7 @@ void RuntimeScheduler_Modern::executeNowOnTheSameThread(
   executeSynchronouslyOnSameThread_CAN_DEADLOCK(
       runtimeExecutor_,
       [this, currentTime, &task](jsi::Runtime& runtime) mutable {
-        SystraceSection s2(
-            "RuntimeScheduler::executeNowOnTheSameThread callback");
+        TraceSection s2("RuntimeScheduler::executeNowOnTheSameThread callback");
 
         syncTaskRequests_--;
         runtimePtr = &runtime;
@@ -201,7 +200,7 @@ void RuntimeScheduler_Modern::callExpiredTasks(jsi::Runtime& runtime) {
 void RuntimeScheduler_Modern::scheduleRenderingUpdate(
     SurfaceId surfaceId,
     RuntimeSchedulerRenderingUpdate&& renderingUpdate) {
-  SystraceSection s("RuntimeScheduler::scheduleRenderingUpdate");
+  TraceSection s("RuntimeScheduler::scheduleRenderingUpdate");
 
   surfaceIdsWithPendingRenderingUpdates_.insert(surfaceId);
   pendingRenderingUpdates_.push(renderingUpdate);
@@ -256,7 +255,7 @@ void RuntimeScheduler_Modern::scheduleEventLoop() {
 void RuntimeScheduler_Modern::runEventLoop(
     jsi::Runtime& runtime,
     bool onlyExpired) {
-  SystraceSection s("RuntimeScheduler::runEventLoop");
+  TraceSection s("RuntimeScheduler::runEventLoop");
 
   auto previousPriority = currentPriority_;
 
@@ -308,7 +307,7 @@ void RuntimeScheduler_Modern::runEventLoopTick(
     jsi::Runtime& runtime,
     Task& task,
     RuntimeSchedulerTimePoint taskStartTime) {
-  SystraceSection s("RuntimeScheduler::runEventLoopTick");
+  TraceSection s("RuntimeScheduler::runEventLoopTick");
 
   ScopedShadowTreeRevisionLock revisionLock(
       shadowTreeRevisionConsistencyManager_);
@@ -346,7 +345,7 @@ void RuntimeScheduler_Modern::runEventLoopTick(
  * https://html.spec.whatwg.org/multipage/webappapis.html#update-the-rendering.
  */
 void RuntimeScheduler_Modern::updateRendering() {
-  SystraceSection s("RuntimeScheduler::updateRendering");
+  TraceSection s("RuntimeScheduler::updateRendering");
 
   if (eventTimingDelegate_ != nullptr &&
       ReactNativeFeatureFlags::enableReportEventPaintTime()) {
@@ -369,7 +368,7 @@ void RuntimeScheduler_Modern::executeTask(
     jsi::Runtime& runtime,
     Task& task,
     bool didUserCallbackTimeout) const {
-  SystraceSection s(
+  TraceSection s(
       "RuntimeScheduler::executeTask",
       "priority",
       serialize(task.priority),
@@ -401,7 +400,7 @@ void RuntimeScheduler_Modern::executeTask(
  */
 void RuntimeScheduler_Modern::performMicrotaskCheckpoint(
     jsi::Runtime& runtime) {
-  SystraceSection s("RuntimeScheduler::performMicrotaskCheckpoint");
+  TraceSection s("RuntimeScheduler::performMicrotaskCheckpoint");
 
   if (performingMicrotaskCheckpoint_) {
     return;

package/ReactCommon/react/renderer/runtimescheduler/SchedulerPriorityUtils.h

@@ -31,10 +31,9 @@ static inline SchedulerPriority fromRawValue(double value) {
       return SchedulerPriority::LowPriority;
     case 5:
       return SchedulerPriority::IdlePriority;
-    default:
-      react_native_assert(false && "Unsupported SchedulerPriority value");
-      return SchedulerPriority::NormalPriority;
   }
+  react_native_assert(false && "Unsupported SchedulerPriority value");
+  return SchedulerPriority::NormalPriority;
 }
 
 static inline std::chrono::milliseconds timeoutForSchedulerPriority(
@@ -51,6 +50,8 @@ static inline std::chrono::milliseconds timeoutForSchedulerPriority(
     case SchedulerPriority::IdlePriority:
       return std::chrono::minutes(5);
   }
+  react_native_assert(false && "Unsupported SchedulerPriority value");
+  return std::chrono::seconds(5);
 }
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/scheduler/CMakeLists.txt

@@ -23,7 +23,6 @@ target_link_libraries(react_render_scheduler
         folly_runtime
         glog
         jsi
-        react_config
         react_debug
         react_featureflags
         react_performance_timeline

package/ReactCommon/react/renderer/scheduler/Scheduler.cpp

@@ -10,7 +10,7 @@
 #include <glog/logging.h>
 #include <jsi/jsi.h>
 
-#include <cxxreact/SystraceSection.h>
+#include <cxxreact/TraceSection.h>
 #include <react/debug/react_native_assert.h>
 #include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
@@ -49,7 +49,7 @@ Scheduler::Scheduler(
 
   auto weakRuntimeScheduler =
       contextContainer_->find<std::weak_ptr<RuntimeScheduler>>(
-          "RuntimeScheduler");
+          RuntimeSchedulerKey);
   react_native_assert(
       weakRuntimeScheduler.has_value() &&
       "Unexpected state: RuntimeScheduler was not provided.");
@@ -151,7 +151,7 @@ Scheduler::~Scheduler() {
   if (ReactNativeFeatureFlags::enableReportEventPaintTime()) {
     auto weakRuntimeScheduler =
         contextContainer_->find<std::weak_ptr<RuntimeScheduler>>(
-            "RuntimeScheduler");
+            RuntimeSchedulerKey);
     auto runtimeScheduler = weakRuntimeScheduler.has_value()
         ? weakRuntimeScheduler.value().lock()
         : nullptr;
@@ -216,37 +216,6 @@ void Scheduler::registerSurface(
   surfaceHandler.setUIManager(uiManager_.get());
 }
 
-InspectorData Scheduler::getInspectorDataForInstance(
-    const EventEmitter& eventEmitter) const noexcept {
-  return executeSynchronouslyOnSameThread_CAN_DEADLOCK<InspectorData>(
-      runtimeExecutor_, [=](jsi::Runtime& runtime) -> InspectorData {
-        auto uiManagerBinding = UIManagerBinding::getBinding(runtime);
-        auto value = uiManagerBinding->getInspectorDataForInstance(
-            runtime, eventEmitter);
-
-        // TODO T97216348: avoid transforming jsi into folly::dynamic
-        auto dynamic = jsi::dynamicFromValue(runtime, value);
-        auto source = dynamic["source"];
-
-        InspectorData result = {};
-        result.fileName =
-            source["fileName"].isNull() ? "" : source["fileName"].c_str();
-        result.lineNumber = (int)source["lineNumber"].getDouble();
-        result.columnNumber = (int)source["columnNumber"].getDouble();
-        result.selectedIndex = (int)dynamic["selectedIndex"].getDouble();
-        // TODO T97216348: remove folly::dynamic from InspectorData struct
-        result.props = dynamic["props"];
-        auto hierarchy = dynamic["hierarchy"];
-        for (auto& i : hierarchy) {
-          auto viewHierarchyValue = i["name"];
-          if (!viewHierarchyValue.isNull()) {
-            result.hierarchy.emplace_back(viewHierarchyValue.c_str());
-          }
-        }
-        return result;
-      });
-}
-
 void Scheduler::unregisterSurface(
     const SurfaceHandler& surfaceHandler) const noexcept {
   surfaceHandler.setUIManager(nullptr);
@@ -280,7 +249,7 @@ void Scheduler::animationTick() const {
 void Scheduler::uiManagerDidFinishTransaction(
     std::shared_ptr<const MountingCoordinator> mountingCoordinator,
     bool mountSynchronously) {
-  SystraceSection s("Scheduler::uiManagerDidFinishTransaction");
+  TraceSection s("Scheduler::uiManagerDidFinishTransaction");
 
   if (delegate_ != nullptr) {
     // This is no-op on all platforms except for Android where we need to
@@ -312,7 +281,7 @@ void Scheduler::uiManagerDidDispatchCommand(
     const ShadowNode::Shared& shadowNode,
     const std::string& commandName,
     const folly::dynamic& args) {
-  SystraceSection s("Scheduler::uiManagerDispatchCommand");
+  TraceSection s("Scheduler::uiManagerDispatchCommand");
 
   if (delegate_ != nullptr) {
     auto shadowView = ShadowView(*shadowNode);
@@ -335,7 +304,7 @@ void Scheduler::uiManagerDidDispatchCommand(
 void Scheduler::uiManagerDidSendAccessibilityEvent(
     const ShadowNode::Shared& shadowNode,
     const std::string& eventType) {
-  SystraceSection s("Scheduler::uiManagerDidSendAccessibilityEvent");
+  TraceSection s("Scheduler::uiManagerDidSendAccessibilityEvent");
 
   if (delegate_ != nullptr) {
     auto shadowView = ShadowView(*shadowNode);

package/ReactCommon/react/renderer/scheduler/Scheduler.h

@@ -52,9 +52,6 @@ class Scheduler final : public UIManagerDelegate {
   void registerSurface(const SurfaceHandler& surfaceHandler) const noexcept;
   void unregisterSurface(const SurfaceHandler& surfaceHandler) const noexcept;
 
-  InspectorData getInspectorDataForInstance(
-      const EventEmitter& eventEmitter) const noexcept;
-
   /*
    * This is broken. Please do not use.
    * `ComponentDescriptor`s are not designed to be used outside of `UIManager`,

package/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp

@@ -7,7 +7,7 @@
 
 #include "SurfaceHandler.h"
 
-#include <cxxreact/SystraceSection.h>
+#include <cxxreact/TraceSection.h>
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/uimanager/UIManager.h>
 
@@ -55,7 +55,7 @@ Status SurfaceHandler::getStatus() const noexcept {
 }
 
 void SurfaceHandler::start() const noexcept {
-  SystraceSection s("SurfaceHandler::start");
+  TraceSection s("SurfaceHandler::start");
   std::unique_lock lock(linkMutex_);
   react_native_assert(
       link_.status == Status::Registered && "Surface must be registered.");
@@ -67,7 +67,7 @@ void SurfaceHandler::start() const noexcept {
 
   auto parameters = Parameters{};
   {
-    SystraceSection s2("SurfaceHandler::start::paramsLock");
+    TraceSection s2("SurfaceHandler::start::paramsLock");
     std::shared_lock parametersLock(parametersMutex_);
     parameters = parameters_;
   }
@@ -81,11 +81,15 @@ void SurfaceHandler::start() const noexcept {
 
   link_.shadowTree = shadowTree.get();
 
-  link_.uiManager->startSurface(
-      std::move(shadowTree),
-      parameters.moduleName,
-      parameters.props,
-      parameters_.displayMode);
+  if (!parameters.moduleName.empty()) {
+    link_.uiManager->startSurface(
+        std::move(shadowTree),
+        parameters.moduleName,
+        parameters.props,
+        parameters_.displayMode);
+  } else {
+    link_.uiManager->startEmptySurface(std::move(shadowTree));
+  }
 
   link_.status = Status::Running;
 
@@ -165,7 +169,7 @@ std::string SurfaceHandler::getModuleName() const noexcept {
 }
 
 void SurfaceHandler::setProps(const folly::dynamic& props) const noexcept {
-  SystraceSection s("SurfaceHandler::setProps");
+  TraceSection s("SurfaceHandler::setProps");
   auto parameters = Parameters{};
   {
     std::unique_lock lock(parametersMutex_);
@@ -231,7 +235,7 @@ Size SurfaceHandler::measure(
 void SurfaceHandler::constraintLayout(
     const LayoutConstraints& layoutConstraints,
     const LayoutContext& layoutContext) const noexcept {
-  SystraceSection s("SurfaceHandler::constraintLayout");
+  TraceSection s("SurfaceHandler::constraintLayout");
   {
     std::unique_lock lock(parametersMutex_);
 
@@ -278,7 +282,7 @@ LayoutContext SurfaceHandler::getLayoutContext() const noexcept {
 #pragma mark - Private
 
 void SurfaceHandler::applyDisplayMode(DisplayMode displayMode) const noexcept {
-  SystraceSection s("SurfaceHandler::applyDisplayMode");
+  TraceSection s("SurfaceHandler::applyDisplayMode");
   react_native_assert(
       link_.status == Status::Running && "Surface must be running.");
   react_native_assert(

package/ReactCommon/react/renderer/scheduler/SurfaceHandler.h

@@ -62,6 +62,7 @@ class SurfaceHandler {
    * Can be constructed anytime with a `moduleName` and a `surfaceId`.
    */
   SurfaceHandler(const std::string& moduleName, SurfaceId surfaceId) noexcept;
+
   virtual ~SurfaceHandler() noexcept;
 
   /*

package/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp

@@ -7,6 +7,7 @@
 
 #include "SurfaceManager.h"
 
+#include <glog/logging.h>
 #include <react/renderer/scheduler/Scheduler.h>
 
 namespace facebook::react {
@@ -14,12 +15,18 @@ namespace facebook::react {
 SurfaceManager::SurfaceManager(const Scheduler& scheduler) noexcept
     : scheduler_(scheduler) {}
 
+SurfaceManager::~SurfaceManager() noexcept {
+  LOG(WARNING) << "SurfaceManager::~SurfaceManager() was called (address: "
+               << this << ").";
+  stopAllSurfaces();
+}
+
 void SurfaceManager::startSurface(
     SurfaceId surfaceId,
     const std::string& moduleName,
     const folly::dynamic& props,
     const LayoutConstraints& layoutConstraints,
-    const LayoutContext& layoutContext) const noexcept {
+    const LayoutContext& layoutContext) noexcept {
   {
     std::unique_lock lock(mutex_);
     auto surfaceHandler = SurfaceHandler{moduleName, surfaceId};
@@ -37,11 +44,18 @@ void SurfaceManager::startSurface(
   });
 }
 
-void SurfaceManager::stopSurface(SurfaceId surfaceId) const noexcept {
+void SurfaceManager::stopSurface(SurfaceId surfaceId) noexcept {
+  bool surfaceWasRunning = false;
   visit(surfaceId, [&](const SurfaceHandler& surfaceHandler) {
     surfaceHandler.stop();
     scheduler_.unregisterSurface(surfaceHandler);
+    surfaceWasRunning = true;
   });
+  if (!surfaceWasRunning) {
+    LOG(WARNING)
+        << "SurfaceManager::stopSurface tried to stop a surface which was not running, surfaceId = "
+        << surfaceId;
+  }
 
   {
     std::unique_lock lock(mutex_);
@@ -51,6 +65,46 @@ void SurfaceManager::stopSurface(SurfaceId surfaceId) const noexcept {
   }
 }
 
+void SurfaceManager::stopAllSurfaces() noexcept {
+  auto surfaceIds = getRunningSurfaces();
+  for (const auto& surfaceId : surfaceIds) {
+    stopSurface(surfaceId);
+  }
+}
+
+bool SurfaceManager::isSurfaceRunning(SurfaceId surfaceId) const noexcept {
+  std::shared_lock lock(mutex_);
+  return registry_.contains(surfaceId);
+}
+
+std::unordered_set<SurfaceId> SurfaceManager::getRunningSurfaces()
+    const noexcept {
+  std::unordered_set<SurfaceId> surfaceIds;
+  {
+    std::shared_lock lock(mutex_);
+    for (const auto& [surfaceId, _] : registry_) {
+      surfaceIds.insert(surfaceId);
+    }
+  }
+  return surfaceIds;
+}
+
+std::optional<SurfaceManager::SurfaceProps> SurfaceManager::getSurfaceProps(
+    SurfaceId surfaceId) const noexcept {
+  std::optional<SurfaceManager::SurfaceProps> surfaceProps;
+
+  visit(surfaceId, [&](const SurfaceHandler& surfaceHandler) {
+    surfaceProps = SurfaceManager::SurfaceProps{
+        surfaceId,
+        surfaceHandler.getModuleName(),
+        surfaceHandler.getProps(),
+        surfaceHandler.getLayoutConstraints(),
+        surfaceHandler.getLayoutContext()};
+  });
+
+  return surfaceProps;
+}
+
 Size SurfaceManager::measureSurface(
     SurfaceId surfaceId,
     const LayoutConstraints& layoutConstraints,

package/ReactCommon/react/renderer/scheduler/SurfaceManager.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <mutex>
+#include <optional>
 #include <shared_mutex>
 #include <unordered_map>
 
@@ -27,6 +28,16 @@ namespace facebook::react {
 class SurfaceManager final {
  public:
   explicit SurfaceManager(const Scheduler& scheduler) noexcept;
+  ~SurfaceManager() noexcept;
+
+  /* SurfaceProps contain information about running surfaces */
+  struct SurfaceProps {
+    SurfaceId surfaceId;
+    std::string moduleName;
+    folly::dynamic props;
+    LayoutConstraints layoutConstraints;
+    LayoutContext layoutContext;
+  };
 
 #pragma mark - Surface Management
 
@@ -35,9 +46,18 @@ class SurfaceManager final {
       const std::string& moduleName,
       const folly::dynamic& props,
       const LayoutConstraints& layoutConstraints = {},
-      const LayoutContext& layoutContext = {}) const noexcept;
+      const LayoutContext& layoutContext = {}) noexcept;
+
+  void stopSurface(SurfaceId surfaceId) noexcept;
+
+  void stopAllSurfaces() noexcept;
 
-  void stopSurface(SurfaceId surfaceId) const noexcept;
+  bool isSurfaceRunning(SurfaceId surfaceId) const noexcept;
+
+  std::unordered_set<SurfaceId> getRunningSurfaces() const noexcept;
+
+  std::optional<SurfaceManager::SurfaceProps> getSurfaceProps(
+      SurfaceId surfaceId) const noexcept;
 
   Size measureSurface(
       SurfaceId surfaceId,
@@ -60,7 +80,7 @@ class SurfaceManager final {
 
   const Scheduler& scheduler_;
   mutable std::shared_mutex mutex_; // Protects `registry_`.
-  mutable std::unordered_map<SurfaceId, SurfaceHandler> registry_{};
+  std::unordered_map<SurfaceId, SurfaceHandler> registry_{};
 };
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt

@@ -24,16 +24,15 @@ add_library(react_render_textlayoutmanager
 
 target_include_directories(react_render_textlayoutmanager
         PUBLIC
+          .
           ${REACT_COMMON_DIR}
           ${CMAKE_CURRENT_SOURCE_DIR}/platform/android/
 )
 
 target_link_libraries(react_render_textlayoutmanager
         glog
-        fb
         fbjni
         folly_runtime
-        glog_init
         mapbufferjni
         react_debug
         react_render_attributedstring