From e48a59f21ffc3063769626a76f639218048e324e Mon Sep 17 00:00:00 2001
From: Rafael Rosa <rafaelmendesrosa@gmail.com>
Date: Thu, 24 Aug 2023 17:27:38 -0300
Subject: [PATCH 1/9] chore: add Ellipse and Rectangle Fill

(cherry picked from commit 5601122cdc639e8932bbdfede2e2f341b9bc654e)
---
 ...hadowContainerRectangleTestPage.WinUI.xaml | 73 ++++++++++++++++
 ...owContainerRectangleTestPage.WinUI.xaml.cs | 75 ++++++++++++++++
 .../ShadowContainerTestPage.WinUI.xaml        | 43 ++++++++--
 .../ShadowContainerTestPage.WinUI.xaml.cs     | 31 ++++++-
 .../Uno.Toolkit.Samples.Shared.projitems      |  2 +-
 ...olkit.WinUI.Samples.Windows.Desktop.csproj |  4 +
 src/Uno.Toolkit.UITest/Constants.cs           |  2 +-
 .../ShadowContainer/Given_ShadowContainer.cs  | 85 +++++++++++++++----
 8 files changed, 288 insertions(+), 27 deletions(-)
 create mode 100644 samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerRectangleTestPage.WinUI.xaml
 create mode 100644 samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerRectangleTestPage.WinUI.xaml.cs

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerRectangleTestPage.WinUI.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerRectangleTestPage.WinUI.xaml
new file mode 100644
index 000000000..28a626f72
--- /dev/null
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerRectangleTestPage.WinUI.xaml
@@ -0,0 +1,73 @@
+<Page x:Class="Uno.Toolkit.Samples.Content.TestPages.ShadowContainerRectangleTestPage"
+	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	  xmlns:local="using:Uno.Toolkit.Samples.Content.TestPages"
+	  xmlns:utu="using:Uno.Toolkit.UI"
+	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	  mc:Ignorable="d"
+	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+	<Grid Background="Yellow"
+		  RowSpacing="10">
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto" />
+			<RowDefinition Height="Auto" />
+		</Grid.RowDefinitions>
+
+		<StackPanel HorizontalAlignment="Center"
+					VerticalAlignment="Center">
+			<Border x:Name="outerBorder"
+					Background="Blue"
+					Padding="10"
+					Height="220"
+					Width="220">
+				<utu:ShadowContainer x:Name="shadowContainer">
+					<Rectangle Width="200"
+							Height="200"
+							x:Name="border"
+							Fill="Green" />
+				</utu:ShadowContainer>
+			</Border>
+		</StackPanel>
+
+		<StackPanel Spacing="10"
+					Grid.Row="1"
+					Orientation="Horizontal"
+					VerticalAlignment="Center"
+					HorizontalAlignment="Center">
+
+			<StackPanel HorizontalAlignment="Center"
+						VerticalAlignment="Center">
+				<TextBlock Text="Current Case"
+						   FontWeight="Bold"
+						   FontSize="20" />
+				<StackPanel Orientation="Horizontal"
+							VerticalAlignment="Center">
+					<TextBlock Text="X Offset:" />
+					<TextBox x:Name="xOffsetText" />
+				</StackPanel>
+				<StackPanel Orientation="Horizontal"
+							VerticalAlignment="Center">
+					<TextBlock Text="Y Offset:" />
+					<TextBox x:Name="yOffsetText" />
+				</StackPanel>
+				<StackPanel Orientation="Horizontal">
+					<CheckBox Content="Inner"
+							  x:Name="inner" />
+				</StackPanel>
+			</StackPanel>
+
+			<Button Content="Run Test Case"
+					x:Name="runButton"
+					Click="runButton_Click" />
+			<Button Content="Reset"
+					x:Name="resetButton"
+					Click="reset_Click" />
+			<TextBlock x:Name="statusText"
+					   VerticalAlignment="Center" />
+
+
+		</StackPanel>
+	</Grid>
+</Page>
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerRectangleTestPage.WinUI.xaml.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerRectangleTestPage.WinUI.xaml.cs
new file mode 100644
index 000000000..0c6046bbf
--- /dev/null
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerRectangleTestPage.WinUI.xaml.cs
@@ -0,0 +1,75 @@
+#if IS_WINUI
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Uno.Toolkit.Samples.Entities;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+using Microsoft.UI;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+
+namespace Uno.Toolkit.Samples.Content.TestPages
+{
+	/// <summary>
+	/// An empty page that can be used on its own or navigated to within a Frame.
+	/// </summary>
+
+	[SamplePage(SampleCategory.Tests, "ShadowContainerRectangleTest")]
+	public sealed partial class ShadowContainerRectangleTestPage : Page
+	{
+		public ShadowContainerRectangleTestPage()
+		{
+			this.InitializeComponent();
+		}
+
+		private void runButton_Click(object sender, RoutedEventArgs e)
+		{
+			statusText.Text = "Running";
+			shadowContainer.Shadows.Clear();
+
+			if (!int.TryParse(xOffsetText.Text, out var xOffset))
+			{
+				xOffset = 0;
+			}
+
+			if (!int.TryParse(yOffsetText.Text, out var yOffset))
+			{
+				yOffset = 0;
+			}
+
+			var isInner = inner.IsChecked ?? false;
+
+			shadowContainer.Shadows.Add(new UI.Shadow
+			{
+				OffsetX = xOffset,
+				OffsetY = yOffset,
+				IsInner = isInner,
+				Opacity = 1,
+				Color = Colors.Red,
+			});
+
+			statusText.Text = "Verify";
+		}
+
+		private void reset_Click(object sender, RoutedEventArgs e)
+		{
+			statusText.Text = string.Empty;
+
+			xOffsetText.Text = string.Empty;
+			yOffsetText.Text = string.Empty;
+			inner.IsChecked = false;
+
+			shadowContainer.Shadows.Clear();
+		}
+	}
+}
+#endif
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml
index 3bc5136eb..6d42b70c2 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml
@@ -8,29 +8,49 @@
 	  mc:Ignorable="d"
 	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
-	<Grid Background="Yellow"
-		  RowSpacing="10">
+	<Grid RowSpacing="10">
 		<Grid.RowDefinitions>
 			<RowDefinition Height="Auto" />
 			<RowDefinition Height="Auto" />
 		</Grid.RowDefinitions>
 
 		<StackPanel HorizontalAlignment="Center"
-					VerticalAlignment="Center">
+					VerticalAlignment="Center"
+					x:Name="containerBorder">
 			<Border x:Name="outerBorder"
 					Background="Blue"
 					Padding="10"
 					Height="220"
 					Width="220">
-				<utu:ShadowContainer x:Name="shadowContainer"
-									 Background="Green">
-					<Border Width="200"
+				<utu:ShadowContainer x:Name="shadowContainer">
+						<Border Width="200"
 							Height="200"
-							x:Name="border" />
+							x:Name="border"
+							Background="Green"/>
 				</utu:ShadowContainer>
 			</Border>
+		
 		</StackPanel>
 
+		<StackPanel HorizontalAlignment="Center"
+					VerticalAlignment="Center"
+					x:Name="containerRectangle"
+					Visibility="Collapsed">
+			<Border x:Name="outerBorderRetangle"
+					Background="Blue"
+					Padding="10"
+					Height="220"
+					Width="220">
+				<utu:ShadowContainer x:Name="shadowContainerRectangle">
+
+					<Rectangle Width="200"
+							Height="200"
+							x:Name="rectangle"
+							Fill="Green"/>
+
+				</utu:ShadowContainer>
+			</Border>
+		</StackPanel>
 		<StackPanel Spacing="10"
 					Grid.Row="1"
 					Orientation="Horizontal"
@@ -56,6 +76,15 @@
 					<CheckBox Content="Inner"
 							  x:Name="inner" />
 				</StackPanel>
+				<StackPanel Orientation="Vertical">
+
+					<TextBlock Text="Border"/>
+					<RadioButton GroupName="RadioGroup" Content="Border" x:Name="check_Border" Click="Border_ClickElement" />
+
+					<TextBlock Text="Rectangle"/>
+					<RadioButton GroupName="RadioGroup" Content="Rectangle" x:Name="check_Rectangle" Click="Rectangle_ClickElement" />
+
+				</StackPanel>
 			</StackPanel>
 
 			<Button Content="Run Test Case"
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml.cs
index a4d936f4b..6b4de007b 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml.cs
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml.cs
@@ -7,6 +7,7 @@
 using Uno.Toolkit.Samples.Entities;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
 
 using Microsoft.UI;
 using Microsoft.UI.Xaml;
