react-native-windows 0.69.6 → 0.70.0

package/Microsoft.ReactNative/Modules/AppStateModule.cpp

@@ -3,16 +3,20 @@
 
 #include "pch.h"
 #include "AppStateModule.h"
+#include <QuirkSettings.h>
 #include <Utils/Helpers.h>
 #include <XamlUtils.h>
 #include <winrt/Windows.ApplicationModel.DataTransfer.h>
 #include "Unicode.h"
 
+using namespace winrt::Windows::UI::Core;
+
 namespace Microsoft::ReactNative {
 
 void AppState::Initialize(winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept {
   m_context = reactContext;
-  m_active = true;
+  m_deactivated = false;
+  m_enteredBackground = false;
 
   // We need to register for notifications from the XAML thread.
   if (auto dispatcher = reactContext.UIDispatcher()) {
@@ -21,13 +25,15 @@ void AppState::Initialize(winrt::Microsoft::ReactNative::ReactContext const &rea
 
       if (!IsWinUI3Island() && currentApp != nullptr) {
 #ifndef USE_WINUI3
+        CoreWindow window = CoreWindow::GetForCurrentThread();
+
         m_enteredBackgroundRevoker = currentApp.EnteredBackground(
             winrt::auto_revoke,
             [weakThis = weak_from_this()](
                 winrt::IInspectable const & /*sender*/,
                 winrt::Windows::ApplicationModel::EnteredBackgroundEventArgs const & /*e*/) noexcept {
               if (auto strongThis = weakThis.lock()) {
-                strongThis->SetActive(false);
+                strongThis->SetEnteredBackground(true);
               }
             });
 
@@ -37,9 +43,27 @@ void AppState::Initialize(winrt::Microsoft::ReactNative::ReactContext const &rea
                 winrt::IInspectable const & /*sender*/,
                 winrt::Windows::ApplicationModel::LeavingBackgroundEventArgs const & /*e*/) noexcept {
               if (auto strongThis = weakThis.lock()) {
-                strongThis->SetActive(true);
+                strongThis->SetEnteredBackground(false);
               }
             });
+        if (window != nullptr &&
+            winrt::Microsoft::ReactNative::implementation::QuirkSettings::GetMapWindowDeactivatedToAppStateInactive(
+                m_context.Properties())) {
+          m_activatedEventRevoker = window.Activated(
+              winrt::auto_revoke,
+              [weakThis = weak_from_this()](
+                  winrt::Windows::UI::Core::CoreWindow /*sender*/,
+                  winrt::Windows::UI::Core::WindowActivatedEventArgs args) {
+                if (auto strongThis = weakThis.lock()) {
+                  if (args.WindowActivationState() ==
+                      winrt::Windows::UI::Core::CoreWindowActivationState::Deactivated) {
+                    strongThis->SetDeactivated(true);
+                  } else {
+                    strongThis->SetDeactivated(false);
+                  }
+                }
+              });
+        }
 #endif
       } else {
         assert(IsXamlIsland());
@@ -52,7 +76,7 @@ void AppState::GetCurrentAppState(
     std::function<void(AppStateChangeArgs const &)> const &success,
     std::function<void(React::JSValue const &)> const &error) noexcept {
   AppStateChangeArgs args;
-  args.app_state = m_active ? "active" : "background";
+  args.app_state = GetAppState();
   success(args);
 }
 
@@ -65,12 +89,24 @@ void AppState::RemoveListeners(double /*count*/) noexcept {
 }
 
 ReactNativeSpecs::AppStateSpec_Constants AppState::GetConstants() noexcept {
-  return {m_active ? "active" : "background"};
+  return {GetAppState()};
+}
+
+void AppState::SetDeactivated(bool deactivated) noexcept {
+  if (winrt::Microsoft::ReactNative::implementation::QuirkSettings::GetMapWindowDeactivatedToAppStateInactive(
+          m_context.Properties())) {
+    m_deactivated = deactivated;
+    m_context.JSDispatcher().Post([this]() { AppStateDidChange({GetAppState()}); });
+  }
+}
+
+void AppState::SetEnteredBackground(bool enteredBackground) noexcept {
+  m_enteredBackground = enteredBackground;
+  m_context.JSDispatcher().Post([this]() { AppStateDidChange({GetAppState()}); });
 }
 
-void AppState::SetActive(bool active) noexcept {
-  m_active = active;
-  m_context.JSDispatcher().Post([this]() { AppStateDidChange({m_active ? "active" : "background"}); });
+std::string AppState::GetAppState() noexcept {
+  return m_enteredBackground ? "background" : (m_deactivated ? "inactive" : "active");
 }
 
-} // namespace Microsoft::ReactNative
+} // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Modules/AppStateModule.h

@@ -2,11 +2,13 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "../../codegen/NativeAppStateSpec.g.h"
+#include "codegen/NativeAppStateSpec.g.h"
 #include <NativeModules.h>
 #include <winrt/Windows.ApplicationModel.h>
 #include <winrt/Windows.Foundation.h>
 
+#include <winrt/Windows.UI.Core.h>
+
 namespace Microsoft::ReactNative {
 
 REACT_MODULE(AppState)
@@ -35,15 +37,19 @@ struct AppState : public std::enable_shared_from_this<AppState> {
   std::function<void(AppStateChangeArgs const &)> AppStateDidChange;
 
  private:
-  void SetActive(bool active) noexcept;
+  void SetDeactivated(bool deactivated) noexcept;
+  void SetEnteredBackground(bool enteredBackground) noexcept;
+  std::string GetAppState() noexcept;
 
   std::mutex m_stateMutex;
-  std::atomic<bool> m_active;
+  std::atomic<bool> m_deactivated;
+  std::atomic<bool> m_enteredBackground;
   char const *m_lastState{nullptr};
   React::ReactContext m_context;
 #ifndef USE_WINUI3
   xaml::Application::EnteredBackground_revoker m_enteredBackgroundRevoker;
   xaml::Application::LeavingBackground_revoker m_leavingBackgroundRevoker;
+  winrt::Windows::UI::Core::CoreWindow::Activated_revoker m_activatedEventRevoker;
 #endif
 };
 

package/Microsoft.ReactNative/Modules/AppThemeModuleUwp.h

@@ -9,7 +9,7 @@
 #include <cxxreact/MessageQueueThread.h>
 #include <winrt/Windows.UI.ViewManagement.h>
 
-#include "../../codegen/NativeAppThemeSpec.g.h"
+#include "codegen/NativeAppThemeSpec.g.h"
 #include <NativeModules.h>
 
 namespace Microsoft::ReactNative {

package/Microsoft.ReactNative/Modules/ClipboardModule.h

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "../../codegen/NativeClipboardSpec.g.h"
+#include "codegen/NativeClipboardSpec.g.h"
 #include <NativeModules.h>
 
 namespace Microsoft::ReactNative {

package/Microsoft.ReactNative/Modules/DevSettingsModule.h

@@ -5,7 +5,7 @@
 #include <cxxreact/CxxModule.h>
 #include <functional/functor.h>
 
-#include "../../codegen/NativeDevSettingsSpec.g.h"
+#include "codegen/NativeDevSettingsSpec.g.h"
 #include <NativeModules.h>
 #include <ReactHost/React.h>
 

package/Microsoft.ReactNative/Modules/DeviceInfoModule.h

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "../../codegen/NativeDeviceInfoSpec.g.h"
+#include "codegen/NativeDeviceInfoSpec.g.h"
 #include <NativeModules.h>
 #include <React.h>
 #include <ReactNotificationService.h>

package/Microsoft.ReactNative/Modules/I18nManagerModule.h

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "../../codegen/NativeI18nManagerSpec.g.h"
+#include "codegen/NativeI18nManagerSpec.g.h"
 #include <NativeModules.h>
 #include <winrt/Windows.ApplicationModel.h>
 #include <winrt/Windows.Foundation.h>

package/Microsoft.ReactNative/Modules/ImageViewManagerModule.cpp

@@ -45,7 +45,7 @@ winrt::fire_and_forget GetImageSizeAsync(
     bool needsDownload = (scheme == L"http") || (scheme == L"https");
     bool inlineData = scheme == L"data";
 
-    winrt::InMemoryRandomAccessStream memoryStream;
+    winrt::IRandomAccessStream memoryStream;
     if (needsDownload) {
       memoryStream = co_await GetImageStreamAsync(source);
     } else if (inlineData) {

package/Microsoft.ReactNative/Modules/ImageViewManagerModule.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../../codegen/NativeImageLoaderIOSSpec.g.h"
+#include "codegen/NativeImageLoaderIOSSpec.g.h"
 #include <NativeModules.h>
 #include <winrt/Windows.ApplicationModel.h>
 #include <winrt/Windows.Foundation.h>

package/Microsoft.ReactNative/Modules/LinkingManagerModule.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../../codegen/NativeLinkingManagerSpec.g.h"
+#include "codegen/NativeLinkingManagerSpec.g.h"
 #include <NativeModules.h>
 #include <winrt/Windows.ApplicationModel.h>
 #include <winrt/Windows.Foundation.h>

package/Microsoft.ReactNative/Modules/LogBoxModule.h

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "../../codegen/NativeLogBoxSpec.g.h"
+#include "codegen/NativeLogBoxSpec.g.h"
 #include <NativeModules.h>
 #include <winrt/Windows.ApplicationModel.h>
 #include <winrt/Windows.Foundation.h>

package/Microsoft.ReactNative/Modules/NativeUIManager.cpp

@@ -7,6 +7,7 @@
 #include <UI.Xaml.Input.h>
 #include <UI.Xaml.Media.h>
 #include <Views/ShadowNodeBase.h>
+#include <cxxreact/SystraceSection.h>
 #include "Modules/I18nManagerModule.h"
 #include "NativeUIManager.h"
 
@@ -24,6 +25,8 @@ using namespace xaml::Controls;
 using namespace xaml::Media;
 } // namespace winrt
 
+using namespace facebook::react;
+
 namespace Microsoft::ReactNative {
 
 static YogaNodePtr make_yoga_node(YGConfigRef config) {
@@ -38,7 +41,7 @@ static int YogaLog(
     YGLogLevel /*level*/,
     const char *format,
     va_list args) {
-  int len = _scprintf(format, args);
+  const int len = _vscprintf(format, args);
   std::string buffer(len + 1, '\0');
   vsnprintf_s(&buffer[0], len + 1, _TRUNCATE, format, args);
   buffer.resize(len);
@@ -222,6 +225,7 @@ int64_t NativeUIManager::AddMeasuredRootView(facebook::react::IReactRootView *ro
 }
 
 void NativeUIManager::AddRootView(ShadowNode &shadowNode, facebook::react::IReactRootView *pReactRootView) {
+  SystraceSection s("NativeUIManager::AddRootView");
   auto xamlRootView = static_cast<IXamlRootView *>(pReactRootView);
   XamlView view = xamlRootView->GetXamlView();
   m_tagsToXamlReactControl.emplace(
@@ -244,11 +248,13 @@ void NativeUIManager::AddRootView(ShadowNode &shadowNode, facebook::react::IReac
 }
 
 void NativeUIManager::removeRootView(Microsoft::ReactNative::ShadowNode &shadow) {
+  SystraceSection s("NativeUIManager::removeRootView");
   m_tagsToXamlReactControl.erase(shadow.m_tag);
   RemoveView(shadow, true);
 }
 
 void NativeUIManager::onBatchComplete() {
+  SystraceSection s("NativeUIManager::onBatchComplete");
   if (m_inBatch) {
     DoLayout();
     m_inBatch = false;
@@ -768,6 +774,7 @@ static void StyleYogaNode(
 }
 
 void NativeUIManager::CreateView(ShadowNode &shadowNode, React::JSValueObject &props) {
+  SystraceSection s("NativeUIManager::CreateView");
   ShadowNodeBase &node = static_cast<ShadowNodeBase &>(shadowNode);
   auto *pViewManager = node.GetViewManager();
 
@@ -859,6 +866,7 @@ void NativeUIManager::ReplaceView(ShadowNode &shadowNode) {
 }
 
 void NativeUIManager::UpdateView(ShadowNode &shadowNode, winrt::Microsoft::ReactNative::JSValueObject &props) {
+  SystraceSection s("NativeUIManager::UpdateView");
   ShadowNodeBase &node = static_cast<ShadowNodeBase &>(shadowNode);
   auto *pViewManager = node.GetViewManager();
 
@@ -889,51 +897,70 @@ void NativeUIManager::UpdateExtraLayout(int64_t tag) {
 }
 
 void NativeUIManager::DoLayout() {
-  // Process vector of RN controls needing extra layout here.
-  const auto extraLayoutNodes = m_extraLayoutNodes;
-  for (const int64_t tag : extraLayoutNodes) {
-    ShadowNodeBase *node = static_cast<ShadowNodeBase *>(m_host->FindShadowNodeForTag(tag));
-    if (node) {
-      auto element = node->GetView().as<xaml::FrameworkElement>();
-      element.UpdateLayout();
+  SystraceSection s("NativeUIManager::DoLayout");
+
+  {
+    SystraceSection s("NativeUIManager::DoLayout::UpdateLayout");
+    // Process vector of RN controls needing extra layout here.
+    const auto extraLayoutNodes = m_extraLayoutNodes;
+    for (const int64_t tag : extraLayoutNodes) {
+      ShadowNodeBase *node = static_cast<ShadowNodeBase *>(m_host->FindShadowNodeForTag(tag));
+      if (node) {
+        auto element = node->GetView().as<xaml::FrameworkElement>();
+        element.UpdateLayout();
+      }
     }
+    // Values need to be cleared from the vector before next call to DoLayout.
+    m_extraLayoutNodes.clear();
   }
-  // Values need to be cleared from the vector before next call to DoLayout.
-  m_extraLayoutNodes.clear();
+
   auto &rootTags = m_host->GetAllRootTags();
   for (int64_t rootTag : rootTags) {
-    UpdateExtraLayout(rootTag);
+    {
+      SystraceSection s("NativeUIManager::DoLayout::UpdateExtraLayout");
+      UpdateExtraLayout(rootTag);
+    }
 
     ShadowNodeBase &rootShadowNode = static_cast<ShadowNodeBase &>(m_host->GetShadowNodeForTag(rootTag));
-    YGNodeRef rootNode = GetYogaNode(rootTag);
-    auto rootElement = rootShadowNode.GetView().as<xaml::FrameworkElement>();
-
-    float actualWidth = static_cast<float>(rootElement.ActualWidth());
-    float actualHeight = static_cast<float>(rootElement.ActualHeight());
-
-    // 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.
-    YGNodeCalculateLayout(rootNode, actualWidth, actualHeight, YGDirectionLTR);
+    if (YGNodeRef rootNode = GetYogaNode(rootTag)) {
+      auto rootElement = rootShadowNode.GetView().as<xaml::FrameworkElement>();
+
+      float actualWidth = static_cast<float>(rootElement.ActualWidth());
+      float actualHeight = static_cast<float>(rootElement.ActualHeight());
+
+      {
+        SystraceSection 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.
+        YGNodeCalculateLayout(rootNode, actualWidth, actualHeight, YGDirectionLTR);
+      }
+    } else {
+      assert(false);
+      return;
+    }
   }
 
-  for (auto &tagToYogaNode : m_tagsToYogaNodes) {
-    int64_t tag = tagToYogaNode.first;
-    YGNodeRef yogaNode = tagToYogaNode.second.get();
-
-    if (!YGNodeGetHasNewLayout(yogaNode))
-      continue;
-    YGNodeSetHasNewLayout(yogaNode, false);
-
-    float left = YGNodeLayoutGetLeft(yogaNode);
-    float top = YGNodeLayoutGetTop(yogaNode);
-    float width = YGNodeLayoutGetWidth(yogaNode);
-    float height = YGNodeLayoutGetHeight(yogaNode);
-
-    ShadowNodeBase &shadowNode = static_cast<ShadowNodeBase &>(m_host->GetShadowNodeForTag(tag));
-    auto view = shadowNode.GetView();
-    auto pViewManager = shadowNode.GetViewManager();
-    pViewManager->SetLayoutProps(shadowNode, view, left, top, width, height);
+  {
+    SystraceSection s("NativeUIManager::DoLayout::SetLayoutProps");
+    for (auto &tagToYogaNode : m_tagsToYogaNodes) {
+      int64_t tag = tagToYogaNode.first;
+      YGNodeRef yogaNode = tagToYogaNode.second.get();
+
+      if (!YGNodeGetHasNewLayout(yogaNode))
+        continue;
+      YGNodeSetHasNewLayout(yogaNode, false);
+
+      float left = YGNodeLayoutGetLeft(yogaNode);
+      float top = YGNodeLayoutGetTop(yogaNode);
+      float width = YGNodeLayoutGetWidth(yogaNode);
+      float height = YGNodeLayoutGetHeight(yogaNode);
+
+      ShadowNodeBase &shadowNode = static_cast<ShadowNodeBase &>(m_host->GetShadowNodeForTag(tag));
+      auto view = shadowNode.GetView();
+      auto pViewManager = shadowNode.GetViewManager();
+      pViewManager->SetLayoutProps(shadowNode, view, left, top, width, height);
+    }
   }
 }
 
@@ -1115,7 +1142,7 @@ void NativeUIManager::findSubviewIn(
 
 void NativeUIManager::focus(int64_t reactTag) {
   if (auto shadowNode = static_cast<ShadowNodeBase *>(m_host->FindShadowNodeForTag(reactTag))) {
-    xaml::Input::FocusManager::TryFocusAsync(shadowNode->GetView(), winrt::FocusState::Keyboard);
+    xaml::Input::FocusManager::TryFocusAsync(shadowNode->GetView(), winrt::FocusState::Programmatic);
   }
 }
 

package/Microsoft.ReactNative/Modules/PaperUIManagerModule.cpp

@@ -6,14 +6,17 @@
 #include <DynamicWriter.h>
 #include <IReactContext.h>
 #include <IReactRootView.h>
+#include <Modules/NativeUIManager.h>
 #include <Modules/PaperUIManagerModule.h>
-#include <Modules\NativeUIManager.h>
 #include <Views/ViewManager.h>
 #include <XamlUtils.h>
+#include <cxxreact/SystraceSection.h>
 #include "ShadowNodeBase.h"
 #include "Unicode.h"
 #include "XamlUIService.h"
 
+using namespace facebook::react;
+
 namespace Microsoft::ReactNative {
 
 struct ViewAtIndex final {
@@ -126,20 +129,24 @@ class UIManagerModule : public std::enable_shared_from_this<UIManagerModule>, pu
 
   void createView(int64_t reactTag, std::string viewName, int64_t rootTag, React::JSValueObject &&props) noexcept {
     m_nativeUIManager->ensureInBatch();
-    auto viewManager = GetViewManager(viewName);
-    auto node = viewManager->createShadow();
-    node->m_className = std::move(viewName);
-    node->m_tag = reactTag;
-    node->m_rootTag = rootTag;
-    node->m_viewManager = viewManager;
+    if (auto viewManager = GetViewManager(viewName)) {
+      auto node = viewManager->createShadow();
+      node->m_className = std::move(viewName);
+      node->m_tag = reactTag;
+      node->m_rootTag = rootTag;
+      node->m_viewManager = viewManager;
 
-    node->createView(props);
+      node->createView(props);
 
-    m_nativeUIManager->CreateView(*node, props);
+      m_nativeUIManager->CreateView(*node, props);
 
-    m_nodeRegistry.addNode(shadow_ptr(node), reactTag);
+      m_nodeRegistry.addNode(shadow_ptr(node), reactTag);
 
-    node->updateProperties(props);
+      node->updateProperties(props);
+    } else {
+      assert(false);
+      return;
+    }
   }
 
   void updateView(int64_t reactTag, std::string viewName, React::JSValueObject &&props) noexcept {
@@ -578,6 +585,7 @@ void UIManager::createView(
                                                          viewName = std::move(viewName),
                                                          rootTag,
                                                          props = std::move(props)]() mutable {
+    SystraceSection s("UIManager::createView");
     if (auto module = m.lock()) {
       module->createView(static_cast<int64_t>(reactTag), viewName, static_cast<int64_t>(rootTag), std::move(props));
     }
@@ -589,6 +597,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");
     if (auto module = m.lock()) {
       module->updateView(static_cast<int64_t>(reactTag), viewName, std::move(props));
     }
@@ -597,6 +606,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");
     if (auto module = m.lock()) {
       module->focus(static_cast<int64_t>(reactTag));
     }
@@ -605,6 +615,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");
     if (auto module = m.lock()) {
       module->blur(static_cast<int64_t>(reactTag));
     }
@@ -620,6 +631,7 @@ void UIManager::findSubviewIn(
                                                          reactTag,
                                                          point = std::move(point),
                                                          callback = std::move(callback)]() mutable {
+    SystraceSection s("UIManager::findSubviewIn");
     if (auto module = m.lock()) {
       module->findSubviewIn(static_cast<int64_t>(reactTag), std::move(point), std::move(callback));
     }
@@ -634,6 +646,7 @@ void UIManager::dispatchViewManagerCommand(
                                                          reactTag,
                                                          commandID = std::move(commandID),
                                                          commandArgs = std::move(commandArgs)]() mutable {
+    SystraceSection s("UIManager::dispatchViewManagerCommand");
     if (auto module = m.lock()) {
       module->dispatchViewManagerCommand(static_cast<int64_t>(reactTag), std::move(commandID), std::move(commandArgs));
     }
@@ -646,6 +659,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");
         if (auto module = m.lock()) {
           module->measure(static_cast<int64_t>(reactTag), std::move(callback));
         }
@@ -657,6 +671,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");
         if (auto module = m.lock()) {
           module->measureInWindow(static_cast<int64_t>(reactTag), std::move(callback));
         }
@@ -671,6 +686,7 @@ void UIManager::viewIsDescendantOf(
                                                          reactTag,
                                                          ancestorReactTag,
                                                          callback = std::move(callback)]() mutable {
+    SystraceSection s("UIManager::viewIsDescendantOf");
     if (auto module = m.lock()) {
       module->viewIsDescendantOf(
           static_cast<int64_t>(reactTag), static_cast<int64_t>(ancestorReactTag), std::move(callback));
@@ -688,6 +704,7 @@ void UIManager::measureLayout(
                                                          ancestorReactTag,
                                                          errorCallback = std::move(errorCallback),
                                                          callback = std::move(callback)]() mutable {
+    SystraceSection s("UIManager::measureLayout");
     if (auto module = m.lock()) {
       module->measureLayout(
           static_cast<int64_t>(reactTag),
@@ -706,6 +723,7 @@ void UIManager::measureLayoutRelativeToParent(
                                                          reactTag,
                                                          errorCallback = std::move(errorCallback),
                                                          callback = std::move(callback)]() mutable {
+    SystraceSection s("UIManager::measureLayoutRelativeToParent");
     if (auto module = m.lock()) {
       module->measureLayoutRelativeToParent(
           static_cast<int64_t>(reactTag), std::move(errorCallback), std::move(callback));
@@ -716,6 +734,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");
         if (auto module = m.lock()) {
           module->setJSResponder(static_cast<int64_t>(reactTag), blockNativeResponder);
         }
@@ -724,6 +743,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");
     if (auto module = m.lock()) {
       module->clearJSResponder();
     }
@@ -738,6 +758,7 @@ void UIManager::configureNextLayoutAnimation(
                                                          config = std::move(config),
                                                          callback = std::move(callback),
                                                          errorCallback = std::move(errorCallback)]() mutable {
+    SystraceSection s("UIManager::configureNextLayoutAnimation");
     if (auto module = m.lock()) {
       module->configureNextLayoutAnimation(std::move(config), std::move(callback), std::move(errorCallback));
     }
@@ -746,6 +767,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");
     if (auto module = m.lock()) {
       module->removeSubviewsFromContainerWithID(static_cast<int64_t>(containerID));
     }
@@ -755,6 +777,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");
         if (auto module = m.lock()) {
           module->replaceExistingNonRootView(static_cast<int64_t>(reactTag), static_cast<int64_t>(newReactTag));
         }
@@ -763,6 +786,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");
     if (auto module = m.lock()) {
       module->removeRootView(static_cast<int64_t>(reactTag));
     }
@@ -772,6 +796,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");
         if (auto module = m.lock()) {
           module->setChildren(static_cast<int64_t>(containerTag), std::move(reactTags));
         }
@@ -792,6 +817,7 @@ void UIManager::manageChildren(
                                                          addChildReactTags = std::move(addChildReactTags),
                                                          addAtIndices = std::move(addAtIndices),
                                                          removeAtIndices = std::move(removeAtIndices)]() mutable {
+    SystraceSection s("UIManager::manageChildren");
     if (auto module = m.lock()) {
       module->manageChildren(
           static_cast<int64_t>(containerTag),
@@ -807,6 +833,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");
         if (auto module = m.lock()) {
           module->setLayoutAnimationEnabledExperimental(enabled);
         }
@@ -816,6 +843,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");
         if (auto module = m.lock()) {
           module->sendAccessibilityEvent(static_cast<int64_t>(reactTag), eventType);
         }
@@ -832,6 +860,7 @@ void UIManager::showPopupMenu(
                                                          items = std::move(items),
                                                          error = std::move(error),
                                                          success = std::move(success)]() mutable {
+    SystraceSection s("UIManager::showPopupMenu");
     if (auto module = m.lock()) {
       module->showPopupMenu(static_cast<int64_t>(reactTag), std::move(items), std::move(error), std::move(success));
     }
@@ -840,6 +869,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");
     if (auto module = m.lock()) {
       module->dismissPopupMenu();
     }

package/Microsoft.ReactNative/Modules/PaperUIManagerModule.h

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "../../codegen/NativeUIManagerSpec.g.h"
+#include "codegen/NativeUIManagerSpec.g.h"
 #include <CxxMessageQueue.h>
 #include <INativeUIManager.h>
 #include <NativeModules.h>