From 6cc673df0045666c63da4b88bddf9b26c4a7b206 Mon Sep 17 00:00:00 2001
From: Ieuan Walker <Ieuan.Walker@cardiff.gov.uk>
Date: Fri, 21 Nov 2025 17:21:12 +0000
Subject: [PATCH 1/4] Improve PopupPage accessibility and simplify tap handling

Removed the `TapGestureRecognizer` from the `PopupPage` constructor to simplify tap handling logic. Updated `PopupPageLayout` to enhance accessibility by excluding the overlay `Grid` and `PopupBorder` from the accessibility tree, ensuring only relevant popup content is accessible to assistive technologies.
---
 src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
index 5d3f65ec8c..820d484a86 100644
--- a/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
+++ b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
@@ -46,7 +46,6 @@ public PopupPage(Popup popup, IPopupOptions? popupOptions)
 			await CloseAsync(new PopupResult(true));
 		}, () => GetCanBeDismissedByTappingOutsideOfPopup(popup, popupOptions));
 
-
 		var pageTapGestureRecognizer = new TapGestureRecognizer();
 		pageTapGestureRecognizer.Tapped += HandleTapGestureRecognizerTapped;
 
@@ -251,6 +250,13 @@ public PopupPageLayout(in Popup popupContent, in IPopupOptions options)
 			PopupBorder.SetBinding(Border.StrokeThicknessProperty, static (IPopupOptions options) => options.Shape, source: options, mode: BindingMode.OneWay, converter: new BorderStrokeThicknessConverter());
 
 			Children.Add(PopupBorder);
+
+			// Configure accessibility: 
+			// - Exclude the overlay Grid from accessibility to hide the background dimming area
+			// - Exclude the PopupBorder from accessibility (it's just a visual container)
+			// - Popup and its inner content children will be accessible directly
+			AutomationProperties.SetIsInAccessibleTree(this, false);
+			AutomationProperties.SetIsInAccessibleTree(PopupBorder, false);
 		}
 
 		public Border PopupBorder { get; }

From a54d5b8bdc67f68c0f986500d4a84b1d401b2d1e Mon Sep 17 00:00:00 2001
From: Ieuan Walker <Ieuan.Walker@cardiff.gov.uk>
Date: Fri, 21 Nov 2025 17:44:52 +0000
Subject: [PATCH 2/4] Improve ButtonPopup accessibility and code formatting

Refactored the `VerticalStackLayout.Resources` section in
`ButtonPopup.xaml` for better readability and consistency.

Added a `Loaded` event handler (`Label_Loaded`) to the `Label`
with the `Title` style to set semantic focus on load, enhancing
accessibility. Implemented the `Label_Loaded` method in
`ButtonPopup.xaml.cs` to handle this functionality.
---
 .../Views/Popups/ButtonPopup.xaml             | 58 +++++++++----------
 .../Views/Popups/ButtonPopup.xaml.cs          |  8 +++
 2 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml
index 1537a61ef1..848122230e 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml
@@ -6,37 +6,37 @@
 	xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
     BackgroundColor="LightCoral">
 
-	<VerticalStackLayout Spacing="6">
-		<VerticalStackLayout.Resources>
-			<ResourceDictionary>
-				<Style x:Key="Title" TargetType="Label">
-					<Setter Property="FontSize" Value="26" />
-					<Setter Property="FontAttributes" Value="Bold" />
-					<Setter Property="TextColor" Value="#000" />
-					<Setter Property="VerticalTextAlignment" Value="Center" />
-					<Setter Property="HorizontalTextAlignment" Value="Center" />
-				</Style>
-				<Style x:Key="Divider" TargetType="BoxView">
-					<Setter Property="HeightRequest" Value="1" />
-					<Setter Property="Margin" Value="50, 12" />
-					<Setter Property="Color" Value="#c3c3c3" />
-				</Style>
-				<Style x:Key="Content" TargetType="Label">
-					<Setter Property="HorizontalTextAlignment" Value="Start" />
-					<Setter Property="VerticalTextAlignment" Value="Center" />
-				</Style>
-				<Style x:Key="ConfirmButton" TargetType="Button">
-					<Setter Property="VerticalOptions" Value="End" />
-				</Style>
-			</ResourceDictionary>
-		</VerticalStackLayout.Resources>
+    <VerticalStackLayout Spacing="6">
+        <VerticalStackLayout.Resources>
+            <ResourceDictionary>
+                <Style x:Key="Title" TargetType="Label">
+                    <Setter Property="FontSize" Value="26" />
+                    <Setter Property="FontAttributes" Value="Bold" />
+                    <Setter Property="TextColor" Value="#000" />
+                    <Setter Property="VerticalTextAlignment" Value="Center" />
+                    <Setter Property="HorizontalTextAlignment" Value="Center" />
+                </Style>
+                <Style x:Key="Divider" TargetType="BoxView">
+                    <Setter Property="HeightRequest" Value="1" />
+                    <Setter Property="Margin" Value="50, 12" />
+                    <Setter Property="Color" Value="#c3c3c3" />
+                </Style>
+                <Style x:Key="Content" TargetType="Label">
+                    <Setter Property="HorizontalTextAlignment" Value="Start" />
+                    <Setter Property="VerticalTextAlignment" Value="Center" />
+                </Style>
+                <Style x:Key="ConfirmButton" TargetType="Button">
+                    <Setter Property="VerticalOptions" Value="End" />
+                </Style>
+            </ResourceDictionary>
+        </VerticalStackLayout.Resources>
 