@@ -35,7 +36,8 @@ private void runButton_Click(object sender, RoutedEventArgs e)
 		{
 			statusText.Text = "Running";
 			shadowContainer.Shadows.Clear();
-
+			shadowContainerRectangle.Shadows.Clear();
+			
 			if (!int.TryParse(xOffsetText.Text, out var xOffset))
 			{
 				xOffset = 0;
@@ -57,6 +59,15 @@ private void runButton_Click(object sender, RoutedEventArgs e)
 				Color = Colors.Red,
 			});
 
+			shadowContainerRectangle.Shadows.Add(new UI.Shadow
+			{
+				OffsetX = xOffset,
+				OffsetY = yOffset,
+				IsInner = isInner,
+				Opacity = 1,
+				Color = Colors.Red,
+			});
+
 			statusText.Text = "Verify";
 		}
 
@@ -67,9 +78,27 @@ private void reset_Click(object sender, RoutedEventArgs e)
 			xOffsetText.Text = string.Empty;
 			yOffsetText.Text = string.Empty;
 			inner.IsChecked = false;
+			check_Border.IsChecked = true;
 
 			shadowContainer.Shadows.Clear();
+			shadowContainerRectangle.Shadows.Clear();
+			containerRectangle.Visibility = Visibility.Collapsed;
+			containerBorder.Visibility = Visibility.Visible;
 		}
+
+		private void Border_ClickElement(object sender, RoutedEventArgs e)
+		{
+			containerRectangle.Visibility = Visibility.Collapsed;
+			containerBorder.Visibility = Visibility.Visible;
+
+		}
+		private void Rectangle_ClickElement(object sender, RoutedEventArgs e)
+		{
+			containerRectangle.Visibility = Visibility.Visible;
+			containerBorder.Visibility = Visibility.Collapsed;
+		}
+
+
 	}
 }
 #endif
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Uno.Toolkit.Samples.Shared.projitems b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Uno.Toolkit.Samples.Shared.projitems
index 001dfb279..8d8ea65b4 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Uno.Toolkit.Samples.Shared.projitems
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Uno.Toolkit.Samples.Shared.projitems
@@ -532,4 +532,4 @@
     <Content Include="$(MSBuildThisFileDirectory)Assets\Media\SmallMedia.scale-400.png" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\UnoLogo.png" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj
index d602cd5da..aa814b578 100644
--- a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj
+++ b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj
@@ -38,4 +38,8 @@
 
 	<Import Project="..\..\Uno.Toolkit.Samples\Uno.Toolkit.Samples.Shared\Uno.Toolkit.Samples.Shared.projitems" Label="Shared" />
 
+	<ItemGroup>
+	  <Page Remove="C:\Work\uno.toolkit.ui\samples\Uno.Toolkit.Samples\Uno.Toolkit.Samples.Shared\Content\TestPages\ShadowContainerRectangleTestPage.WinUI.xaml" />
+	</ItemGroup>
+
 </Project>
