react-native-windows 0.76.8 → 0.76.9

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/ClipboardModule.cpp

@@ -48,7 +48,7 @@ void Clipboard::getString(React::ReactPromise<std::string> result) noexcept {
   );
 }
 
-void Clipboard::setString(std::wstring content) noexcept {
+void Clipboard::setString(winrt::hstring content) noexcept {
   m_reactContext.UIDispatcher().Post([=] {
     DataTransfer::DataPackage data;
     data.SetText(content);

package/Microsoft.ReactNative/Modules/ClipboardModule.h

@@ -18,7 +18,7 @@ struct Clipboard {
   void getString(winrt::Microsoft::ReactNative::ReactPromise<std::string> result) noexcept;
 
   REACT_METHOD(setString)
-  void setString(std::wstring content) noexcept;
+  void setString(winrt::hstring content) noexcept;
 
   winrt::Microsoft::ReactNative::ReactContext m_reactContext;
 };

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/Timing.cpp

@@ -124,7 +124,7 @@ void TimerRegistry::setTimerManager(std::weak_ptr<facebook::react::TimerManager>
 void Timing::Initialize(winrt::Microsoft::ReactNative::ReactContext const &reactContext) noexcept {
   m_context = reactContext;
   m_properties = reactContext.Properties().Handle();
-  m_usePostForRendering = !xaml::TryGetCurrentApplication();
+  m_usePostForRendering = !xaml::TryGetCurrentUwpXamlApplication();
   m_uiDispatcher = m_context.UIDispatcher().Handle();
 }
 
@@ -133,7 +133,7 @@ void Timing::InitializeBridgeless(
     const winrt::Microsoft::ReactNative::IReactPropertyBag &properties) noexcept {
   m_timerRegistry = timerRegistry;
   m_properties = properties;
-  m_usePostForRendering = !xaml::TryGetCurrentApplication();
+  m_usePostForRendering = !xaml::TryGetCurrentUwpXamlApplication();
   m_uiDispatcher = {properties.Get(winrt::Microsoft::ReactNative::ReactDispatcherHelper::UIDispatcherProperty())
                         .try_as<winrt::Microsoft::ReactNative::IReactDispatcher>()};
 }

package/Microsoft.ReactNative/ReactHost/IReactInstance.h

@@ -6,7 +6,10 @@
 
 #include <DevSettings.h>
 #include <folly/dynamic.h>
+
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
 #include "XamlView.h"
+#endif
 
 #include <functional>
 #include <string>
@@ -15,7 +18,9 @@ namespace Microsoft::ReactNative {
 
 struct INativeUIManager;
 class ExpressionAnimationStore;
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
 struct IXamlRootView;
+#endif
 
 typedef unsigned int LiveReloadCallbackCookie;
 typedef unsigned int ErrorCallbackCookie;

package/Microsoft.ReactNative/ReactHost/React.h

@@ -22,10 +22,7 @@
 #undef GetCurrentTime
 #endif
 
-#ifndef CORE_ABI
-// The IReactInstance.h brings dependency on XAML. Exclude it for the UI technology independent code.
 #include <IReactInstance.h>
-#endif
 
 #include <Shared/IReactRootView.h>
 

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -67,11 +67,16 @@
 #include <react/runtime/TimerManager.h>
 #endif
 
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
 #include <LayoutService.h>
+#include <XamlUIService.h>
+#include "Modules/NativeUIManager.h"
+#include "Modules/PaperUIManagerModule.h"
+#endif
+
+#ifndef CORE_ABI
 #include <Utils/UwpPreparedScriptStore.h>
 #include <Utils/UwpScriptStore.h>
-#include <XamlUIService.h>
 #include "ConfigureBundlerDlg.h"
 #include "Modules/AccessibilityInfoModule.h"
 #include "Modules/AlertModule.h"
@@ -82,8 +87,6 @@
 #include "Modules/I18nManagerModule.h"
 #include "Modules/LinkingManagerModule.h"
 #include "Modules/LogBoxModule.h"
-#include "Modules/NativeUIManager.h"
-#include "Modules/PaperUIManagerModule.h"
 #else
 #include "Modules/DesktopTimingModule.h"
 #endif
@@ -164,7 +167,7 @@ struct BridgeUIBatchInstanceCallback final : public facebook::react::InstanceCal
                                                       UIBatchCompleteCallbackProperty())) {
                     (*callback)(instance->m_reactContext->Properties());
                   }
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
                   if (auto uiManager = Microsoft::ReactNative::GetNativeUIManager(*instance->m_reactContext).lock()) {
                     uiManager->onBatchComplete();
                   }
@@ -189,7 +192,7 @@ struct BridgeUIBatchInstanceCallback final : public facebook::react::InstanceCal
                                                   UIBatchCompleteCallbackProperty())) {
                 (*callback)(instance->m_reactContext->Properties());
               }
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
               if (auto uiManager = Microsoft::ReactNative::GetNativeUIManager(*instance->m_reactContext).lock()) {
                 uiManager->onBatchComplete();
               }
@@ -347,15 +350,16 @@ void ReactInstanceWin::LoadModules(
   }
 #endif
 
-#ifndef CORE_ABI
-
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
   if (!IsBridgeless()) {
     registerTurboModule(
         L"UIManager",
         // TODO: Use MakeTurboModuleProvider after it satisfies ReactNativeSpecs::UIManagerSpec
         winrt::Microsoft::ReactNative::MakeModuleProvider<::Microsoft::ReactNative::UIManager>());
   }
+#endif
 
+#ifndef CORE_ABI
   registerTurboModule(
       L"AccessibilityInfo",
       winrt::Microsoft::ReactNative::MakeTurboModuleProvider<::Microsoft::ReactNative::AccessibilityInfo>());
@@ -497,7 +501,7 @@ void ReactInstanceWin::Initialize() noexcept {
 
 void ReactInstanceWin::InitDevMenu() noexcept {
   Microsoft::ReactNative::DevMenuManager::InitDevMenu(m_reactContext, [weakReactHost = m_weakReactHost]() noexcept {
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
     Microsoft::ReactNative::ShowConfigureBundlerDialog(weakReactHost);
 #endif // CORE_ABI
   });
@@ -585,6 +589,24 @@ std::unique_ptr<facebook::jsi::PreparedScriptStore> CreatePreparedScriptStore()
 }
 
 #ifdef USE_FABRIC
+
+typedef HRESULT(__stdcall *SetThreadDescriptionFn)(HANDLE, PCWSTR);
+void SetJSThreadDescription() noexcept {
+  // Office still supports Server 2016 so we need to use Run Time Dynamic Linking and cannot just use:
+  // ::SetThreadDescription(GetCurrentThread(), L"React-Native JavaScript Thread");
+
+  auto moduleHandle = GetModuleHandleW(L"kernelbase.dll");
+  // The description is just for developer experience, so we can skip it if kernelbase isn't already loaded
+  if (!moduleHandle)
+    return;
+
+  auto proc = GetProcAddress(moduleHandle, "SetThreadDescription");
+  if (!proc)
+    return;
+
+  reinterpret_cast<SetThreadDescriptionFn>(proc)(GetCurrentThread(), L"React-Native JavaScript Thread");
+}
+
 void ReactInstanceWin::InitializeBridgeless() noexcept {
   InitUIQueue();
 
@@ -633,7 +655,7 @@ void ReactInstanceWin::InitializeBridgeless() noexcept {
                 Mso::Copy(m_whenDestroyed)));
 
             m_jsMessageThread.Load()->runOnQueueSync([&]() {
-              ::SetThreadDescription(GetCurrentThread(), L"React-Native JavaScript Thread");
+              SetJSThreadDescription();
               auto timerRegistry =
                   ::Microsoft::ReactNative::TimerRegistry::CreateTimerRegistry(m_reactContext->Properties());
               auto timerRegistryRaw = timerRegistry.get();
@@ -752,7 +774,7 @@ void ReactInstanceWin::InitializeWithBridge() noexcept {
   InitUIQueue();
   InitUIMessageThread();
 
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
   // InitUIManager uses m_legacyReactInstance
   InitUIManager();
 #endif
@@ -1143,7 +1165,7 @@ bool ReactInstanceWin::IsBridgeless() noexcept {
       winrt::Microsoft::ReactNative::ReactPropertyBag(m_reactContext->Properties()));
 }
 
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
 void ReactInstanceWin::InitUIManager() noexcept {
   std::vector<std::unique_ptr<Microsoft::ReactNative::IViewManager>> viewManagers;
 
@@ -1441,12 +1463,14 @@ void ReactInstanceWin::AttachMeasuredRootView(
   if (!useFabric || m_useWebDebugger) {
     int64_t rootTag = -1;
 
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
     if (auto uiManager = Microsoft::ReactNative::GetNativeUIManager(*m_reactContext).lock()) {
       rootTag = uiManager->AddMeasuredRootView(rootView);
       rootView->SetTag(rootTag);
     } else {
       assert(false);
     }
+#endif
 
     std::string jsMainModuleName = rootView->JSComponentName();
     folly::dynamic params = folly::dynamic::array(

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.h

@@ -111,7 +111,7 @@ class ReactInstanceWin final : public Mso::ActiveObject<IReactInstanceInternal>
   void InitNativeMessageThread() noexcept;
   void InitUIMessageThread() noexcept;
   void SetupHMRClient() noexcept;
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
   void InitUIManager() noexcept;
 #endif
 

package/Microsoft.ReactNative/ReactNativeHost.cpp

@@ -15,6 +15,7 @@
 #include "ReactInstanceSettings.h"
 
 #ifdef USE_FABRIC
+#include <Fabric/Composition/Modal/WindowsModalHostViewComponentView.h>
 #include <Fabric/WindowsComponentDescriptorRegistry.h>
 #include <ReactPackageBuilder.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
@@ -24,7 +25,7 @@ using namespace winrt;
 using namespace Windows::Foundation;
 using namespace Windows::Foundation::Collections;
 
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
 using namespace xaml;
 using namespace xaml::Controls;
 #endif
@@ -87,7 +88,7 @@ ReactNativeHostProperty() noexcept {
 IAsyncAction ReactNativeHost::ReloadInstance() noexcept {
   auto modulesProvider = std::make_shared<NativeModulesProvider>();
 
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
   auto viewManagersProvider = std::make_shared<ViewManagersProvider>();
 #endif
 
@@ -105,7 +106,7 @@ IAsyncAction ReactNativeHost::ReloadInstance() noexcept {
 
   m_packageBuilder = make<ReactPackageBuilder>(
       modulesProvider,
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
       viewManagersProvider,
 #endif
       turboModulesProvider,
@@ -115,6 +116,10 @@ IAsyncAction ReactNativeHost::ReloadInstance() noexcept {
 #endif
       m_instanceSettings.UseWebDebugger());
 
+#ifdef USE_FABRIC
+  winrt::Microsoft::ReactNative::Composition::implementation::RegisterWindowsModalHostNativeComponent(m_packageBuilder);
+#endif
+
   if (auto packageProviders = InstanceSettings().PackageProviders()) {
     for (auto const &packageProvider : packageProviders) {
       packageProvider.CreatePackage(m_packageBuilder);
@@ -163,7 +168,7 @@ IAsyncAction ReactNativeHost::ReloadInstance() noexcept {
   reactOptions.SetJsiEngine(static_cast<Mso::React::JSIEngine>(m_instanceSettings.JSIEngineOverride()));
 
   reactOptions.ModuleProvider = modulesProvider;
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
   reactOptions.ViewManagerProvider = viewManagersProvider;
 #endif
   reactOptions.TurboModuleProvider = turboModulesProvider;

package/Microsoft.ReactNative/ReactNativeIsland.idl

@@ -6,6 +6,8 @@ import "ReactCoreInjection.idl";
 import "ReactNativeHost.idl";
 import "Theme.idl";
 import "IReactViewComponentBuilder.idl";
+import "CompositionComponentView.idl";
+
 #include "NamespaceRedirect.h"
 #include "DocString.h"
 
@@ -83,7 +85,9 @@ namespace Microsoft.ReactNative
 
 #ifdef USE_WINUI3
     ReactNativeIsland(Microsoft.UI.Composition.Compositor compositor);
-    ReactNativeIsland(Microsoft.UI.Composition.Compositor compositor, Microsoft.ReactNative.IReactContext context, Microsoft.ReactNative.ComponentView componentView);
+
+    DOC_STRING("Used to create react portals, such as a native modal component.")
+    static ReactNativeIsland CreatePortal(Microsoft.ReactNative.Composition.PortalComponentView portal);
 #endif
 
     DOC_STRING(