react-native-windows 0.81.1 → 0.82.0-preview.1

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

@@ -39,7 +39,6 @@ KeyRoutedEventArgs::KeyRoutedEventArgs(
   m_key = static_cast<winrt::Windows::System::VirtualKey>(wParam);
 }
 
-#ifdef USE_WINUI3
 KeyRoutedEventArgs::KeyRoutedEventArgs(
     facebook::react::Tag tag,
     winrt::Microsoft::UI::Input::KeyEventArgs const &args,
@@ -54,7 +53,6 @@ KeyRoutedEventArgs::KeyRoutedEventArgs(
   m_keyStatus.IsKeyReleased = keyStatus.IsKeyReleased;
   m_key = args.VirtualKey();
 }
-#endif
 
 int32_t KeyRoutedEventArgs::OriginalSource() noexcept {
   return m_tag;
@@ -103,7 +101,6 @@ CharacterReceivedRoutedEventArgs::CharacterReceivedRoutedEventArgs(
   m_keyStatus.IsKeyReleased = (lParam & 0x80000000) >> 31; // bit 31
 }
 
-#ifdef USE_WINUI3
 CharacterReceivedRoutedEventArgs::CharacterReceivedRoutedEventArgs(
     facebook::react::Tag tag,
     winrt::Microsoft::UI::Input::CharacterReceivedEventArgs const &args,
@@ -118,7 +115,6 @@ CharacterReceivedRoutedEventArgs::CharacterReceivedRoutedEventArgs(
   m_keyStatus.IsKeyReleased = keyStatus.IsKeyReleased;
   m_keycode = args.KeyCode();
 }
-#endif
 
 int32_t CharacterReceivedRoutedEventArgs::OriginalSource() noexcept {
   return m_tag;
@@ -151,10 +147,8 @@ uint32_t Pointer::PointerId() const noexcept {
   return m_id;
 }
 
-#ifdef USE_WINUI3
 PointerPointProperties::PointerPointProperties(const winrt::Microsoft::UI::Input::PointerPointProperties &ppp)
     : m_sysPointerPointProps(ppp) {}
-#endif
 
 PointerPointProperties::PointerPointProperties(
     bool isBarrelButtonPressed,
@@ -199,196 +193,150 @@ PointerPointProperties::PointerPointProperties(
       m_yTilt(yTilt) {}
 
 winrt::Windows::Foundation::Rect PointerPointProperties::ContactRect() noexcept {
-#ifdef USE_WINUI3
   return m_sysPointerPointProps.ContactRect();
-#else
-  assert(false);
-  return {};
-#endif
 }
 
 bool PointerPointProperties::IsBarrelButtonPressed() noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPointProps) {
     return m_sysPointerPointProps.IsBarrelButtonPressed();
   }
-#endif
   return m_isBarrelButtonPressed;
 }
 
 bool PointerPointProperties::IsCanceled() noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPointProps) {
     return m_sysPointerPointProps.IsCanceled();
   }
-#endif
   return m_isCanceled;
 }
 
 bool PointerPointProperties::IsEraser() noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPointProps) {
     return m_sysPointerPointProps.IsEraser();
   }
-#endif
   return m_isEraser;
 }
 
 bool PointerPointProperties::IsHorizontalMouseWheel() noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPointProps) {
     return m_sysPointerPointProps.IsHorizontalMouseWheel();
   }
-#endif
   return m_isHorizontalMouseWheel;
 }
 
 bool PointerPointProperties::IsInRange() noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPointProps) {
     return m_sysPointerPointProps.IsInRange();
   }
-#endif
   return m_isInRange;
 }
 
 bool PointerPointProperties::IsInverted() noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPointProps) {
     return m_sysPointerPointProps.IsInverted();
   }
-#endif
   return m_isInverted;
 }
 
 bool PointerPointProperties::IsLeftButtonPressed() noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPointProps) {
     return m_sysPointerPointProps.IsLeftButtonPressed();
   }
-#endif
   return m_isLeftButtonPressed;
 }
 
 bool PointerPointProperties::IsMiddleButtonPressed() noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPointProps) {
     return m_sysPointerPointProps.IsMiddleButtonPressed();
   }