diff --git a/src/Uno.Toolkit.UITest/Constants.cs b/src/Uno.Toolkit.UITest/Constants.cs
index 86cf91e6c..6f666ecd1 100644
--- a/src/Uno.Toolkit.UITest/Constants.cs
+++ b/src/Uno.Toolkit.UITest/Constants.cs
@@ -11,7 +11,7 @@ public class Constants
 	{
 		public readonly static string WebAssemblyDefaultUri = "http://localhost:59402/";
 		public readonly static string iOSAppName = "com.nventive.Uno.Toolkit.Samples";
-		public readonly static string AndroidAppName = "Uno.Toolkit.Samples";
+		public readonly static string AndroidAppName = "uno.platform.toolkit";
 		public readonly static string iOSDeviceNameOrId = "iPad Pro (12.9-inch) (5th generation)";
 
 		public readonly static Platform CurrentPlatform = Platform.Android;
diff --git a/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer.cs b/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer.cs
index c1734e75b..2d7f9ab25 100644
--- a/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer.cs
+++ b/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer.cs
@@ -4,6 +4,7 @@
 using System.Drawing;
 using Uno.Toolkit.UITest.Extensions;
 using Uno.Toolkit.UITest.Framework;
+using Uno.UITest;
 using Uno.UITest.Helpers;
 using Uno.UITest.Helpers.Queries;
 
@@ -14,6 +15,10 @@ public class Given_ShadowContainer : TestBase
 	{
 		protected override string SampleName => "ShadowContainerTest";
 
+		const string Red = "#FF0000";
+		const string Blue = "#0000FF";
+		const string Green = "#008000";
+
 		[Test]
 		[TestCase(10, 10, false)]
 		[TestCase(10, 10, false)]
@@ -26,31 +31,79 @@ public class Given_ShadowContainer : TestBase
 		[TestCase(10, -10, false)]
 		public void When_Shadows(int xOffset, int yOffset, bool inner)
 		{
-			const string Red = "#FF0000";
-			const string Blue = "#0000FF";
-			const string Green = "#008000";
 
 			var shadowContainer = App.WaitForElementWithMessage("shadowContainer");
 			var runButton = App.MarkedAnywhere("runButton");
+			var resetButton = App.MarkedAnywhere("resetButton");
+			
+
 			var statusText = App.MarkedAnywhere("statusText");
+			var shadowRect = App.GetPhysicalRect("shadowContainer");
+			App.MarkedAnywhere("xOffsetText").ClearText().EnterTextAndDismiss(xOffset.ToString());
+			App.MarkedAnywhere("yOffsetText").ClearText().EnterTextAndDismiss(yOffset.ToString());
+
+			App.Tap("check_Border");
+			var innerCheck = App.MarkedAnywhere("inner");
+			innerCheck.SetDependencyPropertyValue("IsChecked", inner.ToString());
+			App.WaitForDependencyPropertyValue(innerCheck, "IsChecked", inner);
+
+			runButton.FastTap();
+
+			App.WaitForDependencyPropertyValue<string>(statusText, "Text", "Verify");
+			var outerBorderRect = App.GetPhysicalRect("outerBorder");
+			var elementRect = App.GetPhysicalRect("border");
+
+			Check_Assert(outerBorderRect, elementRect, xOffset, yOffset, inner);
+
+			resetButton.FastTap();
+
+		}
 
 
+		[Test]
+		[TestCase(10, 10, false)]
+		[TestCase(10, 10, false)]
+		[TestCase(10, 10, true)]
+		[TestCase(-10, -10, false)]
+		[TestCase(-10, -10, true)]
+		[TestCase(-10, 10, true)]
+		[TestCase(10, -10, true)]
+		[TestCase(-10, 10, false)]
+		[TestCase(10, -10, false)]
+		public void When_RectangleShadows(int xOffset, int yOffset, bool inner)
+		{
+
+			var shadowContainer = App.WaitForElementWithMessage("shadowContainer");
+			App.Tap("check_Rectangle");
+			shadowContainer = App.WaitForElementWithMessage("shadowContainerRectangle");
+			var runButton = App.MarkedAnywhere("runButton");
+			var resetButton = App.MarkedAnywhere("resetButton");
+
+			var statusText = App.MarkedAnywhere("statusText");
+			var shadowRect = App.GetPhysicalRect("shadowContainerRectangle");
 			App.MarkedAnywhere("xOffsetText").ClearText().EnterTextAndDismiss(xOffset.ToString());
 			App.MarkedAnywhere("yOffsetText").ClearText().EnterTextAndDismiss(yOffset.ToString());
-			var innerCheck = App.MarkedAnywhere("inner");
 
+			var innerCheck = App.MarkedAnywhere("inner");
 			innerCheck.SetDependencyPropertyValue("IsChecked", inner.ToString());
 			App.WaitForDependencyPropertyValue(innerCheck, "IsChecked", inner);
 
 			runButton.FastTap();
 
 			App.WaitForDependencyPropertyValue<string>(statusText, "Text", "Verify");
-			var outerBorderRect = App.GetPhysicalRect("outerBorder");
-			var borderRect = App.GetPhysicalRect("border");
-			var shadowRect = App.GetPhysicalRect("shadowContainer");
+			var outerBorderRect = App.GetPhysicalRect("outerBorderRetangle");
+			var elementRect = App.GetPhysicalRect("rectangle");
+
+			Check_Assert(outerBorderRect, elementRect, xOffset, yOffset, inner);
+			resetButton.FastTap();
+
+		}
 
-			var caseName = $"Shadow_x{xOffset}_y{yOffset}{(inner ? "_Inner" : "_Outer")}";
 
+		public void Check_Assert(IAppRect outerBorderRect, IAppRect borderRect, int xOffset, int yOffset, bool inner)
+		{
+
+			var caseName = $"Shadow_x{xOffset}_y{yOffset}{(inner ? "_Inner" : "_Outer")}";
 			using var screenshot = TakeScreenshot(caseName);
 
 
@@ -58,20 +111,18 @@ public void When_Shadows(int xOffset, int yOffset, bool inner)
 			var xStart = xOffset < 0 ? (int)outerBorderRect.X : (int)outerBorderRect.Right;
 			var yStart = yOffset < 0 ? (int)outerBorderRect.Y : (int)outerBorderRect.Bottom;
 
+			int currentX = 1;
+			int currentY = 1;
+			
 			int absXOffset = Math.Abs(xOffset);
 			int absYOffset = Math.Abs(yOffset);
 
-			int currentX = absXOffset * 2;
-			int currentY = absYOffset * 2;
-
 			while (currentX < absXOffset || currentY < absYOffset)
 			{
-				var outerTestRect = outerBorderRect;
-
-				var leftOuterTestPoint = new Point((int)outerTestRect.X + currentX, (int)outerTestRect.CenterY);
-				var topOuterTestPoint = new Point((int)outerTestRect.CenterX, (int)outerTestRect.Y + currentY);
-				var rightOuterTestPoint = new Point((int)outerTestRect.Right - currentX, (int)outerTestRect.CenterY);
-				var bottomOuterTestPoint = new Point((int)outerTestRect.CenterX, (int)outerTestRect.Bottom - currentY);
+				var leftOuterTestPoint = new Point((int)outerBorderRect.X + currentX, (int)outerBorderRect.CenterY);
+				var topOuterTestPoint = new Point((int)outerBorderRect.CenterX, (int)outerBorderRect.Y + currentY);
+				var rightOuterTestPoint = new Point((int)outerBorderRect.Right - currentX, (int)outerBorderRect.CenterY);
+				var bottomOuterTestPoint = new Point((int)outerBorderRect.CenterX, (int)outerBorderRect.Bottom - currentY);
 
 				var leftInnerTestPoint = new Point((int)borderRect.X + currentX, (int)borderRect.CenterY);
 				var topInnerTestPoint = new Point((int)borderRect.CenterX, (int)borderRect.Y + currentY);

From b35d83cdef0b6c6ba08d3d3e57a842468feff3fd Mon Sep 17 00:00:00 2001
From: Rafael Rosa <rafaelmendesrosa@gmail.com>
Date: Tue, 29 Aug 2023 16:09:41 -0300
Subject: [PATCH 2/9] chore: add corner radius

(cherry picked from commit a5aa053ff1ed53059b8a430b906ef077009b913d)
---
 .../ShadowContainerSamplePage.WinUI.xaml      | 48 +++++++++++++++++++
 .../Controls/Shadows/ShadowContainer.cs       | 11 ++++-
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml
index ed74e1d6e..af3538a3c 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml
@@ -81,6 +81,22 @@
 						Spread="0"
 						Color="#8c76ff" />
 		</utu:ShadowCollection>
+		<utu:ShadowCollection x:Key="InnerShadows">
+			<utu:Shadow BlurRadius="30"
+						OffsetX="5"
+						OffsetY="5"
+						Opacity="1"
+						Spread="-5"
+						IsInner="True"
+						Color="#f85977"/>
+			<utu:Shadow BlurRadius="30"
+						OffsetX="-5"
+						OffsetY="-5"
+						Opacity="1"
+						Spread="-5"
+						IsInner="True"
+						Color="#67e5ad"/>
+		</utu:ShadowCollection>
 	</Page.Resources>
 
 	<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
@@ -203,6 +219,38 @@
 							</StackPanel>
 
 							<StackPanel>
+
+								<utu:ShadowContainer Margin="0,60,0,0"
+														 Background="{StaticResource UnoColor}"
+														 Shadows="{StaticResource NeumorphismBulging}">
+									<Rectangle Height="100"
+									   Width="100"
+									   
+									   RadiusX="50" 
+									   RadiusY="50" />
+								</utu:ShadowContainer>
+								
+								<utu:ShadowContainer Margin="0,60,0,0"
+														 Background="{StaticResource UnoColor}"
+														 Shadows="{StaticResource NeumorphismBulging}">
+									<Ellipse Height="100"
+											   Width="100"/>
+								</utu:ShadowContainer>
+
+
+								<utu:ShadowContainer Background="LightGray" Shadows="{StaticResource InnerShadows}">
+									<Rectangle Height="100"
+										   Width="100"
+										   RadiusX="50" 
+										   RadiusY="50" />	
+								</utu:ShadowContainer>
+
+								<TextBlock Text="Ellipse" Foreground="Black" />
+								<utu:ShadowContainer Background="LightGray" Shadows="{StaticResource InnerShadows}">
+									<Ellipse Height="100"
+										   Width="100" />
+								</utu:ShadowContainer>
+								
 								<TextBlock Text="Enable neumorphism" Style="{StaticResource TitleTextBlockStyle}" />
 								<TextBlock Text="Being able to add several shadows enables you to create neumorphic designs." Style="{StaticResource BodyTextBlockStyle}" />
 
diff --git a/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs b/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs
index dbd1187e6..ab018b2f2 100644
--- a/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs
+++ b/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs
@@ -392,11 +392,18 @@ private void InvalidateShadows(bool force = false)
 			Border border => border.CornerRadius,
 			Grid grid => grid.CornerRadius,
 			StackPanel stackpanel => stackpanel.CornerRadius,
+			Rectangle border => new CornerRadius(border.RadiusY == 0 ? 0 : (border.RadiusX / border.RadiusY) * (border.Width > border.Height ? border.Width : border.Height)),
+			Ellipse ellipse => new CornerRadius(ellipse.Height == 0 ? 0 : (ellipse.Width / ellipse.Height / 2) * (ellipse.Width > ellipse.Height ? ellipse.Width : ellipse.Height)),
 
 			Shape => null,
-			DependencyObject @do => @do.FindDependencyPropertyUsingReflection<CornerRadius>("CornerRadiusProperty") is { } dp
+			DependencyObject @do =>
+				@do.FindDependencyPropertyUsingReflection<CornerRadius>("CornerRadiusProperty") is { } dp
 				? (CornerRadius)@do.GetValue(dp)
-				: null,
+				:
+					//@do.FindDependencyPropertyUsingReflection<CornerRadius>("RadiusXProperty") is { } radiusX
+					//? (CornerRadius)new CornerRadius((double)@do.GetValue(radiusX))
+					//:
+				null,
 			_ => null,
 		};
 	}

From bf915588042fede335b396e661ad9aff523fd4d1 Mon Sep 17 00:00:00 2001
From: xiaoy312 <xiaoyao312@gmail.com>
Date: Tue, 29 Aug 2023 18:29:31 -0400
Subject: [PATCH 3/9] chore: fix ellipse & rectangle shadow shape

(cherry picked from commit db080c0b8a4e14d365a9934fb7cd7257ac66e95d)
---
 .../Controls/Shadows/ShadowContainer.Paint.cs | 52 +++++++++++++------
 .../Controls/Shadows/ShadowContainer.cs       | 43 ++++++++-------
 2 files changed, 60 insertions(+), 35 deletions(-)

diff --git a/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.Paint.cs b/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.Paint.cs
index 063b4513f..708e270e1 100644
--- a/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.Paint.cs
+++ b/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.Paint.cs
@@ -133,19 +133,21 @@ private void OnSurfacePainted(object? sender, SKPaintSurfaceEventArgs e)
 		};
 	}
 
-	private IShadowShapeContext GetShadowShapeContext(object? content)
+	private IShadowShapeContext GetShadowShapeContext(object content)
 	{
 		return content switch
 		{
-			FrameworkElement fe => new RectangularShadowShapeContext(fe.ActualWidth, fe.ActualHeight, GetCornerRadiusFor(Content) ?? default),
+			// any dp used here, beside width/height that is covered by SizeChanged, needs to register for dp changed in: BindToPaintingProperties\BindToContent()
+			Ellipse ellipse => new RadiusXYRectShadowShapeContext(ellipse.ActualWidth, ellipse.ActualHeight, ellipse.ActualWidth / 2, ellipse.ActualHeight / 2),
+			Rectangle rect => new RadiusXYRectShadowShapeContext(rect.ActualWidth, rect.ActualHeight, rect.RadiusX, rect.RadiusY),
+			FrameworkElement fe => new CornerRadiusRectShadowShapeContext(fe.ActualWidth, fe.ActualHeight, GetCornerRadiusFor(Content) ?? default),
 
-			null => RectangularShadowShapeContext.Empty,
 			_ => throw new NotSupportedException($"Unsupported content type: {content.GetType().Name}"),
 		};
 	}
 
 	/// <summary>
