Fabric: simplify border code, and fix some border issues (#10659)

* Fabric: fix zorder issues * Change files * Fabric: simplify border code, and fix some border issues * change file * rename const * format
microsoft · Sep 30, 2022 · d6dd444 · d6dd444
1 parent b6a91f6
commit d6dd444
Show file tree

Hide file tree

Showing 5 changed files with 148 additions and 130 deletions.
diff --git a/change/react-native-windows-f017b5c1-bf44-4a8f-b996-203d619e5329.json b/change/react-native-windows-f017b5c1-bf44-4a8f-b996-203d619e5329.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Fabric: simplify border code, and fix some border issues",
+  "packageName": "react-native-windows",
+  "email": "30809111+acoates-ms@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}
diff --git a/vnext/Microsoft.ReactNative/CompositionSwitcher.idl b/vnext/Microsoft.ReactNative/CompositionSwitcher.idl
@@ -53,6 +53,7 @@ namespace Microsoft.ReactNative.Composition
     void Size(Windows.Foundation.Numerics.Vector2 size);
     void Offset(Windows.Foundation.Numerics.Vector3 offset);
     void Offset(Windows.Foundation.Numerics.Vector3 offset, Windows.Foundation.Numerics.Vector3 relativeAdjustment);
+    void RelativeSizeWithOffset(Windows.Foundation.Numerics.Vector2 size, Windows.Foundation.Numerics.Vector2 relativeSizeAdjustment);
   }
 
   [webhosthidden]

diff --git a/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionContextHelper.cpp b/vnext/Microsoft.ReactNative/Fabric/Composition/CompositionContextHelper.cpp
@@ -230,6 +230,13 @@ struct CompVisual : public winrt::implements<
     m_visual.RelativeOffsetAdjustment(relativeAdjustment);
   }
 
+  void RelativeSizeWithOffset(
+      winrt::Windows::Foundation::Numerics::float2 size,
+      winrt::Windows::Foundation::Numerics::float2 relativeSizeAdjustment) noexcept {
+    m_visual.Size(size);
+    m_visual.RelativeSizeAdjustment(relativeSizeAdjustment);
+  }
+
  private:
   winrt::Windows::UI::Composition::Visual m_visual;
 };
@@ -305,6 +312,13 @@ struct CompSpriteVisual : winrt::Microsoft::ReactNative::Composition::implementa
     m_visual.RelativeOffsetAdjustment(relativeAdjustment);
   }
 
+  void RelativeSizeWithOffset(
+      winrt::Windows::Foundation::Numerics::float2 size,
+      winrt::Windows::Foundation::Numerics::float2 relativeSizeAdjustment) noexcept {
+    m_visual.Size(size);
+    m_visual.RelativeSizeAdjustment(relativeSizeAdjustment);
+  }
+
   void SetClippingPath(ID2D1Geometry *clippingPath) noexcept {
     if (!clippingPath) {
       m_visual.Clip(nullptr);
@@ -478,6 +492,13 @@ struct CompScrollerVisual : winrt::Microsoft::ReactNative::Composition::implemen
     m_visual.RelativeOffsetAdjustment(relativeAdjustment);
   }
 
+  void RelativeSizeWithOffset(
+      winrt::Windows::Foundation::Numerics::float2 size,
+      winrt::Windows::Foundation::Numerics::float2 relativeSizeAdjustment) noexcept {
+    m_visual.Size(size);
+    m_visual.RelativeSizeAdjustment(relativeSizeAdjustment);
+  }
+
   void SetClippingPath(ID2D1Geometry *clippingPath) noexcept {
     auto geometry = winrt::make<GeometrySource>(clippingPath);
     auto path = winrt::Windows::UI::Composition::CompositionPath(geometry);