-#endif
   return m_isMiddleButtonPressed;
 }
 
 bool PointerPointProperties::IsPrimary() noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPointProps) {
     return m_sysPointerPointProps.IsPrimary();
   }
-#endif
   return m_isPrimary;
 }
 
 bool PointerPointProperties::IsRightButtonPressed() noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPointProps) {
     return m_sysPointerPointProps.IsRightButtonPressed();
   }
-#endif
   return m_isRightButtonPressed;
 }
 
 bool PointerPointProperties::IsXButton1Pressed() noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPointProps) {
     return m_sysPointerPointProps.IsXButton1Pressed();
   }
-#endif
   return m_isXButton1Pressed;
 }
 
 bool PointerPointProperties::IsXButton2Pressed() noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPointProps) {
     return m_sysPointerPointProps.IsXButton2Pressed();
   }
-#endif
   return m_isXButton2Pressed;
 }
 
 int32_t PointerPointProperties::MouseWheelDelta() noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPointProps) {
     return m_sysPointerPointProps.MouseWheelDelta();
   }
-#endif
   return m_mouseWheelDelta;
 }
 
 float PointerPointProperties::Orientation() noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPointProps) {
     return m_sysPointerPointProps.Orientation();
   }
-#endif
   return m_orientation;
 }
 
 PointerUpdateKind PointerPointProperties::PointerUpdateKind() noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPointProps) {
     return static_cast<winrt::Microsoft::ReactNative::Composition::Input::PointerUpdateKind>(
         m_sysPointerPointProps.PointerUpdateKind());
   }
-#endif
   return m_pointerUpdateKind;
 }
 
 float PointerPointProperties::Pressure() noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPointProps) {
     return m_sysPointerPointProps.Pressure();
   }
-#endif
   return m_pressure;
 }
 
 bool PointerPointProperties::TouchConfidence() noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPointProps) {
     return m_sysPointerPointProps.TouchConfidence();
   }
-#endif
   return m_touchConfidence;
 }
 
 float PointerPointProperties::Twist() noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPointProps) {
     return m_sysPointerPointProps.Twist();
   }
-#endif
   return m_twist;
 }
 
 float PointerPointProperties::XTilt() noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPointProps) {
     return m_sysPointerPointProps.XTilt();
   }
-#endif
   return m_xTilt;
 }
 
 float PointerPointProperties::YTilt() noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPointProps) {
     return m_sysPointerPointProps.YTilt();
   }
-#endif
   return m_yTilt;
 }
 
-#ifdef USE_WINUI3
 PointerPoint::PointerPoint(const winrt::Microsoft::UI::Input::PointerPoint &pp, float scaleFactor)
     : m_sysPointerPoint(pp), m_scaleFactor(scaleFactor), m_offset({0, 0}) {}
 
@@ -397,7 +345,6 @@ PointerPoint::PointerPoint(
     float scaleFactor,
     const winrt::Windows::Foundation::Point &offset)
     : m_sysPointerPoint(pp), m_scaleFactor(scaleFactor), m_offset(offset) {}
-#endif
 
 PointerPoint::PointerPoint(
     HWND hwnd,
@@ -418,30 +365,24 @@ PointerPoint::PointerPoint(HWND hwnd, uint32_t msg, uint64_t wParam, int64_t lPa
     : PointerPoint(hwnd, msg, wParam, lParam, scaleFactor, {0, 0}) {}
 
 uint32_t PointerPoint::FrameId() const noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPoint) {
     return m_sysPointerPoint.FrameId();
   }
-#endif
   return m_pi.frameId;
 }
 
 bool PointerPoint::IsInContact() const noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPoint) {
     return m_sysPointerPoint.IsInContact();
   }
-#endif
   return ((m_pi.pointerFlags & POINTER_FLAG_INCONTACT) == POINTER_FLAG_INCONTACT);
 }
 
 winrt::Microsoft::ReactNative::Composition::Input::PointerDeviceType PointerPoint::PointerDeviceType() const noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPoint) {
     return static_cast<winrt::Microsoft::ReactNative::Composition::Input::PointerDeviceType>(
         m_sysPointerPoint.PointerDeviceType());
   }