-	/// Serves both as a record of states relevant to shadow shape, and the implementations for painting the shadows
+	/// Serves both as a record of states relevant to shadow shape (not <see cref="Shape"/>, but in the broad sense), and the implementations for painting the shadows.
 	/// </summary>
 	private interface IShadowShapeContext
 	{
@@ -158,17 +160,9 @@ private interface IShadowShapeContext
 		void DrawInnerShadow(ShadowPaintState state, SKCanvas canvas, SKPaint paint, ShadowInfo shadow);
 	}
 
-	private record RectangularShadowShapeContext(double ContentWidth, double ContentHeight, CornerRadius CornerRadius) : IShadowShapeContext
+	private abstract record RoundRectShadowShapeContext(double Width, double Height) : IShadowShapeContext
 	{
-		public static readonly RectangularShadowShapeContext Empty = new(0, 0, default);
-
-		private SKRoundRect GetContentShape(ShadowPaintState state)
-		{
-			var rect = new SKRect(0, 0, (float)ContentWidth * state.PixelRatio, (float)ContentHeight * state.PixelRatio);
-			var shape = new SKRoundRect(rect, (float)CornerRadius.BottomRight * state.PixelRatio);
-
-			return shape;
-		}
+		protected abstract SKRoundRect GetContentShape(ShadowPaintState state);
 
 		public void ClipToContent(ShadowPaintState state, SKCanvas canvas)
 		{
@@ -231,7 +225,6 @@ public void DrawDropShadow(ShadowPaintState state, SKCanvas canvas, SKPaint pain
 
 		public void DrawInnerShadow(ShadowPaintState state, SKCanvas canvas, SKPaint paint, ShadowInfo shadow)
 		{
-			var cornerRadius = (float)CornerRadius.BottomRight * state.PixelRatio;
 			var spread = (float)shadow.Spread * state.PixelRatio;
 			var offsetX = (float)shadow.OffsetX * state.PixelRatio;
 			var offsetY = (float)shadow.OffsetY * state.PixelRatio;
@@ -253,12 +246,39 @@ public void DrawInnerShadow(ShadowPaintState state, SKCanvas canvas, SKPaint pai
 
 			if (_logger.IsEnabled(LogLevel.Trace))
 			{
-				_logger.Trace($"[ShadowContainer] DrawInnerShadow => strokeWidth: {paint.StrokeWidth}, cornerRadius: {cornerRadius}, x: {offsetX}, y: {offsetY}, width: {shape.Rect.Width}, height: {shape.Rect.Height}");
+				_logger.Trace($"[ShadowContainer] DrawInnerShadow => strokeWidth: {paint.StrokeWidth}, x: {offsetX}, y: {offsetY}, width: {shape.Rect.Width}, height: {shape.Rect.Height}");
 			}
 			canvas.DrawRoundRect(shape, paint);
 		}
 	}
 
+	private record CornerRadiusRectShadowShapeContext(double Width, double Height, CornerRadius CornerRadius) : RoundRectShadowShapeContext(Width, Height)
+	{
+		protected override SKRoundRect GetContentShape(ShadowPaintState state)
+		{
+			var rect = new SKRect(0, 0, (float)Width * state.PixelRatio, (float)Height * state.PixelRatio);
+			var radii = new[] { CornerRadius.TopLeft, CornerRadius.TopRight, CornerRadius.BottomRight, CornerRadius.BottomLeft }
+				.Select(x => (float)x * state.PixelRatio)
+				.Select(x => new SKPoint(x, x))
+				.ToArray();
+			var shape = new SKRoundRect();
+			shape.SetRectRadii(rect, radii);
+			
+			return shape;
+		}
+	}
+
+	private record RadiusXYRectShadowShapeContext(double Width, double Height, double RadiusX, double RadiusY) : RoundRectShadowShapeContext(Width, Height)
+	{
+		protected override SKRoundRect GetContentShape(ShadowPaintState state)
+		{
+			var rect = new SKRect(0, 0, (float)Width * state.PixelRatio, (float)Height * state.PixelRatio);
+			var shape = new SKRoundRect(rect, (float)RadiusX * state.PixelRatio, (float)RadiusY * state.PixelRatio);
+			
+			return shape;
+		}
+	}
+
 	/// <summary>
 	/// Record of <see cref="Shadow"/> properties at one point in time.
 	/// </summary>
diff --git a/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs b/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs
index ab018b2f2..e18828e29 100644
--- a/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs
+++ b/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs
@@ -118,10 +118,6 @@ void OnShadowPropertyChanged(object? sender, PropertyChangedEventArgs e)
 		}
 		void OnInnerPropertyChanged(DependencyObject sender, DependencyProperty dp)
 		{
-			if (sender == this && dp == CornerRadiusProperty)
-			{
-				InvalidateCanvasLayout();
-			}
 			InvalidateShadows();
 		}
 		void OnContentPropertyChanged(DependencyObject sender, DependencyProperty dp)
@@ -207,13 +203,29 @@ void BindToContent(object? content)
 		{
 			if (content is FrameworkElement contentAsFE)
 			{
-				contentAsFE.SizeChanged += OnContentSizeChanged;
 				contentNestedDisposable.Disposable = new CompositeDisposable
 				{
-					Disposable.Create(() => contentAsFE.SizeChanged -= OnContentSizeChanged),
-					GetCornerRadiusPropertyFor(content) is { } dp ? contentAsFE.RegisterDisposablePropertyChangedCallback(dp, OnContentPropertyChanged) : Disposable.Empty,
-					contentAsFE.RegisterDisposablePropertyChangedCallback(FrameworkElement.MarginProperty, OnContentPropertyChanged),
+					RegisterSizeChangedHandler(contentAsFE, OnContentSizeChanged),
+					RegisterNestedPropertyChangedSafe<FrameworkElement>(GetCornerRadiusPropertyFor(content)),
+					RegisterNestedPropertyChangedSafe<Rectangle>(Rectangle.RadiusXProperty),
+					RegisterNestedPropertyChangedSafe<Rectangle>(Rectangle.RadiusYProperty),
+					RegisterNestedPropertyChangedSafe<FrameworkElement>(FrameworkElement.MarginProperty),
 				};
+
+				static IDisposable RegisterSizeChangedHandler(FrameworkElement fe, SizeChangedEventHandler handler)
+				{
+					fe.SizeChanged += handler;
+					return Disposable.Create(() => fe.SizeChanged -= handler);
+				}
+				IDisposable RegisterNestedPropertyChangedSafe<T>(DependencyProperty? dp, DependencyPropertyChangedCallback? callback = null)
+				{
+					if (contentAsFE is T && dp is { })
+					{
+						return contentAsFE.RegisterDisposablePropertyChangedCallback(dp, callback ?? OnContentPropertyChanged);
+					}
+
+					return Disposable.Empty;
+				}
 			}
 			else
 			{
@@ -377,7 +389,7 @@ private void InvalidateShadows(bool force = false)
 			Grid => Grid.CornerRadiusProperty,
 			StackPanel => StackPanel.CornerRadiusProperty,
 
-			Shape => null,
+			Shape => null, // note: shapes have special handling, see: GetShadowShapeContext
 			DependencyObject @do => @do.FindDependencyPropertyUsingReflection<CornerRadius>("CornerRadiusProperty"),
 			_ => null,
 		};
@@ -392,18 +404,11 @@ private void InvalidateShadows(bool force = false)
 			Border border => border.CornerRadius,
 			Grid grid => grid.CornerRadius,
 			StackPanel stackpanel => stackpanel.CornerRadius,
-			Rectangle border => new CornerRadius(border.RadiusY == 0 ? 0 : (border.RadiusX / border.RadiusY) * (border.Width > border.Height ? border.Width : border.Height)),
-			Ellipse ellipse => new CornerRadius(ellipse.Height == 0 ? 0 : (ellipse.Width / ellipse.Height / 2) * (ellipse.Width > ellipse.Height ? ellipse.Width : ellipse.Height)),
 
-			Shape => null,
-			DependencyObject @do =>
-				@do.FindDependencyPropertyUsingReflection<CornerRadius>("CornerRadiusProperty") is { } dp
+			Shape => null, // note: shapes have special handling, see: GetShadowShapeContext
+			DependencyObject @do => @do.FindDependencyPropertyUsingReflection<CornerRadius>("CornerRadiusProperty") is { } dp
 				? (CornerRadius)@do.GetValue(dp)
-				:
-					//@do.FindDependencyPropertyUsingReflection<CornerRadius>("RadiusXProperty") is { } radiusX
-					//? (CornerRadius)new CornerRadius((double)@do.GetValue(radiusX))
-					//:
-				null,
+				: null,
 			_ => null,
 		};
 	}

From cabf3fd7ac7466c1ed7e2a4ae434142fe66c88b6 Mon Sep 17 00:00:00 2001
From: xiaoy312 <xiaoyao312@gmail.com>
Date: Tue, 29 Aug 2023 19:26:58 -0400
Subject: [PATCH 4/9] chore: add/update shadow samples

(cherry picked from commit d2ab764d8c791cf5ba9d56886b5dc6e915ce1009)
---
 .../ShadowContainerSamplePage.WinUI.xaml      | 103 ++++++++++--------
 .../ShadowContainerSamplePage.WinUI.xaml.cs   |  10 +-
 2 files changed, 62 insertions(+), 51 deletions(-)

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml
index af3538a3c..fb34c882c 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml
@@ -81,21 +81,9 @@
 						Spread="0"
 						Color="#8c76ff" />
 		</utu:ShadowCollection>
-		<utu:ShadowCollection x:Key="InnerShadows">
-			<utu:Shadow BlurRadius="30"
-						OffsetX="5"
-						OffsetY="5"
-						Opacity="1"
-						Spread="-5"
-						IsInner="True"
-						Color="#f85977"/>
-			<utu:Shadow BlurRadius="30"
-						OffsetX="-5"
-						OffsetY="-5"
-						Opacity="1"
-						Spread="-5"
-						IsInner="True"
-						Color="#67e5ad"/>
+		<utu:ShadowCollection x:Key="TestRedGreenShadows">
+			<utu:Shadow OffsetX="-5" OffsetY="-5"  BlurRadius="10" Spread="0" Color="Red" Opacity="1" IsInner="True" />
+			<utu:Shadow OffsetX="4" OffsetY="4" BlurRadius="10" Spread="0" Color="Green" Opacity="1" IsInner="True" />
 		</utu:ShadowCollection>
 	</Page.Resources>
 
@@ -106,6 +94,7 @@
 					<ScrollViewer HorizontalScrollMode="Disabled">
 						<StackPanel Spacing="24">
 
+							<!-- Calculator -->
 							<StackPanel>
 								<TextBlock Text="Many colored shadows" Style="{StaticResource TitleTextBlockStyle}" />
 								<TextBlock Text="You can add as many shadows as you like. You can also dynamically change the shadow properties." Style="{StaticResource BodyTextBlockStyle}" />
@@ -218,39 +207,8 @@
 								</utu:ShadowContainer>
 							</StackPanel>
 
+							<!-- Purple-ish Panel -->
 							<StackPanel>
-
-								<utu:ShadowContainer Margin="0,60,0,0"
-														 Background="{StaticResource UnoColor}"
-														 Shadows="{StaticResource NeumorphismBulging}">
-									<Rectangle Height="100"
-									   Width="100"
-									   
-									   RadiusX="50" 
-									   RadiusY="50" />
-								</utu:ShadowContainer>
-								
-								<utu:ShadowContainer Margin="0,60,0,0"
-														 Background="{StaticResource UnoColor}"
-														 Shadows="{StaticResource NeumorphismBulging}">
-									<Ellipse Height="100"
-											   Width="100"/>
-								</utu:ShadowContainer>
-
-
-								<utu:ShadowContainer Background="LightGray" Shadows="{StaticResource InnerShadows}">
-									<Rectangle Height="100"
-										   Width="100"
-										   RadiusX="50" 
-										   RadiusY="50" />	
-								</utu:ShadowContainer>
-
-								<TextBlock Text="Ellipse" Foreground="Black" />
-								<utu:ShadowContainer Background="LightGray" Shadows="{StaticResource InnerShadows}">
-									<Ellipse Height="100"
-										   Width="100" />
-								</utu:ShadowContainer>
-								
 								<TextBlock Text="Enable neumorphism" Style="{StaticResource TitleTextBlockStyle}" />
 								<TextBlock Text="Being able to add several shadows enables you to create neumorphic designs." Style="{StaticResource BodyTextBlockStyle}" />
 
@@ -351,6 +309,57 @@
 										</utu:ShadowContainer>
 									</StackPanel>
 								</StackPanel>
+							</StackPanel>
+
+							<!-- Complex Shadow Shapes -->
+							<StackPanel Spacing="8">
+								<TextBlock Text="Complex Shadow Shapes" Style="{StaticResource TitleTextBlockStyle}" />
+
+								<StackPanel>
+									<TextBlock Text="Border 200x100 CR=10,50,10,50" />
+									<StackPanel Orientation="Horizontal">
+										<Border Width="200" Height="100" CornerRadius="10,50,10,50" Background="Blue" />
+										<utu:ShadowContainer Background="Blue" Shadows="{StaticResource TestRedGreenShadows}">
+											<Border Width="200" Height="100" CornerRadius="10,50,10,50" />
+										</utu:ShadowContainer>
+									</StackPanel>
+								</StackPanel>
+								<StackPanel>
+									<TextBlock Text="Rectangle 200x100 Radius=50,20" />
+									<StackPanel Orientation="Horizontal">
+										<Rectangle Width="200" Height="100" RadiusX="50" RadiusY="20" Fill="Blue" />
+										<utu:ShadowContainer Background="Blue" Shadows="{StaticResource TestRedGreenShadows}">
+											<Rectangle Width="200" Height="100" RadiusX="50" RadiusY="20" />
+										</utu:ShadowContainer>
+									</StackPanel>
+								</StackPanel>
+								<StackPanel>
+									<TextBlock Text="Rectangle 200x100 Radius=20,20" />
+									<StackPanel Orientation="Horizontal">
+										<Rectangle Width="200" Height="100" RadiusX="20" RadiusY="20" Fill="Blue" />
+										<utu:ShadowContainer Background="Blue" Shadows="{StaticResource TestRedGreenShadows}">
+											<Rectangle Width="200" Height="100" RadiusX="20" RadiusY="20" />
+										</utu:ShadowContainer>
+									</StackPanel>
+								</StackPanel>
+								<StackPanel>
+									<TextBlock Text="Ellipse 100x100" />
+									<StackPanel Orientation="Horizontal">
+										<Ellipse Width="100" Height="100" Fill="Blue" />
+										<utu:ShadowContainer Background="Blue" Shadows="{StaticResource TestRedGreenShadows}">
+											<Ellipse Width="100" Height="100" />
+										</utu:ShadowContainer>
+									</StackPanel>
+								</StackPanel>
+								<StackPanel>
+									<TextBlock Text="Ellipse 200x100" />
+									<StackPanel Orientation="Horizontal">
+										<Ellipse Width="200" Height="100" Fill="Blue" />
+										<utu:ShadowContainer Background="Blue" Shadows="{StaticResource TestRedGreenShadows}">
+											<Ellipse Width="200" Height="100" />
+										</utu:ShadowContainer>
+									</StackPanel>
+								</StackPanel>
 
 
 							 <!--Test ShadowContainer stretching its content by default--> 
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml.cs
index 7987c7108..d404d680d 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml.cs
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml.cs
@@ -18,11 +18,13 @@ public ShadowContainerSamplePage()
 
 			this.Loaded += (s, e) =>
 			{
-				var shadowContainer = SamplePageLayout.GetSampleChild<ShadowContainer>(Design.Agnostic, "ShadowContainer");
-				_shadows = shadowContainer.Shadows;
+				if (SamplePageLayout.GetSampleChild<ShadowContainer>(Design.Agnostic, "ShadowContainer") is { } shadowContainer)
+				{
+					_shadows = shadowContainer.Shadows;
 
-				var shadowsItemsControl = SamplePageLayout.GetSampleChild<ItemsControl>(Design.Agnostic, "ShadowsItemsControl");
-				shadowsItemsControl.ItemsSource = _shadows;
+					var shadowsItemsControl = SamplePageLayout.GetSampleChild<ItemsControl>(Design.Agnostic, "ShadowsItemsControl");
+					shadowsItemsControl.ItemsSource = _shadows;
+				}
 			};
 		}
 

