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

package/ReactCommon/react/renderer/uimanager/AppRegistryBinding.cpp

@@ -0,0 +1,88 @@
+/*
+ * 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.
+ */
+
+#include "AppRegistryBinding.h"
+#include <cxxreact/TraceSection.h>
+#include <react/renderer/uimanager/primitives.h>
+
+namespace facebook::react {
+
+/* static */ void AppRegistryBinding::startSurface(
+    jsi::Runtime& runtime,
+    SurfaceId surfaceId,
+    const std::string& moduleName,
+    const folly::dynamic& initialProps,
+    DisplayMode displayMode) {
+  TraceSection s("AppRegistryBinding::startSurface");
+  jsi::Object parameters(runtime);
+  parameters.setProperty(runtime, "rootTag", surfaceId);
+  parameters.setProperty(
+      runtime, "initialProps", jsi::valueFromDynamic(runtime, initialProps));
+  parameters.setProperty(runtime, "fabric", true);
+
+  auto global = runtime.global();
+  auto registry = global.getProperty(runtime, "RN$AppRegistry");
+  if (!registry.isObject()) {
+    throw std::runtime_error(
+        "AppRegistryBinding::startSurface failed. Global was not installed.");
+  }
+  auto method = std::move(registry).asObject(runtime).getPropertyAsFunction(
+      runtime, "runApplication");
+  method.call(
+      runtime,
+      {jsi::String::createFromUtf8(runtime, moduleName),
+       std::move(parameters),
+       jsi::Value(runtime, displayModeToInt(displayMode))});
+}
+
+/* static */ void AppRegistryBinding::setSurfaceProps(
+    jsi::Runtime& runtime,
+    SurfaceId surfaceId,
+    const std::string& moduleName,
+    const folly::dynamic& initialProps,
+    DisplayMode displayMode) {
+  TraceSection s("UIManagerBinding::setSurfaceProps");
+  jsi::Object parameters(runtime);
+  parameters.setProperty(runtime, "rootTag", surfaceId);
+  parameters.setProperty(
+      runtime, "initialProps", jsi::valueFromDynamic(runtime, initialProps));
+  parameters.setProperty(runtime, "fabric", true);
+
+  auto global = runtime.global();
+  auto registry = global.getProperty(runtime, "RN$AppRegistry");
+  if (!registry.isObject()) {
+    throw std::runtime_error(
+        "AppRegistryBinding::setSurfaceProps failed. Global was not installed.");
+  }
+
+  auto method = std::move(registry).asObject(runtime).getPropertyAsFunction(
+      runtime, "setSurfaceProps");
+  method.call(
+      runtime,
+      {jsi::String::createFromUtf8(runtime, moduleName),
+       std::move(parameters),
+       jsi::Value(runtime, displayModeToInt(displayMode))});
+}
+
+/* static */ void AppRegistryBinding::stopSurface(
+    jsi::Runtime& runtime,
+    SurfaceId surfaceId) {
+  auto global = runtime.global();
+  auto stopFunction = global.getProperty(runtime, "RN$stopSurface");
+  if (!stopFunction.isObject() ||
+      !stopFunction.asObject(runtime).isFunction(runtime)) {
+    throw std::runtime_error(
+        "AppRegistryBinding::stopSurface failed. Global was not installed.");
+  }
+
+  std::move(stopFunction)
+      .asObject(runtime)
+      .asFunction(runtime)
+      .call(runtime, {jsi::Value{surfaceId}});
+}
+
+} // namespace facebook::react

package/ReactCommon/react/renderer/uimanager/AppRegistryBinding.h