-#endif
 
   if (m_pi.pointerId) {
     switch (m_pi.pointerType) {
@@ -462,21 +403,17 @@ winrt::Microsoft::ReactNative::Composition::Input::PointerDeviceType PointerPoin
 }
 
 uint32_t PointerPoint::PointerId() const noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPoint) {
     return m_sysPointerPoint.PointerId();
   }
-#endif
   return (m_pi.pointerId ? m_pi.pointerId : 1 /* MOUSE */);
 }
 
 winrt::Windows::Foundation::Point PointerPoint::Position() const noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPoint) {
     auto pos = m_sysPointerPoint.Position();
     return {pos.X - (m_offset.X / m_scaleFactor), pos.Y - (m_offset.Y / m_scaleFactor)};
   }
-#endif
 
   assert(m_hwnd);
   POINT clientPoint{
@@ -491,11 +428,9 @@ winrt::Windows::Foundation::Point PointerPoint::Position() const noexcept {
 }
 
 winrt::Microsoft::ReactNative::Composition::Input::PointerPointProperties PointerPoint::Properties() const noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPoint) {
     return winrt::make<PointerPointProperties>(m_sysPointerPoint.Properties());
   }
-#endif
 
   if (m_pi.pointerId) {
     auto pointerUpdateKind = winrt::Microsoft::ReactNative::Composition::Input::PointerUpdateKind::Other;
@@ -613,21 +548,17 @@ winrt::Microsoft::ReactNative::Composition::Input::PointerPointProperties Pointe
 }
 
 uint64_t PointerPoint::Timestamp() const noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPoint) {
     return m_sysPointerPoint.Timestamp();
   }
-#endif
   return m_pi.dwTime;
 }
 
 winrt::Microsoft::ReactNative::Composition::Input::PointerPoint PointerPoint::GetOffsetPoint(
     const winrt::Windows::Foundation::Point &offset) const noexcept {
-#ifdef USE_WINUI3
   if (m_sysPointerPoint) {
     return winrt::make<PointerPoint>(m_sysPointerPoint, m_scaleFactor, offset);
   }
-#endif
   return winrt::make<PointerPoint>(m_hwnd, m_msg, m_wParam, m_lParam, m_scaleFactor, offset);
 }
 

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

@@ -9,11 +9,9 @@
 #include <ReactContext.h>
 #include <react/renderer/core/ReactPrimitives.h>
 #include <winrt/Microsoft.ReactNative.Composition.Input.h>
+#include <winrt/Microsoft.UI.Input.h>
 #include <winrt/Windows.System.h>
 #include <winrt/Windows.UI.Input.h>
-#ifdef USE_WINUI3
-#include <winrt/Microsoft.UI.Input.h>
-#endif
 
 namespace winrt::Microsoft::ReactNative::Composition::Input::implementation {
 
@@ -27,12 +25,10 @@ struct KeyRoutedEventArgs : winrt::implements<
       uint64_t wParam,
       int64_t lParam,
       const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source);
-#ifdef USE_WINUI3
   KeyRoutedEventArgs(
       facebook::react::Tag tag,
       winrt::Microsoft::UI::Input::KeyEventArgs const &args,
       const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source);
-#endif
 
   int32_t OriginalSource() noexcept;
   winrt::hstring DeviceId() noexcept;
@@ -62,12 +58,10 @@ struct CharacterReceivedRoutedEventArgs
       uint64_t wParam,
       int64_t lParam,
       const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source);
-#ifdef USE_WINUI3
   CharacterReceivedRoutedEventArgs(
       facebook::react::Tag tag,
       winrt::Microsoft::UI::Input::CharacterReceivedEventArgs const &args,
       const winrt::Microsoft::ReactNative::Composition::Input::KeyboardSource &source);
-#endif
 
   int32_t OriginalSource() noexcept;
   bool Handled() noexcept;
