react-native-windows 0.69.6 → 0.70.0

package/Microsoft.ReactNative/CoreApp.cpp

@@ -0,0 +1,303 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#include "pch.h"
+#include "CoreApp.h"
+#include <winrt/Microsoft.ReactNative.h>
+#include <winrt/Microsoft.UI.Xaml.Controls.h>
+#include <winrt/Windows.ApplicationModel.Activation.h>
+#include <winrt/Windows.Data.Json.h>
+#include <winrt/Windows.UI.ViewManagement.h>
+#include <winrt/Windows.UI.Xaml.Interop.h>
+#include <fstream>
+#include <string_view>
+#include "ReactApplication.h"
+#include "UI.Xaml.Controls.h"
+
+namespace react = winrt::Microsoft::ReactNative;
+using namespace winrt::Windows::Data::Json;
+using namespace std::literals;
+
+void RNCoreAppSetDefaults(RNCoreApp *appSettings) {
+  /// Set default values
+  appSettings->jsBundleFile = L"index.windows";
+  appSettings->bundleRootPath = L"ms-appx:///Bundle/";
+  appSettings->componentName = L"";
+  appSettings->useWebDebugger = true;
+  appSettings->useFastRefresh = true;
+  appSettings->useDeveloperSupport = true;
+  appSettings->useDirectDebugger = false;
+  appSettings->enableDefaultCrashHandler = false;
+  appSettings->debuggerPort = 9229;
+  appSettings->sourceBundlePort = 8081;
+  appSettings->sourceBundleHost = L"localhost";
+  appSettings->requestInlineSourceMap = true;
+  appSettings->jsEngine = L"chakra";
+  appSettings->viewName = nullptr;
+
+  appSettings->resourcesAbi = nullptr;
+  appSettings->args = nullptr;
+  appSettings->packageProvidersAbi = nullptr;
+  appSettings->packageProvidersAbiCount = 0;
+  appSettings->propertiesAbi = nullptr;
+}
+
+NORETURN void RNCoreAppStartInternal(RNCoreApp *appSettings, RNCoreAppCallback launched, void *data) {
+  xaml::Application::Start([appSettings, launched, data](auto &&) {
+    winrt::Windows::Foundation::IInspectable outer{nullptr};
+    const auto app = winrt::make<react::implementation::ReactApplication>(outer);
+
+    const auto implApp = winrt::get_self<react::implementation::ReactApplication>(app);
+
+    implApp->LaunchedInternal([appSettings, launched, data](
+                                  react::ReactApplication const &app,
+                                  winrt::Windows::ApplicationModel::Activation::LaunchActivatedEventArgs const &args) {
+      appSettings->args = args.Arguments().c_str();
+      if (launched) {
+        launched(appSettings, data);
+      }
+
+      for (auto i = 0; i < appSettings->packageProvidersAbiCount; i++) {
+        auto provider = winrt::Microsoft::ReactNative::IReactPackageProvider(
+            appSettings->packageProvidersAbi[i], winrt::take_ownership_from_abi);
+        app.PackageProviders().Append(provider);
+      }
+      CoTaskMemFree(appSettings->packageProvidersAbi);
+
+      if (appSettings->viewName) {
+        auto view = winrt::Windows::UI::ViewManagement::ApplicationView::GetForCurrentView();
+        view.Title(appSettings->viewName);
+      }
+
+      app.JavaScriptBundleFile(appSettings->jsBundleFile);
+
+      auto settings = app.InstanceSettings();
+      constexpr std::pair<std::wstring_view, react::JSIEngine> engines[] = {
+          {L"chakra"sv, react::JSIEngine::Chakra},
+          {L"hermes"sv, react::JSIEngine::Hermes},
+          {L"v8"sv, react::JSIEngine::V8}};
+
+      if (auto it = std::find_if(std::begin(engines), std::end(engines), [appSettings](const auto &c) {
+            return c.first == appSettings->jsEngine;
+          })) {
+        settings.JSIEngineOverride(it->second);
+      }
+
+      settings.BundleRootPath(appSettings->bundleRootPath);
+
+      settings.UseWebDebugger(appSettings->useWebDebugger);
+      settings.UseFastRefresh(appSettings->useFastRefresh);
+      settings.UseDeveloperSupport(appSettings->useDeveloperSupport);
+      settings.UseDirectDebugger(appSettings->useDirectDebugger);
+      settings.RequestInlineSourceMap(appSettings->requestInlineSourceMap);
+
+      settings.EnableDefaultCrashHandler(appSettings->enableDefaultCrashHandler);
+      settings.DebuggerPort(appSettings->debuggerPort);
+      settings.SourceBundlePort(appSettings->sourceBundlePort);
+      settings.SourceBundleHost(appSettings->sourceBundleHost);
+
+      if (appSettings->propertiesAbi) {
+        if (auto props = react::IReactPropertyBag(appSettings->propertiesAbi, winrt::take_ownership_from_abi)) {
+          settings.Properties().CopyFrom(props);
+        }
+      }
+
+      if (auto res = xaml::ResourceDictionary(appSettings->resourcesAbi, winrt::take_ownership_from_abi)) {
+        app.Resources(res);
+      } else {
+        try {
+          auto xcr = winrt::Microsoft::UI::Xaml::Controls::XamlControlsResources();
+          app.Resources(xcr);
+        } catch (...) {
+        }
+      }
+    });
+    implApp->ViewCreatedInternal([](react::ReactApplication const &app, winrt::hstring const &args) {
+      auto rootFrame = xaml::Window::Current().Content().as<xaml::Controls::Frame>();
+      rootFrame.Navigate(winrt::xaml_typename<react::CoreAppPage>(), winrt::box_value(args));
+    });
+    implApp->PageNavigatedInternal(
+        [appSettings](react::ReactApplication const & /*appSettings*/, react::ReactRootView const &view) {
+          view.ComponentName(appSettings->componentName);
+        });
+  });
+}
+
+void SetFromJson(JsonObject json, wchar_t const *key, wchar_t const *&appValue) {
+  if (auto v = json.TryLookup(key); v && v.ValueType() == JsonValueType::String) {
+    appValue = _wcsdup(v.GetString().c_str());
+  }
+}
+
+void SetFromJson(JsonObject json, wchar_t const *key, bool &appValue) {
+  if (auto v = json.TryLookup(key); v && v.ValueType() == JsonValueType::Boolean) {
+    appValue = v.GetBoolean();
+  }
+}
+
+template <typename T>
+std::enable_if_t<std::is_arithmetic_v<T>> SetFromJson(JsonObject json, wchar_t const *key, T &appValue) {
+  if (auto v = json.TryLookup(key); v && v.ValueType() == JsonValueType::Number) {
+    appValue = static_cast<T>(v.GetNumber());
+  }
+}
+
+#define SET_FROM_JSON(key) SetFromJson(json, L#key, appSettings->key)
+
+JsonObject LoadJsonFromFile(wchar_t const *jsoncPath) {
+  std::wifstream appConfigJson(jsoncPath);
+  winrt::check_bool(appConfigJson.good());
+  std::wostringstream out;
+  out << appConfigJson.rdbuf();
+  auto input = out.str();
+
+  // strip comments from jsonc since WinRT's JsonObject doesn't support them
+  // see
+  // https://github.com/microsoft/vscode/blob/432349e1eb4a90eccd1039c61f719e6f54c77607/src/vs/base/common/stripComments.js
+  auto comments = std::wregex(
+      LR"(("[^"\\]*(?:\\.[^"\\]*)*")|('[^'\\]*(?:\\.[^'\\]*)*')|(\/\*[^\/\*]*(?:(?:\*|\/)[^\/\*]*)*?\*\/)|(\/{2,}.*?(?:(?:\r?\n)|$)))");
+  std::wstring stripped;
+  std::size_t previous = 0;
+  for (auto it = std::wsregex_iterator(input.begin(), input.end(), comments); it != std::wsregex_iterator(); ++it) {
+    auto match = *it;
+    stripped += input.substr(previous, match.position() - previous);
+    if (match[3].matched) {
+      // do nothing
+    } else if (match[4].matched) {
+      if (*(match[4].second - 1) == L'\n') {
+        stripped += *(match[4].second - 2) == L'\r' ? L"\r\n" : L"\n";
+      }
+    } else {
+      stripped += match.str();
+    }
+
+    previous = match.position() + match.length();
+  }
+
+  stripped += input.substr(previous);
+
+  auto json = JsonObject::Parse(stripped);
+  return json;
+}
+
+static void SetPackageProviders(JsonObject const &json, RNCoreApp *app) {
+  if (auto v = json.TryLookup(L"nativeModules"); v && v.ValueType() == JsonValueType::Array) {
+    auto nativeModules = v.GetArray();
+    decltype(app->packageProvidersAbiCount) countAdded = 0;
+    const auto count = static_cast<decltype(countAdded)>(nativeModules.Size());
+
+    app->packageProvidersAbi = reinterpret_cast<void **>(CoTaskMemAlloc(sizeof(void *) * count));
+    for (std::remove_const_t<decltype(count)> index = 0; index < count; index++) {
+      if (auto nm_value = nativeModules.GetAt(index); nm_value.ValueType() == JsonValueType::Object) {
+        auto nm = nm_value.GetObject();
+
+        wchar_t const *container{nullptr};
+        SetFromJson(nm, L"moduleContainer", container);
+
+        wchar_t const *factoryName{nullptr};
+        SetFromJson(nm, L"factory", factoryName);
+
+        HMODULE mod{};
+        if (container != nullptr) {
+          mod = reinterpret_cast<HMODULE>(WINRT_IMPL_LoadLibraryW(container));
+        } else {
+          mod = GetModuleHandle(nullptr);
+        }
+
+        if (mod) {
+          if (auto factory = reinterpret_cast<void *(__cdecl *)()>(
+                  WINRT_IMPL_GetProcAddress(mod, winrt::to_string(factoryName).c_str()))) {
+            auto packageProviderAbi = factory();
+            app->packageProvidersAbi[countAdded++] = packageProviderAbi;
+          } else {
+            assert(false && "Could not find native module factory function");
+          }
+        } else {
+          assert(false && "Could not find native module library");
+        }
+      }
+    }
+    app->packageProvidersAbiCount = countAdded;
+  }
+}
+
+static void SetProperties(JsonObject const &json, RNCoreApp *app) {
+  react::IReactPropertyBag bag{nullptr};
+  if (auto v = json.TryLookup(L"properties"); v && v.ValueType() == JsonValueType::Object) {
+    auto props = v.GetObject();
+    bag = react::ReactPropertyBagHelper::CreatePropertyBag();
+    for (const auto &prop : props) {
+      auto name = prop.Key();
+      auto lastDot = std::find(name.rbegin(), name.rend(), L'.');
+      std::wstring nsName;
+      std::wstring localName;
+      if (lastDot != name.rend()) {
+        nsName = std::wstring{name.begin(), static_cast<uint64_t>(name.rend() - lastDot - 1)};
+        localName = std::wstring{lastDot.base()};
+      } else {
+        localName = name;
+      }
+      winrt::hstring nsNameH(nsName);
+      winrt::hstring localNameH(localName);
+      auto propName = react::ReactPropertyName{nsNameH, localNameH};
+      auto value = prop.Value();
+      switch (value.ValueType()) {
+        case JsonValueType::String:
+          bag.Set(propName.Handle(), winrt::box_value(value.GetString()));
+          break;
+        case JsonValueType::Boolean:
+          bag.Set(propName.Handle(), winrt::box_value(value.GetBoolean()));
+          break;
+        case JsonValueType::Number:
+          bag.Set(propName.Handle(), winrt::box_value(value.GetNumber()));
+          break;
+        case JsonValueType::Null:
+          bag.Set(propName.Handle(), nullptr);
+          break;
+        default:
+          assert(false && "not yet implemented");
+          break;
+      }
+    }
+  }
+
+  if (bag) {
+    winrt::copy_to_abi(bag, app->propertiesAbi);
+  }
+}
+
+extern "C" NORETURN void __cdecl RNCoreAppStartFromConfigJson(
+    wchar_t const *configJson,
+    RNCoreAppCallback launched,
+    void *data) {
+  auto appSettings = std::make_shared<RNCoreApp>();
+  RNCoreAppSetDefaults(appSettings.get());
+
+  auto json = LoadJsonFromFile(configJson);
+  SET_FROM_JSON(jsBundleFile);
+  SET_FROM_JSON(bundleRootPath);
+  SET_FROM_JSON(componentName);
+  SET_FROM_JSON(useWebDebugger);
+  SET_FROM_JSON(useFastRefresh);
+  SET_FROM_JSON(useDeveloperSupport);
+  SET_FROM_JSON(useDirectDebugger);
+  SET_FROM_JSON(requestInlineSourceMap);
+
+  SET_FROM_JSON(enableDefaultCrashHandler);
+  SET_FROM_JSON(debuggerPort);
+  SET_FROM_JSON(sourceBundlePort);
+  SET_FROM_JSON(sourceBundleHost);
+  SET_FROM_JSON(jsEngine);
+
+  SET_FROM_JSON(viewName);
+
+  SetPackageProviders(json, appSettings.get());
+  SetProperties(json, appSettings.get());
+  RNCoreAppStartInternal(appSettings.get(), launched, data);
+}
+
+extern "C" NORETURN void __cdecl RNCoreAppStart(RNCoreAppCallback launched, void *data) {
+  auto appSettings = std::make_shared<RNCoreApp>();
+
+  RNCoreAppSetDefaults(appSettings.get());
+  RNCoreAppStartInternal(appSettings.get(), launched, data);
+}

