Merge pull request #1443 from unoplatform/dev/xygu/20250812/rv-refactor

refactor: resp-view

Author: Xiaoy312

src/Uno.Toolkit.RuntimeTests/Tests/ResponsiveViewTests.cs

@@ -1,15 +1,12 @@
-using System.Threading.Tasks;
+using Windows.Foundation;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Uno.UI.RuntimeTests;
 using Uno.Toolkit.RuntimeTests.Helpers;
-using Windows.Foundation;
 using Uno.Toolkit.UI;
 
 #if IS_WINUI
-using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Shapes;
 #else
-using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Shapes;
 #endif
 
@@ -39,7 +36,7 @@ public async Task ResponsiveView_NarrowContent_TextBlock()
 		await UnitTestUIContentHelperEx.SetContentAndWait(host);
 
 		host.ForceResponsiveSize(new Size(300, 400));
-		Assert.AreEqual("Narrow", (host.Content as TextBlock)?.Text);
+		Assert.AreEqual("Narrow", (host.GetResolvedContent() as TextBlock)?.Text);
 	}
 
 	[TestMethod]
@@ -67,7 +64,7 @@ public async Task ResponsiveView_NormalContent_Rectangle()
 		await UnitTestUIContentHelperEx.SetContentAndWait(host);
 
 		host.ForceResponsiveSize(new Size(600, 400));
-		Assert.AreEqual(typeof(Rectangle), host.Content?.GetType());
+		Assert.AreEqual(typeof(Rectangle), host.GetResolvedContent()?.GetType());
 	}
 
 	[TestMethod]
@@ -109,7 +106,7 @@ public async Task ResponsiveView_NormalContent_ResponsiveLayout()
 		await UnitTestUIContentHelperEx.SetContentAndWait(host);
 
 		host.ForceResponsiveSize(new Size(322, 400));
-		Assert.AreEqual(typeof(Ellipse), host.Content?.GetType());
+		Assert.AreEqual(typeof(Ellipse), host.GetResolvedContent()?.GetType());
 	}
 
 	[TestMethod]
@@ -142,7 +139,7 @@ public async Task ResponsiveView_WidestContent_Ellipse()
 		await UnitTestUIContentHelperEx.SetContentAndWait(host);
 
 		host.ForceResponsiveSize(new Size(2000, 400));
-		Assert.AreEqual(typeof(Ellipse), host.Content?.GetType());
+		Assert.AreEqual(typeof(Ellipse), host.GetResolvedContent()?.GetType());
 	}
 
 	[TestMethod]
@@ -175,9 +172,9 @@ public async Task ResponsiveView_WideContent_SizeChanged()
 		await UnitTestUIContentHelperEx.SetContentAndWait(host);
 
 		host.ForceResponsiveSize(new Size(150, 400));
-		Assert.AreEqual(typeof(TextBlock), host.Content?.GetType());
+		Assert.AreEqual(typeof(TextBlock), host.GetResolvedContent()?.GetType());
 
 		host.ForceResponsiveSize(new Size(800, 400));
-		Assert.AreEqual(typeof(TextBox), host.Content?.GetType());
+		Assert.AreEqual(typeof(TextBox), host.GetResolvedContent()?.GetType());
 	}
 }

src/Uno.Toolkit.UI/Controls/ResponsiveView/ResponsiveView.cs

@@ -12,11 +12,24 @@
 
 namespace Uno.Toolkit.UI;
 
-public partial class ResponsiveView : ContentControl
+public partial class ResponsiveView : Control;
+
+partial class ResponsiveView
+{
+	private class TemplateParts
+	{
+		public const string ResponsiveRoot = "ResponsiveRoot";
+	}
+}
+
+[TemplatePart(Name = TemplateParts.ResponsiveRoot, Type = typeof(Border))]
+partial class ResponsiveView
 {
 	public Layout? CurrentLayout { get; private set; }
 	internal ResolvedLayout? LastResolved { get; private set; }
 
+	private Border? _responsiveRoot;
+
 	public ResponsiveView()
 	{
 		DefaultStyleKey = typeof(ResponsiveView);
@@ -25,6 +38,13 @@ public ResponsiveView()
 		Unloaded += OnUnloaded;
 	}
 
+	protected override void OnApplyTemplate()
+	{
+		base.OnApplyTemplate();
+
+		_responsiveRoot = GetTemplateChild(TemplateParts.ResponsiveRoot) as Border
+			?? throw new Exception($"The template part '{TemplateParts.ResponsiveRoot}' is missing or is not of type Border.");
+	}
 
 	private void OnLoaded(object sender, RoutedEventArgs e)
 	{
@@ -66,7 +86,10 @@ private void UpdateTemplate(ResolvedLayout resolved, bool forceApplyValue = fals
 	{
 		if (forceApplyValue || CurrentLayout != resolved.Result)
 		{
-			Content = GetTemplateFor(resolved.Result)?.LoadContent() as UIElement;
+			if (_responsiveRoot is { })
+			{
+				_responsiveRoot.Child = GetTemplateFor(resolved.Result)?.LoadContent() as UIElement;
+			}
 
 			CurrentLayout = resolved.Result;
 			LastResolved = resolved;
@@ -96,6 +119,8 @@ private IEnumerable<Layout> GetAvailableLayoutOptions()
 		if (WidestTemplate != null) yield return UI.Layout.Widest;
 	}
 
+	internal UIElement? GetResolvedContent() => _responsiveRoot?.Child;
+
 	internal ResponsiveLayout? GetAppliedLayout() =>
 		ResponsiveLayout ??
 		this.ResolveLocalResource<ResponsiveLayout>(ResponsiveLayout.DefaultResourceKey) ??

src/Uno.Toolkit.UI/Controls/ResponsiveView/ResponsiveView.xaml

@@ -0,0 +1,13 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+					xmlns:utu="using:Uno.Toolkit.UI">
+	<Style TargetType="utu:ResponsiveView">
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="utu:ResponsiveView">
+					<Border x:Name="ResponsiveRoot" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+</ResourceDictionary>