react-native-windows 0.68.3 → 0.69.0-preview.1

package/Microsoft.ReactNative/Views/TouchEventHandler.h

@@ -50,6 +50,12 @@ class TouchEventHandler {
   winrt::IInspectable m_exitedHandler;
   winrt::IInspectable m_movedHandler;
 
+#ifdef USE_WINUI3
+  using PointerDeviceType = winrt::Microsoft::UI::Input::PointerDeviceType;
+#else
+  using PointerDeviceType = winrt::Windows::Devices::Input::PointerDeviceType;
+#endif
+
   struct ReactPointer {
     int64_t target = 0;
     int64_t identifier = 0;
@@ -57,8 +63,7 @@ class TouchEventHandler {
     uint64_t timestamp = 0;
     winrt::Point positionRoot = {0, 0};
     winrt::Point positionView = {0, 0};
-    winrt::Windows::Devices::Input::PointerDeviceType deviceType{
-        winrt::Windows::Devices::Input::PointerDeviceType::Mouse};
+    PointerDeviceType deviceType{PointerDeviceType::Mouse};
     float pressure = 0;
     bool isLeftButton = false;
     bool isRightButton = false;
@@ -80,14 +85,16 @@ class TouchEventHandler {
       xaml::UIElement sourceElement,
       std::vector<int64_t> &&newViews);
 
+  enum class TouchEventType { Start = 0, End, Move, Cancel, CaptureLost, PointerEntered, PointerExited, PointerMove };
 #ifdef USE_FABRIC
   facebook::react::Touch TouchForPointer(const ReactPointer &pointer) noexcept;
+  static bool IsEndishEventType(TouchEventType eventType) noexcept;
 #endif
-  enum class TouchEventType { Start = 0, End, Move, Cancel, CaptureLost, PointerEntered, PointerExited, PointerMove };
   void OnPointerConcluded(TouchEventType eventType, const winrt::PointerRoutedEventArgs &args);
   void DispatchTouchEvent(TouchEventType eventType, size_t pointerIndex);
   bool DispatchBackEvent();
-  const char *GetPointerDeviceTypeName(winrt::Windows::Devices::Input::PointerDeviceType deviceType) noexcept;
+  const char *GetPointerDeviceTypeName(PointerDeviceType deviceType) noexcept;
+
   winrt::Microsoft::ReactNative::PointerEventKind GetPointerEventKind(TouchEventType eventType) noexcept;
   const wchar_t *GetTouchEventTypeName(TouchEventType eventType) noexcept;
 

package/Microsoft.ReactNative/Views/ViewPanel.cpp

@@ -47,14 +47,6 @@ winrt::AutomationPeer ViewPanel::OnCreateAutomationPeer() {
     panel->m_propertiesChanged = true;
 }
 
-/*static*/ void ViewPanel::PositionPropertyChanged(
-    xaml::DependencyObject sender,
-    xaml::DependencyPropertyChangedEventArgs e) {
-  auto element{sender.as<xaml::UIElement>()};
-  if (element != nullptr)
-    InvalidateForArrange(element);
-}
-
 /*static*/ xaml::DependencyProperty ViewPanel::ViewBackgroundProperty() {
   static xaml::DependencyProperty s_viewBackgroundProperty = xaml::DependencyProperty::Register(
       L"ViewBackground",
@@ -96,23 +88,11 @@ winrt::AutomationPeer ViewPanel::OnCreateAutomationPeer() {
 }
 
 /*static*/ xaml::DependencyProperty ViewPanel::TopProperty() {
-  static xaml::DependencyProperty s_topProperty = xaml::DependencyProperty::RegisterAttached(
-      L"Top",
-      winrt::xaml_typename<double>(),
-      viewPanelTypeName,
-      winrt::PropertyMetadata(winrt::box_value((double)0), ViewPanel::PositionPropertyChanged));
-
-  return s_topProperty;
+  return xaml::Controls::Canvas::TopProperty();
 }
 
 /*static*/ xaml::DependencyProperty ViewPanel::LeftProperty() {
-  static xaml::DependencyProperty s_LeftProperty = xaml::DependencyProperty::RegisterAttached(
-      L"Left",
-      winrt::xaml_typename<double>(),
-      viewPanelTypeName,
-      winrt::PropertyMetadata(winrt::box_value((double)0), ViewPanel::PositionPropertyChanged));
-
-  return s_LeftProperty;
+  return xaml::Controls::Canvas::LeftProperty();
 }
 
 /*static*/ xaml::DependencyProperty ViewPanel::ClipChildrenProperty() {
@@ -135,7 +115,7 @@ winrt::AutomationPeer ViewPanel::OnCreateAutomationPeer() {
   InvalidateForArrange(element);
 }
 
-void ViewPanel::InvalidateForArrange(xaml::UIElement element) {
+void ViewPanel::InvalidateForArrange(const xaml::DependencyObject &element) {
   // If the element's position has changed, we must invalidate the parent for arrange,
   // as it's the parent's responsibility to arrange its children.
   if (auto parent = VisualTreeHelper::GetParent(element)) {

package/Microsoft.ReactNative/Views/ViewPanel.h

@@ -77,13 +77,13 @@ struct ViewPanel : ViewPanelT<ViewPanel> {
     return winrt::unbox_value<double>(element.GetValue(LeftProperty()));
   }
 
+  static void InvalidateForArrange(const xaml::DependencyObject &element);
+
  private:
   void Remove(xaml::UIElement element) const;
 
   void UpdateClip(winrt::Windows::Foundation::Size &finalSize);
 
-  static void InvalidateForArrange(xaml::UIElement element);
-
  private:
   bool m_propertiesChanged{false};
 
@@ -93,7 +93,6 @@ struct ViewPanel : ViewPanelT<ViewPanel> {
 
  private:
   static void VisualPropertyChanged(xaml::DependencyObject sender, xaml::DependencyPropertyChangedEventArgs e);
-  static void PositionPropertyChanged(xaml::DependencyObject sender, xaml::DependencyPropertyChangedEventArgs e);
 };
 
 } // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/Views/ViewViewManager.cpp

@@ -7,6 +7,7 @@
 
 #include "ViewControl.h"
 
+#include <UI.Xaml.Automation.Peers.h>
 #include "DynamicAutomationProperties.h"
 
 #include <JSValueWriter.h>
@@ -127,6 +128,14 @@ class ViewShadowNode : public ShadowNodeBase {
       GetControl().IsTabStop(m_isFocusable);
   }
 
+  bool IsAccessible() const {
+    return m_isAccessible;
+  }
+
+  void IsAccessible(bool isAccessible) {
+    m_isAccessible = isAccessible;
+  }
+
   bool IsHitTestBrushRequired() const {
     return IsRegisteredForMouseEvents();
   }
@@ -251,6 +260,7 @@ class ViewShadowNode : public ShadowNodeBase {
   bool m_enableFocusRing = true;
   bool m_onClick = false;
   bool m_isFocusable = false;
+  bool m_isAccessible = false;
   int32_t m_tabIndex = std::numeric_limits<std::int32_t>::max();
 
   xaml::Controls::ContentControl::GotFocus_revoker m_contentControlGotFocusRevoker{};
@@ -420,6 +430,11 @@ bool ViewViewManager::UpdateProperty(
         pViewShadowNode->TabIndex(std::numeric_limits<std::int32_t>::max());
       }
     } else {
+      if (propertyName == "accessible") {
+        if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Boolean) {
+          pViewShadowNode->IsAccessible(propertyValue.AsBoolean());
+        }
+      }
       ret = Super::UpdateProperty(nodeToUpdate, propertyName, propertyValue);
     }
   }
@@ -563,6 +578,12 @@ void ViewViewManager::TryUpdateView(
 
   if (useControl)
     pViewShadowNode->GetControl().Content(visualRoot);
+
+  if (useControl && pViewShadowNode->IsAccessible() != pViewShadowNode->IsFocusable()) {
+    pViewShadowNode->GetControl().IsTabStop(false);
+    xaml::Automation::AutomationProperties::SetAccessibilityView(
+        pViewShadowNode->GetControl(), xaml::Automation::Peers::AccessibilityView::Raw);
+  }
 }
 
 void ViewViewManager::SetLayoutProps(

package/Microsoft.ReactNative/XamlUIService.cpp

@@ -37,7 +37,7 @@ void XamlUIService::DispatchEvent(
     JSValueArgWriter const &eventDataArgWriter) noexcept {
   auto paramsWriter = winrt::make_self<DynamicWriter>();
   paramsWriter->WriteArrayBegin();
-  paramsWriter->WriteInt64(unbox_value<int64_t>(view.Tag()));
+  paramsWriter->WriteInt64(::Microsoft::ReactNative::GetTag(view));
   paramsWriter->WriteString(eventName);
   if (eventDataArgWriter) {
     eventDataArgWriter(*paramsWriter);

package/Microsoft.ReactNative/XamlView.h

@@ -8,14 +8,19 @@
 namespace Microsoft::ReactNative {
 
 using XamlView = xaml::DependencyObject;
+constexpr int64_t InvalidTag = -1;
 
 inline int64_t GetTag(XamlView view) {
   auto tagValue = view.ReadLocalValue(xaml::FrameworkElement::TagProperty());
   if (tagValue != xaml::DependencyProperty::UnsetValue()) {
-    return tagValue.as<winrt::IPropertyValue>().GetInt64();
-  } else {
-    return -1;
+    if (auto tagValueInt = tagValue.try_as<winrt::IPropertyValue>()) {
+      if (tagValueInt.Type() == winrt::PropertyType::Int64) {
+        return tagValueInt.GetInt64();
+      }
+    }
   }
+
+  return InvalidTag;
 }
 
 inline void SetTag(XamlView view, int64_t tag) {

package/Microsoft.ReactNative.Cxx/CppWinRTIncludes.h

@@ -17,13 +17,12 @@ namespace xaml = winrt::Windows::UI::Xaml;
 namespace comp = winrt::Windows::UI::Composition;
 namespace ui = winrt::Windows::UI;
 namespace winrt {
-namespace system = winrt::Windows::System;
-using ColorHelper = winrt::Windows::UI::ColorHelper;
+namespace dispatching = winrt::Windows::System;
 using Colors = winrt::Windows::UI::Colors;
 } // namespace winrt
 #else
 
-#include <winrt/Microsoft.System.h>
+#include <winrt/Microsoft.UI.Dispatching.h>
 #include <winrt/Microsoft.UI.Xaml.h>
 
 #define XAML_CPPWINRT_NAMESPACE winrt::Microsoft::UI::Xaml
@@ -31,8 +30,7 @@ namespace xaml = winrt::Microsoft::UI::Xaml;
 namespace comp = winrt::Microsoft::UI::Composition;
 namespace ui = winrt::Microsoft::UI;
 namespace winrt {
-namespace system = winrt::Microsoft::System;
-using ColorHelper = winrt::Microsoft::UI::ColorHelper;
+namespace dispatching = winrt::Microsoft::UI::Dispatching;
 using Colors = winrt::Microsoft::UI::Colors;
 } // namespace winrt
 

package/Microsoft.ReactNative.Cxx/DesktopWindowBridge.h

@@ -92,7 +92,7 @@ __declspec(selectany) std::unordered_map<std::wstring, IndirectLibrary> indirect
 } // namespace details
 
 template <typename TFn, typename... TArgs>
-auto CallIndirect(const wchar_t *dllName, const char *fnName, TArgs &&... args) noexcept {
+auto CallIndirect(const wchar_t *dllName, const char *fnName, TArgs &&...args) noexcept {
   if (details::indirectLibraries.count(dllName) == 0) {
     details::indirectLibraries.emplace(dllName, WINRT_IMPL_LoadLibraryW(dllName));
   }

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

@@ -306,6 +306,15 @@ PropNameID JsiAbiRuntime::createPropNameIDFromString(const String &str) try {
   throw;
 }
 
+PropNameID JsiAbiRuntime::createPropNameIDFromSymbol(const Symbol &sym) {
+  // TODO: Support for symbols through the native API in JSC is very limited.
+  // While we could construct a PropNameID here, we would not be able to get a
+  // symbol property through the C++ API.
+  UNREFERENCED_PARAMETER(sym);
+  RethrowJsiError();
+  throw;
+}
+
 std::string JsiAbiRuntime::utf8(const PropNameID &propertyId) try {
   std::string dataResult;
   m_runtime.PropertyIdToUtf8(AsJsiPropertyIdRef(propertyId), [&dataResult](array_view<uint8_t const> utf8) {
@@ -994,7 +1003,7 @@ size_t JsiAbiRuntime::ValueRefArray::Size() const noexcept {
 //===========================================================================
 
 JsiAbiRuntime::PropNameIDRef::PropNameIDRef(JsiPropertyIdRef const &data) noexcept
-    : m_propertyId{make<PropNameID>(new (std::addressof(m_pointerStore)) DataPointerValue(data.Data))} {}
+    : m_propertyId{make<PropNameID>(new(std::addressof(m_pointerStore)) DataPointerValue(data.Data))} {}
 
 JsiAbiRuntime::PropNameIDRef::~PropNameIDRef() noexcept {}
 
@@ -1004,4 +1013,4 @@ JsiAbiRuntime::PropNameIDRef::operator facebook::jsi::PropNameID const &() const
 
 } // namespace winrt::Microsoft::ReactNative
 
-#pragma warning(pop)
+#pragma warning(pop)

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

@@ -99,6 +99,7 @@ struct JsiAbiRuntime : facebook::jsi::Runtime {
   facebook::jsi::PropNameID createPropNameIDFromAscii(const char *str, size_t length) override;
   facebook::jsi::PropNameID createPropNameIDFromUtf8(const uint8_t *utf8, size_t length) override;
   facebook::jsi::PropNameID createPropNameIDFromString(const facebook::jsi::String &str) override;
+  facebook::jsi::PropNameID createPropNameIDFromSymbol(const facebook::jsi::Symbol &sym);
   std::string utf8(const facebook::jsi::PropNameID &propertyNameId) override;
   bool compare(const facebook::jsi::PropNameID &left, const facebook::jsi::PropNameID &right) override;
 

package/Microsoft.ReactNative.Cxx/JSI/NodeApiJsiRuntime.cpp

@@ -137,6 +137,7 @@ struct NapiJsiRuntime : facebook::jsi::Runtime {
   facebook::jsi::PropNameID createPropNameIDFromAscii(const char *str, size_t length) override;
   facebook::jsi::PropNameID createPropNameIDFromUtf8(const uint8_t *utf8, size_t length) override;
   facebook::jsi::PropNameID createPropNameIDFromString(const facebook::jsi::String &str) override;
+  facebook::jsi::PropNameID createPropNameIDFromSymbol(const facebook::jsi::Symbol &sym);
   std::string utf8(const facebook::jsi::PropNameID &id) override;
   bool compare(const facebook::jsi::PropNameID &lhs, const facebook::jsi::PropNameID &rhs) override;
 
@@ -711,6 +712,14 @@ PropNameID NapiJsiRuntime::createPropNameIDFromString(const String &str) {
   return MakePointer<PropNameID>(uniqueStr);
 }
 
+PropNameID NapiJsiRuntime::createPropNameIDFromSymbol(const Symbol &sym) {
+  // TODO: Support for symbols through the native API in JSC is very limited.
+  // While we could construct a PropNameID here, we would not be able to get a
+  // symbol property through the C++ API.
+  UNREFERENCED_PARAMETER(sym);
+  throw;
+}
+
 string NapiJsiRuntime::utf8(const PropNameID &id) {
   EnvScope scope{m_env};
 
@@ -1245,7 +1254,7 @@ size_t NapiJsiRuntime::JsiValueViewArgs::Size() const noexcept {
 #pragma region PropNameIDView
 
 NapiJsiRuntime::PropNameIDView::PropNameIDView(NapiJsiRuntime *runtime, napi_value propertyId) noexcept
-    : m_propertyId{make<PropNameID>(new (std::addressof(m_pointerStore)) NapiPointerValueView{runtime, propertyId})} {}
+    : m_propertyId{make<PropNameID>(new(std::addressof(m_pointerStore)) NapiPointerValueView{runtime, propertyId})} {}
 
 NapiJsiRuntime::PropNameIDView::operator PropNameID const &() const noexcept {
   return m_propertyId;

package/Microsoft.ReactNative.Cxx/JSValueReader.h

@@ -90,7 +90,7 @@ void ReadValue(IJSValueReader const &reader, /*out*/ T &value) noexcept;
 
 bool SkipArrayToEnd(IJSValueReader const &reader) noexcept;
 template <class... TArgs>
-void ReadArgs(IJSValueReader const &reader, /*out*/ TArgs &... args) noexcept;
+void ReadArgs(IJSValueReader const &reader, /*out*/ TArgs &...args) noexcept;
 
 //===========================================================================
 // IJSValueReader extensions implementation
@@ -432,7 +432,7 @@ inline bool SkipArrayToEnd(IJSValueReader const &reader) noexcept {
 }
 
 template <class... TArgs>
-inline void ReadArgs(IJSValueReader const &reader, /*out*/ TArgs &... args) noexcept {
+inline void ReadArgs(IJSValueReader const &reader, /*out*/ TArgs &...args) noexcept {
   // Read as many arguments as we can or return default values.
   bool success = reader.ValueType() == JSValueType::Array;
   ((success = success && reader.GetNextArrayItem(), args = success ? ReadValue<TArgs>(reader) : TArgs{}), ...);

package/Microsoft.ReactNative.Cxx/JSValueWriter.h

@@ -64,10 +64,10 @@ template <class T>
 void WriteProperties(IJSValueWriter const &writer, T const &value) noexcept;
 
 template <class... TArgs>
-void WriteArgs(IJSValueWriter const &writer, TArgs const &... args) noexcept;
+void WriteArgs(IJSValueWriter const &writer, TArgs const &...args) noexcept;
 
 template <class... TArgs>
-JSValueArgWriter MakeJSValueArgWriter(TArgs &&... args) noexcept;
+JSValueArgWriter MakeJSValueArgWriter(TArgs &&...args) noexcept;
 
 IJSValueWriter MakeJSValueTreeWriter() noexcept;
 
@@ -264,7 +264,7 @@ inline void WriteProperties(IJSValueWriter const &writer, T const &value) noexce
 }
 
 template <class... TArgs>
-inline void WriteArgs(IJSValueWriter const &writer, TArgs const &... args) noexcept {
+inline void WriteArgs(IJSValueWriter const &writer, TArgs const &...args) noexcept {
   writer.WriteArrayBegin();
   (WriteValue(writer, args), ...);
   writer.WriteArrayEnd();
@@ -276,7 +276,7 @@ inline JSValueArgWriter MakeJSValueArgWriter(T &&argWriter) noexcept {
 }
 
 template <class... TArgs>
-inline JSValueArgWriter MakeJSValueArgWriter(TArgs &&... args) noexcept {
+inline JSValueArgWriter MakeJSValueArgWriter(TArgs &&...args) noexcept {
   return [&args...](IJSValueWriter const &writer) noexcept { WriteArgs(writer, args...); };
 }
 
@@ -286,7 +286,7 @@ inline JSValueArgWriter MakeJSValueWriter(T &&argWriter) noexcept {
 }
 
 template <class... TArgs>
-inline JSValueArgWriter MakeJSValueWriter(TArgs &&... args) noexcept {
+inline JSValueArgWriter MakeJSValueWriter(TArgs &&...args) noexcept {
   return [&args...](IJSValueWriter const &[[maybe_unused]] writer) noexcept { (WriteValue(writer, args), ...); };
 }
 

package/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems

@@ -12,6 +12,8 @@
     <CallInvoker_SourcePath Condition="'$(CallInvoker_SourcePath)' == '' AND Exists('$(MSBuildThisFileDirectory)ReactCommon\CallInvoker.h')">$(MSBuildThisFileDirectory)</CallInvoker_SourcePath>
     <TurboModule_SourcePath Condition="'$(TurboModule_SourcePath)' == '' AND '$(ReactNativeDir)' != ''">$(ReactNativeDir)\ReactCommon\react\nativemodule\core</TurboModule_SourcePath>
     <TurboModule_SourcePath Condition="'$(TurboModule_SourcePath)' == '' AND Exists('$(MSBuildThisFileDirectory)ReactCommon\TurboModule.h')">$(MSBuildThisFileDirectory)</TurboModule_SourcePath>
+    <Bridging_SourcePath Condition="'$(Bridging_SourcePath)' == '' AND '$(ReactNativeDir)' != ''">$(ReactNativeDir)\ReactCommon\react\bridging</Bridging_SourcePath>
+    <Bridging_SourcePath Condition="'$(Bridging_SourcePath)' == '' AND Exists('$(MSBuildThisFileDirectory)ReactCommon\TurboModule.h')">$(MSBuildThisFileDirectory)</Bridging_SourcePath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -20,6 +22,7 @@
         $(JSI_SourcePath);
         $(CallInvoker_SourcePath);
         $(TurboModule_SourcePath);
+        $(Bridging_SourcePath);
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
     </ClCompile>
@@ -40,6 +43,7 @@
     <ClInclude Include="$(CallInvoker_SourcePath)\ReactCommon\CallInvoker.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)XamlUtils.h" />
     <ClInclude Include="$(TurboModule_SourcePath)\ReactCommon\LongLivedObject.h" />
+    <ClInclude Include="$(Bridging_SourcePath)\CallbackWrapper.h" />
     <ClInclude Include="$(TurboModule_SourcePath)\ReactCommon\TurboModule.h" />
     <ClInclude Include="$(TurboModule_SourcePath)\ReactCommon\TurboModuleUtils.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)CppWinRTIncludes.h" />
@@ -104,7 +108,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <DisableSpecificWarnings>%(DisableSpecificWarnings);4100</DisableSpecificWarnings>
     </ClCompile>
-    <ClCompile Include="$(TurboModule_SourcePath)\ReactCommon\LongLivedObject.cpp">
+    <ClCompile Include="$(TurboModule_SourcePath)\..\..\bridging\LongLivedObject.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <DisableSpecificWarnings>%(DisableSpecificWarnings);4100</DisableSpecificWarnings>
     </ClCompile>

package/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems.filters

@@ -18,9 +18,6 @@
     <ClCompile Include="$(TurboModule_SourcePath)\ReactCommon\TurboModule.cpp">
       <Filter>TurboModule</Filter>
     </ClCompile>
-    <ClCompile Include="$(TurboModule_SourcePath)\ReactCommon\LongLivedObject.cpp">
-      <Filter>TurboModule</Filter>
-    </ClCompile>
     <ClCompile Include="$(TurboModule_SourcePath)\ReactCommon\TurboModuleUtils.cpp">
       <Filter>TurboModule</Filter>
     </ClCompile>
@@ -30,6 +27,7 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)JSI\NodeApiJsiRuntime.cpp">
       <Filter>JSI</Filter>
     </ClCompile>
+    <ClCompile Include="$(TurboModule_SourcePath)\..\..\bridging\LongLivedObject.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MSBuildThisFileDirectory)Crash.h" />
@@ -152,6 +150,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\NodeApiJsiRuntime.h">
       <Filter>JSI</Filter>
     </ClInclude>
+    <ClInclude Include="$(Bridging_SourcePath)\CallbackWrapper.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="JSI">

package/Microsoft.ReactNative.Cxx/NativeModules.h

@@ -280,7 +280,7 @@ struct IsPromise<ReactPromise<T>> : std::true_type {};
 template <class TArgsTuple>
 constexpr size_t GetPromiseCount() noexcept {
   if constexpr (
-      std::tuple_size_v<TArgsTuple> > 0 &&
+      std::tuple_size_v < TArgsTuple >> 0 &&
       IsPromise<TupleElementOrVoid<std::tuple_size_v<TArgsTuple> - 1, TArgsTuple>>::value) {
     return 1;
   } else {

package/Microsoft.ReactNative.Cxx/ReactContext.h

@@ -53,7 +53,7 @@ struct ReactContext {
   // Call methodName JS function of module with moduleName.
   // args are either function arguments or a single lambda with 'IJSValueWriter const&' argument.
   template <class... TArgs>
-  void CallJSFunction(std::wstring_view moduleName, std::wstring_view methodName, TArgs &&... args) const noexcept {
+  void CallJSFunction(std::wstring_view moduleName, std::wstring_view methodName, TArgs &&...args) const noexcept {
     m_handle.CallJSFunction(moduleName, methodName, MakeJSValueArgWriter(std::forward<TArgs>(args)...));
   }
 
@@ -61,7 +61,7 @@ struct ReactContext {
   // Call eventName JS event of module with eventEmitterName.
   // args are either function arguments or a single lambda with 'IJSValueWriter const&' argument.
   template <class... TArgs>
-  void EmitJSEvent(std::wstring_view eventEmitterName, std::wstring_view eventName, TArgs &&... args) const noexcept {
+  void EmitJSEvent(std::wstring_view eventEmitterName, std::wstring_view eventName, TArgs &&...args) const noexcept {
     m_handle.EmitJSEvent(eventEmitterName, eventName, MakeJSValueWriter(std::forward<TArgs>(args)...));
   }
 
@@ -69,7 +69,7 @@ struct ReactContext {
   // Dispatch eventName event to the view.
   // args are either function arguments or a single lambda with 'IJSValueWriter const&' argument.
   template <class... TArgs>
-  void DispatchEvent(xaml::FrameworkElement const &view, std::wstring_view eventName, TArgs &&... args) const noexcept {
+  void DispatchEvent(xaml::FrameworkElement const &view, std::wstring_view eventName, TArgs &&...args) const noexcept {
     XamlUIService::FromContext(m_handle).DispatchEvent(
         view, eventName, MakeJSValueWriter(std::forward<TArgs>(args)...));
   }

package/Microsoft.ReactNative.Cxx/ReactNonAbiValue.h

@@ -22,7 +22,7 @@ template <class T>
 struct ReactNonAbiValue : implements<ReactNonAbiValue<T>, IReactNonAbiValue> {
   // Create ReactNonAbiValue and construct the wrapped value.
   template <class... TArgs>
-  ReactNonAbiValue(TArgs &&... args) noexcept : m_value{std::forward<TArgs>(args)...} {}
+  ReactNonAbiValue(TArgs &&...args) noexcept : m_value{std::forward<TArgs>(args)...} {}
 
   // Get a pointer to the wrapped value.
   int64_t GetPtr() const noexcept {
@@ -47,7 +47,7 @@ template <class T>
 struct ReactNonAbiValue : Windows::Foundation::IInspectable {
   // Create a new instance of implementation::ReactNonAbiValue with args and keep a ref-counted pointer to it.
   template <class... TArgs>
-  ReactNonAbiValue(std::in_place_t, TArgs &&... args) noexcept
+  ReactNonAbiValue(std::in_place_t, TArgs &&...args) noexcept
       : IInspectable{make<implementation::ReactNonAbiValue<T>>(std::forward<TArgs>(args)...)} {}
 
   // Create an empty ReactNonAbiValue.
@@ -100,7 +100,7 @@ struct ReactNonAbiValue : Windows::Foundation::IInspectable {
   // Call the call operator() for the stored value.
   // Crash the app if ReactNonAbiValue is empty.
   template <class... TArgs>
-  auto operator()(TArgs &&... args) const {
+  auto operator()(TArgs &&...args) const {
     return (*GetPtr())(std::forward<TArgs>(args)...);
   }
 };

package/Microsoft.ReactNative.Cxx/XamlUtils.h

@@ -8,16 +8,55 @@
 
 #include "CppWinRTIncludes.h"
 
+extern "C" {
+HMODULE
+WINAPI
+WINRT_IMPL_GetModuleHandleW(_In_opt_ LPCWSTR lpModuleName);
+}
+
+#ifndef WINRT_IMPL_LINK
+#ifdef _M_HYBRID
+#define WINRT_IMPL_LINK(function, count) \
+  __pragma(comment(linker, "/alternatename:#WINRT_IMPL_" #function "@" #count "=#" #function "@" #count))
+#elif _M_ARM64EC
+#define WINRT_IMPL_LINK(function, count) \
+  __pragma(comment(linker, "/alternatename:#WINRT_IMPL_" #function "=#" #function))
+#elif _M_IX86
+#define WINRT_IMPL_LINK(function, count) \
+  __pragma(comment(linker, "/alternatename:_WINRT_IMPL_" #function "@" #count "=_" #function "@" #count))
+#else
+#define WINRT_IMPL_LINK(function, count) __pragma(comment(linker, "/alternatename:WINRT_IMPL_" #function "=" #function))
+#endif
+#endif
+WINRT_IMPL_LINK(GetModuleHandleW, 4);
+#undef WINRT_IMPL_LINK
+
 namespace XAML_CPPWINRT_NAMESPACE {
 
 // Return Application::Current() when it is present or nullptr otherwise.
 // It does not throw exception as Application::Current() does.
 inline Application TryGetCurrentApplication() noexcept {
-  auto applicationStatics = get_activation_factory<IApplicationStatics>(name_of<Application>());
-  auto abiApplicationStatics = static_cast<impl::abi_t<IApplicationStatics> *>(get_abi(applicationStatics));
-  void *value{};
-  abiApplicationStatics->get_Current(&value);
-  return Application{value, take_ownership_from_abi};
+#ifndef USE_WINUI3
+  constexpr auto xamlDll = L"Windows.UI.Xaml.dll";
+#else
+  constexpr auto xamlDll = L"Microsoft.UI.Xaml.dll";
+#endif
+
+  if (auto xamlIsLoaded = WINRT_IMPL_GetModuleHandleW(xamlDll)) {
+    auto applicationStatics = get_activation_factory<IApplicationStatics>(name_of<Application>());
+    auto abiApplicationStatics = static_cast<impl::abi_t<IApplicationStatics> *>(get_abi(applicationStatics));
+    void *value{};
+    abiApplicationStatics->get_Current(&value);
+    return Application{value, take_ownership_from_abi};
+  } else {
+    // If we don't have XAML loaded, we are not a XAML app
+    return nullptr;
+  }
 }
 
+// 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) {
+  return winrt::Windows::UI::Color{a, r, g, b};
+}
 } // namespace XAML_CPPWINRT_NAMESPACE

package/Microsoft.ReactNative.Managed/Microsoft.ReactNative.Managed.csproj

@@ -31,7 +31,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <PlatformTarget>x86</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <DebugType>full</DebugType>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -39,7 +38,6 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <PlatformTarget>x86</PlatformTarget>
-    <OutputPath>bin\x86\Release\</OutputPath>
     <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -49,7 +47,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
     <PlatformTarget>ARM64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM64\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <DebugType>full</DebugType>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -57,7 +54,6 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
     <PlatformTarget>ARM64</PlatformTarget>
-    <OutputPath>bin\ARM64\Release\</OutputPath>
     <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -67,7 +63,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <DebugType>full</DebugType>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -75,7 +70,6 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <PlatformTarget>x64</PlatformTarget>
-    <OutputPath>bin\x64\Release\</OutputPath>
     <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>

package/Mso/activeObject/activeObject.h

@@ -56,7 +56,7 @@ struct ActiveObjectMakePolicy {
   static const bool IsNoExcept{true};
 
   template <typename T, typename TMemoryGuard, typename... TArgs>
-  static void Make(TMemoryGuard &memoryGuard, TArgs &&... args) noexcept;
+  static void Make(TMemoryGuard &memoryGuard, TArgs &&...args) noexcept;
 };
 
 //! Custom deleter to call Finalize() or FinalizeSync() from the associated queue.
@@ -159,7 +159,7 @@ struct ActiveObjectBase : IUnknown {
 //=============================================================================================
 
 template <typename T, typename TMemoryGuard, typename... TArgs>
-/*static*/ void ActiveObjectMakePolicy::Make(TMemoryGuard &memoryGuard, TArgs &&... args) noexcept {
+/*static*/ void ActiveObjectMakePolicy::Make(TMemoryGuard &memoryGuard, TArgs &&...args) noexcept {
   memoryGuard.Obj = ::new (memoryGuard.ObjMemory) T{std::forward<TArgs>(args)...};
   memoryGuard.ObjMemory = nullptr; // Memory is now controlled by the object. Set to null to avoid memory destruction.
 

package/Mso/compilerAdapters/cppMacros.h

@@ -29,11 +29,9 @@
   Make the macro act like a statement.
 */
 #ifndef __GNUC__
-#define Statement(x)                                                   \
-  __pragma(warning(push)) __pragma(warning(disable : 4127 25037)) do { \
-    x;                                                                 \
-  }                                                                    \
-  while (0)                                                            \
+#define Statement(x)                                                        \
+  __pragma(warning(push)) __pragma(warning(disable : 4127 25037)) do { x; } \
+  while (0)                                                                 \
   __pragma(warning(pop))
 #else
 #define Statement(x) \