@@ -96,9 +90,7 @@ struct Pointer : PointerT<Pointer> {
 };
 
 struct PointerPointProperties : PointerPointPropertiesT<PointerPointProperties> {
-#ifdef USE_WINUI3
   PointerPointProperties(const winrt::Microsoft::UI::Input::PointerPointProperties &ppp);
-#endif
 
   PointerPointProperties(
       bool isBarrelButtonPressed,
@@ -145,9 +137,7 @@ struct PointerPointProperties : PointerPointPropertiesT<PointerPointProperties>
   float YTilt() noexcept;
 
  private:
-#ifdef USE_WINUI3
   winrt::Microsoft::UI::Input::PointerPointProperties m_sysPointerPointProps{nullptr};
-#endif
 
   // When not using m_sysPointerPointProps
   bool m_isBarrelButtonPressed : 1;
@@ -173,13 +163,11 @@ struct PointerPointProperties : PointerPointPropertiesT<PointerPointProperties>
 };
 
 struct PointerPoint : PointerPointT<PointerPoint> {
-#ifdef USE_WINUI3
   PointerPoint(const winrt::Microsoft::UI::Input::PointerPoint &pp, float scaleFactor);
   PointerPoint(
       const winrt::Microsoft::UI::Input::PointerPoint &pp,
       float scaleFactor,
       const winrt::Windows::Foundation::Point &offset);
-#endif
   PointerPoint(HWND hwnd, uint32_t msg, uint64_t wParam, int64_t lParam, float scaleFactor);
   PointerPoint(
       HWND hwnd,
@@ -204,9 +192,7 @@ struct PointerPoint : PointerPointT<PointerPoint> {
   bool IsPointerMessage(uint32_t message) const noexcept;
 
   // Windows::Input
-#ifdef USE_WINUI3
   winrt::Microsoft::UI::Input::PointerPoint m_sysPointerPoint{nullptr};
-#endif
   // Non Windows::Input
   HWND m_hwnd;
   // WM_POINTER*

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

@@ -8,11 +8,8 @@
 namespace winrt::Microsoft::ReactNative::implementation {
 
 CompositionAnnotationProvider::CompositionAnnotationProvider(
-    const winrt::Microsoft::ReactNative::Composition::ComponentView &componentView,
-    CompositionDynamicAutomationProvider *parentProvider) noexcept
-    : m_view{componentView} {
-  m_parentProvider.copy_from(parentProvider);
-}
+    const winrt::Microsoft::ReactNative::Composition::ComponentView &componentView) noexcept
+    : m_view{componentView} {}
 HRESULT __stdcall CompositionAnnotationProvider::get_AnnotationTypeId(int *retVal) {
   if (retVal == nullptr)
     return E_POINTER;

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

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <Fabric/Composition/CompositionDynamicAutomationProvider.h>
 #include <Fabric/Composition/CompositionViewComponentView.h>
 #include <Fabric/ReactTaggedView.h>
 #include <UIAutomation.h>
@@ -12,8 +11,7 @@ namespace winrt::Microsoft::ReactNative::implementation {
 class CompositionAnnotationProvider : public winrt::implements<CompositionAnnotationProvider, IAnnotationProvider> {
  public:
   CompositionAnnotationProvider(
-      const winrt::Microsoft::ReactNative::Composition::ComponentView &componentView,
-      CompositionDynamicAutomationProvider *parentProvider) noexcept;
+      const winrt::Microsoft::ReactNative::Composition::ComponentView &componentView) noexcept;
 
   // inherited via IAnnotationProvider
   virtual HRESULT __stdcall get_AnnotationTypeId(int *retVal) override;
@@ -25,7 +23,6 @@ class CompositionAnnotationProvider : public winrt::implements<CompositionAnnota
  private:
   ::Microsoft::ReactNative::ReactTaggedView m_view;
   winrt::com_ptr<IAnnotationProvider> m_annotationProvider;
-  winrt::com_ptr<CompositionDynamicAutomationProvider> m_parentProvider;
 };
 
 } // namespace winrt::Microsoft::ReactNative::implementation

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

@@ -5,11 +5,9 @@
 #if __has_include("Composition.Experimental.SystemCompositionContextHelper.g.cpp")
 #include "Composition.Experimental.SystemCompositionContextHelper.g.cpp"
 #endif
-#ifdef USE_WINUI3
 #if __has_include("Composition.Experimental.MicrosoftCompositionContextHelper.g.cpp")
 #include "Composition.Experimental.MicrosoftCompositionContextHelper.g.cpp"
 #endif
-#endif
 
 #include <Windows.Graphics.Interop.h>
 #include <windows.ui.composition.interop.h>
@@ -19,11 +17,9 @@
 #include <winrt/Windows.UI.Composition.interactions.h>
 #include "CompositionHelpers.h"
 
-#ifdef USE_WINUI3
 #include <winrt/Microsoft.UI.Composition.h>
 #include <winrt/Microsoft.UI.Composition.interactions.h>
 #include <winrt/Microsoft.UI.Composition.interop.h>
-#endif
 
 namespace Microsoft::ReactNative::Composition::Experimental {
 
@@ -102,7 +98,6 @@ struct CompositionTypeTraits<WindowsTypeTag> {
 };
 using WindowsTypeRedirects = CompositionTypeTraits<WindowsTypeTag>;
 
-#ifdef USE_WINUI3
 struct MicrosoftTypeTag;
 template <>
 struct CompositionTypeTraits<MicrosoftTypeTag> {
@@ -174,7 +169,6 @@ struct CompositionTypeTraits<MicrosoftTypeTag> {
       winrt::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompositionContextHelper;
 };
 using MicrosoftTypeRedirects = CompositionTypeTraits<MicrosoftTypeTag>;
-#endif
 
 struct GeometrySource : public winrt::implements<
                             GeometrySource,
@@ -228,9 +222,7 @@ struct CompDropShadow : public winrt::implements<
   typename TTypeRedirects::DropShadow m_shadow;
 };
 using WindowsCompDropShadow = CompDropShadow<WindowsTypeRedirects>;
-#ifdef USE_WINUI3
 using MicrosoftCompDropShadow = CompDropShadow<MicrosoftTypeRedirects>;
-#endif
 
 template <typename TTypeRedirects>
 struct CompBrush : public winrt::implements<
@@ -247,9 +239,7 @@ struct CompBrush : public winrt::implements<
   typename TTypeRedirects::CompositionBrush m_brush;
 };
 using WindowsCompBrush = CompBrush<WindowsTypeRedirects>;
-#ifdef USE_WINUI3
 using MicrosoftCompBrush = CompBrush<MicrosoftTypeRedirects>;
-#endif
 
 template <typename TTypeRedirects>
 struct CompDrawingSurfaceBrush : public winrt::implements<
@@ -328,9 +318,7 @@ struct CompDrawingSurfaceBrush : public winrt::implements<
   winrt::com_ptr<typename TTypeRedirects::ICompositionDrawingSurfaceInterop> m_drawingSurfaceInterop;
 };
 using WindowsCompDrawingSurfaceBrush = CompDrawingSurfaceBrush<WindowsTypeRedirects>;
-#ifdef USE_WINUI3
 using MicrosoftCompDrawingSurfaceBrush = CompDrawingSurfaceBrush<MicrosoftTypeRedirects>;
-#endif
 
 template <typename TTypeRedirects>
 void SetAnimationClass(
@@ -554,9 +542,7 @@ struct CompVisual : public winrt::implements<
   }
 };
 using WindowsCompVisual = CompVisual<WindowsTypeRedirects>;
-#ifdef USE_WINUI3
 using MicrosoftCompVisual = CompVisual<MicrosoftTypeRedirects>;
-#endif
 
 template <typename TTypeRedirects>
 struct CompSpriteVisual : winrt::implements<
@@ -588,9 +574,7 @@ struct CompSpriteVisual : winrt::implements<
   }
 };
 using WindowsCompSpriteVisual = CompSpriteVisual<WindowsTypeRedirects>;
