Return ContentAsString when a template isn't specified

dotnet · Nov 19, 2024 · 351d0a2 · 351d0a2
1 parent fa519a2
commit 351d0a2
Show file tree

Hide file tree

Showing 4 changed files with 140 additions and 2 deletions.
diff --git a/src/Controls/src/Core/RadioButton/RadioButton.cs b/src/Controls/src/Core/RadioButton/RadioButton.cs
@@ -643,8 +643,17 @@ public string ContentAsString()
 
 		Font ITextStyle.Font => this.ToFont();
 
-#if ANDROID
-		object IContentView.Content => ContentAsString();
+#if ANDROID	
+		object IContentView.Content 
+		{
+			get
+			{
+				if (ResolveControlTemplate() == null)
+					return ContentAsString();
+
+				return Content;
+			}
+		}
 #endif
 
 		IView IContentView.PresentedContent => ((this as IControlTemplated).TemplateRoot as IView) ?? (Content as IView);

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25887.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue25887.xaml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage
+  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+  x:Class="Maui.Controls.Sample.Issues.Issue25887"
+  Title="Issue 25887">
+  <ContentPage.Resources>
+
+    <ControlTemplate x:Key="RadioButtonTemplate">
+        <ContentPresenter />
+    </ControlTemplate>
+
+    <Style x:Key="RadioButtonStyle" TargetType="RadioButton">
+      <Setter Property="ControlTemplate"
+              Value="{StaticResource RadioButtonTemplate}" />
+    </Style>
+
+  </ContentPage.Resources>
+  <StackLayout
+    Padding="12">
+    <Label 
+      Text="Using ControlTemplate" />
+    <StackLayout 
+      RadioButtonGroup.GroupName="template">
+      <RadioButton 
+        IsChecked="True"
+        AutomationId="RadioButtonTemplate1"
+        Value="Template 1"
+        Style="{StaticResource RadioButtonStyle}">
+        <RadioButton.Content>
+          <StackLayout>
+            <Image 
+              Source="coffee.png"
+              HorizontalOptions="Center"
+              VerticalOptions="Center" />
+            <Label
+              AutomationId="Success" 
+              Text="Template 1"
+              HorizontalOptions="Center"
+              VerticalOptions="End" />
+          </StackLayout>
+        </RadioButton.Content>
+      </RadioButton>
+      <RadioButton 
+        AutomationId="RadioButtonTemplate2"
+        Value="Template 2"
+        Style="{StaticResource RadioButtonStyle}">
+        <RadioButton.Content>
+          <StackLayout>
+            <Image 
+              Source="coffee.png"
+              HorizontalOptions="Center"
+              VerticalOptions="Center" />
+            <Label 
+              Text="Template 2"
+              HorizontalOptions="Center"
+              VerticalOptions="End" />
+          </StackLayout>
+        </RadioButton.Content>
+      </RadioButton>
+      <RadioButton 
+        AutomationId="RadioButtonTemplate3"
+        Value="Template 3"
+        Style="{StaticResource RadioButtonStyle}">
+        <RadioButton.Content>
+          <StackLayout>
+            <Image 
+              Source="coffee.png"
+              HorizontalOptions="Center"
+              VerticalOptions="Center" />
+            <Label 
+              Text="Template 3"
+              HorizontalOptions="Center"
+              VerticalOptions="End" />
+          </StackLayout>
+        </RadioButton.Content>
+      </RadioButton>
+      <RadioButton 
+        AutomationId="RadioButtonTemplate4"
+        Value="Template 4"
+        Style="{StaticResource RadioButtonStyle}">
+        <RadioButton.Content>
+          <StackLayout>
+            <Image 
+              Source="coffee.png"
+              HorizontalOptions="Center"
+              VerticalOptions="Center" />
+            <Label 
+              Text="Template 4"
+              HorizontalOptions="Center"
+              VerticalOptions="End" />
+          </StackLayout>
+        </RadioButton.Content>
+      </RadioButton>
+    </StackLayout>
+  </StackLayout>
+</ContentPage>
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25887.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue25887.xaml.cs
@@ -0,0 +1,10 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 25887, "ContentPresenter just rendering component string in .Net9", PlatformAffected.Android)]
+public partial class Issue25887 : ContentPage
+{
+	public Issue25887()
+	{
+		InitializeComponent();
+	}
+}
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25887.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25887.cs
@@ -0,0 +1,22 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+	public class Issue25887 : _IssuesUITest
+	{
+		public Issue25887(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "ContentPresenter just rendering component string in .Net9";
+
+		[Test]
+		[Category(UITestCategories.RadioButton)]
+		public void RadioButtonContentNotRendering()
+		{
+			App.WaitForElement("Success");
+		}
+	}
+}