react-native-windows 0.81.3 → 0.82.0-preview.10

package/Microsoft.ReactNative/XamlApplication.cpp

@@ -0,0 +1,71 @@
+#include "pch.h"
+#include "XamlApplication.h"
+#include "Xaml.XamlApplication.g.cpp"
+
+#include "winrt/Microsoft.UI.Xaml.XamlTypeInfo.h"
+
+namespace winrt::Microsoft::ReactNative::Xaml::implementation {
+using namespace ::winrt::Microsoft::UI::Xaml;
+using namespace ::winrt::Microsoft::UI::Xaml::Markup;
+using namespace ::winrt::Windows::UI::Xaml::Interop;
+XamlApplication::XamlApplication() {
+  s_current = *this;
+
+  // TODO: It's probably not a good idea to only load the controls pri file, there are other ones too.
+  auto resourceManager =
+      winrt::Microsoft::Windows::ApplicationModel::Resources::ResourceManager(L"Microsoft.UI.Xaml.Controls.pri");
+
+  this->ResourceManagerRequested([resourceManager](auto &&, ResourceManagerRequestedEventArgs args) {
+    args.CustomResourceManager(resourceManager);
+  });
+  winrt::Microsoft::UI::Xaml::Hosting::WindowsXamlManager::InitializeForCurrentThread();
+
+  m_providers.push_back(
+      winrt::make_self<winrt::Microsoft::ReactNative::implementation::XamlMetaDataProvider>()
+          .as<winrt::Microsoft::UI::Xaml::Markup::IXamlMetadataProvider>()); // Default generated provider
+  m_providers.push_back(winrt::Microsoft::UI::Xaml::XamlTypeInfo::XamlControlsXamlMetaDataProvider());
+
+  auto winUIResources = winrt::Microsoft::UI::Xaml::Controls::XamlControlsResources();
+  Resources().MergedDictionaries().Append(winUIResources);
+}
+
+XamlApplication::~XamlApplication() {
+  s_current = nullptr;
+}
+
+void XamlApplication::AddMetadataProvider(
+    winrt::Microsoft::UI::Xaml::Markup::IXamlMetadataProvider const &otherProvider) {
+  m_providers.push_back(otherProvider);
+}
+
+winrt::Microsoft::UI::Xaml::Markup::IXamlType XamlApplication::GetXamlType(
+    winrt::Windows::UI::Xaml::Interop::TypeName const &type) {
+  for (const auto &provider : m_providers) {
+    if (auto result = provider.GetXamlType(type)) {
+      return result;
+    }
+  }
+  return nullptr;
+}
+
+winrt::Microsoft::UI::Xaml::Markup::IXamlType XamlApplication::GetXamlType(hstring const &fullName) {
+  for (const auto &provider : m_providers) {
+    if (auto result = provider.GetXamlType(fullName)) {
+      return result;
+    }
+  }
+
+  return nullptr;
+}
+com_array<winrt::Microsoft::UI::Xaml::Markup::XmlnsDefinition> XamlApplication::GetXmlnsDefinitions() {
+  std::vector<::winrt::Microsoft::UI::Xaml::Markup::XmlnsDefinition> allDefinitions;
+  for (const auto &provider : m_providers) {
+    const auto &definitions = provider.GetXmlnsDefinitions();
+    allDefinitions.insert(allDefinitions.cend(), definitions.cbegin(), definitions.cend());
+  }
+  return winrt::com_array<::winrt::Microsoft::UI::Xaml::Markup::XmlnsDefinition>(
+      allDefinitions.begin(), allDefinitions.end());
+}
+
+winrt::Microsoft::ReactNative::Xaml::XamlApplication XamlApplication::s_current{nullptr};
+} // namespace winrt::Microsoft::ReactNative::Xaml::implementation

package/Microsoft.ReactNative/XamlApplication.h

