react-native-windows 0.0.0-canary.708 → 0.0.0-canary.709

package/Microsoft.ReactNative/Fabric/Composition/CompositionContextHelper.h

@@ -2,17 +2,28 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "Composition.CompositionContextHelper.g.h"
+#ifdef USE_WINUI3
+#include "Composition.MicrosoftCompositionContextHelper.g.h"
+#endif
+#include "Composition.WindowsCompositionContextHelper.g.h"
 
 #include <d2d1_1.h>
 #include <windows.ui.composition.interop.h>
 #include <winrt/Windows.UI.Composition.h>
 #include "CompositionHelpers.h"
 
+namespace winrt::Microsoft::ReactNative::Composition {
+#ifdef USE_WINUI3
+using CompositionContextHelper = MicrosoftCompositionContextHelper;
+#else
+using CompositionContextHelper = WindowsCompositionContextHelper;
+#endif
+} // namespace winrt::Microsoft::ReactNative::Composition
+
 namespace winrt::Microsoft::ReactNative::Composition::implementation {
 
-struct CompositionContextHelper : CompositionContextHelperT<CompositionContextHelper> {
-  CompositionContextHelper() = default;
+struct WindowsCompositionContextHelper : WindowsCompositionContextHelperT<WindowsCompositionContextHelper> {
+  WindowsCompositionContextHelper() = default;
 
   static ICompositionContext CreateContext(winrt::Windows::UI::Composition::Compositor const &compositor) noexcept;
   static IVisual CreateVisual(winrt::Windows::UI::Composition::Visual const &visual) noexcept;
@@ -23,11 +34,32 @@ struct CompositionContextHelper : CompositionContextHelperT<CompositionContextHe
   static winrt::Windows::UI::Composition::ICompositionSurface InnerSurface(IDrawingSurfaceBrush surface) noexcept;
 };
 
+#ifdef USE_WINUI3
+struct MicrosoftCompositionContextHelper : MicrosoftCompositionContextHelperT<MicrosoftCompositionContextHelper> {
+  MicrosoftCompositionContextHelper() = default;
+
+  static ICompositionContext CreateContext(winrt::Microsoft::UI::Composition::Compositor const &compositor) noexcept;
+  static IVisual CreateVisual(winrt::Microsoft::UI::Composition::Visual const &visual) noexcept;
+  static winrt::Microsoft::UI::Composition::Compositor InnerCompositor(ICompositionContext context) noexcept;
+  static winrt::Microsoft::UI::Composition::Visual InnerVisual(IVisual visual) noexcept;
+  static winrt::Microsoft::UI::Composition::DropShadow InnerDropShadow(IDropShadow shadow) noexcept;
+  static winrt::Microsoft::UI::Composition::CompositionBrush InnerBrush(IBrush brush) noexcept;
+  static winrt::Microsoft::UI::Composition::ICompositionSurface InnerSurface(IDrawingSurfaceBrush surface) noexcept;
+};
+#endif
+
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation
 
 namespace winrt::Microsoft::ReactNative::Composition::factory_implementation {
 
-struct CompositionContextHelper
-    : CompositionContextHelperT<CompositionContextHelper, implementation::CompositionContextHelper> {};
+struct WindowsCompositionContextHelper : WindowsCompositionContextHelperT<
+                                             WindowsCompositionContextHelper,
+                                             implementation::WindowsCompositionContextHelper> {};
+
+#ifdef USE_WINUI3
+struct MicrosoftCompositionContextHelper : MicrosoftCompositionContextHelperT<
+                                               MicrosoftCompositionContextHelper,
+                                               implementation::MicrosoftCompositionContextHelper> {};
+#endif
 
 } // namespace winrt::Microsoft::ReactNative::Composition::factory_implementation

package/Microsoft.ReactNative/Fabric/Composition/CompositionContextHelper_emptyimpl.cpp

@@ -1,40 +1,79 @@
 
 #include "pch.h"
 #include "CompositionContextHelper.h"
-#if __has_include("Composition.CompositionContextHelper.g.cpp")
-#include "Composition.CompositionContextHelper.g.cpp"
+#if __has_include("Composition.WindowsCompositionContextHelper.g.cpp")
+#include "Composition.WindowsCompositionContextHelper.g.cpp"
+#endif
+#ifdef USE_WINUI3
+#if __has_include("Composition.MicrosoftCompositionContextHelper.g.cpp")
+#include "Composition.MicrosoftCompositionContextHelper.g.cpp"
+#endif
 #endif
 
 namespace winrt::Microsoft::ReactNative::Composition::implementation {
 
-ICompositionContext CompositionContextHelper::CreateContext(
+ICompositionContext WindowsCompositionContextHelper::CreateContext(
+    winrt::Windows::UI::Composition::Compositor const &) noexcept {
+  return nullptr;
+}
+
+IVisual WindowsCompositionContextHelper::CreateVisual(winrt::Windows::UI::Composition::Visual const &) noexcept {
+  return nullptr;
+}
+
+winrt::Windows::UI::Composition::Compositor WindowsCompositionContextHelper::InnerCompositor(
+    ICompositionContext) noexcept {
+  return nullptr;
+}
+
+winrt::Windows::UI::Composition::Visual WindowsCompositionContextHelper::InnerVisual(IVisual) noexcept {
+  return nullptr;
+}
+
+winrt::Windows::UI::Composition::DropShadow WindowsCompositionContextHelper::InnerDropShadow(IDropShadow) noexcept {
+  return nullptr;
+}
+
+winrt::Windows::UI::Composition::CompositionBrush WindowsCompositionContextHelper::InnerBrush(IBrush) noexcept {
+  return nullptr;
+}
+
+winrt::Windows::UI::Composition::ICompositionSurface WindowsCompositionContextHelper::InnerSurface(
+    IDrawingSurfaceBrush) noexcept {
+  return nullptr;
+}
+
+#ifdef USE_WINUI3
+ICompositionContext MicrosoftCompositionContextHelper::CreateContext(
     winrt::Windows::UI::Composition::Compositor const &) noexcept {
   return nullptr;
 }
 
-IVisual CompositionContextHelper::CreateVisual(winrt::Windows::UI::Composition::Visual const &) noexcept {
+IVisual MicrosoftCompositionContextHelper::CreateVisual(winrt::Windows::UI::Composition::Visual const &) noexcept {
   return nullptr;
 }
 
-winrt::Windows::UI::Composition::Compositor CompositionContextHelper::InnerCompositor(ICompositionContext) noexcept {
+winrt::Windows::UI::Composition::Compositor MicrosoftCompositionContextHelper::InnerCompositor(
+    ICompositionContext) noexcept {
   return nullptr;
 }
 
-winrt::Windows::UI::Composition::Visual CompositionContextHelper::InnerVisual(IVisual) noexcept {
+winrt::Windows::UI::Composition::Visual MicrosoftCompositionContextHelper::InnerVisual(IVisual) noexcept {
   return nullptr;
 }
 
-winrt::Windows::UI::Composition::DropShadow CompositionContextHelper::InnerDropShadow(IDropShadow) noexcept {
+winrt::Windows::UI::Composition::DropShadow MicrosoftCompositionContextHelper::InnerDropShadow(IDropShadow) noexcept {
   return nullptr;
 }
 
-winrt::Windows::UI::Composition::CompositionBrush CompositionContextHelper::InnerBrush(IBrush) noexcept {
+winrt::Windows::UI::Composition::CompositionBrush MicrosoftCompositionContextHelper::InnerBrush(IBrush) noexcept {
   return nullptr;
 }
 
-winrt::Windows::UI::Composition::ICompositionSurface CompositionContextHelper::InnerSurface(
+winrt::Windows::UI::Composition::ICompositionSurface MicrosoftCompositionContextHelper::InnerSurface(
     IDrawingSurfaceBrush) noexcept {
   return nullptr;
 }
+#endif
 
 } // namespace winrt::Microsoft::ReactNative::Composition::implementation

package/Microsoft.ReactNative/Fabric/Composition/CompositionHelpers.h

@@ -12,29 +12,55 @@ namespace Microsoft::ReactNative {
 namespace Composition {
 
 // Windows composition specific interface to extract the inner composition object
-MSO_STRUCT_GUID(ICompositionVisual, "2F7F7E82-0BEA-4Cf8-9531-E81338754187")
-struct ICompositionVisual : public IUnknown {
+MSO_STRUCT_GUID(IWindowsCompositionVisual, "2F7F7E82-0BEA-4Cf8-9531-E81338754187")
+struct IWindowsCompositionVisual : public IUnknown {
   virtual winrt::Windows::UI::Composition::Visual InnerVisual() const noexcept = 0;
 };
 
 // Windows composition specific interface to extract the inner composition shadow object
-MSO_STRUCT_GUID(ICompositionDropShadow, "C6474C79-B99A-4312-8FE6-7BC0C9594E5C")
-struct ICompositionDropShadow : public IUnknown {
+MSO_STRUCT_GUID(IWindowsCompositionDropShadow, "C6474C79-B99A-4312-8FE6-7BC0C9594E5C")
+struct IWindowsCompositionDropShadow : public IUnknown {
   virtual winrt::Windows::UI::Composition::DropShadow InnerShadow() const noexcept = 0;
 };
 
 // Windows composition specific interface to extract the inner composition brush object
-MSO_STRUCT_GUID(ICompositionBrush, "CFD63CA2-856E-4D5D-B2E2-68B982407051")
-struct ICompositionBrush : public IUnknown {
+MSO_STRUCT_GUID(IWindowsCompositionBrush, "CFD63CA2-856E-4D5D-B2E2-68B982407051")
+struct IWindowsCompositionBrush : public IUnknown {
   virtual winrt::Windows::UI::Composition::CompositionBrush InnerBrush() const noexcept = 0;
 };
 
 // Windows composition specific interface to extract the drawing surface object
-MSO_STRUCT_GUID(ICompositionDrawingSurfaceInner, "985963C3-1133-43CA-BAD2-AC4C893C3A1F")
-struct ICompositionDrawingSurfaceInner : public IUnknown {
+MSO_STRUCT_GUID(IWindowsCompositionDrawingSurfaceInner, "985963C3-1133-43CA-BAD2-AC4C893C3A1F")
+struct IWindowsCompositionDrawingSurfaceInner : public IUnknown {
   virtual winrt::Windows::UI::Composition::ICompositionSurface Inner() const noexcept = 0;
 };
 
+#ifdef USE_WINUI3
+// Microsoft composition specific interface to extract the inner composition object
+MSO_STRUCT_GUID(IMicrosoftCompositionVisual, "FF8731D8-8AFA-4F6F-9E76-7F538F3C1157")
+struct IMicrosoftCompositionVisual : public IUnknown {
+  virtual winrt::Microsoft::UI::Composition::Visual InnerVisual() const noexcept = 0;
+};
+
+// Microsoft composition specific interface to extract the inner composition shadow object
+MSO_STRUCT_GUID(IMicrosoftCompositionDropShadow, "78E94CC1-8E8A-4CF7-9301-23305FFC97A2")
+struct IMicrosoftCompositionDropShadow : public IUnknown {
+  virtual winrt::Microsoft::UI::Composition::DropShadow InnerShadow() const noexcept = 0;
+};
+
+// Microsoft composition specific interface to extract the inner composition brush object
+MSO_STRUCT_GUID(IMicrosoftCompositionBrush, "831CA206-B777-4660-88BC-19EB78045E40")
+struct IMicrosoftCompositionBrush : public IUnknown {
+  virtual winrt::Microsoft::UI::Composition::CompositionBrush InnerBrush() const noexcept = 0;
+};
+
+// Microsoft composition specific interface to extract the drawing surface object
+MSO_STRUCT_GUID(IMicrosoftCompositionDrawingSurfaceInner, "4ADDC62F-51D0-4C71-8BE4-3256E628D07A")
+struct IMicrosoftCompositionDrawingSurfaceInner : public IUnknown {
+  virtual winrt::Microsoft::UI::Composition::ICompositionSurface Inner() const noexcept = 0;
+};
+#endif
+
 } // namespace Composition
 
 bool CheckForDeviceRemoved(HRESULT hr);

package/Microsoft.ReactNative/Fabric/Composition/CompositionHwndHost.cpp

@@ -61,7 +61,8 @@ void CompositionHwndHost::Initialize(uint64_t hwnd) noexcept {
 
   m_compRootView.ScaleFactor(ScaleFactor());
   m_compRootView.RootVisual(
-      winrt::Microsoft::ReactNative::Composition::implementation::CompositionContextHelper::CreateVisual(RootVisual()));
+      winrt::Microsoft::ReactNative::Composition::implementation::WindowsCompositionContextHelper::CreateVisual(
+          RootVisual()));
 
   UpdateSize();
 }
@@ -149,7 +150,7 @@ winrt::Windows::UI::Composition::Compositor CompositionHwndHost::Compositor() co
       winrt::Microsoft::ReactNative::Composition::implementation::CompositionUIService::GetCompositionContext(
           m_reactViewHost.ReactNativeHost().InstanceSettings().Properties());
 
-  return winrt::Microsoft::ReactNative::Composition::implementation::CompositionContextHelper::InnerCompositor(
+  return winrt::Microsoft::ReactNative::Composition::implementation::WindowsCompositionContextHelper::InnerCompositor(
       compositionContext);
 }
 

package/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.cpp

@@ -1207,14 +1207,13 @@ CompositionBaseComponentView::supplementalComponentDescriptorProviders() noexcep
 
 comp::CompositionPropertySet CompositionBaseComponentView::EnsureCenterPointPropertySet() noexcept {
   if (m_centerPropSet == nullptr) {
-    auto compositor =
-        winrt::Microsoft::ReactNative::Composition::implementation::CompositionContextHelper::InnerCompositor(
-            m_compContext);
-
-    m_centerPropSet = compositor.CreatePropertySet();
-    UpdateCenterPropertySet();
-    m_centerPropSet.InsertMatrix4x4(L"transform", winrt::Windows::Foundation::Numerics::float4x4::identity());
-    m_centerPropSet.InsertVector3(L"translation", {0, 0, 0});
+    if (auto compositor =
+            winrt::Microsoft::ReactNative::Composition::CompositionContextHelper::InnerCompositor(m_compContext)) {
+      m_centerPropSet = compositor.CreatePropertySet();
+      UpdateCenterPropertySet();
+      m_centerPropSet.InsertMatrix4x4(L"transform", winrt::Windows::Foundation::Numerics::float4x4::identity());
+      m_centerPropSet.InsertVector3(L"translation", {0, 0, 0});
+    }
   }
 
   return m_centerPropSet;
@@ -1253,15 +1252,15 @@ void CompositionBaseComponentView::EnsureTransformMatrixFacade() noexcept {
   m_hasTransformMatrixFacade = true;
 
   auto centerPointPropSet = EnsureCenterPointPropertySet();
-  // TODO cache expression instead of creating new ones all the time
-  auto expression =
-      winrt::Microsoft::ReactNative::Composition::implementation::CompositionContextHelper::InnerCompositor(
-          m_compContext)
-          .CreateExpressionAnimation(
-              L"Matrix4x4.CreateFromScale(PS.dpiScale3Inv) * Matrix4x4.CreateFromTranslation(PS.translation) * PS.transform * Matrix4x4.CreateFromScale(PS.dpiScale3)");
-  expression.SetReferenceParameter(L"PS", centerPointPropSet);
-  winrt::Microsoft::ReactNative::Composition::implementation::CompositionContextHelper::InnerVisual(OuterVisual())
-      .StartAnimation(L"TransformMatrix", expression);
+  if (auto compositor =
+          winrt::Microsoft::ReactNative::Composition::CompositionContextHelper::InnerCompositor(m_compContext)) {
+    // TODO cache expression instead of creating new ones all the time
+    auto expression = compositor.CreateExpressionAnimation(
+        L"Matrix4x4.CreateFromScale(PS.dpiScale3Inv) * Matrix4x4.CreateFromTranslation(PS.translation) * PS.transform * Matrix4x4.CreateFromScale(PS.dpiScale3)");
+    expression.SetReferenceParameter(L"PS", centerPointPropSet);
+    winrt::Microsoft::ReactNative::Composition::CompositionContextHelper::InnerVisual(OuterVisual())
+        .StartAnimation(L"TransformMatrix", expression);
+  }
 }
 
 facebook::react::SharedViewEventEmitter CompositionBaseComponentView::eventEmitter() noexcept {

package/Microsoft.ReactNative/Modules/Animated/NativeAnimatedNodeManager.cpp

@@ -46,8 +46,7 @@ comp::Compositor NativeAnimatedNodeManager::Compositor() const noexcept {
       winrt::Microsoft::ReactNative::Composition::implementation::CompositionUIService::GetCompositionContext(
           m_context.Properties().Handle());
   if (compositionContext) {
-    return winrt::Microsoft::ReactNative::Composition::implementation::CompositionContextHelper::InnerCompositor(
-        compositionContext);
+    return winrt::Microsoft::ReactNative::Composition::CompositionContextHelper::InnerCompositor(compositionContext);
   }
 #endif
 #ifndef CORE_ABI

package/Microsoft.ReactNative/Modules/Animated/PropsAnimatedNode.cpp

@@ -181,9 +181,8 @@ void PropsAnimatedNode::StartAnimations() {
             view.m_element.RotationAxis(m_rotationAxis);
 #ifdef USE_FABRIC
           } else {
-            auto visual =
-                winrt::Microsoft::ReactNative::Composition::implementation::CompositionContextHelper::InnerVisual(
-                    view.m_componentView->Visual());
+            auto visual = winrt::Microsoft::ReactNative::Composition::CompositionContextHelper::InnerVisual(
+                view.m_componentView->Visual());
             visual.RotationAxis(m_rotationAxis);
 #endif
           }
@@ -393,7 +392,7 @@ void PropsAnimatedNode::StartAnimation(
     view.m_element.StartAnimation(animation);
 #ifdef USE_FABRIC
   } else if (view.m_componentView) {
-    auto visual = winrt::Microsoft::ReactNative::Composition::implementation::CompositionContextHelper::InnerVisual(
+    auto visual = winrt::Microsoft::ReactNative::Composition::CompositionContextHelper::InnerVisual(
         view.m_componentView->Visual());
     if (visual) {
       auto targetProp = animation.Target();

package/Microsoft.ReactNative/Modules/DeviceInfoModule.cpp

@@ -6,7 +6,9 @@
 #include <DesktopWindowBridge.h>
 #include <IReactDispatcher.h>
 #include <IReactPropertyBag.h>
+#ifndef USE_WINUI3
 #include <UI.Xaml.Hosting.DesktopWindowXamlSource.h>
+#endif
 #include <Utils/Helpers.h>
 #include <XamlUIService.h>
 #include <XamlUtils.h>