@@ -0,0 +1,50 @@
+/*
+ * 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 <folly/dynamic.h>
+#include <jsi/jsi.h>
+#include <react/renderer/core/ReactPrimitives.h>
+
+namespace facebook::react {
+
+class AppRegistryBinding final {
+ public:
+  AppRegistryBinding() = delete;
+
+  /*
+   * Starts React Native Surface with given id, moduleName, and props.
+   * Thread synchronization must be enforced externally.
+   */
+  static void startSurface(
+      jsi::Runtime& runtime,
+      SurfaceId surfaceId,
+      const std::string& moduleName,
+      const folly::dynamic& initialProps,
+      DisplayMode displayMode);
+
+  /*
+   * Updates the React Native Surface identified with surfaceId and moduleName
+   * with the given props.
+   * Thread synchronization must be enforced externally.
+   */
+  static void setSurfaceProps(
+      jsi::Runtime& runtime,
+      SurfaceId surfaceId,
+      const std::string& moduleName,
+      const folly::dynamic& initialProps,
+      DisplayMode displayMode);
+
+  /*
+   * Stops React Native Surface with given id.
+   * Thread synchronization must be enforced externally.
+   */
+  static void stopSurface(jsi::Runtime& runtime, SurfaceId surfaceId);
+};
+
+} // namespace facebook::react

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