package/Microsoft.ReactNative/CoreAppPage.cpp

@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#include "pch.h"
+#include "CoreAppPage.h"
+#include "ReactApplication.h"
+
+#if __has_include("CoreAppPage.g.cpp")
+#include "CoreAppPage.g.cpp"
+#endif
+
+namespace winrt::Microsoft::ReactNative::implementation {
+CoreAppPage::CoreAppPage() {
+  InitializeComponent();
+  auto app = xaml::Application::Current().as<winrt::Microsoft::ReactNative::ReactApplication>();
+  auto implApp = winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactApplication>(app);
+  auto pageNavigated = implApp->PageNavigatedInternal();
+  pageNavigated(app, ReactRootView());
+  ReactRootView().ReactNativeHost(app.Host());
+}
+
+} // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/CoreAppPage.h

@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#pragma once
+#include "CoreAppPage.g.h"
+#include <UI.Xaml.Markup.h>
+
+namespace winrt::Microsoft::ReactNative::implementation {
+struct CoreAppPage : CoreAppPageT<CoreAppPage> {
+  CoreAppPage();
+};
+} // namespace winrt::Microsoft::ReactNative::implementation
+
+namespace winrt::Microsoft::ReactNative::factory_implementation {
+struct CoreAppPage : CoreAppPageT<CoreAppPage, implementation::CoreAppPage> {};
+} // namespace winrt::Microsoft::ReactNative::factory_implementation