-#ifdef USE_WINUI3
 using MicrosoftCompSpriteVisual = CompSpriteVisual<MicrosoftTypeRedirects>;
-#endif
 
 template <typename TTypeRedirects>
 struct CompRoundedRectangleVisual
@@ -671,9 +655,7 @@ struct CompRoundedRectangleVisual
   typename TTypeRedirects::CompositionRoundedRectangleGeometry m_geometry{nullptr};
 };
 using WindowsCompRoundedRectangleVisual = CompRoundedRectangleVisual<WindowsTypeRedirects>;
-#ifdef USE_WINUI3
 using MicrosoftCompRoundedRectangleVisual = CompRoundedRectangleVisual<MicrosoftTypeRedirects>;
-#endif
 
 struct CompScrollPositionChangedArgs
     : winrt::implements<
@@ -1415,9 +1397,7 @@ struct CompScrollerVisual : winrt::implements<
   typename TTypeRedirects::VisualInteractionSource m_visualInteractionSource{nullptr};
 };
 using WindowsCompScrollerVisual = CompScrollerVisual<WindowsTypeRedirects>;
-#ifdef USE_WINUI3
 using MicrosoftCompScrollerVisual = CompScrollerVisual<MicrosoftTypeRedirects>;
-#endif
 
 template <typename TTypeRedirects>
 struct CompActivityVisual : winrt::implements<