From 7b8dd5f29005336e2651a6b9fb038c7b5e85742f Mon Sep 17 00:00:00 2001
From: Rafael Rosa <rafaelmendesrosa@gmail.com>
Date: Wed, 30 Aug 2023 10:30:35 -0300
Subject: [PATCH 5/9] chore: fix tests

(cherry picked from commit 0c6000de2cf117e3b42b58ad371c60fef05ec000)
---
 .../TestPages/ShadowContainerTestPage.WinUI.xaml     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml
index 6d42b70c2..6857f87aa 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml
@@ -22,11 +22,11 @@
 					Padding="10"
 					Height="220"
 					Width="220">
-				<utu:ShadowContainer x:Name="shadowContainer">
+				<utu:ShadowContainer x:Name="shadowContainer"
+							Background="Green">
 						<Border Width="200"
 							Height="200"
-							x:Name="border"
-							Background="Green"/>
+							x:Name="border"/>
 				</utu:ShadowContainer>
 			</Border>
 		
@@ -41,12 +41,12 @@
 					Padding="10"
 					Height="220"
 					Width="220">
-				<utu:ShadowContainer x:Name="shadowContainerRectangle">
+				<utu:ShadowContainer x:Name="shadowContainerRectangle" 
+							Background="Green">
 
 					<Rectangle Width="200"
 							Height="200"