@@ -24,7 +24,6 @@ target_link_libraries(react_render_uimanager
         glog
         folly_runtime
         jsi
-        react_config
         react_cxxreact
         react_debug
         react_featureflags

package/ReactCommon/react/renderer/uimanager/SurfaceRegistryBinding.h

@@ -7,44 +7,7 @@
 
 #pragma once
 
-#include <folly/dynamic.h>
-#include <jsi/jsi.h>
-#include <react/renderer/core/ReactPrimitives.h>
+#warning \
+    "The SurfaceRegistryBinding.h header has been renamed to AppRegistryBinding.h"
 
-namespace facebook::react {
-
-class SurfaceRegistryBinding final {
- public:
-  SurfaceRegistryBinding() = delete;
-
-  /*
-   * Starts React Native Surface with given id, moduleName, and props.
-   * Thread synchronization must be enforced externally.
-   */
-  static void startSurface(
-      jsi::Runtime& runtime,
-      SurfaceId surfaceId,
-      const std::string& moduleName,
-      const folly::dynamic& initialProps,
-      DisplayMode displayMode);
-
-  /*
-   * Updates the React Native Surface identified with surfaceId and moduleName
-   * with the given props.
-   * Thread synchronization must be enforced externally.
-   */
-  static void setSurfaceProps(
-      jsi::Runtime& runtime,
-      SurfaceId surfaceId,
-      const std::string& moduleName,
-      const folly::dynamic& initialProps,
-      DisplayMode displayMode);
-
-  /*
-   * Stops React Native Surface with given id.
-   * Thread synchronization must be enforced externally.
-   */
-  static void stopSurface(jsi::Runtime& runtime, SurfaceId surfaceId);
-};
-
-} // namespace facebook::react
+#include <react/renderer/uimanager/AppRegistryBinding.h>

package/ReactCommon/react/renderer/uimanager/UIManager.cpp

@@ -8,13 +8,13 @@
 #include "UIManager.h"
 
 #include <cxxreact/JSExecutor.h>
-#include <cxxreact/SystraceSection.h>
+#include <cxxreact/TraceSection.h>
 #include <react/debug/react_native_assert.h>
 #include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/core/DynamicPropsUtilities.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/ShadowNodeFragment.h>
-#include <react/renderer/uimanager/SurfaceRegistryBinding.h>
+#include <react/renderer/uimanager/AppRegistryBinding.h>
 #include <react/renderer/uimanager/UIManagerBinding.h>
 #include <react/renderer/uimanager/UIManagerCommitHook.h>
 #include <react/renderer/uimanager/UIManagerMountHook.h>
@@ -71,7 +71,7 @@ std::shared_ptr<ShadowNode> UIManager::createNode(
     SurfaceId surfaceId,
     RawProps rawProps,
     InstanceHandle::Shared instanceHandle) const {
-  SystraceSection s("UIManager::createNode", "componentName", name);
+  TraceSection s("UIManager::createNode", "componentName", name);
 
   auto& componentDescriptor = componentDescriptorRegistry_->at(name);
   auto fallbackDescriptor =
@@ -114,7 +114,7 @@ std::shared_ptr<ShadowNode> UIManager::cloneNode(
     const ShadowNode& shadowNode,
     const ShadowNode::SharedListOfShared& children,
     RawProps rawProps) const {
-  SystraceSection s(
+  TraceSection s(
       "UIManager::cloneNode", "componentName", shadowNode.getComponentName());
 
   PropsParserContext propsParserContext{
@@ -181,7 +181,7 @@ std::shared_ptr<ShadowNode> UIManager::cloneNode(
 void UIManager::appendChild(
     const ShadowNode::Shared& parentShadowNode,
     const ShadowNode::Shared& childShadowNode) const {
-  SystraceSection s("UIManager::appendChild");
+  TraceSection s("UIManager::appendChild");
 
   auto& componentDescriptor = parentShadowNode->getComponentDescriptor();
   componentDescriptor.appendChild(parentShadowNode, childShadowNode);
@@ -191,7 +191,7 @@ void UIManager::completeSurface(
     SurfaceId surfaceId,
     const ShadowNode::UnsharedListOfShared& rootChildren,
     ShadowTree::CommitOptions commitOptions) {
-  SystraceSection s("UIManager::completeSurface", "surfaceId", surfaceId);
+  TraceSection s("UIManager::completeSurface", "surfaceId", surfaceId);
 
   shadowTreeRegistry_.visit(surfaceId, [&](const ShadowTree& shadowTree) {
     auto result = shadowTree.commit(
@@ -230,33 +230,38 @@ void UIManager::startSurface(
     const std::string& moduleName,
     const folly::dynamic& props,
     DisplayMode displayMode) const {
-  SystraceSection s("UIManager::startSurface");
+  TraceSection s("UIManager::startSurface");
 
   auto surfaceId = shadowTree->getSurfaceId();
   shadowTreeRegistry_.add(std::move(shadowTree));
 
   runtimeExecutor_([=](jsi::Runtime& runtime) {
-    SystraceSection s("UIManager::startSurface::onRuntime");
-    SurfaceRegistryBinding::startSurface(
+    TraceSection s("UIManager::startSurface::onRuntime");
+    AppRegistryBinding::startSurface(
         runtime, surfaceId, moduleName, props, displayMode);
   });
 }
 
+void UIManager::startEmptySurface(ShadowTree::Unique&& shadowTree) const {
+  TraceSection s("UIManager::startEmptySurface");
+  shadowTreeRegistry_.add(std::move(shadowTree));
+}
+
 void UIManager::setSurfaceProps(
     SurfaceId surfaceId,
     const std::string& moduleName,
     const folly::dynamic& props,
     DisplayMode displayMode) const {
-  SystraceSection s("UIManager::setSurfaceProps");
+  TraceSection s("UIManager::setSurfaceProps");
 
   runtimeExecutor_([=](jsi::Runtime& runtime) {
-    SurfaceRegistryBinding::setSurfaceProps(
+    AppRegistryBinding::setSurfaceProps(
         runtime, surfaceId, moduleName, props, displayMode);
   });
 }
 
 ShadowTree::Unique UIManager::stopSurface(SurfaceId surfaceId) const {
-  SystraceSection s("UIManager::stopSurface");
+  TraceSection s("UIManager::stopSurface");
 
   // Stop any ongoing animations.
   stopSurfaceForAnimationDelegate(surfaceId);
@@ -270,7 +275,7 @@ ShadowTree::Unique UIManager::stopSurface(SurfaceId surfaceId) const {
     // commits from the JavaScript side will not be able to reference a
     // `ShadowTree` and will fail silently.
     runtimeExecutor_([=](jsi::Runtime& runtime) {
-      SurfaceRegistryBinding::stopSurface(runtime, surfaceId);
+      AppRegistryBinding::stopSurface(runtime, surfaceId);
     });
 
     if (leakChecker_) {
@@ -342,7 +347,7 @@ LayoutMetrics UIManager::getRelativeLayoutMetrics(
     const ShadowNode& shadowNode,
     const ShadowNode* ancestorShadowNode,
     LayoutableShadowNode::LayoutInspectingPolicy policy) const {
-  SystraceSection s("UIManager::getRelativeLayoutMetrics");
+  TraceSection s("UIManager::getRelativeLayoutMetrics");
 
   // We might store here an owning pointer to `ancestorShadowNode` to ensure
   // that the node is not deallocated during method execution lifetime.
@@ -375,7 +380,7 @@ LayoutMetrics UIManager::getRelativeLayoutMetrics(
 }
 
 void UIManager::updateState(const StateUpdate& stateUpdate) const {
-  SystraceSection s(
+  TraceSection s(
       "UIManager::updateState",
       "componentName",
       stateUpdate.family->getComponentName());
@@ -614,7 +619,7 @@ RootShadowNode::Unshared UIManager::shadowTreeWillCommit(
     const ShadowTree& shadowTree,
     const RootShadowNode::Shared& oldRootShadowNode,
     const RootShadowNode::Unshared& newRootShadowNode) const {
-  SystraceSection s("UIManager::shadowTreeWillCommit");
+  TraceSection s("UIManager::shadowTreeWillCommit");
 
   std::shared_lock lock(commitHookMutex_);
 
@@ -630,7 +635,7 @@ RootShadowNode::Unshared UIManager::shadowTreeWillCommit(
 void UIManager::shadowTreeDidFinishTransaction(
     std::shared_ptr<const MountingCoordinator> mountingCoordinator,
     bool mountSynchronously) const {
-  SystraceSection s("UIManager::shadowTreeDidFinishTransaction");
+  TraceSection s("UIManager::shadowTreeDidFinishTransaction");
 
   if (delegate_ != nullptr) {
     delegate_->uiManagerDidFinishTransaction(
@@ -639,7 +644,7 @@ void UIManager::shadowTreeDidFinishTransaction(
 }
 
 void UIManager::reportMount(SurfaceId surfaceId) const {
-  SystraceSection s("UIManager::reportMount");
+  TraceSection s("UIManager::reportMount");
 
   auto time = JSExecutor::performanceNow();
 

package/ReactCommon/react/renderer/uimanager/UIManager.h

@@ -108,6 +108,8 @@ class UIManager final : public ShadowTreeDelegate {
       const folly::dynamic& props,
       DisplayMode displayMode) const;
 
+  void startEmptySurface(ShadowTree::Unique&& shadowTree) const;
+
   void setSurfaceProps(
       SurfaceId surfaceId,
       const std::string& moduleName,

package/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp

@@ -7,7 +7,7 @@
 
 #include "UIManagerBinding.h"
 
-#include <cxxreact/SystraceSection.h>
+#include <cxxreact/TraceSection.h>
 #include <glog/logging.h>
 #include <jsi/JSIDynamic.h>
 #include <react/debug/react_native_assert.h>
@@ -19,8 +19,6 @@
 
 #include <utility>
 
-#include "bindingUtils.h"
-
 namespace facebook::react {
 
 void UIManagerBinding::createAndInstallIfNeeded(
@@ -62,40 +60,13 @@ UIManagerBinding::~UIManagerBinding() {
                << this << ").";
 }
 
-jsi::Value UIManagerBinding::getInspectorDataForInstance(
-    jsi::Runtime& runtime,
-    const EventEmitter& eventEmitter) const {
-  auto eventTarget = eventEmitter.eventTarget_;
-  EventEmitter::DispatchMutex().lock();
-
-  if (!runtime.global().hasProperty(runtime, "__fbBatchedBridge") ||
-      !eventTarget) {
-    return jsi::Value::undefined();
-  }
-
-  eventTarget->retain(runtime);
-  auto instanceHandle = eventTarget->getInstanceHandle(runtime);
-  eventTarget->release(runtime);
-  EventEmitter::DispatchMutex().unlock();
-
-  if (instanceHandle.isUndefined()) {
-    return jsi::Value::undefined();
-  }
-
-  return callMethodOfModule(
-      runtime,
-      "ReactFabric",
-      "getInspectorDataForInstance",
-      {std::move(instanceHandle)});
-}
-
 void UIManagerBinding::dispatchEvent(
     jsi::Runtime& runtime,
     const EventTarget* eventTarget,
     const std::string& type,
     ReactEventPriority priority,
     const EventPayload& eventPayload) const {
-  SystraceSection s("UIManagerBinding::dispatchEvent", "type", type);
+  TraceSection s("UIManagerBinding::dispatchEvent", "type", type);
 
   if (eventPayload.getType() == EventPayloadType::PointerEvent) {
     auto pointerEvent = static_cast<const PointerEvent&>(eventPayload);

package/ReactCommon/react/renderer/uimanager/UIManagerBinding.h

@@ -40,10 +40,6 @@ class UIManagerBinding : public jsi::HostObject {
 
   ~UIManagerBinding() override;
 
-  jsi::Value getInspectorDataForInstance(
-      jsi::Runtime& runtime,
-      const EventEmitter& eventEmitter) const;
-
   /*
    * Delivers raw event data to JavaScript.
    * Thread synchronization must be enforced externally.

package/ReactCommon/react/renderer/uimanager/tests/PointerEventsProcessorTest.cpp

@@ -87,8 +87,8 @@ class PointerEventsProcessorTest : public ::testing::Test {
             listenToAllPointerEvents(props);
             props.layoutConstraints = LayoutConstraints{{0,0}, {500, 500}};
             auto &yogaStyle = props.yogaStyle;
-            yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(400));
-            yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(400));
+            yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleSizeLength::points(400));
+            yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleSizeLength::points(400));
             yogaStyle.setDisplay(yoga::Display::Flex);
             yogaStyle.setFlexDirection(yoga::FlexDirection::Row);
             yogaStyle.setAlignItems(yoga::Align::Center);
@@ -109,8 +109,8 @@ class PointerEventsProcessorTest : public ::testing::Test {
                 yogaStyle.setFlexDirection(yoga::FlexDirection::Column);
                 yogaStyle.setAlignItems(yoga::Align::FlexEnd);
                 yogaStyle.setJustifyContent(yoga::Justify::Center);
-                yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(150));
-                yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(300));
+                yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleSizeLength::points(150));
+                yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleSizeLength::points(300));
                 return sharedProps;
               })
               .children({
@@ -123,8 +123,8 @@ class PointerEventsProcessorTest : public ::testing::Test {
                     auto &props = *sharedProps;
                     listenToAllPointerEvents(props);
                     auto &yogaStyle = props.yogaStyle;
-                    yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(100));
-                    yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(200));
+                    yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleSizeLength::points(100));
+                    yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleSizeLength::points(200));
                     return sharedProps;
                   })
               }),
@@ -141,8 +141,8 @@ class PointerEventsProcessorTest : public ::testing::Test {
                 yogaStyle.setFlexDirection(yoga::FlexDirection::Column);
                 yogaStyle.setAlignItems(yoga::Align::FlexStart);
                 yogaStyle.setJustifyContent(yoga::Justify::Center);
-                yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(150));
-                yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(300));
+                yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleSizeLength::points(150));
+                yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleSizeLength::points(300));
                 return sharedProps;
               })
               .children({
@@ -155,8 +155,8 @@ class PointerEventsProcessorTest : public ::testing::Test {
                     auto &props = *sharedProps;
                     listenToAllPointerEvents(props);
                     auto &yogaStyle = props.yogaStyle;
-                    yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(100));
-                    yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(200));
+                    yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleSizeLength::points(100));
+                    yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleSizeLength::points(200));
                     return sharedProps;
                   })
               })

package/ReactCommon/react/runtime/CMakeLists.txt

@@ -27,7 +27,6 @@ target_link_libraries(
         fabricjni
         react_featureflagsjni
         turbomodulejsijni
-        fb
         jsi
         jsireact
         react_utils

package/ReactCommon/react/runtime/React-RuntimeHermes.podspec

@@ -22,7 +22,7 @@ folly_version = folly_config[:version]
 folly_dep_name = folly_config[:dep_name]
 
 boost_config = get_boost_config()
-boost_compiler_flags = boost_config[:compiler_flags] 
+boost_compiler_flags = boost_config[:compiler_flags]
 
 Pod::Spec.new do |s|
   s.name                   = "React-RuntimeHermes"
@@ -47,7 +47,6 @@ Pod::Spec.new do |s|
   end
 
   s.dependency folly_dep_name, folly_version
-  s.dependency "React-nativeconfig"
   s.dependency "React-jsitracing"
   s.dependency "React-jsi"
   s.dependency "React-utils"

package/ReactCommon/react/runtime/ReactInstance.cpp

@@ -12,7 +12,7 @@
 #include <cxxreact/JSBigString.h>
 #include <cxxreact/JSExecutor.h>
 #include <cxxreact/ReactMarker.h>
-#include <cxxreact/SystraceSection.h>
+#include <cxxreact/TraceSection.h>
 #include <glog/logging.h>
 #include <jsi/JSIDynamic.h>
 #include <jsi/instrumentation.h>
@@ -57,62 +57,48 @@ ReactInstance::ReactInstance(
       timerManager_(std::move(timerManager)),
       jsErrorHandler_(std::make_shared<JsErrorHandler>(std::move(onJsError))),
       parentInspectorTarget_(parentInspectorTarget) {
-  RuntimeExecutor runtimeExecutor = [weakRuntime = std::weak_ptr(runtime_),
-                                     weakTimerManager =
-                                         std::weak_ptr(timerManager_),
-                                     weakJsThread =
-                                         std::weak_ptr(jsMessageQueueThread_),
-                                     jsErrorHandler =
-                                         jsErrorHandler_](auto callback) {
-    if (weakRuntime.expired()) {
-      return;
-    }
-
-    /**
-     * If a fatal error was caught while executing the main bundle, assume the
-     * js runtime is invalid. And stop executing any more js.
-     */
-    if (!jsErrorHandler->isRuntimeReady() &&
-        jsErrorHandler->hasHandledFatalError()) {
-      LOG(INFO)
-          << "RuntimeExecutor: Detected fatal error. Dropping work on non-js thread."
-          << std::endl;
-      return;
-    }
-
-    if (auto jsThread = weakJsThread.lock()) {
-      jsThread->runOnQueue([jsErrorHandler,
-                            weakRuntime,
-                            weakTimerManager,
-                            callback = std::move(callback)]() {
-        auto runtime = weakRuntime.lock();
-        if (!runtime) {
+  RuntimeExecutor runtimeExecutor =
+      [weakRuntime = std::weak_ptr(runtime_),
+       weakTimerManager = std::weak_ptr(timerManager_),
+       weakJsThread = std::weak_ptr(jsMessageQueueThread_),
+       jsErrorHandler = jsErrorHandler_](auto callback) {
+        if (weakRuntime.expired()) {
           return;
         }
 
-        jsi::Runtime& jsiRuntime = runtime->getRuntime();
-        SystraceSection s("ReactInstance::_runtimeExecutor[Callback]");
-        try {
-          ShadowNode::setUseRuntimeShadowNodeReferenceUpdateOnThread(true);
-          callback(jsiRuntime);
-
-          // If we have first-class support for microtasks,
-          // they would've been called as part of the previous callback.
-          if (ReactNativeFeatureFlags::disableEventLoopOnBridgeless()) {
-            if (auto timerManager = weakTimerManager.lock()) {
-              timerManager->callReactNativeMicrotasks(jsiRuntime);
+        if (auto jsThread = weakJsThread.lock()) {
+          jsThread->runOnQueue([jsErrorHandler,
+                                weakRuntime,
+                                weakTimerManager,
+                                callback = std::move(callback)]() {
+            auto runtime = weakRuntime.lock();
+            if (!runtime) {
+              return;
             }
-          }
-        } catch (jsi::JSError& originalError) {
-          jsErrorHandler->handleError(jsiRuntime, originalError, true);
-        } catch (std::exception& ex) {
-          jsi::JSError error(
-              jsiRuntime, std::string("Non-js exception: ") + ex.what());
-          jsErrorHandler->handleError(jsiRuntime, error, true);
+
+            jsi::Runtime& jsiRuntime = runtime->getRuntime();
+            TraceSection s("ReactInstance::_runtimeExecutor[Callback]");
+            try {
+              ShadowNode::setUseRuntimeShadowNodeReferenceUpdateOnThread(true);
+              callback(jsiRuntime);
+
+              // If we have first-class support for microtasks,
+              // they would've been called as part of the previous callback.
+              if (ReactNativeFeatureFlags::disableEventLoopOnBridgeless()) {
+                if (auto timerManager = weakTimerManager.lock()) {
+                  timerManager->callReactNativeMicrotasks(jsiRuntime);
+                }
+              }
+            } catch (jsi::JSError& originalError) {
+              jsErrorHandler->handleError(jsiRuntime, originalError, true);
+            } catch (std::exception& ex) {
+              jsi::JSError error(
+                  jsiRuntime, std::string("Non-js exception: ") + ex.what());
+              jsErrorHandler->handleError(jsiRuntime, error, true);
+            }
+          });
         }
-      });
-    }
-  };
+      };
 
   if (parentInspectorTarget_) {
     auto executor = parentInspectorTarget_->executorFromThis();
@@ -249,7 +235,7 @@ void ReactInstance::loadScript(
                                        std::weak_ptr<BufferedRuntimeExecutor>(
                                            bufferedRuntimeExecutor_),
                                    completion](jsi::Runtime& runtime) {
-    SystraceSection s("ReactInstance::loadScript");
+    TraceSection s("ReactInstance::loadScript");
     bool hasLogger(ReactMarker::logTaggedMarkerBridgelessImpl);
     if (hasLogger) {
       ReactMarker::logTaggedMarkerBridgeless(
@@ -302,7 +288,7 @@ void ReactInstance::callFunctionOnModule(
                                      methodName = methodName,
                                      args = std::move(args)](
                                         jsi::Runtime& runtime) {
-    SystraceSection s(
+    TraceSection s(
         "ReactInstance::callFunctionOnModule",
         "moduleName",
         moduleName,
@@ -351,7 +337,7 @@ void ReactInstance::registerSegment(
   LOG(WARNING) << "Starting to run ReactInstance::registerSegment with segment "
                << segmentId;
   runtimeScheduler_->scheduleWork([=](jsi::Runtime& runtime) {
-    SystraceSection s("ReactInstance::registerSegment");
+    TraceSection s("ReactInstance::registerSegment");
     const auto tag = folly::to<std::string>(segmentId);
     auto script = JSBigFileString::fromPath(segmentPath);
     if (script->size() == 0) {
@@ -408,7 +394,7 @@ void ReactInstance::initializeRuntime(
     BindingsInstallFunc bindingsInstallFunc) noexcept {
   runtimeScheduler_->scheduleWork([this, options, bindingsInstallFunc](
                                       jsi::Runtime& runtime) {
-    SystraceSection s("ReactInstance::initializeRuntime");
+    TraceSection s("ReactInstance::initializeRuntime");
 
     bindNativePerformanceNow(runtime);
 
@@ -668,7 +654,7 @@ void ReactInstance::handleMemoryPressureJs(int pressureLevel) {
       LOG(INFO) << "Memory warning (pressure level: " << levelName
                 << ") received by JS VM, running a GC";
       runtimeScheduler_->scheduleWork([=](jsi::Runtime& runtime) {
-        SystraceSection s("ReactInstance::handleMemoryPressure");
+        TraceSection s("ReactInstance::handleMemoryPressure");
         runtime.instrumentation().collectGarbage(levelName);
       });
       break;