@@ -1905,9 +1885,7 @@ struct CompActivityVisual : winrt::implements<
   typename TTypeRedirects::SpriteVisual m_contentVisual{nullptr};
 };
 using WindowsCompActivityVisual = CompActivityVisual<WindowsTypeRedirects>;
-#ifdef USE_WINUI3
 using MicrosoftCompActivityVisual = CompActivityVisual<MicrosoftTypeRedirects>;
-#endif
 
 template <typename TTypeRedirects>
 struct CompCaretVisual : winrt::implements<
@@ -1990,13 +1968,11 @@ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual CompCaretVisua
 }
 using WindowsCompCaretVisual = CompCaretVisual<WindowsTypeRedirects>;
 
-#ifdef USE_WINUI3
 winrt::Microsoft::ReactNative::Composition::Experimental::IVisual
 CompCaretVisual<MicrosoftTypeRedirects>::CreateVisual() const noexcept {
   return winrt::make<Composition::Experimental::MicrosoftCompSpriteVisual>(m_compVisual);
 }
 using MicrosoftCompCaretVisual = CompCaretVisual<MicrosoftTypeRedirects>;
-#endif
 
 template <typename TTypeRedirects>
 struct CompFocusVisual : winrt::implements<
@@ -2061,13 +2037,11 @@ CompFocusVisual<WindowsTypeRedirects>::CreateVisual() noexcept {
 }
 using WindowsCompFocusVisual = CompFocusVisual<WindowsTypeRedirects>;
 
-#ifdef USE_WINUI3
 winrt::Microsoft::ReactNative::Composition::Experimental::IVisual
 CompFocusVisual<MicrosoftTypeRedirects>::CreateVisual() noexcept {
   return winrt::make<Composition::Experimental::MicrosoftCompSpriteVisual>(m_compVisual);
 }
 using MicrosoftCompFocusVisual = CompFocusVisual<MicrosoftTypeRedirects>;
-#endif
 
 template <typename TTypeRedirects>
 struct CompContext : winrt::implements<
@@ -2254,7 +2228,6 @@ CompContext<WindowsTypeRedirects>::CompositionGraphicsDevice() noexcept {
 
 using WindowsCompContext = CompContext<WindowsTypeRedirects>;
 
-#ifdef USE_WINUI3
 winrt::Microsoft::ReactNative::Composition::Experimental::ISpriteVisual
 CompContext<MicrosoftTypeRedirects>::CreateSpriteVisual() noexcept {
   return winrt::make<Composition::Experimental::MicrosoftCompSpriteVisual>(m_compositor.CreateSpriteVisual());
@@ -2319,7 +2292,6 @@ CompContext<MicrosoftTypeRedirects>::CompositionGraphicsDevice() noexcept {
 }
 
 using MicrosoftCompContext = CompContext<MicrosoftTypeRedirects>;
-#endif
 
 } // namespace Microsoft::ReactNative::Composition::Experimental
 
@@ -2369,7 +2341,6 @@ winrt::Windows::UI::Composition::ICompositionSurface SystemCompositionContextHel
   return s ? s->Inner() : nullptr;
 }
 