-							x:Name="rectangle"
-							Fill="Green"/>
+							x:Name="rectangle"/>
 
 				</utu:ShadowContainer>
 			</Border>

From 5e96ef17f0ff6b8e607a25aadc2e4f4f44b08cb4 Mon Sep 17 00:00:00 2001
From: Rafael Rosa <rafaelmendesrosa@gmail.com>
Date: Wed, 30 Aug 2023 12:10:34 -0300
Subject: [PATCH 6/9] chore: add test for irregular corner radius

(cherry picked from commit b88d27c9f4a477465be1446ff8e2deb03cbc7881)
---
 .../ShadowContainerTestPage.WinUI.xaml        |  23 ++++
 .../ShadowContainerTestPage.WinUI.xaml.cs     |  25 +++-
 .../ShadowContainer/Given_ShadowContainer.cs  | 130 ++++++++++++++++++
 3 files changed, 176 insertions(+), 2 deletions(-)

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml
index 6857f87aa..ed54670b4 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml
@@ -51,6 +51,26 @@
 				</utu:ShadowContainer>
 			</Border>
 		</StackPanel>
+
+		<StackPanel HorizontalAlignment="Center"
+					VerticalAlignment="Center"
+					x:Name="containerIrregularCorner"
+					Visibility="Collapsed">
+			<Border x:Name="outerBorderIrregularCorner"
+					Background="Blue"
+					Padding="10"
+					Height="220"
+					Width="220">
+				<utu:ShadowContainer x:Name="shadowContainerIrregularCorner" 
+							Background="Green">
+
+					<Border Width="200"
+							Height="200"
+							CornerRadius="0,200,0,200"
+							x:Name="borderIrregularCorner"/>
+				</utu:ShadowContainer>
+			</Border>
+		</StackPanel>
 		<StackPanel Spacing="10"
 					Grid.Row="1"
 					Orientation="Horizontal"
@@ -84,6 +104,9 @@
 					<TextBlock Text="Rectangle"/>
 					<RadioButton GroupName="RadioGroup" Content="Rectangle" x:Name="check_Rectangle" Click="Rectangle_ClickElement" />
 
+					<TextBlock Text="Irrelugar Corner Radius"/>
+					<RadioButton GroupName="RadioGroup" Content="Irrelugar Corner Radius" x:Name="check_IrregularCorner" Click="IrregularCorner_ClickElement" />
+
 				</StackPanel>
 			</StackPanel>
 
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml.cs
index 6b4de007b..e5224d3a5 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml.cs
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml.cs
@@ -37,7 +37,8 @@ private void runButton_Click(object sender, RoutedEventArgs e)
 			statusText.Text = "Running";
 			shadowContainer.Shadows.Clear();
 			shadowContainerRectangle.Shadows.Clear();
-			
+			shadowContainerIrregularCorner.Shadows.Clear();
+
 			if (!int.TryParse(xOffsetText.Text, out var xOffset))
 			{
 				xOffset = 0;
@@ -68,6 +69,15 @@ private void runButton_Click(object sender, RoutedEventArgs e)
 				Color = Colors.Red,
 			});
 
+			shadowContainerIrregularCorner.Shadows.Add(new UI.Shadow
+			{
+				OffsetX = xOffset,
+				OffsetY = yOffset,
+				IsInner = isInner,
+				Opacity = 1,
+				Color = Colors.Red,
+			});
+
 			statusText.Text = "Verify";
 		}
 
@@ -82,6 +92,9 @@ private void reset_Click(object sender, RoutedEventArgs e)
 
 			shadowContainer.Shadows.Clear();
 			shadowContainerRectangle.Shadows.Clear();
+			shadowContainerIrregularCorner.Shadows.Clear();
+
+			containerIrregularCorner.Visibility = Visibility.Collapsed;
 			containerRectangle.Visibility = Visibility.Collapsed;
 			containerBorder.Visibility = Visibility.Visible;
 		}
@@ -90,14 +103,22 @@ private void Border_ClickElement(object sender, RoutedEventArgs e)
 		{
 			containerRectangle.Visibility = Visibility.Collapsed;
 			containerBorder.Visibility = Visibility.Visible;
+			containerIrregularCorner.Visibility = Visibility.Collapsed;
 
 		}
 		private void Rectangle_ClickElement(object sender, RoutedEventArgs e)
 		{
 			containerRectangle.Visibility = Visibility.Visible;
 			containerBorder.Visibility = Visibility.Collapsed;
+			containerIrregularCorner.Visibility = Visibility.Collapsed;
 		}
-
+		private void IrregularCorner_ClickElement(object sender, RoutedEventArgs e)
+		{
+			containerRectangle.Visibility = Visibility.Collapsed;
+			containerBorder.Visibility = Visibility.Collapsed;
+			containerIrregularCorner.Visibility = Visibility.Visible;
+		}
+		
 
 	}
 }
diff --git a/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer.cs b/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer.cs
index 2d7f9ab25..de56e1d54 100644
--- a/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer.cs
+++ b/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer.cs
@@ -100,6 +100,136 @@ public void When_RectangleShadows(int xOffset, int yOffset, bool inner)
 		}
 
 