@@ -0,0 +1,47 @@
+#pragma once
+#include "Xaml.XamlApplication.g.h"
+
+#include <winrt/Microsoft.UI.Composition.h>
+#include <winrt/Microsoft.UI.Dispatching.h>
+#include <winrt/Microsoft.UI.Xaml.Controls.Primitives.h>
+#include <winrt/Microsoft.UI.Xaml.Controls.h>
+#include <winrt/Microsoft.Windows.ApplicationModel.Resources.h>
+#include <winrt/Windows.Foundation.h>
+
+#include "winrt/Microsoft.UI.Xaml.Hosting.h"
+#include "winrt/Microsoft.UI.Xaml.Interop.h"
+#include "winrt/Microsoft.UI.Xaml.Markup.h"
+#include "winrt/Microsoft.UI.Xaml.h"
+
+#include "winrt/Windows.UI.Xaml.Interop.h"
+
+#include "XamlMetaDataProvider.h"
+
+namespace winrt::Microsoft::ReactNative::Xaml::implementation {
+struct XamlApplication : XamlApplicationT<XamlApplication> {
+  XamlApplication();
+  ~XamlApplication();
+
+  static void EnsureCreated() {
+    if (Current() == nullptr) {
+      s_current = winrt::make<winrt::Microsoft::ReactNative::Xaml::implementation::XamlApplication>();
+    }
+  }
+
+  static winrt::Microsoft::ReactNative::Xaml::XamlApplication Current() {
+    return s_current;
+  }
+
+  void AddMetadataProvider(winrt::Microsoft::UI::Xaml::Markup::IXamlMetadataProvider const &otherProvider);
+  winrt::Microsoft::UI::Xaml::Markup::IXamlType GetXamlType(winrt::Windows::UI::Xaml::Interop::TypeName const &type);
+  winrt::Microsoft::UI::Xaml::Markup::IXamlType GetXamlType(hstring const &fullName);
+  com_array<winrt::Microsoft::UI::Xaml::Markup::XmlnsDefinition> GetXmlnsDefinitions();
+
+ private:
+  static winrt::Microsoft::ReactNative::Xaml::XamlApplication s_current;
+  std::vector<winrt::Microsoft::UI::Xaml::Markup::IXamlMetadataProvider> m_providers;
+};
+} // namespace winrt::Microsoft::ReactNative::Xaml::implementation
+namespace winrt::Microsoft::ReactNative::Xaml::factory_implementation {
+struct XamlApplication : XamlApplicationT<XamlApplication, implementation::XamlApplication> {};
+} // namespace winrt::Microsoft::ReactNative::Xaml::factory_implementation

package/Microsoft.ReactNative/XamlApplication.idl

@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#include "DocString.h"
+
+namespace Microsoft.ReactNative.Xaml {
+[webhosthidden][default_interface] runtimeclass XamlApplication : Microsoft.UI.Xaml.Application,
+    Microsoft.UI.Xaml.Markup.IXamlMetadataProvider {
+  DOC_STRING("Initializes a new XamlApplication instance for RNW-hosted WinUI/XAML.")
+  XamlApplication();
+
+  DOC_STRING("Gets the process-wide XamlApplication singleton.")
+  static XamlApplication Current {
+    get;
+  };
+
+  DOC_STRING("Adds an additional XAML metadata provider to the application.")
+  void AddMetadataProvider(Microsoft.UI.Xaml.Markup.IXamlMetadataProvider otherProvider);
+}
+} // namespace Microsoft.ReactNative.Xaml

package/Microsoft.ReactNative/XamlUIService.cpp

@@ -5,15 +5,7 @@
 #include "XamlUIService.h"
 #include "XamlUIService.g.cpp"
 
-#ifndef USE_FABRIC
-#include <Modules/NativeUIManager.h>
-#include <Modules/PaperUIManagerModule.h>
-#include "ShadowNodeBase.h"
-#include "Views/ShadowNodeBase.h"
-#endif
-
 #include "DynamicWriter.h"
-#include "XamlView.h"
 
 namespace winrt::Microsoft::ReactNative::implementation {
 
@@ -25,52 +17,6 @@ XamlUIService::XamlUIService(Mso::CntPtr<Mso::React::IReactContext> &&context) n
       .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);