-#ifdef USE_WINUI3
 ICompositionContext MicrosoftCompositionContextHelper::CreateContext(
     winrt::Microsoft::UI::Composition::Compositor const &compositor) noexcept {
   return winrt::make<::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompContext>(compositor);
@@ -2421,6 +2392,4 @@ winrt::Microsoft::ReactNative::Composition::Experimental::IBrush MicrosoftCompos
   return winrt::make<::Microsoft::ReactNative::Composition::Experimental::MicrosoftCompBrush>(brush);
 }
 
-#endif
-
 } // namespace winrt::Microsoft::ReactNative::Composition::Experimental::implementation

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

@@ -2,9 +2,7 @@
 // Licensed under the MIT License.
 #pragma once
 
-#ifdef USE_WINUI3
 #include "Composition.Experimental.MicrosoftCompositionContextHelper.g.h"
-#endif
 #include "Composition.Experimental.SystemCompositionContextHelper.g.h"
 
 #include <d2d1_1.h>
@@ -13,11 +11,7 @@
 #include "CompositionHelpers.h"
 
 namespace winrt::Microsoft::ReactNative::Composition::Experimental {
-#ifdef USE_WINUI3
 using CompositionContextHelper = MicrosoftCompositionContextHelper;
-#else
-using CompositionContextHelper = SystemCompositionContextHelper;
-#endif
 } // namespace winrt::Microsoft::ReactNative::Composition::Experimental
 
 namespace winrt::Microsoft::ReactNative::Composition::Experimental::implementation {
@@ -34,7 +28,6 @@ struct SystemCompositionContextHelper : SystemCompositionContextHelperT<SystemCo
   static winrt::Windows::UI::Composition::ICompositionSurface InnerSurface(IDrawingSurfaceBrush surface) noexcept;
 };
 
-#ifdef USE_WINUI3
 struct MicrosoftCompositionContextHelper : MicrosoftCompositionContextHelperT<MicrosoftCompositionContextHelper> {
   MicrosoftCompositionContextHelper() = default;
 
@@ -48,7 +41,6 @@ struct MicrosoftCompositionContextHelper : MicrosoftCompositionContextHelperT<Mi
 
   static IBrush WrapBrush(const winrt::Microsoft::UI::Composition::CompositionBrush &brush) noexcept;
 };
-#endif
 
 } // namespace winrt::Microsoft::ReactNative::Composition::Experimental::implementation
 
@@ -58,10 +50,8 @@ struct SystemCompositionContextHelper
     : SystemCompositionContextHelperT<SystemCompositionContextHelper, implementation::SystemCompositionContextHelper> {
 };
 
-#ifdef USE_WINUI3
 struct MicrosoftCompositionContextHelper : MicrosoftCompositionContextHelperT<
                                                MicrosoftCompositionContextHelper,
                                                implementation::MicrosoftCompositionContextHelper> {};
-#endif
 
 } // namespace winrt::Microsoft::ReactNative::Composition::Experimental::factory_implementation

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

@@ -4,11 +4,9 @@
 #if __has_include("Composition.Experimental.SystemCompositionContextHelper.g.cpp")
 #include "Composition.Experimental.SystemCompositionContextHelper.g.cpp"
 #endif
-#ifdef USE_WINUI3
 #if __has_include("Composition.Experimental.MicrosoftCompositionContextHelper.g.cpp")
 #include "Composition.Experimental.MicrosoftCompositionContextHelper.g.cpp"
 #endif
-#endif
 
 namespace winrt::Microsoft::ReactNative::Composition::Experimental::implementation {
 
@@ -43,7 +41,6 @@ winrt::Windows::UI::Composition::ICompositionSurface SystemCompositionContextHel
   return nullptr;
 }
 
-#ifdef USE_WINUI3
 ICompositionContext MicrosoftCompositionContextHelper::CreateContext(
     winrt::Microsoft::UI::Composition::Compositor const &) noexcept {
   return nullptr;
@@ -74,6 +71,5 @@ winrt::Microsoft::UI::Composition::ICompositionSurface MicrosoftCompositionConte
     IDrawingSurfaceBrush) noexcept {
   return nullptr;
 }
-#endif
 
 } // namespace winrt::Microsoft::ReactNative::Composition::Experimental::implementation