+		[Test]
+		[TestCase(10, 10, false)]
+		[TestCase(-10, -10, false)]
+		public void When_ShadowsIrregularCorner(int xOffset, int yOffset, bool inner)
+		{
+			var shadowContainer = App.WaitForElementWithMessage("shadowContainer");
+			App.Tap("check_IrregularCorner");
+			shadowContainer = App.WaitForElementWithMessage("shadowContainerIrregularCorner");
+			var runButton = App.MarkedAnywhere("runButton");
+			var resetButton = App.MarkedAnywhere("resetButton");
+			var statusText = App.MarkedAnywhere("statusText");
+
+
+			App.MarkedAnywhere("xOffsetText").ClearText().EnterTextAndDismiss(xOffset.ToString());
+			App.MarkedAnywhere("yOffsetText").ClearText().EnterTextAndDismiss(yOffset.ToString());
+			var innerCheck = App.MarkedAnywhere("inner");
+
+			innerCheck.SetDependencyPropertyValue("IsChecked", inner.ToString());
+			App.WaitForDependencyPropertyValue(innerCheck, "IsChecked", inner);
+
+			runButton.FastTap();
+
+			App.WaitForDependencyPropertyValue<string>(statusText, "Text", "Verify");
+			var outerTestRect = App.GetPhysicalRect("outerBorderIrregularCorner");
+
+			var caseName = $"Shadow_x{xOffset}_y{yOffset}{(inner ? "_Inner" : "_Outer")}";
+
+			using var screenshot = TakeScreenshot(caseName);
+
+
+
+			int currentX = 3;
+			int currentY = 3;
+
+			int absXOffset = Math.Abs(xOffset);
+			int absYOffset = Math.Abs(yOffset);
+
+			while (currentX < absXOffset || currentY < absYOffset)
+			{
+
+				var beginX = (int)outerTestRect.X;
+				var beginY = (int)outerTestRect.Y;
+				var centerX = (int)outerTestRect.CenterX;
+				var centerY = (int)outerTestRect.CenterY;
+				var endX = (int)outerTestRect.Right;
+				var endY = (int)outerTestRect.Bottom;
+
+				//CornerRadius="0,100,0,100"
+				/*
+				 * Points for test
+				 	 _______________________
+					|	1		7		4	|
+					|		A		C		|
+					|	2		8		5	|
+					|		B		D		|
+					|	3		9		6	|
+					 _______________________
+				*/
+
+				//1
+				var leftTopOuterTestPoint = new Point(beginX + currentX, beginY + currentY);
+				//2
+				var leftMiddleOuterTestPoint = new Point(beginX + currentX, centerY);
+				//3
+				var leftBottomOuterTestPoint = new Point(beginX + currentX, endY - currentY);
+
+				//4
+				var rightTopOuterTestPoint = new Point(endX - currentX, beginY + currentY);
+				//5
+				var rightMiddleOuterTestPoint = new Point(endX - currentX, centerY);
+				//6
+				var rightBottomOuterTestPoint = new Point(endX - currentX, endY - currentY);
+
+				//7
+				var centerTopOuterTestPoint = new Point(centerX - currentX, beginY + currentY);
+				//8
+				var centerMiddleOuterTestPoint = new Point(centerX - currentX, centerY);
+				//9
+				var centerBottomOuterTestPoint = new Point(centerX - currentX, endY - currentY);
+
+				//A
+				var cornerTopLeftOuterTestPoint = new Point(beginX + (endX - beginX) / 5 * 2 + currentX, beginY + (endY - beginY) / 5 * 2 + currentY);
+				//B
+				var cornerBottomLeftOuterTestPoint = new Point(beginX + (endX - beginX) / 5 * 4 + currentX, beginY + (endY - beginY) / 5 * 2 - currentY);
+				//C
+				var cornerTopRightOuterTestPoint = new Point(beginX + (endX - beginX) / 5 * 2 - currentX, beginY + (endY - beginY) / 5 * 4 + currentY);
+				//D
+				var cornerBottomRightOuterTestPoint = new Point(beginX + (endX - beginX) / 5 * 4 - currentX, beginY + (endY - beginY) / 5 * 4 - currentY);
+
+				var outerDefault = inner ? Blue : Red;
+
+				AssertExpectations(new[] {
+					(leftTopOuterTestPoint, xOffset < 0 ? outerDefault : Blue),
+					(leftMiddleOuterTestPoint, Blue),
+					(leftBottomOuterTestPoint, Blue),
+
+					(rightTopOuterTestPoint, Blue),
+					(rightMiddleOuterTestPoint, Blue),
+					(rightBottomOuterTestPoint, xOffset < 0 ? Blue : outerDefault),
+
+					(centerTopOuterTestPoint, Blue),
+					(centerMiddleOuterTestPoint, Green),
+					(centerBottomOuterTestPoint, Blue ),
+
+					(cornerTopLeftOuterTestPoint, Green),
+					(cornerBottomLeftOuterTestPoint, Blue),
+					(cornerTopRightOuterTestPoint, Blue),
+					(cornerBottomRightOuterTestPoint, Green)
+				});
+
+				void AssertExpectations((Point TestPoint, string Color)[] expectations)
+				{
+					foreach (var expectation in expectations)
+					{
+						ImageAssert.HasPixels(
+							screenshot,
+							ExpectedPixels
+								.At(expectation.TestPoint)
+								.Named($"{caseName}_at_{expectation.TestPoint.X}_{expectation.TestPoint.Y}_offset_{currentX}_{currentY}")
+								.Pixel(expectation.Color)
+						);
+					}
+				}
+
+				currentX = Math.Min(++currentX, absXOffset);
+				currentY = Math.Min(++currentY, absYOffset);
+			}
+			resetButton.FastTap();
+		}
+
 		public void Check_Assert(IAppRect outerBorderRect, IAppRect borderRect, int xOffset, int yOffset, bool inner)
 		{
 

From 1f2158f975655852a90f21c4468590854fc71c36 Mon Sep 17 00:00:00 2001
From: Rafael Rosa <rafaelmendesrosa@gmail.com>
Date: Wed, 30 Aug 2023 13:32:43 -0300
Subject: [PATCH 7/9] chore: add reset on irregular corner test

(cherry picked from commit e367addb7f17cc89c039ad410f35b9b6b50f9935)
---
 .../ShadowContainerTestPage.WinUI.xaml.cs     | 83 ++++++++++++-------
 .../ShadowContainer/Given_ShadowContainer.cs  |  4 +-
 2 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml.cs
index e5224d3a5..fb7dd221b 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml.cs
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml.cs
@@ -27,6 +27,13 @@ namespace Uno.Toolkit.Samples.Content.TestPages
 	[SamplePage(SampleCategory.Tests, "ShadowContainerTest")]
 	public sealed partial class ShadowContainerTestPage : Page
 	{
+		private enum ElementState
+		{
+			Border,
+			Rectangle,
+			BorderIrregular
+		}
+		private ElementState SelectedElement;
 		public ShadowContainerTestPage()
 		{
 			this.InitializeComponent();
@@ -34,7 +41,9 @@ public ShadowContainerTestPage()
 
 		private void runButton_Click(object sender, RoutedEventArgs e)
 		{
+			UpdateVisibilityElement();
 			statusText.Text = "Running";
+
 			shadowContainer.Shadows.Clear();
 			shadowContainerRectangle.Shadows.Clear();
 			shadowContainerIrregularCorner.Shadows.Clear();
@@ -50,39 +59,35 @@ private void runButton_Click(object sender, RoutedEventArgs e)
 			}
 
 			var isInner = inner.IsChecked ?? false;
-
-			shadowContainer.Shadows.Add(new UI.Shadow
+			var shadow = new UI.Shadow
 			{
 				OffsetX = xOffset,
 				OffsetY = yOffset,
 				IsInner = isInner,
 				Opacity = 1,
 				Color = Colors.Red,
-			});
-
-			shadowContainerRectangle.Shadows.Add(new UI.Shadow
+			};
+			switch (SelectedElement)
 			{
-				OffsetX = xOffset,
-				OffsetY = yOffset,
-				IsInner = isInner,
-				Opacity = 1,
-				Color = Colors.Red,
-			});
+				case ElementState.Border:
+					shadowContainer.Shadows.Add(shadow);
+					break;
+				case ElementState.Rectangle:
+					shadowContainerRectangle.Shadows.Add(shadow);
+					break;
+				case ElementState.BorderIrregular:
+					shadowContainerIrregularCorner.Shadows.Add(shadow);
+					break;
 
-			shadowContainerIrregularCorner.Shadows.Add(new UI.Shadow
-			{
-				OffsetX = xOffset,
-				OffsetY = yOffset,
-				IsInner = isInner,
-				Opacity = 1,
-				Color = Colors.Red,
-			});
+			}
 
 			statusText.Text = "Verify";
 		}
 
 		private void reset_Click(object sender, RoutedEventArgs e)
 		{
+			SelectedElement = ElementState.Border;
+
 			statusText.Text = string.Empty;
 
 			xOffsetText.Text = string.Empty;
@@ -94,32 +99,46 @@ private void reset_Click(object sender, RoutedEventArgs e)
 			shadowContainerRectangle.Shadows.Clear();
 			shadowContainerIrregularCorner.Shadows.Clear();
 
-			containerIrregularCorner.Visibility = Visibility.Collapsed;
-			containerRectangle.Visibility = Visibility.Collapsed;
-			containerBorder.Visibility = Visibility.Visible;
+			UpdateVisibilityElement();
+
 		}
 
 		private void Border_ClickElement(object sender, RoutedEventArgs e)
 		{
-			containerRectangle.Visibility = Visibility.Collapsed;
-			containerBorder.Visibility = Visibility.Visible;
-			containerIrregularCorner.Visibility = Visibility.Collapsed;
-
+			SelectedElement = ElementState.Border;
+			UpdateVisibilityElement();
 		}
 		private void Rectangle_ClickElement(object sender, RoutedEventArgs e)
 		{
-			containerRectangle.Visibility = Visibility.Visible;
-			containerBorder.Visibility = Visibility.Collapsed;
-			containerIrregularCorner.Visibility = Visibility.Collapsed;
+			SelectedElement = ElementState.Rectangle;
+			UpdateVisibilityElement();
 		}
 		private void IrregularCorner_ClickElement(object sender, RoutedEventArgs e)
 		{
+			SelectedElement = ElementState.BorderIrregular;
+			UpdateVisibilityElement();
+		}
+
+		private void UpdateVisibilityElement()
+		{
+			statusText.Text = string.Empty;
+			containerIrregularCorner.Visibility = Visibility.Collapsed;
 			containerRectangle.Visibility = Visibility.Collapsed;
 			containerBorder.Visibility = Visibility.Collapsed;
-			containerIrregularCorner.Visibility = Visibility.Visible;
-		}
-		
+			switch (SelectedElement)
+			{
+				case ElementState.Border:
+					containerBorder.Visibility = Visibility.Visible;
+					break;
+				case ElementState.Rectangle:
+					containerRectangle.Visibility = Visibility.Visible;
+					break;
+				case ElementState.BorderIrregular:
+					containerIrregularCorner.Visibility = Visibility.Visible;
+					break;
 
+			}
+		}
 	}
 }
 #endif