-		<Label Style="{StaticResource Title}" Text="Button Popup" />
-		<BoxView Style="{StaticResource Divider}" />
-		<Label Style="{StaticResource Content}" Text="This is a platform specific popup with a .NET MAUI View being rendered. The behaviors of the popup will confirm to 100% this platform look and feel, but still allows you to use your .NET MAUI controls." />
-		<Button
+        <Label Style="{StaticResource Title}" Text="Button Popup" Loaded="Label_Loaded" />
+        <BoxView Style="{StaticResource Divider}" />
+        <Label Style="{StaticResource Content}" Text="This is a platform specific popup with a .NET MAUI View being rendered. The behaviors of the popup will confirm to 100% this platform look and feel, but still allows you to use your .NET MAUI controls." />
+        <Button
 			Clicked="Button_Clicked"
 			Style="{StaticResource ConfirmButton}"
 			Text="OKAY" />
-	</VerticalStackLayout>
+    </VerticalStackLayout>
 </mct:Popup>
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml.cs
index 06840d20cc..1c984df58c 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml.cs
@@ -11,4 +11,12 @@ void Button_Clicked(object? sender, EventArgs e)
 	{
 		CloseAsync();
 	}
+
+	void Label_Loaded(object sender, EventArgs e)
+	{
+		if (sender is Label label)
+		{
+			label.SetSemanticFocus();
+		}
+	}
 }
\ No newline at end of file

From 1863267e6198c9f20f546922f61460aaad718713 Mon Sep 17 00:00:00 2001
From: Ieuan Walker <walker.ieuan@gmail.com>
Date: Sat, 22 Nov 2025 18:50:36 +0000
Subject: [PATCH 3/4] Remove comments on accessibility configuration

Removed comments explaining the accessibility setup for the
overlay Grid and PopupBorder. No functional changes were
made to the accessibility behavior, as the relevant
`AutomationProperties.SetIsInAccessibleTree` calls remain
unchanged. The comments were likely removed for clarity or
to reduce redundancy.
---
 src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
index 820d484a86..1ce9cb7710 100644
--- a/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
+++ b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
@@ -251,10 +251,6 @@ public PopupPageLayout(in Popup popupContent, in IPopupOptions options)
 
 			Children.Add(PopupBorder);
 
-			// Configure accessibility: 
-			// - Exclude the overlay Grid from accessibility to hide the background dimming area
-			// - Exclude the PopupBorder from accessibility (it's just a visual container)
-			// - Popup and its inner content children will be accessible directly
 			AutomationProperties.SetIsInAccessibleTree(this, false);
 			AutomationProperties.SetIsInAccessibleTree(PopupBorder, false);
 		}

From bf0aa1717ebe7fe089d910a90a90e6671d577e3d Mon Sep 17 00:00:00 2001
From: Ieuan Walker <walker.ieuan@gmail.com>
Date: Sat, 22 Nov 2025 19:24:29 +0000
Subject: [PATCH 4/4] Fix CI build errors

Update Label_Loaded method with nullability and logic

The `Label_Loaded` method in `ButtonPopup.xaml.cs` was updated to
accept a nullable `sender` parameter by changing its signature
to `void Label_Loaded(object? sender, EventArgs e)`.

Additionally, the method implementation was added to check if
the `sender` is of type `Label`. If so, it casts the `sender`
to a `Label` and calls the `SetSemanticFocus` method on it.
---
 .../Views/Popups/ButtonPopup.xaml.cs                            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml.cs
index 1c984df58c..a8c9816133 100644
--- a/samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/Views/Popups/ButtonPopup.xaml.cs
@@ -12,7 +12,7 @@ void Button_Clicked(object? sender, EventArgs e)
 		CloseAsync();
 	}
 
-	void Label_Loaded(object sender, EventArgs e)
+	void Label_Loaded(object? sender, EventArgs e)
 	{
 		if (sender is Label label)
 		{