package/Microsoft.ReactNative/CoreAppPage.idl

@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#include "NamespaceRedirect.h"
+
+namespace Microsoft.ReactNative
+{
+    [default_interface]
+    runtimeclass CoreAppPage : XAML_NAMESPACE.Controls.Page
+    {
+        CoreAppPage();
+    }
+}

package/Microsoft.ReactNative/CoreAppPage.xaml

@@ -0,0 +1,14 @@
+<Page
+    x:Class="Microsoft.ReactNative.CoreAppPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:react="using:Microsoft.ReactNative"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+  <react:ReactRootView 
+        x:Name="ReactRootView"
+        Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+        MinHeight="400"/>
+</Page>

package/Microsoft.ReactNative/Fabric/ActivityIndicatorComponentView.cpp

@@ -1,4 +1,3 @@
-
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
@@ -70,7 +69,7 @@ void ActivityIndicatorComponentView::updateLayoutMetrics(
 }
 void ActivityIndicatorComponentView::finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept {}
 void ActivityIndicatorComponentView::prepareForRecycle() noexcept {}
-facebook::react::SharedProps ActivityIndicatorComponentView::props() noexcept {
+facebook::react::Props::Shared ActivityIndicatorComponentView::props() noexcept {
   assert(false);
   return {};
 }

package/Microsoft.ReactNative/Fabric/ActivityIndicatorComponentView.h

@@ -33,7 +33,7 @@ struct ActivityIndicatorComponentView : BaseComponentView {
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
   void finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept override;
   void prepareForRecycle() noexcept override;
-  facebook::react::SharedProps props() noexcept override;
+  facebook::react::Props::Shared props() noexcept override;
 
   const xaml::FrameworkElement Element() const noexcept override;
 

package/Microsoft.ReactNative/Fabric/ComponentView.h

@@ -38,7 +38,7 @@ struct IComponentView {
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept = 0;
   virtual void finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept = 0;
   virtual void prepareForRecycle() noexcept = 0;
-  virtual facebook::react::SharedProps props() noexcept = 0;
+  virtual facebook::react::Props::Shared props() noexcept = 0;
   virtual void handleCommand(std::string const &commandName, folly::dynamic const &arg) noexcept = 0;
 };
 

package/Microsoft.ReactNative/Fabric/ImageComponentView.cpp

@@ -126,7 +126,7 @@ void ImageComponentView::finalizeUpdates(RNComponentViewUpdateMask updateMask) n
 }
 
 void ImageComponentView::prepareForRecycle() noexcept {}
-facebook::react::SharedProps ImageComponentView::props() noexcept {
+facebook::react::Props::Shared ImageComponentView::props() noexcept {
   assert(false);
   return {};
 }

package/Microsoft.ReactNative/Fabric/ImageComponentView.h

@@ -33,7 +33,7 @@ struct ImageComponentView : BaseComponentView {
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
   void finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept override;
   void prepareForRecycle() noexcept override;
-  facebook::react::SharedProps props() noexcept override;
+  facebook::react::Props::Shared props() noexcept override;
 
   const xaml::FrameworkElement Element() const noexcept override;
 

package/Microsoft.ReactNative/Fabric/ParagraphComponentView.cpp

@@ -148,7 +148,7 @@ void ParagraphComponentView::updateLayoutMetrics(
 }
 void ParagraphComponentView::finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept {}
 void ParagraphComponentView::prepareForRecycle() noexcept {}
-facebook::react::SharedProps ParagraphComponentView::props() noexcept {
+facebook::react::Props::Shared ParagraphComponentView::props() noexcept {
   assert(false);
   return {};
 }

package/Microsoft.ReactNative/Fabric/ParagraphComponentView.h

@@ -27,7 +27,7 @@ struct ParagraphComponentView : BaseComponentView {
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
   void finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept override;
   void prepareForRecycle() noexcept override;
-  facebook::react::SharedProps props() noexcept override;
+  facebook::react::Props::Shared props() noexcept override;
 
   const xaml::FrameworkElement Element() const noexcept override;
 

package/Microsoft.ReactNative/Fabric/ScrollViewComponentView.cpp

@@ -188,7 +188,7 @@ void ScrollViewComponentView::finalizeUpdates(RNComponentViewUpdateMask updateMa
   // m_element.FinalizeProperties();
 }
 void ScrollViewComponentView::prepareForRecycle() noexcept {}
-facebook::react::SharedProps ScrollViewComponentView::props() noexcept {
+facebook::react::Props::Shared ScrollViewComponentView::props() noexcept {
   assert(false);
   return {};
 }

package/Microsoft.ReactNative/Fabric/ScrollViewComponentView.h

@@ -32,7 +32,7 @@ struct ScrollViewComponentView : BaseComponentView {
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
   void finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept override;
   void prepareForRecycle() noexcept override;
-  facebook::react::SharedProps props() noexcept override;
+  facebook::react::Props::Shared props() noexcept override;
 
   const xaml::FrameworkElement Element() const noexcept override;
 

package/Microsoft.ReactNative/Fabric/SliderComponentView.cpp

@@ -95,7 +95,7 @@ void SliderComponentView::updateLayoutMetrics(
 void SliderComponentView::finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept {}
 
 void SliderComponentView::prepareForRecycle() noexcept {}
-facebook::react::SharedProps SliderComponentView::props() noexcept {
+facebook::react::Props::Shared SliderComponentView::props() noexcept {
   assert(false);
   return {};
 }

package/Microsoft.ReactNative/Fabric/SliderComponentView.h

@@ -35,7 +35,7 @@ struct SliderComponentView : BaseComponentView {
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
   void finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept override;
   void prepareForRecycle() noexcept override;
-  facebook::react::SharedProps props() noexcept override;
+  facebook::react::Props::Shared props() noexcept override;
 
   const xaml::FrameworkElement Element() const noexcept override;
 

package/Microsoft.ReactNative/Fabric/SwitchComponentView.cpp

@@ -97,7 +97,7 @@ void SwitchComponentView::updateLayoutMetrics(
 void SwitchComponentView::finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept {}
 
 void SwitchComponentView::prepareForRecycle() noexcept {}
-facebook::react::SharedProps SwitchComponentView::props() noexcept {
+facebook::react::Props::Shared SwitchComponentView::props() noexcept {
   assert(false);
   return {};
 }

package/Microsoft.ReactNative/Fabric/SwitchComponentView.h

@@ -35,7 +35,7 @@ struct SwitchComponentView : BaseComponentView {
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
   void finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept override;
   void prepareForRecycle() noexcept override;
-  facebook::react::SharedProps props() noexcept override;
+  facebook::react::Props::Shared props() noexcept override;
   void handleCommand(std::string const &commandName, folly::dynamic const &arg) noexcept override;
 
   const xaml::FrameworkElement Element() const noexcept override;

package/Microsoft.ReactNative/Fabric/TextComponentView.cpp

@@ -86,7 +86,7 @@ void TextComponentView::finalizeUpdates(RNComponentViewUpdateMask updateMask) no
   // m_element.FinalizeProperties();
 }
 void TextComponentView::prepareForRecycle() noexcept {}
-facebook::react::SharedProps TextComponentView::props() noexcept {
+facebook::react::Props::Shared TextComponentView::props() noexcept {
   assert(false);
   return {};
 }

package/Microsoft.ReactNative/Fabric/TextComponentView.h

@@ -27,7 +27,7 @@ struct TextComponentView : BaseComponentView {
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
   void finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept override;
   void prepareForRecycle() noexcept override;
-  facebook::react::SharedProps props() noexcept override;
+  facebook::react::Props::Shared props() noexcept override;
 
   virtual const xaml::FrameworkElement Element() const noexcept override;
 

package/Microsoft.ReactNative/Fabric/TextInput/WindowsTextInputComponentView.cpp

@@ -296,7 +296,7 @@ void WindowsTextInputComponentView::finalizeUpdates(RNComponentViewUpdateMask up
   // m_element.FinalizeProperties();
 }
 void WindowsTextInputComponentView::prepareForRecycle() noexcept {}
-facebook::react::SharedProps WindowsTextInputComponentView::props() noexcept {
+facebook::react::Props::Shared WindowsTextInputComponentView::props() noexcept {
   assert(false);
   return {};
 }

package/Microsoft.ReactNative/Fabric/TextInput/WindowsTextInputComponentView.h

@@ -28,7 +28,7 @@ struct WindowsTextInputComponentView : BaseComponentView {
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
   void finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept override;
   void prepareForRecycle() noexcept override;
-  facebook::react::SharedProps props() noexcept override;
+  facebook::react::Props::Shared props() noexcept override;
   void handleCommand(std::string const &commandName, folly::dynamic const &arg) noexcept override;
 
   virtual const xaml::FrameworkElement Element() const noexcept override;

package/Microsoft.ReactNative/Fabric/ViewComponentView.cpp

@@ -209,7 +209,7 @@ void ViewComponentView::finalizeUpdates(RNComponentViewUpdateMask updateMask) no
 }
 
 void ViewComponentView::prepareForRecycle() noexcept {}
-facebook::react::SharedProps ViewComponentView::props() noexcept {
+facebook::react::Props::Shared ViewComponentView::props() noexcept {
   assert(false);
   return {};
 }

package/Microsoft.ReactNative/Fabric/ViewComponentView.h

@@ -36,7 +36,7 @@ struct ViewComponentView : BaseComponentView {
       facebook::react::LayoutMetrics const &oldLayoutMetrics) noexcept override;
   void finalizeUpdates(RNComponentViewUpdateMask updateMask) noexcept override;
   void prepareForRecycle() noexcept override;
-  facebook::react::SharedProps props() noexcept override;
+  facebook::react::Props::Shared props() noexcept override;
 
   virtual const xaml::FrameworkElement Element() const noexcept;
 

package/Microsoft.ReactNative/GlyphViewManager.cpp

@@ -8,6 +8,7 @@
 #include "GlyphViewManager.h"
 
 #include <UI.Xaml.Documents.h>
+#include <UI.Xaml.Media.h>
 #include <Utils/ValueUtils.h>
 #include <Views/ShadowNodeBase.h>
 

package/Microsoft.ReactNative/IReactDispatcher.cpp

@@ -124,4 +124,22 @@ void ReactDispatcher::InvokeElsePost(Mso::DispatchTask &&task) const noexcept {
   return jsThreadDispatcherProperty;
 }
 
+/*static*/ IReactPropertyName ReactDispatcher::JSDispatcherTaskStartingEventName() noexcept {
+  static IReactPropertyName jsThreadDispatcherProperty{ReactPropertyBagHelper::GetName(
+      ReactPropertyBagHelper::GetNamespace(L"ReactNative.Dispatcher"), L"JSDispatcherTaskStartingEventName")};
+  return jsThreadDispatcherProperty;
+}
+
+/*static*/ IReactPropertyName ReactDispatcher::JSDispatcherIdleWaitStartingEventName() noexcept {
+  static IReactPropertyName jsThreadDispatcherProperty{ReactPropertyBagHelper::GetName(
+      ReactPropertyBagHelper::GetNamespace(L"ReactNative.Dispatcher"), L"JSDispatcherIdleWaitStartingEventName")};
+  return jsThreadDispatcherProperty;
+}
+
+/*static*/ IReactPropertyName ReactDispatcher::JSDispatcherIdleWaitCompletedEventName() noexcept {
+  static IReactPropertyName jsThreadDispatcherProperty{ReactPropertyBagHelper::GetName(
+      ReactPropertyBagHelper::GetNamespace(L"ReactNative.Dispatcher"), L"JSDispatcherIdleWaitCompletedEventName")};
+  return jsThreadDispatcherProperty;
+}
+
 } // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/IReactDispatcher.h

@@ -31,16 +31,19 @@ struct ReactDispatcher : implements<ReactDispatcher, IReactDispatcher, Mso::Reac
 
   static IReactDispatcher CreateSerialDispatcher() noexcept;
 
-  static Mso::CntPtr<IDispatchQueue2> GetUIDispatchQueue2(IReactPropertyBag const &properties) noexcept;
+  static Mso::CntPtr<Mso::React::IDispatchQueue2> GetUIDispatchQueue2(IReactPropertyBag const &properties) noexcept;
   static IReactDispatcher UIThreadDispatcher() noexcept;
   static IReactPropertyName UIDispatcherProperty() noexcept;
   static IReactDispatcher GetUIDispatcher(IReactPropertyBag const &properties) noexcept;
   static void SetUIThreadDispatcher(IReactPropertyBag const &properties) noexcept;
 
   static IReactPropertyName JSDispatcherProperty() noexcept;
+  static IReactPropertyName JSDispatcherTaskStartingEventName() noexcept;
+  static IReactPropertyName JSDispatcherIdleWaitStartingEventName() noexcept;
+  static IReactPropertyName JSDispatcherIdleWaitCompletedEventName() noexcept;
 
-  void Post(Mso::DispatchTask &&task) const noexcept override;
-  void InvokeElsePost(Mso::DispatchTask &&task) const noexcept override;
+  void Post(Mso::DispatchTask &&task) const noexcept;
+  void InvokeElsePost(Mso::DispatchTask &&task) const noexcept;
 
  private:
   Mso::DispatchQueue m_queue;
@@ -64,6 +67,18 @@ struct ReactDispatcherHelper {
   static IReactPropertyName JSDispatcherProperty() noexcept {
     return ReactDispatcher::JSDispatcherProperty();
   }
+
+  static IReactPropertyName JSDispatcherTaskStartingEventName() noexcept {
+    return ReactDispatcher::JSDispatcherTaskStartingEventName();
+  }
+
+  static IReactPropertyName JSDispatcherIdleWaitStartingEventName() noexcept {
+    return ReactDispatcher::JSDispatcherIdleWaitStartingEventName();
+  }
+
+  static IReactPropertyName JSDispatcherIdleWaitCompletedEventName() noexcept {
+    return ReactDispatcher::JSDispatcherIdleWaitCompletedEventName();
+  }
 };
 
 } // namespace winrt::Microsoft::ReactNative::implementation