diff --git a/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer.cs b/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer.cs
index de56e1d54..334ac9221 100644
--- a/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer.cs
+++ b/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer.cs
@@ -106,10 +106,12 @@ public void When_RectangleShadows(int xOffset, int yOffset, bool inner)
 		public void When_ShadowsIrregularCorner(int xOffset, int yOffset, bool inner)
 		{
 			var shadowContainer = App.WaitForElementWithMessage("shadowContainer");
+			var resetButton = App.MarkedAnywhere("resetButton");
+			resetButton.FastTap();
+
 			App.Tap("check_IrregularCorner");
 			shadowContainer = App.WaitForElementWithMessage("shadowContainerIrregularCorner");
 			var runButton = App.MarkedAnywhere("runButton");
-			var resetButton = App.MarkedAnywhere("resetButton");
 			var statusText = App.MarkedAnywhere("statusText");
 
 

From 7ed09998423641bbbdbe6aa85d86a06bcee6c4c7 Mon Sep 17 00:00:00 2001
From: Rafael Rosa <rafaelmendesrosa@gmail.com>
Date: Wed, 30 Aug 2023 14:16:05 -0300
Subject: [PATCH 8/9] chore: set name of the test

(cherry picked from commit 140e93ed289f3bbd8a8c72f872afb1521d1214e0)
---
 .../ShadowContainerTestPage.WinUI.xaml.cs      |  2 +-
 .../ShadowContainer/Given_ShadowContainer.cs   | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml.cs
index fb7dd221b..07e918219 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml.cs
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml.cs
@@ -86,7 +86,6 @@ private void runButton_Click(object sender, RoutedEventArgs e)
 
 		private void reset_Click(object sender, RoutedEventArgs e)
 		{
-			SelectedElement = ElementState.Border;
 
 			statusText.Text = string.Empty;
 
@@ -94,6 +93,7 @@ private void reset_Click(object sender, RoutedEventArgs e)
 			yOffsetText.Text = string.Empty;
 			inner.IsChecked = false;
 			check_Border.IsChecked = true;
+			SelectedElement = ElementState.Border;
 
 			shadowContainer.Shadows.Clear();
 			shadowContainerRectangle.Shadows.Clear();
diff --git a/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer.cs b/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer.cs
index 334ac9221..1810433d6 100644
--- a/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer.cs
+++ b/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer.cs
@@ -2,6 +2,7 @@
 using NUnit.Framework;
 using System;
 using System.Drawing;
+using System.Reflection;
 using Uno.Toolkit.UITest.Extensions;
 using Uno.Toolkit.UITest.Framework;
 using Uno.UITest;
@@ -35,7 +36,7 @@ public void When_Shadows(int xOffset, int yOffset, bool inner)
 			var shadowContainer = App.WaitForElementWithMessage("shadowContainer");
 			var runButton = App.MarkedAnywhere("runButton");
 			var resetButton = App.MarkedAnywhere("resetButton");
-			
+
 
 			var statusText = App.MarkedAnywhere("statusText");
 			var shadowRect = App.GetPhysicalRect("shadowContainer");
@@ -53,7 +54,8 @@ public void When_Shadows(int xOffset, int yOffset, bool inner)
 			var outerBorderRect = App.GetPhysicalRect("outerBorder");
 			var elementRect = App.GetPhysicalRect("border");
 
-			Check_Assert(outerBorderRect, elementRect, xOffset, yOffset, inner);
+			var caseName = $"Shadow_x{xOffset}_y{yOffset}{(inner ? "_Inner" : "_Outer")}";
+			Check_Assert(outerBorderRect, elementRect, xOffset, yOffset, inner, caseName);
 
 			resetButton.FastTap();
 
@@ -94,7 +96,8 @@ public void When_RectangleShadows(int xOffset, int yOffset, bool inner)
 			var outerBorderRect = App.GetPhysicalRect("outerBorderRetangle");
 			var elementRect = App.GetPhysicalRect("rectangle");
 
-			Check_Assert(outerBorderRect, elementRect, xOffset, yOffset, inner);
+			var caseName = $"ShadowRectangle_x{xOffset}_y{yOffset}{(inner ? "_Inner" : "_Outer")}";
+			Check_Assert(outerBorderRect, elementRect, xOffset, yOffset, inner, caseName);
 			resetButton.FastTap();
 
 		}
@@ -103,7 +106,7 @@ public void When_RectangleShadows(int xOffset, int yOffset, bool inner)
 		[Test]
 		[TestCase(10, 10, false)]
 		[TestCase(-10, -10, false)]
-		public void When_ShadowsIrregularCorner(int xOffset, int yOffset, bool inner)
+		public void When_AsymmetricShadowsCorner(int xOffset, int yOffset, bool inner)
 		{
 			var shadowContainer = App.WaitForElementWithMessage("shadowContainer");
 			var resetButton = App.MarkedAnywhere("resetButton");
@@ -127,7 +130,7 @@ public void When_ShadowsIrregularCorner(int xOffset, int yOffset, bool inner)
 			App.WaitForDependencyPropertyValue<string>(statusText, "Text", "Verify");
 			var outerTestRect = App.GetPhysicalRect("outerBorderIrregularCorner");
 
-			var caseName = $"Shadow_x{xOffset}_y{yOffset}{(inner ? "_Inner" : "_Outer")}";
+			var caseName = $"ShadowIrregular_x{xOffset}_y{yOffset}{(inner ? "_Inner" : "_Outer")}";
 
 			using var screenshot = TakeScreenshot(caseName);
 
@@ -229,13 +232,12 @@ void AssertExpectations((Point TestPoint, string Color)[] expectations)
 				currentX = Math.Min(++currentX, absXOffset);
 				currentY = Math.Min(++currentY, absYOffset);
 			}
-			resetButton.FastTap();
+			//resetButton.FastTap();
 		}
 
-		public void Check_Assert(IAppRect outerBorderRect, IAppRect borderRect, int xOffset, int yOffset, bool inner)
+		public void Check_Assert(IAppRect outerBorderRect, IAppRect borderRect, int xOffset, int yOffset, bool inner, string caseName)
 		{
 
-			var caseName = $"Shadow_x{xOffset}_y{yOffset}{(inner ? "_Inner" : "_Outer")}";
 			using var screenshot = TakeScreenshot(caseName);
 
 

From 727334bc43f490f624cb03cf36dde82a33f4bf29 Mon Sep 17 00:00:00 2001
From: Rafael Rosa <rafaelmendesrosa@gmail.com>
Date: Wed, 30 Aug 2023 14:33:53 -0300
Subject: [PATCH 9/9] chore: fix cache problem

(cherry picked from commit 65f320ebf86c3c59cf918f09f5aa2963208fe7b7)
---
 .../Controls/ShadowContainer/Given_ShadowContainer.cs         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer.cs b/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer.cs
index 1810433d6..750e14a31 100644
--- a/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer.cs
+++ b/src/Uno.Toolkit.UITest/Controls/ShadowContainer/Given_ShadowContainer.cs
@@ -104,8 +104,8 @@ public void When_RectangleShadows(int xOffset, int yOffset, bool inner)
 
 
 		[Test]
-		[TestCase(10, 10, false)]
-		[TestCase(-10, -10, false)]
+		[TestCase(9, 9, false)]
+		[TestCase(-9, -9, false)]
 		public void When_AsymmetricShadowsCorner(int xOffset, int yOffset, bool inner)
 		{
 			var shadowContainer = App.WaitForElementWithMessage("shadowContainer");