-    if (!shadowNode)
-      return nullptr;
-
-    return static_cast<::Microsoft::ReactNative::ShadowNodeBase *>(shadowNode)->GetView();
-  }
-  return nullptr;
-}
-
-void XamlUIService::DispatchEvent(
-    xaml::FrameworkElement const &view,
-    hstring const &eventName,
-    JSValueArgWriter const &eventDataArgWriter) noexcept {
-  auto paramsWriter = winrt::make_self<DynamicWriter>();
-  paramsWriter->WriteArrayBegin();
-  paramsWriter->WriteInt64(::Microsoft::ReactNative::GetTag(view));
-  paramsWriter->WriteString(eventName);
-  if (eventDataArgWriter) {
-    eventDataArgWriter(*paramsWriter);
-  } else {
-    paramsWriter->WriteNull();
-  }
-  paramsWriter->WriteArrayEnd();
-  auto params = paramsWriter->TakeValue();
-  m_context->CallJSFunction("RCTEventEmitter", "receiveEvent", std::move(params));
-}
-
-winrt::Microsoft::ReactNative::ReactRootView XamlUIService::GetReactRootView(
-    xaml::FrameworkElement const &view) noexcept {
-  if (auto uiManager = ::Microsoft::ReactNative::GetNativeUIManager(*m_context).lock()) {
-    const auto reactTag = ::Microsoft::ReactNative::GetTag(view);
-    if (auto shadowNode = static_cast<::Microsoft::ReactNative::ShadowNodeBase *>(
-            uiManager->getHost()->FindShadowNodeForTag(reactTag))) {
-      if (auto rootNode = static_cast<::Microsoft::ReactNative::ShadowNodeBase *>(
-              uiManager->getHost()->FindShadowNodeForTag(shadowNode->m_rootTag))) {
-        return rootNode->GetView().as<winrt::Microsoft::ReactNative::ReactRootView>();
-      }
-    }
-  }
-  return nullptr;
-}
-#endif
-
 /*static*/ ReactPropertyId<XamlUIService> XamlUIService::XamlUIServiceProperty() noexcept {
   static ReactPropertyId<XamlUIService> uiManagerProperty{L"ReactNative.UIManager", L"XamlUIManager"};
   return uiManagerProperty;

package/Microsoft.ReactNative/XamlUIService.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include "XamlUIService.g.h"
-#include "INativeUIManager.h"
 #include "ReactHost/React.h"
 #include "ReactPropertyBag.h"
 #include "winrt/Microsoft.ReactNative.h"
@@ -17,16 +16,6 @@ struct XamlUIService : XamlUIServiceT<XamlUIService> {
 
   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(
       IReactPropertyBag const &properties,
@@ -38,7 +27,6 @@ struct XamlUIService : XamlUIServiceT<XamlUIService> {
   static uint64_t GetIslandWindowHandle(IReactPropertyBag const &properties) noexcept;
 
  private:
-  std::weak_ptr<::Microsoft::ReactNative::INativeUIManagerHost> m_wkUIManager;
   Mso::CntPtr<Mso::React::IReactContext> m_context;
 };
 

package/Microsoft.ReactNative/XamlUIService.idl

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 import "IReactContext.idl";
-import "ReactRootView.idl";
 
 #include "NamespaceRedirect.h"
 #include "DocString.h"
@@ -19,17 +18,6 @@ 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);
-
-    DOC_STRING("Dispatches an event to a JS component.")
-    void DispatchEvent(XAML_NAMESPACE.FrameworkElement view, String eventName, JSValueArgWriter eventDataArgWriter);
-
-    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. "
       "This must be manually provided to the @ReactInstanceSettings object when using XAML Islands "

package/Microsoft.ReactNative.Cxx/CppWinRTIncludes.h

@@ -7,22 +7,6 @@
 #include <winrt/Windows.Foundation.Collections.h>
 #include <winrt/Windows.Foundation.h>
 
-#ifndef USE_WINUI3
-
-#include <winrt/Windows.System.h>
-#include <winrt/Windows.UI.Xaml.h>
-
-#define XAML_CPPWINRT_NAMESPACE winrt::Windows::UI::Xaml
-namespace xaml = winrt::Windows::UI::Xaml;
-namespace comp = winrt::Windows::UI::Composition;
-namespace ui = winrt::Windows::UI;
-namespace winrt {
-namespace dispatching = winrt::Windows::System;
-using Colors = winrt::Windows::UI::Colors;
-} // namespace winrt
-#else
-
-#include <winrt/Microsoft.UI.Dispatching.h>
 #include <winrt/Microsoft.UI.Xaml.h>
 
 #define XAML_CPPWINRT_NAMESPACE winrt::Microsoft::UI::Xaml
@@ -30,7 +14,6 @@ namespace xaml = winrt::Microsoft::UI::Xaml;
 namespace comp = winrt::Microsoft::UI::Composition;
 namespace ui = winrt::Microsoft::UI;
 namespace winrt {
-namespace dispatching = winrt::Microsoft::UI::Dispatching;
 using Colors = winrt::Microsoft::UI::Colors;
 } // namespace winrt
 
@@ -40,8 +23,6 @@ using IUIElement9 = UIElement;
 using IUIElement10 = UIElement;
 } // namespace winrt::Microsoft::UI::Xaml
 
-#endif
-
 namespace winrt {
 using namespace Windows::UI::Core;
 using namespace Windows::Foundation;

package/Microsoft.ReactNative.Cxx/DesktopWindowBridge.h

@@ -8,7 +8,7 @@
 #include <winrt/Windows.Foundation.h>
 #include <functional>
 
-#if defined(USE_WINUI3) && !defined(CORE_ABI) && !defined(__APPLE__) && \
+#if !defined(CORE_ABI) && !defined(__APPLE__) && \
     WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM | WINAPI_PARTITION_GAMES)
 
 #include <winrt/Microsoft.ReactNative.h>