react-native-windows 0.77.0-preview.4 → 0.78.0-preview.1

package/Microsoft.ReactNative/Modules/Animated/PropsAnimatedNode.cpp

@@ -3,13 +3,13 @@
 
 #include "pch.h"
 
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
 #include <Modules/NativeUIManager.h>
 #include <Modules/PaperUIManagerModule.h>
+#include <Views/ShadowNodeBase.h>
 #endif
 
 #include <Utils/Helpers.h>
-#include <Views/ShadowNodeBase.h>
 #include <Views/XamlFeatures.h>
 #include "NativeAnimatedNodeManager.h"
 #include "PropsAnimatedNode.h"
@@ -84,9 +84,11 @@ void PropsAnimatedNode::DisconnectFromView(int64_t viewTag) {
     }
 
     if (m_centerPointAnimation) {
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
       if (const auto target = GetUIElement()) {
         target.StopAnimation(m_centerPointAnimation);
       }
+#endif
       m_centerPointAnimation = nullptr;
     }
     m_needsCenterPointAnimation = false;
@@ -140,6 +142,7 @@ void PropsAnimatedNode::UpdateView() {
   }
 }
 
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
 static void EnsureUIElementDirtyForRender(xaml::UIElement uiElement) {
   auto compositeMode = uiElement.CompositeMode();
   switch (compositeMode) {
@@ -153,16 +156,19 @@ static void EnsureUIElementDirtyForRender(xaml::UIElement uiElement) {
   }
   uiElement.CompositeMode(compositeMode);
 }
+#endif
 
 void PropsAnimatedNode::StartAnimations() {
   assert(m_useComposition);
   if (m_expressionAnimations.size()) {
     AnimationView view = GetAnimationView();
     if (view) {
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
       // Work around for https://github.com/microsoft/microsoft-ui-xaml/issues/2511
       if (view.m_element) {
         EnsureUIElementDirtyForRender(view.m_element);
       }
+#endif
       for (const auto &anim : m_expressionAnimations) {
         if (anim.second.Target() == L"Translation.X") {
           m_subchannelPropertySet.StartAnimation(L"TranslationX", anim.second);
@@ -177,18 +183,20 @@ void PropsAnimatedNode::StartAnimations() {
           m_subchannelPropertySet.StartAnimation(L"ScaleY", anim.second);
           StartAnimation(view, m_scaleCombined);
         } else if (anim.second.Target() == L"Rotation") {
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
           if (view.m_element) {
             view.m_element.RotationAxis(m_rotationAxis);
-#ifdef USE_FABRIC
-          } else {
+          }
+#else
+          if (view.m_componentView) {
             auto visual =
                 winrt::Microsoft::ReactNative::Composition::Experimental::CompositionContextHelper::InnerVisual(
                     view.m_componentView
                         .as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>()
                         ->Visual());
             visual.RotationAxis(m_rotationAxis);
-#endif
           }
+#endif
           StartAnimation(view, anim.second);
         } else {
           StartAnimation(view, anim.second);
@@ -322,20 +330,18 @@ void PropsAnimatedNode::MakeAnimation(int64_t valueNodeTag, FacadeType facadeTyp
   }
 }
 
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
 Microsoft::ReactNative::ShadowNodeBase *PropsAnimatedNode::GetShadowNodeBase() {
-#ifndef CORE_ABI
   if (const auto uiManager = Microsoft::ReactNative::GetNativeUIManager(m_context).lock()) {
     if (const auto nativeUIManagerHost = uiManager->getHost()) {
       return static_cast<Microsoft::ReactNative::ShadowNodeBase *>(
           nativeUIManagerHost->FindShadowNodeForTag(m_connectedViewTag));
     }
   }
-#endif
   return nullptr;
 }
 
 xaml::UIElement PropsAnimatedNode::GetUIElement() {
-#ifndef CORE_ABI
   if (IsRS5OrHigher()) {
     if (const auto shadowNodeBase = GetShadowNodeBase()) {
       if (const auto shadowNodeView = shadowNodeBase->GetView()) {
@@ -343,12 +349,12 @@ xaml::UIElement PropsAnimatedNode::GetUIElement() {
       }
     }
   }
-#endif
   return nullptr;
 }
+#endif
 
 void PropsAnimatedNode::CommitProps() {
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
   if (const auto node = GetShadowNodeBase()) {
     if (!node->m_zombie) {
       node->updateProperties(m_props);
@@ -358,43 +364,35 @@ void PropsAnimatedNode::CommitProps() {
 }
 
 PropsAnimatedNode::AnimationView PropsAnimatedNode::GetAnimationView() {
-#ifdef USE_FABRIC
-  if (auto fabricuiManager = FabricUIManager::FromProperties(m_context.Properties())) {
-    auto componentView = fabricuiManager->GetViewRegistry().findComponentViewWithTag(
-        static_cast<facebook::react::Tag>(m_connectedViewTag));
-    if (componentView) {
-      return {nullptr, componentView};
-    }
-  }
-#endif // USE_FABRIC
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
   if (IsRS5OrHigher()) {
     if (const auto shadowNodeBase = GetShadowNodeBase()) {
       if (const auto shadowNodeView = shadowNodeBase->GetView()) {
-#ifdef USE_FABRIC
-        return {shadowNodeView.as<xaml::UIElement>(), nullptr};
-#else
         return {shadowNodeView.as<xaml::UIElement>()};
-#endif
       }
     }
   }
-#endif // CORE_ABI
-
-#ifdef USE_FABRIC
-  return {nullptr, nullptr};
 #else
-  return {nullptr};
+  if (auto fabricuiManager = FabricUIManager::FromProperties(m_context.Properties())) {
+    auto componentView = fabricuiManager->GetViewRegistry().findComponentViewWithTag(
+        static_cast<facebook::react::Tag>(m_connectedViewTag));
+    if (componentView) {
+      return {componentView};
+    }
+  }
 #endif
+  return {nullptr};
 }
 
 void PropsAnimatedNode::StartAnimation(
     const AnimationView &view,
     const comp::CompositionAnimation &animation) noexcept {
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
   if (view.m_element) {
     view.m_element.StartAnimation(animation);
-#ifdef USE_FABRIC
-  } else if (view.m_componentView) {
+  }
+#else
+  if (view.m_componentView) {
     auto baseComponentView =
         view.m_componentView.as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>();
     auto visual = winrt::Microsoft::ReactNative::Composition::Experimental::CompositionContextHelper::InnerVisual(
@@ -414,17 +412,16 @@ void PropsAnimatedNode::StartAnimation(
       }
       visual.StartAnimation(targetProp, animation);
     }
-#endif
   }
+#endif
 }
 
 comp::CompositionPropertySet PropsAnimatedNode::EnsureCenterPointPropertySet(const AnimationView &view) noexcept {
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
   if (view.m_element) {
     return GetShadowNodeBase()->EnsureTransformPS();
   }
-#endif
-#ifdef USE_FABRIC
+#else
   if (view.m_componentView) {
     return view.m_componentView.as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>()
         ->EnsureCenterPointPropertySet();

package/Microsoft.ReactNative/Modules/Animated/PropsAnimatedNode.h

@@ -36,23 +36,26 @@ class PropsAnimatedNode final : public AnimatedNode {
 
  private:
   struct AnimationView {
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
     xaml::UIElement m_element;
-#ifdef USE_FABRIC
+#else
     winrt::Microsoft::ReactNative::ComponentView m_componentView;
 #endif
     operator bool() const noexcept {
-#ifdef USE_FABRIC
-      return m_element || m_componentView;
-#else
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
       return m_element != nullptr;
+#else
+      return m_componentView != nullptr;
 #endif
     }
   };
 
   void CommitProps();
   void MakeAnimation(int64_t valueNodeTag, FacadeType facadeType);
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
   Microsoft::ReactNative::ShadowNodeBase *GetShadowNodeBase();
   xaml::UIElement GetUIElement();
+#endif
   AnimationView GetAnimationView();
   void StartAnimation(const AnimationView &view, const comp::CompositionAnimation &animation) noexcept;
   comp::CompositionPropertySet EnsureCenterPointPropertySet(const AnimationView &view) noexcept;

package/Microsoft.ReactNative/Modules/AppStateModule.cpp

@@ -21,7 +21,7 @@ void AppState::Initialize(winrt::Microsoft::ReactNative::ReactContext const &rea
   // We need to register for notifications from the XAML thread.
   if (auto dispatcher = reactContext.UIDispatcher()) {
     dispatcher.Post([this]() {
-      auto currentApp = xaml::TryGetCurrentApplication();
+      auto currentApp = xaml::TryGetCurrentUwpXamlApplication();
 
       if (!IsWinUI3Island() && currentApp != nullptr) {
 #ifndef USE_WINUI3

package/Microsoft.ReactNative/Modules/AppThemeModuleUwp.cpp

@@ -44,7 +44,7 @@ static const React::ReactPropertyId<React::ReactNonAbiValue<std::shared_ptr<AppT
 AppThemeHolder::AppThemeHolder(const Mso::React::IReactContext &context) : m_context(&context) {
   NotifyHighContrastChanged();
 
-  if (auto currentApp = xaml::TryGetCurrentApplication()) {
+  if (auto currentApp = xaml::TryGetCurrentUwpXamlApplication()) {
     if (IsWinUI3Island()) {
       m_wmSubscription = SubscribeToWindowMessage(
           ReactNotificationService(m_context->Notifications()), WM_THEMECHANGED, [this](const auto &, const auto &) {
@@ -77,7 +77,7 @@ void AppThemeHolder::SetCallback(
 
 void AppThemeHolder::NotifyHighContrastChanged() noexcept {
   m_appThemeData.isHighContrast =
-      xaml::TryGetCurrentApplication() ? m_accessibilitySettings.HighContrast() : IsInHighContrastWin32();
+      xaml::TryGetCurrentUwpXamlApplication() ? m_accessibilitySettings.HighContrast() : IsInHighContrastWin32();
   m_appThemeData.highContrastColors.ButtonFaceColor =
       FormatRGB(m_uiSettings.UIElementColor(winrt::UIElementType::ButtonFace));
   m_appThemeData.highContrastColors.ButtonTextColor =

package/Microsoft.ReactNative/Modules/AppearanceModule.cpp

@@ -50,7 +50,7 @@ ApplicationTheme CurrentThemeFromUISettings(const winrt::Windows::UI::ViewManage
 
 ApplicationTheme Appearance::GetCurrentTheme() noexcept {
   assert(m_context.UIDispatcher().HasThreadAccess()); // xaml::Application is only accessible on the UI thread
-  if (auto currentApp = xaml::TryGetCurrentApplication()) {
+  if (auto currentApp = xaml::TryGetCurrentUwpXamlApplication()) {
     return currentApp.RequestedTheme();
   }
 
@@ -74,7 +74,7 @@ void Appearance::RequeryTheme() noexcept {
 
 void Appearance::InitOnUIThread(const Mso::React::IReactContext &context) noexcept {
   xaml::ApplicationTheme theme = ApplicationTheme::Light;
-  if (auto currentApp = xaml::TryGetCurrentApplication()) {
+  if (auto currentApp = xaml::TryGetCurrentUwpXamlApplication()) {
     theme = currentApp.RequestedTheme();
   } else {
     theme = CurrentThemeFromUISettings(winrt::Windows::UI::ViewManagement::UISettings());

package/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp

@@ -36,7 +36,7 @@ DeviceInfoHolder::DeviceInfoHolder(const Mso::React::IReactContext &context) : m
 }
 
 void DeviceInfoHolder::InitDeviceInfoHolder(const Mso::React::IReactContext &context) noexcept {
-  if (xaml::TryGetCurrentApplication() || IsFabricEnabled(context.Properties())) {
+  if (xaml::TryGetCurrentUwpXamlApplication() || IsFabricEnabled(context.Properties())) {
     auto deviceInfoHolder = std::make_shared<DeviceInfoHolder>(context);
 
     deviceInfoHolder->updateDeviceInfo();
@@ -51,7 +51,7 @@ void DeviceInfoHolder::InitDeviceInfoHolder(const Mso::React::IReactContext &con
     }
 #endif
 
-    if (xaml::TryGetCurrentApplication()) {
+    if (xaml::TryGetCurrentUwpXamlApplication()) {
       if (auto window = xaml::Window::Current()) {
         auto const &coreWindow = window.CoreWindow();
 
@@ -157,7 +157,7 @@ void DeviceInfoHolder::SetCallback(
 }
 
 void DeviceInfoHolder::updateDeviceInfo() noexcept {
-  if (xaml::TryGetCurrentApplication() && xaml::Window::Current()) {
+  if (xaml::TryGetCurrentUwpXamlApplication() && xaml::Window::Current()) {
     auto const window = xaml::Window::Current().CoreWindow();
 
     m_windowWidth = window.Bounds().Width;

package/Microsoft.ReactNative/Modules/I18nManagerModule.cpp

@@ -28,7 +28,7 @@ static const React::ReactPropertyId<bool> &ForceRTLPropertyId() noexcept {
 }
 
 void I18nManager::InitI18nInfo(const winrt::Microsoft::ReactNative::ReactPropertyBag &propertyBag) noexcept {
-  if (xaml::TryGetCurrentApplication() && !IsXamlIsland()) {
+  if (xaml::TryGetCurrentUwpXamlApplication() && !IsXamlIsland()) {
     // TODO: Figure out packaged win32 app story for WinUI 3
     auto layoutDirection = winrt::Windows::ApplicationModel::Resources::Core::ResourceContext()
                                .GetForCurrentView()

package/Microsoft.ReactNative/Modules/LogBoxModule.cpp

@@ -8,14 +8,15 @@
 #include "ReactHost/ReactInstanceWin.h"
 #include "ReactNativeHost.h"
 #include "Utils/Helpers.h"
-#include "XamlUtils.h"
 
 #ifdef USE_FABRIC
 #include <Fabric/Composition/CompositionContextHelper.h>
 #include <Fabric/Composition/CompositionUIService.h>
 #include <winrt/Windows.UI.Composition.h>
-#endif
+#else
 #include <UI.Xaml.Controls.Primitives.h>
+#include "XamlUtils.h"
+#endif
 
 namespace Microsoft::ReactNative {
 
@@ -121,7 +122,7 @@ void LogBox::ShowOnUIThread() noexcept {
   auto host = React::implementation::ReactNativeHost::GetReactNativeHost(m_context.Properties());
   if (!host)
     return;
-
+#ifndef USE_FABRIC
   if (!IsFabricEnabled(m_context.Properties().Handle())) {
     m_logBoxContent = React::ReactRootView();
     m_logBoxContent.ComponentName(L"LogBox");
@@ -170,7 +171,7 @@ void LogBox::ShowOnUIThread() noexcept {
     m_popup.Child(m_logBoxContent);
     m_popup.IsOpen(true);
   }
-#ifdef USE_FABRIC
+#else
   else {
     RegisterWndClass();
 
@@ -212,7 +213,7 @@ void LogBox::HideOnUIThread() noexcept {
   if (m_hwnd) {
     ::ShowWindow(m_hwnd, SW_HIDE);
   }
-#endif // USE_FABRIC
+#else // USE_FABRIC
   if (m_popup) {
     m_popup.Closed(m_tokenClosed);
     m_sizeChangedRevoker.revoke();
@@ -220,6 +221,7 @@ void LogBox::HideOnUIThread() noexcept {
     m_popup = nullptr;
     m_logBoxContent = nullptr;
   }
+#endif // USE_FABRIC
 }
 
 void LogBox::Initialize(React::ReactContext const &reactContext) noexcept {

package/Microsoft.ReactNative/Modules/LogBoxModule.h

@@ -32,9 +32,10 @@ struct LogBox : public std::enable_shared_from_this<LogBox> {
   winrt::Microsoft::ReactNative::ReactContext m_context;
 #ifdef USE_FABRIC
   HWND m_hwnd{nullptr};
-#endif // USE_FABRIC
+#else
   xaml::Controls::Primitives::Popup m_popup{nullptr};
   winrt::Microsoft::ReactNative::ReactRootView m_logBoxContent{nullptr};
+#endif // USE_FABRIC
   xaml::FrameworkElement::SizeChanged_revoker m_sizeChangedRevoker;
   winrt::event_token m_tokenClosed;
 };

package/Microsoft.ReactNative/Modules/NativeUIManager.cpp

@@ -8,7 +8,7 @@
 #include <UI.Xaml.Input.h>
 #include <UI.Xaml.Media.h>
 #include <Views/ShadowNodeBase.h>
-#include <cxxreact/SystraceSection.h>
+#include <cxxreact/TraceSection.h>
 #include "Modules/I18nManagerModule.h"
 #include "NativeUIManager.h"
 
@@ -215,7 +215,7 @@ int64_t NativeUIManager::AddMeasuredRootView(facebook::react::IReactRootView *ro
 }
 
 void NativeUIManager::AddRootView(ShadowNode &shadowNode, facebook::react::IReactRootView *pReactRootView) {
-  SystraceSection s("NativeUIManager::AddRootView");
+  TraceSection s("NativeUIManager::AddRootView");
   auto xamlRootView = static_cast<IXamlRootView *>(pReactRootView);
   XamlView view = xamlRootView->GetXamlView();
   const auto rootTag = shadowNode.m_tag;
@@ -243,14 +243,14 @@ void NativeUIManager::AddRootView(ShadowNode &shadowNode, facebook::react::IReac
 }
 
 void NativeUIManager::removeRootView(Microsoft::ReactNative::ShadowNode &shadow) {
-  SystraceSection s("NativeUIManager::removeRootView");
+  TraceSection s("NativeUIManager::removeRootView");
   m_tagsToXamlReactControl.erase(shadow.m_tag);
   m_sizeChangedMap.erase(shadow.m_tag);
   RemoveView(shadow, true);
 }
 
 void NativeUIManager::onBatchComplete() {
-  SystraceSection s("NativeUIManager::onBatchComplete");
+  TraceSection s("NativeUIManager::onBatchComplete");
   if (m_inBatch) {
     DoLayout();
     m_inBatch = false;
@@ -783,7 +783,7 @@ static void StyleYogaNode(
 }
 
 void NativeUIManager::CreateView(ShadowNode &shadowNode, React::JSValueObject &props) {
-  SystraceSection s("NativeUIManager::CreateView");
+  TraceSection s("NativeUIManager::CreateView");
   ShadowNodeBase &node = static_cast<ShadowNodeBase &>(shadowNode);
   auto *pViewManager = node.GetViewManager();
 
@@ -874,7 +874,7 @@ void NativeUIManager::ReplaceView(ShadowNode &shadowNode) {
 }
 
 void NativeUIManager::UpdateView(ShadowNode &shadowNode, winrt::Microsoft::ReactNative::JSValueObject &props) {
-  SystraceSection s("NativeUIManager::UpdateView");
+  TraceSection s("NativeUIManager::UpdateView");
   ShadowNodeBase &node = static_cast<ShadowNodeBase &>(shadowNode);
   auto *pViewManager = node.GetViewManager();
 
@@ -885,10 +885,10 @@ void NativeUIManager::UpdateView(ShadowNode &shadowNode, winrt::Microsoft::React
 }
 
 void NativeUIManager::DoLayout() {
-  SystraceSection s("NativeUIManager::DoLayout");
+  TraceSection s("NativeUIManager::DoLayout");
 
   {
-    SystraceSection s("NativeUIManager::DoLayout::UpdateLayout");
+    TraceSection s("NativeUIManager::DoLayout::UpdateLayout");
     // Process vector of RN controls needing extra layout here.
     const auto extraLayoutNodes = m_extraLayoutNodes;
     for (const int64_t tag : extraLayoutNodes) {
@@ -914,7 +914,7 @@ void NativeUIManager::DoLayout() {
 
 void NativeUIManager::ApplyLayout(int64_t tag, float width, float height) {
   if (YGNodeRef rootNode = GetYogaNode(tag)) {
-    SystraceSection s("NativeUIManager::DoLayout::YGNodeCalculateLayout");
+    TraceSection s("NativeUIManager::DoLayout::YGNodeCalculateLayout");
     // We must always run layout in LTR mode, which might seem unintuitive.
     // We will flip the root of the tree into RTL by forcing the root XAML node's FlowDirection to RightToLeft
     // which will inherit down the XAML tree, allowing all native controls to pick it up.
@@ -925,7 +925,7 @@ void NativeUIManager::ApplyLayout(int64_t tag, float width, float height) {
   }
 
   {
-    SystraceSection s("NativeUIManager::DoLayout::SetLayoutProps");
+    TraceSection s("NativeUIManager::DoLayout::SetLayoutProps");
     SetLayoutPropsRecursive(tag);
   }
 }

package/Microsoft.ReactNative/Modules/PaperUIManagerModule.cpp

@@ -10,7 +10,7 @@
 #include <Modules/PaperUIManagerModule.h>
 #include <Views/ViewManager.h>
 #include <XamlUtils.h>
-#include <cxxreact/SystraceSection.h>
+#include <cxxreact/TraceSection.h>
 #include <glog/logging.h>
 #include "ShadowNodeBase.h"
 #include "Unicode.h"
@@ -580,7 +580,7 @@ void UIManager::createView(
                                                  viewName = std::move(viewName),
                                                  rootTag,
                                                  props = std::move(props)]() mutable {
-    SystraceSection s("UIManager::createView");
+    TraceSection s("UIManager::createView");
     if (auto module = m.lock()) {
       module->createView(static_cast<int64_t>(reactTag), viewName, static_cast<int64_t>(rootTag), std::move(props));
     }
@@ -592,7 +592,7 @@ void UIManager::updateView(double reactTag, std::string viewName, React::JSValue
                                                          reactTag,
                                                          viewName = std::move(viewName),
                                                          props = std::move(props)]() mutable {
-    SystraceSection s("UIManager::updateView");
+    TraceSection s("UIManager::updateView");
     if (auto module = m.lock()) {
       module->updateView(static_cast<int64_t>(reactTag), viewName, std::move(props));
     }
@@ -601,7 +601,7 @@ void UIManager::updateView(double reactTag, std::string viewName, React::JSValue
 
 void UIManager::focus(double reactTag) noexcept {
   m_batchingUIMessageQueue->runOnQueue([m = std::weak_ptr<UIManagerModule>(m_module), reactTag]() {
-    SystraceSection s("UIManager::focus");
+    TraceSection s("UIManager::focus");
     if (auto module = m.lock()) {
       module->focus(static_cast<int64_t>(reactTag));
     }
@@ -610,7 +610,7 @@ void UIManager::focus(double reactTag) noexcept {
 
 void UIManager::blur(double reactTag) noexcept {
   m_batchingUIMessageQueue->runOnQueue(Mso::VoidFunctor([m = std::weak_ptr<UIManagerModule>(m_module), reactTag]() {
-    SystraceSection s("UIManager::blur");
+    TraceSection s("UIManager::blur");
     if (auto module = m.lock()) {
       module->blur(static_cast<int64_t>(reactTag));
     }
@@ -626,7 +626,7 @@ void UIManager::findSubviewIn(
                                                          reactTag,
                                                          point = std::move(point),
                                                          callback = std::move(callback)]() mutable {
-    SystraceSection s("UIManager::findSubviewIn");
+    TraceSection s("UIManager::findSubviewIn");
     if (auto module = m.lock()) {
       module->findSubviewIn(static_cast<int64_t>(reactTag), std::move(point), std::move(callback));
     }
@@ -641,7 +641,7 @@ void UIManager::dispatchViewManagerCommand(
                                                          reactTag,
                                                          commandID = std::move(commandID),
                                                          commandArgs = std::move(commandArgs)]() mutable {
-    SystraceSection s("UIManager::dispatchViewManagerCommand");
+    TraceSection s("UIManager::dispatchViewManagerCommand");
     if (auto module = m.lock()) {
       module->dispatchViewManagerCommand(static_cast<int64_t>(reactTag), std::move(commandID), std::move(commandArgs));
     }
@@ -654,7 +654,7 @@ void UIManager::measure(
         &callback) noexcept {
   m_batchingUIMessageQueue->runOnQueue(Mso::VoidFunctor(
       [m = std::weak_ptr<UIManagerModule>(m_module), reactTag, callback = std::move(callback)]() mutable {
-        SystraceSection s("UIManager::measure");
+        TraceSection s("UIManager::measure");
         if (auto module = m.lock()) {
           module->measure(static_cast<int64_t>(reactTag), std::move(callback));
         }
@@ -666,7 +666,7 @@ void UIManager::measureInWindow(
     std::function<void(double x, double y, double width, double height)> const &callback) noexcept {
   m_batchingUIMessageQueue->runOnQueue(Mso::VoidFunctor(
       [m = std::weak_ptr<UIManagerModule>(m_module), reactTag, callback = std::move(callback)]() mutable {
-        SystraceSection s("UIManager::measureInWindow");
+        TraceSection s("UIManager::measureInWindow");
         if (auto module = m.lock()) {
           module->measureInWindow(static_cast<int64_t>(reactTag), std::move(callback));
         }
@@ -681,7 +681,7 @@ void UIManager::viewIsDescendantOf(
                                                          reactTag,
                                                          ancestorReactTag,
                                                          callback = std::move(callback)]() mutable {
-    SystraceSection s("UIManager::viewIsDescendantOf");
+    TraceSection s("UIManager::viewIsDescendantOf");
     if (auto module = m.lock()) {
       module->viewIsDescendantOf(
           static_cast<int64_t>(reactTag), static_cast<int64_t>(ancestorReactTag), std::move(callback));
@@ -699,7 +699,7 @@ void UIManager::measureLayout(
                                                          ancestorReactTag,
                                                          errorCallback = std::move(errorCallback),
                                                          callback = std::move(callback)]() mutable {
-    SystraceSection s("UIManager::measureLayout");
+    TraceSection s("UIManager::measureLayout");
     if (auto module = m.lock()) {
       module->measureLayout(
           static_cast<int64_t>(reactTag),
@@ -718,7 +718,7 @@ void UIManager::measureLayoutRelativeToParent(
                                                          reactTag,
                                                          errorCallback = std::move(errorCallback),
                                                          callback = std::move(callback)]() mutable {
-    SystraceSection s("UIManager::measureLayoutRelativeToParent");
+    TraceSection s("UIManager::measureLayoutRelativeToParent");
     if (auto module = m.lock()) {
       module->measureLayoutRelativeToParent(
           static_cast<int64_t>(reactTag), std::move(errorCallback), std::move(callback));
@@ -729,7 +729,7 @@ void UIManager::measureLayoutRelativeToParent(
 void UIManager::setJSResponder(double reactTag, bool blockNativeResponder) noexcept {
   m_batchingUIMessageQueue->runOnQueue(
       Mso::VoidFunctor([m = std::weak_ptr<UIManagerModule>(m_module), reactTag, blockNativeResponder]() mutable {
-        SystraceSection s("UIManager::setJSResponder");
+        TraceSection s("UIManager::setJSResponder");
         if (auto module = m.lock()) {
           module->setJSResponder(static_cast<int64_t>(reactTag), blockNativeResponder);
         }
@@ -738,7 +738,7 @@ void UIManager::setJSResponder(double reactTag, bool blockNativeResponder) noexc
 
 void UIManager::clearJSResponder() noexcept {
   m_batchingUIMessageQueue->runOnQueue(Mso::VoidFunctor([m = std::weak_ptr<UIManagerModule>(m_module)]() mutable {
-    SystraceSection s("UIManager::clearJSResponder");
+    TraceSection s("UIManager::clearJSResponder");
     if (auto module = m.lock()) {
       module->clearJSResponder();
     }
@@ -753,7 +753,7 @@ void UIManager::configureNextLayoutAnimation(
                                                          config = std::move(config),
                                                          callback = std::move(callback),
                                                          errorCallback = std::move(errorCallback)]() mutable {
-    SystraceSection s("UIManager::configureNextLayoutAnimation");
+    TraceSection s("UIManager::configureNextLayoutAnimation");
     if (auto module = m.lock()) {
       module->configureNextLayoutAnimation(std::move(config), std::move(callback), std::move(errorCallback));
     }
@@ -762,7 +762,7 @@ void UIManager::configureNextLayoutAnimation(
 
 void UIManager::removeSubviewsFromContainerWithID(double containerID) noexcept {
   m_batchingUIMessageQueue->runOnQueue(Mso::VoidFunctor([m = std::weak_ptr<UIManagerModule>(m_module), containerID]() {
-    SystraceSection s("UIManager::removeSubviewsFromContainerWithID");
+    TraceSection s("UIManager::removeSubviewsFromContainerWithID");
     if (auto module = m.lock()) {
       module->removeSubviewsFromContainerWithID(static_cast<int64_t>(containerID));
     }
@@ -772,7 +772,7 @@ void UIManager::removeSubviewsFromContainerWithID(double containerID) noexcept {
 void UIManager::replaceExistingNonRootView(double reactTag, double newReactTag) noexcept {
   m_batchingUIMessageQueue->runOnQueue(
       Mso::VoidFunctor([m = std::weak_ptr<UIManagerModule>(m_module), reactTag, newReactTag]() {
-        SystraceSection s("UIManager::replaceExistingNonRootView");
+        TraceSection s("UIManager::replaceExistingNonRootView");
         if (auto module = m.lock()) {
           module->replaceExistingNonRootView(static_cast<int64_t>(reactTag), static_cast<int64_t>(newReactTag));
         }
@@ -781,7 +781,7 @@ void UIManager::replaceExistingNonRootView(double reactTag, double newReactTag)
 
 void UIManager::removeRootView(double reactTag) noexcept {
   m_batchingUIMessageQueue->runOnQueue(Mso::VoidFunctor([m = std::weak_ptr<UIManagerModule>(m_module), reactTag]() {
-    SystraceSection s("UIManager::removeRootView");
+    TraceSection s("UIManager::removeRootView");
     if (auto module = m.lock()) {
       module->removeRootView(static_cast<int64_t>(reactTag));
     }
@@ -791,7 +791,7 @@ void UIManager::removeRootView(double reactTag) noexcept {
 void UIManager::setChildren(double containerTag, React::JSValueArray &&reactTags) noexcept {
   m_batchingUIMessageQueue->runOnQueue(Mso::VoidFunctor(
       [m = std::weak_ptr<UIManagerModule>(m_module), containerTag, reactTags = std::move(reactTags)]() mutable {
-        SystraceSection s("UIManager::setChildren");
+        TraceSection s("UIManager::setChildren");
         if (auto module = m.lock()) {
           module->setChildren(static_cast<int64_t>(containerTag), std::move(reactTags));
         }
@@ -812,7 +812,7 @@ void UIManager::manageChildren(
                                                          addChildReactTags = std::move(addChildReactTags),
                                                          addAtIndices = std::move(addAtIndices),
                                                          removeAtIndices = std::move(removeAtIndices)]() mutable {
-    SystraceSection s("UIManager::manageChildren");
+    TraceSection s("UIManager::manageChildren");
     if (auto module = m.lock()) {
       module->manageChildren(
           static_cast<int64_t>(containerTag),
@@ -828,7 +828,7 @@ void UIManager::manageChildren(
 void UIManager::setLayoutAnimationEnabledExperimental(bool enabled) noexcept {
   m_batchingUIMessageQueue->runOnQueue(
       Mso::VoidFunctor([m = std::weak_ptr<UIManagerModule>(m_module), enabled]() mutable {
-        SystraceSection s("UIManager::setLayoutAnimationEnabledExperimental");
+        TraceSection s("UIManager::setLayoutAnimationEnabledExperimental");
         if (auto module = m.lock()) {
           module->setLayoutAnimationEnabledExperimental(enabled);
         }
@@ -838,7 +838,7 @@ void UIManager::setLayoutAnimationEnabledExperimental(bool enabled) noexcept {
 void UIManager::sendAccessibilityEvent(double reactTag, double eventType) noexcept {
   m_batchingUIMessageQueue->runOnQueue(
       Mso::VoidFunctor([m = std::weak_ptr<UIManagerModule>(m_module), reactTag, eventType]() mutable {
-        SystraceSection s("UIManager::sendAccessibilityEvent");
+        TraceSection s("UIManager::sendAccessibilityEvent");
         if (auto module = m.lock()) {
           module->sendAccessibilityEvent(static_cast<int64_t>(reactTag), eventType);
         }
@@ -855,7 +855,7 @@ void UIManager::showPopupMenu(
                                                          items = std::move(items),
                                                          error = std::move(error),
                                                          success = std::move(success)]() mutable {
-    SystraceSection s("UIManager::showPopupMenu");
+    TraceSection s("UIManager::showPopupMenu");
     if (auto module = m.lock()) {
       module->showPopupMenu(static_cast<int64_t>(reactTag), std::move(items), std::move(error), std::move(success));
     }
@@ -864,7 +864,7 @@ void UIManager::showPopupMenu(
 
 void UIManager::dismissPopupMenu() noexcept {
   m_batchingUIMessageQueue->runOnQueue(Mso::VoidFunctor([m = std::weak_ptr<UIManagerModule>(m_module)]() mutable {
-    SystraceSection s("UIManager::dismissPopupMenu");
+    TraceSection s("UIManager::dismissPopupMenu");
     if (auto module = m.lock()) {
       module->dismissPopupMenu();
     }