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

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

@@ -55,7 +55,6 @@
 #ifdef USE_FABRIC
 #include <Fabric/Composition/UriImageManager.h>
 #include <Fabric/FabricUIManagerModule.h>
-#include <Fabric/ReactNativeConfigProperties.h>
 #include <Fabric/WindowsComponentDescriptorRegistry.h>
 #include <SchedulerSettings.h>
 #include <jserrorhandler/JsErrorHandler.h>
@@ -67,11 +66,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 +86,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 +166,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 +191,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 +349,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 +500,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 +588,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 +654,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();
@@ -643,7 +664,7 @@ void ReactInstanceWin::InitializeBridgeless() noexcept {
 
               auto jsErrorHandlingFunc = [this](
                                              facebook::jsi::Runtime &runtime,
-                                             const facebook::react::JsErrorHandler::ParsedError &error) noexcept {
+                                             const facebook::react::JsErrorHandler::ProcessedError &error) noexcept {
                 OnJSError(runtime, std::move(error));
               };
 
@@ -754,7 +775,7 @@ void ReactInstanceWin::InitializeWithBridge() noexcept {
   InitUIQueue();
   InitUIMessageThread();
 
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
   // InitUIManager uses m_legacyReactInstance
   InitUIManager();
 #endif
@@ -1145,7 +1166,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;
 
@@ -1267,12 +1288,12 @@ void ReactInstanceWin::OnError(const Mso::ErrorCode &errorCode) noexcept {
 #ifdef USE_FABRIC
 void ReactInstanceWin::OnJSError(
     facebook::jsi::Runtime &runtime,
-    const facebook::react::JsErrorHandler::ParsedError &error) noexcept {
+    const facebook::react::JsErrorHandler::ProcessedError &error) noexcept {
   ErrorInfo errorInfo;
   errorInfo.Message = error.message;
   auto errorCode = Mso::React::ReactErrorProvider().MakeErrorCode(Mso::React::ReactError{errorInfo.Message.c_str()});
 
-  for (const facebook::react::JsErrorHandler::ParsedError::StackFrame &frame : error.stack) {
+  for (const facebook::react::JsErrorHandler::ProcessedError::StackFrame &frame : error.stack) {
     errorInfo.Callstack.push_back(
         {frame.file.value(), frame.methodName, frame.lineNumber.value(), frame.column.value()});
   }
@@ -1446,12 +1467,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
 
@@ -141,7 +141,9 @@ class ReactInstanceWin final : public Mso::ActiveObject<IReactInstanceInternal>
   void OnError(const Mso::ErrorCode &errorcode) noexcept;
   void OnErrorWithMessage(const std::string &errorMessage) noexcept;
 #ifdef USE_FABRIC
-  void OnJSError(facebook::jsi::Runtime &runtime, const facebook::react::JsErrorHandler::ParsedError &error) noexcept;
+  void OnJSError(
+      facebook::jsi::Runtime &runtime,
+      const facebook::react::JsErrorHandler::ProcessedError &error) noexcept;
 #endif
   void OnLiveReload() noexcept;
   void OnWaitingForDebugger() noexcept;

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(

package/Microsoft.ReactNative/ReactPackageBuilder.cpp

@@ -16,7 +16,7 @@ namespace winrt::Microsoft::ReactNative {
 
 ReactPackageBuilder::ReactPackageBuilder(
     std::shared_ptr<NativeModulesProvider> const &modulesProvider,
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
     std::shared_ptr<ViewManagersProvider> const &viewManagersProvider,
 #endif
     std::shared_ptr<TurboModulesProvider> const &turboModulesProvider,
@@ -26,7 +26,7 @@ ReactPackageBuilder::ReactPackageBuilder(
 #endif
     bool isWebDebugging) noexcept
     : m_modulesProvider{modulesProvider},
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
       m_viewManagersProvider{viewManagersProvider},
 #endif
       m_turboModulesProvider{turboModulesProvider},
@@ -42,7 +42,7 @@ void ReactPackageBuilder::AddModule(hstring const &moduleName, ReactModuleProvid
   m_modulesProvider->AddModuleProvider(moduleName, moduleProvider);
 }
 
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
 void ReactPackageBuilder::AddViewManager(
     hstring const &viewManagerName,
     ReactViewManagerProvider const &viewManagerProvider) noexcept {

package/Microsoft.ReactNative/ReactPackageBuilder.h

@@ -4,7 +4,7 @@
 
 #include "NativeModulesProvider.h"
 #include "TurboModulesProvider.h"
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
 #include "ViewManagersProvider.h"
 #endif
 #include "winrt/Microsoft.ReactNative.h"
@@ -26,7 +26,7 @@ struct ReactPackageBuilder : winrt::implements<
                                  > {
   ReactPackageBuilder(
       std::shared_ptr<NativeModulesProvider> const &modulesProvider,
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
       std::shared_ptr<ViewManagersProvider> const &viewManagersProvider,
 #endif
       std::shared_ptr<TurboModulesProvider> const &turboModulesProvider,
@@ -39,7 +39,7 @@ struct ReactPackageBuilder : winrt::implements<
 
  public: // IReactPackageBuilder
   void AddModule(hstring const &moduleName, ReactModuleProvider const &moduleProvider) noexcept;
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
   void AddViewManager(hstring const &viewManagerName, ReactViewManagerProvider const &viewManagerProvider) noexcept;
 #endif
   void AddTurboModule(hstring const &moduleName, ReactModuleProvider const &moduleProvider) noexcept;
@@ -52,7 +52,7 @@ struct ReactPackageBuilder : winrt::implements<
 
  private:
   std::shared_ptr<NativeModulesProvider> m_modulesProvider;
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
   std::shared_ptr<ViewManagersProvider> m_viewManagersProvider;
 #endif
   std::shared_ptr<TurboModulesProvider> m_turboModulesProvider;

package/Microsoft.ReactNative/Utils/Helpers.cpp

@@ -14,8 +14,6 @@
 #endif // USE_FABRIC
 
 namespace winrt {
-using namespace xaml::Controls::Primitives;
-using namespace xaml::Media;
 using namespace Windows::Foundation::Metadata;
 } // namespace winrt
 

package/Microsoft.ReactNative/Views/DevMenu.cpp

@@ -10,7 +10,7 @@
 #include "IReactDispatcher.h"
 #include "Modules/DevSettingsModule.h"
 
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
 #include <XamlUtils.h>
 #include "DevMenuControl.h"
 #include "UI.Xaml.Controls.Primitives.h"
@@ -37,7 +37,7 @@ struct IDevMenu {
   virtual void Show() noexcept = 0;
 };
 
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
 bool IsCtrlShiftD(winrt::Windows::System::VirtualKey key) noexcept {
   return (
       key == winrt::Windows::System::VirtualKey::D &&
@@ -116,7 +116,7 @@ const wchar_t *HermesProfilerLabel(Mso::CntPtr<Mso::React::IReactContext> const
                                                                       : L"Stop and copy trace path to clipboard";
 }
 
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
 struct InAppXamlDevMenu : public IDevMenu, public std::enable_shared_from_this<InAppXamlDevMenu> {
   InAppXamlDevMenu(Mso::CntPtr<Mso::React::IReactContext> const &reactContext) : m_context(reactContext) {}
 
@@ -348,7 +348,7 @@ struct WindowsPopupMenuDevMenu : public IDevMenu, public std::enable_shared_from
 DevMenuManager::DevMenuManager(Mso::CntPtr<Mso::React::IReactContext> const &reactContext) : m_context(reactContext) {}
 
 void DevMenuManager::Init() noexcept {
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
   auto uiDispatcher = React::implementation::ReactDispatcher::GetUIDispatcher(m_context->Properties());
   uiDispatcher.Post([weakThis = weak_from_this()]() {
     if (auto strongThis = weakThis.lock()) {
@@ -396,8 +396,8 @@ std::shared_ptr<IDevMenu> GetOrCreateDevMenu(Mso::CntPtr<Mso::React::IReactConte
       .GetOrCreate(
           DevMenuImplProperty(),
           [reactContext]() -> std::shared_ptr<IDevMenu> {
-#ifndef CORE_ABI
-            if (xaml::TryGetCurrentApplication()) {
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
+            if (xaml::TryGetCurrentUwpXamlApplication()) {
               auto devMenu = std::make_shared<InAppXamlDevMenu>(reactContext);
               return devMenu;
             } else

package/Microsoft.ReactNative/Views/DevMenu.h

@@ -21,7 +21,7 @@ struct DevMenuManager : public std::enable_shared_from_this<DevMenuManager> {
  private:
   void Init() noexcept;
   const Mso::CntPtr<Mso::React::IReactContext> m_context;
-#ifndef CORE_ABI
+#if !defined(CORE_ABI) && !defined(USE_FABRIC)
   winrt::CoreDispatcher::AcceleratorKeyActivated_revoker m_coreDispatcherAKARevoker{};
   xaml::UIElement::KeyDown_revoker m_keyDownRevoker;
 #endif

package/Microsoft.ReactNative/Views/ViewManagerBase.cpp

@@ -19,7 +19,7 @@
 #include <Utils/PropertyUtils.h>
 #include <Views/ExpressionAnimationStore.h>
 #include <Views/ShadowNodeBase.h>
-#include <cxxreact/SystraceSection.h>
+#include <cxxreact/TraceSection.h>
 
 namespace winrt {
 using namespace xaml;
@@ -308,7 +308,7 @@ void ViewManagerBase::UpdateProperties(
   }
 
   {
-    SystraceSection s("ViewManagerBase::OnPropertiesUpdated");
+    TraceSection s("ViewManagerBase::OnPropertiesUpdated");
     OnPropertiesUpdated(nodeToUpdate);
   }
 }

package/Microsoft.ReactNative/Views/ViewPanel.cpp

@@ -9,7 +9,7 @@
 #include <UI.Xaml.Media.h>
 #include <Utils/PropertyUtils.h>
 #include <Utils/ResourceBrushUtils.h>
-#include <cxxreact/SystraceSection.h>
+#include <cxxreact/TraceSection.h>
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.UI.Xaml.Interop.h>
 

package/Microsoft.ReactNative/Views/ViewViewManager.cpp

@@ -19,7 +19,7 @@
 #include <INativeUIManager.h>
 #include <IReactInstance.h>
 
-#include <cxxreact/SystraceSection.h>
+#include <cxxreact/TraceSection.h>
 #include <inspectable.h>
 #include <unicode.h>
 #include <winrt/Windows.System.h>
@@ -419,7 +419,7 @@ void ViewViewManager::TryUpdateView(
   // 2. Transfer needed properties from old to new view
   //
   {
-    SystraceSection s("ViewViewManager::TransferProperties");
+    TraceSection s("ViewViewManager::TransferProperties");
     // Transfer properties from old XamlView to the new one
     TransferProperties(oldXamlView, newXamlView);
   }

package/Microsoft.ReactNative/XamlUIService.cpp

@@ -4,17 +4,28 @@
 #include "pch.h"
 #include "XamlUIService.h"
 #include "XamlUIService.g.cpp"
+
+#ifndef USE_FABRIC
 #include <Modules/NativeUIManager.h>
 #include <Modules/PaperUIManagerModule.h>
-#include "DynamicWriter.h"
 #include "ShadowNodeBase.h"
 #include "Views/ShadowNodeBase.h"
+#endif
+
+#include "DynamicWriter.h"
 #include "XamlView.h"
 
 namespace winrt::Microsoft::ReactNative::implementation {
 
 XamlUIService::XamlUIService(Mso::CntPtr<Mso::React::IReactContext> &&context) noexcept : m_context(context) {}
 
+/*static*/ winrt::Microsoft::ReactNative::XamlUIService XamlUIService::FromContext(IReactContext context) {
+  return context.Properties()
+      .Get(XamlUIService::XamlUIServiceProperty().Handle())
+      .try_as<winrt::Microsoft::ReactNative::XamlUIService>();
+}
+
+#ifndef USE_FABRIC
 xaml::DependencyObject XamlUIService::ElementFromReactTag(int64_t reactTag) noexcept {
   if (auto uiManager = ::Microsoft::ReactNative::GetNativeUIManager(*m_context).lock()) {
     auto shadowNode = uiManager->getHost()->FindShadowNodeForTag(reactTag);
@@ -26,12 +37,6 @@ xaml::DependencyObject XamlUIService::ElementFromReactTag(int64_t reactTag) noex
   return nullptr;
 }
 
-/*static*/ winrt::Microsoft::ReactNative::XamlUIService XamlUIService::FromContext(IReactContext context) {
-  return context.Properties()
-      .Get(XamlUIService::XamlUIServiceProperty().Handle())
-      .try_as<winrt::Microsoft::ReactNative::XamlUIService>();
-}
-
 void XamlUIService::DispatchEvent(
     xaml::FrameworkElement const &view,
     hstring const &eventName,
@@ -64,6 +69,7 @@ winrt::Microsoft::ReactNative::ReactRootView XamlUIService::GetReactRootView(
   }
   return nullptr;
 }
+#endif
 
 /*static*/ ReactPropertyId<XamlUIService> XamlUIService::XamlUIServiceProperty() noexcept {
   static ReactPropertyId<XamlUIService> uiManagerProperty{L"ReactNative.UIManager", L"XamlUIManager"};

package/Microsoft.ReactNative/XamlUIService.h

@@ -15,14 +15,17 @@ struct XamlUIService : XamlUIServiceT<XamlUIService> {
   XamlUIService(Mso::CntPtr<Mso::React::IReactContext> &&context) noexcept;
   static ReactPropertyId<XamlUIService> XamlUIServiceProperty() noexcept;
 
-  xaml::DependencyObject ElementFromReactTag(int64_t reactTag) noexcept;
   static winrt::Microsoft::ReactNative::XamlUIService FromContext(IReactContext context);
+
+#ifndef USE_FABRIC
+  xaml::DependencyObject ElementFromReactTag(int64_t reactTag) noexcept;
   void DispatchEvent(
       xaml::FrameworkElement const &view,
       hstring const &eventName,
       JSValueArgWriter const &eventDataArgWriter) noexcept;
 
   winrt::Microsoft::ReactNative::ReactRootView GetReactRootView(xaml::FrameworkElement const &view) noexcept;
+#endif
 
   static void SetXamlRoot(IReactPropertyBag const &properties, xaml::XamlRoot const &xamlRoot) noexcept;
   static void SetAccessibleRoot(

package/Microsoft.ReactNative/XamlUIService.idl

@@ -19,6 +19,7 @@ namespace Microsoft.ReactNative
     DOC_STRING("Use this method to get access to the @XamlUIService associated with the @IReactContext.")
     static XamlUIService FromContext(IReactContext context);
 
+#ifndef USE_FABRIC
     DOC_STRING("Gets the backing XAML element from a react tag.")
     XAML_NAMESPACE.DependencyObject ElementFromReactTag(Int64 reactTag);
 
@@ -27,6 +28,7 @@ namespace Microsoft.ReactNative
 
     DOC_STRING("Gets the @ReactRootView view for a given element.")
     ReactRootView GetReactRootView(XAML_NAMESPACE.FrameworkElement view);
+#endif
 
     DOC_STRING(
       "Sets the @Windows.UI.Xaml.XamlRoot element for the app. "

package/Microsoft.ReactNative.Cxx/JSI/JsiAbiApi.h

@@ -283,7 +283,9 @@ struct JsiAbiRuntime : facebook::jsi::Runtime {
     ~ValueRef() noexcept;
     operator facebook::jsi::Value const &() const noexcept;
 
-    using StoreType = std::aligned_storage_t<sizeof(DataPointerValue)>;
+    struct alignas(std::max_align_t) StoreType {
+      std::byte buffer[sizeof(DataPointerValue)];
+    };
     static void InitValueRef(JsiValueRef const &data, facebook::jsi::Value *value, StoreType *store) noexcept;
 
    private:
@@ -307,7 +309,9 @@ struct JsiAbiRuntime : facebook::jsi::Runtime {
     ~PropNameIDRef() noexcept;
     operator facebook::jsi::PropNameID const &() const noexcept;
 
-    using StoreType = std::aligned_storage_t<sizeof(DataPointerValue)>;
+    struct alignas(std::max_align_t) StoreType {
+      std::byte buffer[sizeof(DataPointerValue)];
+    };
 
    private:
     StoreType m_pointerStore{};

package/Microsoft.ReactNative.Cxx/ReactContext.h

@@ -65,7 +65,7 @@ struct ReactContext {
     m_handle.EmitJSEvent(eventEmitterName, eventName, MakeJSValueWriter(std::forward<TArgs>(args)...));
   }
 
-#if !defined(CORE_ABI) && !defined(__APPLE__) && !defined(CXXUNITTESTS)
+#if !defined(CORE_ABI) && !defined(USE_FABRIC) && !defined(__APPLE__) && !defined(CXXUNITTESTS)
   // Dispatch eventName event to the view.
   // args are either function arguments or a single lambda with 'IJSValueWriter const&' argument.
   template <class... TArgs>

package/Microsoft.ReactNative.Cxx/XamlUtils.h

@@ -54,6 +54,18 @@ inline Application TryGetCurrentApplication() noexcept {
   }
 }
 
+// In the legacy architecture, RNW uses a Uwp Xaml app as the groundwork for the UI.
+// In the new architecture, WinUI3 Xaml may be involved, but only as XamlIslands -- leaf nodes in the RNW content.
+// This function returns the Uwp/System Xaml Application if we're running in the legacy architecture and Xaml is
+// running, and null if otherwise.
+inline Application TryGetCurrentUwpXamlApplication() noexcept {
+#ifdef USE_WINUI3
+  return nullptr;
+#else
+  return TryGetCurrentApplication();
+#endif
+}
+
 // Using Windows::UI::ColorHelper causes the process to load Windows.UI.Xaml.dll which is not needed just to fill a
 // Color struct
 inline winrt::Windows::UI::Color FromArgb(uint8_t a, uint8_t r, uint8_t g, uint8_t b) {

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.77.0</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.78.0-preview.1</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
-    <ReactNativeWindowsMinor>77</ReactNativeWindowsMinor>
+    <ReactNativeWindowsMinor>78</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>1e639ef0de6e9ca02d4d463d7e9fe982d756c584</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>f6b375a43749b744c67617193e0550010d39b6d0</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/PropertySheets/React.Cpp.props

@@ -73,6 +73,9 @@
       -->
       <PreprocessorDefinitions>_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
+    <Midl>
+      <PreprocessorDefinitions Condition="'$(UseFabric)' == 'true'">USE_FABRIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </Midl>
   </ItemDefinitionGroup>
 
   <PropertyGroup>