diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 934fe7623e1d..c2d342fc8af4 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -200,20 +200,6 @@ git commit -m "Fix: Description of the change"
- `.github/instructions/android.instructions.md` - Android handler implementation
- `.github/instructions/xaml-unittests.instructions.md` - XAML unit test guidelines
-### Opening PRs
-
-All PRs are required to have this at the top of the description:
-
-```
-
-> [!NOTE]
-> Are you waiting for the changes in this PR to be merged?
-> It would be very helpful if you could [test the resulting artifacts](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from this PR and let us know in a comment if this change resolves your issue. Thank you!
-```
-
-Always put that at the top, without the block quotes. Without it, users will NOT be able to try the PR and your work will have been in vain!
-
-
## Custom Agents and Skills
diff --git a/.github/skills/pr-finalize/SKILL.md b/.github/skills/pr-finalize/SKILL.md
index 28ba6916dd8b..9932ac6534c5 100644
--- a/.github/skills/pr-finalize/SKILL.md
+++ b/.github/skills/pr-finalize/SKILL.md
@@ -127,16 +127,10 @@ Examples:
## Description Requirements
PR description should:
-1. Start with the required NOTE block (so users can test PR artifacts)
-2. Include the base sections from `.github/PULL_REQUEST_TEMPLATE.md` ("Description of Change" and "Issues Fixed"). The skill adds additional structured fields (Root cause, Fix, Key insight, etc.) as recommended enhancements for better agent context.
-3. Match the actual implementation
+1. Include the base sections from `.github/PULL_REQUEST_TEMPLATE.md` ("Description of Change" and "Issues Fixed"). The skill adds additional structured fields (Root cause, Fix, Key insight, etc.) as recommended enhancements for better agent context.
+2. Match the actual implementation
```markdown
-
-> [!NOTE]
-> Are you waiting for the changes in this PR to be merged?
-> It would be very helpful if you could [test the resulting artifacts](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from this PR and let us know in a comment if this change resolves your issue. Thank you!
-
### Description of Change
[Must match actual implementation]
@@ -229,11 +223,6 @@ Example: "Before: Safe area applied by default (opt-out). After: Only views impl
Use structured template only when existing description is inadequate:
```markdown
-
-> [!NOTE]
-> Are you waiting for the changes in this PR to be merged?
-> It would be very helpful if you could [test the resulting artifacts](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from this PR and let us know in a comment if this change resolves your issue. Thank you!
-
### Root Cause
[Why the bug occurred - be specific about the code path]
diff --git a/.github/skills/pr-finalize/references/complete-example.md b/.github/skills/pr-finalize/references/complete-example.md
index 034da2e3d09d..6f8ff08d1006 100644
--- a/.github/skills/pr-finalize/references/complete-example.md
+++ b/.github/skills/pr-finalize/references/complete-example.md
@@ -9,10 +9,6 @@ This example shows a PR description optimized for future agent success.
## Description
```markdown
-> [!NOTE]
-> Are you waiting for the changes in this PR to be merged?
-> It would be very helpful if you could [test the resulting artifacts](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from this PR and let us know in a comment if this change resolves your issue. Thank you!
-
### Root Cause
In `MauiView.GetAdjustedSafeAreaInsets()` on iOS, views that don't implement `ISafeAreaView` or `ISafeAreaView2` (such as `ContentPresenter`, `Border`) were falling through to return `baseSafeArea`. This applied full device safe area insets to views that never opted into safe area handling, causing double-padding when used inside ControlTemplates.
diff --git a/eng/pipelines/common/ui-tests-steps.yml b/eng/pipelines/common/ui-tests-steps.yml
index e3c1186e329c..b5b2a8f79a8a 100644
--- a/eng/pipelines/common/ui-tests-steps.yml
+++ b/eng/pipelines/common/ui-tests-steps.yml
@@ -186,6 +186,8 @@ steps:
- task: PublishBuildArtifacts@1
condition: always()
displayName: publish artifacts
+ inputs:
+ artifactName: drop-$(System.StageName)-$(System.JobName)-$(System.JobAttempt)
# Enable Notification Center re-enabled only for catalyst
- ${{ if eq(parameters.platform, 'catalyst')}}:
diff --git a/eng/pipelines/common/ui-tests.yml b/eng/pipelines/common/ui-tests.yml
index fe1231c2292c..258ab00de3e7 100644
--- a/eng/pipelines/common/ui-tests.yml
+++ b/eng/pipelines/common/ui-tests.yml
@@ -24,7 +24,7 @@ parameters:
- 'Cells,CheckBox,ContextActions,CustomRenderers,DatePicker,Dispatcher,DisplayAlert,DisplayPrompt,DragAndDrop'
- 'CollectionView'
- 'Entry'
- - 'Editor,Effects,FlyoutPage,Focus,Fonts,Frame,Gestures,GraphicsView'
+ - 'Editor,Effects,Essentials,FlyoutPage,Focus,Fonts,Frame,Gestures,GraphicsView'
- 'Image,ImageButton,IndicatorView,InputTransparent,IsEnabled,IsVisible'
- 'Label'
- 'Layout'
@@ -38,8 +38,8 @@ parameters:
- 'SearchBar,Shape,Slider'
- 'SoftInput,Stepper,Switch,SwipeView'
- 'Shell'
- - 'TabbedPage,TableView,TimePicker,TitleView,ToolbarItem'
- - 'ViewBaseTests,Window'
+ - 'TabbedPage,TableView,TimePicker,TitleView,ToolbarItem,Triggers'
+ - 'ViewBaseTests,VisualStateManager,Window'
- 'WebView'
projects:
diff --git a/src/BlazorWebView/src/Maui/BlazorWebView.cs b/src/BlazorWebView/src/Maui/BlazorWebView.cs
index 15922e86b364..d54ee207cf77 100644
--- a/src/BlazorWebView/src/Maui/BlazorWebView.cs
+++ b/src/BlazorWebView/src/Maui/BlazorWebView.cs
@@ -1,5 +1,6 @@
using System;
using System.Threading.Tasks;
+using System.Runtime.Versioning;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.Extensions.FileProviders;
using Microsoft.Maui;
@@ -10,8 +11,24 @@ namespace Microsoft.AspNetCore.Components.WebView.Maui
///
/// A that can render Blazor content.
///
+#if ANDROID
+ [SupportedOSPlatform(AndroidSupportedOSPlatformVersion)]
+#elif IOS
+ [SupportedOSPlatform(iOSSupportedOSPlatformVersion)]
+#elif MACCATALYST
+ [SupportedOSPlatform(MacCatalystSupportedOSPlatformVersion)]
+#endif
public partial class BlazorWebView : View, IBlazorWebView
{
+ // NOTE: keep these in *reasonably* in sync with:
+ // * src\BlazorWebView\src\Maui\Microsoft.AspNetCore.Components.WebView.Maui.csproj
+ // * src\Templates\src\templates\maui-blazor\MauiApp.1.csproj
+ // * src\Templates\src\templates\maui-blazor-solution\MauiApp.1\MauiApp.1.csproj
+ // * https://learn.microsoft.com/dotnet/maui/supported-platforms
+ internal const string AndroidSupportedOSPlatformVersion = "android24.0";
+ internal const string iOSSupportedOSPlatformVersion = "ios15.0";
+ internal const string MacCatalystSupportedOSPlatformVersion = "maccatalyst15.0";
+
internal static string AppHostAddress { get; } = HostAddressHelper.GetAppHostAddress();
private readonly JSComponentConfigurationStore _jSComponents = new();
@@ -80,9 +97,11 @@ public string StartPath
///
#if ANDROID
- [System.Runtime.Versioning.SupportedOSPlatform("android23.0")]
+ [System.Runtime.Versioning.SupportedOSPlatform(AndroidSupportedOSPlatformVersion)]
#elif IOS
- [System.Runtime.Versioning.SupportedOSPlatform("ios11.0")]
+ [System.Runtime.Versioning.SupportedOSPlatform(iOSSupportedOSPlatformVersion)]
+#elif MACCATALYST
+ [System.Runtime.Versioning.SupportedOSPlatform(MacCatalystSupportedOSPlatformVersion)]
#endif
public virtual IFileProvider CreateFileProvider(string contentRootDir)
{
@@ -97,7 +116,11 @@ public virtual IFileProvider CreateFileProvider(string contentRootDir)
/// Returns a representing true if the was called, or false if it was not called because Blazor is not currently running.
/// Thrown if is null.
#if ANDROID
- [System.Runtime.Versioning.SupportedOSPlatform("android23.0")]
+ [System.Runtime.Versioning.SupportedOSPlatform(AndroidSupportedOSPlatformVersion)]
+#elif IOS
+ [System.Runtime.Versioning.SupportedOSPlatform(iOSSupportedOSPlatformVersion)]
+#elif MACCATALYST
+ [System.Runtime.Versioning.SupportedOSPlatform(MacCatalystSupportedOSPlatformVersion)]
#endif
public virtual async Task TryDispatchAsync(Action workItem)
{
diff --git a/src/BlazorWebView/src/Maui/BlazorWebViewHandler.cs b/src/BlazorWebView/src/Maui/BlazorWebViewHandler.cs
index 052a96f5586f..df638d6d7cd1 100644
--- a/src/BlazorWebView/src/Maui/BlazorWebViewHandler.cs
+++ b/src/BlazorWebView/src/Maui/BlazorWebViewHandler.cs
@@ -9,7 +9,11 @@
namespace Microsoft.AspNetCore.Components.WebView.Maui
{
#if ANDROID
- [SupportedOSPlatform("android23.0")]
+ [SupportedOSPlatform(BlazorWebView.AndroidSupportedOSPlatformVersion)]
+#elif IOS
+ [SupportedOSPlatform(BlazorWebView.iOSSupportedOSPlatformVersion)]
+#elif MACCATALYST
+ [SupportedOSPlatform(BlazorWebView.MacCatalystSupportedOSPlatformVersion)]
#endif
public partial class BlazorWebViewHandler
{
diff --git a/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj b/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj
index d4268f64fa8f..115ba0586b46 100644
--- a/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj
+++ b/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj
@@ -23,6 +23,10 @@
$(DefaultPackageTags);blazor;webview;aspnet
$(MauiRootDirectory)Assets\aspnet-icon.png
Build .NET Multi-platform App UI (.NET MAUI) apps with Blazor web UI in the BlazorWebView control.
+
+ 15.0
+ 15.0
+ 24.0
diff --git a/src/BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs b/src/BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs
index b7b0c748177d..a83a5e187c3c 100644
--- a/src/BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs
+++ b/src/BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs
@@ -30,9 +30,11 @@ public static IWindowsFormsBlazorWebViewBuilder AddWindowsFormsBlazorWebView(thi
public static IWpfBlazorWebViewBuilder AddWpfBlazorWebView(this IServiceCollection services)
#elif WEBVIEW2_MAUI
#if ANDROID
- [System.Runtime.Versioning.SupportedOSPlatform("android23.0")]
+ [System.Runtime.Versioning.SupportedOSPlatform(BlazorWebView.AndroidSupportedOSPlatformVersion)]
#elif IOS
- [System.Runtime.Versioning.SupportedOSPlatform("ios11.0")]
+ [System.Runtime.Versioning.SupportedOSPlatform(BlazorWebView.iOSSupportedOSPlatformVersion)]
+#elif MACCATALYST
+ [System.Runtime.Versioning.SupportedOSPlatform(BlazorWebView.MacCatalystSupportedOSPlatformVersion)]
#endif
public static IMauiBlazorWebViewBuilder AddMauiBlazorWebView(this IServiceCollection services)
#else
diff --git a/src/Compatibility/Core/src/iOS/Renderers/NavigationRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/NavigationRenderer.cs
index ae911866e9ad..09e30a6a4fa8 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/NavigationRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/NavigationRenderer.cs
@@ -762,6 +762,11 @@ void UpdateBarTextColor()
void SetStatusBarStyle()
{
+ if (NavPage is null)
+ {
+ return;
+ }
+
var barTextColor = NavPage.BarTextColor;
var statusBarColorMode = NavPage.OnThisPlatform().GetStatusBarTextColorMode();
diff --git a/src/Compatibility/Maps/src/Android/MapRenderer.cs b/src/Compatibility/Maps/src/Android/MapRenderer.cs
index fe526759bf13..e0a18f5b2c6d 100644
--- a/src/Compatibility/Maps/src/Android/MapRenderer.cs
+++ b/src/Compatibility/Maps/src/Android/MapRenderer.cs
@@ -46,6 +46,7 @@ public class MapRenderer : Handlers.Compatibility.ViewRenderer, Go
List _polylines;
List _polygons;
List _circles;
+ List _trackedMapElements;
public MapRenderer(Context context) : base(context)
{
@@ -581,6 +582,16 @@ void MapElementCollectionChanged(NotifyCollectionChangedEventArgs e)
AddMapElements(e.NewItems.Cast());
break;
case NotifyCollectionChangedAction.Reset:
+ // Clear MapElementId from tracked elements (not Element.MapElements,
+ // which is already empty after ObservableCollection.Clear())
+ if (_trackedMapElements != null)
+ {
+ foreach (var element in _trackedMapElements)
+ element.MapElementId = null;
+
+ _trackedMapElements = null;
+ }
+
if (_polylines != null)
{
for (int i = 0; i < _polylines.Count; i++)
@@ -612,8 +623,11 @@ void MapElementCollectionChanged(NotifyCollectionChangedEventArgs e)
void AddMapElements(IEnumerable mapElements)
{
+ _trackedMapElements ??= new List();
+
foreach (var element in mapElements)
{
+ _trackedMapElements.Add(element);
element.PropertyChanged += MapElementPropertyChanged;
switch (element)
diff --git a/src/Compatibility/Maps/src/iOS/MapRenderer.cs b/src/Compatibility/Maps/src/iOS/MapRenderer.cs
index c248128a451e..0bcdddc456a4 100644
--- a/src/Compatibility/Maps/src/iOS/MapRenderer.cs
+++ b/src/Compatibility/Maps/src/iOS/MapRenderer.cs
@@ -31,6 +31,7 @@ public class MapRenderer : Microsoft.Maui.Controls.Handlers.Compatibility.ViewRe
bool _shouldUpdateRegion;
object _lastTouchedView;
bool _disposed;
+ List _trackedMapElements;
#if __MOBILE__
UITapGestureRecognizer _mapClickedGestureRecognizer;
@@ -528,6 +529,16 @@ void MapElementCollectionChanged(NotifyCollectionChangedEventArgs e)
case NotifyCollectionChangedAction.Reset:
var mkMapView = (MKMapView)Control;
+ // Clear MapElementId from tracked elements (not Element.MapElements,
+ // which is already empty after ObservableCollection.Clear())
+ if (_trackedMapElements != null)
+ {
+ foreach (var mapElement in _trackedMapElements)
+ mapElement.MapElementId = null;
+
+ _trackedMapElements = null;
+ }
+
if (mkMapView.Overlays != null)
{
var overlays = mkMapView.Overlays;
@@ -544,8 +555,11 @@ void MapElementCollectionChanged(NotifyCollectionChangedEventArgs e)
void AddMapElements(IEnumerable mapElements)
{
+ _trackedMapElements ??= new List();
+
foreach (var element in mapElements)
{
+ _trackedMapElements.Add(element);
element.PropertyChanged += MapElementPropertyChanged;
IMKOverlay overlay = null;
diff --git a/src/Controls/samples/Controls.Sample/Pages/Others/LargeTitlesPageiOS.cs b/src/Controls/samples/Controls.Sample/Pages/Others/LargeTitlesPageiOS.cs
deleted file mode 100644
index e0ccaf46ba17..000000000000
--- a/src/Controls/samples/Controls.Sample/Pages/Others/LargeTitlesPageiOS.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System.Linq;
-using System.Windows.Input;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.PlatformConfiguration;
-using Microsoft.Maui.Graphics;
-using static Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.NavigationPage;
-using static Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page;
-using LargeTitleDisplayMode = Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.LargeTitleDisplayMode;
-
-namespace Maui.Controls.Sample.Pages
-{
- public class LargeTitlesPageiOS : ContentPage
- {
- public LargeTitlesPageiOS()
- {
- Title = "Large Titles";
-
- var offscreenPageLimit = new Label();
- var content = new StackLayout
- {
- VerticalOptions = LayoutOptions.Fill,
- HorizontalOptions = LayoutOptions.Fill,
- Children =
- {
- new Button
- {
- Text = "LargeTitleDisplayMode.Never",
- Command = new Command(() => On().SetLargeTitleDisplay(LargeTitleDisplayMode.Never))
- },
- new Button
- {
- Text = "LargeTitleDisplayMode.Always",
- Command = new Command(() => On().SetLargeTitleDisplay(LargeTitleDisplayMode.Always))
- },
- new Button
- {
- Text = "LargeTitleDisplayMode.Automatic -> next page will have same LargeTitleDisplayMode as this one",
- Command = new Command(async () =>{
- var page = new ContentPage { Title = "Page Title" };
- page.On().SetLargeTitleDisplay(LargeTitleDisplayMode.Automatic);
- await Navigation.PushAsync(page);
- } )
- },
- new Button
- {
- Text = "Tooggle UseLargeTitles on Navigation",
- Command = new Command( () =>{
- var navPage = (NavigationPage)Parent;
- navPage.On().SetPrefersLargeTitles(!navPage.On().PrefersLargeTitles());
- } )
- },
-
- new Button
- {
- Text = "UseLargeTitles on Navigation with safe Area",
- Command = new Command( () =>{
- var navPage = (NavigationPage)Parent;
- navPage.On().SetPrefersLargeTitles(true);
- var page = new ContentPage { Title = "New Title", BackgroundColor = Colors.Red };
- page.SafeAreaEdges = Microsoft.Maui.SafeAreaEdges.All;
- var listView = new ListView(ListViewCachingStrategy.RecycleElementAndDataTemplate)
- {
- HasUnevenRows = true,
- VerticalOptions = LayoutOptions.Fill
- };
-
- listView.ItemTemplate = new DataTemplate(()=>{
- var cell = new ViewCell();
- cell.View = new Label { Text ="Hello", FontSize = 30};
- return cell;
- });
- listView.ItemsSource = Enumerable.Range(1, 40);
- listView.Header = new Label { BackgroundColor = Colors.Pink , Text = "I'm a header, background is red"};
- listView.Footer = new Label { BackgroundColor = Colors.Yellow , Text = "I'm a footer, you should see no white below me"};
- page.Content = listView;
- navPage.PushAsync(page);
- } )
- },
- offscreenPageLimit
- }
- };
-
- var restoreButton = new Button { Text = "Back To Gallery" };
- restoreButton.Clicked += async (sender, args) => await Navigation.PopAsync();
- content.Children.Add(restoreButton);
-
- Content = content;
- }
- }
-}
diff --git a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSLargeTitlePage.cs b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSLargeTitlePage.cs
new file mode 100644
index 000000000000..22f70954eaae
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSLargeTitlePage.cs
@@ -0,0 +1,228 @@
+using System;
+using System.Linq;
+using Microsoft.Maui;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.PlatformConfiguration;
+using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
+using Microsoft.Maui.Graphics;
+
+namespace Maui.Controls.Sample.Pages;
+
+public partial class iOSLargeTitlePage : ContentPage
+{
+ public iOSLargeTitlePage()
+ {
+ Title = "Large Titles";
+
+ // Set the parent NavigationPage's BarTextColor to black when this page appears
+ Appearing += (s, e) =>
+ {
+ if (Parent is Microsoft.Maui.Controls.NavigationPage navPage)
+ {
+ navPage.BarTextColor = Colors.Black;
+ }
+ };
+
+ var scrollView = new Microsoft.Maui.Controls.ScrollView
+ {
+ Content = new StackLayout
+ {
+ Padding = new Thickness(10),
+ Spacing = 15,
+ Children =
+ {
+ // Display Mode Section
+ new Label
+ {
+ Text = "Display Mode",
+ FontSize = 20,
+ FontAttributes = FontAttributes.Bold,
+ Margin = new Thickness(0, 10, 0, 0)
+ },
+ new Button
+ {
+ Text = "Never - Hide large title",
+ Command = new Command(() => On().SetLargeTitleDisplay(LargeTitleDisplayMode.Never))
+ },
+ new Button
+ {
+ Text = "Always - Show large title",
+ Command = new Command(() => On().SetLargeTitleDisplay(LargeTitleDisplayMode.Always))
+ },
+ new Button
+ {
+ Text = "Automatic - Inherit from previous page",
+ Command = new Command(async () =>
+ {
+ var page = new ContentPage { Title = "Automatic Mode" };
+ page.On().SetLargeTitleDisplay(LargeTitleDisplayMode.Automatic);
+ await Navigation.PushAsync(page);
+ })
+ },
+
+ // Navigation Configuration Section
+ new BoxView { HeightRequest = 1, Color = Colors.Gray, Margin = new Thickness(0, 10) },
+ new Label
+ {
+ Text = "Navigation Configuration",
+ FontSize = 20,
+ FontAttributes = FontAttributes.Bold
+ },
+ new Button
+ {
+ Text = "Toggle PrefersLargeTitles on NavigationPage",
+ Command = new Command(async () =>
+ {
+ var navPage = (Microsoft.Maui.Controls.NavigationPage)Parent;
+ navPage.On().SetPrefersLargeTitles(!navPage.On().PrefersLargeTitles());
+
+ // Refresh the page to show the change
+ Navigation.InsertPageBefore(new iOSLargeTitlePage(), this);
+ await Navigation.PopAsync(false);
+ })
+ },
+
+ // Scrolling Behavior Section
+ new BoxView { HeightRequest = 1, Color = Colors.Gray, Margin = new Thickness(0, 10) },
+ new Label
+ {
+ Text = "Scrolling Behavior",
+ FontSize = 20,
+ FontAttributes = FontAttributes.Bold
+ },
+ new Button
+ {
+ Text = "ScrollView - Watch title collapse on scroll",
+ Command = new Command(async () =>
+ {
+ var navPage = (Microsoft.Maui.Controls.NavigationPage)Parent;
+ navPage.On().SetPrefersLargeTitles(true);
+
+ var page = new ContentPage { Title = "Scroll Me" };
+ page.On().SetLargeTitleDisplay(LargeTitleDisplayMode.Always);
+
+ var scrollContent = new StackLayout { Padding = 20, Spacing = 10 };
+ for (int i = 1; i <= 50; i++)
+ {
+ scrollContent.Children.Add(new Label
+ {
+ Text = $"Item {i} - Scroll to see the large title collapse",
+ FontSize = 16,
+ Padding = new Thickness(0, 10)
+ });
+ }
+
+ page.Content = new Microsoft.Maui.Controls.ScrollView { Content = scrollContent };
+ await Navigation.PushAsync(page);
+ })
+ },
+ new Button
+ {
+ Text = "CollectionView - Large title with SafeArea",
+ Command = new Command(async () =>
+ {
+ var navPage = (Microsoft.Maui.Controls.NavigationPage)Parent;
+ navPage.On().SetPrefersLargeTitles(true);
+
+ var page = new ContentPage { Title = "CollectionView Demo", BackgroundColor = Colors.LightBlue };
+ page.On().SetLargeTitleDisplay(LargeTitleDisplayMode.Always);
+ page.SafeAreaEdges = Microsoft.Maui.SafeAreaEdges.All;
+
+ var collectionView = new Microsoft.Maui.Controls.CollectionView
+ {
+ VerticalOptions = LayoutOptions.Fill
+ };
+
+ collectionView.ItemTemplate = new DataTemplate(() =>
+ {
+ var label = new Label
+ {
+ Text = "Scroll to see title collapse",
+ FontSize = 18,
+ Padding = 15
+ };
+ return label;
+ });
+
+ collectionView.ItemsSource = Enumerable.Range(1, 40);
+ collectionView.Header = new Label { BackgroundColor = Colors.Pink, Text = "Header", Padding = 10, FontSize = 16 };
+ collectionView.Footer = new Label { BackgroundColor = Colors.Yellow, Text = "Footer", Padding = 10, FontSize = 16 };
+
+ page.Content = collectionView;
+ await navPage.PushAsync(page);
+ })
+ },
+ new Button
+ {
+ Text = "Transparent NavBar - Content shows through",
+ Command = new Command(async () =>
+ {
+ var navPage = (Microsoft.Maui.Controls.NavigationPage)Parent;
+ navPage.On().SetPrefersLargeTitles(true);
+ var previousBarColor = navPage.BarBackgroundColor;
+ navPage.BarBackgroundColor = Colors.Transparent;
+
+ var page = new ContentPage
+ {
+ Title = "Transparent Bar",
+ // Create a gradient background that shows through the nav bar
+ Background = new LinearGradientBrush
+ {
+ StartPoint = new Point(0, 0),
+ EndPoint = new Point(0, 1),
+ GradientStops = new GradientStopCollection
+ {
+ new GradientStop { Color = Color.FromArgb("#667eea"), Offset = 0.0f },
+ new GradientStop { Color = Color.FromArgb("#764ba2"), Offset = 1.0f }
+ }
+ }
+ };
+ page.On().SetLargeTitleDisplay(LargeTitleDisplayMode.Always);
+
+ var scrollContent = new StackLayout { Padding = 20, Spacing = 15 };
+ scrollContent.Children.Add(new Label
+ {
+ Text = "Notice how the gradient background shows through the navigation bar area. This follows Apple's HIG recommendation.",
+ FontSize = 16,
+ TextColor = Colors.White,
+ Margin = new Thickness(0, 20)
+ });
+
+ for (int i = 1; i <= 30; i++)
+ {
+ scrollContent.Children.Add(new Frame
+ {
+ BackgroundColor = Colors.White.WithAlpha(0.9f),
+ CornerRadius = 10,
+ Padding = 15,
+ Content = new Label
+ {
+ Text = $"Card {i} - Scroll to see the effect",
+ FontSize = 16
+ }
+ });
+ }
+
+ page.Content = new Microsoft.Maui.Controls.ScrollView { Content = scrollContent };
+ await Navigation.PushAsync(page);
+
+ // Restore opaque background when returning
+ page.Disappearing += (s, e) => navPage.BarBackgroundColor = previousBarColor;
+ })
+ },
+
+ // Back Button
+ new BoxView { HeightRequest = 1, Color = Colors.Gray, Margin = new Thickness(0, 10) },
+ new Button
+ {
+ Text = "← Back To Gallery",
+ Margin = new Thickness(0, 10, 0, 20),
+ Command = new Command(async () => await Navigation.PopAsync())
+ }
+ }
+ }
+ };
+
+ Content = scrollView;
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSLargeTitlePage.xaml b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSLargeTitlePage.xaml
deleted file mode 100644
index 20cb2334a915..000000000000
--- a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSLargeTitlePage.xaml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSLargeTitlePage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSLargeTitlePage.xaml.cs
deleted file mode 100644
index 92cad19ebad7..000000000000
--- a/src/Controls/samples/Controls.Sample/Pages/PlatformSpecifics/iOS/iOSLargeTitlePage.xaml.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Windows.Input;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.PlatformConfiguration;
-using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
-
-namespace Maui.Controls.Sample.Pages
-{
- public partial class iOSLargeTitlePage : ContentPage
- {
- public iOSLargeTitlePage()
- {
- InitializeComponent();
- }
-
- void OnButtonClicked(object sender, EventArgs e)
- {
- switch (On().LargeTitleDisplay())
- {
- case LargeTitleDisplayMode.Always:
- On().SetLargeTitleDisplay(LargeTitleDisplayMode.Automatic);
- break;
- case LargeTitleDisplayMode.Automatic:
- On().SetLargeTitleDisplay(LargeTitleDisplayMode.Never);
- break;
- case LargeTitleDisplayMode.Never:
- On().SetLargeTitleDisplay(LargeTitleDisplayMode.Always);
- break;
- }
- }
-
- void OnReturnButtonClicked(object sender, EventArgs e)
- {
- Navigation.PopAsync();
- }
- }
-}
diff --git a/src/Controls/samples/Controls.Sample/ViewModels/OthersViewModel.cs b/src/Controls/samples/Controls.Sample/ViewModels/OthersViewModel.cs
index 9c2798e06a94..aec7338e9b94 100644
--- a/src/Controls/samples/Controls.Sample/ViewModels/OthersViewModel.cs
+++ b/src/Controls/samples/Controls.Sample/ViewModels/OthersViewModel.cs
@@ -12,9 +12,6 @@ protected override IEnumerable CreateItems() => new[]
new SectionModel(typeof(GraphicsViewPage), "GraphicsView",
"Allow to draw directly in a Canvas. You can combine a canvas and native Views on the same page."),
- new SectionModel(typeof(LargeTitlesPageiOS), "Large Titles - iOS",
- "This iOS platform-specific is used to display the page title as a large title on the navigation bar of a NavigationPage, for devices that use iOS 11 or greater."),
-
new SectionModel(typeof(StyleSheetsPage), "StyleSheets",
"Demonstrates the usage of CSS in XAML."),
diff --git a/src/Controls/src/Build.Tasks/XmlTypeExtensions.cs b/src/Controls/src/Build.Tasks/XmlTypeExtensions.cs
index 3d894400c417..e6c52e656e67 100644
--- a/src/Controls/src/Build.Tasks/XmlTypeExtensions.cs
+++ b/src/Controls/src/Build.Tasks/XmlTypeExtensions.cs
@@ -111,7 +111,14 @@ public static bool TryGetTypeReference(this XmlType xmlType, XamlCache cache, Mo
string typeName = typeInfo.typeName.Replace('+', '/'); //Nested types
var type = module.GetTypeDefinition(cache, (typeInfo.assemblyName, typeInfo.clrNamespace, typeName));
if (type is not null && type.IsPublicOrVisibleInternal(module))
+ {
+ // Skip static classes found via the "Extension" suffix expansion when they shadow
+ // the exact name (e.g. MyEnumExtension shadowing MyEnum). Static types cannot
+ // implement IMarkupExtension, so they are never valid markup extensions. (#34021)
+ if (typeInfo.typeName != xmlType.Name && type.IsAbstract && type.IsSealed)
+ return null;
return type;
+ }
return null;
}, expandToExtension: expandToExtension);
diff --git a/src/Controls/src/Core/BindingExpression.cs b/src/Controls/src/Core/BindingExpression.cs
index 75ee9aaec0fc..fc83ec7fdefa 100644
--- a/src/Controls/src/Core/BindingExpression.cs
+++ b/src/Controls/src/Core/BindingExpression.cs
@@ -68,8 +68,11 @@ internal void Apply(object sourceObject, BindableObject target, BindableProperty
{
if (Binding is Binding { Source: var source, DataType: Type dataType })
{
- // Do not check type mismatch if this is a binding with Source and compilation of bindings with Source is disabled
- bool skipTypeMismatchCheck = source is not null && !RuntimeFeature.IsXamlCBindingWithSourceCompilationEnabled;
+ // Skip the type-mismatch check when an explicit concrete Source is provided (e.g. Source={x:Reference}).
+ // In a DataTemplate, x:DataType describes the item context - not the type of the referenced element.
+ // RelativeBindingSource is excluded: a mismatch against its source type must still be reported.
+ bool skipTypeMismatchCheck = (source is not null && source is not RelativeBindingSource)
+ || !RuntimeFeature.IsXamlCBindingWithSourceCompilationEnabled;
if (!skipTypeMismatchCheck)
{
if (sourceObject != null && !dataType.IsAssignableFrom(sourceObject.GetType()))
diff --git a/src/Controls/src/Core/Button/Button.iOS.cs b/src/Controls/src/Core/Button/Button.iOS.cs
index c710d5a2a8de..4e9f1fa1f067 100644
--- a/src/Controls/src/Core/Button/Button.iOS.cs
+++ b/src/Controls/src/Core/Button/Button.iOS.cs
@@ -204,10 +204,19 @@ void LayoutButton(UIButton platformButton, Button button, Rect size)
// Which makes the later math easier to follow
if (layout.Position == ButtonContentLayout.ImagePosition.Left || layout.Position == ButtonContentLayout.ImagePosition.Right)
{
- imageInsets.Left += titleWidth / 2;
- imageInsets.Right -= titleWidth / 2;
- titleInsets.Left -= imageWidth / 2;
- titleInsets.Right += imageWidth / 2;
+ // In RTL mode, physical Left/Right offsets must be reversed.
+ // Use EffectiveFlowDirection to handle both explicit and inherited RTL.
+ nfloat dir = ((IVisualElementController)button).EffectiveFlowDirection.IsRightToLeft() ? -1 : 1;
+
+ imageInsets.Left += dir * (titleWidth / 2);
+ imageInsets.Right -= dir * (titleWidth / 2);
+ titleInsets.Left -= dir * (imageWidth / 2);
+ titleInsets.Right += dir * (imageWidth / 2);
+
+ imageInsets.Left -= dir * ((titleWidth / 2) + sharedSpacing);
+ imageInsets.Right += dir * ((titleWidth / 2) + sharedSpacing);
+ titleInsets.Left += dir * ((imageWidth / 2) + sharedSpacing);
+ titleInsets.Right -= dir * ((imageWidth / 2) + sharedSpacing);
}
if (layout.Position == ButtonContentLayout.ImagePosition.Top)
@@ -236,23 +245,6 @@ void LayoutButton(UIButton platformButton, Button button, Rect size)
titleInsets.Right += (nfloat)padding.Right;
}
- else if (layout.Position == ButtonContentLayout.ImagePosition.Left)
- {
- imageInsets.Left -= (titleWidth / 2) + sharedSpacing;
- imageInsets.Right += (titleWidth / 2) + sharedSpacing;
-
- titleInsets.Left += (imageWidth / 2) + sharedSpacing;
- titleInsets.Right -= (imageWidth / 2) + sharedSpacing;
-
- }
- else if (layout.Position == ButtonContentLayout.ImagePosition.Right)
- {
- imageInsets.Left += (titleWidth / 2) + sharedSpacing;
- imageInsets.Right -= (titleWidth / 2) + sharedSpacing;
-
- titleInsets.Left -= (imageWidth / 2) + sharedSpacing;
- titleInsets.Right += (imageWidth / 2) + sharedSpacing;
- }
}
#pragma warning disable CA1416, CA1422
@@ -409,7 +401,10 @@ bool ResizeImageIfNecessary(UIButton platformButton, Button button, UIImage imag
return false;
}
- image = image?.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal);
+ // Preserve AlwaysTemplate if explicitly set (e.g., by a tint behavior),
+ // otherwise use AlwaysOriginal to prevent unwanted default tinting
+ if (image?.RenderingMode != UIImageRenderingMode.AlwaysTemplate)
+ image = image?.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal);
platformButton.SetImage(image, UIControlState.Normal);
diff --git a/src/Controls/src/Core/Compatibility/Handlers/FlyoutPage/iOS/PhoneFlyoutPageRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/FlyoutPage/iOS/PhoneFlyoutPageRenderer.cs
index 3c32df43d13e..9ec7e8447a56 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/FlyoutPage/iOS/PhoneFlyoutPageRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/FlyoutPage/iOS/PhoneFlyoutPageRenderer.cs
@@ -399,7 +399,7 @@ void LayoutChildren(bool animated)
if (IsRTL && !FlyoutOverlapsDetailsInPopoverMode)
{
- flyoutFrame.X = (int)(flyoutFrame.Width * .25);
+ flyoutFrame.X = (int)(frame.Width - flyoutFrame.Width);
}
var detailsFrame = frame;
diff --git a/src/Controls/src/Core/Compatibility/Handlers/NavigationPage/iOS/NavigationRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/NavigationPage/iOS/NavigationRenderer.cs
index f7928950539e..955508c8955a 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/NavigationPage/iOS/NavigationRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/NavigationPage/iOS/NavigationRenderer.cs
@@ -242,11 +242,28 @@ public override void ViewDidLoad()
Element.PropertyChanged += HandlePropertyChanged;
+ InteractivePopGestureRecognizer.Delegate = new GestureDelegate(() => _uiRequestedPop = true);
+
UpdateToolBarVisible();
UpdateBackgroundColor();
Current = navPage.CurrentPage;
}
+ class GestureDelegate : UIGestureRecognizerDelegate
+ {
+ readonly Func _shouldPop;
+
+ public GestureDelegate(Func shouldPop)
+ {
+ _shouldPop = shouldPop;
+ }
+
+ public override bool ShouldBegin(UIGestureRecognizer recognizer)
+ {
+ return _shouldPop();
+ }
+ }
+
protected override void Dispose(bool disposing)
{
if (_disposed)
@@ -265,6 +282,7 @@ protected override void Dispose(bool disposing)
_secondaryToolbar.RemoveFromSuperview();
_secondaryToolbar.Dispose();
_secondaryToolbar = null;
+ InteractivePopGestureRecognizer.Delegate = null;
if (_currentBarBackgroundBrush is GradientBrush gb)
gb.InvalidateGradientBrushRequested -= OnBarBackgroundChanged;
@@ -332,6 +350,7 @@ protected virtual async Task OnPopToRoot(Page page, bool animated)
}
UpdateToolBarVisible();
+ UpdateFlyoutMenuButton();
return success;
}
@@ -363,6 +382,7 @@ protected virtual async Task OnPopViewAsync(Page page, bool animated)
poppedViewController?.Dispose();
UpdateToolBarVisible();
+ UpdateFlyoutMenuButton();
return actuallyRemoved;
}
@@ -441,6 +461,12 @@ void FindParentFlyoutPage()
_parentFlyoutPage = flyoutDetail;
}
+ void UpdateFlyoutMenuButton(Page pageBeingRemoved = null)
+ {
+ var parentingViewController = GetParentingViewController();
+ parentingViewController?.UpdateLeftBarButtonItem(pageBeingRemoved);
+ }
+
TaskCompletionSource _pendingNavigationRequest;
ActionDisposable _removeLifecycleEvents;
@@ -470,6 +496,15 @@ Task GetAppearedOrDisappearedTask(Page page)
_ = page.ToPlatform(MauiContext);
var renderer = (IPlatformViewHandler)page.Handler;
+ // renderer or ViewController can be null if a rapid push/pop causes the handler
+ // to be torn down before this navigation completes (mirrors fix for ShellSectionRenderer #32426)
+ if (renderer?.ViewController == null)
+ {
+ var pendingTask = _pendingNavigationRequest.Task;
+ CompletePendingNavigation(false);
+ return pendingTask;
+ }
+
var parentViewController = renderer.ViewController.ParentViewController as ParentingViewController;
if (parentViewController == null)
throw new NotSupportedException("ParentingViewController parent could not be found. Please file a bug.");
@@ -659,7 +694,14 @@ void InsertPageBefore(Page page, Page before)
var pageContainer = CreateViewControllerForPage(page);
var target = nvh.ViewController.ParentViewController;
- ViewControllers = ViewControllers.Insert(ViewControllers.IndexOf(target), pageContainer);
+ var index = ViewControllers.IndexOf(target);
+ ViewControllers = ViewControllers.Insert(index, pageContainer);
+
+ // Update the flyout icon when the root page changes
+ if (index == 0)
+ {
+ (target as ParentingViewController)?.UpdateLeftBarButtonItem();
+ }
}
void OnInsertPageBeforeRequested(object sender, NavigationRequestedEventArgs e)
@@ -721,8 +763,7 @@ void RemovePage(Page page)
ViewControllers = _removeControllers;
}
target.Dispose();
- var parentingViewController = GetParentingViewController();
- parentingViewController?.UpdateLeftBarButtonItem(page);
+ UpdateFlyoutMenuButton(page);
}
void RemoveViewControllers(bool animated)
@@ -947,20 +988,56 @@ void UpdateBarTextColor()
? UINavigationBar.Appearance.TintColor
: iconColor.ToPlatform();
- if ((OperatingSystem.IsIOSVersionAtLeast(26) || OperatingSystem.IsMacCatalystVersionAtLeast(26)) && NavigationBar.TintColor is not null)
+ // iOS 26+ Liquid Glass ignores TintColor for the back button; apply via appearance instead.
+ if (OperatingSystem.IsIOSVersionAtLeast(26) || OperatingSystem.IsMacCatalystVersionAtLeast(26))
{
- if (VisibleViewController?.NavigationItem?.RightBarButtonItems is UIBarButtonItem[] items)
+ if (NavigationBar.TintColor is not null && VisibleViewController?.NavigationItem?.RightBarButtonItems is UIBarButtonItem[] items)
{
foreach (var item in items)
{
item.TintColor = NavigationBar.TintColor;
}
}
+
+ var useCustomColor = iconColor != null && NavPage.OnThisPlatform().GetStatusBarTextColorMode() != StatusBarTextColorMode.DoNotAdjust;
+ if (useCustomColor)
+ {
+ var backColor = iconColor.ToPlatform();
+ var colorAttributes = NSDictionary.FromObjectsAndKeys(
+ new NSObject[] { backColor }, new NSString[] { UIStringAttributeKey.ForegroundColor });
+ var appearance = new UIBarButtonItemAppearance(UIBarButtonItemStyle.Plain);
+ appearance.Normal.TitleTextAttributes = colorAttributes;
+ appearance.Highlighted.TitleTextAttributes = colorAttributes;
+ NavigationBar.CompactAppearance.BackButtonAppearance = appearance;
+ NavigationBar.StandardAppearance.BackButtonAppearance = appearance;
+ NavigationBar.ScrollEdgeAppearance.BackButtonAppearance = appearance;
+
+ var backimage = UIImage.GetSystemImage("chevron.backward");
+ if (backimage is not null)
+ {
+ var tinted = backimage.ApplyTintColor(backColor).ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal);
+ NavigationBar.BackIndicatorImage = tinted;
+ NavigationBar.BackIndicatorTransitionMaskImage = tinted;
+ }
+ }
+ else
+ {
+ NavigationBar.CompactAppearance.BackButtonAppearance = null;
+ NavigationBar.StandardAppearance.BackButtonAppearance = null;
+ NavigationBar.ScrollEdgeAppearance.BackButtonAppearance = null;
+ NavigationBar.BackIndicatorImage = null;
+ NavigationBar.BackIndicatorTransitionMaskImage = null;
+ }
}
}
void SetStatusBarStyle()
{
+ if (NavPage is null)
+ {
+ return;
+ }
+
var barTextColor = NavPage.BarTextColor;
var statusBarColorMode = NavPage.OnThisPlatform().GetStatusBarTextColorMode();
@@ -1026,6 +1103,8 @@ async Task UpdateFormsInnerNavigation(Page pageBeingRemoved)
if (Element.Navigation.NavigationStack.Contains(pageBeingRemoved))
{
await (NavPage as INavigationPageController)?.RemoveAsyncInner(pageBeingRemoved, false, true);
+ UpdateFlyoutMenuButton();
+
if (_uiRequestedPop)
{
NavPage?.SendNavigatedFromHandler(pageBeingRemoved, NavigationType.Pop);
@@ -1424,8 +1503,20 @@ public override void ViewDidLoad()
{
base.ViewDidLoad();
- _tracker.Target = Child;
- _tracker.AdditionalTargets = Child.GetParentPages();
+ var parentPages = Child.GetParentPages();
+ var flyoutPageWithToolbarItems = FindFlyoutPageWithToolbarItems(parentPages);
+ if (flyoutPageWithToolbarItems != null)
+ {
+ _tracker.Target = flyoutPageWithToolbarItems.Flyout;
+ var additionalTargets = new List(parentPages);
+ additionalTargets.Add(Child);
+ _tracker.AdditionalTargets = additionalTargets;
+ }
+ else
+ {
+ _tracker.Target = Child;
+ _tracker.AdditionalTargets = parentPages;
+ }
_tracker.CollectionChanged += TrackerOnCollectionChanged;
UpdateToolbarItems();
@@ -1676,8 +1767,7 @@ internal void UpdateLeftBarButtonItem(Page pageBeingRemoved = null)
return;
var currentChild = this.Child;
- var firstPage = n.NavPageController.Pages.FirstOrDefault();
-
+ var firstPage = (n.ViewControllers.FirstOrDefault() as ParentingViewController)?.Child;
if (n._parentFlyoutPage == null)
return;
@@ -1745,6 +1835,18 @@ internal void UpdateTitleArea(Page page)
}
}
+ FlyoutPage FindFlyoutPageWithToolbarItems(IEnumerable parentPages)
+ {
+ foreach (var page in parentPages)
+ {
+ if (page is FlyoutPage flyoutPage && flyoutPage.Flyout?.ToolbarItems?.Count > 0)
+ {
+ return flyoutPage;
+ }
+ }
+ return null;
+ }
+
///
/// Creates a Container with the appropriate configuration for the current iOS version.
/// For iOS 26+, uses autoresizing masks and sets frame from navigation bar to prevent layout issues.
@@ -2330,10 +2432,34 @@ public override CGRect Frame
value.Width = (value.X - xSpace) + value.Width;
value.X = xSpace;
}
+
+ if (_child?.VirtualView is IView view)
+ {
+ var margin = view.Margin;
+
+ // Apply margins AFTER back button spacing calculations
+ // Margins push the view inward to keep it within the nav bar bounds
+ var newWidth = value.Width - (nfloat)(margin.Left + margin.Right);
+ if (newWidth < 0)
+ newWidth = 0;
+
+ value = new RectangleF(
+ value.X + (nfloat)margin.Left,
+ value.Y + (nfloat)margin.Top,
+ newWidth,
+ value.Height
+ );
+ }
}
- ;
value.Height = ToolbarHeight;
+
+ // Reduce height by vertical margins so the view stays within the nav bar
+ if (_child?.VirtualView is IView marginView)
+ {
+ var verticalMargin = (nfloat)(marginView.Margin.Top + marginView.Margin.Bottom);
+ value.Height = (nfloat)Math.Max(0, value.Height - verticalMargin);
+ }
}
base.Frame = value;
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellBottomNavViewAppearanceTracker.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellBottomNavViewAppearanceTracker.cs
index 1f9d682d41d9..b7718728d990 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellBottomNavViewAppearanceTracker.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellBottomNavViewAppearanceTracker.cs
@@ -131,7 +131,7 @@ static ColorStateList MakeDefaultColorStateList(Context context)
return null;
var baseCSL = AppCompatResources.GetColorStateList(context, mTypedValue.ResourceId);
- var colorPrimary = (ShellRenderer.IsDarkTheme) ? AColor.White : ShellRenderer.DefaultBackgroundColor.ToPlatform();
+ var colorPrimary = (ShellRenderer.IsDarkTheme) ? AColor.White : RuntimeFeature.IsMaterial3Enabled ? Color.FromArgb("#625B71").ToPlatform() : ShellRenderer.DefaultBackgroundColor.ToPlatform();
int defaultColor = baseCSL.DefaultColor;
var disabledcolor = baseCSL.GetColorForState(new[] { -R.Attribute.StateEnabled }, AColor.Gray);
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellFlyoutTemplatedContentRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellFlyoutTemplatedContentRenderer.cs
index 75c19f1ffb26..d2311ce85709 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellFlyoutTemplatedContentRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellFlyoutTemplatedContentRenderer.cs
@@ -53,7 +53,7 @@ public class ShellFlyoutTemplatedContentRenderer : Java.Lang.Object, IShellFlyou
protected IShellContext ShellContext => _shellContext;
protected AView FooterView => _footerView?.PlatformView;
protected AView View => _rootView;
- WindowsListener _windowsListener;
+ ShellFlyoutWindowInsetListener _shellFlyoutListener;
public ShellFlyoutTemplatedContentRenderer(IShellContext shellContext)
@@ -85,7 +85,7 @@ void OnFlyoutStateChanging(object sender, AndroidX.DrawerLayout.Widget.DrawerLay
// - Keep this minimal.
// - Will be replaced by the planned comprehensive window insets solution.
// - Do not extend; add new logic to the forthcoming implementation instead.
- internal class WindowsListener : MauiWindowInsetListener, IOnApplyWindowInsetsListener
+ internal class ShellFlyoutWindowInsetListener : MauiWindowInsetListener
{
private WeakReference _bgImageRef;
private WeakReference _flyoutViewRef;
@@ -120,7 +120,7 @@ public AView FooterView
}
}
- public WindowsListener(ImageView bgImage)
+ public ShellFlyoutWindowInsetListener(ImageView bgImage)
{
_bgImageRef = new WeakReference(bgImage);
}
@@ -207,8 +207,8 @@ protected virtual void LoadView(IShellContext shellContext)
LayoutParameters = new LP(coordinator.LayoutParameters)
};
- _windowsListener = new WindowsListener(_bgImage);
- MauiWindowInsetListener.SetupViewWithLocalListener(coordinator, _windowsListener);
+ _shellFlyoutListener = new ShellFlyoutWindowInsetListener(_bgImage);
+ MauiWindowInsetListener.SetupViewWithLocalListener(coordinator, _shellFlyoutListener);
UpdateFlyoutHeaderBehavior();
_shellContext.Shell.PropertyChanged += OnShellPropertyChanged;
@@ -304,7 +304,7 @@ protected virtual void UpdateFlyoutContent()
}
_flyoutContentView = CreateFlyoutContent(_rootView);
- _windowsListener.FlyoutView = _flyoutContentView;
+ _shellFlyoutListener.FlyoutView = _flyoutContentView;
if (_flyoutContentView == null)
return;
@@ -421,7 +421,7 @@ protected virtual void UpdateFlyoutFooter()
var oldFooterView = _footerView;
_rootView.RemoveView(_footerView);
_footerView = null;
- _windowsListener.FooterView = null;
+ _shellFlyoutListener.FooterView = null;
oldFooterView.View = null;
}
@@ -441,7 +441,7 @@ protected virtual void UpdateFlyoutFooter()
MatchWidth = true
};
- _windowsListener.FooterView = _footerView;
+ _shellFlyoutListener.FooterView = _footerView;
var footerViewLP = new CoordinatorLayout.LayoutParams(0, 0)
{
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellItemRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellItemRenderer.cs
index 650b3fabb113..d0c1dc495539 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellItemRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellItemRenderer.cs
@@ -13,6 +13,7 @@
using Google.Android.Material.Navigation;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
+using Microsoft.Maui.Controls.Handlers.Compatibility;
using Microsoft.Maui.Graphics;
using AColor = Android.Graphics.Color;
using AView = Android.Views.View;
@@ -141,6 +142,11 @@ protected virtual void SetAppearance(ShellAppearance appearance)
return;
}
+ // Apply background color from appearance, fallback to default if unavailable
+ if (_bottomView.Background is ColorDrawable background && appearance is IShellAppearanceElement appearanceElement)
+ {
+ background.Color = appearanceElement.EffectiveTabBarBackgroundColor?.ToPlatform() ?? ShellRenderer.DefaultBottomNavigationViewBackgroundColor.ToPlatform();
+ }
_appearanceSet = true;
_appearanceTracker.SetAppearance(_bottomView, appearance);
}
@@ -456,7 +462,7 @@ _updateMenuItemSource is not null &&
}
}
- if (DisplayedPage is null)
+ if (DisplayedPage is null && !_menuSetup)
return;
if (ShellItemController.ShowTabs)
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellPageContainer.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellPageContainer.cs
index c58fcf794e9f..408eec70fc87 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellPageContainer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellPageContainer.cs
@@ -14,8 +14,6 @@ internal class ShellPageContainer : ViewGroup
{
static int? DarkBackground;
static int? LightBackground;
-
-
public IViewHandler Child { get; set; }
public bool IsInFragment { get; set; }
@@ -24,13 +22,13 @@ public ShellPageContainer(Context context, IPlatformViewHandler child, bool inFr
{
Child = child;
IsInFragment = inFragment;
- if (child.VirtualView.Background == null)
+ if (child.VirtualView.Background is null)
{
- int color;
- if (ShellRenderer.IsDarkTheme)
- color = DarkBackground ??= ContextCompat.GetColor(context, AColorRes.BackgroundDark);
- else
- color = LightBackground ??= ContextCompat.GetColor(context, AColorRes.BackgroundLight);
+ bool isDark = ShellRenderer.IsDarkTheme;
+
+ int color = RuntimeFeature.IsMaterial3Enabled
+ ? GetMaterial3Background(context)
+ : GetResourceBackground(context, isDark);
child.PlatformView.SetBackgroundColor(new AColor(color));
}
@@ -38,6 +36,27 @@ public ShellPageContainer(Context context, IPlatformViewHandler child, bool inFr
AddView(child.PlatformView);
}
+ int GetMaterial3Background(Context context)
+ {
+ // Material 3 colorSurface automatically adapts to light/dark theme
+ // The theme resolution happens in GetThemeAttrColor based on the active theme
+ return ContextExtensions.GetThemeAttrColor(context, Resource.Attribute.colorSurface);
+ }
+
+ int GetResourceBackground(Context context, bool isDark)
+ {
+ int color;
+ if (isDark)
+ {
+ color = DarkBackground ??= ContextCompat.GetColor(context, AColorRes.BackgroundDark);
+ }
+ else
+ {
+ color = LightBackground ??= ContextCompat.GetColor(context, AColorRes.BackgroundLight);
+ }
+ return color;
+ }
+
protected override void OnLayout(bool changed, int l, int t, int r, int b)
{
var width = r - l;
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellRenderer.cs
index 079585280840..c54aa140c971 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellRenderer.cs
@@ -92,14 +92,12 @@ void IAppearanceObserver.OnAppearanceChanged(ShellAppearance appearance)
// These are the primary colors in our styles.xml file
- public static Color DefaultBackgroundColor => ResolveThemeColor(Color.FromArgb("#2c3e50"), Color.FromArgb("#1B3147"));
-
- public static readonly Color DefaultForegroundColor = Colors.White;
- public static readonly Color DefaultTitleColor = Colors.White;
+ public static Color DefaultBackgroundColor => ResolveThemeColor(RuntimeFeature.IsMaterial3Enabled ? Color.FromArgb("#FEF7FF") : Color.FromArgb("#2c3e50"), RuntimeFeature.IsMaterial3Enabled ? Color.FromArgb("#141218") : Color.FromArgb("#1B3147"));
+ public static Color DefaultForegroundColor => ResolveThemeColor(RuntimeFeature.IsMaterial3Enabled ? Color.FromArgb("#1D1B20") : Colors.Black, RuntimeFeature.IsMaterial3Enabled ? Color.FromArgb("#E6E0E9") : Colors.White);
+ public static Color DefaultTitleColor => ResolveThemeColor(RuntimeFeature.IsMaterial3Enabled ? Color.FromArgb("#1D1B20") : Colors.White, RuntimeFeature.IsMaterial3Enabled ? Color.FromArgb("#E6E0E9") : Colors.White);
public static readonly Color DefaultUnselectedColor = Color.FromRgba(255, 255, 255, 180);
- internal static Color DefaultBottomNavigationViewBackgroundColor => ResolveThemeColor(Colors.White, Color.FromArgb("#1B3147"));
-
- internal static bool IsDarkTheme => (Application.Current?.RequestedTheme == AppTheme.Dark);
+ internal static Color DefaultBottomNavigationViewBackgroundColor => ResolveThemeColor(RuntimeFeature.IsMaterial3Enabled ? Color.FromArgb("#F3EDF7") : Colors.White, RuntimeFeature.IsMaterial3Enabled ? Color.FromArgb("#1D1B20") : Color.FromArgb("#1B3147"));
+ internal static bool IsDarkTheme => Application.Current?.RequestedTheme == AppTheme.Dark;
static Color ResolveThemeColor(Color light, Color dark)
{
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellSectionRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellSectionRenderer.cs
index a3f4513ccaf2..5bb034f40632 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellSectionRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellSectionRenderer.cs
@@ -84,6 +84,7 @@ void AView.IOnClickListener.OnClick(AView v)
protected IShellContext ShellContext => _shellContext;
IShellSectionController SectionController => (IShellSectionController)ShellSection;
IMauiContext MauiContext => ShellContext.Shell.Handler.MauiContext;
+ Toolbar _shellToolbar;
public ShellSectionRenderer(IShellContext shellContext)
{
@@ -108,9 +109,9 @@ public override AView OnCreateView(LayoutInflater inflater, ViewGroup container,
int actionBarHeight = context.GetActionBarHeight();
- var shellToolbar = new Toolbar(shellSection);
- ShellToolbarTracker.ApplyToolbarChanges(_shellContext.Shell.Toolbar, shellToolbar);
- _toolbar = (AToolbar)shellToolbar.ToPlatform(_shellContext.Shell.FindMauiContext());
+ _shellToolbar = new Toolbar(shellSection);
+ ShellToolbarTracker.ApplyToolbarChanges(_shellContext.Shell.Toolbar, _shellToolbar);
+ _toolbar = (AToolbar)_shellToolbar.ToPlatform(_shellContext.Shell.FindMauiContext());
appbar.AddView(_toolbar);
_tablayout = PlatformInterop.CreateShellTabLayout(context, appbar, actionBarHeight);
@@ -135,7 +136,7 @@ public override AView OnCreateView(LayoutInflater inflater, ViewGroup container,
}
_toolbarTracker = _shellContext.CreateTrackerForToolbar(_toolbar);
- _toolbarTracker.SetToolbar(shellToolbar);
+ _toolbarTracker.SetToolbar(_shellToolbar);
_toolbarTracker.Page = currentPage;
_viewPager.CurrentItem = currentIndex;
@@ -228,6 +229,7 @@ void Destroy()
_toolbarTracker = null;
_tablayout = null;
_toolbar = null;
+ _shellToolbar = null;
_viewPager = null;
_rootView = null;
@@ -240,6 +242,17 @@ public override void OnDestroy()
Destroy();
base.OnDestroy();
}
+
+ public override void OnHiddenChanged(bool hidden)
+ {
+ base.OnHiddenChanged(hidden);
+
+ if (!hidden && _shellToolbar?.Handler != null)
+ {
+ _shellToolbar.Handler.UpdateValue(nameof(Toolbar.TitleView));
+ }
+ }
+
protected override void Dispose(bool disposing)
{
if (_disposed)
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellToolbarAppearanceTracker.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellToolbarAppearanceTracker.cs
index 597a57ddb6ea..1c466efc50ba 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellToolbarAppearanceTracker.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellToolbarAppearanceTracker.cs
@@ -45,7 +45,6 @@ protected virtual void SetColors(AToolbar toolbar, IShellToolbarTracker toolbarT
shellToolbar.BarTextColor = title ?? ShellRenderer.DefaultTitleColor;
shellToolbar.BarBackground = new SolidColorBrush(background ?? ShellRenderer.DefaultBackgroundColor);
shellToolbar.IconColor = foreground ?? ShellRenderer.DefaultForegroundColor;
- toolbarTracker.TintColor = foreground ?? ShellRenderer.DefaultForegroundColor;
}
#region IDisposable
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellToolbarTracker.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellToolbarTracker.cs
index feda1cdbb481..e403a8e4c08e 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellToolbarTracker.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellToolbarTracker.cs
@@ -297,7 +297,13 @@ void OnShellNavigated(object sender, ShellNavigatedEventArgs e)
void HandleShellPropertyChanged(object sender, PropertyChangedEventArgs e)
{
if (e.Is(Shell.FlyoutIconProperty))
+ {
+ UpdateLeftBarButtonItem();
+ }
+ else if (e.Is(Shell.ForegroundColorProperty))
+ {
UpdateLeftBarButtonItem();
+ }
}
BackButtonBehavior _backButtonBehavior = null;
@@ -326,6 +332,10 @@ protected virtual void OnPagePropertyChanged(object sender, PropertyChangedEvent
}
else if (e.PropertyName == Shell.TitleViewProperty.PropertyName)
UpdateTitleView();
+ else if (e.PropertyName == Shell.ForegroundColorProperty.PropertyName)
+ {
+ UpdateLeftBarButtonItem();
+ }
}
void OnBackButtonBehaviorChanged(object sender, PropertyChangedEventArgs e)
@@ -423,7 +433,7 @@ protected virtual async void UpdateLeftBarButtonItem(Context context, AToolbar t
DrawerArrowDrawable icon = null;
bool defaultDrawerArrowDrawable = false;
- var tintColor = Colors.White;
+ var tintColor = Shell.GetForegroundColor(page) ?? Shell.GetForegroundColor(_shell);
if (TintColor != null)
tintColor = TintColor;
@@ -471,23 +481,23 @@ protected virtual async void UpdateLeftBarButtonItem(Context context, AToolbar t
icon = _flyoutIconDrawerDrawable;
}
- if (icon == null && (_flyoutBehavior == FlyoutBehavior.Flyout || CanNavigateBack))
+ if (icon == null && (_flyoutBehavior == FlyoutBehavior.Flyout || (CanNavigateBack && backButtonVisible)))
{
_drawerArrowDrawable ??= new DrawerArrowDrawable(context.GetThemedContext());
icon = _drawerArrowDrawable;
defaultDrawerArrowDrawable = true;
}
- icon?.Progress = (CanNavigateBack) ? 1 : 0;
+ icon?.Progress = (CanNavigateBack && backButtonVisible) ? 1 : 0;
- if (command != null || CanNavigateBack)
+ if (command != null || (CanNavigateBack && backButtonVisible))
{
_drawerToggle.DrawerIndicatorEnabled = false;
if (backButtonVisibleFromBehavior && (backButtonVisible || !defaultDrawerArrowDrawable))
toolbar.NavigationIcon = icon;
}
- else if (_flyoutBehavior == FlyoutBehavior.Flyout || !defaultDrawerArrowDrawable)
+ else if (_flyoutBehavior == FlyoutBehavior.Flyout || (!defaultDrawerArrowDrawable && backButtonVisible))
{
bool drawerEnabled = isEnabled && icon != null;
_drawerToggle.DrawerIndicatorEnabled = drawerEnabled;
@@ -503,6 +513,7 @@ protected virtual async void UpdateLeftBarButtonItem(Context context, AToolbar t
else
{
_drawerToggle.DrawerIndicatorEnabled = false;
+ toolbar.NavigationIcon = null;
}
_drawerToggle.SyncState();
@@ -557,7 +568,7 @@ protected virtual void UpdateToolbarIconAccessibilityText(AToolbar toolbar, Shel
else if (image == null ||
toolbar.SetNavigationContentDescription(image) == null)
{
- if (CanNavigateBack)
+ if (CanNavigateBack && _toolbar?.BackButtonVisible == true)
toolbar.SetNavigationContentDescription(Resource.String.nav_app_bar_navigate_up_description);
else
toolbar.SetNavigationContentDescription(Resource.String.nav_app_bar_open_drawer_description);
@@ -600,13 +611,22 @@ void UpdateNavBarHasShadow(Page page)
{
if (page == null || !_appBar.IsAlive())
return;
-
if (Shell.GetNavBarHasShadow(page))
{
- if (_appBarElevation <= 0)
- _appBarElevation = _appBar.Context.ToPixels(4);
+ if (RuntimeFeature.IsMaterial3Enabled)
+ {
+ // AppBar elevation is set 0f to match Material 3 AppBar behavior.
+ _appBar.SetElevation(0f);
+ }
+ else
+ {
+ if (_appBarElevation <= 0)
+ {
+ _appBarElevation = _appBar.Context.ToPixels(4);
+ }
- _appBar.SetElevation(_appBarElevation);
+ _appBar.SetElevation(_appBarElevation);
+ }
}
else
{
@@ -648,10 +668,10 @@ protected virtual void UpdateToolbarItems(AToolbar toolbar, Page page)
{
var menu = toolbar.Menu;
SearchHandler = Shell.GetSearchHandler(page);
- if (SearchHandler != null && SearchHandler.SearchBoxVisibility != SearchBoxVisibility.Hidden)
+ if (SearchHandler is not null && SearchHandler.SearchBoxVisibility != SearchBoxVisibility.Hidden)
{
var context = ShellContext.AndroidContext;
- if (_searchView == null)
+ if (_searchView is null)
{
_searchView = GetSearchView(context);
_searchView.SearchHandler = SearchHandler;
@@ -677,21 +697,31 @@ protected virtual void UpdateToolbarItems(AToolbar toolbar, Page page)
icon.SetColorFilter(TintColor.ToPlatform(Colors.White), FilterMode.SrcAtop);
item.SetShowAsAction(ShowAsAction.IfRoom | ShowAsAction.CollapseActionView);
- if (_searchView.View.Parent != null)
+ if (_searchView.View.Parent is not null)
+ {
_searchView.View.RemoveFromParent();
+ }
item.SetActionView(_searchView.View);
item.Dispose();
}
else if (SearchHandler.SearchBoxVisibility == SearchBoxVisibility.Expanded)
{
+ // Remove the placeholder menu item, if it exists, added for collapsible mode.
+ if (menu.FindItem(_placeholderMenuItemId) is not null)
+ {
+ menu.RemoveItem(_placeholderMenuItemId);
+ }
+
if (_searchView.View.Parent != _platformToolbar)
+ {
_platformToolbar.AddView(_searchView.View);
+ }
}
}
else
{
- if (_searchView != null)
+ if (_searchView is not null)
{
_searchView.View.RemoveFromParent();
_searchView.View.ViewAttachedToWindow -= OnSearchViewAttachedToWindow;
@@ -789,8 +819,15 @@ public override void Draw(Canvas canvas)
bool pressed = false;
if (IconBitmap != null)
{
- ADrawableCompat.SetTint(IconBitmap, TintColor.ToPlatform());
- ADrawableCompat.SetTintMode(IconBitmap, PorterDuff.Mode.SrcAtop);
+ if (TintColor is not null)
+ {
+ ADrawableCompat.SetTint(IconBitmap, TintColor.ToPlatform());
+ ADrawableCompat.SetTintMode(IconBitmap, PorterDuff.Mode.SrcAtop);
+ }
+ else
+ {
+ ADrawableCompat.SetTintList(IconBitmap, null); // Clear tint to preserve original icon colors
+ }
IconBitmap.SetBounds(Bounds.Left, Bounds.Top, Bounds.Right, Bounds.Bottom);
IconBitmap.Draw(canvas);
@@ -800,7 +837,7 @@ public override void Draw(Canvas canvas)
var paint = new Paint { AntiAlias = true };
paint.TextSize = _defaultSize;
#pragma warning disable CA1416 // https://github.com/xamarin/xamarin-android/issues/6962
- paint.Color = pressed ? _pressedBackgroundColor.ToPlatform() : TintColor.ToPlatform();
+ paint.Color = pressed ? _pressedBackgroundColor.ToPlatform() : (TintColor ?? Colors.White).ToPlatform();
#pragma warning restore CA1416
paint.SetStyle(Paint.Style.Fill);
var y = (Bounds.Height() + paint.TextSize) / 2;
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/SafeShellTabBarAppearanceTracker.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/SafeShellTabBarAppearanceTracker.cs
index 168d119d8e2c..e0ecca140f76 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/SafeShellTabBarAppearanceTracker.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/SafeShellTabBarAppearanceTracker.cs
@@ -28,8 +28,8 @@ public virtual void SetAppearance(UITabBarController controller, ShellAppearance
{
IShellAppearanceElement appearanceElement = appearance;
var backgroundColor = appearanceElement.EffectiveTabBarBackgroundColor;
- var foregroundColor = appearanceElement.EffectiveTabBarForegroundColor; // Currently unused
- var disabledColor = appearanceElement.EffectiveTabBarDisabledColor; // Unused on iOS
+ var foregroundColor = appearanceElement.EffectiveTabBarForegroundColor;
+ var disabledColor = appearanceElement.EffectiveTabBarDisabledColor;
var unselectedColor = appearanceElement.EffectiveTabBarUnselectedColor;
var titleColor = appearanceElement.EffectiveTabBarTitleColor;
@@ -75,6 +75,7 @@ void UpdateiOS15TabBarAppearance(UITabBarController controller, ShellAppearance
var foregroundColor = appearanceElement.EffectiveTabBarForegroundColor;
var unselectedColor = appearanceElement.EffectiveTabBarUnselectedColor;
var titleColor = appearanceElement.EffectiveTabBarTitleColor;
+ var disabledColor = appearanceElement.EffectiveTabBarDisabledColor;
controller.TabBar
.UpdateiOS15TabBarAppearance(
@@ -86,6 +87,19 @@ void UpdateiOS15TabBarAppearance(UITabBarController controller, ShellAppearance
backgroundColor,
titleColor ?? foregroundColor,
unselectedColor);
+
+ // Set disabled color in the global appearance for text-only tabs
+ if (disabledColor is not null && _tabBarAppearance is not null)
+ {
+ var disabledUIColor = disabledColor.ToPlatform();
+ var disabledAttributes = new UIStringAttributes { ForegroundColor = disabledUIColor };
+
+ _tabBarAppearance.StackedLayoutAppearance.Disabled.TitleTextAttributes = disabledAttributes;
+ _tabBarAppearance.InlineLayoutAppearance.Disabled.TitleTextAttributes = disabledAttributes;
+ _tabBarAppearance.CompactInlineLayoutAppearance.Disabled.TitleTextAttributes = disabledAttributes;
+
+ controller.TabBar.StandardAppearance = controller.TabBar.ScrollEdgeAppearance = _tabBarAppearance;
+ }
}
void UpdateTabBarAppearance(UITabBarController controller, ShellAppearance appearance)
@@ -95,6 +109,7 @@ void UpdateTabBarAppearance(UITabBarController controller, ShellAppearance appea
var foregroundColor = appearanceElement.EffectiveTabBarForegroundColor;
var unselectedColor = appearanceElement.EffectiveTabBarUnselectedColor;
var titleColor = appearanceElement.EffectiveTabBarTitleColor;
+ var disabledColor = appearanceElement.EffectiveTabBarDisabledColor;
var tabBar = controller.TabBar;
@@ -113,6 +128,10 @@ void UpdateTabBarAppearance(UITabBarController controller, ShellAppearance appea
tabBar.TintColor = (foregroundColor ?? titleColor).ToPlatform();
UITabBarItem.Appearance.SetTitleTextAttributes(new UIStringAttributes { ForegroundColor = (titleColor ?? foregroundColor).ToPlatform() }, UIControlState.Selected);
}
+
+ // Set disabled color for text-only tabs
+ if (disabledColor is not null && disabledColor.IsNotDefault())
+ UITabBarItem.Appearance.SetTitleTextAttributes(new UIStringAttributes { ForegroundColor = disabledColor.ToPlatform() }, UIControlState.Disabled);
}
}
}
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/SearchHandlerAppearanceTracker.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/SearchHandlerAppearanceTracker.cs
index 3096d9eab8f4..8547b700ddc6 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/SearchHandlerAppearanceTracker.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/SearchHandlerAppearanceTracker.cs
@@ -40,7 +40,6 @@ public SearchHandlerAppearanceTracker(UISearchBar searchBar, SearchHandler searc
_uiSearchBar.OnEditingStarted += OnEditingStarted;
_uiSearchBar.OnEditingStopped += OnEditingEnded;
_uiSearchBar.TextChanged += OnTextChanged;
- _uiSearchBar.ShowsCancelButton = false;
GetDefaultSearchBarColors(_uiSearchBar);
var uiTextField = searchBar.FindDescendantView();
UpdateSearchBarColors();
@@ -151,25 +150,25 @@ void UpdateSearchBarBackgroundColor(UITextField textField)
if (!_hasCustomBackground && backGroundColor == null)
return;
- var backgroundView = textField.Subviews[0];
-
if (backGroundColor == null)
{
- backgroundView.Layer.CornerRadius = 0;
- backgroundView.ClipsToBounds = false;
- backgroundView.BackgroundColor = _defaultBackgroundColor;
+ // Reset to defaults
+ textField.Layer.CornerRadius = 0;
+ textField.ClipsToBounds = false;
+ textField.BackgroundColor = _defaultBackgroundColor;
+ _hasCustomBackground = false;
+ }
+ else
+ {
+ _hasCustomBackground = true;
+ textField.Layer.CornerRadius = 10;
+ textField.ClipsToBounds = true;
+ if (_defaultBackgroundColor is null)
+ {
+ _defaultBackgroundColor = backGroundColor.ToPlatform();
+ }
+ textField.BackgroundColor = backGroundColor.ToPlatform();
}
-
- _hasCustomBackground = true;
-
- backgroundView.Layer.CornerRadius = 10;
- backgroundView.ClipsToBounds = true;
- if (_defaultBackgroundColor == null)
- _defaultBackgroundColor = backgroundView.BackgroundColor;
-
- UIColor backgroundColor = backGroundColor.ToPlatform();
- backgroundView.BackgroundColor = backgroundColor;
- textField.BackgroundColor = backgroundColor;
}
void UpdateCancelButtonColor(UIButton cancelButton)
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs
index 5d29846d0125..4c9428cf5bec 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs
@@ -4,6 +4,7 @@
using System.Collections.Specialized;
using System.ComponentModel;
using System.Linq;
+using CoreGraphics;
using Foundation;
using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
using Microsoft.Maui.Graphics;
@@ -142,6 +143,60 @@ public override void ViewDidLoad()
};
}
+ public override void ViewDidAppear(bool animated)
+ {
+ base.ViewDidAppear(animated);
+ ApplyInitialDisabledState();
+ }
+
+ void ApplyInitialDisabledState()
+ {
+ if (TabBar.Items is null)
+ return;
+
+ var items = ShellItemController?.GetItems();
+ if (items is null)
+ return;
+
+ for (int i = 0; i < items.Count && i < TabBar.Items.Length; i++)
+ {
+ if (!items[i].IsEnabled)
+ UpdateTabBarItemEnabled(TabBar.Items[i], false);
+ }
+ }
+
+ void UpdateTabBarItemEnabled(UITabBarItem tabBarItem, bool isEnabled)
+ {
+ tabBarItem.Enabled = isEnabled;
+
+ var disabledColor = Shell.GetTabBarDisabledColor(_context.Shell)?.ToPlatform();
+ if (disabledColor is null)
+ return;
+
+ // Per-item text attributes needed for dynamic enable/disable changes
+ var textAttributes = isEnabled ? null : new UIStringAttributes { ForegroundColor = disabledColor };
+ tabBarItem.SetTitleTextAttributes(textAttributes, UIControlState.Disabled);
+
+ // Tint icon image since UITabBarAppearance.Disabled.IconColor doesn't work
+ if (tabBarItem.Image is not null)
+ {
+ tabBarItem.Image = isEnabled
+ ? tabBarItem.Image.ImageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate)
+ : CreateTintedImage(tabBarItem.Image, disabledColor).ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal);
+ }
+ }
+
+ UIImage CreateTintedImage(UIImage image, UIColor color)
+ {
+ var renderer = new UIGraphicsImageRenderer(image.Size, new UIGraphicsImageRendererFormat { Opaque = false, Scale = image.CurrentScale });
+ return renderer.CreateImage(ctx =>
+ {
+ image.Draw(new CGRect(CGPoint.Empty, image.Size));
+ color.SetFill();
+ ctx.FillRect(new CGRect(CGPoint.Empty, image.Size), CGBlendMode.SourceIn);
+ });
+ }
+
void IDisconnectable.Disconnect()
{
if (_sectionRenderers != null)
@@ -220,6 +275,9 @@ protected virtual void OnItemsCollectionChanged(object sender, NotifyCollectionC
RemoveRenderer(renderer);
}
}
+
+ // Recalculate IsInMoreTab for remaining renderers since tab positions shifted after removal.
+ UpdateIsInMoreTabForRenderers();
}
if (e.NewItems != null && e.NewItems.Count > 0)
@@ -280,10 +338,12 @@ protected virtual void OnShellSectionPropertyChanged(object sender, PropertyChan
var shellSection = (ShellSection)sender;
var renderer = RendererForShellContent(shellSection);
var index = ViewControllers.ToList().IndexOf(renderer.ViewController);
- TabBar.Items[index].Enabled = shellSection.IsEnabled;
+ if (TabBar.Items is not null && index >= 0 && index < TabBar.Items.Length)
+ UpdateTabBarItemEnabled(TabBar.Items[index], shellSection.IsEnabled);
}
}
+
protected virtual void UpdateShellAppearance(ShellAppearance appearance)
{
if (appearance == null)
@@ -324,6 +384,22 @@ void SetTabItemsEnabledState()
}
}
+ void UpdateIsInMoreTabForRenderers()
+ {
+ const int maxTabs = 5;
+ var currentViewControllers = ViewControllers;
+ if (currentViewControllers == null)
+ return;
+
+ bool willUseMore = currentViewControllers.Length > maxTabs;
+ for (int i = 0; i < currentViewControllers.Length; i++)
+ {
+ var renderer = RendererForViewController(currentViewControllers[i]);
+ if (renderer != null)
+ renderer.IsInMoreTab = willUseMore && i >= maxTabs - 1;
+ }
+ }
+
void CreateTabRenderers()
{
if (ShellItem.CurrentItem == null)
@@ -455,11 +531,19 @@ void UpdateLargeTitles()
if (page is null || !OperatingSystem.IsIOSVersionAtLeast(11))
return;
+ // Shell doesn't have the property PrefersLargeTitles, so we should not update the large titles
+ // if users doen't explicitly set the LargeTitleDisplay property on the Page.
+ // todo net 11: Add PrefersLargeTitles to Shell and use that here.
+ if (!page.IsSet(PlatformConfiguration.iOSSpecific.Page.LargeTitleDisplayProperty))
+ {
+ return;
+ }
+
var largeTitleDisplayMode = page.OnThisPlatform().LargeTitleDisplay();
if (SelectedViewController is UINavigationController navigationController)
{
- navigationController.NavigationBar.PrefersLargeTitles = largeTitleDisplayMode == LargeTitleDisplayMode.Always;
+ navigationController.NavigationBar.PrefersLargeTitles = largeTitleDisplayMode != LargeTitleDisplayMode.Never;
var top = navigationController.TopViewController;
if (top is not null)
{
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemTransition.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemTransition.cs
index 090939cce980..44d650904b14 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemTransition.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemTransition.cs
@@ -1,4 +1,5 @@
#nullable disable
+using System;
using System.Threading.Tasks;
using ObjCRuntime;
using UIKit;
@@ -14,7 +15,15 @@ public Task Transition(IShellItemRenderer oldRenderer, IShellItemRenderer newRen
var newView = newRenderer.ViewController.View;
oldView.Layer.RemoveAllAnimations();
- newView.Alpha = 0;
+
+ // On iOS 26+, setting newView.Alpha = 0 before the fade-in causes Liquid Glass
+ // tab bar icons to composite at zero opacity, resulting in missing tab icons.
+ // We skip the initial alpha=0 on iOS 26+, which means there is no fade-in
+ // animation on iOS 26+ — this is intentional to avoid the rendering issue.
+ if (!(OperatingSystem.IsIOSVersionAtLeast(26) || OperatingSystem.IsMacCatalystVersionAtLeast(26)))
+ {
+ newView.Alpha = 0;
+ }
oldView.Superview.InsertSubviewAbove(newView, oldView);
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellNavBarAppearanceTracker.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellNavBarAppearanceTracker.cs
index e31120c1b798..67f8acc8fa15 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellNavBarAppearanceTracker.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellNavBarAppearanceTracker.cs
@@ -122,8 +122,14 @@ void UpdateiOS13NavigationBarAppearance(UINavigationController controller, Shell
// Set ForegroundColor
var foreground = appearance.ForegroundColor;
- if (foreground != null)
+ if (foreground is not null)
+ {
navBar.TintColor = foreground.ToPlatform();
+ }
+ else if (_defaultTint is not null) // Reset to default if user set ForegroundColor to null
+ {
+ navBar.TintColor = _defaultTint;
+ }
// Set BackgroundColor
var background = appearance.BackgroundColor;
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellPageRendererTracker.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellPageRendererTracker.cs
index 025ae0e77993..15f18ad20962 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellPageRendererTracker.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellPageRendererTracker.cs
@@ -79,6 +79,8 @@ public Page Page
SearchHandlerAppearanceTracker? _searchHandlerAppearanceTracker;
IFontManager _fontManager;
bool _isVisiblePage;
+ NSObject? _keyboardWillHideObserver;
+ bool _pendingKeyboardNavigation;
BackButtonBehavior? BackButtonBehavior { get; set; }
UINavigationItem? NavigationItem { get; set; }
@@ -93,6 +95,8 @@ public ShellPageRendererTracker(IShellContext context)
_context.Shell.PropertyChanged += HandleShellPropertyChanged;
_fontManager = context.Shell.RequireFontManager();
+
+ _keyboardWillHideObserver = UIKeyboard.Notifications.ObserveWillHide(OnKeyboardWillHide);
}
public void OnFlyoutBehaviorChanged(FlyoutBehavior behavior)
@@ -108,7 +112,10 @@ protected virtual void HandleShellPropertyChanged(object sender, PropertyChanged
if (e.Is(VisualElement.FlowDirectionProperty))
UpdateFlowDirection();
else if (e.Is(Shell.FlyoutIconProperty) || e.Is(Shell.ForegroundColorProperty))
+ {
UpdateLeftToolbarItems();
+ UpdateRightBarButtonItemTintColors();
+ }
}
#nullable disable
@@ -155,6 +162,7 @@ protected virtual void OnPagePropertyChanged(object sender, PropertyChangedEvent
else if (e.PropertyName == Shell.ForegroundColorProperty.PropertyName)
{
UpdateLeftToolbarItems();
+ UpdateRightBarButtonItemTintColors();
}
}
@@ -276,7 +284,7 @@ protected virtual void OnRendererSet()
ViewController.AutomaticallyAdjustsScrollViewInsets = false;
}
}
-
+
internal void UpdateTitleViewInternal()
{
UpdateTitleView();
@@ -456,9 +464,37 @@ protected virtual void UpdateToolbarItems()
NavigationItem.SetRightBarButtonItems(primaries is null ? Array.Empty() : primaries.ToArray(), false);
+ UpdateRightBarButtonItemTintColors();
UpdateLeftToolbarItems();
}
+ /// iOS 26+: LiquidGlass no longer inherits the foreground color from the navigation bar's TintColor.
+ /// Explicitly set TintColor on each right bar button item to ensure the Shell.ForegroundColor is applied.
+ void UpdateRightBarButtonItemTintColors()
+ {
+ if (!(OperatingSystem.IsIOSVersionAtLeast(26) || OperatingSystem.IsMacCatalystVersionAtLeast(26)))
+ {
+ return;
+ }
+
+ if (NavigationItem?.RightBarButtonItems is not { Length: > 0 } rightItems)
+ {
+ return;
+ }
+
+ var foregroundColor = _context?.Shell?.CurrentPage?.GetValue(Shell.ForegroundColorProperty) ??
+ _context?.Shell?.GetValue(Shell.ForegroundColorProperty);
+
+ var platformColor = foregroundColor is Graphics.Color shellForegroundColor
+ ? shellForegroundColor.ToPlatform()
+ : null;
+
+ foreach (var item in rightItems)
+ {
+ item.TintColor = platformColor;
+ }
+ }
+
void UpdateLeftToolbarItems()
{
var shell = _context?.Shell;
@@ -534,7 +570,8 @@ void UpdateLeftToolbarItems()
}
}
}
- else if (String.IsNullOrWhiteSpace(text) && IsRootPage && _flyoutBehavior == FlyoutBehavior.Flyout)
+ // Show hamburger icon if it's the root page, or if the back button is not visible.
+ else if (String.IsNullOrWhiteSpace(text) && (IsRootPage || !backButtonVisible) && _flyoutBehavior == FlyoutBehavior.Flyout)
{
icon = DrawHamburger();
}
@@ -542,7 +579,7 @@ void UpdateLeftToolbarItems()
if (icon != null)
{
NavigationItem.LeftBarButtonItem =
- new UIBarButtonItem(icon, UIBarButtonItemStyle.Plain, (s, e) => LeftBarButtonItemHandler(ViewController, IsRootPage)) { Enabled = enabled };
+ new UIBarButtonItem(icon, UIBarButtonItemStyle.Plain, (s, e) => LeftBarButtonItemHandler(ViewController, (IsRootPage || !backButtonVisible))) { Enabled = enabled };
// For iOS 26+, explicitly set the tint color on the bar button item
// because the navigation bar's tint color is not automatically inherited
@@ -564,7 +601,7 @@ void UpdateLeftToolbarItems()
{
if (String.IsNullOrWhiteSpace(image?.AutomationId))
{
- if (IsRootPage)
+ if (IsRootPage || !backButtonVisible)
{
NavigationItem.LeftBarButtonItem.AccessibilityIdentifier = "OK";
NavigationItem.LeftBarButtonItem.AccessibilityLabel = "Menu";
@@ -1119,6 +1156,9 @@ void OnPageLoaded(object? sender, EventArgs e)
return;
}
+ // Set flag when page is loaded during navigation - this is when the keyboard issue can occur
+ _pendingKeyboardNavigation = true;
+
UpdateToolbarItemsInternal();
//UIKIt will try to override our colors when the SearchController is inside the NavigationBar
@@ -1175,6 +1215,51 @@ void SetDisappeared()
_context.Shell.Toolbar.PropertyChanged -= OnToolbarPropertyChanged;
}
+ void OnKeyboardWillHide(object? sender, UIKeyboardEventArgs e)
+ {
+ // Keyboard dismissal during page load can cause iOS to misposition the view behind the navigation bar.
+ // Detect and correct this by repositioning the view below the navigation bar when needed.
+
+ if (_disposed || ViewController?.View is null || ViewController.NavigationController is null)
+ return;
+
+ // Only apply fix during the problematic timing window (page load with navigation)
+ if (!_pendingKeyboardNavigation)
+ return;
+
+ var navController = ViewController.NavigationController;
+ var navBar = navController.NavigationBar;
+
+ if (navBar.Hidden || navBar.Frame.Height <= 0)
+ return;
+
+ // Don't interfere with SearchHandler's keyboard management when it's active
+ if (_searchController?.Active == true)
+ return;
+
+ var currentFrame = ViewController.View.Frame;
+ var navBarBottom = navBar.Frame.Bottom;
+
+ if (currentFrame.Y == 0 && navBarBottom > 0 &&
+ navController.ViewControllers?.Length > 1 &&
+ ViewController == navController.TopViewController)
+ {
+ // Adjust height to fit available space after Y position change
+ var yOffset = navBarBottom - currentFrame.Y;
+ var correctFrame = new CGRect(
+ currentFrame.X,
+ navBarBottom,
+ currentFrame.Width,
+ currentFrame.Height - yOffset
+ );
+
+ ViewController.View.Frame = correctFrame;
+ }
+
+ // Clear flag after handling keyboard dismissal once
+ _pendingKeyboardNavigation = false;
+ }
+
#endregion SearchHandler
#region IDisposable Support
@@ -1221,6 +1306,9 @@ protected virtual void Dispose(bool disposing)
if (NavigationItem?.TitleView is TitleViewContainer tvc)
tvc.Disconnect();
+
+ _keyboardWillHideObserver?.Dispose();
+ _keyboardWillHideObserver = null;
}
_context = null;
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRenderer.cs
index aabf4cc14bc7..7c1976f95c50 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRenderer.cs
@@ -36,18 +36,35 @@ public ShellSection ShellSection
IShellSectionController ShellSectionController => ShellSection;
+ UINavigationController MoreNavigationController => (ParentViewController as UITabBarController)?.MoreNavigationController;
+
public UIViewController ViewController => this;
#endregion IShellContentRenderer
#region IAppearanceObserver
+ ShellAppearance _shellAppearance;
+
void IAppearanceObserver.OnAppearanceChanged(ShellAppearance appearance)
{
+ _shellAppearance = appearance;
if (appearance == null)
+ {
_appearanceTracker.ResetAppearance(this);
+ if (MoreNavigationController is not null)
+ {
+ _appearanceTracker.ResetAppearance(MoreNavigationController);
+ }
+ }
else
+ {
_appearanceTracker.SetAppearance(this, appearance);
+ if (MoreNavigationController is not null)
+ {
+ _appearanceTracker.SetAppearance(MoreNavigationController, appearance);
+ }
+ }
}
#endregion IAppearanceObserver
@@ -70,6 +87,13 @@ void IAppearanceObserver.OnAppearanceChanged(ShellAppearance appearance)
ShellSection _shellSection;
bool _ignorePopCall;
+ // Prevents multiple concurrent GoToAsync("..") dispatches from SendPop().
+ // On iOS 26+, delegate methods (ShouldPopItem, DidPopItem) can fire in any order
+ // and combinations that may cause SendPop() to be called multiple times.
+ // Once a back-navigation dispatch is in flight, all subsequent calls are blocked
+ // until it completes (success or cancel).
+ bool _sendPopPending;
+
// When setting base.ViewControllers iOS doesn't modify the property right away.
// if you set base.ViewControllers to a new array and then retrieve base.ViewControllers
// iOS will return the previous array until the new array has been processed
@@ -115,19 +139,34 @@ bool DidPopItem(UINavigationBar _, UINavigationItem __)
if (_shellSection.Stack.Count == NavigationBar.Items.Length)
return true;
- // Stacks out of sync = user-initiated navigation
+ // Stacks out of sync: treat as user-initiated back (e.g., swipe-back).
+ // On iOS 26+, this can also fire during ShouldPopItem and programmatic PopViewController;
+ // SendPop() contains the _sendPopPending guard to prevent any double-dispatch in those cases.
return SendPop();
}
- internal bool SendPop()
+ internal bool SendPop(UIViewController topViewController = null)
{
// this means the pop is already done, nothing we can do
if (ActiveViewControllers().Length < NavigationBar.Items.Length)
return true;
+ // On iOS 26+, delegate methods (ShouldPopItem, DidPopItem) can fire in any order
+ // and fire multiple times for a single user back action. Guard against multiple
+ // concurrent GoToAsync("..") dispatches to prevent navigating to the wrong page.
+ if (OperatingSystem.IsIOSVersionAtLeast(26) || OperatingSystem.IsMacCatalystVersionAtLeast(26))
+ {
+ if (_sendPopPending)
+ {
+ return false;
+ }
+ _sendPopPending = true;
+ }
+
+ topViewController ??= TopViewController;
foreach (var tracker in _trackers)
{
- if (tracker.Value.ViewController == TopViewController)
+ if (tracker.Value.ViewController == topViewController)
{
var behavior = Shell.GetEffectiveBackButtonBehavior(tracker.Value.Page);
var command = behavior.GetPropertyIfSet(BackButtonBehavior.CommandProperty, null);
@@ -139,7 +178,13 @@ internal bool SendPop()
{
command.Execute(commandParameter);
}
+ _sendPopPending = false; // reset before returning
+ return false;
+ }
+ // Allow the page to intercept back navigation via OnBackButtonPressed
+ if (tracker.Value.Page?.SendBackButtonPressed() == true)
+ {
return false;
}
@@ -147,7 +192,6 @@ internal bool SendPop()
}
}
-
// Do not remove, wonky behavior on some versions of iOS if you dont dispatch
// Shane: ^ not sure if this is true anymore because of how
// we now route this through "GoToAsync"
@@ -155,7 +199,14 @@ internal bool SendPop()
{
var navItemsCount = NavigationBar.Items.Length;
- await _context.Shell.GoToAsync("..", true);
+ try
+ {
+ await _context.Shell.GoToAsync("..", true);
+ }
+ finally
+ {
+ _sendPopPending = false;
+ }
// This means the navigation was cancelled
if (NavigationBar.Items.Length == navItemsCount)
@@ -191,6 +242,7 @@ public override void ViewDidDisappear(bool animated)
_popCompletionTask?.TrySetResult(false);
_popCompletionTask = null;
+ _sendPopPending = false;
base.ViewDidDisappear(animated);
}
@@ -226,6 +278,15 @@ public override void ViewDidLayoutSubviews()
}
}
+ public override void DidMoveToParentViewController(UIViewController parent)
+ {
+ if (_shellAppearance is not null && MoreNavigationController is not null)
+ {
+ _appearanceTracker?.SetAppearance(MoreNavigationController, _shellAppearance);
+ }
+ base.DidMoveToParentViewController(parent);
+ }
+
public override void ViewDidLoad()
{
if (_disposed)
@@ -611,6 +672,8 @@ public override void PushViewController(UIViewController viewController, bool an
if (IsInMoreTab && ParentViewController is UITabBarController tabBarController)
{
tabBarController.MoreNavigationController.PushViewController(viewController, animated);
+ viewController.NavigationItem.BackAction = UIAction.Create((e) => SendPop(tabBarController.MoreNavigationController.TopViewController));
+ HandleMoreNavigationCompletionTasks(viewController);
}
else
{
@@ -623,12 +686,30 @@ public override UIViewController PopViewController(bool animated)
_pendingViewControllers = null;
if (IsInMoreTab && ParentViewController is UITabBarController tabBarController)
{
- return tabBarController.MoreNavigationController.PopViewController(animated);
+ var viewController = tabBarController.MoreNavigationController.PopViewController(animated);
+ HandleMoreNavigationCompletionTasks(viewController);
+ return viewController;
}
return base.PopViewController(animated);
}
+ private void HandleMoreNavigationCompletionTasks(UIViewController viewController)
+ {
+ var tasks = _completionTasks;
+ var popTask = _popCompletionTask;
+
+ if (tasks.TryGetValue(viewController, out var source))
+ {
+ source.TrySetResult(true);
+ tasks.Remove(viewController);
+ }
+ else if (popTask != null)
+ {
+ popTask.TrySetResult(true);
+ }
+ }
+
UIViewController[] ActiveViewControllers() =>
_pendingViewControllers ?? base.ViewControllers;
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRootRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRootRenderer.cs
index 6d880ec642a6..cc45d37bb0bc 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRootRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRootRenderer.cs
@@ -40,6 +40,10 @@ public class ShellSectionRootRenderer : UIViewController, IShellSectionRootRende
UIViewPropertyAnimator _pageAnimation;
UIEdgeInsets _additionalSafeArea = UIEdgeInsets.Zero;
+#if MACCATALYST
+ CGRect _previousFrameHeader;
+#endif
+
ShellSection ShellSection
{
get;
@@ -563,6 +567,16 @@ void LayoutHeader()
CGRect frame = new CGRect(View.Bounds.X, headerTop, View.Bounds.Width, HeaderHeight);
_blurView.Frame = frame;
_header.ViewController.View.Frame = frame;
+#if MACCATALYST
+ if (frame.Width != _previousFrameHeader.Width || frame.Height != _previousFrameHeader.Height)
+ {
+ _previousFrameHeader = frame;
+ if (_header.ViewController is ShellSectionRootHeader rootHeader)
+ {
+ rootHeader.CollectionView.CollectionViewLayout.InvalidateLayout();
+ }
+ }
+#endif
}
nfloat left;
diff --git a/src/Controls/src/Core/Compatibility/Handlers/TabbedPage/iOS/TabbedRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/TabbedPage/iOS/TabbedRenderer.cs
index 78a0b58b383a..3ab57244b64b 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/TabbedPage/iOS/TabbedRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/TabbedPage/iOS/TabbedRenderer.cs
@@ -100,6 +100,7 @@ public void SetElement(VisualElement element)
UpdateSelectedTabColors();
UpdateBarTranslucent();
UpdatePageSpecifics();
+ UpdateFlowDirection();
}
public UIViewController ViewController
@@ -190,7 +191,7 @@ void OnPagePropertyChanged(object sender, PropertyChangedEventArgs e)
UpdateTabBarItem(page);
}
}
-
+
public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection)
{
if (previousTraitCollection.VerticalSizeClass == TraitCollection.VerticalSizeClass)
@@ -245,6 +246,8 @@ void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
SetNeedsStatusBarAppearanceUpdate();
SelectedViewController = controller;
}
+ else if (e.PropertyName == nameof(TabbedPage.FlowDirection))
+ UpdateFlowDirection();
else if (e.PropertyName == TabbedPage.BarBackgroundColorProperty.PropertyName)
UpdateBarBackgroundColor();
else if (e.PropertyName == TabbedPage.BarBackgroundProperty.PropertyName)
@@ -505,6 +508,14 @@ void UpdateTabBarItems()
}
}
+ void UpdateFlowDirection()
+ {
+ if (Tabbed is null)
+ return;
+
+ View.UpdateFlowDirection(Tabbed);
+ }
+
void UpdateChildrenOrderIndex(UIViewController[] viewControllers)
{
if (Tabbed is not TabbedPage tabbed)
@@ -669,4 +680,4 @@ void IElementHandler.DisconnectHandler()
}
#endregion
}
-}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/ContentConverter.cs b/src/Controls/src/Core/ContentConverter.cs
index 3d0a3e896db2..50d76aa70245 100644
--- a/src/Controls/src/Core/ContentConverter.cs
+++ b/src/Controls/src/Core/ContentConverter.cs
@@ -44,9 +44,10 @@ static View ConfigureView(View view, ContentPresenter presenter)
return view;
}
- static Label ConvertToLabel(string textContent, ContentPresenter presenter)
+ static ContentLabel ConvertToLabel(string textContent, ContentPresenter presenter)
{
- var label = new Label
+ // Use ContentLabel instead of Label to avoid interference from global styles
+ var label = new ContentLabel
{
Text = textContent
};
@@ -129,4 +130,20 @@ static bool HasTemplateAncestor(ContentPresenter presenter, Type type)
return false;
}
}
-}
\ No newline at end of file
+
+ // Internal label type used by ContentPresenter to avoid interference from global Label styles.
+ // MAUI resolves implicit styles by looking up Type.FullName as the key in ResourceDictionary,
+ // starting from the element's own Resources and walking up the visual tree (see MergedStyle.RegisterImplicitStyles).
+ // By storing an empty Style keyed to typeof(ContentLabel).FullName in the element's own Resources,
+ // the lookup finds it locally and short-circuits — the global Label style (even with ApplyToDerivedTypes)
+ // is never reached. This keeps properties like TextColor unset, so ShouldSetBinding returns true
+ // and the binding to the templated parent (e.g. RadioButton.TextColor) can be established.
+ internal class ContentLabel : Label
+ {
+ static readonly Style s_style = new Style(typeof(ContentLabel));
+ public ContentLabel()
+ {
+ Resources = new ResourceDictionary { { typeof(ContentLabel).FullName, s_style } };
+ }
+ }
+}
diff --git a/src/Controls/src/Core/Entry/Entry.Android.cs b/src/Controls/src/Core/Entry/Entry.Android.cs
index 985683a1ee0f..0f90bf2ca3b7 100644
--- a/src/Controls/src/Core/Entry/Entry.Android.cs
+++ b/src/Controls/src/Core/Entry/Entry.Android.cs
@@ -29,5 +29,34 @@ public static void MapText(IEntryHandler handler, Entry entry)
Platform.EditTextExtensions.UpdateText(handler.PlatformView, entry);
}
+
+ // TODO: Material3: Make it public in .NET 11
+ // MaterialEntryHandler-specific overloads
+ internal static void MapImeOptions(EntryHandler2 handler, Entry entry)
+ {
+ if (handler.PlatformView?.EditText is null)
+ {
+ return;
+ }
+
+ Platform.EditTextExtensions.UpdateImeOptions(handler.PlatformView.EditText, entry);
+ }
+
+ // TODO: Material3: Make it public in .NET 11
+ internal static void MapText(EntryHandler2 handler, Entry entry)
+ {
+ if (handler.PlatformView?.EditText is null)
+ {
+ return;
+ }
+
+ if (handler.DataFlowDirection == DataFlowDirection.FromPlatform)
+ {
+ Platform.EditTextExtensions.UpdateTextFromPlatform(handler.PlatformView.EditText, entry);
+ return;
+ }
+
+ Platform.EditTextExtensions.UpdateText(handler.PlatformView.EditText, entry);
+ }
}
}
diff --git a/src/Controls/src/Core/Entry/Entry.Mapper.cs b/src/Controls/src/Core/Entry/Entry.Mapper.cs
index 9acb2b4127b6..1d3d9285c740 100644
--- a/src/Controls/src/Core/Entry/Entry.Mapper.cs
+++ b/src/Controls/src/Core/Entry/Entry.Mapper.cs
@@ -20,6 +20,19 @@ public partial class Entry
EntryHandler.Mapper.ReplaceMapping(nameof(Text), MapText);
EntryHandler.Mapper.ReplaceMapping(nameof(TextTransform), MapText);
+ // Material3 Entry Handler mappings
+#if ANDROID
+ if (RuntimeFeature.IsMaterial3Enabled)
+ {
+ EntryHandler2.Mapper.ReplaceMapping(PlatformConfiguration.AndroidSpecific.Entry.ImeOptionsProperty.PropertyName, MapImeOptions);
+ EntryHandler2.Mapper.ReplaceMapping(nameof(Text), MapText);
+ EntryHandler2.Mapper.ReplaceMapping(nameof(TextTransform), MapText);
+ EntryHandler2.Mapper.AppendToMapping(nameof(VisualElement.IsFocused), InputView.MapIsFocused);
+ EntryHandler2.Mapper.AppendToMapping(nameof(VisualElement.IsVisible), InputView.MapIsVisible);
+ EntryHandler2.CommandMapper.PrependToMapping(nameof(IEntry.Focus), InputView.MapFocus);
+ }
+#endif
+
#if IOS || ANDROID
EntryHandler.Mapper.AppendToMapping(nameof(VisualElement.IsFocused), InputView.MapIsFocused);
EntryHandler.Mapper.AppendToMapping(nameof(VisualElement.IsVisible), InputView.MapIsVisible);
diff --git a/src/Controls/src/Core/Handlers/Items/Android/Adapters/CarouselViewAdapter.cs b/src/Controls/src/Core/Handlers/Items/Android/Adapters/CarouselViewAdapter.cs
index 96b2c5eef98b..1ba7570300ef 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/Adapters/CarouselViewAdapter.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/Adapters/CarouselViewAdapter.cs
@@ -18,6 +18,8 @@ internal CarouselViewAdapter(CarouselView itemsView, Func CarouselView.Loop && !(ItemsSource is EmptySource)
&& ItemsSource.Count > 0 ? CarouselViewLoopManager.LoopScale : ItemsSource.Count;
+ protected override bool IsSelectionEnabled(global::Android.Views.ViewGroup parent, int viewType) => false;
+
public override int GetItemViewType(int position)
{
int positionInList = GetPositionInList(position);
diff --git a/src/Controls/src/Core/Handlers/Items/Android/Adapters/EmptyViewAdapter.cs b/src/Controls/src/Core/Handlers/Items/Android/Adapters/EmptyViewAdapter.cs
index fd4ccadfdd17..449ffeaf72d1 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/Adapters/EmptyViewAdapter.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/Adapters/EmptyViewAdapter.cs
@@ -316,6 +316,11 @@ void UpdateHeaderFooterHeight(object item, bool isHeader)
if (item is DataTemplate dataTemplate)
{
var content = dataTemplate.CreateContent() as IView;
+
+ if (content?.Handler is null)
+ {
+ TemplateHelpers.GetHandler(content as View, ItemsView.FindMauiContext());
+ }
size = content.Measure(double.PositiveInfinity, double.PositiveInfinity);
}
diff --git a/src/Controls/src/Core/Handlers/Items/Android/Adapters/SelectableItemsViewAdapter.cs b/src/Controls/src/Core/Handlers/Items/Android/Adapters/SelectableItemsViewAdapter.cs
index 41f5619c3ea7..2b36f38e29fc 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/Adapters/SelectableItemsViewAdapter.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/Adapters/SelectableItemsViewAdapter.cs
@@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using Android.Content;
+using Android.Views;
using AndroidX.RecyclerView.Widget;
using Object = Java.Lang.Object;
@@ -28,6 +29,14 @@ public override void OnBindViewHolder(RecyclerView.ViewHolder holder, int positi
return;
}
+ // Header and footer view holders should not participate in selection tracking.
+ // They are not data items and calling GetItem() on their positions would cause
+ // an ArgumentOutOfRangeException due to the header index adjustment.
+ if (ItemsSource.IsHeader(position) || ItemsSource.IsFooter(position))
+ {
+ return;
+ }
+
// Watch for clicks so the user can select the item held by this ViewHolder
selectable.Clicked += SelectableClicked;
@@ -58,6 +67,16 @@ internal void ClearPlatformSelection()
}
}
+ internal void UpdateSelectionMode()
+ {
+ // Update click listeners for all currently visible ViewHolders when SelectionMode changes
+ bool selectionEnabled = ItemsView.SelectionMode is not SelectionMode.None;
+ for (int i = 0; i < _currentViewHolders.Count; i++)
+ {
+ _currentViewHolders[i].UpdateClickListener(selectionEnabled);
+ }
+ }
+
internal void MarkPlatformSelection(SelectableItemsView selectableItemsView)
{
if (_currentViewHolders.Count == 0)
@@ -146,6 +165,16 @@ int[] GetSelectedPositions()
return Array.Empty();
}
+ protected override bool IsSelectionEnabled(ViewGroup parent, int viewType)
+ {
+ if (ItemsView == null)
+ {
+ return false;
+ }
+ // Disable click listeners when SelectionMode is None to prevent TalkBack from announcing items as clickable
+ return ItemsView.SelectionMode != SelectionMode.None;
+ }
+
bool PositionIsSelected(int position)
{
var selectedPositions = GetSelectedPositions();
diff --git a/src/Controls/src/Core/Handlers/Items/Android/Adapters/StructuredItemsViewAdapter.cs b/src/Controls/src/Core/Handlers/Items/Android/Adapters/StructuredItemsViewAdapter.cs
index 86913f1ade7e..42c8055d9a73 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/Adapters/StructuredItemsViewAdapter.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/Adapters/StructuredItemsViewAdapter.cs
@@ -104,15 +104,16 @@ public override void OnBindViewHolder(RecyclerView.ViewHolder holder, int positi
protected override void BindTemplatedItemViewHolder(TemplatedItemViewHolder templatedItemViewHolder, object context)
{
- if (ItemsView.ItemSizingStrategy == ItemSizingStrategy.MeasureFirstItem)
- {
- templatedItemViewHolder.Bind(context, ItemsView, _reportMeasure, _size);
-
- if (templatedItemViewHolder.ItemView is ItemContentView itemContentView)
- {
- itemContentView.RetrieveStaticSize = _retrieveStaticSize;
+ var itemViewType = templatedItemViewHolder.ItemViewType;
+ if (ItemsView.ItemSizingStrategy == ItemSizingStrategy.MeasureFirstItem && itemViewType != ItemViewType.Header && itemViewType != ItemViewType.Footer && itemViewType != ItemViewType.GroupHeader && itemViewType != ItemViewType.GroupFooter)
+ {
+ templatedItemViewHolder.Bind(context, ItemsView, _reportMeasure, _size);
+
+ if (templatedItemViewHolder.ItemView is ItemContentView itemContentView)
+ {
+ itemContentView.RetrieveStaticSize = _retrieveStaticSize;
}
- }
+ }
else
{
base.BindTemplatedItemViewHolder(templatedItemViewHolder, context);
diff --git a/src/Controls/src/Core/Handlers/Items/Android/ItemContentView.cs b/src/Controls/src/Core/Handlers/Items/Android/ItemContentView.cs
index 71f0ff2136fc..c07bbfa766fd 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/ItemContentView.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/ItemContentView.cs
@@ -66,6 +66,10 @@ internal void Recycle()
RemoveView(platformView);
}
+ // Capture the current platform view before disconnecting handlers, because
+ // DisconnectHandlers() may null out the handler's PlatformView/ContainerView.
+ View?.DisconnectHandlers();
+
Content = null;
_pixelSize = null;
_reportMeasure = null;
@@ -151,8 +155,6 @@ _pixelSize is not null &&
{
_pixelSize = null;
}
-
- _pixelSize = null;
}
}
diff --git a/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/ObservableGroupedSource.cs b/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/ObservableGroupedSource.cs
index 596f1224c28a..a8b8e79fe26a 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/ObservableGroupedSource.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/ItemsSources/ObservableGroupedSource.cs
@@ -144,6 +144,13 @@ public object GetGroup(int groupIndex)
public IItemsViewSource GetGroupItemsViewSource(int groupIndex)
{
+ // The uint cast is being used as an optimization to handle both negative numbers and out-of-bounds indices in a single comparison
+ if ((uint) groupIndex >= (uint) _groups.Count)
+ {
+ System.Diagnostics.Debug.WriteLine($"Invalid Group index: {groupIndex}, Group count: {_groups.Count}");
+ return null;
+ }
+
return _groups[groupIndex];
}
@@ -226,7 +233,10 @@ void UpdateGroupTracking()
for (int n = 0; n < _groupSource.Count; n++)
{
- if (_groupSource[n] is IEnumerable list)
+ // Use ICollection (not IEnumerable) so that flat collections whose item type
+ // implements IEnumerable (e.g. string → IEnumerable) are not mistaken
+ // for groups, which would render a header/footer per item.
+ if (_groupSource[n] is ICollection list)
{
var source = ItemsSourceFactory.Create(list, _groupableItemsView, this);
source.HasFooter = _hasGroupFooters;
@@ -287,6 +297,24 @@ void Reload()
void Add(NotifyCollectionChangedEventArgs args)
{
+ var count = 0;
+
+ foreach (var item in args.NewItems)
+ {
+ // Count only real groups (ICollection); flat items like strings must not
+ // trigger a section insertion — they would cause _groups[groupIndex] to be
+ // out-of-range after UpdateGroupTracking skips non-ICollection items.
+ if (item is ICollection)
+ {
+ count++;
+ }
+ }
+
+ if (count == 0)
+ {
+ return;
+ }
+
var groupIndex = args.NewStartingIndex > -1 ? args.NewStartingIndex : _groupSource.IndexOf(args.NewItems[0]);
var groupCount = args.NewItems.Count;
@@ -307,6 +335,24 @@ void Add(NotifyCollectionChangedEventArgs args)
void Remove(NotifyCollectionChangedEventArgs args)
{
+ var count = 0;
+
+ foreach (var item in args.OldItems)
+ {
+ // Count only real groups (ICollection); flat items like strings must not
+ // trigger a section removal — they would cause _groups[groupIndex] to be
+ // out-of-range after UpdateGroupTracking skips non-ICollection items.
+ if (item is ICollection)
+ {
+ count++;
+ }
+ }
+
+ if (count == 0)
+ {
+ return;
+ }
+
var groupIndex = args.OldStartingIndex;
if (groupIndex < 0)
diff --git a/src/Controls/src/Core/Handlers/Items/Android/MauiCarouselRecyclerView.cs b/src/Controls/src/Core/Handlers/Items/Android/MauiCarouselRecyclerView.cs
index 2917b6060ed7..58a771a64b39 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/MauiCarouselRecyclerView.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/MauiCarouselRecyclerView.cs
@@ -35,7 +35,9 @@ public MauiCarouselRecyclerView(Context context, Func getItemsLayo
public override bool OnInterceptTouchEvent(MotionEvent ev)
{
if (!IsSwipeEnabled)
+ {
return false;
+ }
return base.OnInterceptTouchEvent(ev);
}
diff --git a/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs b/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs
index 2cacd2f34def..bcb5a628d46e 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs
@@ -20,6 +20,8 @@ public class MauiRecyclerView : Recycler
where TAdapter : ItemsViewAdapter
where TItemsViewSource : IItemsViewSource
{
+ const int InvalidPosition = -1;
+
protected TAdapter ItemsViewAdapter;
protected TItemsView ItemsView;
@@ -197,6 +199,14 @@ public virtual void UpdateEmptyView()
_emptyCollectionObserver.Start(ItemsViewAdapter);
+ // When the EmptyView swaps while _emptyViewAdapter is active, RecyclerView can
+ // reuse a stale item ViewHolder from the shared pool at the empty position.
+ // Clear the pool before refreshing the EmptyView adapter to prevent that reuse.
+ if (GetAdapter() == _emptyViewAdapter)
+ {
+ GetRecycledViewPool().Clear();
+ }
+
_emptyViewAdapter.NotifyDataSetChanged();
}
else
@@ -390,6 +400,12 @@ public virtual void ScrollTo(ScrollToRequestEventArgs args)
var position = DetermineTargetPosition(args);
+ if (position < 0)
+ {
+ System.Diagnostics.Debug.WriteLine($"Invalid scroll request: position = {position}");
+ return;
+ }
+
if (args.IsAnimated)
{
ScrollHelper.AnimateScrollToPosition(position, args.ScrollToPosition);
@@ -432,6 +448,11 @@ protected virtual int DetermineTargetPosition(ScrollToRequestEventArgs args)
else if (ItemsViewAdapter.ItemsSource is IGroupableItemsViewSource groupItemSource)
{
item = FindBoundItemInGroup(args, groupItemSource);
+
+ if (item is null)
+ {
+ return InvalidPosition;
+ }
}
}
@@ -440,18 +461,10 @@ protected virtual int DetermineTargetPosition(ScrollToRequestEventArgs args)
private static object FindBoundItemInGroup(ScrollToRequestEventArgs args, IGroupableItemsViewSource groupItemSource)
{
- if (args.GroupIndex >= 0 &&
- args.GroupIndex < groupItemSource.Count)
- {
- var group = groupItemSource.GetGroupItemsViewSource(args.GroupIndex);
+ var group = groupItemSource.GetGroupItemsViewSource(args.GroupIndex);
- if (group is not null)
- {
- // GetItem calls AdjustIndexRequest, which subtracts 1 if we have a header (UngroupedItemsSource does not do this)
- return group.GetItem(args.Index + 1);
- }
- }
- return groupItemSource.GetItem(args.Index);
+ // GetItem calls AdjustIndexRequest, which subtracts 1 if we have a header (UngroupedItemsSource does not do this)
+ return group?.GetItem(args.Index + 1);
}
protected virtual void UpdateItemSpacing()
@@ -471,12 +484,26 @@ protected virtual void UpdateItemSpacing()
if (_itemDecoration is SpacingItemDecoration spacingDecoration)
{
- // SpacingItemDecoration applies spacing to all items & all 4 sides of the items.
- // We need to adjust the padding on the RecyclerView so this spacing isn't visible around the outer edge of our control.
- // Horizontal & vertical spacing should only exist between items.
- var horizontalPadding = -spacingDecoration.HorizontalOffset;
- var verticalPadding = -spacingDecoration.VerticalOffset;
- SetPadding(horizontalPadding, verticalPadding, horizontalPadding, verticalPadding);
+ // SpacingItemDecoration now removes spacing on outer edges (first/last row or column),
+ // so we only need negative padding on the cross-axis for grid layouts to compensate
+ // for the spacing between columns (vertical grid) or rows (horizontal grid).
+ if (ItemsLayout is GridItemsLayout gridItemsLayout)
+ {
+ if (gridItemsLayout.Orientation == ItemsLayoutOrientation.Horizontal)
+ {
+ var verticalPadding = -spacingDecoration.VerticalOffset;
+ SetPadding(0, verticalPadding, 0, verticalPadding);
+ }
+ else
+ {
+ var horizontalPadding = -spacingDecoration.HorizontalOffset;
+ SetPadding(horizontalPadding, 0, horizontalPadding, 0);
+ }
+ }
+ else
+ {
+ SetPadding(0, 0, 0, 0);
+ }
}
}
@@ -511,6 +538,7 @@ protected virtual void LayoutPropertyChanged(object sender, PropertyChangedEvent
if (GetLayoutManager() is GridLayoutManager gridLayoutManager)
{
gridLayoutManager.SpanCount = ((GridItemsLayout)ItemsLayout).Span;
+ UpdateItemSpacing();
}
}
else if (propertyChanged.IsOneOf(Microsoft.Maui.Controls.ItemsLayout.SnapPointsTypeProperty, Microsoft.Maui.Controls.ItemsLayout.SnapPointsAlignmentProperty))
diff --git a/src/Controls/src/Core/Handlers/Items/Android/RecyclerViewScrollListener.cs b/src/Controls/src/Core/Handlers/Items/Android/RecyclerViewScrollListener.cs
index 8f285d875aae..04cb789c9347 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/RecyclerViewScrollListener.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/RecyclerViewScrollListener.cs
@@ -11,8 +11,10 @@ public class RecyclerViewScrollListener : Recycler
bool _disposed;
int _horizontalOffset, _verticalOffset;
TItemsView _itemsView;
+ bool _pendingRemainingItemsThresholdReached;
readonly bool _getCenteredItemOnXAndY = false;
bool _hasCompletedFirstLayout = false;
+ bool _scrollStarted;
public RecyclerViewScrollListener(TItemsView itemsView, ItemsViewAdapter itemsViewAdapter) : this(itemsView, itemsViewAdapter, false)
{
@@ -33,6 +35,12 @@ internal void UpdateAdapter(ItemsViewAdapter items
_hasCompletedFirstLayout = false;
}
+ public override void OnScrollStateChanged(RecyclerView recyclerView, int newState)
+ {
+ base.OnScrollStateChanged(recyclerView, newState);
+ _scrollStarted = newState != RecyclerView.ScrollStateIdle;
+ }
+
public override void OnScrolled(RecyclerView recyclerView, int dx, int dy)
{
base.OnScrolled(recyclerView, dx, dy);
@@ -68,7 +76,7 @@ public override void OnScrolled(RecyclerView recyclerView, int dx, int dy)
// Don't send RemainingItemsThresholdReached event for non-linear layout managers
// This can also happen if a layout pass has not happened yet
- if (Last == -1 || ItemsViewAdapter is null || _itemsView.RemainingItemsThreshold == -1)
+ if (Last == -1 || ItemsViewAdapter is null || !_scrollStarted || _itemsView.RemainingItemsThreshold == -1)
{
return;
}
@@ -91,10 +99,34 @@ public override void OnScrolled(RecyclerView recyclerView, int dx, int dy)
if (isThresholdReached)
{
- _itemsView.SendRemainingItemsThresholdReached();
+ HandleRemainingItemsThresholdReached();
+ }
+ }
+
+ public override void OnScrollStateChanged(RecyclerView recyclerView, int newState)
+ {
+ base.OnScrollStateChanged(recyclerView, newState);
+
+ // If we have a pending threshold reached event and the RecyclerView is now idle,
+ // it's safe to trigger the event without the risk of modifying the adapter during a scroll callback
+ if (_pendingRemainingItemsThresholdReached && newState == RecyclerView.ScrollStateIdle)
+ {
+ _pendingRemainingItemsThresholdReached = false;
+ if (!_disposed && _itemsView is not null)
+ {
+ _itemsView.SendRemainingItemsThresholdReached();
+ }
}
}
+ void HandleRemainingItemsThresholdReached()
+ {
+ // Mark that we need to trigger the threshold reached event
+ // This will be handled when the RecyclerView transitions to idle state
+ // to avoid the "Cannot call this method in a scroll callback" exception
+ _pendingRemainingItemsThresholdReached = true;
+ }
+
protected virtual (int First, int Center, int Last) GetVisibleItemsIndex(RecyclerView recyclerView)
{
var firstVisibleItemIndex = -1;
@@ -176,6 +208,7 @@ protected override void Dispose(bool disposing)
{
_itemsView = null;
ItemsViewAdapter = null;
+ _pendingRemainingItemsThresholdReached = false;
}
_disposed = true;
diff --git a/src/Controls/src/Core/Handlers/Items/Android/SelectableViewHolder.cs b/src/Controls/src/Core/Handlers/Items/Android/SelectableViewHolder.cs
index 88b1a451cdee..3dce2b8de830 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/SelectableViewHolder.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/SelectableViewHolder.cs
@@ -14,14 +14,30 @@ public abstract class SelectableViewHolder : RecyclerView.ViewHolder, global::An
bool _isSelected;
Drawable _selectedDrawable;
Drawable _selectableItemDrawable;
- readonly bool _isSelectionEnabled;
+ bool _isSelectionEnabled;
protected SelectableViewHolder(global::Android.Views.View itemView, bool isSelectionEnabled = true) : base(itemView)
{
- if (isSelectionEnabled)
- itemView.SetOnClickListener(this);
+ UpdateClickListener(isSelectionEnabled);
+ }
+
+ internal void UpdateClickListener(bool enableSelection)
+ {
+ _isSelectionEnabled = enableSelection;
+
+ if (enableSelection)
+ {
+ // Only attach if not already registered; HasOnClickListeners is true once
+ // SetOnClickListener has been called, so this guard prevents duplicate listeners.
+ if (!ItemView.HasOnClickListeners)
+ ItemView.SetOnClickListener(this);
+ }
+ else
+ {
+ ItemView.SetOnClickListener(null);
+ }
- _isSelectionEnabled = isSelectionEnabled;
+ ItemView.Clickable = enableSelection;
}
public bool IsSelected
diff --git a/src/Controls/src/Core/Handlers/Items/Android/SpacingItemDecoration.cs b/src/Controls/src/Core/Handlers/Items/Android/SpacingItemDecoration.cs
index c0545e9c368a..ca2525e79658 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/SpacingItemDecoration.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/SpacingItemDecoration.cs
@@ -13,6 +13,10 @@ public class SpacingItemDecoration : RecyclerView.ItemDecoration
public int VerticalOffset { get; }
+ int _span = 1;
+
+ ItemsLayoutOrientation _orientation;
+
public SpacingItemDecoration(Context context, IItemsLayout itemsLayout)
{
// The original "SpacingItemDecoration" applied spacing based on an item's current span index.
@@ -35,6 +39,8 @@ public SpacingItemDecoration(Context context, IItemsLayout itemsLayout)
case GridItemsLayout gridItemsLayout:
horizontalOffset = gridItemsLayout.HorizontalItemSpacing / 2.0;
verticalOffset = gridItemsLayout.VerticalItemSpacing / 2.0;
+ _span = gridItemsLayout.Span;
+ _orientation = gridItemsLayout.Orientation;
break;
case LinearItemsLayout listItemsLayout:
if (listItemsLayout.Orientation == ItemsLayoutOrientation.Horizontal)
@@ -47,10 +53,12 @@ public SpacingItemDecoration(Context context, IItemsLayout itemsLayout)
horizontalOffset = 0;
verticalOffset = listItemsLayout.ItemSpacing / 2.0;
}
+ _orientation = listItemsLayout.Orientation;
break;
default:
horizontalOffset = 0;
verticalOffset = 0;
+ _orientation = ItemsLayoutOrientation.Vertical;
break;
}
@@ -62,10 +70,39 @@ public override void GetItemOffsets(ARect outRect, AView view, RecyclerView pare
{
base.GetItemOffsets(outRect, view, parent, state);
+ int position = parent.GetChildAdapterPosition(view);
+ if (position == RecyclerView.NoPosition)
+ return;
+
+ int itemCount = state.ItemCount;
+ if (itemCount <= 0)
+ return;
+
outRect.Left = HorizontalOffset;
outRect.Right = HorizontalOffset;
outRect.Bottom = VerticalOffset;
outRect.Top = VerticalOffset;
+
+ // Remove spacing on the outer edges so spacing only appears between items.
+ // A linear layout is effectively span=1, so the same math works for both.
+ int rowCol = _span <= 1 ? position : position / _span;
+ int totalRowsCols = _span <= 1 ? itemCount : (itemCount + _span - 1) / _span;
+ int lastRowCol = totalRowsCols - 1;
+
+ if (_orientation == ItemsLayoutOrientation.Vertical)
+ {
+ if (rowCol == 0)
+ outRect.Top = 0;
+ if (rowCol == lastRowCol)
+ outRect.Bottom = 0;
+ }
+ else
+ {
+ if (rowCol == 0)
+ outRect.Left = 0;
+ if (rowCol == lastRowCol)
+ outRect.Right = 0;
+ }
}
}
}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Handlers/Items/Android/TemplatedItemViewHolder.cs b/src/Controls/src/Core/Handlers/Items/Android/TemplatedItemViewHolder.cs
index cffac7ede766..184d53455b63 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/TemplatedItemViewHolder.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/TemplatedItemViewHolder.cs
@@ -42,6 +42,14 @@ public void Recycle(ItemsView itemsView)
}
itemsView.RemoveLogicalChild(View);
+
+ // Disconnect and clear the handler via ItemContentView.Recycle(), which calls
+ // DisconnectHandlers() before releasing Content. Reset _selectedTemplate so the
+ // next Bind() call always goes through the templateChanging path and recreates
+ // the handler (since we just disconnected it).
+ _itemContentView.Recycle();
+ View = null; // clear reference to the disconnected view
+ _selectedTemplate = null; // force templateChanging=true on next Bind() to recreate the view
}
public void Bind(object itemBindingContext, ItemsView itemsView,
diff --git a/src/Controls/src/Core/Handlers/Items/CarouselViewHandler.cs b/src/Controls/src/Core/Handlers/Items/CarouselViewHandler.cs
index 019796a0c899..279359ec443a 100644
--- a/src/Controls/src/Core/Handlers/Items/CarouselViewHandler.cs
+++ b/src/Controls/src/Core/Handlers/Items/CarouselViewHandler.cs
@@ -16,6 +16,9 @@ public CarouselViewHandler(PropertyMapper mapper = null) : base(mapper ?? Mapper
{
#if TIZEN || ANDROID
[Controls.CarouselView.ItemsLayoutProperty.PropertyName] = MapItemsLayout,
+#endif
+#if IOS || MACCATALYST
+ [Controls.VisualElement.IsEnabledProperty.PropertyName] = MapIsEnabled,
#endif
[Controls.CarouselView.IsSwipeEnabledProperty.PropertyName] = MapIsSwipeEnabled,
[Controls.CarouselView.PeekAreaInsetsProperty.PropertyName] = MapPeekAreaInsets,
diff --git a/src/Controls/src/Core/Handlers/Items/CarouselViewHandler.iOS.cs b/src/Controls/src/Core/Handlers/Items/CarouselViewHandler.iOS.cs
index ab58b0c0076d..4c2a3ff206b2 100644
--- a/src/Controls/src/Core/Handlers/Items/CarouselViewHandler.iOS.cs
+++ b/src/Controls/src/Core/Handlers/Items/CarouselViewHandler.iOS.cs
@@ -35,6 +35,12 @@ protected override void ScrollToRequested(object sender, ScrollToRequestEventArg
}
}
+ // TODO: Change the modifier to public in .NET 11.
+ internal static void MapIsEnabled(CarouselViewHandler handler, CarouselView carouselView)
+ {
+ handler.Controller?.CollectionView?.UpdateIsEnabled(carouselView);
+ }
+
public static void MapIsSwipeEnabled(CarouselViewHandler handler, CarouselView carouselView)
{
handler.Controller.CollectionView.ScrollEnabled = carouselView.IsSwipeEnabled;
diff --git a/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs b/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs
index f1d75f9cba54..6b1dacf47be5 100644
--- a/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs
+++ b/src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs
@@ -133,24 +133,34 @@ void OnItemsVectorChanged(global::Windows.Foundation.Collections.IObservableVect
if (sender is not ItemCollection items)
return;
- var itemsCount = items.Count;
+ ListViewBase.DispatcherQueue.TryEnqueue(() =>
+ {
+ if (VirtualView is null || ListViewBase is null)
+ {
+ return;
+ }
- if (itemsCount == 0)
- return;
+ var itemsCount = items.Count;
- if (VirtualView.ItemsUpdatingScrollMode == ItemsUpdatingScrollMode.KeepItemsInView)
- {
- var firstItem = items[0];
- // Keeps the first item in the list displayed when new items are added.
- ListViewBase.ScrollIntoView(firstItem);
- }
+ if (itemsCount == 0)
+ {
+ return;
+ }
- if (VirtualView.ItemsUpdatingScrollMode == ItemsUpdatingScrollMode.KeepLastItemInView)
- {
- var lastItem = items[itemsCount - 1];
- // Adjusts the scroll offset to keep the last item in the list displayed when new items are added.
- ListViewBase.ScrollIntoView(lastItem, ScrollIntoViewAlignment.Leading);
- }
+ if (VirtualView.ItemsUpdatingScrollMode == ItemsUpdatingScrollMode.KeepItemsInView)
+ {
+ var firstItem = items[0];
+ // Keeps the first item in the list displayed when new items are added.
+ ListViewBase.ScrollIntoView(firstItem);
+ }
+
+ if (VirtualView.ItemsUpdatingScrollMode == ItemsUpdatingScrollMode.KeepLastItemInView)
+ {
+ var lastItem = items[itemsCount - 1];
+ // Adjusts the scroll offset to keep the last item in the list displayed when new items are added.
+ ListViewBase.ScrollIntoView(lastItem, ScrollIntoViewAlignment.Leading);
+ }
+ });
}
protected abstract ListViewBase SelectListViewBase();
@@ -184,7 +194,12 @@ private void CleanUpCollectionViewSource(ListViewBase platformView)
foreach (var item in platformView.GetChildren())
{
var element = item.GetVisualElement();
- VirtualView.RemoveLogicalChild(element);
+
+ if (element is not null)
+ {
+ element.DisconnectHandlers();
+ VirtualView.RemoveLogicalChild(element);
+ }
}
}
diff --git a/src/Controls/src/Core/Handlers/Items/SelectableItemsViewHandler.Android.cs b/src/Controls/src/Core/Handlers/Items/SelectableItemsViewHandler.Android.cs
index d32b9d489d67..a4c384b72331 100644
--- a/src/Controls/src/Core/Handlers/Items/SelectableItemsViewHandler.Android.cs
+++ b/src/Controls/src/Core/Handlers/Items/SelectableItemsViewHandler.Android.cs
@@ -15,6 +15,13 @@ public static void MapSelectedItems(SelectableItemsViewHandler handl
=> handler.PlatformView.UpdateSelection(itemsView);
public static void MapSelectionMode(SelectableItemsViewHandler handler, SelectableItemsView itemsView)
- => handler.PlatformView.UpdateSelection(itemsView);
+ {
+ // CollectionView (the only SelectableItemsView today) uses ReorderableItemsViewAdapter at runtime.
+ // The cast is intentional; invariant generics prevent casting through the SelectableItemsViewAdapter base.
+ var adapter = handler.PlatformView.GetAdapter() as ReorderableItemsViewAdapter;
+ adapter?.UpdateSelectionMode();
+
+ handler.PlatformView.UpdateSelection(itemsView);
+ }
}
}
diff --git a/src/Controls/src/Core/Handlers/Items/StructuredItemsViewHandler.Android.cs b/src/Controls/src/Core/Handlers/Items/StructuredItemsViewHandler.Android.cs
index dcf87f722158..109892b41cb3 100644
--- a/src/Controls/src/Core/Handlers/Items/StructuredItemsViewHandler.Android.cs
+++ b/src/Controls/src/Core/Handlers/Items/StructuredItemsViewHandler.Android.cs
@@ -21,7 +21,14 @@ public static void MapFooterTemplate(StructuredItemsViewHandler hand
}
public static void MapItemsLayout(StructuredItemsViewHandler handler, StructuredItemsView itemsView)
- => (handler.PlatformView as IMauiRecyclerView)?.UpdateLayoutManager();
+ {
+ if (handler.PlatformView is IMauiRecyclerView recyclerView)
+ {
+ recyclerView.UpdateAdapter();
+ recyclerView.UpdateScrollingMode();
+ recyclerView.UpdateLayoutManager();
+ }
+ }
public static void MapItemSizingStrategy(StructuredItemsViewHandler handler, StructuredItemsView itemsView)
=> (handler.PlatformView as IMauiRecyclerView)?.UpdateAdapter();
diff --git a/src/Controls/src/Core/Handlers/Items/StructuredItemsViewHandler.Windows.cs b/src/Controls/src/Core/Handlers/Items/StructuredItemsViewHandler.Windows.cs
index 09b8636591c6..b1476f190ba3 100644
--- a/src/Controls/src/Core/Handlers/Items/StructuredItemsViewHandler.Windows.cs
+++ b/src/Controls/src/Core/Handlers/Items/StructuredItemsViewHandler.Windows.cs
@@ -325,7 +325,10 @@ void UpdateItemsLayoutItemSpacing()
switch (ListViewBase)
{
case FormsListView formsListView:
- formsListView.ItemContainerStyle = GetVerticalItemContainerStyle(linearItemsLayout);
+ // Set the ItemContainerStyle based on the orientation
+ formsListView.ItemContainerStyle = (linearItemsLayout.Orientation == ItemsLayoutOrientation.Horizontal)
+ ? GetHorizontalItemContainerStyle(linearItemsLayout)
+ : GetVerticalItemContainerStyle(linearItemsLayout);
break;
case WListView listView:
listView.ItemContainerStyle = GetHorizontalItemContainerStyle(linearItemsLayout);
diff --git a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewController.cs b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewController.cs
index 595e7a5a393f..04d41a5607a4 100644
--- a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewController.cs
+++ b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewController.cs
@@ -360,7 +360,20 @@ void InvalidateMeasureIfContentSizeChanged()
return _emptyUIView.Frame.Size.ToSize();
}
- return CollectionView.CollectionViewLayout.CollectionViewContentSize.ToSize();
+ var contentSize = CollectionView.CollectionViewLayout.CollectionViewContentSize.ToSize();
+
+ // For horizontal layouts, items use the CollectionView frame height as their height
+ // (ConstrainedDimension = frame height). When no items are loaded (Width == 0),
+ // contentSize.Height reflects the container's frame height rather than actual content.
+ // This creates a circular sizing issue in Auto-height containers: the frame grows
+ // based on the incorrect content height and locks in at an excessive value even after
+ // items load. Reset to 0 so MinimumHeight / HeightRequest can determine the correct size.
+ if (IsHorizontal && contentSize.Width == 0)
+ {
+ contentSize.Height = 0;
+ }
+
+ return contentSize;
}
void ConstrainItemsToBounds()
diff --git a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewDelegator.cs b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewDelegator.cs
index 428d8c992c80..277a61adae28 100644
--- a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewDelegator.cs
+++ b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewDelegator.cs
@@ -1,5 +1,6 @@
#nullable disable
using System;
+using System.Collections.Generic;
using System.Linq;
using CoreGraphics;
using Foundation;
@@ -119,14 +120,15 @@ protected virtual (bool VisibleItems, NSIndexPath First, NSIndexPath Center, NSI
if (collectionView is null)
return default;
- var indexPathsForVisibleItems = collectionView.IndexPathsForVisibleItems.OrderBy(x => x.Row).ToList();
+ // Sort visible item index paths by section and then by row for consistent order in both grouped and ungrouped sources
+ var indexPathsForVisibleItems = collectionView.IndexPathsForVisibleItems.OrderBy(x => x.Section).ThenBy(x => x.Row).ToList();
var visibleItems = indexPathsForVisibleItems.Count > 0;
NSIndexPath firstVisibleItemIndex = null, centerItemIndex = null, lastVisibleItemIndex = null;
if (visibleItems)
{
- firstVisibleItemIndex = indexPathsForVisibleItems.First();
+ firstVisibleItemIndex = GetFirstVisibleIndexPathUsingLayoutAttributes(collectionView, indexPathsForVisibleItems);
centerItemIndex = GetCenteredIndexPath(collectionView);
lastVisibleItemIndex = indexPathsForVisibleItems.Last();
}
@@ -164,6 +166,48 @@ static int GetItemIndex(NSIndexPath indexPath, IItemsViewSource itemSource)
return index;
}
+ static NSIndexPath GetFirstVisibleIndexPathUsingLayoutAttributes(UICollectionView collectionView, IEnumerable indexPathsForVisibleItems)
+ {
+ if (!indexPathsForVisibleItems.Any())
+ return null;
+
+ var layout = collectionView.CollectionViewLayout;
+ if (layout is null)
+ return indexPathsForVisibleItems.First();
+
+ var visibleRect = new CGRect(collectionView.ContentOffset, collectionView.Bounds.Size);
+ var layoutAttributes = layout.LayoutAttributesForElementsInRect(visibleRect);
+ if (layoutAttributes is null || layoutAttributes.Length == 0)
+ return indexPathsForVisibleItems.First();
+
+ var flowLayout = layout as UICollectionViewFlowLayout;
+ bool isVertical = flowLayout?.ScrollDirection != UICollectionViewScrollDirection.Horizontal;
+ // Find the first visible cell (not headers/footers) based on scroll direction
+ NSIndexPath firstVisibleIndexPath = null;
+ nfloat minPosition = nfloat.MaxValue;
+
+ for (int i = 0; i < layoutAttributes.Length; i++)
+ {
+ var attr = layoutAttributes[i];
+ // Skip non-cell elements (headers, footers, decorations)
+ if (attr.RepresentedElementCategory != UICollectionElementCategory.Cell)
+ continue;
+
+ // Skip items that don't intersect with visible rect
+ if (!attr.Frame.IntersectsWith(visibleRect))
+ continue;
+
+ nfloat position = isVertical ? attr.Frame.Y : attr.Frame.X;
+ if (position < minPosition)
+ {
+ minPosition = position;
+ firstVisibleIndexPath = attr.IndexPath;
+ }
+ }
+
+ return firstVisibleIndexPath ?? indexPathsForVisibleItems.First();
+ }
+
static NSIndexPath GetCenteredIndexPath(UICollectionView collectionView)
{
NSIndexPath centerItemIndex = null;
diff --git a/src/Controls/src/Core/Handlers/Items/iOS/ObservableGroupedSource.cs b/src/Controls/src/Core/Handlers/Items/iOS/ObservableGroupedSource.cs
index 3a26a708245e..516292e6ed2a 100644
--- a/src/Controls/src/Core/Handlers/Items/iOS/ObservableGroupedSource.cs
+++ b/src/Controls/src/Core/Handlers/Items/iOS/ObservableGroupedSource.cs
@@ -240,8 +240,26 @@ void Add(NotifyCollectionChangedEventArgs args)
return;
}
+ // Only count items that are actual groups (ICollection); flat items like strings or model objects
+ // must not increment _groupCount or trigger InsertSections on UICollectionView
+ int count = 0;
+
+ foreach (var item in args.NewItems)
+ {
+ // Count only ICollection items — string and plain model objects are not groups
+ if (item is ICollection)
+ {
+ count++;
+ }
+ }
+
+ // None of the new items are groups; no section changes needed
+ if (count == 0)
+ {
+ return;
+ }
+
var startIndex = args.NewStartingIndex > -1 ? args.NewStartingIndex : _groupSource.IndexOf(args.NewItems[0]);
- var count = args.NewItems.Count;
_groupCount += count;
// Adding a group will change the section index for all subsequent groups, so the easiest thing to do
@@ -270,12 +288,30 @@ void Remove(NotifyCollectionChangedEventArgs args)
return;
}
+ // Only count items that are actual groups (ICollection); flat items must not decrement
+ // _groupCount or trigger DeleteSections for sections that were never created
+ int count = 0;
+
+ foreach (var item in args.OldItems)
+ {
+ // Count only ICollection items — string and plain model objects are not groups
+ if (item is ICollection)
+ {
+ count++;
+ }
+ }
+
+ // None of the removed items are groups; no section changes needed
+ if (count == 0)
+ {
+ return;
+ }
+
// Removing a group will change the section index for all subsequent groups, so the easiest thing to do
// is to reset all the group tracking to get it up-to-date
ResetGroupTracking();
// Since we have a start index, we can be more clever about removing the item(s) (and get the nifty animations)
- var count = args.OldItems.Count;
_groupCount -= count;
// Queue up the updates to the UICollectionView
@@ -408,12 +444,26 @@ void Update(Action update)
int GroupsCount()
{
+ int count = 0;
if (_groupSource is IList list)
- return list.Count;
+ {
+ foreach (var group in list)
+ {
+ if (group is ICollection)
+ {
+ count++;
+ }
+ }
+ return count;
+ }
- int count = 0;
foreach (var item in _groupSource)
- count++;
+ {
+ if (item is ICollection)
+ {
+ count++;
+ }
+ }
return count;
}
}
diff --git a/src/Controls/src/Core/Handlers/Items/iOS/SelectableItemsViewController.cs b/src/Controls/src/Core/Handlers/Items/iOS/SelectableItemsViewController.cs
index e7d2ecb6ced8..1f00d0f482e1 100644
--- a/src/Controls/src/Core/Handlers/Items/iOS/SelectableItemsViewController.cs
+++ b/src/Controls/src/Core/Handlers/Items/iOS/SelectableItemsViewController.cs
@@ -55,37 +55,49 @@ internal void SelectItem(object selectedItem)
if (index.Section > -1 && index.Item > -1)
{
// Ensure the selected index is updated after the collection view's items generation is completed
- CollectionView.PerformBatchUpdates(null, _ =>
+ if (!CollectionView.IsLoaded())
{
- // Ensure ItemsSource hasn't been disposed
- if (ItemsSource is EmptySource)
+ CollectionView.PerformBatchUpdates(null, _ =>
{
- return;
- }
+ ValidateAndSelectItem(selectedItem, originalSource);
+ });
+ }
+ else
+ {
+ ValidateAndSelectItem(selectedItem, originalSource);
+ }
+ }
+ }
- // Exit if the ItemsSource reference no longer matches the one captured at invocation.
- if (!ReferenceEquals(ItemsView.ItemsSource, originalSource))
- {
- return;
- }
+ void ValidateAndSelectItem(object selectedItem, object originalSource)
+ {
+ // Ensure ItemsSource hasn't been disposed
+ if (ItemsSource is EmptySource)
+ {
+ return;
+ }
- // Recalculate the index for the selectedItem now that the collection may have changed.(Adding, deleting etc..)
- var updatedIndex = GetIndexForItem(selectedItem);
- if (updatedIndex.Section < 0 || updatedIndex.Item < 0)
- {
- return;
- }
+ // Exit if the ItemsSource reference no longer matches the one captured at invocation.
+ if (!ReferenceEquals(ItemsView.ItemsSource, originalSource))
+ {
+ return;
+ }
- // Retrieve the current item at that index and verify it still equals the intended selection.
- var liveItem = GetItemAtIndex(updatedIndex);
- if (!Equals(liveItem, selectedItem))
- {
- return;
- }
+ // Recalculate the index for the selectedItem now that the collection may have changed.(Adding, deleting etc..)
+ var updatedIndex = GetIndexForItem(selectedItem);
+ if (updatedIndex.Section < 0 || updatedIndex.Item < 0)
+ {
+ return;
+ }
- CollectionView.SelectItem(index, true, UICollectionViewScrollPosition.None);
- });
+ // Retrieve the current item at that index and verify it still equals the intended selection.
+ var liveItem = GetItemAtIndex(updatedIndex);
+ if (!Equals(liveItem, selectedItem))
+ {
+ return;
}
+
+ CollectionView.SelectItem(updatedIndex, true, UICollectionViewScrollPosition.None);
}
// Called by Forms to clear the native selection
diff --git a/src/Controls/src/Core/Handlers/Items2/CarouselViewHandler2.iOS.cs b/src/Controls/src/Core/Handlers/Items2/CarouselViewHandler2.iOS.cs
index e439eeda3dc4..a43bbcb51680 100644
--- a/src/Controls/src/Core/Handlers/Items2/CarouselViewHandler2.iOS.cs
+++ b/src/Controls/src/Core/Handlers/Items2/CarouselViewHandler2.iOS.cs
@@ -22,7 +22,7 @@ public CarouselViewHandler2(PropertyMapper mapper = null) : base(mapper ?? Mappe
public static PropertyMapper Mapper = new(ItemsViewMapper)
{
-
+ [Controls.VisualElement.IsEnabledProperty.PropertyName] = MapIsEnabled,
[Controls.CarouselView.IsSwipeEnabledProperty.PropertyName] = MapIsSwipeEnabled,
[Controls.CarouselView.PeekAreaInsetsProperty.PropertyName] = MapPeekAreaInsets,
[Controls.CarouselView.IsBounceEnabledProperty.PropertyName] = MapIsBounceEnabled,
@@ -69,6 +69,12 @@ protected override void ScrollToRequested(object sender, ScrollToRequestEventArg
}
}
+ // TODO: Change the modifier to public in .NET 11.
+ internal static void MapIsEnabled(CarouselViewHandler2 handler, CarouselView carouselView)
+ {
+ handler.Controller?.CollectionView?.UpdateIsEnabled(carouselView);
+ }
+
public static void MapIsSwipeEnabled(CarouselViewHandler2 handler, CarouselView carouselView)
{
handler.Controller.CollectionView.ScrollEnabled = carouselView.IsSwipeEnabled;
diff --git a/src/Controls/src/Core/Handlers/Items2/CollectionViewHandler2.iOS.cs b/src/Controls/src/Core/Handlers/Items2/CollectionViewHandler2.iOS.cs
index f708cf9fea54..7ed8b7eea894 100644
--- a/src/Controls/src/Core/Handlers/Items2/CollectionViewHandler2.iOS.cs
+++ b/src/Controls/src/Core/Handlers/Items2/CollectionViewHandler2.iOS.cs
@@ -82,6 +82,7 @@ internal void SetCachedFirstItemSize(CoreGraphics.CGSize size)
[StructuredItemsView.FooterTemplateProperty.PropertyName] = MapFooterTemplate,
[StructuredItemsView.HeaderProperty.PropertyName] = MapHeaderTemplate,
[StructuredItemsView.FooterProperty.PropertyName] = MapFooterTemplate,
+ [StructuredItemsView.ItemsLayoutProperty.PropertyName] = MapItemsLayout,
[StructuredItemsView.ItemSizingStrategyProperty.PropertyName] = MapItemSizingStrategy,
[GroupableItemsView.GroupHeaderTemplateProperty.PropertyName] = MapHeaderTemplate,
[GroupableItemsView.GroupFooterTemplateProperty.PropertyName] = MapFooterTemplate,
@@ -186,8 +187,6 @@ protected override UICollectionViewLayout SelectLayout()
var itemSizingStrategy = ItemsView.ItemSizingStrategy;
var itemsLayout = ItemsView.ItemsLayout;
- SubscribeToItemsLayoutPropertyChanged(itemsLayout);
-
if (itemsLayout is GridItemsLayout gridItemsLayout)
{
return LayoutFactory2.CreateGrid(gridItemsLayout, groupInfo, headerFooterInfo);
@@ -219,6 +218,7 @@ public static void MapFooterTemplate(CollectionViewHandler2 handler, StructuredI
public static void MapItemsLayout(CollectionViewHandler2 handler, StructuredItemsView itemsView)
{
+ handler.UpdateItemsLayoutSubscription(itemsView.ItemsLayout);
handler.UpdateLayout();
}
@@ -227,23 +227,44 @@ public static void MapItemSizingStrategy(CollectionViewHandler2 handler, Structu
handler.UpdateLayout();
}
- void SubscribeToItemsLayoutPropertyChanged(IItemsLayout itemsLayout)
+ IItemsLayout _subscribedItemsLayout;
+
+ protected override void DisconnectHandler(UIView platformView)
+ {
+ base.DisconnectHandler(platformView);
+ UpdateItemsLayoutSubscription(null);
+ }
+
+ internal void UpdateItemsLayoutSubscription(IItemsLayout newLayout)
{
- if (itemsLayout is not null)
+ if (_subscribedItemsLayout == newLayout)
{
- itemsLayout.PropertyChanged += (sender, args) =>
- {
- if (args.PropertyName == nameof(ItemsLayout.SnapPointsAlignment) ||
- args.PropertyName == nameof(ItemsLayout.SnapPointsType) ||
- args.PropertyName == nameof(GridItemsLayout.VerticalItemSpacing) ||
- args.PropertyName == nameof(GridItemsLayout.HorizontalItemSpacing) ||
- args.PropertyName == nameof(GridItemsLayout.Span) ||
- args.PropertyName == nameof(LinearItemsLayout.ItemSpacing))
-
- {
- UpdateLayout();
- }
- };
+ return;
+ }
+
+ if (_subscribedItemsLayout is not null)
+ {
+ _subscribedItemsLayout.PropertyChanged -= OnItemsLayoutPropertyChanged;
+ }
+
+ _subscribedItemsLayout = newLayout;
+
+ if (_subscribedItemsLayout is not null)
+ {
+ _subscribedItemsLayout.PropertyChanged += OnItemsLayoutPropertyChanged;
+ }
+ }
+
+ void OnItemsLayoutPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs args)
+ {
+ if (args.PropertyName == nameof(ItemsLayout.SnapPointsAlignment) ||
+ args.PropertyName == nameof(ItemsLayout.SnapPointsType) ||
+ args.PropertyName == nameof(GridItemsLayout.VerticalItemSpacing) ||
+ args.PropertyName == nameof(GridItemsLayout.HorizontalItemSpacing) ||
+ args.PropertyName == nameof(GridItemsLayout.Span) ||
+ args.PropertyName == nameof(LinearItemsLayout.ItemSpacing))
+ {
+ UpdateLayout();
}
}
}
diff --git a/src/Controls/src/Core/Handlers/Items2/ItemsViewHandler2.iOS.cs b/src/Controls/src/Core/Handlers/Items2/ItemsViewHandler2.iOS.cs
index b56dcd9f4ef9..8f55ca5eb2d0 100644
--- a/src/Controls/src/Core/Handlers/Items2/ItemsViewHandler2.iOS.cs
+++ b/src/Controls/src/Core/Handlers/Items2/ItemsViewHandler2.iOS.cs
@@ -197,11 +197,65 @@ Size EnsureContentSizeForScrollDirection(double widthConstraint, double heightCo
var scrollDirection = Controller.GetScrollDirection();
// If contentSize is zero in the relevant dimension (height for vertical, width for horizontal),
- // it means none of the content has been realized yet; we need to return the expansive size
- // the collection view wants by default to get it to start measuring its content
+ // it means none of the content has been realized yet.
if ((scrollDirection == UICollectionViewScrollDirection.Vertical && contentSize.Height == 0) ||
(scrollDirection == UICollectionViewScrollDirection.Horizontal && contentSize.Width == 0))
{
+ var collectionView = Controller.CollectionView;
+
+ // When the CollectionView has not yet been added to a window (pre-mount measurement),
+ // UICollectionViewCompositionalLayout hasn't run a layout pass and therefore
+ // CollectionViewContentSize is still zero. Force a layout pass with the given constraints
+ // so the layout can compute actual content size from its items.
+ if (collectionView.Window == null)
+ {
+ // Local helper to clamp layout constraints to finite, non-negative nfloat values.
+ nfloat ClampConstraint(double constraint, nfloat fallback)
+ {
+ // Treat NaN, infinity, and negative values as invalid and fall back.
+ if (double.IsNaN(constraint) || double.IsInfinity(constraint) || constraint < 0)
+ return fallback;
+
+ var value = (nfloat)constraint;
+
+ // Guard against overflow to infinity/NaN or negative after casting.
+ var valueAsDouble = (double)value;
+ if (double.IsNaN(valueAsDouble) || double.IsInfinity(valueAsDouble) || value < 0)
+ return fallback;
+
+ return value;
+ }
+
+ var previousFrame = collectionView.Frame;
+ try
+ {
+ // Give the CollectionView a finite available size so the layout calculates correctly
+ var frameWidth = ClampConstraint(widthConstraint, UIView.UILayoutFittingExpandedSize.Width);
+ var frameHeight = ClampConstraint(heightConstraint, UIView.UILayoutFittingExpandedSize.Height);
+
+ collectionView.Frame = new CoreGraphics.CGRect(0, 0, frameWidth, frameHeight);
+ collectionView.SetNeedsLayout();
+ collectionView.LayoutIfNeeded();
+
+ // Re-read the content size now that the layout has run
+ contentSize = Controller.GetSize();
+ }
+ finally
+ {
+ // Always restore the original frame
+ collectionView.Frame = previousFrame;
+ }
+
+ // If the forced layout produced a valid size, return it directly
+ if ((scrollDirection == UICollectionViewScrollDirection.Vertical && contentSize.Height > 0) ||
+ (scrollDirection == UICollectionViewScrollDirection.Horizontal && contentSize.Width > 0))
+ {
+ return contentSize;
+ }
+ }
+
+ // Fallback: return the expansive size the collection view wants by default
+ // to get it to start measuring its content
var desiredSize = base.GetDesiredSize(widthConstraint, heightConstraint);
if (scrollDirection == UICollectionViewScrollDirection.Vertical)
{
@@ -210,6 +264,14 @@ Size EnsureContentSizeForScrollDirection(double widthConstraint, double heightCo
else
{
contentSize.Width = desiredSize.Width;
+
+ // For horizontal layouts, items use FractionalHeight(1f), meaning their height equals
+ // the CollectionView's current frame height. When no items are loaded (Width == 0),
+ // contentSize.Height reflects the container's frame height rather than actual content.
+ // This creates a circular sizing issue in Auto-height containers: the frame grows based
+ // on the incorrect content height and stays locked in even after items load.
+ // Reset to 0 so that MinimumHeight / HeightRequest can determine the correct size.
+ contentSize.Height = 0;
}
}
diff --git a/src/Controls/src/Core/Handlers/Items2/iOS/ItemsViewDelegator2.cs b/src/Controls/src/Core/Handlers/Items2/iOS/ItemsViewDelegator2.cs
index 5fd94e697991..f51ae203b5af 100644
--- a/src/Controls/src/Core/Handlers/Items2/iOS/ItemsViewDelegator2.cs
+++ b/src/Controls/src/Core/Handlers/Items2/iOS/ItemsViewDelegator2.cs
@@ -1,5 +1,6 @@
#nullable disable
using System;
+using System.Collections.Generic;
using System.Linq;
using CoreGraphics;
using Foundation;
@@ -120,14 +121,15 @@ protected virtual (bool VisibleItems, NSIndexPath First, NSIndexPath Center, NSI
if (collectionView is null)
return default;
- var indexPathsForVisibleItems = collectionView.IndexPathsForVisibleItems.OrderBy(x => x.Row).ToList();
+ // Sort visible item index paths by section and then by row for consistent order in both grouped and ungrouped sources
+ var indexPathsForVisibleItems = collectionView.IndexPathsForVisibleItems.OrderBy(x => x.Section).ThenBy(x => x.Row).ToList();
var visibleItems = indexPathsForVisibleItems.Count > 0;
NSIndexPath firstVisibleItemIndex = null, centerItemIndex = null, lastVisibleItemIndex = null;
if (visibleItems)
{
- firstVisibleItemIndex = indexPathsForVisibleItems.First();
+ firstVisibleItemIndex = GetFirstVisibleIndexPathUsingLayoutAttributes(collectionView, indexPathsForVisibleItems);
centerItemIndex = GetCenteredIndexPath(collectionView);
lastVisibleItemIndex = indexPathsForVisibleItems.Last();
}
@@ -165,6 +167,48 @@ static int GetItemIndex(NSIndexPath indexPath, IItemsViewSource itemSource)
return index;
}
+ static NSIndexPath GetFirstVisibleIndexPathUsingLayoutAttributes(UICollectionView collectionView, IEnumerable indexPathsForVisibleItems)
+ {
+ if (!indexPathsForVisibleItems.Any())
+ return null;
+
+ var layout = collectionView.CollectionViewLayout;
+ if (layout is null)
+ return indexPathsForVisibleItems.First();
+
+ var visibleRect = new CGRect(collectionView.ContentOffset, collectionView.Bounds.Size);
+ var layoutAttributes = layout.LayoutAttributesForElementsInRect(visibleRect);
+ if (layoutAttributes is null || layoutAttributes.Length == 0)
+ return indexPathsForVisibleItems.First();
+
+ var flowLayout = layout as UICollectionViewFlowLayout;
+ bool isVertical = flowLayout?.ScrollDirection != UICollectionViewScrollDirection.Horizontal;
+ // Find the first visible cell (not headers/footers) based on scroll direction
+ NSIndexPath firstVisibleIndexPath = null;
+ nfloat minPosition = nfloat.MaxValue;
+
+ for (int i = 0; i < layoutAttributes.Length; i++)
+ {
+ var attr = layoutAttributes[i];
+ // Skip non-cell elements (headers, footers, decorations)
+ if (attr.RepresentedElementCategory != UICollectionElementCategory.Cell)
+ continue;
+
+ // Skip items that don't intersect with visible rect
+ if (!attr.Frame.IntersectsWith(visibleRect))
+ continue;
+
+ nfloat position = isVertical ? attr.Frame.Y : attr.Frame.X;
+ if (position < minPosition)
+ {
+ minPosition = position;
+ firstVisibleIndexPath = attr.IndexPath;
+ }
+ }
+
+ return firstVisibleIndexPath ?? indexPathsForVisibleItems.First();
+ }
+
static NSIndexPath GetCenteredIndexPath(UICollectionView collectionView)
{
NSIndexPath centerItemIndex = null;
diff --git a/src/Controls/src/Core/Handlers/Items2/iOS/LayoutFactory2.cs b/src/Controls/src/Core/Handlers/Items2/iOS/LayoutFactory2.cs
index a61b16aa851f..235472aeab54 100644
--- a/src/Controls/src/Core/Handlers/Items2/iOS/LayoutFactory2.cs
+++ b/src/Controls/src/Core/Handlers/Items2/iOS/LayoutFactory2.cs
@@ -93,7 +93,7 @@ static UICollectionViewLayout CreateListLayout(UICollectionViewScrollDirection s
//create global header and footer
layoutConfiguration.BoundarySupplementaryItems = CreateSupplementaryItems(null, layoutHeaderFooterInfo, scrollDirection, groupWidth, groupHeight);
- var layout = new CustomUICollectionViewCompositionalLayout(snapInfo, (sectionIndex, environment) =>
+ var layout = new CustomUICollectionViewCompositionalLayout(snapInfo, groupingInfo, layoutHeaderFooterInfo, (sectionIndex, environment) =>
{
// Each item has a size
var itemSize = NSCollectionLayoutSize.Create(itemWidth, itemHeight);
@@ -151,7 +151,7 @@ static UICollectionViewLayout CreateGridLayout(UICollectionViewScrollDirection s
var layoutConfiguration = new UICollectionViewCompositionalLayoutConfiguration();
layoutConfiguration.ScrollDirection = scrollDirection;
- var layout = new CustomUICollectionViewCompositionalLayout(snapInfo, (sectionIndex, environment) =>
+ var layout = new CustomUICollectionViewCompositionalLayout(snapInfo, groupingInfo, headerFooterInfo, (sectionIndex, environment) =>
{
// Each item has a size
var itemSize = NSCollectionLayoutSize.Create(itemWidth, itemHeight);
@@ -450,11 +450,15 @@ class CustomUICollectionViewCompositionalLayout : UICollectionViewCompositionalL
{
LayoutSnapInfo _snapInfo;
ItemsUpdatingScrollMode _itemsUpdatingScrollMode;
+ LayoutGroupingInfo? _groupingInfo;
+ LayoutHeaderFooterInfo? _headerFooterInfo;
- public CustomUICollectionViewCompositionalLayout(LayoutSnapInfo snapInfo, UICollectionViewCompositionalLayoutSectionProvider sectionProvider, UICollectionViewCompositionalLayoutConfiguration configuration, ItemsUpdatingScrollMode itemsUpdatingScrollMode) : base(sectionProvider, configuration)
+ public CustomUICollectionViewCompositionalLayout(LayoutSnapInfo snapInfo, LayoutGroupingInfo? groupingInfo, LayoutHeaderFooterInfo? headerFooterInfo, UICollectionViewCompositionalLayoutSectionProvider sectionProvider, UICollectionViewCompositionalLayoutConfiguration configuration, ItemsUpdatingScrollMode itemsUpdatingScrollMode) : base(sectionProvider, configuration)
{
_snapInfo = snapInfo;
_itemsUpdatingScrollMode = itemsUpdatingScrollMode;
+ _groupingInfo = groupingInfo;
+ _headerFooterInfo = headerFooterInfo;
}
public override void FinalizeCollectionViewUpdates()
@@ -558,6 +562,33 @@ public override CGPoint TargetContentOffset(CGPoint proposedContentOffset, CGPoi
Configuration.ScrollDirection);
}
+ public override CGSize CollectionViewContentSize
+ {
+ get
+ {
+ if (CollectionView != null)
+ {
+ bool hasGlobalHeaders = _headerFooterInfo?.HasHeader == true || _headerFooterInfo?.HasFooter == true;
+ bool hasGroupHeaders = _groupingInfo?.HasHeader == true || _groupingInfo?.HasFooter == true;
+
+ if (hasGlobalHeaders || hasGroupHeaders)
+ {
+ return base.CollectionViewContentSize;
+ }
+
+ if (CollectionView.NumberOfSections() > 0 &&
+ CollectionView.NumberOfItemsInSection(0) > 0)
+ {
+ return base.CollectionViewContentSize;
+ }
+
+ return CGSize.Empty;
+ }
+
+ return base.CollectionViewContentSize;
+ }
+ }
+
CGPoint ScrollSingle(SnapPointsAlignment alignment, CGPoint proposedContentOffset, CGPoint scrollingVelocity)
{
// Get the viewport of the UICollectionView at the current content offset
diff --git a/src/Controls/src/Core/Handlers/Items2/iOS/SelectableItemsViewController2.cs b/src/Controls/src/Core/Handlers/Items2/iOS/SelectableItemsViewController2.cs
index 74f14b077884..cc02ddde501e 100644
--- a/src/Controls/src/Core/Handlers/Items2/iOS/SelectableItemsViewController2.cs
+++ b/src/Controls/src/Core/Handlers/Items2/iOS/SelectableItemsViewController2.cs
@@ -56,37 +56,49 @@ internal void SelectItem(object selectedItem)
if (index.Section > -1 && index.Item > -1)
{
// Ensure the selected index is updated after the collection view's items generation is completed
- CollectionView.PerformBatchUpdates(null, _ =>
+ if (!CollectionView.IsLoaded())
{
- // Ensure ItemsSource hasn't been disposed
- if (ItemsSource is Items.EmptySource)
+ CollectionView.PerformBatchUpdates(null, _ =>
{
- return;
- }
+ ValidateAndSelectItem(selectedItem, originalSource);
+ });
+ }
+ else
+ {
+ ValidateAndSelectItem(selectedItem, originalSource);
+ }
+ }
+ }
- // Exit if the ItemsSource reference no longer matches the one captured at invocation.
- if (!ReferenceEquals(ItemsView.ItemsSource, originalSource))
- {
- return;
- }
+ private void ValidateAndSelectItem(object selectedItem, object originalSource)
+ {
+ // Ensure ItemsSource hasn't been disposed
+ if (ItemsSource is Items.EmptySource)
+ {
+ return;
+ }
- // Recalculate the index for the selectedItem now that the collection may have changed.(Adding, deleting etc..)
- var updatedIndex = GetIndexForItem(selectedItem);
- if (updatedIndex.Section < 0 || updatedIndex.Item < 0)
- {
- return;
- }
+ // Exit if the ItemsSource reference no longer matches the one captured at invocation.
+ if (!ReferenceEquals(ItemsView.ItemsSource, originalSource))
+ {
+ return;
+ }
- // Retrieve the current item at that index and verify it still equals the intended selection.
- var liveItem = GetItemAtIndex(updatedIndex);
- if (!Equals(liveItem, selectedItem))
- {
- return;
- }
+ // Recalculate the index for the selectedItem now that the collection may have changed.(Adding, deleting etc..)
+ var updatedIndex = GetIndexForItem(selectedItem);
+ if (updatedIndex.Section < 0 || updatedIndex.Item < 0)
+ {
+ return;
+ }
- CollectionView.SelectItem(index, true, UICollectionViewScrollPosition.None);
- });
+ // Retrieve the current item at that index and verify it still equals the intended selection.
+ var liveItem = GetItemAtIndex(updatedIndex);
+ if (!Equals(liveItem, selectedItem))
+ {
+ return;
}
+
+ CollectionView.SelectItem(updatedIndex, true, UICollectionViewScrollPosition.None);
}
// Called by Forms to clear the native selection
diff --git a/src/Controls/src/Core/Handlers/Shell/ShellHandler.Windows.cs b/src/Controls/src/Core/Handlers/Shell/ShellHandler.Windows.cs
index 22b3572a6a28..a1308c79b9eb 100644
--- a/src/Controls/src/Core/Handlers/Shell/ShellHandler.Windows.cs
+++ b/src/Controls/src/Core/Handlers/Shell/ShellHandler.Windows.cs
@@ -43,6 +43,7 @@ private void OnLoaded(object sender, UI.Xaml.RoutedEventArgs e)
UpdateValue(nameof(Shell.FlyoutIcon));
UpdateValue(nameof(Shell.FlyoutBackground));
UpdateValue(nameof(Shell.FlyoutBackgroundImage));
+ UpdateValue(nameof(Shell.FlyoutVerticalScrollMode));
}
protected override void DisconnectHandler(ShellView platformView)
diff --git a/src/Controls/src/Core/Handlers/Shell/ShellHandler.cs b/src/Controls/src/Core/Handlers/Shell/ShellHandler.cs
index 47b43fed67e1..d93a1c779f73 100644
--- a/src/Controls/src/Core/Handlers/Shell/ShellHandler.cs
+++ b/src/Controls/src/Core/Handlers/Shell/ShellHandler.cs
@@ -37,6 +37,7 @@ public partial class ShellHandler
[nameof(Shell.FlowDirection)] = MapFlowDirection,
[nameof(Shell.FlyoutBackgroundImage)] = MapFlyoutBackgroundImage,
[nameof(Shell.FlyoutBackgroundImageAspect)] = MapFlyoutBackgroundImage,
+ [nameof(Shell.FlyoutVerticalScrollMode)] = MapFlyoutVerticalScrollMode,
#endif
};
diff --git a/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs b/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs
index cd006d288762..545ce838cabc 100644
--- a/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs
+++ b/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs
@@ -78,6 +78,14 @@ internal static IMauiHandlersCollection AddControlsHandlers(this IMauiHandlersCo
handlersCollection.AddHandler();
handlersCollection.AddHandler();
handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
}
else
{
@@ -86,6 +94,14 @@ internal static IMauiHandlersCollection AddControlsHandlers(this IMauiHandlersCo
handlersCollection.AddHandler();
handlersCollection.AddHandler();
handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
}
#else
handlersCollection.AddHandler();
@@ -93,22 +109,22 @@ internal static IMauiHandlersCollection AddControlsHandlers(this IMauiHandlersCo
handlersCollection.AddHandler();
handlersCollection.AddHandler();
handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
#endif
handlersCollection.AddHandler();
- handlersCollection.AddHandler();
handlersCollection.AddHandler();
handlersCollection.AddHandler();
- handlersCollection.AddHandler();
- handlersCollection.AddHandler();
handlersCollection.AddHandler();
- handlersCollection.AddHandler();
handlersCollection.AddHandler();
- handlersCollection.AddHandler();
handlersCollection.AddHandler();
- handlersCollection.AddHandler();
- handlersCollection.AddHandler();
handlersCollection.AddHandler();
- handlersCollection.AddHandler();
handlersCollection.AddHandler();
handlersCollection.AddHandler();
if (RuntimeFeature.IsHybridWebViewSupported)
@@ -116,6 +132,7 @@ internal static IMauiHandlersCollection AddControlsHandlers(this IMauiHandlersCo
// NOTE: not registered under NativeAOT or TrimMode=Full scenarios
handlersCollection.AddHandler();
}
+
handlersCollection.AddHandler();
handlersCollection.AddHandler();
handlersCollection.AddHandler();
diff --git a/src/Controls/src/Core/IndicatorView/IndicatorStackLayout.cs b/src/Controls/src/Core/IndicatorView/IndicatorStackLayout.cs
index cc14cea74c5f..9e1ee609a23e 100644
--- a/src/Controls/src/Core/IndicatorView/IndicatorStackLayout.cs
+++ b/src/Controls/src/Core/IndicatorView/IndicatorStackLayout.cs
@@ -1,4 +1,8 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
using System.ComponentModel;
+using System.Linq;
using Microsoft.Maui.Controls.Shapes;
using Microsoft.Maui.Graphics;
@@ -161,10 +165,44 @@ void BindIndicatorItems()
}
});
- BindableLayout.SetItemsSource(this, _indicatorView.ItemsSource);
+ // Get the filtered items source based on MaximumVisible
+ var itemsSource = GetFilteredItemsSource();
+ BindableLayout.SetItemsSource(this, itemsSource);
+
BindableLayout.SetItemTemplate(this, indicatorTemplate);
}
+ IEnumerable? GetFilteredItemsSource()
+ {
+ if (_indicatorView.ItemsSource is null || _indicatorView.MaximumVisible <= 0)
+ {
+ return null;
+ }
+
+ var itemsSource = _indicatorView.ItemsSource;
+ int totalCount = itemsSource is ICollection col
+ ? col.Count
+ : itemsSource.Cast
/// The string representation of the content, or the result of ToString() if content is not a string.
///
- /// If is a , a warning is logged and the ToString() representation is used instead.
+ /// If is a and no is set, a warning is logged
+ /// and the ToString() representation is used instead. When a ControlTemplate is applied, View content is supported.
///
public string ContentAsString()
{
var content = Content;
- if (content is View)
+ // Only log warning if Content is a View AND no ControlTemplate is set
+ // When ControlTemplate is set, View content IS supported (per documentation)
+ if (content is View && ResolveControlTemplate() == null)
{
Application.Current?.FindMauiContext()?.CreateLogger()?.LogWarning("Warning - {RuntimePlatform} does not support View as the {PropertyName} property of RadioButton; the return value of the ToString() method will be displayed instead.", DeviceInfo.Platform, ContentProperty.PropertyName);
}
diff --git a/src/Controls/src/Core/SearchBar/SearchBar.Android.cs b/src/Controls/src/Core/SearchBar/SearchBar.Android.cs
index 2abec0b32b2d..51c974c79b6b 100644
--- a/src/Controls/src/Core/SearchBar/SearchBar.Android.cs
+++ b/src/Controls/src/Core/SearchBar/SearchBar.Android.cs
@@ -12,5 +12,17 @@ public static void MapText(ISearchBarHandler handler, SearchBar searchBar)
{
Platform.SearchViewExtensions.UpdateText(handler.PlatformView, searchBar);
}
+
+ // Material3 specific overload for SearchBarHandler2
+ // TODO: Material3: Make it public in .NET 11
+ internal static void MapText(SearchBarHandler2 handler, SearchBar searchBar)
+ {
+ if (handler.PlatformView?.EditText is null)
+ {
+ return;
+ }
+
+ Platform.EditTextExtensions.UpdateText(handler.PlatformView.EditText, searchBar);
+ }
}
}
diff --git a/src/Controls/src/Core/SearchBar/SearchBar.Mapper.cs b/src/Controls/src/Core/SearchBar/SearchBar.Mapper.cs
index 3278ba05f637..d05efd265ec8 100644
--- a/src/Controls/src/Core/SearchBar/SearchBar.Mapper.cs
+++ b/src/Controls/src/Core/SearchBar/SearchBar.Mapper.cs
@@ -18,9 +18,26 @@ static SearchBar()
// Adjust the mappings to preserve Controls.SearchBar legacy behaviors
#if IOS
SearchBarHandler.Mapper.ReplaceMapping(PlatformConfiguration.iOSSpecific.SearchBar.SearchBarStyleProperty.PropertyName, MapSearchBarStyle);
+ SearchBarHandler.Mapper.ReplaceMapping(nameof(IsEnabled), MapUserInteraction);
+ SearchBarHandler.Mapper.ReplaceMapping(nameof(ISearchBar.IsReadOnly), MapUserInteraction);
+ SearchBarHandler.Mapper.ReplaceMapping(nameof(InputTransparent), MapUserInteraction);
#endif
+#if ANDROID
+ if (RuntimeFeature.IsMaterial3Enabled)
+ {
+ // Material3 SearchBar handler mappings
+ SearchBarHandler2.Mapper.ReplaceMapping(nameof(Text), MapText);
+ SearchBarHandler2.Mapper.ReplaceMapping(nameof(TextTransform), MapText);
+ }
+ else
+ {
+ SearchBarHandler.Mapper.ReplaceMapping(nameof(Text), MapText);
+ SearchBarHandler.Mapper.ReplaceMapping(nameof(TextTransform), MapText);
+ }
+#else
SearchBarHandler.Mapper.ReplaceMapping(nameof(Text), MapText);
SearchBarHandler.Mapper.ReplaceMapping(nameof(TextTransform), MapText);
+#endif
#if IOS || ANDROID
SearchBarHandler.Mapper.AppendToMapping(nameof(VisualElement.IsFocused), InputView.MapIsFocused);
diff --git a/src/Controls/src/Core/SearchBar/SearchBar.iOS.cs b/src/Controls/src/Core/SearchBar/SearchBar.iOS.cs
index 445e64cf116a..d140cae18130 100644
--- a/src/Controls/src/Core/SearchBar/SearchBar.iOS.cs
+++ b/src/Controls/src/Core/SearchBar/SearchBar.iOS.cs
@@ -19,5 +19,10 @@ public static void MapText(ISearchBarHandler handler, SearchBar searchBar)
Platform.SearchBarExtensions.UpdateText(handler.PlatformView, searchBar);
SearchBarHandler.MapFormatting(handler, searchBar);
}
+
+ internal static void MapUserInteraction(ISearchBarHandler handler, SearchBar searchBar)
+ {
+ handler.PlatformView.UserInteractionEnabled = searchBar.IsEnabled && !searchBar.IsReadOnly && !searchBar.InputTransparent;
+ }
}
}
diff --git a/src/Controls/src/Core/Shell/BaseShellItem.cs b/src/Controls/src/Core/Shell/BaseShellItem.cs
index 19711d358c9f..adcbf9d5df81 100644
--- a/src/Controls/src/Core/Shell/BaseShellItem.cs
+++ b/src/Controls/src/Core/Shell/BaseShellItem.cs
@@ -272,6 +272,18 @@ internal static void PropagateFromParent(BindableProperty property, Element me)
if (me == null || me.Parent == null)
return;
+ // For Shell.NavBarIsVisibleProperty, find the shell instance for more accurate propagation
+ if (property == Shell.NavBarIsVisibleProperty)
+ {
+ var shell = me.FindParentOfType();
+ if (shell is not null && shell.IsSet(property) && !me.IsSet(property))
+ {
+ // Get the value from the Shell directly
+ me.SetValue(property, shell.GetValue(property));
+ return;
+ }
+ }
+
Propagate(property, me.Parent, me, false);
}
diff --git a/src/Controls/src/Core/Shell/SearchHandler.cs b/src/Controls/src/Core/Shell/SearchHandler.cs
index 958be4bd455f..1bf1f5059a78 100644
--- a/src/Controls/src/Core/Shell/SearchHandler.cs
+++ b/src/Controls/src/Core/Shell/SearchHandler.cs
@@ -6,6 +6,7 @@
using System.Windows.Input;
using Microsoft.Maui.Controls.Internals;
using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Devices;
using static Microsoft.Maui.Controls.VisualElement;
namespace Microsoft.Maui.Controls
@@ -314,6 +315,12 @@ void ISearchHandlerController.ItemSelected(object obj)
{
OnItemSelected(obj);
SetValue(SelectedItemPropertyKey, obj, specificity: SetterSpecificity.FromHandler);
+ if (!(DeviceInfo.Platform == DevicePlatform.WinUI))
+ {
+ // For WinUI the query is confirmed in the QuerySubmitted event,
+ // so we don't want to call OnQueryConfirmed here as it would cause the command to execute twice
+ OnQueryConfirmed();
+ }
}
void ISearchHandlerController.QueryConfirmed()
diff --git a/src/Controls/src/Core/Shell/Shell.cs b/src/Controls/src/Core/Shell/Shell.cs
index 36d5e2610d9e..c84bac32f857 100644
--- a/src/Controls/src/Core/Shell/Shell.cs
+++ b/src/Controls/src/Core/Shell/Shell.cs
@@ -84,7 +84,17 @@ private static void OnNavBarIsVisibleChanged(BindableObject bindable, object old
?? (bindable as BaseShellItem)?.FindParentOfType()
?? (bindable as Page)?.FindParentOfType();
- shell?.OnPropertyChanged(NavBarIsVisibleProperty.PropertyName);
+ if (shell != null)
+ {
+ // Notify about the property change
+ shell.OnPropertyChanged(NavBarIsVisibleProperty.PropertyName);
+
+ // Explicitly propagate the property change to all children
+ if (shell is IPropertyPropagationController controller)
+ {
+ controller.PropagatePropertyChanged(NavBarIsVisibleProperty.PropertyName);
+ }
+ }
}
///
@@ -994,6 +1004,40 @@ void IShellController.UpdateCurrentState(ShellNavigationSource source)
if (result?.Location != oldState?.Location)
{
SetValueFromRenderer(CurrentStatePropertyKey, result);
+
+ // Fire NavigatingFrom after state is updated so CurrentPage is the destination.
+ // _previousPage was captured in SendNavigating before navigation started.
+ if (_previousPage is not null)
+ {
+ NavigationType navigationType = NavigationType.Replace;
+
+ switch (source)
+ {
+ case ShellNavigationSource.Pop:
+ navigationType = NavigationType.Pop;
+ break;
+ case ShellNavigationSource.Push:
+ navigationType = NavigationType.Push;
+ break;
+ case ShellNavigationSource.PopToRoot:
+ navigationType = NavigationType.PopToRoot;
+ break;
+ case ShellNavigationSource.Insert:
+ navigationType = NavigationType.Insert;
+ break;
+ case ShellNavigationSource.Remove:
+ navigationType = NavigationType.Remove;
+ break;
+ case ShellNavigationSource.ShellItemChanged:
+ case ShellNavigationSource.ShellSectionChanged:
+ case ShellNavigationSource.ShellContentChanged:
+ navigationType = NavigationType.Replace;
+ break;
+ }
+
+ _previousPage.SendNavigatingFrom(new NavigatingFromEventArgs(CurrentPage, navigationType));
+ }
+
_navigationManager.HandleNavigated(new ShellNavigatedEventArgs(oldState, CurrentState, source));
}
}
@@ -1220,6 +1264,9 @@ public Task GoToAsync(ShellNavigationState state, bool animate, ShellNavigationQ
ShellNavigationManager _navigationManager;
ShellFlyoutItemsManager _flyoutManager;
Page _previousPage;
+ NavigationType _navigationType;
+ Page _pendingPreviousPage;
+ NavigationType _pendingNavigationType;
/// Initializes a new instance of the class.
public Shell()
@@ -1635,35 +1682,35 @@ void SendNavigated(ShellNavigatedEventArgs args)
if (_previousPage != null)
_previousPage.PropertyChanged -= OnCurrentPagePropertyChanged;
- NavigationType navigationType = NavigationType.Replace;
+ _navigationType = NavigationType.Replace;
switch (args.Source)
{
case ShellNavigationSource.Pop:
- navigationType = NavigationType.Pop;
+ _navigationType = NavigationType.Pop;
break;
case ShellNavigationSource.ShellItemChanged:
- navigationType = NavigationType.Replace;
+ _navigationType = NavigationType.Replace;
break;
case ShellNavigationSource.ShellSectionChanged:
- navigationType = NavigationType.Replace;
+ _navigationType = NavigationType.Replace;
break;
case ShellNavigationSource.ShellContentChanged:
- navigationType = NavigationType.Replace;
+ _navigationType = NavigationType.Replace;
break;
case ShellNavigationSource.Push:
- navigationType = NavigationType.Push;
+ _navigationType = NavigationType.Push;
break;
case ShellNavigationSource.PopToRoot:
- navigationType = NavigationType.PopToRoot;
+ _navigationType = NavigationType.PopToRoot;
break;
case ShellNavigationSource.Insert:
- navigationType = NavigationType.Insert;
+ _navigationType = NavigationType.Insert;
break;
}
- _previousPage?.SendNavigatedFrom(new NavigatedFromEventArgs(CurrentPage, navigationType));
- CurrentPage?.SendNavigatedTo(new NavigatedToEventArgs(_previousPage, navigationType));
+ _previousPage?.SendNavigatedFrom(new NavigatedFromEventArgs(CurrentPage, _navigationType));
+ PropagateSendNavigatedTo();
_previousPage = null;
if (CurrentPage != null)
@@ -1672,6 +1719,44 @@ void SendNavigated(ShellNavigatedEventArgs args)
CurrentItem?.Handler?.UpdateValue(Shell.TabBarIsVisibleProperty.PropertyName);
}
+ void OnCurrentPageLoaded(object sender, EventArgs e)
+ {
+ if (sender is Page page)
+ {
+ page.Loaded -= OnCurrentPageLoaded;
+ page.SendNavigatedTo(new NavigatedToEventArgs(_pendingPreviousPage, _pendingNavigationType));
+ _pendingPreviousPage = null;
+ _pendingNavigationType = default;
+#if ANDROID
+ // Restore flyout behavior observers after deferred NavigatedTo timing
+ // Android requires this call to maintain flyout functionality
+ CurrentContent?.EvaluateDisconnect();
+#endif
+ }
+ }
+
+ void PropagateSendNavigatedTo()
+ {
+ if (CurrentPage is null)
+ {
+ return;
+ }
+
+ // On Windows, the Loaded event has already fired (IsLoaded=true), so SendNavigatedTo runs immediately without altering the flow.
+ if (CurrentPage.IsLoaded)
+ {
+ CurrentPage.SendNavigatedTo(new NavigatedToEventArgs(_previousPage, _navigationType));
+ }
+ else
+ {
+ // Capture before _previousPage is nulled in SendNavigated() so OnCurrentPageLoaded
+ // receives the correct PreviousPage in NavigatedToEventArgs when it fires asynchronously.
+ _pendingPreviousPage = _previousPage;
+ _pendingNavigationType = _navigationType;
+ CurrentPage.Loaded += OnCurrentPageLoaded;
+ }
+ }
+
internal PropertyChangedEventHandler CurrentPagePropertyChanged;
void OnCurrentPagePropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -1689,35 +1774,16 @@ void SendNavigating(ShellNavigatingEventArgs args)
if (!args.Cancelled)
{
- NavigationType navigationType = NavigationType.Replace;
-
- switch (args.Source)
- {
- case ShellNavigationSource.Pop:
- navigationType = NavigationType.Pop;
- break;
- case ShellNavigationSource.ShellItemChanged:
- navigationType = NavigationType.Replace;
- break;
- case ShellNavigationSource.ShellSectionChanged:
- navigationType = NavigationType.Replace;
- break;
- case ShellNavigationSource.ShellContentChanged:
- navigationType = NavigationType.Replace;
- break;
- case ShellNavigationSource.Push:
- navigationType = NavigationType.Push;
- break;
- case ShellNavigationSource.PopToRoot:
- navigationType = NavigationType.PopToRoot;
- break;
- case ShellNavigationSource.Insert:
- navigationType = NavigationType.Insert;
- break;
- }
-
+ // Capture the current page now; SendNavigatingFrom will be called in
+ // UpdateCurrentState after the shell state is updated, ensuring CurrentPage
+ // correctly reflects the destination page at that point.
_previousPage = CurrentPage;
- CurrentPage?.SendNavigatingFrom(new NavigatingFromEventArgs(CurrentPage, navigationType));
+ }
+
+ // Unsubscribe Loaded handler if navigating away before page loads to prevent memory leaks.
+ if (CurrentPage != null && !CurrentPage.IsLoaded)
+ {
+ CurrentPage.Loaded -= OnCurrentPageLoaded;
}
}
diff --git a/src/Controls/src/Core/Shell/ShellContent.cs b/src/Controls/src/Core/Shell/ShellContent.cs
index 68c3f10a8ceb..1faa996f76db 100644
--- a/src/Controls/src/Core/Shell/ShellContent.cs
+++ b/src/Controls/src/Core/Shell/ShellContent.cs
@@ -97,6 +97,12 @@ Page IShellContentController.GetOrCreateContent()
}
result = ContentCache ?? (Page)template.CreateContent(content, this);
+
+ if (GetValue(QueryAttributesProperty) is ShellRouteParameters delayedQueryParams)
+ {
+ result?.SetValue(QueryAttributesProperty, delayedQueryParams);
+ }
+
ContentCache = result;
}
@@ -112,9 +118,6 @@ Page IShellContentController.GetOrCreateContent()
if (result is NavigationPage)
throw new NotSupportedException("Shell is currently not compatible with NavigationPage. Shell has Navigation built in and doesn't require a NavigationPage.");
- if (GetValue(QueryAttributesProperty) is ShellRouteParameters delayedQueryParams)
- result.SetValue(QueryAttributesProperty, delayedQueryParams);
-
return result;
}
@@ -416,8 +419,18 @@ static void ApplyQueryAttributes(object content, ShellRouteParameters query, She
}
else
{
- var castValue = Convert.ChangeType(value, prop.PropertyType);
- prop.SetValue(content, castValue);
+ // Handle nullable types
+ Type targetType = Nullable.GetUnderlyingType(prop.PropertyType) ?? prop.PropertyType;
+
+ if (value == null)
+ {
+ prop.SetValue(content, null);
+ }
+ else
+ {
+ var castValue = Convert.ChangeType(value, targetType);
+ prop.SetValue(content, castValue);
+ }
}
}
}
diff --git a/src/Controls/src/Core/Shell/ShellElementCollection.cs b/src/Controls/src/Core/Shell/ShellElementCollection.cs
index ac88242d85aa..1e94532aab4d 100644
--- a/src/Controls/src/Core/Shell/ShellElementCollection.cs
+++ b/src/Controls/src/Core/Shell/ShellElementCollection.cs
@@ -23,6 +23,7 @@ internal abstract class ShellElementCollection :
public bool IsReadOnly => Inner.IsReadOnly;
IList _inner;
IList _visibleItems;
+ bool _isItemsCleared;
protected ShellElementCollection()
{
@@ -119,6 +120,7 @@ public void Clear()
}
Inner.Clear();
+ _isItemsCleared = true;
CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, list));
}
@@ -153,6 +155,13 @@ void InnerCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
CheckVisibility(element);
}
+ // When items are cleared, the flyout behavior is set to disabled state. When adding items again, we need to update the flyout behavior. The flyout state should be updated only when the second item is added to the view.
+ if (_isItemsCleared && Count == 2 && this is ShellItemCollection shellItemCollection)
+ {
+ var shell = shellItemCollection[0].Parent as Shell;
+ shell?.NotifyFlyoutBehaviorObservers();
+ _isItemsCleared = false;
+ }
}
if (e.OldItems != null)
diff --git a/src/Controls/src/Core/Shell/ShellNavigationManager.cs b/src/Controls/src/Core/Shell/ShellNavigationManager.cs
index dbe205c51e56..efac0f54f2e6 100644
--- a/src/Controls/src/Core/Shell/ShellNavigationManager.cs
+++ b/src/Controls/src/Core/Shell/ShellNavigationManager.cs
@@ -313,14 +313,27 @@ public static void ApplyQueryAttributes(Element element, ShellRouteParameters qu
var mergedData = MergeData(element, filteredQuery, isPopping);
//if we are pop or navigating back, we need to apply the query attributes to the ShellContent
- if (isPopping)
+ if (isPopping && mergedData.Count > 0 )
{
element.SetValue(ShellContent.QueryAttributesProperty, mergedData);
}
- baseShellItem.ApplyQueryAttributes(mergedData);
+
+ // Skip applying query attributes if the merged data is empty and we're popping back
+ // This respects when user calls query.Clear() - they don't want attributes applied on back navigation
+ if (mergedData.Count > 0 || !isPopping)
+ {
+ baseShellItem.ApplyQueryAttributes(mergedData);
+ }
}
else if (isLastItem)
- element.SetValue(ShellContent.QueryAttributesProperty, MergeData(element, query, isPopping));
+ {
+ var mergedData = MergeData(element, query, isPopping);
+ // Skip setting query attributes if the merged data is empty and we're popping back
+ if (mergedData.Count > 0 || !isPopping)
+ {
+ element.SetValue(ShellContent.QueryAttributesProperty, mergedData);
+ }
+ }
ShellRouteParameters MergeData(Element shellElement, ShellRouteParameters data, bool isPopping)
{
diff --git a/src/Controls/src/Core/Shell/ShellSection.cs b/src/Controls/src/Core/Shell/ShellSection.cs
index e17f4c12d855..119eac000ce7 100644
--- a/src/Controls/src/Core/Shell/ShellSection.cs
+++ b/src/Controls/src/Core/Shell/ShellSection.cs
@@ -524,9 +524,9 @@ internal async Task GoToAsync(ShellNavigationRequest request, ShellRouteParamete
if (globalRoutes == null || globalRoutes.Count == 0)
{
if (_navStack.Count == 2)
- await OnPopAsync(animate ?? false);
+ await OnPopAsync(animate ?? true);
else
- await OnPopToRootAsync(animate ?? false);
+ await OnPopToRootAsync(animate ?? true);
return;
}
@@ -844,10 +844,21 @@ protected virtual async Task OnPopToRootAsync(bool animated)
RequestType = NavigationRequestType.PopToRoot
};
- InvokeNavigationRequest(args);
+ PresentedPageDisappearing();
var oldStack = _navStack;
_navStack = new List { null };
+ // NOTE:
+ // We intentionally raise PresentedPageAppearing (and thus SendPageAppearing/OnAppearing)
+ // before issuing the platform navigation request and awaiting its completion. This matches
+ // the behavior used for single-level Pop navigation and keeps Shell lifecycle events
+ // consistent across navigation patterns. At this point the root page may not yet be
+ // visually presented by the native stack (the pop-to-root animation can still be in
+ // progress), but Shell-level state (e.g., tab bar visibility) must already be updated
+ // so the platform reads the correct value when it commits the native navigation.
+ PresentedPageAppearing();
+ InvokeNavigationRequest(args);
+
if (args.Task != null)
await args.Task;
@@ -856,11 +867,14 @@ protected virtual async Task OnPopToRootAsync(bool animated)
for (int i = 1; i < oldStack.Count; i++)
{
- oldStack[i].SendDisappearing();
+ // RemovePage is called for all pages. SendDisappearing is only called for
+ // intermediate pages; the top page's disappearing event was already fired
+ // by PresentedPageDisappearing() above to avoid duplicate lifecycle events.
+ if (i < oldStack.Count - 1)
+ oldStack[i].SendDisappearing();
RemovePage(oldStack[i]);
}
- PresentedPageAppearing();
}
protected virtual Task OnPushAsync(Page page, bool animated)
diff --git a/src/Controls/src/Core/SwipeView/SwipeView.cs b/src/Controls/src/Core/SwipeView/SwipeView.cs
index d0bb86c0534d..18a27764e189 100644
--- a/src/Controls/src/Core/SwipeView/SwipeView.cs
+++ b/src/Controls/src/Core/SwipeView/SwipeView.cs
@@ -258,6 +258,7 @@ public IPlatformElementConfiguration On() where T : IConfigPlat
double _previousScrollX;
double _previousScrollY;
View? _scrollParent;
+ Element? _templateParent;
SwipeDirection? _swipeDirection;
ISwipeItems ISwipeView.LeftItems => new HandlerSwipeItems(LeftItems);
@@ -313,60 +314,83 @@ void OnPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEven
private protected override void OnParentChangedCore()
{
- if (_scrollParent != null)
+ base.OnParentChangedCore();
+
+ if (_templateParent != null)
{
- if (_scrollParent is ScrollView scrollView)
- {
- scrollView.Scrolled -= OnParentScrolled;
- }
+ _templateParent.ParentChanged -= OnTemplateParentChanged;
+ _templateParent = null;
+ }
+ UnsubscribeFromParentScrolledEvents();
+ // Try direct discovery first (works when the visual tree is already connected)
+ if (SubscribeToNearestScrollParent(this))
+ return;
+
+ // Deferred discovery for DataTemplate scenarios where the tree isn't fully connected yet
+ _templateParent = this.FindParentWith(x => x.Parent == null, false);
+ if (_templateParent != null)
+ _templateParent.ParentChanged += OnTemplateParentChanged;
+ }
+
+ void UnsubscribeFromParentScrolledEvents()
+ {
+ if (_scrollParent is ScrollView scrollView)
+ {
+ scrollView.Scrolled -= OnParentScrolled;
+ }
#pragma warning disable CS0618 // Type or member is obsolete
- if (_scrollParent is ListView listView)
- {
- listView.Scrolled -= OnParentScrolled;
- return;
- }
+ else if (_scrollParent is ListView listView)
+ {
+ listView.Scrolled -= OnParentScrolled;
+ }
#pragma warning restore CS0618 // Type or member is obsolete
+ else if (_scrollParent is CollectionView collectionView)
+ {
+ collectionView.Scrolled -= OnParentScrolled;
+ }
+ _scrollParent = null;
+ }
- if (_scrollParent is Microsoft.Maui.Controls.CollectionView collectionView)
- {
- collectionView.Scrolled -= OnParentScrolled;
- }
+ void OnTemplateParentChanged(object? sender, EventArgs e)
+ {
+ UnsubscribeFromParentScrolledEvents();
- _scrollParent = null;
+ if (_templateParent?.Parent != null)
+ {
+ SubscribeToNearestScrollParent(_templateParent);
}
+ }
- base.OnParentChangedCore();
+ bool SubscribeToNearestScrollParent(Element startElement)
+ {
+ _scrollParent = startElement.FindParentOfType();
- if (_scrollParent == null)
+ if (_scrollParent is ScrollView scrollView)
{
- _scrollParent = this.FindParentOfType();
-
- if (_scrollParent is ScrollView scrollView)
- {
- scrollView.Scrolled += OnParentScrolled;
- return;
- }
+ scrollView.Scrolled += OnParentScrolled;
+ return true;
+ }
#pragma warning disable CS0618 // Type or member is obsolete
- _scrollParent = this.FindParentOfType();
-#pragma warning restore CS0618 // Type or member is obsolete
+ _scrollParent = startElement.FindParentOfType();
-#pragma warning disable CS0618 // Type or member is obsolete
- if (_scrollParent is ListView listView)
- {
- listView.Scrolled += OnParentScrolled;
- return;
- }
+ if (_scrollParent is ListView listView)
+ {
+ listView.Scrolled += OnParentScrolled;
+ return true;
+ }
#pragma warning restore CS0618 // Type or member is obsolete
- _scrollParent = this.FindParentOfType();
+ _scrollParent = startElement.FindParentOfType();
- if (_scrollParent is Microsoft.Maui.Controls.CollectionView collectionView)
- {
- collectionView.Scrolled += OnParentScrolled;
- }
+ if (_scrollParent is Microsoft.Maui.Controls.CollectionView collectionView)
+ {
+ collectionView.Scrolled += OnParentScrolled;
+ return true;
}
+
+ return false;
}
void UpdateMargin()
@@ -380,8 +404,8 @@ void UpdateMargin()
void OnParentScrolled(object? sender, ScrolledEventArgs e)
{
- var horizontalDelta = e.ScrollX - _previousScrollX;
- var verticalDelta = e.ScrollY - _previousScrollY;
+ var horizontalDelta = Math.Abs(e.ScrollX - _previousScrollX);
+ var verticalDelta = Math.Abs(e.ScrollY - _previousScrollY);
if (horizontalDelta > SwipeMinimumDelta || verticalDelta > SwipeMinimumDelta)
((ISwipeView)this).RequestClose(new SwipeViewCloseRequest(true));
@@ -392,7 +416,7 @@ void OnParentScrolled(object? sender, ScrolledEventArgs e)
void OnParentScrolled(object? sender, ItemsViewScrolledEventArgs e)
{
- if (e.HorizontalDelta > SwipeMinimumDelta || e.VerticalDelta > SwipeMinimumDelta)
+ if (Math.Abs(e.HorizontalDelta) > SwipeMinimumDelta || Math.Abs(e.VerticalDelta) > SwipeMinimumDelta)
((ISwipeView)this).RequestClose(new SwipeViewCloseRequest(true));
}
diff --git a/src/Controls/src/Core/VisualElement/VisualElement.cs b/src/Controls/src/Core/VisualElement/VisualElement.cs
index 4db4e3ad0042..863154f7a8b8 100644
--- a/src/Controls/src/Core/VisualElement/VisualElement.cs
+++ b/src/Controls/src/Core/VisualElement/VisualElement.cs
@@ -1672,13 +1672,13 @@ protected internal virtual void ChangeVisualState()
{
VisualStateManager.GoToState(this, VisualStateManager.CommonStates.Disabled);
}
- else if (IsPointerOver)
- {
- VisualStateManager.GoToState(this, VisualStateManager.CommonStates.PointerOver);
- }
else
{
- VisualStateManager.GoToState(this, VisualStateManager.CommonStates.Normal);
+ bool isSelected = this.IsElementInSelectedState();
+ string targetState = isSelected ? VisualStateManager.CommonStates.Selected
+ : (IsPointerOver ? VisualStateManager.CommonStates.PointerOver : VisualStateManager.CommonStates.Normal);
+
+ VisualStateManager.GoToState(this, targetState);
}
if (IsEnabled)
diff --git a/src/Controls/src/Core/VisualStateManager.cs b/src/Controls/src/Core/VisualStateManager.cs
index 3910d823a91a..4c315d0fe681 100644
--- a/src/Controls/src/Core/VisualStateManager.cs
+++ b/src/Controls/src/Core/VisualStateManager.cs
@@ -779,6 +779,20 @@ internal static bool HasVisualState(this VisualElement element, string name)
return false;
}
+
+ internal static bool IsElementInSelectedState(this VisualElement element)
+ {
+ var groups = VisualStateManager.GetVisualStateGroups(element);
+ foreach (var group in groups)
+ {
+ if (group.CurrentState?.Name == VisualStateManager.CommonStates.Selected)
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
}
internal class WatchAddList : IList
diff --git a/src/Controls/src/Core/Window/Window.cs b/src/Controls/src/Core/Window/Window.cs
index 429eccb62f12..21025b297fc9 100644
--- a/src/Controls/src/Core/Window/Window.cs
+++ b/src/Controls/src/Core/Window/Window.cs
@@ -44,11 +44,13 @@ public partial class Window : NavigableElement, IWindow, IToolbarElement, IMenuB
/// Bindable property for .
public static readonly BindableProperty WidthProperty = BindableProperty.Create(
- nameof(Width), typeof(double), typeof(Window), Primitives.Dimension.Unset);
+ nameof(Width), typeof(double), typeof(Window), Primitives.Dimension.Unset,
+ propertyChanged: OnSizePropertyChanged);
/// Bindable property for .
public static readonly BindableProperty HeightProperty = BindableProperty.Create(
- nameof(Height), typeof(double), typeof(Window), Primitives.Dimension.Unset);
+ nameof(Height), typeof(double), typeof(Window), Primitives.Dimension.Unset,
+ propertyChanged: OnSizePropertyChanged);
/// Bindable property for .
public static readonly BindableProperty MaximumWidthProperty = BindableProperty.Create(
@@ -228,6 +230,16 @@ double GetSizeCoordinate(BindableProperty property)
int _batchFrameUpdate = 0;
+ static void OnSizePropertyChanged(BindableObject bindable, object oldValue, object newValue)
+ {
+ var window = (Window)bindable;
+ // Only trigger SizeChanged if not being updated from platform (FrameChanged)
+ if (window._batchFrameUpdate == 0)
+ {
+ window.SizeChanged?.Invoke(window, EventArgs.Empty);
+ }
+ }
+
void IWindow.FrameChanged(Rect frame)
{
if (new Rect(X, Y, Width, Height) == frame)
diff --git a/src/Controls/src/SourceGen/KnownMarkups.cs b/src/Controls/src/SourceGen/KnownMarkups.cs
index c9ade31c9a2a..72094fedfdcc 100644
--- a/src/Controls/src/SourceGen/KnownMarkups.cs
+++ b/src/Controls/src/SourceGen/KnownMarkups.cs
@@ -548,10 +548,9 @@ static bool TryGetXDataType(ElementNode node, SourceGenContext context, out ITyp
return false;
}
- if (!dataType.TryResolveTypeSymbol(null, context.Compilation, context.XmlnsCache, context.TypeCache, out INamedTypeSymbol? symbol) && symbol is not null)
+ if (!dataType.TryResolveTypeSymbol(null, context.Compilation, context.XmlnsCache, context.TypeCache, out INamedTypeSymbol? symbol) || symbol is null)
{
- // TODO report the right diagnostic
- context.ReportDiagnostic(Diagnostic.Create(Descriptors.XamlParserError, location, "Cannot resolve x:DataType type"));
+ context.ReportDiagnostic(Diagnostic.Create(Descriptors.TypeResolution, location, dataTypeName));
return false;
}
diff --git a/src/Controls/src/SourceGen/XmlTypeExtensions.cs b/src/Controls/src/SourceGen/XmlTypeExtensions.cs
index 0726a8a4d5ea..3c08ef92133d 100644
--- a/src/Controls/src/SourceGen/XmlTypeExtensions.cs
+++ b/src/Controls/src/SourceGen/XmlTypeExtensions.cs
@@ -67,6 +67,12 @@ public static bool TryResolveTypeSymbol(this XmlType xmlType, Action
if (types.Length == 1)
{
symbol = types[0];
+ // If the match is via the "Extension" suffix but the type is static, it cannot be
+ // an IMarkupExtension (static types cannot implement interfaces). In that case, skip
+ // this match and continue to try the exact name. This prevents a static helper class
+ // like MyEnumExtension from being returned instead of the MyEnum enum type. (#34021)
+ if (suffix == "Extension" && symbol.IsStatic)
+ continue;
if (symbol.IsGenericType && xmlType.TypeArguments is not null)
{
var typeArgs = xmlType.TypeArguments.Select(typeArg => typeArg.GetTypeSymbol(reportDiagnostic, compilation, xmlnsCache, typeCache)!).ToArray();
diff --git a/src/Controls/src/Xaml/ApplyPropertiesVisitor.cs b/src/Controls/src/Xaml/ApplyPropertiesVisitor.cs
index e513cb13e37c..e3034080322e 100644
--- a/src/Controls/src/Xaml/ApplyPropertiesVisitor.cs
+++ b/src/Controls/src/Xaml/ApplyPropertiesVisitor.cs
@@ -281,6 +281,15 @@ void ProvideValue(ref object value, ElementNode node, object source, XmlName pro
}
catch (Exception e)
{
+ // StaticResourceExtension must always rethrow even when a handler is present —
+ // unlike other markup extensions, swallowing this exception would silently apply
+ // an invalid value to the property. Notify the handler first to log the error.
+ if (markupExtension is StaticResourceExtension)
+ {
+ Context.ExceptionHandler?.Invoke(e);
+ throw;
+ }
+
if (Context.ExceptionHandler != null)
Context.ExceptionHandler(e);
else
diff --git a/src/Controls/src/Xaml/MarkupExtensions/BindingExtension.cs b/src/Controls/src/Xaml/MarkupExtensions/BindingExtension.cs
index 02228ad40da6..5d86ae0daa12 100644
--- a/src/Controls/src/Xaml/MarkupExtensions/BindingExtension.cs
+++ b/src/Controls/src/Xaml/MarkupExtensions/BindingExtension.cs
@@ -95,7 +95,17 @@ BindingBase CreateBinding()
UpdateSourceEventName = UpdateSourceEventName,
FallbackValue = FallbackValue,
TargetNullValue = TargetNullValue,
- DataType = bindingXDataType,
+ // When Source is set to a concrete element reference (e.g. x:Reference), the
+ // DataType from IXamlDataTypeProvider reflects the DataTemplate item type, not
+ // the explicit source type. Assigning that mismatched DataType causes
+ // BindingExpression.Apply to null-out the binding source when
+ // IsXamlCBindingWithSourceCompilationEnabled is true (.NET 10 default for
+ // AOT/trimmed builds). See https://github.com/dotnet/maui/issues/33291.
+ //
+ // RelativeBindingSource is excluded: the developer likely set x:DataType on
+ // the binding to describe the expected type of the resolved ancestor, and
+ // that validation should be preserved.
+ DataType = (Source is null || Source is RelativeBindingSource) ? bindingXDataType : null,
};
}
}
diff --git a/src/Controls/src/Xaml/MarkupExtensions/StaticResourceExtension.cs b/src/Controls/src/Xaml/MarkupExtensions/StaticResourceExtension.cs
index ef8757d883e2..26fe06836982 100644
--- a/src/Controls/src/Xaml/MarkupExtensions/StaticResourceExtension.cs
+++ b/src/Controls/src/Xaml/MarkupExtensions/StaticResourceExtension.cs
@@ -30,16 +30,15 @@ public object ProvideValue(IServiceProvider serviceProvider)
&& !TryGetApplicationLevelResource(Key, out resource, out resourceDictionary))
{
var xmlLineInfo = serviceProvider.GetService(typeof(IXmlLineInfoProvider)) is IXmlLineInfoProvider xmlLineInfoProvider ? xmlLineInfoProvider.XmlLineInfo : null;
+ var ex = new XamlParseException($"StaticResource not found for key {Key}", xmlLineInfo);
if (Controls.Internals.ResourceLoader.ExceptionHandler2 is var ehandler && ehandler != null)
{
- var ex = new XamlParseException($"StaticResource not found for key {Key}", xmlLineInfo);
var rootObjectProvider = (IRootObjectProvider)serviceProvider.GetService(typeof(IRootObjectProvider));
var root = rootObjectProvider.RootObject;
ehandler.Invoke((ex, XamlFilePathAttribute.GetFilePathForObject(root)));
- return null;
}
- else
- throw new XamlParseException($"StaticResource not found for key {Key}", xmlLineInfo);
+ // Throw an exception when the key is not found
+ throw ex;
}
Diagnostics.ResourceDictionaryDiagnostics.OnStaticResourceResolved(resourceDictionary, Key, valueProvider.TargetObject, valueProvider.TargetProperty);
diff --git a/src/Controls/src/Xaml/XmlTypeXamlExtensions.cs b/src/Controls/src/Xaml/XmlTypeXamlExtensions.cs
index dfef113220cd..6eab676b6346 100644
--- a/src/Controls/src/Xaml/XmlTypeXamlExtensions.cs
+++ b/src/Controls/src/Xaml/XmlTypeXamlExtensions.cs
@@ -108,6 +108,15 @@ public static IEnumerable GetTypeReferences(
if ((returnTypeName == null || returnTypeName == typeInfo.typeName) //only return multiple types if they share the same name. avoid returning both BindingExtension and Binding
&& (type = refFromTypeInfo(typeInfo)) != null)
{
+ // If this is an Extension-suffix match but the type is static (cannot implement
+ // IMarkupExtension), skip it and continue to try the exact name. This prevents
+ // a static helper class like MyEnumExtension from shadowing MyEnum. (#34021)
+ if (returnTypeName == null
+ && typeInfo.typeName.EndsWith("Extension", StringComparison.Ordinal)
+ && typeInfo.typeName != elementName
+ && type is System.Type runtimeType
+ && runtimeType.IsAbstract && runtimeType.IsSealed) // static in reflection: abstract+sealed
+ continue;
returnTypeName = typeInfo.typeName;
yield return type;
}
diff --git a/src/Controls/tests/Core.UnitTests/FlexOrderTests.cs b/src/Controls/tests/Core.UnitTests/FlexOrderTests.cs
index 3a087779144d..257698b9e31b 100644
--- a/src/Controls/tests/Core.UnitTests/FlexOrderTests.cs
+++ b/src/Controls/tests/Core.UnitTests/FlexOrderTests.cs
@@ -45,5 +45,124 @@ public void TestOrderingElements()
Assert.Equal(label1.Bounds, new Rect(0, 40, 912, 20));
Assert.Equal(label0.Bounds, new Rect(0, 60, 912, 20));
}
+
+ [Fact]
+ public void TestReverseOrderingElements()
+ {
+ // Children inserted in order 0..3, but Order values are reversed (3, 2, 1, 0)
+ // so layout should place label0 last and label3 first
+ var label0 = MockPlatformSizeService.Sub
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/EmptyView/EmptyViewOptionsPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/EmptyView/EmptyViewOptionsPage.xaml.cs
index 4186e8905925..418f1daed905 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/EmptyView/EmptyViewOptionsPage.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/EmptyView/EmptyViewOptionsPage.xaml.cs
@@ -41,7 +41,6 @@ private void OnEmptyViewChanged(object sender, CheckedChangedEventArgs e)
grid.Children.Add(new Label
{
Text = "No Items Available(Grid View)",
- HorizontalOptions = LayoutOptions.Center,
VerticalOptions = LayoutOptions.Center,
TextColor = Colors.Blue
});
@@ -60,7 +59,6 @@ private void OnEmptyViewChanged(object sender, CheckedChangedEventArgs e)
Content = new Label
{
Text = "Custom Empty View (Sized)",
- HorizontalOptions = LayoutOptions.Center,
VerticalOptions = LayoutOptions.Center,
}
};
@@ -140,7 +138,6 @@ private void OnEmptyViewTemplateChanged(object sender, CheckedChangedEventArgs e
grid.Children.Add(new Label
{
Text = "No Template Items Available(Grid View)",
- HorizontalOptions = LayoutOptions.Center,
VerticalOptions = LayoutOptions.Center,
TextColor = Colors.Blue
});
@@ -163,7 +160,6 @@ private void OnEmptyViewTemplateChanged(object sender, CheckedChangedEventArgs e
Content = new Label
{
Text = "Custom EmptyViewTemplate (Sized)",
- HorizontalOptions = LayoutOptions.Center,
VerticalOptions = LayoutOptions.Center,
}
};
@@ -266,5 +262,17 @@ private void OnItemsLayoutChanged(object sender, CheckedChangedEventArgs e)
_viewModel.ItemsLayout = new GridItemsLayout(2, ItemsLayoutOrientation.Horizontal); // 2 rows
}
}
+
+ private void OnFlowDirectionChanged(object sender, CheckedChangedEventArgs e)
+ {
+ if (FlowDirectionLeftToRight.IsChecked)
+ {
+ _viewModel.FlowDirection = FlowDirection.LeftToRight;
+ }
+ else if (FlowDirectionRightToLeft.IsChecked)
+ {
+ _viewModel.FlowDirection = FlowDirection.RightToLeft;
+ }
+ }
}
}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ScrollingFeature/CollectionViewScrollPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ScrollingFeature/CollectionViewScrollPage.xaml
index 603b91f350f6..44ada31fab73 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ScrollingFeature/CollectionViewScrollPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ScrollingFeature/CollectionViewScrollPage.xaml
@@ -4,21 +4,79 @@
xmlns:local="clr-namespace:Maui.Controls.Sample"
x:Class="Maui.Controls.Sample.CollectionViewScrollPage"
Title="CollectionViewScrollPage">
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ScrollingFeature/CollectionViewScrollPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ScrollingFeature/CollectionViewScrollPage.xaml.cs
index cf1fc1fd5050..d33c1139eab4 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ScrollingFeature/CollectionViewScrollPage.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ScrollingFeature/CollectionViewScrollPage.xaml.cs
@@ -17,6 +17,127 @@ private async void NavigateToOptionsPage_Clicked(object sender, EventArgs e)
{
BindingContext = _viewModel = new CollectionViewViewModel();
_viewModel.ItemsSourceType = ItemsSourceType.ObservableCollectionT3;
+ _viewModel.ScrollToPosition = ScrollToPosition.MakeVisible;
+ ResetScrollEventLabels();
await Navigation.PushAsync(new ScrollBehaviorOptionsPage(_viewModel));
}
+
+ public void ResetScrollEventLabels()
+ {
+#if !WINDOWS // In Windows, CollectionView automatically moves to the first item when navigating to the page, so there is no need to scroll to the first item again.
+ collectionView.ScrollTo(0, position: ScrollToPosition.Start);
+#endif
+ scrolledEventLabel.Text = "Not Fired";
+ scrollToRequestedLabel.Text = "Not Fired";
+ remainingItemsThresholdLabel.Text = "Not Fired";
+ reorderCompletedLabel.Text = "Not Fired";
+ firstIndexLabel.Text = "0";
+ centerIndexLabel.Text = "0";
+ lastIndexLabel.Text = "0";
+ indexLabel.Text = "0";
+ itemLabel.Text = "None";
+ groupIndexLabel.Text = "-1";
+ groupLabel.Text = "None";
+ }
+
+ private void OnScrolled(object sender, ItemsViewScrolledEventArgs e)
+ {
+ scrolledEventLabel.Text = "Fired";
+ firstIndexLabel.Text = e.FirstVisibleItemIndex.ToString();
+ centerIndexLabel.Text = e.CenterItemIndex.ToString();
+ lastIndexLabel.Text = e.LastVisibleItemIndex.ToString();
+ }
+
+ private void OnScrollToRequested(object sender, ScrollToRequestEventArgs e)
+ {
+ scrollToRequestedLabel.Text = "Fired";
+ indexLabel.Text = e.Index.ToString();
+ itemLabel.Text = (e.Item as CollectionViewViewModel.CollectionViewTestItem)?.Caption ?? "None";
+ groupIndexLabel.Text = e.GroupIndex.ToString();
+ groupLabel.Text = e.Group?.ToString() ?? "None";
+ }
+
+ private void OnScrollToButtonClicked(object sender, EventArgs e)
+ {
+ if (_viewModel.IsGrouped)
+ {
+ if (_viewModel.ScrollToByIndexOrItem == "Index")
+ {
+ ScrollToGroupedByIndex();
+ }
+ else
+ {
+ ScrollToGroupedByItem();
+ }
+ }
+ else
+ {
+ if (_viewModel.ScrollToByIndexOrItem == "Index")
+ {
+ ScrollToUngroupedByIndex();
+ }
+ else
+ {
+ ScrollToUngroupedByItem();
+ }
+ }
+ }
+
+ private void ScrollToGroupedByIndex()
+ {
+ if (_viewModel.ItemsSource is not List> groupedList)
+ return;
+
+ if (_viewModel.GroupIndex < 0 || _viewModel.GroupIndex >= groupedList.Count
+ || _viewModel.ScrollToIndex < 0 || _viewModel.ScrollToIndex >= groupedList[_viewModel.GroupIndex].Count)
+ return;
+
+ collectionView.ScrollTo(groupIndex: _viewModel.GroupIndex, index: _viewModel.ScrollToIndex, position: _viewModel.ScrollToPosition, animate: true);
+ }
+
+ private void ScrollToGroupedByItem()
+ {
+ if (_viewModel.ItemsSource is not List> groupedList)
+ return;
+
+ // Find the selected group
+ var selectedGroup = groupedList.FirstOrDefault(g => g.Key == _viewModel.GroupName);
+ if (selectedGroup == null)
+ return;
+
+ // Find the item in the group
+ var targetItem = selectedGroup.FirstOrDefault(item => item.Caption == _viewModel.ScrollToItem);
+ if (targetItem == null)
+ return;
+
+ collectionView.ScrollTo(item: targetItem, group: selectedGroup.Key, position: _viewModel.ScrollToPosition, animate: true);
+ }
+
+ private void ScrollToUngroupedByIndex()
+ {
+ collectionView.ScrollTo(index: _viewModel.ScrollToIndex, position: _viewModel.ScrollToPosition, animate: true);
+ }
+
+ private void ScrollToUngroupedByItem()
+ {
+ if (_viewModel.ItemsSource is not ObservableCollection items)
+ return;
+
+ // Find the item by caption
+ var targetItem = items.FirstOrDefault(x => x.Caption == _viewModel.ScrollToItem);
+ if (targetItem == null)
+ return;
+
+ collectionView.ScrollTo(item: targetItem, position: _viewModel.ScrollToPosition, animate: true);
+ }
+
+ private void OnRemainingItemsThresholdReached(object sender, EventArgs e)
+ {
+ remainingItemsThresholdLabel.Text = "Fired";
+ }
+
+ private void OnReorderCompleted(object sender, EventArgs e)
+ {
+ reorderCompletedLabel.Text = "Fired";
+ }
}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ScrollingFeature/ScrollBehaviorOptionsPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ScrollingFeature/ScrollBehaviorOptionsPage.xaml
index 3ff7fa3563dd..3c5ac8c9160d 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ScrollingFeature/ScrollBehaviorOptionsPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ScrollingFeature/ScrollBehaviorOptionsPage.xaml
@@ -54,7 +54,7 @@
CheckedChanged="OnItemsUpdatingScrollModeChanged"
AutomationId="ItemsUpdatingKeepLastItemInView"/>
-
+
-
-
-
-
-
-
-
+
+
@@ -160,6 +185,143 @@
AutomationId="ItemsLayoutHorizontalGrid"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ScrollingFeature/ScrollBehaviorOptionsPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ScrollingFeature/ScrollBehaviorOptionsPage.xaml.cs
index 766394abc621..e7d3ea64a885 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ScrollingFeature/ScrollBehaviorOptionsPage.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/ScrollingFeature/ScrollBehaviorOptionsPage.xaml.cs
@@ -67,6 +67,21 @@ private void OnIsGroupedChanged(object sender, CheckedChangedEventArgs e)
}
}
+ private void OnGroupNameChanged(object sender, CheckedChangedEventArgs e)
+ {
+ if (!(sender is RadioButton radioButton) || !e.Value)
+ return;
+
+ if (radioButton == FruitGroup)
+ {
+ _viewModel.GroupName = "Fruits";
+ }
+ else if (radioButton == VegetableGroup)
+ {
+ _viewModel.GroupName = "Vegetables";
+ }
+ }
+
private void OnItemsLayoutChanged(object sender, CheckedChangedEventArgs e)
{
if (ItemsLayoutVerticalList.IsChecked)
@@ -86,4 +101,77 @@ private void OnItemsLayoutChanged(object sender, CheckedChangedEventArgs e)
_viewModel.ItemsLayout = new GridItemsLayout(2, ItemsLayoutOrientation.Horizontal); // 2 rows
}
}
+
+ private void OnFlowDirectionChanged(object sender, CheckedChangedEventArgs e)
+ {
+ if (FlowDirectionLeftToRight.IsChecked)
+ {
+ _viewModel.FlowDirection = FlowDirection.LeftToRight;
+ }
+ else if (FlowDirectionRightToLeft.IsChecked)
+ {
+ _viewModel.FlowDirection = FlowDirection.RightToLeft;
+ }
+ }
+ private void OnScrollToPositionChanged(object sender, CheckedChangedEventArgs e)
+ {
+ if (!(sender is RadioButton radioButton) || !e.Value)
+ return;
+
+ if (radioButton == ScrollToPositionMakeVisible)
+ _viewModel.ScrollToPosition = ScrollToPosition.MakeVisible;
+ else if (radioButton == ScrollToPositionStart)
+ _viewModel.ScrollToPosition = ScrollToPosition.Start;
+ else if (radioButton == ScrollToPositionCenter)
+ _viewModel.ScrollToPosition = ScrollToPosition.Center;
+ else if (radioButton == ScrollToPositionEnd)
+ _viewModel.ScrollToPosition = ScrollToPosition.End;
+ }
+
+ private void ScrollToIndexItemChanged(object sender, CheckedChangedEventArgs e)
+ {
+ if (!(sender is RadioButton radioButton) || !e.Value)
+ return;
+ if (radioButton == ScrollToByIndex)
+ {
+ _viewModel.ScrollToByIndexOrItem = "Index";
+ }
+ else if (radioButton == ScrollToByItem)
+ {
+ _viewModel.ScrollToByIndexOrItem = "Item";
+ }
+ }
+
+ private void ScrollToIndexEntry_TextChanged(object sender, TextChangedEventArgs e)
+ {
+ if (int.TryParse(ScrollToIndexEntry.Text, out int index))
+ {
+ _viewModel.ScrollToIndex = index;
+ }
+ }
+
+ private void GroupIndexEntry_TextChanged(object sender, TextChangedEventArgs e)
+ {
+ if (int.TryParse(GroupIndexEntry.Text, out int groupIndex))
+ {
+ _viewModel.GroupIndex = groupIndex;
+ }
+ }
+
+ private void ScrollToItemEntry_TextChanged(object sender, TextChangedEventArgs e)
+ {
+ _viewModel.ScrollToItem = ScrollToItemEntry.Text;
+ }
+
+ private void OnCanReorderItemsChanged(object sender, CheckedChangedEventArgs e)
+ {
+ if (CanReorderItemsTrue.IsChecked)
+ {
+ _viewModel.CanReorderItems = true;
+ }
+ else if (CanReorderItemsFalse.IsChecked)
+ {
+ _viewModel.CanReorderItems = false;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/Selection/CollectionViewSelectionPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/Selection/CollectionViewSelectionPage.xaml
index fa292dd3d0a3..5894590e384f 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/Selection/CollectionViewSelectionPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/Selection/CollectionViewSelectionPage.xaml
@@ -30,6 +30,11 @@
x:Name="collectionView"
Grid.Row="0"
Grid.ColumnSpan="2"
+ FlowDirection="{Binding FlowDirection}"
+ Header="{Binding Header}"
+ Footer="{Binding Footer}"
+ HeaderTemplate="{Binding HeaderTemplate}"
+ FooterTemplate="{Binding FooterTemplate}"
ItemsSource="{Binding ItemsSource}"
ItemTemplate="{Binding ItemTemplate}"
ItemsLayout="{Binding ItemsLayout}"
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/Selection/SelectionOptionsPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/Selection/SelectionOptionsPage.xaml
index c8b72fad7638..068cb76e0d91 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/Selection/SelectionOptionsPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/Selection/SelectionOptionsPage.xaml
@@ -129,6 +129,115 @@
CheckedChanged="OnItemsSourceChanged"
AutomationId="ItemsSourceGroupedList"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/Selection/SelectionOptionsPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/Selection/SelectionOptionsPage.xaml.cs
index 580dd578e63a..a6001de9fa3d 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/Selection/SelectionOptionsPage.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/CollectionView/Selection/SelectionOptionsPage.xaml.cs
@@ -41,6 +41,139 @@ private void OnSelectionModeButtonClicked(object sender, EventArgs e)
}
}
}
+
+ private void OnFlowDirectionChanged(object sender, CheckedChangedEventArgs e)
+ {
+ if (FlowDirectionLeftToRight.IsChecked)
+ {
+ _viewModel.FlowDirection = FlowDirection.LeftToRight;
+ }
+ else if (FlowDirectionRightToLeft.IsChecked)
+ {
+ _viewModel.FlowDirection = FlowDirection.RightToLeft;
+ }
+ }
+
+ private void OnHeaderChanged(object sender, CheckedChangedEventArgs e)
+ {
+ if (HeaderNone.IsChecked)
+ {
+ _viewModel.Header = null;
+ }
+ else if (HeaderString.IsChecked)
+ {
+ _viewModel.Header = "CollectionView Header(String)";
+ }
+ else if (HeaderGrid.IsChecked)
+ {
+ Grid grid = new Grid
+ {
+ BackgroundColor = Colors.LightGray,
+ Padding = new Thickness(10)
+ };
+ grid.Children.Add(new Label
+ {
+ Text = "CollectionView Header(Grid View)",
+ FontSize = 18,
+ HorizontalOptions = LayoutOptions.Center,
+ VerticalOptions = LayoutOptions.Center,
+ TextColor = Colors.Blue,
+ AutomationId = "HeaderViewLabel"
+ });
+ _viewModel.Header = grid;
+ }
+ }
+
+ private void OnFooterChanged(object sender, CheckedChangedEventArgs e)
+ {
+ if (FooterNone.IsChecked)
+ {
+ _viewModel.Footer = null;
+ }
+ else if (FooterString.IsChecked)
+ {
+ _viewModel.Footer = "CollectionView Footer(String)";
+ }
+ else if (FooterGrid.IsChecked)
+ {
+ Grid grid = new Grid
+ {
+ BackgroundColor = Colors.LightGray,
+ Padding = new Thickness(10)
+ };
+ grid.Children.Add(new Label
+ {
+ Text = "CollectionView Footer(Grid View)",
+ FontSize = 18,
+ HorizontalOptions = LayoutOptions.Center,
+ VerticalOptions = LayoutOptions.Center,
+ TextColor = Colors.Red,
+ AutomationId = "FooterViewLabel"
+ });
+ _viewModel.Footer = grid;
+ }
+ }
+
+ private void OnHeaderTemplateChanged(object sender, CheckedChangedEventArgs e)
+ {
+ if (HeaderTemplateNone.IsChecked)
+ {
+ _viewModel.HeaderTemplate = null;
+ }
+ else if (HeaderTemplateGrid.IsChecked)
+ {
+ _viewModel.HeaderTemplate = new DataTemplate(() =>
+ {
+ Grid grid = new Grid
+ {
+ BackgroundColor = Colors.LightGray,
+ Padding = new Thickness(10)
+ };
+ grid.Children.Add(new Label
+ {
+ Text = "Header Template(Grid View)",
+ FontSize = 18,
+ FontAttributes = FontAttributes.Bold,
+ HorizontalOptions = LayoutOptions.Center,
+ VerticalOptions = LayoutOptions.Center,
+ TextColor = Colors.Blue,
+ AutomationId = "HeaderTemplateLabel"
+ });
+ return grid;
+ });
+ }
+ }
+
+ private void OnFooterTemplateChanged(object sender, CheckedChangedEventArgs e)
+ {
+ if (FooterTemplateNone.IsChecked)
+ {
+ _viewModel.FooterTemplate = null;
+ }
+ else if (FooterTemplateGrid.IsChecked)
+ {
+ _viewModel.FooterTemplate = new DataTemplate(() =>
+ {
+ Grid grid = new Grid
+ {
+ BackgroundColor = Colors.LightGray,
+ Padding = new Thickness(10)
+ };
+ grid.Children.Add(new Label
+ {
+ Text = "Footer Template(Grid View)",
+ FontSize = 18,
+ FontAttributes = FontAttributes.Bold,
+ HorizontalOptions = LayoutOptions.Center,
+ VerticalOptions = LayoutOptions.Center,
+ TextColor = Colors.Green,
+ AutomationId = "FooterTemplateLabel"
+ });
+ return grid;
+ });
+ }
+ }
+
private void OnIsGroupedChanged(object sender, CheckedChangedEventArgs e)
{
if (IsGroupedFalse.IsChecked)
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryMaterial3/Material3_EntryControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryMaterial3/Material3_EntryControlPage.xaml
new file mode 100644
index 000000000000..c3262fdf0e40
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryMaterial3/Material3_EntryControlPage.xaml
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryMaterial3/Material3_EntryControlPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryMaterial3/Material3_EntryControlPage.xaml.cs
new file mode 100644
index 000000000000..0f945e3c0b1e
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/EntryMaterial3/Material3_EntryControlPage.xaml.cs
@@ -0,0 +1,125 @@
+using System.ComponentModel;
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample;
+
+public class Material3_EntryControlPage : NavigationPage
+{
+ EntryViewModel _viewModel;
+
+ public Material3_EntryControlPage()
+ {
+ _viewModel = new EntryViewModel();
+ PushAsync(new Material3_EntryControlMainPage(_viewModel));
+ }
+}
+
+public partial class Material3_EntryControlMainPage : ContentPage
+{
+ EntryViewModel _viewModel;
+
+ public Material3_EntryControlMainPage(EntryViewModel viewModel)
+ {
+ InitializeComponent();
+ _viewModel = viewModel;
+ BindingContext = _viewModel;
+ EntryControl.PropertyChanged += UpdateEntryControl;
+ }
+
+ async void NavigateToOptionsPage_Clicked(object sender, EventArgs e)
+ {
+ BindingContext = _viewModel = new EntryViewModel();
+ _viewModel.Text = "Test Entry";
+ _viewModel.Placeholder = "Enter text here";
+ _viewModel.CursorPosition = 0;
+ _viewModel.SelectionLength = 0;
+ await Navigation.PushAsync(new EntryOptionsPage(_viewModel));
+ }
+
+ void CursorPositionButton_Clicked(object sender, EventArgs e)
+ {
+ if (int.TryParse(CursorPositionEntry.Text, out int cursorPosition))
+ {
+ _viewModel.CursorPosition = cursorPosition;
+ }
+ }
+
+ void SelectionLength_Clicked(object sender, EventArgs e)
+ {
+ if (int.TryParse(SelectionLengthEntry.Text, out int selectionLength))
+ {
+ _viewModel.SelectionLength = selectionLength;
+ }
+ }
+
+ void OnUpdateCursorAndSelectionClicked(object sender, EventArgs e)
+ {
+ if (int.TryParse(CursorPositionEntry.Text, out int cursorPosition))
+ {
+ EntryControl.Focus();
+ EntryControl.CursorPosition = cursorPosition;
+
+ if (BindingContext is EntryViewModel vm)
+ vm.CursorPosition = cursorPosition;
+ }
+
+ if (int.TryParse(SelectionLengthEntry.Text, out int selectionLength))
+ {
+ EntryControl.Focus();
+ EntryControl.SelectionLength = selectionLength;
+
+ if (BindingContext is EntryViewModel vm)
+ vm.SelectionLength = selectionLength;
+ }
+ CursorPositionEntry.Text = EntryControl.CursorPosition.ToString();
+ SelectionLengthEntry.Text = EntryControl.SelectionLength.ToString();
+ }
+
+ void UpdateEntryControl(object sender, PropertyChangedEventArgs args)
+ {
+ if (args.PropertyName == Entry.CursorPositionProperty.PropertyName)
+ CursorPositionEntry.Text = EntryControl.CursorPosition.ToString();
+ else if (args.PropertyName == Entry.SelectionLengthProperty.PropertyName)
+ SelectionLengthEntry.Text = EntryControl.SelectionLength.ToString();
+ }
+
+ void EntryControl_TextChanged(object sender, TextChangedEventArgs e)
+ {
+ string eventInfo = $"TextChanged: Old='{e.OldTextValue}', New='{e.NewTextValue}'";
+
+ if (BindingContext is EntryViewModel vm)
+ {
+ vm.TextChangedText = eventInfo;
+ }
+ }
+
+ void EntryControl_Completed(object sender, EventArgs e)
+ {
+ string eventInfo = $"Completed: Event Triggered";
+
+ if (BindingContext is EntryViewModel vm)
+ {
+ vm.CompletedText = eventInfo;
+ }
+ }
+
+ void EntryControl_Focused(object sender, FocusEventArgs e)
+ {
+ string eventInfo = $"Focused: Event Triggered";
+
+ if (BindingContext is EntryViewModel vm)
+ {
+ vm.FocusedText = eventInfo;
+ }
+ }
+
+ void EntryControl_Unfocused(object sender, FocusEventArgs e)
+ {
+ string eventInfo = $"Unfocused: Event Triggered";
+
+ if (BindingContext is EntryViewModel vm)
+ {
+ vm.UnfocusedText = eventInfo;
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/FlyoutPage/FlyoutControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/FlyoutPage/FlyoutControlPage.xaml
index 1427640a183e..6c35f5ee2c4a 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/FlyoutPage/FlyoutControlPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/FlyoutPage/FlyoutControlPage.xaml
@@ -7,7 +7,9 @@
FlyoutLayoutBehavior="{Binding FlyoutLayoutBehavior}"
IsEnabled="{Binding IsEnabled}"
FlowDirection="{Binding FlowDirection}"
- IsVisible="{Binding IsVisible }">
+ IsVisible="{Binding IsVisible }"
+ BackButtonPressed="OnBackButtonPressed"
+ IsPresentedChanged="OnIsPresentedChanged">
-
@@ -40,8 +43,8 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/FlyoutPage/FlyoutControlPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/FlyoutPage/FlyoutControlPage.xaml.cs
index 4ce1bcefe950..c7ac995c9b00 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/FlyoutPage/FlyoutControlPage.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/FlyoutPage/FlyoutControlPage.xaml.cs
@@ -22,6 +22,8 @@ public FlyoutControlMainPage(FlyoutPageViewModel viewModel)
BindingContext = _viewModel;
NavigationPage.SetHasNavigationBar(this, false);
_originalFlyoutPage = this.Flyout;
+ AttachFlyoutNavigationEvents(this.Flyout);
+
}
private async void NavigateToOptionsPage_Clicked(object sender, EventArgs e)
{
@@ -29,6 +31,8 @@ private async void NavigateToOptionsPage_Clicked(object sender, EventArgs e)
NavigatedToLabel.Text = "NavigatedTo: ";
NavigatingFromLabel.Text = "NavigatingFrom: ";
NavigatedFromLabel.Text = "NavigatedFrom: ";
+ _viewModel.IsPresentedChangedText = "Not Raised";
+ _viewModel.BackButtonPressedText = "Not Raised";
await Navigation.PushAsync(new FlyoutOptionsPage(_viewModel));
}
@@ -66,6 +70,14 @@ protected override void OnAppearing()
#endif
}
+ private void AttachFlyoutNavigationEvents(Page flyoutPage)
+ {
+ flyoutPage.NavigatedTo += OnPageNavigatedTo;
+ flyoutPage.NavigatingFrom += OnPageNavigatingFrom;
+ flyoutPage.NavigatedFrom += OnPageNavigatedFrom;
+ }
+
+
private void OnPageNavigatedTo(object sender, NavigatedToEventArgs e)
{
@@ -135,7 +147,7 @@ private async void OnGoToNewPageClicked(object sender, EventArgs e)
private void OnSetFlyout1Clicked(object sender, EventArgs e)
{
- this.Flyout = new ContentPage
+ var flyout1 = new ContentPage
{
Title = "Flyout 1",
Content = new VerticalStackLayout
@@ -156,11 +168,15 @@ private void OnSetFlyout1Clicked(object sender, EventArgs e)
}
}
};
+ AttachFlyoutNavigationEvents(flyout1);
+ this.Flyout = flyout1;
+
+
}
private void OnSetFlyout2Clicked(object sender, EventArgs e)
{
- this.Flyout = new ContentPage
+ var flyout2 = new ContentPage
{
Title = "Flyout 2",
Content = new VerticalStackLayout
@@ -181,12 +197,17 @@ private void OnSetFlyout2Clicked(object sender, EventArgs e)
}
}
};
+ AttachFlyoutNavigationEvents(flyout2);
+
+ this.Flyout = flyout2;
}
private void RestoreOriginalFlyoutPage()
{
if (_originalFlyoutPage != null)
+ {
this.Flyout = _originalFlyoutPage;
+ }
}
private async void OnSetDetail1Clicked(object sender, EventArgs e)
{
@@ -252,4 +273,23 @@ void OnOpenFlyoutClicked(object sender, EventArgs e)
{
this.IsPresented = true;
}
+
+ private void OnIsPresentedChanged(object sender, EventArgs e)
+ {
+ if (BindingContext is FlyoutPageViewModel vm)
+ {
+ vm.IsPresentedChangedText = "Raised";
+ }
+ }
+
+ private void OnBackButtonPressed(object sender, BackButtonPressedEventArgs e)
+
+ {
+ if (BindingContext is FlyoutPageViewModel vm)
+ {
+ vm.BackButtonPressedText = "Raised";
+ e.Handled = vm.ShouldHandleBackButton;
+ vm.BackButtonHandled = e.Handled.ToString();
+ }
+ }
}
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/FlyoutPage/FlyoutPageViewModel.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/FlyoutPage/FlyoutPageViewModel.cs
index 89e33a004311..24edc84507fd 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/FlyoutPage/FlyoutPageViewModel.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/FlyoutPage/FlyoutPageViewModel.cs
@@ -15,6 +15,10 @@ public class FlyoutPageViewModel : INotifyPropertyChanged
private bool _isEnabled = true;
private bool _isVisible = true;
private ImageSource _iconImageSource = "coffee.png";
+ private string _isPresentedChangedText = "Not Raised";
+ private string _backButtonPressedText = "Not Raised";
+ string _backButtonHandled = "False";
+
public string Title
{
@@ -134,6 +138,47 @@ public bool IsVisible
}
}
+ public string IsPresentedChangedText
+ {
+ get => _isPresentedChangedText;
+ set
+ {
+ _isPresentedChangedText = value;
+ OnPropertyChanged();
+ }
+ }
+
+ public string BackButtonPressedText
+ {
+ get => _backButtonPressedText;
+ set
+ {
+ _backButtonPressedText = value;
+ OnPropertyChanged();
+ }
+ }
+
+ public string BackButtonHandled
+ {
+ get => _backButtonHandled;
+ set
+ {
+ _backButtonHandled = value;
+ OnPropertyChanged(nameof(BackButtonHandled));
+ }
+ }
+
+ bool _shouldHandleBack = false;
+ public bool ShouldHandleBackButton
+ {
+ get => _shouldHandleBack;
+ set
+ {
+ _shouldHandleBack = value;
+ OnPropertyChanged(nameof(ShouldHandleBackButton));
+ }
+ }
+
public event PropertyChangedEventHandler PropertyChanged;
protected void OnPropertyChanged([CallerMemberName] string propertyName = "")
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Map/MapControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Map/MapControlPage.xaml
new file mode 100644
index 000000000000..997b24b6aa5e
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Map/MapControlPage.xaml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Map/MapControlPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Map/MapControlPage.xaml.cs
new file mode 100644
index 000000000000..fb11af2d141f
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Map/MapControlPage.xaml.cs
@@ -0,0 +1,246 @@
+using System.Collections.Specialized;
+using System.ComponentModel;
+using Microsoft.Maui.Controls.Maps;
+
+namespace Maui.Controls.Sample;
+
+public class MapControlPage : NavigationPage
+{
+ private MapViewModel _viewModel;
+ public MapControlPage()
+ {
+ _viewModel = new MapViewModel();
+ PushAsync(new MapControlMainPage(_viewModel));
+ }
+}
+
+public partial class MapControlMainPage : ContentPage
+{
+ private MapViewModel _viewModel;
+ public MapControlMainPage(MapViewModel viewModel)
+ {
+
+ InitializeComponent();
+ _viewModel = viewModel;
+ BindingContext = _viewModel;
+
+ // Set initial label text to 'Not clicked'
+ var mapLabel = this.FindByName("MapClickedLabel");
+ if (mapLabel != null)
+ mapLabel.Text = "Map Clicked: Not clicked";
+ var markerLabel = this.FindByName("MarkerClickedLabel");
+ if (markerLabel != null)
+ markerLabel.Text = "Marker Clicked: Not clicked";
+
+ // Handle MapElements collection changes manually since it's not directly bindable
+ _viewModel.MapElements.CollectionChanged += OnMapElementsCollectionChanged;
+
+ // Note: Pins collection changes are handled through ItemsSource binding
+ // Manual Pins handling is only needed when ItemsSource is null
+ _viewModel.Pins.CollectionChanged += OnPinsCollectionChanged;
+ _viewModel.PropertyChanged += OnViewModelPropertyChanged;
+
+ // ItemsSource, ItemTemplate, and ItemTemplateSelector are already bound in XAML
+ // No need for programmatic binding as it can cause conflicts
+
+ // Set initial map region to Pearl City
+ TestMap.MoveToRegion(_viewModel.InitialRegion);
+
+ // Ensure ItemTemplate and ItemTemplateSelector are synchronized with ViewModel
+ if (_viewModel.ItemTemplate != null)
+ {
+ TestMap.ItemTemplate = _viewModel.ItemTemplate;
+ }
+ if (_viewModel.ItemTemplateSelector != null)
+ {
+ TestMap.ItemTemplateSelector = _viewModel.ItemTemplateSelector;
+ }
+
+ // Subscribe to map events to sync VisibleRegion back to ViewModel
+ TestMap.PropertyChanged += OnMapPropertyChanged;
+
+ // Subscribe to MessagingCenter for label updates
+ Microsoft.Maui.Controls.MessagingCenter.Subscribe(this, "MapClickedLabelUpdate", (sender, value) =>
+ {
+ var label = this.FindByName("MapClickedLabel");
+ if (label != null)
+ label.Text = value;
+ });
+ Microsoft.Maui.Controls.MessagingCenter.Subscribe(this, "MarkerClickedLabelUpdate", (sender, value) =>
+ {
+ var label = this.FindByName("MarkerClickedLabel");
+ if (label != null)
+ label.Text = value;
+ });
+
+ TestMap.MapClicked += OnMapClicked;
+
+ }
+
+ protected override void OnDisappearing()
+ {
+ base.OnDisappearing();
+
+ // Clean up MessagingCenter subscriptions to avoid memory leaks
+ Microsoft.Maui.Controls.MessagingCenter.Unsubscribe(this, "MapClickedLabelUpdate");
+ Microsoft.Maui.Controls.MessagingCenter.Unsubscribe(this, "MarkerClickedLabelUpdate");
+ }
+
+ private void OnMapElementsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+ {
+ if (e.Action == NotifyCollectionChangedAction.Add)
+ {
+ foreach (MapElement element in e.NewItems)
+ {
+ TestMap.MapElements.Add(element);
+ }
+ }
+ else if (e.Action == NotifyCollectionChangedAction.Remove)
+ {
+ foreach (MapElement element in e.OldItems)
+ {
+ TestMap.MapElements.Remove(element);
+ }
+ }
+ else if (e.Action == NotifyCollectionChangedAction.Reset)
+ {
+ TestMap.MapElements.Clear();
+ }
+ }
+
+ private void OnPinsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+ {
+ // Only handle pins manually when ItemsSource is null
+ // When ItemsSource is set, the binding handles pin display automatically
+ if (_viewModel.ItemsSource == null)
+ {
+ if (e.Action == NotifyCollectionChangedAction.Add)
+ {
+ foreach (Pin pin in e.NewItems)
+ {
+ TestMap.Pins.Add(pin);
+ }
+ }
+ else if (e.Action == NotifyCollectionChangedAction.Remove)
+ {
+ foreach (Pin pin in e.OldItems)
+ {
+ TestMap.Pins.Remove(pin);
+ }
+ }
+ else if (e.Action == NotifyCollectionChangedAction.Reset)
+ {
+ TestMap.Pins.Clear();
+ }
+ }
+ }
+
+ private void OnViewModelPropertyChanged(object sender, PropertyChangedEventArgs e)
+ {
+ if (e.PropertyName == nameof(_viewModel.ItemsSource))
+ {
+ TestMap.Pins.Clear(); // Clear existing pins if any
+ TestMap.ItemsSource = _viewModel.ItemsSource;
+ }
+ else if (e.PropertyName == nameof(_viewModel.ItemTemplate))
+ {
+ // When ItemTemplate changes in ViewModel, update the actual Map
+ TestMap.ItemTemplate = _viewModel.ItemTemplate;
+ }
+ else if (e.PropertyName == nameof(_viewModel.ItemTemplateSelector))
+ {
+ TestMap.ItemTemplate = null;
+ // When ItemTemplateSelector changes in ViewModel, update the actual Map
+ TestMap.ItemTemplateSelector = _viewModel.ItemTemplateSelector;
+ }
+ else if (e.PropertyName == nameof(_viewModel.VisibleRegion))
+ {
+ // When VisibleRegion changes in ViewModel, update the actual Map
+ if (_viewModel.VisibleRegion != null)
+ {
+ TestMap.MoveToRegion(_viewModel.VisibleRegion);
+ }
+ }
+ }
+
+ private void OnMapPropertyChanged(object sender, PropertyChangedEventArgs e)
+ {
+ // Update ViewModel's VisibleRegion when the map's VisibleRegion changes
+ if (e.PropertyName == "VisibleRegion" && TestMap.VisibleRegion != null)
+ {
+ // Only update if it's different to avoid infinite loops
+ if (_viewModel.VisibleRegion != TestMap.VisibleRegion)
+ {
+ _viewModel.VisibleRegion = TestMap.VisibleRegion;
+ }
+ }
+ }
+
+ private Pin _lastClickPin;
+ private void OnMapClicked(object sender, Microsoft.Maui.Controls.Maps.MapClickedEventArgs e)
+ {
+ var label = this.FindByName("MapClickedLabel");
+ if (label != null)
+ label.Text = $"Map Clicked: Latitude: {e.Location.Latitude:F6}, Longitude: {e.Location.Longitude:F6}";
+
+ // Remove previous click marker if it exists
+ if (_lastClickPin != null)
+ {
+ if (TestMap.Pins.Contains(_lastClickPin))
+ TestMap.Pins.Remove(_lastClickPin);
+ _lastClickPin = null;
+ }
+
+ // Add a new pin at the clicked location
+ var clickPin = new Pin
+ {
+ Label = "Clicked Location",
+ Location = e.Location,
+ Address = $"Lat: {e.Location.Latitude:F6}, Lng: {e.Location.Longitude:F6}",
+ Type = PinType.Place
+ };
+ // Attach MarkerClicked and InfoWindowClicked events
+ clickPin.MarkerClicked += OnPinMarkerClicked;
+ clickPin.InfoWindowClicked += OnPinInfoWindowClicked;
+ TestMap.Pins.Add(clickPin);
+ _lastClickPin = clickPin;
+ }
+ private void OnPinMarkerClicked(object sender, PinClickedEventArgs e)
+ {
+ var label = this.FindByName("MarkerClickedLabel");
+ if (label != null)
+ label.Text = "Marker Clicked: Pin tapped (info window will show)";
+ e.HideInfoWindow = false;
+ }
+
+ private void OnPinInfoWindowClicked(object sender, PinClickedEventArgs e)
+ {
+ var label = this.FindByName("MarkerClickedLabel");
+ if (label != null)
+ label.Text = "Marker Clicked: Info window tapped (info window will hide)";
+ e.HideInfoWindow = true;
+ }
+
+ public void ResetClickedLocationPinAndLabel()
+ {
+ // Remove the clicked location pin if it exists
+ if (_lastClickPin != null)
+ {
+ if (TestMap.Pins.Contains(_lastClickPin))
+ TestMap.Pins.Remove(_lastClickPin);
+ _lastClickPin = null;
+ }
+ // Reset the labels to 'Not clicked'
+ var mapLabel = this.FindByName("MapClickedLabel");
+ if (mapLabel != null)
+ mapLabel.Text = "Map Clicked: Not clicked";
+ var markerLabel = this.FindByName("MarkerClickedLabel");
+ if (markerLabel != null)
+ markerLabel.Text = "Marker Clicked: Not clicked";
+ }
+ private async void NavigateToOptionsPage_Clicked(object sender, EventArgs e)
+ {
+ // Use the existing view model instead of creating a new one
+ await Navigation.PushAsync(new MapOptionsPage(_viewModel));
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Map/MapOptionsPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Map/MapOptionsPage.xaml
new file mode 100644
index 000000000000..4356b3737e5e
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Map/MapOptionsPage.xaml
@@ -0,0 +1,281 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Map/MapOptionsPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Map/MapOptionsPage.xaml.cs
new file mode 100644
index 000000000000..cf084ee0ed8d
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Map/MapOptionsPage.xaml.cs
@@ -0,0 +1,527 @@
+using Microsoft.Maui.Controls.Maps;
+using Microsoft.Maui.Maps;
+using System.ComponentModel;
+namespace Maui.Controls.Sample;
+
+public partial class MapOptionsPage : ContentPage
+{
+ private MapViewModel _viewModel;
+
+ public MapOptionsPage(MapViewModel viewModel)
+ {
+ InitializeComponent();
+ _viewModel = viewModel;
+ BindingContext = _viewModel;
+
+ // Set up a basic ItemTemplate for demonstration
+ // Templates are now set via UI controls - SetItemTemplateButton_Clicked and SetTemplateSelectorButton_Clicked
+
+ // Initialize radio buttons based on current MapType
+ UpdateRadioButtonsFromMapType();
+
+ // Subscribe to checkbox events
+ IsShowingUserCheckBox.CheckedChanged += OnIsShowingUserCheckBoxChanged;
+
+ // Subscribe to VisibleRegion property changes to update the UI
+ _viewModel.PropertyChanged += OnViewModelPropertyChanged;
+
+ // Initialize the VisibleRegion display
+ UpdateVisibleRegionDisplay();
+ }
+
+ private void UpdateRadioButtonsFromMapType()
+ {
+ switch (_viewModel.MapType)
+ {
+ case MapType.Street:
+ StreetRadioButton.IsChecked = true;
+ break;
+ case MapType.Satellite:
+ SatelliteRadioButton.IsChecked = true;
+ break;
+ case MapType.Hybrid:
+ HybridRadioButton.IsChecked = true;
+ break;
+ }
+ }
+
+ private void MapTypeRadioButton_CheckedChanged(object sender, CheckedChangedEventArgs e)
+ {
+ if (e.Value) // Only respond to checked events, not unchecked
+ {
+ if (sender == StreetRadioButton)
+ _viewModel.MapType = MapType.Street;
+ else if (sender == SatelliteRadioButton)
+ _viewModel.MapType = MapType.Satellite;
+ else if (sender == HybridRadioButton)
+ _viewModel.MapType = MapType.Hybrid;
+ }
+ }
+
+ private void OnIsShowingUserCheckBoxChanged(object sender, CheckedChangedEventArgs e)
+ {
+ if (e.Value)
+ {
+ // Add current location pin when IsShowingUser is checked
+ AddCurrentLocationPin();
+ }
+ else
+ {
+ // Remove current location pin when IsShowingUser is unchecked
+ RemoveCurrentLocationPin();
+ }
+ }
+
+ private void AddCurrentLocationPin()
+ {
+ // Check if current location pin already exists
+ var existingCurrentLocationPin = _viewModel.Pins.FirstOrDefault(p => p.Label == "Current Location");
+ if (existingCurrentLocationPin == null)
+ {
+ var currentLocationPin = new Pin
+ {
+ Label = "Current Location",
+ Address = "Pearl City, Hawaii (Current Location)",
+ Type = PinType.Generic,
+ Location = MapViewModel.PearlCityLocation
+ };
+
+ var placeInfo = new PlaceInfo
+ {
+ Name = "Current Location",
+ Description = "Pearl City, Hawaii (Current Location)",
+ Location = MapViewModel.PearlCityLocation,
+ Type = PlaceType.Tourist
+ };
+
+ _viewModel.Pins.Add(currentLocationPin);
+ _viewModel.Places.Add(placeInfo);
+ }
+ }
+
+ private void RemoveCurrentLocationPin()
+ {
+ // Find and remove the current location pin
+ var currentLocationPin = _viewModel.Pins.FirstOrDefault(p => p.Label == "Current Location");
+ if (currentLocationPin != null)
+ {
+ _viewModel.Pins.Remove(currentLocationPin);
+ }
+ }
+
+ private void ApplyButton_Clicked(object sender, EventArgs e)
+ {
+ Navigation.PopAsync();
+ }
+
+ private void AddPinButton_Clicked(object sender, EventArgs e)
+ {
+ // Count only numbered pins (Pin1, Pin2, etc.), exclude "Current Location" pin
+ var numberedPinsCount = _viewModel.Pins.Count(p => p.Label != "Current Location");
+ // Maximum of 10 numbered pins allowed
+ if (numberedPinsCount >= 10)
+ {
+ return; // Don't add more than 10 numbered pins
+ }
+
+ // Predefined pin locations around Pearl City, Hawaii
+ var pinLocations = new[]
+ {
+ // Pin 1: Pearl City, Hawaii
+ new { Lat = 21.3933, Lng = -157.9751, Name = "Pearl City", Description = "Suburb, shopping, residential, schools, parks" , Type = PlaceType.Tourist },
+ // Pin 2: Waipahu, Hawaii
+ new { Lat = 21.3986, Lng = -158.0097, Name = "Waipahu", Description = "Historic sugar town, diverse community" , Type = PlaceType.Restaurant },
+ // Pin 3: Aiea, Hawaii
+ new { Lat = 21.3649, Lng = -157.9634, Name = "Aiea", Description = "Residential, Pearl Harbor views, mall" , Type = PlaceType.Restaurant },
+ // Pin 4: Waikele, Hawaii
+ new { Lat = 21.4513, Lng = -158.0147, Name = "Waikele", Description = "Outlet shopping, golf, residential area" , Type = PlaceType.Tourist },
+ // Pin 5: Halawa, Hawaii
+ new { Lat = 21.3847, Lng = -157.9261, Name = "Halawa", Description = "Aloha Stadium, neighborhoods, valley, events", Type = PlaceType.Restaurant },
+ // Pin 6: Mililani, Hawaii
+ new { Lat = 21.4644, Lng = -158.0411, Name = "Mililani", Description = "Planned community, schools, parks, shopping" , Type = PlaceType.Tourist },
+ // Pin 7: Ewa Beach, Hawaii
+ new { Lat = 21.3408, Lng = -158.0061, Name = "Ewa Beach", Description = "Coastal, golf, growing, residential, beaches" , Type = PlaceType.Restaurant },
+ // Pin 8: Waimalu, Hawaii
+ new { Lat = 21.3247, Lng = -157.9772, Name = "Waimalu", Description = "Small community, shopping, residential, eateries", Type = PlaceType.Tourist },
+ // Pin 9: Kapolei, Hawaii
+ new { Lat = 21.3142, Lng = -158.0397, Name = "Kapolei", Description = "Second city, business, shopping, growth", Type = PlaceType.Restaurant },
+ // Pin 10: Makakilo, Hawaii
+ new { Lat = 21.3350, Lng = -158.0550, Name = "Makakilo", Description = "Hillside, residential, views, breezy, quiet", Type = PlaceType.Tourist },
+ };
+
+ // Get the next pin location based on numbered pins count
+ var pinData = pinLocations[numberedPinsCount];
+
+ var pin = new Pin
+ {
+ Label = pinData.Name,
+ Address = $"{pinData.Description}",
+ Type = PinType.Place,
+ Location = new Location(pinData.Lat, pinData.Lng)
+ };
+
+ var placeInfo = new PlaceInfo
+ {
+ Name = pinData.Name,
+ Description = "Pin Added from ItemsSource",
+ Location = new Location(pinData.Lat, pinData.Lng),
+ Type = pinData.Type
+ };
+
+ _viewModel.Places.Add(placeInfo);
+ _viewModel.Pins.Add(pin);
+ _viewModel.UserAddedPinCount++;
+ }
+
+ // Shape selection for Map Elements
+ private string _selectedShape = "Polyline"; // Default
+
+ private void ShapeRadioButton_CheckedChanged(object sender, CheckedChangedEventArgs e)
+ {
+ if (e.Value && sender is RadioButton rb && rb.Content is string content)
+ {
+ _selectedShape = content;
+
+ // If Polygon is selected, render the polygon immediately
+ if (_selectedShape == "Polygon")
+ {
+ // Remove any existing polygon
+ var polygons = _viewModel.MapElements.Where(el => el is Polygon).ToList();
+ foreach (var poly in polygons)
+ _viewModel.MapElements.Remove(poly);
+
+ // Add the polygon connecting all 9 locations
+ var destinations = new[]
+ {
+ new Location(21.3649, -157.9634), // Pin3
+ new Location(21.3986, -158.0097), // Pin2
+
+ new Location(21.4513, -158.0147), // Pin4
+ new Location(21.3847, -157.9261), // Pin5
+ };
+ var polygon = new Polygon
+ {
+ StrokeColor = Colors.Blue,
+ StrokeWidth = 3,
+ FillColor = Color.FromArgb("#330000FF")
+ };
+ foreach (var loc in destinations)
+ polygon.Geopath.Add(loc);
+ _viewModel.MapElements.Add(polygon);
+ }
+ else
+ {
+ // Remove any existing polygon if another shape is selected
+ var polygons = _viewModel.MapElements.Where(el => el is Polygon).ToList();
+ foreach (var poly in polygons)
+ _viewModel.MapElements.Remove(poly);
+ }
+ }
+ }
+
+ private void AddElementButton_Clicked(object sender, EventArgs e)
+ {
+ // Use the same destinations for all shapes
+ var destinations = new[]
+ {
+ new { Name = "Pin2", Location = new Location(21.3986, -158.0097), Color = Colors.Red, Type = PlaceType.Restaurant },
+ new { Name = "Pin3", Location = new Location(21.3649, -157.9634), Color = Colors.Green, Type = PlaceType.Tourist },
+ new { Name = "Pin4", Location = new Location(21.4513, -158.0147), Color = Colors.Orange, Type = PlaceType.Restaurant },
+ new { Name = "Pin5", Location = new Location(21.3847, -157.9261), Color = Colors.Purple, Type = PlaceType.Tourist },
+ new { Name = "Pin6", Location = new Location(21.4644, -158.0411), Color = Colors.Brown, Type = PlaceType.Restaurant },
+ new { Name = "Pin7", Location = new Location(21.3408, -158.0061), Color = Colors.Pink, Type = PlaceType.Tourist },
+ new { Name = "Pin8", Location = new Location(21.3247, -157.9772), Color = Colors.Navy, Type = PlaceType.Restaurant },
+ new { Name = "Pin9", Location = new Location(21.3142, -158.0397), Color = Colors.Teal, Type = PlaceType.Tourist },
+ new { Name = "Pin10", Location = new Location(21.3350, -158.0550), Color = Colors.Maroon, Type = PlaceType.Restaurant }
+ };
+
+ if (_selectedShape == "Polyline")
+ {
+ // Add up to 9 polylines, one per click
+ int polylineCount = _viewModel.MapElements.Count(e => e is Polyline);
+ if (polylineCount >= 9)
+ return;
+ var destination = destinations[polylineCount];
+ var polyline = new Polyline
+ {
+ StrokeColor = destination.Color,
+ StrokeWidth = 4
+ };
+ polyline.Geopath.Add(MapViewModel.PearlCityLocation);
+ var startLat = MapViewModel.PearlCityLocation.Latitude;
+ var startLng = MapViewModel.PearlCityLocation.Longitude;
+ var endLat = destination.Location.Latitude;
+ var endLng = destination.Location.Longitude;
+ var midLat1 = startLat + (endLat - startLat) * 0.33;
+ var midLng1 = startLng + (endLng - startLng) * 0.33;
+ polyline.Geopath.Add(new Location(midLat1, midLng1));
+ var midLat2 = startLat + (endLat - startLat) * 0.67;
+ var midLng2 = startLng + (endLng - startLng) * 0.67;
+ polyline.Geopath.Add(new Location(midLat2, midLng2));
+ polyline.Geopath.Add(destination.Location);
+ _viewModel.MapElements.Add(polyline);
+ }
+ else if (_selectedShape == "Circle")
+ {
+ // Add up to 9 circles, one per click
+ int circleCount = _viewModel.MapElements.Count(e => e is Circle && ((Circle)e).Radius.Kilometers == 2);
+ if (circleCount >= 9)
+ return;
+ var destination = destinations[circleCount];
+ var circle = new Circle
+ {
+ Center = destination.Location,
+ Radius = Distance.FromKilometers(2),
+ StrokeColor = destination.Color,
+ StrokeWidth = 2,
+ FillColor = Color.FromArgb("#3300FF00")
+ };
+ _viewModel.MapElements.Add(circle);
+ }
+ else if (_selectedShape == "Polygon")
+ {
+ bool polygonExists = _viewModel.MapElements.Any(e => e is Polygon);
+ if (polygonExists)
+ return;
+
+ var polygon = new Polygon
+ {
+ StrokeColor = Colors.Blue,
+ StrokeWidth = 3,
+ FillColor = Color.FromArgb("#330000FF")
+ };
+ polygon.Geopath.Add(MapViewModel.PearlCityLocation);
+ polygon.Geopath.Add(destinations[0].Location);
+ polygon.Geopath.Add(destinations[1].Location);
+ polygon.Geopath.Add(destinations[3].Location);
+
+ _viewModel.MapElements.Add(polygon);
+ }
+ }
+ private void SetItemsSourceButton_Clicked(object sender, EventArgs e)
+ {
+ _viewModel.Pins.Clear(); // Clear any existing pins
+ _viewModel.ItemsSource = _viewModel.Places;
+ }
+
+ private void ClearItemsSourceButton_Clicked(object sender, EventArgs e)
+ {
+ // Clear the ItemsSource to disable data templating
+ // This will revert to manual pin management
+ _viewModel.ItemsSource = null;
+ }
+
+ private void SetItemTemplateButton_Clicked(object sender, EventArgs e)
+ {
+ // Create a sample DataTemplate using a Pin to render place info
+ var pinTemplate = new DataTemplate(() =>
+ {
+ var pin = new Pin
+ {
+ Type = PinType.SearchResult
+ };
+ pin.SetBinding(Pin.LocationProperty, new Binding("Location"));
+ pin.SetBinding(Pin.LabelProperty, new Binding("Name"));
+ pin.SetBinding(Pin.AddressProperty, new Binding("Description"));
+
+ return pin;
+ });
+
+ _viewModel.ItemTemplate = pinTemplate;
+ }
+
+ private void ClearItemTemplateButton_Clicked(object sender, EventArgs e)
+ {
+ // Clear the ItemTemplate
+ _viewModel.ItemTemplate = null;
+ }
+
+ private void SetTemplateSelectorButton_Clicked(object sender, EventArgs e)
+ {
+ // Create sample templates for the selector using Grid with red background
+ var restaurantTemplate = new DataTemplate(() =>
+ {
+ var pin = new Pin
+ {
+ Type = PinType.Place,
+ Address = "Restaurant Pin",
+ };
+ pin.SetBinding(Pin.LocationProperty, new Binding("Location"));
+ pin.SetBinding(Pin.LabelProperty, new Binding("Name"));
+ return pin;
+ });
+
+ var touristTemplate = new DataTemplate(() =>
+ {
+ var pin = new Pin
+ {
+ Type = PinType.SearchResult,
+ Address = "Tourist Pin"
+ };
+ pin.SetBinding(Pin.LocationProperty, new Binding("Location"));
+ pin.SetBinding(Pin.LabelProperty, new Binding("Name"));
+
+ return pin;
+ });
+
+ // Setup ItemTemplateSelector
+ var templateSelector = new SamplePinTemplateSelector
+ {
+ RestaurantTemplate = restaurantTemplate,
+ TouristTemplate = touristTemplate
+ };
+
+ _viewModel.ItemTemplateSelector = templateSelector;
+
+ // Note: ItemsSource must be set separately via "Set ItemsSource" button
+ // Template selector only works when ItemsSource is explicitly set by the user
+ }
+
+ private void ClearTemplateSelectorButton_Clicked(object sender, EventArgs e)
+ {
+ // Clear the ItemTemplateSelector
+ _viewModel.ItemTemplateSelector = null;
+ }
+
+ private void OnViewModelPropertyChanged(object sender, PropertyChangedEventArgs e)
+ {
+ if (e.PropertyName == nameof(_viewModel.VisibleRegion))
+ {
+ UpdateVisibleRegionDisplay();
+ }
+ }
+
+ private void UpdateVisibleRegionDisplay()
+ {
+ // RegionDetailsLabel is commented out in XAML, so no UI update needed
+ // This method can be used for debugging or future implementation
+ if (_viewModel.VisibleRegion != null)
+ {
+ var region = _viewModel.VisibleRegion;
+ // Could log or store region info for debugging:
+ // $"Lat: {region.Center.Latitude:F4}, Lng: {region.Center.Longitude:F4}, LatDeg: {region.LatitudeDegrees:F4}, LngDeg: {region.LongitudeDegrees:F4}"
+ }
+ }
+
+ private void ZoomInButton_Clicked(object sender, EventArgs e)
+ {
+ // Only allow zoom if IsZoomEnabled is checked
+ if (!_viewModel.IsZoomEnabled)
+ {
+ return; // Don't zoom if zoom is disabled
+ }
+
+ // Zoom in by reducing the radius by half
+ if (_viewModel.VisibleRegion != null)
+ {
+ var currentRegion = _viewModel.VisibleRegion;
+ var newRadius = Distance.FromMeters(currentRegion.Radius.Meters / 2);
+ _viewModel.VisibleRegion = MapSpan.FromCenterAndRadius(currentRegion.Center, newRadius);
+ }
+ }
+
+ private void ZoomOutButton_Clicked(object sender, EventArgs e)
+ {
+ // Only allow zoom if IsZoomEnabled is checked
+ if (!_viewModel.IsZoomEnabled)
+ {
+ return; // Don't zoom if zoom is disabled
+ }
+
+ // Zoom out by doubling the radius
+ if (_viewModel.VisibleRegion != null)
+ {
+ var currentRegion = _viewModel.VisibleRegion;
+ var newRadius = Distance.FromMeters(currentRegion.Radius.Meters * 2);
+ _viewModel.VisibleRegion = MapSpan.FromCenterAndRadius(currentRegion.Center, newRadius);
+ }
+ }
+
+ private void ShowAllPinsButton_Clicked(object sender, EventArgs e)
+ {
+ // Calculate a region that encompasses all pins
+ if (_viewModel.Pins.Any())
+ {
+ var pins = _viewModel.Pins.ToList();
+
+ // Find the bounds of all pins
+ var minLat = pins.Min(p => p.Location.Latitude);
+ var maxLat = pins.Max(p => p.Location.Latitude);
+ var minLng = pins.Min(p => p.Location.Longitude);
+ var maxLng = pins.Max(p => p.Location.Longitude);
+
+ // Calculate center point
+ var centerLat = (minLat + maxLat) / 2;
+ var centerLng = (minLng + maxLng) / 2;
+ var center = new Location(centerLat, centerLng);
+
+ // Calculate the distance to encompass all pins with some padding
+ var latDelta = Math.Abs(maxLat - minLat);
+ var lngDelta = Math.Abs(maxLng - minLng);
+ var maxDelta = Math.Max(latDelta, lngDelta);
+
+ // Add 20% padding and ensure minimum radius
+ var radiusKm = Math.Max(maxDelta * 111 * 0.6, 1); // 111 km per degree, 20% padding
+ var radius = Distance.FromKilometers(radiusKm);
+
+ _viewModel.VisibleRegion = MapSpan.FromCenterAndRadius(center, radius);
+ }
+ else
+ {
+ // If no pins, just reset to initial state
+ ResetToInitialButton_Clicked(sender, e);
+ }
+ }
+
+ private void ResetToInitialButton_Clicked(object sender, EventArgs e)
+ {
+ // Reset all properties to their original state
+
+ // Reset boolean properties to their default values
+ _viewModel.IsShowingUser = false;
+ _viewModel.IsScrollEnabled = false;
+ _viewModel.IsTrafficEnabled = false;
+ _viewModel.IsZoomEnabled = false;
+ _viewModel.IsVisible = true;
+
+ // Reset MapType to default
+ _viewModel.MapType = MapType.Street;
+
+ // Reset Map Element radio button to Polyline
+ _selectedShape = "Polyline";
+
+ // Clear all pins and reset user pin count (from ClearPinsButton functionality)
+ _viewModel.Pins.Clear();
+ _viewModel.UserAddedPinCount = 0;
+ _viewModel.Places.Clear();
+
+ // Clear all map elements (from ClearElementsButton functionality)
+ _viewModel.MapElements.Clear();
+
+ // Reset template properties
+ _viewModel.ItemsSource = null;
+ _viewModel.ItemTemplate = null;
+ _viewModel.ItemTemplateSelector = null;
+
+ // Reset visible region to initial region
+ _viewModel.VisibleRegion = _viewModel.InitialRegion;
+
+ // Update radio buttons to reflect the reset MapType
+ UpdateRadioButtonsFromMapType();
+
+ // Also reset the clicked location pin and label on the map page
+ var nav = this.Navigation;
+ if (nav != null && nav.NavigationStack.Count > 0)
+ {
+ // Find the MapControlMainPage in the navigation stack
+ foreach (var page in nav.NavigationStack)
+ {
+ if (page is Maui.Controls.Sample.MapControlMainPage mainPage)
+ {
+ mainPage.ResetClickedLocationPinAndLabel();
+ break;
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Map/MapViewModel.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Map/MapViewModel.cs
new file mode 100644
index 000000000000..a7d28c6d5d3e
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Map/MapViewModel.cs
@@ -0,0 +1,243 @@
+using System.Collections;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using Microsoft.Maui.Maps;
+using Microsoft.Maui.Controls.Maps;
+using System.Windows.Input;
+
+namespace Maui.Controls.Sample;
+
+public class SamplePinTemplateSelector : DataTemplateSelector
+{
+ public DataTemplate RestaurantTemplate { get; set; }
+ public DataTemplate TouristTemplate { get; set; }
+
+ protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
+ {
+ if (item is PlaceInfo placeInfo)
+ {
+ return placeInfo.Type == PlaceType.Tourist ? TouristTemplate : RestaurantTemplate;
+ }
+ return RestaurantTemplate;
+ }
+}
+
+public class MapViewModel : INotifyPropertyChanged
+{
+ public static readonly Location PearlCityLocation = new Location(21.3933, -157.9751);
+ private bool _isShowingUser = false;
+ private bool _isScrollEnabled = false;
+ private bool _isTrafficEnabled;
+ private bool _isZoomEnabled = false;
+ private bool _isVisible = true;
+ private MapType _mapType = MapType.Street;
+ private ObservableCollection _pins = new();
+ private ObservableCollection _mapElements = new();
+ private IEnumerable _itemsSource;
+ private DataTemplate _itemTemplate;
+ private DataTemplateSelector _itemTemplateSelector;
+ private MapSpan _initialRegion;
+ private MapSpan _visibleRegion;
+ private ICommand _mapClickedCommand;
+ private int _userAddedPinCount = 0;
+
+ public ObservableCollection Places { get; set; } = new();
+
+ public MapViewModel()
+ {
+
+ _initialRegion = MapSpan.FromCenterAndRadius(
+ PearlCityLocation,
+ Distance.FromMiles(5)
+ );
+
+ // Initialize visible region to the same as initial region
+ _visibleRegion = _initialRegion;
+
+ // Start with ItemsSource cleared (null) - user must click "Set ItemsSource" button to enable data templating
+ // This allows manual pin management by default, and data templating only when explicitly requested
+ _itemsSource = null;
+
+ // Note: IsShowingUser is set to false by default
+ // No pins are added initially - pins will only appear when user clicks "Add Pin"
+ }
+
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ public bool IsShowingUser
+ {
+ get => _isShowingUser;
+ set
+ {
+ _isShowingUser = value;
+ OnPropertyChanged();
+ }
+ }
+
+ public bool IsScrollEnabled
+ {
+ get => _isScrollEnabled;
+ set
+ {
+ _isScrollEnabled = value;
+ OnPropertyChanged();
+ }
+ }
+
+ public bool IsTrafficEnabled
+ {
+ get => _isTrafficEnabled;
+ set
+ {
+ _isTrafficEnabled = value;
+ OnPropertyChanged();
+ }
+ }
+
+ public bool IsZoomEnabled
+ {
+ get => _isZoomEnabled;
+ set
+ {
+ _isZoomEnabled = value;
+ OnPropertyChanged();
+ }
+ }
+
+ public bool IsVisible
+ {
+ get => _isVisible;
+ set
+ {
+ _isVisible = value;
+ OnPropertyChanged();
+ }
+ }
+
+ public MapType MapType
+ {
+ get => _mapType;
+ set
+ {
+ _mapType = value;
+ OnPropertyChanged();
+ }
+ }
+
+ public ObservableCollection Pins
+ {
+ get => _pins;
+ set
+ {
+ _pins = value;
+ OnPropertyChanged();
+ }
+ }
+
+ public int UserAddedPinCount
+ {
+ get => _userAddedPinCount;
+ set
+ {
+ _userAddedPinCount = value;
+ OnPropertyChanged();
+ }
+ }
+
+ public ObservableCollection MapElements
+ {
+ get => _mapElements;
+ set
+ {
+ _mapElements = value;
+ OnPropertyChanged();
+ }
+ }
+
+ public IEnumerable ItemsSource
+ {
+ get => _itemsSource;
+ set
+ {
+ _itemsSource = value;
+ OnPropertyChanged();
+ }
+ }
+
+ public DataTemplate ItemTemplate
+ {
+ get => _itemTemplate;
+ set
+ {
+ _itemTemplate = value;
+ OnPropertyChanged();
+ }
+ }
+
+ public DataTemplateSelector ItemTemplateSelector
+ {
+ get => _itemTemplateSelector;
+ set
+ {
+ _itemTemplateSelector = value;
+ OnPropertyChanged();
+ }
+ }
+
+ public List MapTypeOptions { get; } = new List
+ {
+ MapType.Street,
+ MapType.Satellite,
+ MapType.Hybrid
+ };
+
+ public MapSpan InitialRegion
+ {
+ get => _initialRegion;
+ set
+ {
+ _initialRegion = value;
+ OnPropertyChanged();
+ }
+ }
+
+ public MapSpan VisibleRegion
+ {
+ get => _visibleRegion;
+ set
+ {
+ _visibleRegion = value;
+ OnPropertyChanged();
+ }
+ }
+
+ public ICommand MapClickedCommand
+ {
+ get => _mapClickedCommand;
+ set
+ {
+ _mapClickedCommand = value;
+ OnPropertyChanged();
+ }
+ }
+
+ protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
+ {
+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+ }
+}
+
+public class PlaceInfo
+{
+ public string Name { get; set; } = string.Empty;
+ public string Description { get; set; } = string.Empty;
+ public Location Location { get; set; } = new Location();
+ public PlaceType Type { get; set; }
+}
+
+public enum PlaceType
+{
+ Restaurant,
+ Tourist,
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/RefreshView/RefreshViewControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/RefreshView/RefreshViewControlPage.xaml
index c17554fcde90..ad6548c7456d 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/RefreshView/RefreshViewControlPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/RefreshView/RefreshViewControlPage.xaml
@@ -13,7 +13,7 @@
@@ -40,7 +40,8 @@
IsRefreshing="{Binding IsRefreshing}"
RefreshColor="{Binding RefreshColor}"
Shadow="{Binding Shadow}"
- AutomationId="RefreshView">
+ AutomationId="RefreshView"
+ Refreshing="OnRefreshViewRefreshing">
+
+
+
+
-
\ No newline at end of file
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/RefreshView/RefreshViewControlPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/RefreshView/RefreshViewControlPage.xaml.cs
index 113d58a8b22a..6f3048e91b1a 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/RefreshView/RefreshViewControlPage.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/RefreshView/RefreshViewControlPage.xaml.cs
@@ -50,7 +50,7 @@ private void SetScrollViewContent()
// Set binding immediately
boxView.SetBinding(BoxView.ColorProperty, "BoxViewColor");
- var RefreshView = new RefreshView
+ var refreshView = new RefreshView
{
AutomationId = "RefreshView",
Content = new ScrollView
@@ -59,22 +59,24 @@ private void SetScrollViewContent()
}
};
- RefreshView.SetBinding(RefreshView.CommandProperty, "Command");
- RefreshView.SetBinding(RefreshView.CommandParameterProperty, "CommandParameter");
- RefreshView.SetBinding(RefreshView.FlowDirectionProperty, "FlowDirection");
- RefreshView.SetBinding(RefreshView.IsEnabledProperty, "IsEnabled");
- RefreshView.SetBinding(RefreshView.IsVisibleProperty, "IsVisible");
- RefreshView.SetBinding(RefreshView.IsRefreshingProperty, "IsRefreshing");
- RefreshView.SetBinding(RefreshView.RefreshColorProperty, "RefreshColor");
- RefreshView.SetBinding(RefreshView.ShadowProperty, "Shadow");
+ refreshView.Refreshing += OnRefreshViewRefreshing;
- RefreshViewContainer.Children.Add(RefreshView);
+ refreshView.SetBinding(RefreshView.CommandProperty, "Command");
+ refreshView.SetBinding(RefreshView.CommandParameterProperty, "CommandParameter");
+ refreshView.SetBinding(RefreshView.FlowDirectionProperty, "FlowDirection");
+ refreshView.SetBinding(RefreshView.IsEnabledProperty, "IsEnabled");
+ refreshView.SetBinding(RefreshView.IsVisibleProperty, "IsVisible");
+ refreshView.SetBinding(RefreshView.IsRefreshingProperty, "IsRefreshing");
+ refreshView.SetBinding(RefreshView.RefreshColorProperty, "RefreshColor");
+ refreshView.SetBinding(RefreshView.ShadowProperty, "Shadow");
+
+ RefreshViewContainer.Children.Add(refreshView);
}
private void SetCollectionViewContent()
{
RefreshViewContainer.Children.Clear();
- var RefreshView = new RefreshView
+ var refreshView = new RefreshView
{
AutomationId = "RefreshView",
Content = new CollectionView
@@ -99,16 +101,19 @@ private void SetCollectionViewContent()
}
};
- RefreshView.SetBinding(RefreshView.CommandProperty, "Command");
- RefreshView.SetBinding(RefreshView.CommandParameterProperty, "CommandParameter");
- RefreshView.SetBinding(RefreshView.FlowDirectionProperty, "FlowDirection");
- RefreshView.SetBinding(RefreshView.IsEnabledProperty, "IsEnabled");
- RefreshView.SetBinding(RefreshView.IsVisibleProperty, "IsVisible");
- RefreshView.SetBinding(RefreshView.IsRefreshingProperty, "IsRefreshing");
- RefreshView.SetBinding(RefreshView.RefreshColorProperty, "RefreshColor");
- RefreshView.SetBinding(RefreshView.ShadowProperty, "Shadow");
+ refreshView.Refreshing += OnRefreshViewRefreshing;
+
- RefreshViewContainer.Children.Add(RefreshView);
+ refreshView.SetBinding(RefreshView.CommandProperty, "Command");
+ refreshView.SetBinding(RefreshView.CommandParameterProperty, "CommandParameter");
+ refreshView.SetBinding(RefreshView.FlowDirectionProperty, "FlowDirection");
+ refreshView.SetBinding(RefreshView.IsEnabledProperty, "IsEnabled");
+ refreshView.SetBinding(RefreshView.IsVisibleProperty, "IsVisible");
+ refreshView.SetBinding(RefreshView.IsRefreshingProperty, "IsRefreshing");
+ refreshView.SetBinding(RefreshView.RefreshColorProperty, "RefreshColor");
+ refreshView.SetBinding(RefreshView.ShadowProperty, "Shadow");
+
+ RefreshViewContainer.Children.Add(refreshView);
}
private void OnScrollViewContentClicked(object sender, EventArgs e)
@@ -120,4 +125,12 @@ private void OnCollectionViewContentClicked(object sender, EventArgs e)
{
SetCollectionViewContent();
}
-}
\ No newline at end of file
+
+ private void OnRefreshViewRefreshing(object sender, EventArgs e)
+{
+ if (BindingContext is RefreshViewViewModel vm)
+ {
+ vm.RefreshEventStatusText = "Raised";
+ }
+}
+}
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/RefreshView/RefreshViewViewModel.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/RefreshView/RefreshViewViewModel.cs
index 9b2de2030e84..da087a1325d4 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/RefreshView/RefreshViewViewModel.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/RefreshView/RefreshViewViewModel.cs
@@ -184,8 +184,23 @@ public string RefreshStatusText
}
}
+ private string _refreshEventStatusText = "Not Raised";
+
+ public string RefreshEventStatusText
+ {
+ get => _refreshEventStatusText;
+ set
+ {
+ if (_refreshEventStatusText != value)
+ {
+ _refreshEventStatusText = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+
protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
{
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/SearchBarMaterial3/Material3_SearchBarControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/SearchBarMaterial3/Material3_SearchBarControlPage.xaml
new file mode 100644
index 000000000000..3d359676756a
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/SearchBarMaterial3/Material3_SearchBarControlPage.xaml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/SearchBarMaterial3/Material3_SearchBarControlPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/SearchBarMaterial3/Material3_SearchBarControlPage.xaml.cs
new file mode 100644
index 000000000000..d9061a77eda6
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/SearchBarMaterial3/Material3_SearchBarControlPage.xaml.cs
@@ -0,0 +1,94 @@
+namespace Maui.Controls.Sample;
+
+public class Material3_SearchBarControlPage : NavigationPage
+{
+ private SearchBarViewModel _viewModel;
+ public Material3_SearchBarControlPage()
+ {
+ _viewModel = new SearchBarViewModel();
+ PushAsync(new SearchBarMaterial3ControlMainPage(_viewModel));
+ }
+}
+
+public partial class SearchBarMaterial3ControlMainPage : ContentPage
+{
+ private SearchBarViewModel _viewModel;
+
+ public SearchBarMaterial3ControlMainPage(SearchBarViewModel viewModel)
+ {
+ InitializeComponent();
+ _viewModel = viewModel;
+ BindingContext = _viewModel;
+ }
+
+ private async void NavigateToOptionsPage_Clicked(object sender, EventArgs e)
+ {
+ BindingContext = _viewModel = new SearchBarViewModel();
+ ReInitializeSearchBar();
+ await Navigation.PushAsync(new SearchBarOptionsPage(_viewModel));
+ }
+
+ private void ReInitializeSearchBar()
+ {
+ SearchBarGrid.Children.Clear();
+
+ var searchBar = new SearchBar
+ {
+ AutomationId = "SearchBar",
+ };
+
+ searchBar.SetBinding(SearchBar.CancelButtonColorProperty, nameof(SearchBarViewModel.CancelButtonColor));
+ searchBar.SetBinding(SearchBar.CharacterSpacingProperty, nameof(SearchBarViewModel.CharacterSpacing));
+ searchBar.SetBinding(SearchBar.CursorPositionProperty, nameof(SearchBarViewModel.CursorPosition));
+ searchBar.SetBinding(SearchBar.FlowDirectionProperty, nameof(SearchBarViewModel.FlowDirection));
+ searchBar.SetBinding(SearchBar.FontAttributesProperty, nameof(SearchBarViewModel.FontAttributes));
+ searchBar.SetBinding(SearchBar.FontAutoScalingEnabledProperty, nameof(SearchBarViewModel.FontAutoScalingEnabled));
+ searchBar.SetBinding(SearchBar.FontFamilyProperty, nameof(SearchBarViewModel.FontFamily));
+ searchBar.SetBinding(SearchBar.FontSizeProperty, nameof(SearchBarViewModel.FontSize));
+ searchBar.SetBinding(SearchBar.HorizontalTextAlignmentProperty, nameof(SearchBarViewModel.HorizontalTextAlignment));
+ searchBar.SetBinding(SearchBar.IsEnabledProperty, nameof(SearchBarViewModel.IsEnabled));
+ searchBar.SetBinding(SearchBar.IsVisibleProperty, nameof(SearchBarViewModel.IsVisible));
+ searchBar.SetBinding(SearchBar.ShadowProperty, nameof(SearchBarViewModel.Shadow));
+ searchBar.SetBinding(SearchBar.IsReadOnlyProperty, nameof(SearchBarViewModel.IsReadOnly));
+ searchBar.SetBinding(SearchBar.IsSpellCheckEnabledProperty, nameof(SearchBarViewModel.IsSpellCheckEnabled));
+ searchBar.SetBinding(SearchBar.IsTextPredictionEnabledProperty, nameof(SearchBarViewModel.IsTextPredictionEnabled));
+ searchBar.SetBinding(SearchBar.KeyboardProperty, nameof(SearchBarViewModel.Keyboard));
+ searchBar.SetBinding(SearchBar.MaxLengthProperty, nameof(SearchBarViewModel.MaxLength));
+ searchBar.SetBinding(SearchBar.PlaceholderProperty, nameof(SearchBarViewModel.Placeholder));
+ searchBar.SetBinding(SearchBar.PlaceholderColorProperty, nameof(SearchBarViewModel.PlaceholderColor));
+ searchBar.SetBinding(SearchBar.SelectionLengthProperty, nameof(SearchBarViewModel.SelectionLength));
+ searchBar.SetBinding(SearchBar.TextProperty, nameof(SearchBarViewModel.Text));
+ searchBar.SetBinding(SearchBar.TextColorProperty, nameof(SearchBarViewModel.TextColor));
+ searchBar.SetBinding(SearchBar.TextTransformProperty, nameof(SearchBarViewModel.TextTransform));
+ searchBar.SetBinding(SearchBar.VerticalTextAlignmentProperty, nameof(SearchBarViewModel.VerticalTextAlignment));
+ searchBar.SetBinding(SearchBar.SearchCommandProperty, nameof(SearchBarViewModel.SearchCommand));
+ searchBar.SetBinding(SearchBar.SearchCommandParameterProperty, nameof(SearchBarViewModel.Text));
+
+ searchBar.SearchButtonPressed += OnSearchButtonPressed;
+ searchBar.TextChanged += OnTextChanged;
+
+ NewTextChangedLabel.Text = string.Empty;
+ OldTextChangedLabel.Text = string.Empty;
+ SearchButtonPressedLabel.Text = "No";
+
+ SearchBarGrid.Children.Add(searchBar);
+ }
+
+ private void OnSearchButtonPressed(object sender, EventArgs e)
+ {
+ var searchBar = sender as SearchBar;
+ if (searchBar != null && !string.IsNullOrEmpty(searchBar.Text))
+ {
+ SearchButtonPressedLabel.Text = "Yes";
+ }
+ }
+
+ private void OnTextChanged(object sender, TextChangedEventArgs e)
+ {
+ if (!string.IsNullOrEmpty(e.NewTextValue))
+ {
+ NewTextChangedLabel.Text = e.NewTextValue;
+ OldTextChangedLabel.Text = e.OldTextValue;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellFeaturePage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellFeaturePage.xaml
index 0e7b6d3c220e..831cbfd0fad4 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellFeaturePage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellFeaturePage.xaml
@@ -17,5 +17,15 @@
HorizontalOptions="Center"
AutomationId="ShellTabbedButton"
WidthRequest="400"/>
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellFeaturePage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellFeaturePage.xaml.cs
index 2086a1b9ada1..8aebc1021207 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellFeaturePage.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellFeaturePage.xaml.cs
@@ -5,9 +5,8 @@ namespace Maui.Controls.Sample;
public class ShellFeaturePage : NavigationPage
{
- public ShellFeaturePage()
+ public ShellFeaturePage() : base(new ShellFeatureMainPage())
{
- PushAsync(new ShellFeatureMainPage());
}
}
@@ -27,4 +26,14 @@ private void OnShellTabbedButtonClicked(object sender, EventArgs e)
{
Application.Current.MainPage = new ShellTabbedControlPage();
}
+
+ private void OnShellPageButtonClicked(object sender, EventArgs e)
+ {
+ this.Window.Page = new ShellControlPage();
+ }
+
+ private void OnShellNavigationButtonClicked(object sender, EventArgs e)
+ {
+ this.Window.Page = new ShellNavigationControlPage();
+ }
}
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellNavigation/ShellNavigationControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellNavigation/ShellNavigationControlPage.xaml
new file mode 100644
index 000000000000..63bbfc043528
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellNavigation/ShellNavigationControlPage.xaml
@@ -0,0 +1,903 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellNavigation/ShellNavigationControlPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellNavigation/ShellNavigationControlPage.xaml.cs
new file mode 100644
index 000000000000..97913b1628c4
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellNavigation/ShellNavigationControlPage.xaml.cs
@@ -0,0 +1,807 @@
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Maui.Controls;
+namespace Maui.Controls.Sample
+{
+ public partial class ShellNavigationControlPage : Shell
+ {
+ readonly ShellViewModel _viewModel;
+ string _previousPageTitle = "null";
+ public ShellNavigationControlPage()
+ {
+ _viewModel = new ShellViewModel();
+ BindingContext = _viewModel;
+ InitializeComponent();
+ Routing.RegisterRoute("detail1", typeof(DetailPage1));
+ Routing.RegisterRoute("detail2", typeof(DetailPage2));
+ Routing.RegisterRoute("detail1/subdetail", typeof(SubDetailPage)); // Contextual route from Detail1
+ Routing.RegisterRoute("detail2/subdetail", typeof(SubDetailPage)); // Contextual route from Detail2
+
+ // Register navigation test pages
+ Routing.RegisterRoute("navtest1", typeof(NavigationTestPage1));
+ Routing.RegisterRoute("navtest2", typeof(NavigationTestPage2));
+ Routing.RegisterRoute("navtest3", typeof(NavigationTestPage3));
+
+ // Pass data demo routes
+ Routing.RegisterRoute("querysender", typeof(QuerySenderPage));
+ Routing.RegisterRoute("querydetail", typeof(QueryDataDetailPage));
+ Routing.RegisterRoute("queryintermediate", typeof(QueryIntermediatePage));
+
+ this.Navigating += OnShellNavigating;
+ this.Navigated += OnShellNavigated;
+
+ }
+ public ShellViewModel ViewModel => _viewModel;
+ void UpdateCurrentState()
+ {
+ var shell = Shell.Current;
+ if (shell != null)
+ {
+ _viewModel.CurrentState = shell.CurrentState?.Location?.ToString() ?? "Not Set";
+ _viewModel.CurrentPage = shell.CurrentPage?.Title ?? "Not Set";
+ _viewModel.CurrentItem = shell.CurrentItem?.Title ?? "Not Set";
+ _viewModel.ShellCurrent = shell.GetType().Name;
+ }
+ }
+ void UpdatePage2State()
+ {
+ UpdatePageLabels(Page2CurrentStateLabel, Page2CurrentPageLabel, Page2CurrentItemLabel, Page2ShellCurrentLabel, Page2ContentPage);
+
+ // Update Tab.Stack info
+ var shell = Shell.Current;
+ var section = shell?.CurrentItem?.CurrentItem;
+ if (section != null)
+ {
+ var stack = section.Stack;
+ _viewModel.TabStackInfo = $"Count={stack.Count}: {string.Join(", ", stack.Select(p => p?.Title ?? "null"))}";
+ }
+ }
+ void UpdatePage3C1State()
+ {
+ UpdatePageLabels(Page3C1CurrentStateLabel, Page3C1CurrentPageLabel, Page3C1CurrentItemLabel, Page3C1ShellCurrentLabel, Page3C1ContentPage);
+ }
+ void UpdatePage3C2State()
+ {
+ UpdatePageLabels(Page3C2CurrentStateLabel, Page3C2CurrentPageLabel, Page3C2CurrentItemLabel, Page3C2ShellCurrentLabel, Page3C2ContentPage);
+ }
+ void UpdatePage2TabBState()
+ {
+ UpdatePageLabels(Page2TabBCurrentStateLabel, Page2TabBCurrentPageLabel, Page2TabBCurrentItemLabel, Page2TabBShellCurrentLabel, Page2TabBPage);
+ }
+ void UpdatePageLabels(Label stateLabel, Label pageLabel, Label itemLabel, Label shellLabel, ContentPage page)
+ {
+ var shell = Shell.Current;
+ if (shell != null)
+ {
+ stateLabel.Text = shell.CurrentState?.Location?.ToString() ?? "Not Set";
+ pageLabel.Text = shell.CurrentPage?.Title ?? "Not Set";
+ itemLabel.Text = shell.CurrentItem?.Title ?? "Not Set";
+ shellLabel.Text = shell.GetType().Name;
+ page.BindingContext = _viewModel;
+ }
+ }
+ public void OnIconOverrideClicked(object sender, EventArgs e)
+ {
+ if (sender is Button btn)
+ {
+ if (btn.Text == "None")
+ _viewModel.IconOverride = string.Empty;
+ else
+ _viewModel.IconOverride = btn.Text;
+ }
+ }
+ void OnToggleIsEnabled(object sender, EventArgs e)
+ {
+ _viewModel.IsEnabled = !_viewModel.IsEnabled;
+ }
+ void OnToggleIsVisible(object sender, EventArgs e)
+ {
+ _viewModel.IsVisible = !_viewModel.IsVisible;
+ }
+ async void OnNavigateToDetail1Clicked(object sender, EventArgs e)
+ {
+ await Shell.Current.GoToAsync("detail1");
+ }
+ async void OnNavigateToDetail2Clicked(object sender, EventArgs e)
+ {
+ await Shell.Current.GoToAsync("detail2");
+ }
+ async void OnGoToMainClicked(object sender, EventArgs e)
+ {
+ await Shell.Current.GoToAsync("//main/MainContent");
+ }
+ async void NavigateToOptionsPage_Clicked(object sender, EventArgs e)
+ {
+ await Navigation.PushAsync(new ShellNavigationOptionsPage(_viewModel));
+ }
+ void OnShellNavigating(object sender, ShellNavigatingEventArgs e)
+ {
+ _previousPageTitle = Shell.Current?.CurrentPage?.Title ?? "null";
+ _viewModel.NavigatingCurrent = Shell.Current?.CurrentPage?.Title ?? "null";
+ _viewModel.NavigatingSource = e.Source.ToString();
+ _viewModel.NavigatingTarget = e.Target?.Location?.ToString() ?? "null";
+ _viewModel.NavigatingCanCancel = e.CanCancel.ToString();
+ _viewModel.NavigatingCancelled = e.Cancelled.ToString();
+
+ if (_viewModel.CancelNavigation && e.CanCancel)
+ {
+ e.Cancel();
+ _viewModel.NavigatingCancelled = e.Cancelled.ToString();
+ return;
+ }
+
+ if (_viewModel.EnableDeferral && e.CanCancel)
+ {
+ var deferral = e.GetDeferral();
+ _viewModel.DeferralStatus = "Deferring...";
+ _ = HandleDeferralAsync(deferral);
+ }
+ }
+
+ async Task HandleDeferralAsync(ShellNavigatingDeferral deferral)
+ {
+ try
+ {
+ await Task.Delay(2000);
+ _viewModel.DeferralStatus = "Deferral completed";
+ deferral.Complete();
+ }
+ catch (Exception ex)
+ {
+ _viewModel.DeferralStatus = $"Deferral error";
+ System.Diagnostics.Debug.WriteLine($"Deferral failed: {ex.Message}");
+ }
+ }
+ void OnShellNavigated(object sender, ShellNavigatedEventArgs e)
+ {
+ _viewModel.NavigatedCurrent = Shell.Current?.CurrentPage?.Title ?? "null";
+ _viewModel.NavigatedPrevious = _previousPageTitle;
+ _viewModel.NavigatedSource = e.Source.ToString();
+ UpdateCurrentState();
+ UpdatePage2State();
+ UpdatePage2TabBState();
+ UpdatePage3C1State();
+ UpdatePage3C2State();
+ }
+ protected override void OnNavigating(ShellNavigatingEventArgs args)
+ {
+ base.OnNavigating(args);
+ _viewModel.OverrideNavigatingStatus = $"Source={args.Source}, Target={args.Target?.Location}";
+ }
+ protected override void OnNavigated(ShellNavigatedEventArgs args)
+ {
+ base.OnNavigated(args);
+ _viewModel.OverrideNavigatedStatus = $"Source={args.Source}, Previous={args.Previous?.Location}";
+ }
+ bool _routeRegistered = true;
+ async void OnToggleRouteClicked(object sender, EventArgs e)
+ {
+ var btn = (Button)sender;
+ if (_routeRegistered)
+ {
+ Routing.UnRegisterRoute("detail2");
+ try
+ { await Shell.Current.GoToAsync("detail2"); _viewModel.RouteStatus = "Still works"; }
+ catch (Exception ex) { _viewModel.RouteStatus = "Unregistered"; System.Diagnostics.Debug.WriteLine($"Expected: {ex.Message}"); }
+ btn.Text = "Register Route";
+ _routeRegistered = false;
+ }
+ else
+ {
+ Routing.RegisterRoute("detail2", typeof(DetailPage2));
+ try
+ { await Shell.Current.GoToAsync("detail2"); _viewModel.RouteStatus = "Registered"; }
+ catch (Exception ex) { _viewModel.RouteStatus = $"{ex.Message}"; }
+ btn.Text = "Unregister Route";
+ _routeRegistered = true;
+ }
+ }
+ void OnResetClicked(object sender, EventArgs e)
+ {
+ _viewModel.TextOverride = string.Empty;
+ _viewModel.IconOverride = string.Empty;
+ _viewModel.IsEnabled = true;
+ _viewModel.IsVisible = true;
+ _viewModel.CommandParameter = string.Empty;
+ _viewModel.CommandExecuted = string.Empty;
+ _viewModel.CurrentState = "Not Set";
+ _viewModel.CurrentPage = "Not Set";
+ _viewModel.CurrentItem = "Not Set";
+ _viewModel.ShellCurrent = "Not Set";
+ _viewModel.NavigatingCurrent = string.Empty;
+ _viewModel.NavigatingSource = string.Empty;
+ _viewModel.NavigatingTarget = string.Empty;
+ _viewModel.NavigatingCanCancel = string.Empty;
+ _viewModel.NavigatingCancelled = string.Empty;
+ _viewModel.NavigatedCurrent = string.Empty;
+ _viewModel.NavigatedPrevious = string.Empty;
+ _viewModel.NavigatedSource = string.Empty;
+ _viewModel.RouteStatus = string.Empty;
+ _viewModel.CancelNavigation = false;
+ _viewModel.EnableDeferral = false;
+ _viewModel.DeferralStatus = string.Empty;
+ _viewModel.OverrideNavigatingStatus = string.Empty;
+ _viewModel.OverrideNavigatedStatus = string.Empty;
+ _viewModel.TabStackInfo = string.Empty;
+
+ // Restore Shell-level route state to initial state
+ if (!_routeRegistered)
+ {
+ Routing.RegisterRoute("detail2", typeof(DetailPage2));
+ _routeRegistered = true;
+ }
+ ToggleRouteButton.Text = "Unregister Route";
+ }
+ void OnToggleCancelNavigation(object sender, EventArgs e)
+ {
+ _viewModel.CancelNavigation = !_viewModel.CancelNavigation;
+ }
+ void OnToggleEnableDeferral(object sender, EventArgs e)
+ {
+ _viewModel.EnableDeferral = !_viewModel.EnableDeferral;
+ }
+ async void OnOpenPassDataDemoClicked(object sender, EventArgs e)
+ {
+ await Shell.Current.GoToAsync("querysender");
+ }
+ }
+ public class ShellDetailBasePage : ContentPage
+ {
+ readonly string _prefix;
+ Label _currentStateLabel;
+ Label _currentPageLabel;
+ Label _currentItemLabel;
+ Label _shellCurrentLabel;
+ Label _commandExecutedLabel;
+ public ShellDetailBasePage(string title, string prefix)
+ {
+ Title = title;
+ AutomationId = $"{prefix}Page";
+ _prefix = prefix;
+ var behavior = new BackButtonBehavior();
+ behavior.SetBinding(BackButtonBehavior.TextOverrideProperty, "TextOverride");
+ behavior.SetBinding(BackButtonBehavior.IconOverrideProperty, "IconOverride");
+ behavior.SetBinding(BackButtonBehavior.IsEnabledProperty, "IsEnabled");
+ behavior.SetBinding(BackButtonBehavior.IsVisibleProperty, "IsVisible");
+ behavior.SetBinding(BackButtonBehavior.CommandProperty, "Command");
+ behavior.SetBinding(BackButtonBehavior.CommandParameterProperty, "CommandParameter");
+ Shell.SetBackButtonBehavior(this, behavior);
+ BuildUI();
+ this.Appearing += OnPageAppearing;
+ }
+ void BuildUI()
+ {
+ _currentStateLabel = new Label { FontSize = 12, AutomationId = $"{_prefix}CurrentStateLabel" };
+ _currentPageLabel = new Label { FontSize = 12, AutomationId = $"{_prefix}CurrentPageLabel" };
+ _currentItemLabel = new Label { FontSize = 12, AutomationId = $"{_prefix}CurrentItemLabel" };
+ _shellCurrentLabel = new Label { FontSize = 12, AutomationId = $"{_prefix}ShellCurrentLabel" };
+ _commandExecutedLabel = new Label { FontSize = 12, AutomationId = $"{_prefix}CommandExecutedLabel" };
+ var identityLabel = new Label
+ {
+ Text = Title,
+ FontSize = 14,
+ FontAttributes = FontAttributes.Bold,
+ Margin = new Thickness(10, 8, 10, 4),
+ AutomationId = $"{_prefix}PageIdentityLabel"
+ };
+ var goBackButton = ShellNavHelper.CreateNavButton("Go Back", "..", $"{_prefix}GoBackButton");
+ var contextualNavButton = ShellNavHelper.CreateNavButton("Navigate SubDetail", "subdetail", $"{_prefix}ContextualNavButton");
+ var grid = new Grid
+ {
+ Padding = 10,
+ RowSpacing = 4,
+ ColumnSpacing = 10,
+ RowDefinitions = { new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto) },
+ ColumnDefinitions = { new ColumnDefinition(GridLength.Star), new ColumnDefinition(GridLength.Star) }
+ };
+ AddRow(grid, 0, "CurrentState:", _currentStateLabel);
+ AddRow(grid, 1, "CurrentPage:", _currentPageLabel);
+ AddRow(grid, 2, "CurrentItem:", _currentItemLabel);
+ AddRow(grid, 3, "Shell.Current:", _shellCurrentLabel);
+ AddRow(grid, 4, "CommandExecuted:", _commandExecutedLabel);
+ Grid.SetRow(goBackButton, 5);
+ Grid.SetColumn(goBackButton, 0);
+ Grid.SetColumnSpan(goBackButton, 2);
+ grid.Children.Add(goBackButton);
+ Grid.SetRow(contextualNavButton, 6);
+ Grid.SetColumn(contextualNavButton, 0);
+ Grid.SetColumnSpan(contextualNavButton, 2);
+ grid.Children.Add(contextualNavButton);
+ Content = new ScrollView
+ {
+ Content = new VerticalStackLayout
+ {
+ Spacing = 4,
+ Children = { identityLabel, grid }
+ }
+ };
+ }
+ static void AddRow(Grid grid, int row, string labelText, Label valueLabel)
+ {
+ var label = new Label { Text = labelText, FontSize = 12 };
+ Grid.SetRow(label, row);
+ Grid.SetColumn(label, 0);
+ Grid.SetRow(valueLabel, row);
+ Grid.SetColumn(valueLabel, 1);
+ grid.Children.Add(label);
+ grid.Children.Add(valueLabel);
+ }
+ void OnPageAppearing(object sender, EventArgs e)
+ {
+ UpdateState();
+ Shell.Current?.Navigated += OnShellNavigatedUpdateState;
+ }
+
+ void OnShellNavigatedUpdateState(object sender, ShellNavigatedEventArgs e)
+ {
+ if (Shell.Current?.CurrentPage == this)
+ UpdateState();
+ }
+
+ void UpdateState()
+ {
+ var shell = Shell.Current;
+ if (shell != null)
+ {
+ _currentStateLabel.Text = shell.CurrentState?.Location?.ToString() ?? "Not Set";
+ _currentPageLabel.Text = shell.CurrentPage?.Title ?? "Not Set";
+ _currentItemLabel.Text = shell.CurrentItem?.Title ?? "Not Set";
+ _shellCurrentLabel.Text = shell.GetType().Name;
+ if (shell is ShellNavigationControlPage controlPage)
+ {
+ var vm = controlPage.ViewModel;
+ _commandExecutedLabel.Text = vm.CommandExecuted;
+ BindingContext = vm;
+ }
+ }
+ }
+
+ protected override void OnDisappearing()
+ {
+ base.OnDisappearing();
+ Shell.Current?.Navigated -= OnShellNavigatedUpdateState;
+ }
+ }
+ public class DetailPage1 : ShellDetailBasePage
+ {
+ public DetailPage1() : base("DetailPage1", "Detail1")
+ {
+ var stackLayout = (Content as ScrollView)?.Content as VerticalStackLayout;
+ if (stackLayout == null)
+ return;
+ var absBtn = ShellNavHelper.CreateNavButton("Absolute to Page2", "//page2", "Detail1AbsoluteButton");
+ var relBtn = ShellNavHelper.CreateNavButton("Relative to NavTest1", "navtest1", "Detail1RelativeButton");
+ stackLayout.Children.Add(absBtn);
+ stackLayout.Children.Add(relBtn);
+ }
+ }
+
+ public class DetailPage2 : ShellDetailBasePage
+ {
+ public DetailPage2() : base("DetailPage2", "Detail2")
+ {
+ var stackLayout = (Content as ScrollView)?.Content as VerticalStackLayout;
+ if (stackLayout == null)
+ return;
+ var absToPage2Btn = ShellNavHelper.CreateNavButton("Absolute to Page2", "//page2", "Detail2AbsoluteButton");
+ var backBtn = ShellNavHelper.CreateNavButton("Go Back", "..", "Detail2BackButton");
+ stackLayout.Children.Add(absToPage2Btn);
+ stackLayout.Children.Add(backBtn);
+ }
+ }
+ public class SubDetailPage : ContentPage
+ {
+ public SubDetailPage()
+ {
+ Title = "SubDetailPage";
+ AutomationId = "SubDetailPage";
+ var currentRouteLabel = new Label { FontSize = 12, AutomationId = "SubDetailCurrentRouteLabel" };
+ var sourceContextLabel = new Label { FontSize = 12, AutomationId = "SubDetailSourceContextLabel" };
+ var identityLabel = new Label
+ {
+ Text = "SubDetail Page",
+ FontSize = 14,
+ FontAttributes = FontAttributes.Bold,
+ Margin = new Thickness(10, 8, 10, 4),
+ AutomationId = "SubDetailPageIdentityLabel"
+ };
+ var goBackButton = ShellNavHelper.CreateNavButton("Go Back", "..", "SubDetailGoBackButton");
+ this.Appearing += (s, e) =>
+ {
+ UpdateLabels(currentRouteLabel, sourceContextLabel);
+ Shell.Current?.Navigated += OnNavigated;
+ };
+ this.Disappearing += (s, e) =>
+ {
+ Shell.Current?.Navigated -= OnNavigated;
+ };
+
+ void OnNavigated(object sender, ShellNavigatedEventArgs e)
+ {
+ if (Shell.Current?.CurrentPage == this)
+ UpdateLabels(currentRouteLabel, sourceContextLabel);
+ }
+
+ void UpdateLabels(Label routeLabel, Label contextLabel)
+ {
+ var shell = Shell.Current;
+ var location = shell?.CurrentState?.Location?.ToString() ?? "unknown";
+ routeLabel.Text = location;
+ contextLabel.Text = location.Contains("detail1", StringComparison.Ordinal) ? "Contextual from: detail1"
+ : location.Contains("detail2", StringComparison.Ordinal) ? "Contextual from: detail2"
+ : "Unknown context";
+ }
+ Content = new ScrollView
+ {
+ Content = new VerticalStackLayout
+ {
+ Spacing = 0,
+ Children =
+ {
+ identityLabel,
+ new Grid
+ {
+ Padding = 10,
+ RowSpacing = 4,
+ ColumnSpacing = 10,
+ RowDefinitions = { new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto) },
+ ColumnDefinitions = { new ColumnDefinition(GridLength.Star), new ColumnDefinition(GridLength.Star) },
+ Children =
+ {
+ CreateLabel("Current Route:", 0, 0),
+ SetGrid(currentRouteLabel, 0, 1),
+ CreateLabel("Source Context:", 1, 0),
+ SetGrid(sourceContextLabel, 1, 1),
+ SetGrid(goBackButton, 2, 0, 2)
+ }
+ }
+ }
+ }
+ };
+ }
+ static Label CreateLabel(string text, int row, int col, int colSpan = 1, bool bold = false)
+ {
+ var label = new Label { Text = text, FontSize = 12 };
+ if (bold)
+ label.FontAttributes = FontAttributes.Bold;
+ Grid.SetRow(label, row);
+ Grid.SetColumn(label, col);
+ if (colSpan > 1)
+ Grid.SetColumnSpan(label, colSpan);
+ return label;
+ }
+ static View SetGrid(View view, int row, int col, int colSpan = 1)
+ {
+ Grid.SetRow(view, row);
+ Grid.SetColumn(view, col);
+ if (colSpan > 1)
+ Grid.SetColumnSpan(view, colSpan);
+ return view;
+ }
+ }
+ public class NavigationTestPage1 : ContentPage
+ {
+ public NavigationTestPage1()
+ {
+ Title = "NavTest1";
+ AutomationId = "NavigationTestPage1";
+ Content = new ScrollView
+ {
+ Content = new VerticalStackLayout
+ {
+ Padding = 10,
+ Spacing = 10,
+ Children =
+ {
+ new Label { Text = "NavTest 1", FontSize = 14, FontAttributes = FontAttributes.Bold, AutomationId = "NavTest1PageIdentityLabel" },
+ ShellNavHelper.CreateNavButton("Go Back", "..", "NavTest1BackButton"),
+ ShellNavHelper.CreateNavButton("Navigate to NavTest2", "navtest2", "NavTest1ToNavTest2Button")
+ }
+ }
+ };
+ }
+ }
+ public class NavigationTestPage2 : ContentPage
+ {
+ public NavigationTestPage2()
+ {
+ Title = "NavTest2";
+ AutomationId = "NavigationTestPage2";
+ Content = new ScrollView
+ {
+ Content = new VerticalStackLayout
+ {
+ Padding = 10,
+ Spacing = 10,
+ Children =
+ {
+ new Label { Text = "NavTest 2", FontSize = 14, FontAttributes = FontAttributes.Bold, AutomationId = "NavTest2PageIdentityLabel" },
+ ShellNavHelper.CreateNavButton("Back and Forward", "../navtest3", "NavTest2BackForwardButton"),
+ ShellNavHelper.CreateNavButton("Simple Back", "..", "NavTest2BackButton")
+ }
+ }
+ };
+ }
+ }
+ public class NavigationTestPage3 : ContentPage
+ {
+ public NavigationTestPage3()
+ {
+ Title = "NavTest3";
+ AutomationId = "NavigationTestPage3";
+ Content = new ScrollView
+ {
+ Content = new VerticalStackLayout
+ {
+ Padding = 10,
+ Spacing = 10,
+ Children =
+ {
+ new Label { Text = "NavTest 3", FontSize = 14, FontAttributes = FontAttributes.Bold, AutomationId = "NavTest3PageIdentityLabel" },
+ ShellNavHelper.CreateNavButton("Back 2 Levels", "../..", "NavTest3MultiBackButton")
+ }
+ }
+ };
+ }
+ }
+ // ── Pass Data: QuerySenderPage ────────────────────────────────────────────
+ public class QuerySenderPage : ContentPage, IQueryAttributable
+ {
+ readonly Label _backValueLabel;
+ readonly Entry _nameEntry;
+ readonly Entry _locationEntry;
+ string _backValue;
+
+ public string BackValue
+ {
+ get => _backValue;
+ set
+ {
+ _backValue = value;
+ _backValueLabel.Text = value ?? "(none)";
+ }
+ }
+
+ public void ApplyQueryAttributes(IDictionary query)
+ {
+ if (query.TryGetValue("backvalue", out var val))
+ BackValue = val?.ToString();
+ }
+
+ public QuerySenderPage()
+ {
+ Title = "QuerySenderPage";
+ AutomationId = "QuerySenderPage";
+
+ _nameEntry = new Entry { Text = "Hello World", FontSize = 12, HeightRequest = 35, AutomationId = "QuerySendNameEntry" };
+ _locationEntry = new Entry { Text = "Savannah", FontSize = 12, HeightRequest = 35, AutomationId = "QuerySendLocationEntry" };
+ _backValueLabel = new Label { FontSize = 12, Text = "(none)", AutomationId = "QueryBackValueLabel" };
+
+ var identityLabel = new Label
+ {
+ Text = "Query Sender",
+ FontSize = 14,
+ FontAttributes = FontAttributes.Bold,
+ Margin = new Thickness(10, 8, 10, 4),
+ AutomationId = "QuerySenderPageIdentityLabel"
+ };
+
+ var sendStringBtn = MakeButton("Send ?name= (string param)", "QuerySendStringButton");
+ sendStringBtn.Clicked += async (s, e) =>
+ await Shell.Current.GoToAsync($"querydetail?name={Uri.EscapeDataString(_nameEntry.Text ?? string.Empty)}");
+
+ var sendMultiBtn = MakeButton("Send ?name=&location= (multi param)", "QuerySendMultiParamButton");
+ sendMultiBtn.Clicked += async (s, e) =>
+ await Shell.Current.GoToAsync($"querydetail?name={Uri.EscapeDataString(_nameEntry.Text ?? string.Empty)}&location={Uri.EscapeDataString(_locationEntry.Text ?? string.Empty)}");
+
+ var sendDictBtn = MakeButton("Send Dictionary", "QuerySendDictButton");
+ sendDictBtn.Clicked += async (s, e) =>
+ await Shell.Current.GoToAsync("querydetail", new Dictionary { ["name"] = _nameEntry.Text ?? string.Empty });
+
+ var sendSingleUseBtn = MakeButton("Send SingleUse Params", "QuerySendSingleUseButton");
+ sendSingleUseBtn.Clicked += async (s, e) =>
+ await Shell.Current.GoToAsync("querydetail", new ShellNavigationQueryParameters { ["name"] = _nameEntry.Text ?? string.Empty });
+
+ var goBackBtn = ShellNavHelper.CreateNavButton("Go Back", "..", "QuerySenderGoBackButton");
+
+ var grid = new Grid
+ {
+ Padding = 10,
+ RowSpacing = 4,
+ ColumnSpacing = 10,
+ RowDefinitions = { new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto) },
+ ColumnDefinitions = { new ColumnDefinition(GridLength.Star), new ColumnDefinition(GridLength.Star) }
+ };
+
+ void AddLabelRow(int row, string labelText, View valueView)
+ {
+ var lbl = new Label { Text = labelText, FontSize = 12, VerticalOptions = LayoutOptions.Center };
+ Grid.SetRow(lbl, row);
+ Grid.SetColumn(lbl, 0);
+ Grid.SetRow(valueView, row);
+ Grid.SetColumn(valueView, 1);
+ grid.Children.Add(lbl);
+ grid.Children.Add(valueView);
+ }
+
+ AddLabelRow(0, "Name to Send:", _nameEntry);
+ AddLabelRow(1, "Location to Send:", _locationEntry);
+ AddLabelRow(2, "Back Value:", _backValueLabel);
+ foreach (var (btn, row) in new (Button, int)[] { (sendStringBtn, 3), (sendMultiBtn, 4), (sendDictBtn, 5), (sendSingleUseBtn, 6), (goBackBtn, 7) })
+ {
+ Grid.SetRow(btn, row);
+ Grid.SetColumn(btn, 0);
+ Grid.SetColumnSpan(btn, 2);
+ grid.Children.Add(btn);
+ }
+
+ Content = new ScrollView { Content = new VerticalStackLayout { Spacing = 4, Children = { identityLabel, grid } } };
+ }
+
+ static Button MakeButton(string text, string automationId) => new Button
+ {
+ Text = text,
+ FontSize = 11,
+ HeightRequest = 35,
+ Padding = new Thickness(8, 0),
+ Margin = new Thickness(10, 4),
+ HorizontalOptions = LayoutOptions.Fill,
+ AutomationId = automationId
+ };
+ }
+
+ // ── Pass Data: QueryDataDetailPage ────────────────────────────────────────
+ public class QueryDataDetailPage : ContentPage, IQueryAttributable
+ {
+ readonly Label _attributeNameLabel;
+ readonly Label _attributeLocationLabel;
+ readonly Label _iqaNameLabel;
+ readonly Label _iqaCallCountLabel;
+ int _iqaCallCount;
+
+ public QueryDataDetailPage()
+ {
+ Title = "QueryDataDetail";
+ AutomationId = "QueryDataDetailPage";
+
+ _attributeNameLabel = new Label { FontSize = 12, Text = "(not set)", AutomationId = "QueryPropertyReceivedLabel" };
+ _attributeLocationLabel = new Label { FontSize = 12, Text = "(not set)", AutomationId = "QueryPropertyLocationLabel" };
+ _iqaNameLabel = new Label { FontSize = 12, Text = "(not set)", AutomationId = "IQueryAttributableReceivedLabel" };
+ _iqaCallCountLabel = new Label { FontSize = 12, Text = "0", AutomationId = "DictAppliedCountLabel" };
+
+ var identityLabel = new Label
+ {
+ Text = "Query Data Detail",
+ FontSize = 14,
+ FontAttributes = FontAttributes.Bold,
+ Margin = new Thickness(10, 8, 10, 4),
+ AutomationId = "QueryDataDetailPageIdentityLabel"
+ };
+
+ var goBackBtn = ShellNavHelper.CreateNavButton("Go Back", "..", "QueryDetailGoBackButton");
+ var goBackWithDataBtn = new Button
+ {
+ Text = "Go Back with Data",
+ FontSize = 11,
+ HeightRequest = 35,
+ Padding = new Thickness(8, 0),
+ Margin = new Thickness(10, 4),
+ HorizontalOptions = LayoutOptions.Fill,
+ AutomationId = "QueryDetailGoBackWithDataButton"
+ };
+ goBackWithDataBtn.Clicked += async (s, e) => await Shell.Current.GoToAsync("..?backvalue=ReturnedData");
+
+ // Navigates forward without passing data — Dictionary data will re-apply on return (persistence demo)
+ var goToIntermediateBtn = new Button
+ {
+ Text = "Go to Intermediate (no data)",
+ FontSize = 11,
+ HeightRequest = 35,
+ Padding = new Thickness(8, 0),
+ Margin = new Thickness(10, 4),
+ HorizontalOptions = LayoutOptions.Fill,
+ AutomationId = "QueryDetailGoToIntermediateButton"
+ };
+ goToIntermediateBtn.Clicked += async (s, e) => await Shell.Current.GoToAsync("queryintermediate");
+
+ var grid = new Grid
+ {
+ Padding = 10,
+ RowSpacing = 4,
+ ColumnSpacing = 10,
+ RowDefinitions = { new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto) },
+ ColumnDefinitions = { new ColumnDefinition(GridLength.Star), new ColumnDefinition(GridLength.Star) }
+ };
+
+ void AddRow(int row, string labelText, Label valueLabel)
+ {
+ var lbl = new Label { Text = labelText, FontSize = 12 };
+ Grid.SetRow(lbl, row);
+ Grid.SetColumn(lbl, 0);
+ Grid.SetRow(valueLabel, row);
+ Grid.SetColumn(valueLabel, 1);
+ grid.Children.Add(lbl);
+ grid.Children.Add(valueLabel);
+ }
+
+ AddRow(0, "[QueryProp] name:", _attributeNameLabel);
+ AddRow(1, "[QueryProp] location:", _attributeLocationLabel);
+ AddRow(2, "IQA name:", _iqaNameLabel);
+ AddRow(3, "IQA call count:", _iqaCallCountLabel);
+ foreach (var (btn, row) in new (Button, int)[] { (goBackBtn, 4), (goBackWithDataBtn, 5), (goToIntermediateBtn, 6) })
+ {
+ Grid.SetRow(btn, row);
+ Grid.SetColumn(btn, 0);
+ Grid.SetColumnSpan(btn, 2);
+ grid.Children.Add(btn);
+ }
+
+ Content = new ScrollView { Content = new VerticalStackLayout { Spacing = 4, Children = { identityLabel, grid } } };
+ }
+
+ public void ApplyQueryAttributes(IDictionary query)
+ {
+ if (query.TryGetValue("name", out var nameVal))
+ {
+ _iqaCallCount++;
+ _iqaCallCountLabel.Text = _iqaCallCount.ToString();
+ var name = nameVal?.ToString() ?? "(null)";
+ _attributeNameLabel.Text = name;
+ _iqaNameLabel.Text = name;
+ }
+
+ if (query.TryGetValue("location", out var locVal))
+ _attributeLocationLabel.Text = locVal?.ToString() ?? "(null)";
+ }
+ }
+
+ // ── Pass Data: QueryIntermediatePage ─────────────────────────────────────
+ public class QueryIntermediatePage : ContentPage
+ {
+ public QueryIntermediatePage()
+ {
+ Title = "QueryIntermediate";
+ AutomationId = "QueryIntermediatePage";
+ Content = new ScrollView
+ {
+ Content = new VerticalStackLayout
+ {
+ Padding = 10,
+ Spacing = 8,
+ Children =
+ {
+ new Label { Text = "Intermediate Page", FontSize = 14, FontAttributes = FontAttributes.Bold, AutomationId = "QueryIntermediatePageIdentityLabel" },
+ new Label { Text = "No data was passed here.\nGo Back to see Dictionary data re-applied on the detail page.", FontSize = 12, LineBreakMode = LineBreakMode.WordWrap },
+ ShellNavHelper.CreateNavButton("Go Back", "..", "QueryIntermediateGoBackButton")
+ }
+ }
+ };
+ }
+ }
+
+ static class ShellNavHelper
+ {
+ public static Button CreateNavButton(string text, string route, string automationId)
+ {
+ var btn = new Button
+ {
+ Text = text,
+ FontSize = 12,
+ HeightRequest = 35,
+ Padding = new Thickness(8, 0),
+ Margin = new Thickness(10, 4),
+ HorizontalOptions = LayoutOptions.Fill,
+ AutomationId = automationId
+ };
+ btn.Clicked += async (s, e) =>
+ {
+ try
+ { await Shell.Current.GoToAsync(route); }
+ catch (Exception ex) { System.Diagnostics.Debug.WriteLine($"Navigation failed: {ex.Message}"); }
+ };
+ return btn;
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellNavigation/ShellNavigationOptionsPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellNavigation/ShellNavigationOptionsPage.xaml
new file mode 100644
index 000000000000..9f841e776984
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellNavigation/ShellNavigationOptionsPage.xaml
@@ -0,0 +1,248 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellNavigation/ShellNavigationOptionsPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellNavigation/ShellNavigationOptionsPage.xaml.cs
new file mode 100644
index 000000000000..2bbb34ce0bf5
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellNavigation/ShellNavigationOptionsPage.xaml.cs
@@ -0,0 +1,273 @@
+using System.Linq;
+using Microsoft.Maui.Controls;
+namespace Maui.Controls.Sample
+{
+ public partial class ShellNavigationOptionsPage : ContentPage
+ {
+ readonly ShellViewModel _viewModel;
+ readonly List _insertedPages = new();
+ int _insertedPageCount;
+ public ShellNavigationOptionsPage(ShellViewModel viewModel, List existingInsertedPages = null, int existingInsertedPageCount = 0)
+ {
+ _viewModel = viewModel;
+ if (existingInsertedPages != null)
+ {
+ _insertedPages.AddRange(existingInsertedPages);
+ _insertedPageCount = existingInsertedPageCount;
+ }
+ BindingContext = _viewModel;
+ InitializeComponent();
+ this.Appearing += OnPageAppearing;
+ }
+ void OnPageAppearing(object sender, System.EventArgs e)
+ {
+ UpdateStateLabels();
+ Shell.Current?.Navigated += OnShellNavigated;
+ }
+ void OnShellNavigated(object sender, ShellNavigatedEventArgs e)
+ {
+ if (Shell.Current?.CurrentPage == this)
+ UpdateStateLabels();
+ }
+ void UpdateStateLabels()
+ {
+ var shell = Shell.Current;
+ if (shell != null)
+ {
+ _viewModel.CurrentState = shell.CurrentState?.Location?.ToString() ?? "Not Set";
+ _viewModel.CurrentPage = shell.CurrentPage?.Title ?? "Not Set";
+ _viewModel.CurrentItem = shell.CurrentItem?.Title ?? "Not Set";
+ _viewModel.ShellCurrent = shell.GetType().Name;
+ }
+ UpdateNavigationStackDisplay();
+ }
+ protected override void OnDisappearing()
+ {
+ base.OnDisappearing();
+ Shell.Current?.Navigated -= OnShellNavigated;
+ }
+ void UpdateNavigationStackDisplay()
+ {
+ var shell = Shell.Current;
+ var section = shell?.CurrentItem?.CurrentItem;
+ if (section != null)
+ {
+ // section.Stack[0] is null in Shell (root placeholder).
+ // Resolve it to the root ContentPage title via ShellContent.Content.
+ var rootTitle = (section.CurrentItem?.Content as Page)?.Title ?? "Root";
+ var stack = section.Stack;
+ TabStackLabel.Text = $"Count={stack.Count}: {string.Join(", ", stack.Select(p => p?.Title ?? rootTitle))}";
+ var navStack = Navigation.NavigationStack;
+ GetNavStackLabel.Text = $"Count={navStack.Count}: {string.Join(", ", navStack.Select(p => p?.Title ?? rootTitle))}";
+ }
+ else
+ {
+ TabStackLabel.Text = "N/A";
+ GetNavStackLabel.Text = "N/A";
+ }
+ }
+ async void OnPushClicked(object sender, System.EventArgs e)
+ {
+ var stack = Navigation.NavigationStack;
+ int optionsIndex = -1;
+ for (int i = 0; i < stack.Count; i++)
+ if (ReferenceEquals(stack[i], this)) { optionsIndex = i; break; }
+ var subPageNumber = optionsIndex >= 0 ? stack.Count - optionsIndex : 1;
+ var pageTitle = $"SubPage{subPageNumber}";
+ var subPage = new ContentPage
+ {
+ Title = pageTitle,
+ AutomationId = $"OptionsSubPage{subPageNumber}",
+ };
+ var subTabStackLabel = new Label { FontSize = 11, AutomationId = $"SubPage{subPageNumber}TabStackLabel" };
+ var subNavStackLabel = new Label { FontSize = 11, AutomationId = $"SubPage{subPageNumber}NavStackLabel" };
+ subPage.Content = new ScrollView
+ {
+ Content = new VerticalStackLayout
+ {
+ Padding = 10,
+ Spacing = 8,
+ Children =
+ {
+ new Label { Text = $"Sub Page {subPageNumber}", FontSize = 14, FontAttributes = FontAttributes.Bold, AutomationId = $"OptionsSubPage{subPageNumber}IdentityLabel" },
+ CreateEventDisplay(),
+ CreateStackDisplay(subTabStackLabel, subNavStackLabel),
+ CreateSubPageButtons()
+ }
+ }
+ };
+ subPage.Appearing += (s2, e2) => UpdateStackLabels(subPage, subTabStackLabel, subNavStackLabel);
+ subPage.BindingContext = _viewModel;
+ await Navigation.PushAsync(subPage);
+ // Update the new SubPage's stack labels immediately after push so they
+ // reflect the correct count before Appearing fires (fixes "not updated on push").
+ UpdateStackLabels(subPage, subTabStackLabel, subNavStackLabel);
+ UpdateNavigationStackDisplay();
+ }
+ async void OnPopClicked(object sender, System.EventArgs e)
+ {
+ if (Navigation.NavigationStack.Count > 1)
+ {
+ await Navigation.PopAsync();
+ }
+ }
+ async void OnPopToRootClicked(object sender, System.EventArgs e)
+ {
+ await Navigation.PopToRootAsync();
+ }
+ void OnInsertClicked(object sender, System.EventArgs e)
+ {
+ _insertedPageCount++;
+ var pageTitle = $"InsertedPage{_insertedPageCount}";
+ var goBackBtn = new Button
+ {
+ Text = "Go Back",
+ FontSize = 12,
+ HeightRequest = 35,
+ AutomationId = $"InsertedPage{_insertedPageCount}GoBackButton"
+ };
+ goBackBtn.Clicked += async (s, ev) => await Shell.Current.GoToAsync("..");
+ var goToOptionsBtn = new Button
+ {
+ Text = "Go to Options Page",
+ FontSize = 12,
+ HeightRequest = 35,
+ AutomationId = $"InsertedPage{_insertedPageCount}GoToOptionsButton"
+ };
+ var insTabStackLabel = new Label { FontSize = 11, AutomationId = $"InsertedPage{_insertedPageCount}TabStackLabel" };
+ var insNavStackLabel = new Label { FontSize = 11, AutomationId = $"InsertedPage{_insertedPageCount}NavStackLabel" };
+ var insertedPage = new ContentPage
+ {
+ Title = pageTitle,
+ AutomationId = $"InsertedPage{_insertedPageCount}",
+ Content = new VerticalStackLayout
+ {
+ Padding = 20,
+ Spacing = 10,
+ Children =
+ {
+ new Label { Text = $"Inserted Page {_insertedPageCount}", FontSize = 14, FontAttributes = FontAttributes.Bold, AutomationId = $"InsertedPage{_insertedPageCount}IdentityLabel" },
+ CreateStackDisplay(insTabStackLabel, insNavStackLabel),
+ goToOptionsBtn,
+ goBackBtn
+ }
+ }
+ };
+ insertedPage.Appearing += (s2, e2) => UpdateStackLabels(insertedPage, insTabStackLabel, insNavStackLabel);
+ goToOptionsBtn.Clicked += async (s, ev) => await insertedPage.Navigation.PushAsync(new ShellNavigationOptionsPage(_viewModel, _insertedPages, _insertedPageCount));
+ _insertedPages.Add(insertedPage);
+ Navigation.InsertPageBefore(insertedPage, this);
+ UpdateNavigationStackDisplay();
+ }
+ void OnRemoveClicked(object sender, System.EventArgs e)
+ {
+ for (int i = _insertedPages.Count - 1; i >= 0; i--)
+ {
+ if (Navigation.NavigationStack.Contains(_insertedPages[i]))
+ {
+ Navigation.RemovePage(_insertedPages[i]);
+ _insertedPages.RemoveAt(i);
+ break;
+ }
+ }
+ if (_insertedPages.Count == 0)
+ _insertedPageCount = 0;
+ UpdateNavigationStackDisplay();
+ }
+ VerticalStackLayout CreateEventDisplay()
+ {
+ var layout = new VerticalStackLayout { Spacing = 3 };
+ layout.Children.Add(new Label { Text = "NAVIGATING EVENT", FontSize = 13, FontAttributes = FontAttributes.Bold, TextColor = Colors.DarkBlue });
+ AddBoundLabel(layout, "Current:", "NavigatingCurrent", "SubNavigatingCurrentLabel");
+ AddBoundLabel(layout, "Source:", "NavigatingSource", "SubNavigatingSourceLabel");
+ AddBoundLabel(layout, "Target:", "NavigatingTarget", "SubNavigatingTargetLabel");
+ AddBoundLabel(layout, "CanCancel:", "NavigatingCanCancel", "SubNavigatingCanCancelLabel");
+ AddBoundLabel(layout, "Cancelled:", "NavigatingCancelled", "SubNavigatingCancelledLabel");
+ layout.Children.Add(new BoxView { HeightRequest = 1, Color = Colors.Gray, Margin = new Thickness(0, 4) });
+ layout.Children.Add(new Label { Text = "NAVIGATED EVENT", FontSize = 13, FontAttributes = FontAttributes.Bold, TextColor = Colors.DarkGreen });
+ AddBoundLabel(layout, "Current:", "NavigatedCurrent", "SubNavigatedCurrentLabel");
+ AddBoundLabel(layout, "Previous:", "NavigatedPrevious", "SubNavigatedPreviousLabel");
+ AddBoundLabel(layout, "Source:", "NavigatedSource", "SubNavigatedSourceLabel");
+ return layout;
+ }
+ static void AddBoundLabel(VerticalStackLayout layout, string title, string bindingPath, string automationId)
+ {
+ var row = new HorizontalStackLayout { Spacing = 5 };
+ row.Children.Add(new Label { Text = title, FontSize = 11, WidthRequest = 80 });
+ var valueLabel = new Label { FontSize = 11, AutomationId = automationId };
+ valueLabel.SetBinding(Label.TextProperty, bindingPath);
+ row.Children.Add(valueLabel);
+ layout.Children.Add(row);
+ }
+ Grid CreateSubPageButtons()
+ {
+ var pushBtn = new Button { Text = "Push Deeper", FontSize = 11, HeightRequest = 35, AutomationId = "SubPushDeeperButton" };
+ pushBtn.Clicked += OnPushClicked;
+ var popBtn = new Button { Text = "Pop (Go Back)", FontSize = 11, HeightRequest = 35, AutomationId = "SubPopButton" };
+ popBtn.Clicked += async (s, e) => await Navigation.PopAsync();
+ var popToRootBtn = new Button { Text = "PopToRoot", FontSize = 11, HeightRequest = 35, AutomationId = "SubPopToRootButton" };
+ popToRootBtn.Clicked += async (s, e) => await Navigation.PopToRootAsync();
+ var grid = new Grid
+ {
+ ColumnDefinitions = { new ColumnDefinition(GridLength.Star), new ColumnDefinition(GridLength.Star) },
+ RowDefinitions = { new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto) },
+ RowSpacing = 4,
+ ColumnSpacing = 4
+ };
+ Grid.SetRow(pushBtn, 0);
+ Grid.SetColumn(pushBtn, 0);
+ Grid.SetRow(popBtn, 0);
+ Grid.SetColumn(popBtn, 1);
+ Grid.SetRow(popToRootBtn, 1);
+ Grid.SetColumn(popToRootBtn, 0);
+ Grid.SetColumnSpan(popToRootBtn, 2);
+ grid.Children.Add(pushBtn);
+ grid.Children.Add(popBtn);
+ grid.Children.Add(popToRootBtn);
+ return grid;
+ }
+ static Grid CreateStackDisplay(Label tabStackLabel, Label navStackLabel)
+ {
+ var grid = new Grid
+ {
+ ColumnDefinitions = { new ColumnDefinition(new GridLength(100)), new ColumnDefinition(GridLength.Star) },
+ RowDefinitions = { new RowDefinition(GridLength.Auto), new RowDefinition(GridLength.Auto) },
+ RowSpacing = 2,
+ ColumnSpacing = 8
+ };
+ var tabLabel = new Label { Text = "TabStack:", FontSize = 12 };
+ Grid.SetRow(tabLabel, 0);
+ Grid.SetColumn(tabLabel, 0);
+ Grid.SetRow(tabStackLabel, 0);
+ Grid.SetColumn(tabStackLabel, 1);
+ var navLabel = new Label { Text = "NavStack:", FontSize = 12 };
+ Grid.SetRow(navLabel, 1);
+ Grid.SetColumn(navLabel, 0);
+ Grid.SetRow(navStackLabel, 1);
+ Grid.SetColumn(navStackLabel, 1);
+ grid.Children.Add(tabLabel);
+ grid.Children.Add(tabStackLabel);
+ grid.Children.Add(navLabel);
+ grid.Children.Add(navStackLabel);
+ return grid;
+ }
+ void UpdateStackLabels(Page page, Label tabStackLabel, Label navStackLabel)
+ {
+ var shell = Shell.Current;
+ var section = shell?.CurrentItem?.CurrentItem;
+ if (section != null)
+ {
+ var rootTitle = (section.CurrentItem?.Content as Page)?.Title ?? "Root";
+ var stack = section.Stack;
+ tabStackLabel.Text = $"Count={stack.Count}: {string.Join(", ", stack.Select(p => p?.Title ?? rootTitle))}";
+ var navStack = page.Navigation.NavigationStack;
+ navStackLabel.Text = $"Count={navStack.Count}: {string.Join(", ", navStack.Select(p => p?.Title ?? rootTitle))}";
+ }
+ else
+ {
+ tabStackLabel.Text = "N/A";
+ navStackLabel.Text = "N/A";
+ }
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellPage/ShellControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellPage/ShellControlPage.xaml
new file mode 100644
index 000000000000..a9f877131b20
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellPage/ShellControlPage.xaml
@@ -0,0 +1,220 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellPage/ShellControlPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellPage/ShellControlPage.xaml.cs
new file mode 100644
index 000000000000..76d9fab2bb31
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellPage/ShellControlPage.xaml.cs
@@ -0,0 +1,203 @@
+using Microsoft.Maui.Controls;
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Maui.Controls.Sample;
+
+public partial class ShellControlPage : Shell
+{
+ private ShellViewModel _viewModel;
+ public ShellContent HomePage => homePage;
+ private const string NotAnimatedRoute = "shell-feature/notanimated";
+ private const string AnimatedRoute = "shell-feature/animated";
+ private const string ModalRoute = "shell-feature/modal";
+ private const string ModalAnimatedRoute = "shell-feature/modalanimated";
+ private const string ModalNotAnimatedRoute = "shell-feature/modalnotanimated";
+
+
+ public ShellControlPage()
+ {
+ InitializeComponent();
+ _viewModel = new ShellViewModel();
+ BindingContext = _viewModel;
+ Routing.RegisterRoute(NotAnimatedRoute, typeof(NotAnimatedPresentationPage));
+ Routing.RegisterRoute(AnimatedRoute, typeof(AnimatedPresentationPage));
+ Routing.RegisterRoute(ModalRoute, typeof(ModalPresentationPage));
+ Routing.RegisterRoute(ModalAnimatedRoute, typeof(ModalAnimatedPresentationPage));
+ Routing.RegisterRoute(ModalNotAnimatedRoute, typeof(ModalNotAnimatedPresentationPage));
+ }
+ async void NavigateToOptionsPage_Clicked(object sender, EventArgs e)
+ {
+ BindingContext = _viewModel = new ShellViewModel();
+ await Navigation.PushAsync(new ShellOptionsPage(_viewModel));
+ }
+ void OnNavBarAnimTrueClicked(object sender, EventArgs e)
+ {
+ Shell.SetNavBarVisibilityAnimationEnabled(this, true);
+ }
+ void OnNavBarAnimFalseClicked(object sender, EventArgs e)
+ {
+ Shell.SetNavBarVisibilityAnimationEnabled(this, false);
+ }
+ void OnNavBarVisibleClicked(object sender, EventArgs e)
+ {
+ Shell.SetNavBarIsVisible(this, true);
+ }
+ void OnNavBarHiddenClicked(object sender, EventArgs e)
+ {
+ Shell.SetNavBarIsVisible(this, false);
+ }
+ void OnNavBarHasShadowTrueClicked(object sender, EventArgs e)
+ {
+ Shell.SetNavBarHasShadow(this, true);
+ }
+ void OnNavBarHasShadowFalseClicked(object sender, EventArgs e)
+ {
+ Shell.SetNavBarHasShadow(this, false);
+ }
+ private async void OnGoToNotAnimated(object sender, EventArgs e)
+ => await Shell.Current.GoToAsync(NotAnimatedRoute);
+
+ private async void OnGoToAnimated(object sender, EventArgs e)
+ => await Shell.Current.GoToAsync(AnimatedRoute);
+
+ private async void OnGoToModal(object sender, EventArgs e)
+ => await Shell.Current.GoToAsync(ModalRoute);
+
+ private async void OnGoToModalAnimated(object sender, EventArgs e)
+ => await Shell.Current.GoToAsync(ModalAnimatedRoute);
+
+ private async void OnGoToModalNotAnimated(object sender, EventArgs e)
+ => await Shell.Current.GoToAsync(ModalNotAnimatedRoute);
+ private async void OnGoToHomeClicked(object sender, EventArgs e)
+ {
+ await Shell.Current.GoToAsync("//home");
+ }
+ private async void OnGoBackClicked(object sender, EventArgs e)
+ {
+ await Shell.Current.GoToAsync("..");
+ }
+ private void SetTitleView()
+ {
+ var grid = new Grid
+ {
+ ColumnDefinitions =
+ {
+ new ColumnDefinition { Width = GridLength.Auto },
+ new ColumnDefinition { Width = GridLength.Auto }
+ },
+ VerticalOptions = LayoutOptions.Center
+ };
+ var image = new Image
+ {
+ Source = "dotnet_bot.png",
+ WidthRequest = 28,
+ HeightRequest = 28,
+ HorizontalOptions = LayoutOptions.Start,
+ VerticalOptions = LayoutOptions.Center
+ };
+
+ var label = new Label
+ {
+ Text = "Shell TitleView",
+ Margin = new Thickness(30, 0, 0, 0),
+ VerticalOptions = LayoutOptions.Center,
+ FontAttributes = FontAttributes.Bold,
+ TextColor = Colors.Black
+ };
+
+ Grid.SetColumn(label, 1);
+
+ grid.Add(image);
+ grid.Add(label);
+
+ Shell.SetTitleView(this, grid);
+ }
+ private void RemoveTitleView()
+ {
+ Shell.SetTitleView(this, null);
+ }
+ private void OnShowTitleViewClicked(object sender, EventArgs e)
+ {
+ SetTitleView();
+ }
+ private void OnHideTitleViewClicked(object sender, EventArgs e)
+ {
+ RemoveTitleView();
+ }
+
+ private abstract class PresentationModePage : ContentPage
+ {
+ protected PresentationModePage(string title, PresentationMode mode)
+ {
+ Title = title;
+ BackgroundColor = Colors.White;
+ Shell.SetPresentationMode(this, mode);
+
+ var backButton = new Button
+ {
+ Text = "Go Back",
+ AutomationId = "GoBackButton",
+ BackgroundColor = Color.FromArgb("F5F5F5"),
+ TextColor = Colors.Black
+ };
+ backButton.Clicked += async (_, __) => await Shell.Current.GoToAsync("..");
+
+ Content = new VerticalStackLayout
+ {
+ Padding = 20,
+ Spacing = 20,
+ VerticalOptions = LayoutOptions.Center,
+ HorizontalOptions = LayoutOptions.Center,
+ Children =
+ {
+ new Label { Text = title, HorizontalOptions = LayoutOptions.Center },
+ backButton
+ }
+ };
+ }
+ }
+
+ private sealed class NotAnimatedPresentationPage : PresentationModePage
+ {
+ public NotAnimatedPresentationPage()
+ : base("NotAnimated Page", PresentationMode.NotAnimated)
+ {
+ }
+ }
+
+ private sealed class AnimatedPresentationPage : PresentationModePage
+ {
+ public AnimatedPresentationPage()
+ : base("Animated Page", PresentationMode.Animated)
+ {
+ }
+ }
+
+ private sealed class ModalPresentationPage : PresentationModePage
+ {
+ public ModalPresentationPage()
+ : base("Modal Page", PresentationMode.Modal)
+ {
+ }
+ }
+
+ private sealed class ModalAnimatedPresentationPage : PresentationModePage
+ {
+ public ModalAnimatedPresentationPage()
+ : base("ModalAnimated Page", PresentationMode.ModalAnimated)
+ {
+ }
+ }
+
+ private sealed class ModalNotAnimatedPresentationPage : PresentationModePage
+ {
+ public ModalNotAnimatedPresentationPage()
+ : base("ModalNotAnimated Page", PresentationMode.ModalNotAnimated)
+ {
+ }
+ }
+
+}
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellPage/ShellOptionsPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellPage/ShellOptionsPage.xaml
new file mode 100644
index 000000000000..bb9b14342d4d
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellPage/ShellOptionsPage.xaml
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellPage/ShellOptionsPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellPage/ShellOptionsPage.xaml.cs
new file mode 100644
index 000000000000..b81921abefea
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellPage/ShellOptionsPage.xaml.cs
@@ -0,0 +1,122 @@
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Graphics;
+using System;
+
+namespace Maui.Controls.Sample
+{
+ public partial class ShellOptionsPage : ContentPage
+ {
+ private readonly ShellViewModel _viewModel;
+
+ public ShellOptionsPage(ShellViewModel viewModel)
+ {
+ InitializeComponent();
+ _viewModel = viewModel;
+ BindingContext = _viewModel;
+ }
+
+ private async void OnApplyClicked(object sender, EventArgs e)
+ {
+ await Navigation.PopAsync();
+ }
+
+ // BackgroundColor
+ void OnBackgroundColorClicked(object sender, EventArgs e)
+ {
+ if (sender is Button button)
+ {
+ _viewModel.BackgroundColor = button.Text switch
+ {
+ "SkyBlue" => Colors.SkyBlue,
+ "LightGreen" => Colors.LightGreen,
+ "White" => Colors.White,
+ _ => _viewModel.BackgroundColor
+ };
+ }
+ }
+
+ // ForegroundColor
+ void OnForegroundColorClicked(object sender, EventArgs e)
+ {
+ if (sender is Button button)
+ {
+ _viewModel.ForegroundColor = button.Text switch
+ {
+ "Brown" => Colors.Brown,
+ "Magenta" => Colors.Magenta,
+ "Purple" => Colors.Purple,
+ _ => _viewModel.ForegroundColor
+ };
+ }
+ }
+
+ // TitleColor
+ void OnTitleColorClicked(object sender, EventArgs e)
+ {
+ if (sender is Button button)
+ {
+ _viewModel.TitleColor = button.Text switch
+ {
+ "Red" => Colors.Red,
+ "Green" => Colors.Green,
+ "Navy" => Colors.Navy,
+ _ => _viewModel.TitleColor
+ };
+ }
+ }
+
+ // DisabledColor
+ void OnDisabledColorClicked(object sender, EventArgs e)
+ {
+ if (sender is Button button)
+ {
+ _viewModel.DisabledColor = button.Text switch
+ {
+ "Gold" => Colors.Gold,
+ "Violet" => Colors.Violet,
+ "Silver" => Colors.Silver,
+ _ => _viewModel.DisabledColor
+ };
+ }
+ }
+
+ // UnselectedColor
+ void OnUnselectedColorClicked(object sender, EventArgs e)
+ {
+ if (sender is Button button)
+ {
+ _viewModel.UnselectedColor = button.Text switch
+ {
+ "Maroon" => Colors.Maroon,
+ "Blue" => Colors.Blue,
+ "Indigo" => Colors.Indigo,
+ _ => _viewModel.UnselectedColor
+ };
+ }
+ }
+ private void OnIsEnabledChanged(object sender, CheckedChangedEventArgs e)
+ {
+ if (sender is RadioButton radioButton && e.Value)
+ {
+ _viewModel.IsEnabled = radioButton.Content.ToString() == "True";
+ }
+ }
+
+ private void OnIsVisibleChanged(object sender, CheckedChangedEventArgs e)
+ {
+ if (sender is RadioButton radioButton && e.Value)
+ {
+ _viewModel.IsVisible = radioButton.Content.ToString() == "True";
+ }
+ }
+
+ private void OnFlowDirectionChanged(object sender, CheckedChangedEventArgs e)
+ {
+ if (sender is RadioButton radioButton && e.Value)
+ {
+ _viewModel.FlowDirection = radioButton.Content?.ToString() == "LTR" ? FlowDirection.LeftToRight : FlowDirection.RightToLeft;
+ }
+ }
+
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellViewModel.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellViewModel.cs
index 212040a7af09..dd2c5728974c 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellViewModel.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Shell/ShellViewModel.cs
@@ -1,6 +1,7 @@
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Runtime.CompilerServices;
+using System.Windows.Input;
using Microsoft.Maui.Controls;
using Microsoft.Maui.Graphics;
@@ -37,8 +38,41 @@ public class ShellViewModel : INotifyPropertyChanged
private Color _tabBarTitleColor;
private Color _tabBarUnselectedColor;
private bool _tabBarIsVisible = true;
+ private string _textOverride = string.Empty;
+ private string _iconOverride = string.Empty;
private bool _isEnabled = true;
private bool _isVisible = true;
+ private string _commandParameter = string.Empty;
+ private string _commandExecuted = string.Empty;
+ private string _currentState = "Not Set";
+ private string _currentPage = "Not Set";
+ private string _currentItem = "Not Set";
+ private string _shellCurrent = "Not Set";
+ private string _navigatingCurrent = string.Empty;
+ private string _navigatingSource = string.Empty;
+ private string _navigatingTarget = string.Empty;
+ private string _navigatingCanCancel = string.Empty;
+ private string _navigatingCancelled = string.Empty;
+ private string _navigatedCurrent = string.Empty;
+ private string _navigatedPrevious = string.Empty;
+ private string _navigatedSource = string.Empty;
+ private string _routeStatus = string.Empty;
+ private bool _cancelNavigation;
+ private bool _enableDeferral;
+ private string _deferralStatus = string.Empty;
+ private string _overrideNavigatingStatus = string.Empty;
+ private string _overrideNavigatedStatus = string.Empty;
+ private string _tabStackInfo = string.Empty;
+ readonly Command
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Slider/SliderOptionsPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Slider/SliderOptionsPage.xaml.cs
index e35f116ca57f..df5162357759 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Slider/SliderOptionsPage.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Slider/SliderOptionsPage.xaml.cs
@@ -100,5 +100,10 @@ private void ThumbImageSourceButton_Clicked(object sender, EventArgs e)
{
_viewModel.ThumbImageSource = "coffee.png";
}
+
+ private void ThumbImageResetButton_Clicked(object sender, EventArgs e)
+ {
+ _viewModel.ThumbImageSource = null;
+ }
}
}
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Stepper/StepperControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Stepper/StepperControlPage.xaml
index b686c52f5a67..355a4a6f35a5 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Stepper/StepperControlPage.xaml
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Stepper/StepperControlPage.xaml
@@ -6,78 +6,121 @@
x:DataType="local:StepperViewModel"
Title="StepperFeature">
-
-
-
+
+
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Stepper/StepperControlPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Stepper/StepperControlPage.xaml.cs
index 9317cece85c3..5cc74230e720 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Stepper/StepperControlPage.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Stepper/StepperControlPage.xaml.cs
@@ -30,6 +30,16 @@ public StepperControlMainPage()
private async void NavigateToOptionsPage_Clicked(object sender, EventArgs e)
{
BindingContext = _viewModel = new StepperViewModel();
+ _viewModel.ValueChangedText = "Not Raised";
await Navigation.PushAsync(new StepperFeaturePage(_viewModel));
}
-}
\ No newline at end of file
+ private void StepperControl_ValueChanged(object sender, ValueChangedEventArgs e)
+ {
+ if (BindingContext is StepperViewModel vm)
+ {
+ vm.ValueChangedText = "Raised";
+ vm.OldValue = e.OldValue;
+ vm.NewValue = e.NewValue;
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Stepper/StepperViewModel.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Stepper/StepperViewModel.cs
index c0a1e027c57d..764f25e516c0 100644
--- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Stepper/StepperViewModel.cs
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Stepper/StepperViewModel.cs
@@ -11,8 +11,12 @@ public class StepperViewModel : INotifyPropertyChanged
private double _value = 0;
private bool _isEnabled = true;
private bool _isVisible = true;
+ private double _oldValue;
+ private double _newValue;
+
private FlowDirection _flowDirection = FlowDirection.LeftToRight;
+
public double Minimum
{
get => _minimum;
@@ -37,6 +41,13 @@ public double Value
set => SetProperty(ref _value, value);
}
+ private string _valueChangedText = "Not Raised";
+ public string ValueChangedText
+ {
+ get => _valueChangedText;
+ set => SetProperty(ref _valueChangedText, value);
+ }
+
public bool IsEnabled
{
get => _isEnabled;
@@ -55,6 +66,19 @@ public FlowDirection FlowDirection
set => SetProperty(ref _flowDirection, value);
}
+ public double OldValue
+ {
+ get => _oldValue;
+ set => SetProperty(ref _oldValue, value);
+ }
+
+ public double NewValue
+ {
+ get => _newValue;
+ set => SetProperty(ref _newValue, value);
+ }
+
+
public event PropertyChangedEventHandler PropertyChanged;
protected void SetProperty(ref T backingStore, T value, [CallerMemberName] string propertyName = "")
@@ -65,4 +89,4 @@ protected void SetProperty(ref T backingStore, T value, [CallerMemberName] st
backingStore = value;
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Triggers/TriggersControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Triggers/TriggersControlPage.xaml
new file mode 100644
index 000000000000..a8bf6b1e5d98
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Triggers/TriggersControlPage.xaml
@@ -0,0 +1,579 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Triggers/TriggersControlPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Triggers/TriggersControlPage.xaml.cs
new file mode 100644
index 000000000000..cb355c08416a
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Triggers/TriggersControlPage.xaml.cs
@@ -0,0 +1,127 @@
+namespace Maui.Controls.Sample;
+
+public class TriggersControlPage : NavigationPage
+{
+ private TriggersViewModel _viewModel;
+
+ public TriggersControlPage()
+ {
+ _viewModel = new TriggersViewModel();
+ PushAsync(new TriggersControlMainPage(_viewModel));
+ }
+}
+
+public partial class TriggersControlMainPage : ContentPage
+{
+ private TriggersViewModel _viewModel;
+ private bool _isReturningFromOptions = false;
+
+ public TriggersControlMainPage(TriggersViewModel viewModel)
+ {
+ InitializeComponent();
+ _viewModel = viewModel;
+ BindingContext = _viewModel;
+
+ // Display platform information
+ UpdatePlatformLabel();
+ // Display orientation information
+ UpdateOrientationLabel();
+ }
+
+ protected override void OnAppearing()
+ {
+ base.OnAppearing();
+
+ // Reset entry values and focus only when returning from options page
+ if (_isReturningFromOptions)
+ {
+ // Reset view model and clear entry focus
+ // OnAppearing is called after the page is visible, so UI is already ready
+ _viewModel.Reset();
+ ClearAndUnfocusAllEntries();
+ _isReturningFromOptions = false;
+ }
+
+ // Update orientation when page appears
+ UpdateOrientationLabel();
+
+ // Subscribe to orientation changes
+ DeviceDisplay.Current.MainDisplayInfoChanged += OnMainDisplayInfoChanged;
+
+ // Re-subscribe to size changes (may have been unsubscribed in OnDisappearing)
+ this.SizeChanged += OnPageSizeChanged;
+ }
+
+ private void ClearAndUnfocusAllEntries()
+ {
+ // Force focus to content page first to ensure entries lose focus
+ this.Focus();
+
+ // Directly clear text and unfocus all entry controls
+ if (propertyTriggerEntry != null)
+ {
+ propertyTriggerEntry.Text = string.Empty;
+ propertyTriggerEntry.Unfocus();
+ }
+ if (dataEntry != null)
+ {
+ dataEntry.Text = string.Empty;
+ dataEntry.Unfocus();
+ }
+ if (numericEntry != null)
+ {
+ numericEntry.Text = string.Empty;
+ numericEntry.Unfocus();
+ }
+ if (emailEntry != null)
+ {
+ emailEntry.Text = string.Empty;
+ emailEntry.Unfocus();
+ }
+ if (phoneEntry != null)
+ {
+ phoneEntry.Text = string.Empty;
+ phoneEntry.Unfocus();
+ }
+ }
+
+ protected override void OnDisappearing()
+ {
+ base.OnDisappearing();
+
+ // Unsubscribe from orientation changes
+ DeviceDisplay.Current.MainDisplayInfoChanged -= OnMainDisplayInfoChanged;
+
+ // Unsubscribe from size changes
+ this.SizeChanged -= OnPageSizeChanged;
+ }
+
+ private void OnPageSizeChanged(object sender, EventArgs e)
+ {
+ // Update window size label for adaptive trigger demo
+ windowSizeLabel.Text = $"Window size: {Width:F0} x {Height:F0} (Width threshold: 600)";
+ }
+
+ private void OnMainDisplayInfoChanged(object sender, DisplayInfoChangedEventArgs e)
+ {
+ // Update orientation label when device orientation changes
+ UpdateOrientationLabel();
+ }
+
+ private void UpdatePlatformLabel()
+ {
+ platformLabel.Text = $"Running on: {DeviceInfo.Platform}";
+ }
+
+ private void UpdateOrientationLabel()
+ {
+ var orientation = DeviceDisplay.Current.MainDisplayInfo.Orientation;
+ orientationLabel.Text = $"Current orientation: {orientation}";
+ }
+
+ private async void NavigateToOptionsPage_Clicked(object sender, EventArgs e)
+ {
+ _isReturningFromOptions = true;
+ await Navigation.PushAsync(new TriggersOptionsPage(_viewModel));
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Triggers/TriggersOptionsPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Triggers/TriggersOptionsPage.xaml
new file mode 100644
index 000000000000..b874394a3dcf
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Triggers/TriggersOptionsPage.xaml
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Triggers/TriggersOptionsPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Triggers/TriggersOptionsPage.xaml.cs
new file mode 100644
index 000000000000..a2c58b1b9ab1
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Triggers/TriggersOptionsPage.xaml.cs
@@ -0,0 +1,29 @@
+namespace Maui.Controls.Sample;
+
+public partial class TriggersOptionsPage : ContentPage
+{
+ private TriggersViewModel _viewModel;
+
+ public TriggersOptionsPage(TriggersViewModel viewModel)
+ {
+ InitializeComponent();
+ _viewModel = viewModel;
+ BindingContext = _viewModel;
+ }
+
+ private void ApplyButton_Clicked(object sender, EventArgs e)
+ {
+ Navigation.PopAsync();
+ }
+
+ private void OnTriggerTypeButtonClicked(object sender, EventArgs e)
+ {
+ if (sender is Button button && button.CommandParameter is string triggerTypeString)
+ {
+ if (Enum.TryParse(triggerTypeString, out var triggerType))
+ {
+ _viewModel.SelectedTriggerType = triggerType;
+ }
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Triggers/TriggersViewModel.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Triggers/TriggersViewModel.cs
new file mode 100644
index 000000000000..2f3f2fffd0e4
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Triggers/TriggersViewModel.cs
@@ -0,0 +1,246 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+
+namespace Maui.Controls.Sample;
+
+public class TriggersViewModel : INotifyPropertyChanged
+{
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ private TriggerType _selectedTriggerType = TriggerType.PropertyTrigger;
+ private bool _isToggled = false;
+ private bool _isChecked = false;
+ private string _dataEntryText = string.Empty;
+ private string _emailEntryText = string.Empty;
+ private string _phoneEntryText = string.Empty;
+
+ public TriggerType SelectedTriggerType
+ {
+ get => _selectedTriggerType;
+ set
+ {
+ if (_selectedTriggerType != value)
+ {
+ _selectedTriggerType = value;
+ OnPropertyChanged();
+ OnPropertyChanged(nameof(ShowPropertyTrigger));
+ OnPropertyChanged(nameof(ShowDataTrigger));
+ OnPropertyChanged(nameof(ShowEventTrigger));
+ OnPropertyChanged(nameof(ShowMultiTrigger));
+ OnPropertyChanged(nameof(ShowEnterExitActions));
+ OnPropertyChanged(nameof(ShowStateTrigger));
+ OnPropertyChanged(nameof(ShowAdaptiveTrigger));
+ OnPropertyChanged(nameof(ShowCompareStateTrigger));
+ OnPropertyChanged(nameof(ShowDeviceStateTrigger));
+ OnPropertyChanged(nameof(ShowOrientationStateTrigger));
+ }
+ }
+ }
+
+ public bool IsToggled
+ {
+ get => _isToggled;
+ set
+ {
+ if (_isToggled != value)
+ {
+ _isToggled = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+
+ public bool IsChecked
+ {
+ get => _isChecked;
+ set
+ {
+ if (_isChecked != value)
+ {
+ _isChecked = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+
+ public string DataEntryText
+ {
+ get => _dataEntryText;
+ set
+ {
+ if (_dataEntryText != value)
+ {
+ _dataEntryText = value;
+ OnPropertyChanged();
+ OnPropertyChanged(nameof(IsSaveButtonEnabled));
+ }
+ }
+ }
+
+ public string EmailEntryText
+ {
+ get => _emailEntryText;
+ set
+ {
+ if (_emailEntryText != value)
+ {
+ _emailEntryText = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+
+ public string PhoneEntryText
+ {
+ get => _phoneEntryText;
+ set
+ {
+ if (_phoneEntryText != value)
+ {
+ _phoneEntryText = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+
+ public bool IsSaveButtonEnabled => !string.IsNullOrEmpty(DataEntryText);
+ public bool ShowPropertyTrigger => SelectedTriggerType == TriggerType.PropertyTrigger;
+ public bool ShowDataTrigger => SelectedTriggerType == TriggerType.DataTrigger;
+ public bool ShowEventTrigger => SelectedTriggerType == TriggerType.EventTrigger;
+ public bool ShowMultiTrigger => SelectedTriggerType == TriggerType.MultiTrigger;
+ public bool ShowEnterExitActions => SelectedTriggerType == TriggerType.EnterExitActions;
+ public bool ShowStateTrigger => SelectedTriggerType == TriggerType.StateTrigger;
+ public bool ShowAdaptiveTrigger => SelectedTriggerType == TriggerType.AdaptiveTrigger;
+ public bool ShowCompareStateTrigger => SelectedTriggerType == TriggerType.CompareStateTrigger;
+ public bool ShowDeviceStateTrigger => SelectedTriggerType == TriggerType.DeviceStateTrigger;
+ public bool ShowOrientationStateTrigger => SelectedTriggerType == TriggerType.OrientationStateTrigger;
+
+ public void Reset()
+ {
+ IsToggled = false;
+ IsChecked = false;
+ DataEntryText = string.Empty;
+ EmailEntryText = string.Empty;
+ PhoneEntryText = string.Empty;
+ }
+
+ protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
+ {
+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+ }
+}
+
+public enum TriggerType
+{
+ PropertyTrigger,
+ DataTrigger,
+ EventTrigger,
+ MultiTrigger,
+ EnterExitActions,
+ StateTrigger,
+ AdaptiveTrigger,
+ CompareStateTrigger,
+ DeviceStateTrigger,
+ OrientationStateTrigger
+}
+
+///
+/// Trigger action that performs a fade animation on visual elements
+///
+public class FadeTriggerAction : TriggerAction
+{
+ public int StartsFrom { get; set; }
+
+ protected override void Invoke(VisualElement sender)
+ {
+ sender.Animate("FadeTriggerAction", new Animation((d) =>
+ {
+ var val = StartsFrom == 1 ? d : 1 - d;
+ sender.BackgroundColor = Color.FromRgb(1, val, 1);
+ }),
+ length: 1000, // milliseconds
+ easing: Easing.Linear);
+ }
+}
+
+///
+/// Trigger action that validates numeric input and changes text color based on validity
+///
+public class NumericValidationTriggerAction : TriggerAction
+{
+ protected override void Invoke(Entry entry)
+ {
+ double result;
+ bool isValid = double.TryParse(entry.Text, out result);
+ entry.TextColor = isValid ? Colors.Black : Colors.Red;
+ entry.BackgroundColor = isValid ? Colors.SkyBlue : Colors.Yellow;
+ }
+}
+
+///
+/// Value converter that inverts a boolean value
+///
+public class InverseBooleanConverter : IValueConverter
+{
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ if (value is bool boolValue)
+ {
+ return !boolValue;
+ }
+ return false;
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ if (value is bool boolValue)
+ {
+ return !boolValue;
+ }
+ return false;
+ }
+}
+
+///
+/// Value converter that returns true if a string is not null or empty
+///
+public class StringNotNullOrEmptyConverter : IValueConverter
+{
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ return !string.IsNullOrEmpty(value as string);
+ }
+
+ ///
+ /// Two-way binding is not supported. Returns as a default.
+ ///
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ return Binding.DoNothing;
+ }
+}
+
+///
+/// Value converter that returns the length of a string
+///
+public class StringLengthConverter : IValueConverter
+{
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ if (value is string text)
+ {
+ return text.Length;
+ }
+ return 0;
+ }
+
+ ///
+ /// Two-way binding is not supported. Returns as a default.
+ ///
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ return Binding.DoNothing;
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMButton/VisualStateManagerButtonPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMButton/VisualStateManagerButtonPage.xaml
new file mode 100644
index 000000000000..4ed6751ea722
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMButton/VisualStateManagerButtonPage.xaml
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMButton/VisualStateManagerButtonPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMButton/VisualStateManagerButtonPage.xaml.cs
new file mode 100644
index 000000000000..a81ada579092
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMButton/VisualStateManagerButtonPage.xaml.cs
@@ -0,0 +1,83 @@
+namespace Maui.Controls.Sample;
+
+public partial class VisualStateManagerButtonPage : ContentPage
+{
+ public VisualStateManagerButtonPage()
+ {
+ InitializeComponent();
+ VisualStateManager.GoToState(DemoButton, "Normal");
+ }
+
+ void OnDemoButtonPressed(object sender, EventArgs e)
+ {
+ if (!DemoButton.IsEnabled)
+ return;
+ VisualStateManager.GoToState(DemoButton, "Pressed");
+ StateLabel.Text = "State: Pressed";
+ DemoButton.Text = "Pressed";
+ }
+
+ void OnDemoButtonReleased(object sender, EventArgs e)
+ {
+ if (!DemoButton.IsEnabled)
+ return;
+ VisualStateManager.GoToState(DemoButton, "Normal");
+ StateLabel.Text = "State: Normal/Released";
+ DemoButton.Text = "Normal/Released";
+ }
+
+ void OnToggleButtonDisabled(object sender, EventArgs e)
+ {
+ DemoButton.IsEnabled = !DemoButton.IsEnabled;
+ ButtonDisableButton.Text = DemoButton.IsEnabled ? "Disable" : "Enable";
+ if (!DemoButton.IsEnabled)
+ {
+ VisualStateManager.GoToState(DemoButton, "Disabled");
+ StateLabel.Text = "State: Disabled";
+ DemoButton.Text = "Disabled";
+ }
+ else
+ {
+ VisualStateManager.GoToState(DemoButton, "Normal");
+ StateLabel.Text = "State: Normal";
+ DemoButton.Text = "Normal";
+ }
+ }
+
+ void OnResetButtonState(object sender, EventArgs e)
+ {
+ DemoButton.IsEnabled = true;
+ VisualStateManager.GoToState(DemoButton, "Normal");
+ ButtonDisableButton.Text = "Disable";
+ StateLabel.Text = "State: Normal";
+ DemoButton.Text = "Press Me";
+ }
+
+ void OnDemoButtonPointerEntered(object sender, PointerEventArgs e)
+ {
+ if (!DemoButton.IsEnabled)
+ return;
+ VisualStateManager.GoToState(DemoButton, "PointerOver");
+ StateLabel.Text = "State: PointerOver Enter";
+ DemoButton.Text = "PointerOver Enter";
+ }
+
+ void OnDemoButtonPointerExited(object sender, PointerEventArgs e)
+ {
+ if (!DemoButton.IsEnabled)
+ return;
+ VisualStateManager.GoToState(DemoButton, "Normal");
+ StateLabel.Text = "State: PointerOver Exit";
+ DemoButton.Text = "PointerOver Exit";
+ }
+
+ void OnButtonFocused(object sender, FocusEventArgs e)
+ {
+ if (!DemoButton.IsEnabled)
+ return;
+ VisualStateManager.GoToState(DemoButton, "Focused");
+ StateLabel.Text = "State: Focused";
+ DemoButton.Text = "Focused";
+ }
+}
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMCheckBox/VisualStateManagerCheckBoxPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMCheckBox/VisualStateManagerCheckBoxPage.xaml
new file mode 100644
index 000000000000..936550847517
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMCheckBox/VisualStateManagerCheckBoxPage.xaml
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMCheckBox/VisualStateManagerCheckBoxPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMCheckBox/VisualStateManagerCheckBoxPage.xaml.cs
new file mode 100644
index 000000000000..8dc63932e476
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMCheckBox/VisualStateManagerCheckBoxPage.xaml.cs
@@ -0,0 +1,51 @@
+namespace Maui.Controls.Sample;
+
+public partial class VisualStateManagerCheckBoxPage : ContentPage
+{
+ public VisualStateManagerCheckBoxPage()
+ {
+ InitializeComponent();
+ VisualStateManager.GoToState(VSMCheckBox, "Normal");
+ CheckBoxState.Text = "State: Normal";
+ }
+
+ void OnCheckBoxCheckedChanged(object sender, CheckedChangedEventArgs e)
+ {
+ if (!VSMCheckBox.IsEnabled)
+ {
+ CheckBoxState.Text = "State: Disabled";
+ return;
+ }
+
+ var state = e.Value ? "Checked" : "Unchecked";
+ VisualStateManager.GoToState(VSMCheckBox, state);
+ CheckBoxState.Text = $"State: {state}";
+ }
+
+ void OnToggleCheckBoxDisabled(object sender, EventArgs e)
+ {
+ VSMCheckBox.IsEnabled = !VSMCheckBox.IsEnabled;
+ CheckBoxDisableButton.Text = VSMCheckBox.IsEnabled ? "Disable" : "Enable";
+ if (!VSMCheckBox.IsEnabled)
+ {
+ VisualStateManager.GoToState(VSMCheckBox, "Disabled");
+ CheckBoxState.Text = "State: Disabled";
+ }
+ else
+ {
+ var state = VSMCheckBox.IsChecked ? "Checked" : "Unchecked";
+ VisualStateManager.GoToState(VSMCheckBox, state);
+ CheckBoxState.Text = $"State: {state}";
+ }
+ }
+
+ void OnResetCheckBox(object sender, EventArgs e)
+ {
+ VSMCheckBox.IsEnabled = true;
+ VSMCheckBox.IsChecked = false;
+ CheckBoxDisableButton.Text = "Disable";
+ VisualStateManager.GoToState(VSMCheckBox, "Normal");
+ CheckBoxState.Text = "State: Normal";
+ }
+}
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMCollectionViewPage/VSMCollectionViewViewModel.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMCollectionViewPage/VSMCollectionViewViewModel.cs
new file mode 100644
index 000000000000..89986fae6308
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMCollectionViewPage/VSMCollectionViewViewModel.cs
@@ -0,0 +1,28 @@
+using System.Collections.ObjectModel;
+
+namespace Maui.Controls.Sample;
+
+public class VSMCollectionViewItem
+{
+ public string Name { get; set; } = string.Empty;
+}
+
+public class VSMCollectionViewViewModel
+{
+ public ObservableCollection Items { get; }
+
+ public VSMCollectionViewViewModel()
+ {
+ Items = new ObservableCollection
+ {
+ new VSMCollectionViewItem { Name = "Banana" },
+ new VSMCollectionViewItem { Name = "Cherry" },
+ new VSMCollectionViewItem { Name = "Date" },
+ new VSMCollectionViewItem { Name = "Elderberry" },
+ new VSMCollectionViewItem { Name = "Fig" },
+ new VSMCollectionViewItem { Name = "Grape" },
+ new VSMCollectionViewItem { Name = "Honeydew" }
+ };
+ }
+}
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMCollectionViewPage/VisualStateManagerCollectionViewPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMCollectionViewPage/VisualStateManagerCollectionViewPage.xaml
new file mode 100644
index 000000000000..9837805f4529
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMCollectionViewPage/VisualStateManagerCollectionViewPage.xaml
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMCollectionViewPage/VisualStateManagerCollectionViewPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMCollectionViewPage/VisualStateManagerCollectionViewPage.xaml.cs
new file mode 100644
index 000000000000..673992f896d3
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMCollectionViewPage/VisualStateManagerCollectionViewPage.xaml.cs
@@ -0,0 +1,140 @@
+using System.Collections.ObjectModel;
+
+namespace Maui.Controls.Sample;
+
+public partial class VisualStateManagerCollectionViewPage : ContentPage
+{
+ private readonly VSMCollectionViewViewModel _viewModel;
+ public VisualStateManagerCollectionViewPage()
+ {
+ InitializeComponent();
+ _viewModel = new VSMCollectionViewViewModel();
+ BindingContext = _viewModel;
+ }
+
+ void OnCollectionSelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+ if (!MyCollectionView.IsEnabled)
+ {
+ CVState.Text = "State: Disabled";
+ return;
+ }
+
+ var hasSelection = e.CurrentSelection != null && e.CurrentSelection.Count > 0;
+ VisualStateManager.GoToState(MyCollectionView, hasSelection ? "Selected" : "Normal");
+ CVState.Text = hasSelection ? $"State: Selected ({e.CurrentSelection.Count})" : "State: Normal";
+ }
+
+ void OnToggleCollectionViewDisabled(object sender, EventArgs e)
+ {
+ MyCollectionView.IsEnabled = !MyCollectionView.IsEnabled;
+ CVToggleButton?.Text = MyCollectionView.IsEnabled ? "Disable" : "Enable";
+ CVState.Text = MyCollectionView.IsEnabled
+ ? (GetSelectedCount() > 0 ? $"State: Selected ({GetSelectedCount()})" : "State: Normal")
+ : "State: Disabled";
+ }
+
+ void OnResetCollectionView(object sender, EventArgs e)
+ {
+ MyCollectionView.IsEnabled = true;
+ MyCollectionView.SelectedItem = null;
+ if (MyCollectionView.SelectionMode == SelectionMode.Multiple)
+ {
+ MyCollectionView.SelectedItems?.Clear();
+ }
+ CVToggleButton.Text = "Disable";
+ VisualStateManager.GoToState(MyCollectionView, "Normal");
+ CVState.Text = "State: Normal";
+ }
+
+ void OnItemPointerEntered(object sender, PointerEventArgs e)
+ {
+ if (!MyCollectionView.IsEnabled)
+ {
+ CVState.Text = "State: Disabled";
+ return;
+ }
+
+ if (sender is VisualElement ve)
+ {
+ VisualStateManager.GoToState(ve, "PointerOver");
+ CVState.Text = "State: PointerOver";
+ }
+ }
+
+ void OnItemPointerExited(object sender, PointerEventArgs e)
+ {
+ if (!MyCollectionView.IsEnabled)
+ {
+ CVState.Text = "State: Disabled";
+ return;
+ }
+
+ if (sender is VisualElement ve)
+ {
+ var bc = ve.BindingContext;
+ var isSelected = IsItemSelected(bc);
+ VisualStateManager.GoToState(ve, isSelected ? "Selected" : "Normal");
+ CVState.Text = GetSelectedCount() > 0 ? $"State: Selected ({GetSelectedCount()})" : "State: Normal";
+ }
+ }
+
+ int GetSelectedCount()
+ {
+ if (MyCollectionView.SelectionMode == SelectionMode.Multiple)
+ return MyCollectionView.SelectedItems?.Count ?? 0;
+ return MyCollectionView.SelectedItem != null ? 1 : 0;
+ }
+
+ bool IsItemSelected(object item)
+ {
+ if (item is null)
+ return false;
+ if (MyCollectionView.SelectionMode == SelectionMode.Multiple)
+ return MyCollectionView.SelectedItems?.Contains(item) == true;
+ return Equals(MyCollectionView.SelectedItem, item);
+
+ }
+
+ void OnSelectItem(object sender, EventArgs e)
+ {
+ if (!MyCollectionView.IsEnabled)
+ {
+ CVState.Text = "State: Disabled";
+ return;
+ }
+ if (_viewModel.Items is ObservableCollection items && items.Count > 0)
+ {
+ if (MyCollectionView.SelectionMode == SelectionMode.Multiple)
+ {
+ if (MyCollectionView.SelectedItems?.Contains(items[0]) != true)
+ {
+ MyCollectionView.SelectedItems?.Add(items[0]);
+ }
+ }
+ else
+ {
+ MyCollectionView.SelectedItem = items[0];
+ }
+ }
+ VisualStateManager.GoToState(MyCollectionView, "Selected");
+ CVState.Text = $"State: Selected ({GetSelectedCount()})";
+ }
+
+ void OnSetNormal(object sender, EventArgs e)
+ {
+ if(!MyCollectionView.IsEnabled)
+ {
+ CVState.Text = "State: Disabled";
+ return;
+ }
+ MyCollectionView.SelectedItem = null;
+ if (MyCollectionView.SelectionMode == SelectionMode.Multiple)
+ {
+ MyCollectionView.SelectedItems?.Clear();
+ }
+ VisualStateManager.GoToState(MyCollectionView, "Normal");
+ CVState.Text = "State: Normal/Unselected";
+ }
+}
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMEntry/VisualStateManagerEntryPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMEntry/VisualStateManagerEntryPage.xaml
new file mode 100644
index 000000000000..58704606962a
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMEntry/VisualStateManagerEntryPage.xaml
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMEntry/VisualStateManagerEntryPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMEntry/VisualStateManagerEntryPage.xaml.cs
new file mode 100644
index 000000000000..0be6ddbc6287
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMEntry/VisualStateManagerEntryPage.xaml.cs
@@ -0,0 +1,131 @@
+using System.Text.RegularExpressions;
+
+namespace Maui.Controls.Sample;
+
+public partial class VisualStateManagerEntryPage : ContentPage
+{
+ bool _completedFired;
+
+ public VisualStateManagerEntryPage()
+ {
+ InitializeComponent();
+
+ VisualStateManager.GoToState(VSMEntry, "Normal");
+ VisualStateManager.GoToState(ValidationEntry, "Invalid");
+ }
+
+ void OnFocusEntry(object sender, EventArgs e)
+ {
+ if (!VSMEntry.IsEnabled)
+ return;
+ VisualStateManager.GoToState(VSMEntry, "Focused");
+ StateEntryLabel.Text = "State: Focused";
+ VSMEntry.Focus();
+ }
+
+ void OnNormalEntry(object sender, EventArgs e)
+ {
+ if (!VSMEntry.IsEnabled)
+ return;
+ VisualStateManager.GoToState(VSMEntry, "Normal");
+ StateEntryLabel.Text = "State: Normal/Unfocused";
+ VSMEntry.Unfocus();
+ }
+
+ void OnEntryDisabled(object sender, EventArgs e)
+ {
+ VSMEntry.IsEnabled = !VSMEntry.IsEnabled;
+ DisableEntryButton.Text = VSMEntry.IsEnabled ? "Disable" : "Enable";
+
+ if (!VSMEntry.IsEnabled)
+ {
+ VisualStateManager.GoToState(VSMEntry, "Disabled");
+ StateEntryLabel.Text = "State: Disabled";
+ }
+ else
+ {
+ VisualStateManager.GoToState(VSMEntry, "Normal");
+ StateEntryLabel.Text = "State: Normal";
+ }
+ }
+
+ void OnEntryCompleted(object sender, EventArgs e)
+ {
+ if (!VSMEntry.IsEnabled)
+ return;
+ _completedFired = true;
+ VisualStateManager.GoToState(VSMEntry, "Completed");
+ StateEntryLabel.Text = "State: Completed";
+ }
+
+ void OnEntryFocused(object sender, FocusEventArgs e)
+ {
+ if (!VSMEntry.IsEnabled)
+ return;
+ VSMEntry.Focus();
+ VisualStateManager.GoToState(VSMEntry, "Focused");
+ StateEntryLabel.Text = "State: Focused";
+ }
+
+ void OnEntryUnfocused(object sender, FocusEventArgs e)
+ {
+ if (_completedFired)
+ {
+ _completedFired = false;
+ return;
+ }
+
+ if (VSMEntry.IsEnabled)
+ {
+ VisualStateManager.GoToState(VSMEntry, "Normal");
+ VSMEntry.Unfocus();
+ StateEntryLabel.Text = "State: Normal/Unfocused";
+ }
+ }
+
+ void OnResetEntry(object sender, EventArgs e)
+ {
+ _completedFired = false;
+ VSMEntry.IsEnabled = true;
+ DisableEntryButton.Text = "Disable";
+ VisualStateManager.GoToState(VSMEntry, "Normal");
+ StateEntryLabel.Text = "State: Normal";
+ VSMEntry.Text = string.Empty;
+ }
+
+ // ---------------- Entry2 (Valid / Invalid) ----------------
+ void OnValidationEntryTextChanged(object sender, TextChangedEventArgs e)
+ {
+ ValidateEntryText(e.NewTextValue);
+ }
+
+ void OnValidateEntry(object sender, EventArgs e)
+ {
+ ValidateEntryText(ValidationEntry.Text);
+ }
+
+ void OnValidateEntryReset(object sender, EventArgs e)
+ {
+ ValidationEntry.Text = string.Empty;
+ VisualStateManager.GoToState(ValidationEntry, "Invalid");
+ ValidationEntryLabel.Text = "State: Invalid";
+ }
+
+ void ValidateEntryText(string text)
+ {
+ bool isValid = Regex.IsMatch(text ?? string.Empty,
+ @"^[2-9]\d{2}-\d{3}-\d{4}$");
+
+ if (isValid)
+ {
+ VisualStateManager.GoToState(ValidationEntry, "Valid");
+ ValidationEntryLabel.Text = "State: Valid";
+ }
+ else
+ {
+ VisualStateManager.GoToState(ValidationEntry, "Invalid");
+ ValidationEntryLabel.Text = "State: Invalid";
+ }
+ }
+}
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMLabel/VisualStateManagerLabelPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMLabel/VisualStateManagerLabelPage.xaml
new file mode 100644
index 000000000000..16a2322ed073
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMLabel/VisualStateManagerLabelPage.xaml
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMLabel/VisualStateManagerLabelPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMLabel/VisualStateManagerLabelPage.xaml.cs
new file mode 100644
index 000000000000..c95f13f0f3ac
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMLabel/VisualStateManagerLabelPage.xaml.cs
@@ -0,0 +1,50 @@
+namespace Maui.Controls.Sample;
+
+public partial class VisualStateManagerLabelPage : ContentPage
+{
+ bool _labelSelected;
+ bool _labelDisabled;
+
+ public VisualStateManagerLabelPage()
+ {
+ InitializeComponent();
+ VisualStateManager.GoToState(SelectableLabelContainer, "Normal");
+ }
+ void OnToggleLabelSelected(object sender, EventArgs e)
+ {
+ if (_labelDisabled)
+ return;
+ _labelSelected = !_labelSelected;
+ var state = _labelSelected ? "Selected" : "Normal";
+ VisualStateManager.GoToState(SelectableLabelContainer, state);
+ LabelState.Text = $"State: {state}";
+ }
+
+ void OnToggleLabelDisabled(object sender, EventArgs e)
+ {
+ _labelDisabled = !_labelDisabled;
+ string state;
+ LabelDisableButton.Text = _labelDisabled ? "Enable" : "Disable";
+ if (_labelDisabled)
+ {
+ state = "Disabled";
+ VisualStateManager.GoToState(SelectableLabelContainer, state);
+ }
+ else
+ {
+ state = _labelSelected ? "Selected" : "Normal";
+ VisualStateManager.GoToState(SelectableLabelContainer, state);
+ }
+ LabelState.Text = $"State: {state}";
+ }
+
+ void OnResetLabel(object sender, EventArgs e)
+ {
+ _labelSelected = false;
+ _labelDisabled = false;
+ LabelDisableButton.Text = "Disable";
+ VisualStateManager.GoToState(SelectableLabelContainer, "Normal");
+ LabelState.Text = "State: Normal";
+ }
+}
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMSlider/VisualStateManagerSliderPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMSlider/VisualStateManagerSliderPage.xaml
new file mode 100644
index 000000000000..c58aa7bf49c9
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMSlider/VisualStateManagerSliderPage.xaml
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMSlider/VisualStateManagerSliderPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMSlider/VisualStateManagerSliderPage.xaml.cs
new file mode 100644
index 000000000000..5c7bbefa1022
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMSlider/VisualStateManagerSliderPage.xaml.cs
@@ -0,0 +1,94 @@
+namespace Maui.Controls.Sample;
+
+public partial class VisualStateManagerSliderPage : ContentPage
+{
+ bool _isResetting = false;
+
+ public VisualStateManagerSliderPage()
+ {
+ InitializeComponent();
+ VisualStateManager.GoToState(VSMSlider, "Normal");
+ }
+
+ void OnFocusSlider(object sender, EventArgs e)
+ {
+ if (!VSMSlider.IsEnabled)
+ return;
+ if (!VSMSlider.IsFocused)
+ {
+ VSMSlider.Focus();
+ VisualStateManager.GoToState(VSMSlider, "Focused");
+ VSMSlider.Value = 65;
+ SliderState.Text = $"State: Focused | Value: {VSMSlider.Value:0}";
+ }
+ }
+
+ void OnUnfocusSlider(object sender, EventArgs e)
+ {
+ if (!VSMSlider.IsEnabled)
+ return;
+
+ VSMSlider.Unfocus();
+ VisualStateManager.GoToState(VSMSlider, "Normal");
+ SliderState.Text = $"State: Normal/Unfocused | Value: {VSMSlider.Value:0}";
+ }
+
+ void OnToggleSliderDisabled(object sender, EventArgs e)
+ {
+ VSMSlider.IsEnabled = !VSMSlider.IsEnabled;
+ SliderDisableButton.Text = VSMSlider.IsEnabled ? "Disable" : "Enable";
+ if (!VSMSlider.IsEnabled)
+ {
+ VisualStateManager.GoToState(VSMSlider, "Disabled");
+ SliderState.Text = $"State: Disabled | Value: {VSMSlider.Value:0}";
+ }
+ else
+ {
+ VisualStateManager.GoToState(VSMSlider, "Normal");
+ SliderState.Text = $"State: Normal | Value: {VSMSlider.Value:0}";
+ }
+ }
+
+ void OnResetSlider(object sender, EventArgs e)
+ {
+ _isResetting = true;
+ VSMSlider.IsEnabled = true;
+ SliderDisableButton.Text = "Disable";
+ VSMSlider.Value = 50;
+ VisualStateManager.GoToState(VSMSlider, "Normal");
+ SliderState.Text = $"State: Normal | Value: {VSMSlider.Value:0}";
+ _isResetting = false;
+ }
+
+ void OnSliderFocused(object sender, FocusEventArgs e)
+ {
+ VSMSlider.Focus();
+ VisualStateManager.GoToState(VSMSlider, "Focused");
+ SliderState.Text = $"State: Focused | Value: {VSMSlider.Value:0}";
+ }
+
+ void OnSliderUnfocused(object sender, FocusEventArgs e)
+ {
+ VisualStateManager.GoToState(VSMSlider, "Normal");
+ SliderState.Text = $"State: Normal/Unfocused | Value: {VSMSlider.Value:0}";
+ }
+
+ void OnSliderValueChanged(object sender, ValueChangedEventArgs e)
+ {
+ if (_isResetting)
+ {
+ VisualStateManager.GoToState(VSMSlider, "Normal");
+ SliderState.Text = $"State: Normal | Value: {e.NewValue:0}";
+ return;
+ }
+ if (!VSMSlider.IsEnabled)
+ {
+ VisualStateManager.GoToState(VSMSlider, "Disabled");
+ SliderState.Text = $"State: Disabled | Value: {e.NewValue:0}";
+ return;
+ }
+ VisualStateManager.GoToState(VSMSlider, "Focused");
+ SliderState.Text = $"State: Focused | Value: {e.NewValue:0}";
+ }
+}
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMSwitch/VisualStateManagerSwitchPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMSwitch/VisualStateManagerSwitchPage.xaml
new file mode 100644
index 000000000000..a031bb2ff956
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMSwitch/VisualStateManagerSwitchPage.xaml
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMSwitch/VisualStateManagerSwitchPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMSwitch/VisualStateManagerSwitchPage.xaml.cs
new file mode 100644
index 000000000000..a58e4caa96ba
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VSMSwitch/VisualStateManagerSwitchPage.xaml.cs
@@ -0,0 +1,48 @@
+namespace Maui.Controls.Sample;
+
+public partial class VisualStateManagerSwitchPage : ContentPage
+{
+ public VisualStateManagerSwitchPage()
+ {
+ InitializeComponent();
+ VisualStateManager.GoToState(VSMSwitch, "Normal");
+ }
+
+ void OnSwitchToggled(object sender, ToggledEventArgs e)
+ {
+ if (!VSMSwitch.IsEnabled)
+ {
+ SwitchState.Text = "State: Disabled";
+ return;
+ }
+ var state = e.Value ? "On" : "Off";
+ VisualStateManager.GoToState(VSMSwitch, state);
+ SwitchState.Text = $"State: {state}";
+ }
+
+ void OnToggleSwitchDisabled(object sender, EventArgs e)
+ {
+ VSMSwitch.IsEnabled = !VSMSwitch.IsEnabled;
+ SwitchDisableButton.Text = VSMSwitch.IsEnabled ? "Disable" : "Enable";
+ if (!VSMSwitch.IsEnabled)
+ {
+ VisualStateManager.GoToState(VSMSwitch, "Disabled");
+ SwitchState.Text = "State: Disabled";
+ }
+ else
+ {
+ var state = VSMSwitch.IsToggled ? "On" : "Off";
+ VisualStateManager.GoToState(VSMSwitch, state);
+ SwitchState.Text = $"State: {state}";
+ }
+ }
+
+ void OnResetSwitch(object sender, EventArgs e)
+ {
+ VSMSwitch.IsEnabled = true;
+ SwitchDisableButton.Text = "Disable";
+ VisualStateManager.GoToState(VSMSwitch, "Normal");
+ VSMSwitch.IsToggled = false;
+ SwitchState.Text = "State: Normal";
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VisualStateManagerFeaturePage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VisualStateManagerFeaturePage.xaml
new file mode 100644
index 000000000000..d91ba3a66c0e
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VisualStateManagerFeaturePage.xaml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VisualStateManagerFeaturePage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VisualStateManagerFeaturePage.xaml.cs
new file mode 100644
index 000000000000..744ebcadcf6e
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualStateManager/VisualStateManagerFeaturePage.xaml.cs
@@ -0,0 +1,52 @@
+namespace Maui.Controls.Sample;
+
+public class VisualStateManagerFeaturePage : NavigationPage
+{
+ public VisualStateManagerFeaturePage()
+ {
+ PushAsync(new VisualStateManagerFeatureMainPage());
+ }
+}
+public partial class VisualStateManagerFeatureMainPage : ContentPage
+{
+ public VisualStateManagerFeatureMainPage()
+ {
+ InitializeComponent();
+ }
+
+ private async void OnVSMButtonClicked (object sender, EventArgs e)
+ {
+ await Navigation.PushAsync(new VisualStateManagerButtonPage ());
+ }
+
+ private async void OnVSMCheckBoxClicked (object sender, EventArgs e)
+ {
+ await Navigation.PushAsync(new VisualStateManagerCheckBoxPage ());
+ }
+
+ private async void OnVSMCollectionViewClicked (object sender, EventArgs e)
+ {
+ await Navigation.PushAsync(new VisualStateManagerCollectionViewPage ());
+ }
+
+ private async void OnVSMEntryClicked (object sender, EventArgs e)
+ {
+ await Navigation.PushAsync(new VisualStateManagerEntryPage ());
+ }
+
+ private async void OnVSMLabelClicked (object sender, EventArgs e)
+ {
+ await Navigation.PushAsync(new VisualStateManagerLabelPage ());
+ }
+
+ private async void OnVSMSliderClicked (object sender, EventArgs e)
+ {
+ await Navigation.PushAsync(new VisualStateManagerSliderPage ());
+ }
+
+ private async void OnVSMSwitchClicked (object sender, EventArgs e)
+ {
+ await Navigation.PushAsync(new VisualStateManagerSwitchPage ());
+ }
+}
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualTransform/VisualTransformControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualTransform/VisualTransformControlPage.xaml
new file mode 100644
index 000000000000..e496e108fafd
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualTransform/VisualTransformControlPage.xaml
@@ -0,0 +1,146 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualTransform/VisualTransformControlPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualTransform/VisualTransformControlPage.xaml.cs
new file mode 100644
index 000000000000..79167725c0aa
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualTransform/VisualTransformControlPage.xaml.cs
@@ -0,0 +1,30 @@
+namespace Maui.Controls.Sample;
+
+public partial class VisualTransformControlPage : NavigationPage
+{
+
+ private VisualTransformViewModel _viewModel;
+
+ public VisualTransformControlPage()
+ {
+ _viewModel = new VisualTransformViewModel();
+ PushAsync(new VisualTransformControlMainPage(_viewModel));
+ }
+}
+
+public partial class VisualTransformControlMainPage : ContentPage
+{
+ private VisualTransformViewModel _viewModel;
+
+ public VisualTransformControlMainPage(VisualTransformViewModel viewModel)
+ {
+ InitializeComponent();
+ _viewModel = viewModel;
+ BindingContext = _viewModel;
+ }
+
+ private async void NavigateToOptionsPage_Clicked(object sender, EventArgs e)
+ {
+ await Navigation.PushAsync(new VisualTransformOptionsPage(_viewModel));
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualTransform/VisualTransformOptionsPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualTransform/VisualTransformOptionsPage.xaml
new file mode 100644
index 000000000000..b221efae5a23
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualTransform/VisualTransformOptionsPage.xaml
@@ -0,0 +1,247 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualTransform/VisualTransformOptionsPage.xaml.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualTransform/VisualTransformOptionsPage.xaml.cs
new file mode 100644
index 000000000000..6d14a44eb14e
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualTransform/VisualTransformOptionsPage.xaml.cs
@@ -0,0 +1,21 @@
+namespace Maui.Controls.Sample
+{
+ public partial class VisualTransformOptionsPage : ContentPage
+ {
+ private VisualTransformViewModel _viewModel;
+
+ public VisualTransformOptionsPage(VisualTransformViewModel viewModel)
+ {
+ InitializeComponent();
+ _viewModel = viewModel;
+ BindingContext = _viewModel;
+ }
+
+ private void ApplyButton_Clicked(object sender, EventArgs e)
+ {
+ Navigation.PopAsync();
+ }
+
+
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualTransform/VisualTransformViewModel.cs b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualTransform/VisualTransformViewModel.cs
new file mode 100644
index 000000000000..3189afbccb46
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/VisualTransform/VisualTransformViewModel.cs
@@ -0,0 +1,218 @@
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using System.Windows.Input;
+
+namespace Maui.Controls.Sample;
+
+public class VisualTransformViewModel : INotifyPropertyChanged
+{
+ public event PropertyChangedEventHandler PropertyChanged;
+ // Core Transformation Properties
+ private double _rotation = 0.0;
+ private double _rotationX = 0.0;
+ private double _rotationY = 0.0;
+ private double _scale = 1.0;
+ private double _scaleX = 1.0;
+ private double _scaleY = 1.0;
+ private bool _isVisible = true;
+
+ // Additional Related Properties
+ private double _translationX = 0.0;
+ private double _translationY = 0.0;
+ private double _anchorX = 0.5;
+ private double _anchorY = 0.5;
+
+ // Core Transformation Properties
+ public bool IsVisible
+ {
+ get => _isVisible;
+ set
+ {
+ if (_isVisible != value)
+ {
+ _isVisible = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+ private bool _hasShadow = false;
+ private Shadow _boxShadow = null;
+ public bool HasShadow
+ {
+ get => _hasShadow;
+ set
+ {
+ if (_hasShadow != value)
+ {
+ _hasShadow = value;
+ // Minimal shadow that shouldn't interfere with layout
+ BoxShadow = value
+ ? new Shadow
+ {
+ Radius = 2,
+ Opacity = 0.9f,
+ Brush = new SolidColorBrush(Colors.Gray),
+ Offset = new Point(10, 10) // Visible offset to make shadow apparent in screenshots
+ }
+ : null;
+ OnPropertyChanged(nameof(HasShadow));
+ }
+ }
+ }
+ public Shadow BoxShadow
+ {
+ get => _boxShadow;
+ private set
+ {
+ if (_boxShadow != value)
+ {
+ _boxShadow = value;
+ OnPropertyChanged(nameof(BoxShadow));
+ }
+ }
+ }
+ public double Rotation
+ {
+ get => _rotation;
+ set
+ {
+ if (_rotation != value)
+ {
+ _rotation = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+ public double RotationX
+ {
+ get => _rotationX;
+ set
+ {
+ if (_rotationX != value)
+ {
+ _rotationX = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+ public double RotationY
+ {
+ get => _rotationY;
+ set
+ {
+ if (_rotationY != value)
+ {
+ _rotationY = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+ public double Scale
+ {
+ get => _scale;
+ set
+ {
+ if (_scale != value)
+ {
+ _scale = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+ public double ScaleX
+ {
+ get => _scaleX;
+ set
+ {
+ if (_scaleX != value)
+ {
+ _scaleX = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+ public double ScaleY
+ {
+ get => _scaleY;
+ set
+ {
+ if (_scaleY != value)
+ {
+ _scaleY = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+
+ // Additional Related Properties
+ public double TranslationX
+ {
+ get => _translationX;
+ set
+ {
+ if (_translationX != value)
+ {
+ _translationX = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+ public double TranslationY
+ {
+ get => _translationY;
+ set
+ {
+ if (_translationY != value)
+ {
+ _translationY = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+ public double AnchorX
+ {
+ get => _anchorX;
+ set
+ {
+ if (_anchorX != value)
+ {
+ _anchorX = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+ public double AnchorY
+ {
+ get => _anchorY;
+ set
+ {
+ if (_anchorY != value)
+ {
+ _anchorY = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+
+ // Reset Command
+ public ICommand ResetCommand => new Command(Reset);
+ private void Reset()
+ {
+ Rotation = 0.0;
+ RotationX = 0.0;
+ RotationY = 0.0;
+ Scale = 1.0;
+ ScaleX = 1.0;
+ ScaleY = 1.0;
+ TranslationX = 0.0;
+ TranslationY = 0.0;
+ AnchorX = 0.5;
+ AnchorY = 0.5;
+ IsVisible = true;
+ HasShadow = false;
+ }
+ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+ {
+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue10509.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue10509.cs
new file mode 100644
index 000000000000..4335b0111402
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue10509.cs
@@ -0,0 +1,82 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 10509, "Query parameter is missing after navigation", PlatformAffected.Android)]
+public class Issue10509 : Shell
+{
+ public Issue10509()
+ {
+ Routing.RegisterRoute(nameof(Issue10509Page1), typeof(Issue10509Page1));
+ Routing.RegisterRoute(nameof(Issue10509Page2), typeof(Issue10509Page2));
+
+ Items.Add(new ShellContent
+ {
+ Title = "First Page",
+ Route = nameof(Issue10509Page1),
+ ContentTemplate = new DataTemplate(typeof(Issue10509Page1))
+ });
+
+ Items.Add(new ShellContent
+ {
+ Title = "Second Page",
+ Route = nameof(Issue10509Page2),
+ ContentTemplate = new DataTemplate(typeof(Issue10509Page2))
+ });
+ }
+}
+
+public class Issue10509Page1 : ContentPage
+{
+ public Issue10509Page1()
+ {
+ var navigateBtn = new Button
+ {
+ Text = "Navigate to Page 2",
+ HorizontalOptions = LayoutOptions.Center,
+ AutomationId = "Page1Button"
+ };
+ navigateBtn.Clicked += NavigateBtn_Clicked;
+
+ Content = new VerticalStackLayout
+ {
+ VerticalOptions = LayoutOptions.Center,
+ Children = { navigateBtn }
+ };
+ }
+
+ private async void NavigateBtn_Clicked(object sender, EventArgs e)
+ {
+ await Shell.Current.GoToAsync($"//{nameof(Issue10509Page2)}?{Issue10509Page2.NavigationDataParam}=Passed");
+ }
+}
+
+[QueryProperty(nameof(NavigationData), NavigationDataParam)]
+public class Issue10509Page2 : ContentPage
+{
+ public const string NavigationDataParam = "NavigationDataParam";
+
+ private Label dataLabel;
+
+ public Issue10509Page2()
+ {
+ dataLabel = new Label
+ {
+ AutomationId = "Page2Label",
+ VerticalOptions = LayoutOptions.Center,
+ HorizontalOptions = LayoutOptions.Center
+ };
+
+ Content = new VerticalStackLayout
+ {
+ VerticalOptions = LayoutOptions.Center,
+ Children = { dataLabel }
+ };
+ }
+
+ public string NavigationData { get; set; }
+
+ protected override void OnNavigatedTo(NavigatedToEventArgs args)
+ {
+ base.OnNavigatedTo(args);
+ dataLabel.Text = $"Navigation data: {NavigationData ?? "Missed"}";
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue11677.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue11677.cs
new file mode 100644
index 000000000000..efc6de421774
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue11677.cs
@@ -0,0 +1,47 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 11677, "[iOS][maccatalyst] SearchBar BackgroundColor is black when set to transparent", PlatformAffected.iOS)]
+public class Issue11677 : ContentPage
+{
+ public Issue11677()
+ {
+ Content = new VerticalStackLayout
+ {
+ Children =
+ {
+ new Label
+ {
+ Text = "SearchBar Transparent BackgroundColor",
+ FontSize = 16,
+ TextColor = Colors.Black,
+ AutomationId = "Label"
+ },
+ new SearchBar
+ {
+ BackgroundColor = Colors.Transparent,
+ },
+ new Label
+ {
+ Text = "SearchBar with null background",
+ FontSize = 16,
+ TextColor = Colors.Black,
+ },
+ new SearchBar
+ {
+ BackgroundColor = null,
+ },
+ new Label
+ {
+ Text = "SearchBar with default background",
+ FontSize = 16,
+ TextColor = Colors.Black,
+ },
+ new SearchBar
+ {
+ Background = Brush.Default,
+ }
+ }
+ };
+
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue11812.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue11812.cs
new file mode 100644
index 000000000000..81a34923d5e4
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue11812.cs
@@ -0,0 +1,65 @@
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 11812, "Setting Content of ContentView through style would crash on parent change", PlatformAffected.Android)]
+public class Issue11812 : ContentPage
+{
+ ContentView _mainContentView;
+ public Issue11812()
+ {
+ var button = new Button
+ {
+ Text = "Add ContentView",
+ HorizontalOptions = LayoutOptions.Center,
+ AutomationId = "ChangeInnerContent"
+ };
+ button.Clicked += OnButtonClicked;
+
+ _mainContentView = new ContentView();
+ _mainContentView.Content = new Issue11812InnerContentView();
+
+ var layout = new VerticalStackLayout
+ {
+ Spacing = 25,
+ Padding = new Thickness(30, 0),
+ VerticalOptions = LayoutOptions.Center,
+ Children =
+ {
+ button,
+ _mainContentView
+ }
+ };
+
+ Content = layout;
+ }
+ private void OnButtonClicked(object sender, EventArgs e)
+ {
+ _mainContentView.Content = new Issue11812InnerContentView() { BackgroundColor = Colors.Red };
+ }
+}
+
+public class Issue11812InnerContentView : ContentView
+{
+ public Issue11812InnerContentView()
+ {
+ Application.Current.Resources ??= new ResourceDictionary();
+
+ if (!Application.Current.Resources.ContainsKey("SubContentStyle"))
+ {
+ Application.Current.Resources["SubContentStyle"] = new Style(typeof(ContentView))
+ {
+ Setters =
+ {
+ new Setter
+ {
+ Property = ContentView.ContentProperty,
+ Value = new Label { Text = "SubContent" }
+ }
+ }
+ };
+ }
+ Style = (Style)Application.Current.Resources["SubContentStyle"];
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue12131.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue12131.cs
new file mode 100644
index 000000000000..333272103b1b
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue12131.cs
@@ -0,0 +1,51 @@
+namespace Maui.Controls.Sample.Issues
+{
+ [Issue(IssueTracker.Github, 12131, "RefreshView - CollectionView sizing not working correctly inside VerticalStackLayout", PlatformAffected.Android)]
+ public class Issue12131 : ContentPage
+ {
+ public Issue12131()
+ {
+ var items = Enumerable.Range(1, 20).Select(i => $"Item {i}").ToList();
+
+ var collectionView = new CollectionView
+ {
+ AutomationId = "CollectionView12131",
+ ItemTemplate = new DataTemplate(() =>
+ {
+ var label = new Label();
+ label.SetBinding(Label.TextProperty, ".");
+ return label;
+ }),
+ ItemsSource = items
+ };
+
+ var refreshView = new RefreshView
+ {
+ AutomationId = "RefreshView12131",
+ Content = collectionView
+ };
+
+ var sizeLabel = new Label
+ {
+ AutomationId = "SizeLabel12131",
+ Text = "Waiting..."
+ };
+
+ refreshView.SizeChanged += (s, e) =>
+ {
+ sizeLabel.Text = $"Height={refreshView.Height:F0}";
+ };
+
+ Content = new VerticalStackLayout
+ {
+ Padding = 10,
+ Children =
+ {
+ new Label { Text = "CollectionView wrapped within RefreshView." },
+ sizeLabel,
+ refreshView
+ }
+ };
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue12324.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue12324.cs
new file mode 100644
index 000000000000..d966cf9760f6
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue12324.cs
@@ -0,0 +1,34 @@
+using AndroidSpecific = Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific;
+namespace Controls.TestCases.HostApp.Issues;
+
+[Issue(IssueTracker.Github, 12324, "Tabbedpage should not have visual bug", PlatformAffected.Android)]
+
+public class Issue12324 : TabbedPage
+{
+ public Issue12324()
+ {
+ // Set tabs to bottom placement on Android
+ AndroidSpecific.TabbedPage.SetToolbarPlacement(this, AndroidSpecific.ToolbarPlacement.Bottom);
+ BarBackground = new RadialGradientBrush
+ {
+ GradientStops = new GradientStopCollection
+ {
+ new GradientStop { Color = Color.FromArgb("#1AFFFF00"), Offset = 0.0f },
+ new GradientStop { Color = Colors.Green, Offset = 1.0f }
+ }
+ };
+
+ Children.Add(new ContentPage
+ {
+ IconImageSource = "groceries.png",
+ Title = "Tab 1",
+ Content = new VerticalStackLayout
+ {
+ Children = {
+ new Label { AutomationId = "Label12324", HorizontalOptions = LayoutOptions.Center, VerticalOptions = LayoutOptions.Center, Text = "Welcome to .NET MAUI!"
+ }
+ }
+ }
+ });
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue13258.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue13258.cs
new file mode 100644
index 000000000000..ade96442da2e
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue13258.cs
@@ -0,0 +1,51 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 13258, "MAUI Slider thumb image is big on android", PlatformAffected.Android)]
+public class Issue13258 : TestContentPage
+{
+ protected override void Init()
+ {
+ StackLayout rootLayout = new StackLayout() { Spacing = 10, Padding = 10 };
+
+ Label slider1DescriptionLabel = CreateLabel("Slider with Thumb Image");
+ Slider slider1 = CreateSlider("avatar.png");
+
+ Label slider2DescriptionLabel = CreateLabel("Thumb Image will be set to coffee.png at run time");
+ Slider slider2 = CreateSlider();
+
+ Label slider3DescriptionLabel = CreateLabel("Thumb Image will be set to null at run time");
+ Slider slider3 = CreateSlider("shopping_cart.png");
+
+ Button button = new Button() { Text = "Change Thumb Image", AutomationId = "ToggleImageBtn" };
+ button.Clicked += (s, e) => ToggleThumbImages(slider2, slider3);
+
+ rootLayout.Children.Add(slider1DescriptionLabel);
+ rootLayout.Children.Add(slider1);
+
+ rootLayout.Children.Add(slider2DescriptionLabel);
+ rootLayout.Children.Add(slider2);
+
+ rootLayout.Children.Add(slider3DescriptionLabel);
+ rootLayout.Children.Add(slider3);
+
+ rootLayout.Children.Add(button);
+
+ Content = rootLayout;
+ }
+
+ Label CreateLabel(string text)
+ {
+ return new Label { Text = text };
+ }
+
+ Slider CreateSlider(string thumbImageSource = null)
+ {
+ return new Slider { ThumbImageSource = thumbImageSource };
+ }
+
+ private void ToggleThumbImages(Slider slider2, Slider slider3)
+ {
+ slider2.ThumbImageSource = "coffee.png";
+ slider3.ThumbImageSource = null;
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue14364.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue14364.cs
new file mode 100644
index 000000000000..62a449b327b7
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue14364.cs
@@ -0,0 +1,50 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 14364, "Control size properties are not available during Loaded event", PlatformAffected.Android)]
+public class Issue14364 : Shell
+{
+ public Issue14364()
+ {
+ ShellContent shellContent = new ShellContent
+ {
+ ContentTemplate = new DataTemplate(typeof(Issue14364Page)),
+ Route = "Issue14364Page"
+ };
+
+ Items.Add(shellContent);
+ }
+}
+
+public class Issue14364Page : ContentPage
+{
+ public Issue14364Page()
+ {
+ var grid = new Grid
+ {
+ HeightRequest = 300,
+ WidthRequest = 200
+ };
+
+ var label = new Label
+ {
+ Text = "Size",
+ AutomationId = "labelSize"
+ };
+
+ label.Loaded += Label_Loaded;
+
+ grid.Children.Add(label);
+ Content = grid;
+ }
+
+ void Label_Loaded(object sender, EventArgs e)
+ {
+ if (sender is Label label)
+ {
+ var h1 = label.Height;
+ var h2 = label.Width;
+
+ label.Text = $"Height: {h1}, Width: {h2}";
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue14566.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue14566.cs
new file mode 100644
index 000000000000..08f38ea47c4a
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue14566.cs
@@ -0,0 +1,49 @@
+namespace Maui.Controls.Sample.Issues
+{
+ [Issue(IssueTracker.Github, 14566, "SearchBar IsEnabled property not functioning", PlatformAffected.Android | PlatformAffected.iOS | PlatformAffected.macOS)]
+ public class Issue14566 : TestContentPage
+ {
+ const string SearchBar = "SearchBar";
+ const string ResultText = "ResultText";
+ const string CheckResultButton = "CheckResultButton";
+ const string Success = "Success";
+ const string Failure = "Failure";
+
+ protected override void Init()
+ {
+ var layout = new StackLayout
+ {
+ VerticalOptions = LayoutOptions.Center,
+ Padding = new Thickness(30, 0),
+ Spacing = 25
+ };
+
+ var searchBar = new SearchBar
+ {
+ AutomationId = SearchBar,
+ Placeholder = "Search Placeholder",
+ IsEnabled = false
+ };
+ var searchText = new Label();
+
+ searchBar.TextChanged += (sender, e) =>
+ {
+ // Handle text changed event
+ searchText.Text = $"{e.NewTextValue}";
+ };
+
+ var result = new Label() { AutomationId = ResultText };
+ var checkResultButton = new Button() { AutomationId = CheckResultButton, Text = "Check Result" };
+ checkResultButton.Clicked += (sender, e) =>
+ {
+ result.Text = string.IsNullOrWhiteSpace(searchBar.Text) ? Success : Failure;
+ };
+
+ layout.Children.Add(searchBar);
+ layout.Children.Add(checkResultButton);
+ layout.Children.Add(result);
+
+ Content = layout;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue15280.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue15280.cs
new file mode 100644
index 000000000000..8d7a9f42e97e
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue15280.cs
@@ -0,0 +1,70 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 15280, "Swipe gestures attached to rotated controls are rotated on iOS", PlatformAffected.iOS)]
+public partial class Issue15280 : ContentPage
+{
+ Image _botImage;
+ Label _directionLabel;
+ public Issue15280()
+ {
+ Title = "Swipe Gesture Rotation Test";
+ Padding = 20;
+
+ _botImage = new Image
+ {
+ AutomationId = "RotatedImage",
+ Source = "dotnet_bot.png",
+ HeightRequest = 300,
+ WidthRequest = 300,
+ HorizontalOptions = LayoutOptions.Center,
+ VerticalOptions = LayoutOptions.Center,
+ BackgroundColor = Colors.LightBlue
+ };
+
+ var upSwipe = new SwipeGestureRecognizer { Direction = SwipeDirection.Up, Threshold = 20 };
+ var downSwipe = new SwipeGestureRecognizer { Direction = SwipeDirection.Down, Threshold = 20 };
+ var leftSwipe = new SwipeGestureRecognizer { Direction = SwipeDirection.Left, Threshold = 20 };
+ var rightSwipe = new SwipeGestureRecognizer { Direction = SwipeDirection.Right, Threshold = 20 };
+
+ upSwipe.Swiped += SwipeGestureRecognizer_Swiped;
+ downSwipe.Swiped += SwipeGestureRecognizer_Swiped;
+ leftSwipe.Swiped += SwipeGestureRecognizer_Swiped;
+ rightSwipe.Swiped += SwipeGestureRecognizer_Swiped;
+
+ _botImage.GestureRecognizers.Add(upSwipe);
+ _botImage.GestureRecognizers.Add(downSwipe);
+ _botImage.GestureRecognizers.Add(leftSwipe);
+ _botImage.GestureRecognizers.Add(rightSwipe);
+
+ _directionLabel = new Label
+ {
+ AutomationId = "DirectionLabel",
+ Text = "Try swiping Left on the image",
+ FontSize = 18,
+ HorizontalOptions = LayoutOptions.Center,
+ HorizontalTextAlignment = TextAlignment.Center,
+ TextColor = Colors.Blue
+ };
+
+ var mainLayout = new VerticalStackLayout
+ {
+ Spacing = 20,
+ Children =
+ {
+ _botImage,
+ _directionLabel
+ }
+ };
+
+ var grid = new Grid();
+ grid.Children.Add(mainLayout);
+ Content = grid;
+ }
+
+ void SwipeGestureRecognizer_Swiped(object sender, SwipedEventArgs e)
+ {
+ _directionLabel.Text = $"Swiped: {e.Direction.ToString().ToUpperInvariant()}";
+
+ _botImage.Rotation += 90;
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue15559.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue15559.xaml
new file mode 100644
index 000000000000..c58eeeb7b416
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue15559.xaml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue15559.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue15559.xaml.cs
new file mode 100644
index 000000000000..96d4f3bc950a
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue15559.xaml.cs
@@ -0,0 +1,11 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 15559, "[iOS] Vertical layout content of label is truncated when a width request is set in the layout", PlatformAffected.iOS | PlatformAffected.macOS)]
+
+public partial class Issue15559 : ContentPage
+{
+ public Issue15559()
+ {
+ InitializeComponent();
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue16522.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue16522.xaml
new file mode 100644
index 000000000000..6719b7468fe0
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue16522.xaml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue16522.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue16522.xaml.cs
new file mode 100644
index 000000000000..69d890caa760
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue16522.xaml.cs
@@ -0,0 +1,12 @@
+namespace Maui.Controls.Sample.Issues
+{
+ [Issue(IssueTracker.Github, 16522, "[Android] Tabs briefly display wrong background color when navigating between flyout items", PlatformAffected.Android)]
+ public partial class Issue16522 : Shell
+ {
+ public Issue16522()
+ {
+ InitializeComponent();
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue17323.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue17323.cs
new file mode 100644
index 000000000000..17e8b18f41bb
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue17323.cs
@@ -0,0 +1,40 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 17323, "Arabic text flows RTL on Android in MAUI, but flows LTR on Windows", PlatformAffected.Android)]
+public class Issue17323 : TestContentPage
+{
+ protected override void Init()
+ {
+ VerticalStackLayout _verticalStackLayout = new VerticalStackLayout();
+ GraphicsView _graphicsView = new GraphicsView
+ {
+ Drawable = new Issue17323_Drawable(),
+ HeightRequest = 300,
+ WidthRequest = 350,
+ };
+
+ Label label = new Label
+ {
+ AutomationId = "TextLabel",
+ Text = "The Arabic text should be drawn from left to right on Android for consistent behavior with Windows, iOS, and macOS."
+ };
+
+ _verticalStackLayout.Add(_graphicsView);
+ _verticalStackLayout.Add(label);
+ Content = _verticalStackLayout;
+ }
+}
+
+
+public class Issue17323_Drawable : IDrawable
+{
+ public void Draw(ICanvas canvas, RectF dirtyRect)
+ {
+ canvas.StrokeColor = Colors.Red;
+ canvas.StrokeSize = 5;
+ canvas.FontSize = 18;
+ canvas.DrawRectangle(dirtyRect);
+ canvas.DrawString("Hello World", dirtyRect.X + 5, dirtyRect.Y + 5, dirtyRect.Width - 10, dirtyRect.Height - 160, HorizontalAlignment.Left, VerticalAlignment.Center);
+ canvas.DrawString("مرحبا بالعالم", dirtyRect.X + 5, dirtyRect.Y + 20, dirtyRect.Width - 10, dirtyRect.Height - 160, HorizontalAlignment.Left, VerticalAlignment.Center);
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue17550.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue17550.cs
new file mode 100644
index 000000000000..bedbc5ef0a79
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue17550.cs
@@ -0,0 +1,57 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 17550, "Changing Shell.NavBarIsVisible does not update the nav bar on Mac / iOS",
+ PlatformAffected.All)]
+public class Issue17550 : TestShell
+{
+ Button _toggleButton;
+
+ protected override void Init()
+ {
+ // Create a toggle button similar to the one in SandboxShell.xaml
+ _toggleButton = new Button
+ {
+ Text = Shell.GetNavBarIsVisible(this) ? "Hide NavBar" : "Show NavBar",
+ HeightRequest = 50,
+ WidthRequest = 150,
+ AutomationId = "NavBarToggleButton",
+ HorizontalOptions = LayoutOptions.Center,
+ VerticalOptions = LayoutOptions.Center
+ };
+
+ _toggleButton.Clicked += OnNavBarToggleButtonClicked;
+
+ // Add the button to a content page in the shell
+ Items.Add(new ShellContent
+ {
+ Content = new ContentPage
+ {
+ Title = "Home",
+ Content = new StackLayout
+ {
+ Children =
+ {
+ new Label
+ {
+ Text = "Toggle NavBar visibility",
+ HorizontalOptions = LayoutOptions.Center
+ },
+ _toggleButton
+ },
+ VerticalOptions = LayoutOptions.Center
+ }
+ }
+ });
+ }
+
+ void OnNavBarToggleButtonClicked(object sender, EventArgs e)
+ {
+ // Toggle the NavBar visibility
+ bool isCurrentlyVisible = Shell.GetNavBarIsVisible(this);
+ bool newVisibility = !isCurrentlyVisible;
+ Shell.SetNavBarIsVisible(this, newVisibility);
+
+ // Update the button text to reflect the new state
+ _toggleButton.Text = newVisibility ? "Hide NavBar" : "Show NavBar";
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue17664.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue17664.cs
new file mode 100644
index 000000000000..707e06ad5aa2
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue17664.cs
@@ -0,0 +1,120 @@
+using System.Collections.ObjectModel;
+
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 17664, "Incorrect ItemsViewScrolledEventArgs in CollectionView when IsGrouped is set to true", PlatformAffected.iOS)]
+public class Issue17664 : ContentPage
+{
+ CollectionView _collectionView;
+ Label descriptionLabel;
+ ObservableCollection _groupedItems;
+
+ public Issue17664()
+ {
+ Button scrollButton = new Button
+ {
+ AutomationId = "Issue17664ScrollBtn",
+ Text = "Scroll to Category C, Item #2"
+ };
+ scrollButton.Clicked += ScrollButton_Clicked;
+
+ descriptionLabel = new Label
+ {
+ AutomationId = "Issue17664DescriptionLabel",
+ Text = "Use the button above to scroll the CollectionView.",
+ FontSize = 14,
+ HorizontalOptions = LayoutOptions.Center
+ };
+
+ _collectionView = new CollectionView
+ {
+ IsGrouped = true,
+ GroupHeaderTemplate = new DataTemplate(() =>
+ {
+ Label label = new Label
+ {
+ FontAttributes = FontAttributes.Bold,
+ BackgroundColor = Colors.LightGray,
+ Padding = 10
+ };
+
+ label.SetBinding(Label.TextProperty, "Name");
+ return label;
+ }),
+ ItemTemplate = new DataTemplate(() =>
+ {
+ Label textLabel = new Label
+ {
+ FontAttributes = FontAttributes.Bold,
+ Padding = 30
+ };
+
+ textLabel.SetBinding(Label.TextProperty, ".");
+ return textLabel;
+ })
+ };
+
+ _collectionView.Scrolled += (s, e) =>
+ {
+ var flatItems = _groupedItems.SelectMany(group => group).ToList();
+ if (e.LastVisibleItemIndex >= 0 && e.LastVisibleItemIndex < flatItems.Count)
+ {
+ descriptionLabel.Text = flatItems[e.LastVisibleItemIndex];
+ }
+ };
+
+ List categories = new List { "Category A", "Category B", "Category C" };
+
+ _groupedItems = new ObservableCollection();
+
+ foreach (var category in categories)
+ {
+ List items = new List();
+
+ for (int i = 0; i < 5; i++)
+ {
+ items.Add($"{category} item #{i}");
+ }
+
+ _groupedItems.Add(new Issue17664_ItemModelGroup(category, items));
+ }
+
+ _collectionView.ItemsSource = _groupedItems;
+
+ Grid grid = new Grid
+ {
+ RowSpacing = 10,
+ Padding = 10,
+ RowDefinitions =
+ {
+ new RowDefinition { Height = GridLength.Auto },
+ new RowDefinition { Height = GridLength.Auto },
+ new RowDefinition { Height = GridLength.Star }
+ }
+ };
+
+ grid.Add(scrollButton, 0, 0);
+ grid.Add(descriptionLabel, 0, 1);
+ grid.Add(_collectionView, 0, 2);
+
+ Content = grid;
+ }
+
+ private void ScrollButton_Clicked(object sender, EventArgs e)
+ {
+ var targetGroup = _groupedItems.FirstOrDefault(group => group.Name == "Category C");
+ var targetItem = targetGroup.FirstOrDefault(item => item == "Category C item #2");
+
+ _collectionView.ScrollTo(targetItem, targetGroup, ScrollToPosition.End);
+ }
+}
+
+public class Issue17664_ItemModelGroup : ObservableCollection
+{
+ public string Name { get; set; }
+
+ public Issue17664_ItemModelGroup(string name, IEnumerable items) : base(items)
+ {
+ Name = name;
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue18011.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue18011.cs
new file mode 100644
index 000000000000..eea896e3aa0f
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue18011.cs
@@ -0,0 +1,54 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 18011,
+ "RadioButton TextColor for plain Content not working on iOS when Label styles present", PlatformAffected.iOS)]
+public class Issue18011 : ContentPage
+{
+ ResourceDictionary _styleDictionary;
+
+ public Issue18011()
+ {
+ // Add an implicit Label style to Application resources to simulate global App.xaml styles.
+ // The bug only reproduces when global Label styles exist that set TextColor.
+ _styleDictionary = new ResourceDictionary();
+ _styleDictionary.Add(new Style(typeof(Label))
+ {
+ Setters =
+ {
+ new Setter { Property = Label.TextColorProperty, Value = Colors.Green }
+ }
+ });
+
+ Application.Current.Resources.MergedDictionaries.Add(_styleDictionary);
+
+ Content = new VerticalStackLayout
+ {
+ Padding = new Thickness(20),
+ Spacing = 20,
+ Children =
+ {
+ new RadioButton
+ {
+ AutomationId = "RadioButtonWithTextColor",
+ Content = "Red RadioButton Text",
+ TextColor = Colors.Red,
+ FontSize = 20,
+ IsChecked = true
+ },
+ new RadioButton
+ {
+ AutomationId = "RadioButtonDefault",
+ Content = "Default RadioButton Text",
+ FontSize = 20
+ }
+ }
+ };
+ }
+
+ protected override void OnDisappearing()
+ {
+ base.OnDisappearing();
+ // Clean up global styles to avoid affecting other tests
+ Application.Current?.Resources?.MergedDictionaries?.Remove(_styleDictionary);
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue18668.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue18668.xaml
new file mode 100644
index 000000000000..fb0e8db1a23f
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue18668.xaml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue18668.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue18668.xaml.cs
new file mode 100644
index 000000000000..f1a3ac837655
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue18668.xaml.cs
@@ -0,0 +1,17 @@
+namespace Maui.Controls.Sample.Issues
+{
+ [XamlCompilation(XamlCompilationOptions.Compile)]
+ [Issue(IssueTracker.Github, 18668, "Visual state change for disabled RadioButton", PlatformAffected.All)]
+ public partial class Issue18668 : ContentPage
+ {
+ public Issue18668()
+ {
+ InitializeComponent();
+ }
+
+ private void ButtonClicked(object sender, EventArgs e)
+ {
+ radioButton.IsEnabled = false;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue18679.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue18679.cs
new file mode 100644
index 000000000000..abc153b6b488
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue18679.cs
@@ -0,0 +1,100 @@
+using Font = Microsoft.Maui.Graphics.Font;
+
+namespace Maui.Controls.Sample.Issues
+{
+ [Issue(IssueTracker.Github, 18679, "Canvas.GetStringSize() is not consistent with actual string size in GraphicsView", PlatformAffected.All)]
+ public class Issue18679 : TestContentPage
+ {
+ const string ShortText = "ShortText";
+ const string LongText = "CiaomondorowfdskleCiaomondorowfdsk";
+ const string MultiLineText = "HELLO, WORLD!\nCiao mondo row 2\nGuten tag!?àèìòù@";
+
+ protected override void Init()
+ {
+ var layout = new VerticalStackLayout
+ {
+ Spacing = 10,
+ };
+ var label = new Label
+ {
+ Text = "The drawn text should not overflow the bounding rectangle.",
+ FontSize = 16,
+ AutomationId = "18679DescriptionLabel",
+ };
+ layout.Add(label);
+
+ // Test Case 1: Single long line (basic case)
+ layout.Add(CreateDrawable("Test Case 1: Short text", ShortText));
+
+ // Test Case 2: Multi-line text
+ layout.Add(CreateDrawable("Test Case 2: Multi-line Text", MultiLineText));
+
+ // Test Case 3: Unicode/non-Latin text
+ layout.Add(CreateDrawable("Test Case 3: Long Text", LongText));
+
+ Content = layout;
+ }
+
+ private Border CreateDrawable(string testName, string text)
+ {
+ var graphicsView = new GraphicsView
+ {
+ HeightRequest = 150,
+ Drawable = new Issue18679_Drawable(text, testName)
+ };
+
+ return new Border
+ {
+ Content = graphicsView,
+ Stroke = Colors.LightGray,
+ StrokeThickness = 1,
+ };
+ }
+ }
+
+ public class Issue18679_Drawable : IDrawable
+ {
+ readonly string _text;
+ readonly string _label;
+ static readonly Font Font = Font.Default;
+ const int FontSize = 20;
+
+
+ public Issue18679_Drawable(string text, string label)
+ {
+ _text = text;
+ _label = label;
+ }
+
+ public void Draw(ICanvas canvas, RectF dirtyRect)
+ {
+ canvas.SaveState();
+
+ // Draw label
+ canvas.FontSize = 14;
+ canvas.Font = Font;
+ canvas.FontColor = Colors.Blue;
+ canvas.DrawString(_label, 10, 10, dirtyRect.Width - 20, 20,
+ HorizontalAlignment.Left, VerticalAlignment.Top);
+
+ // Set up for text measurement
+ canvas.FontSize = FontSize;
+ canvas.Font = Font;
+
+ // Get text size and create bounds
+ var stringSize = canvas.GetStringSize(_text, Font, FontSize);
+
+ // Draw the actual text first
+ canvas.FontColor = Colors.Black;
+ canvas.DrawString(_text, 2, 40, dirtyRect.Width, dirtyRect.Height,
+ HorizontalAlignment.Left, VerticalAlignment.Top);
+
+ // Draw the measured bounds rectangle
+ canvas.StrokeColor = Colors.Red;
+ canvas.StrokeSize = 1;
+ canvas.DrawRectangle(2, 40, stringSize.Width, stringSize.Height);
+
+ canvas.RestoreState();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue18933.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue18933.cs
new file mode 100644
index 000000000000..d71ddac37e74
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue18933.cs
@@ -0,0 +1,76 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 18933, "ContentView Background Color Not Cleared When Set to Null", PlatformAffected.Android | PlatformAffected.iOS)]
+public class Issue18933 : ContentPage
+{
+ ContentView contentView;
+ ContentView contentViewWithBackground;
+
+ public Issue18933()
+ {
+ Label contentLabel = new Label
+ {
+ Text = "ContentView - Test BackgroundColor removal",
+ Padding = 20
+ };
+
+ Label backgroundContentLabel = new Label
+ {
+ Text = "ContentView - Test Background removal",
+ Padding = 20
+ };
+
+ contentView = new ContentView
+ {
+ BackgroundColor = Colors.Purple,
+ Content = contentLabel
+ };
+
+ contentViewWithBackground = new ContentView
+ {
+ Background = Colors.Purple,
+ Content = backgroundContentLabel
+ };
+
+ Button clearBackgroundBtn = new Button
+ {
+ AutomationId = "clearBgBtn",
+ Text = "Set ContentView Background to Null"
+ };
+ clearBackgroundBtn.Clicked += Button_Clicked;
+
+ Button setBackgroundBtn = new Button
+ {
+ AutomationId = "setBgBtn",
+ Text = "Set ContentView Background"
+ };
+ setBackgroundBtn.Clicked += SetBackground_Clicked;
+
+ VerticalStackLayout mainLayout = new VerticalStackLayout
+ {
+ Spacing = 10,
+ Padding = 20,
+ Children =
+ {
+ contentView,
+ contentViewWithBackground,
+ clearBackgroundBtn,
+ setBackgroundBtn,
+ }
+ };
+
+ Content = mainLayout;
+ }
+
+ void Button_Clicked(object sender, EventArgs e)
+ {
+ contentView.BackgroundColor = null;
+ contentViewWithBackground.Background = null;
+ }
+
+ void SetBackground_Clicked(object sender, EventArgs e)
+ {
+ contentView.BackgroundColor = Colors.Purple;
+ contentViewWithBackground.Background = Colors.Purple;
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue19219.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue19219.cs
new file mode 100644
index 000000000000..e15b03feddcf
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue19219.cs
@@ -0,0 +1,61 @@
+using System.Windows.Input;
+
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 19219, "[Android, iOS, macOS] Shell SearchHandler Command Not Executed on Item Selection", PlatformAffected.All)]
+public class Issue19219Shell : Shell
+{
+ public Issue19219Shell()
+ {
+ this.FlyoutBehavior = FlyoutBehavior.Flyout;
+
+ var shellContent = new ShellContent
+ {
+ Title = "Home",
+ Route = "MainPage",
+ Content = new Issue19219() { Title = "Home" }
+ };
+
+ Items.Add(shellContent);
+ }
+
+ class Issue19219 : ContentPage
+ {
+ public Issue19219()
+ {
+ Label label = new Label
+ {
+ Text = "SearchHandler command will execute when tap on item",
+ AutomationId = "SearchHandlerLabel"
+ };
+
+ var cities = new List { "Los Angeles", "New York", "London", "Sydney", "Toronto", "Chicago", "Melbourne", "Vancouver",
+ "Manchester", "Birmingham", "San Francisco", "Dublin", "Auckland", "Glasgow", "Perth", "Houston",
+ "Seattle", "Cape Town", "Ottawa", "Brisbane", "Boston", "Phoenix", "Washington", "Edinburgh" };
+ var searchHandler = new SearchHandler
+ {
+ AutomationId = "searchBar",
+ Placeholder = "SearchHandler",
+ Command = (new Command(() =>
+ {
+ label.Text = "SearchHandler Command Executed when tap on item";
+ })),
+ ShowsResults = true,
+ };
+ searchHandler.SetBinding(SearchHandler.ItemsSourceProperty, new Binding
+ {
+ Source = cities,
+ Mode = BindingMode.OneWay
+ });
+
+ Shell.SetSearchHandler(this, searchHandler);
+
+ Grid grid = new Grid
+ {
+ Children = { label }
+ };
+
+ Content = grid;
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue19676.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue19676.cs
new file mode 100644
index 000000000000..4d4ecdb8f0e8
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue19676.cs
@@ -0,0 +1,45 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 19676, "Android Switch Control Thumb Shadow missing when ThumbColor matches background", PlatformAffected.Android)]
+public class Issue19676 : ContentPage
+{
+ public Issue19676()
+ {
+ BackgroundColor = Color.FromArgb("#F2F5F8");
+
+ Content = new VerticalStackLayout
+ {
+ Padding = 20,
+ Spacing = 20,
+ Children =
+ {
+ new Label
+ {
+ Text = "Switch with ThumbColor matching background",
+ FontSize = 16,
+ FontAttributes = FontAttributes.Bold,
+ },
+ new Label
+ {
+ Text = "The switch thumb should be visible with a shadow, even though ThumbColor matches the background.",
+ FontSize = 14,
+ },
+ new Switch
+ {
+ IsToggled = true,
+ ThumbColor = Color.FromArgb("#F2F5F8"),
+ OnColor = Colors.Red,
+ AutomationId = "TestSwitch",
+ Margin = new Thickness(10, 20, 15, 0),
+ VerticalOptions = LayoutOptions.Center
+ },
+ new Label
+ {
+ Text = "Expected: Switch thumb is visible with shadow",
+ FontSize = 14,
+ TextColor = Colors.Gray,
+ }
+ }
+ };
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue20596.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue20596.cs
new file mode 100644
index 000000000000..493c1977c192
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue20596.cs
@@ -0,0 +1,49 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 20596, "[Android] Button with corner radius shadow broken on Android device", PlatformAffected.Android | PlatformAffected.UWP)]
+public class Issue20596 : ContentPage
+{
+ public Issue20596()
+ {
+ var button = new Button
+ {
+ TextColor = Colors.Black,
+ HeightRequest = 200,
+ WidthRequest = 200,
+ BackgroundColor = Colors.Green,
+ CornerRadius = 20,
+ Shadow = new Shadow { Radius = 10 }
+ };
+
+ var imageButton = new ImageButton
+ {
+ HeightRequest = 200,
+ WidthRequest = 200,
+ BackgroundColor = Colors.Red,
+ CornerRadius = 20,
+ Shadow = new Shadow { Radius = 10 }
+ };
+
+ var updateButton = new Button
+ {
+ Text = "Update corner radius",
+ HeightRequest = 50,
+ AutomationId = "UpdateCornerRadiusButton"
+ };
+ updateButton.Clicked += (sender, e) =>
+ {
+ button.CornerRadius = 100;
+ imageButton.CornerRadius = 100;
+ };
+
+ Content = new VerticalStackLayout
+ {
+ Children =
+ {
+ button,
+ imageButton,
+ updateButton
+ }
+ };
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue20855.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue20855.cs
new file mode 100644
index 000000000000..21ab0b104b34
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue20855.cs
@@ -0,0 +1,86 @@
+using System.Collections.ObjectModel;
+using Microsoft.Maui.Layouts;
+
+namespace Maui.Controls.Sample.Issues
+{
+
+ [Issue(IssueTracker.Github, 20855, "Grouped CollectionView items not rendered properly on Android, works on Windows", PlatformAffected.Android)]
+ public class Issue20855 : TestContentPage
+ {
+
+ protected override void Init()
+ {
+ ObservableCollection ItemGroups = new ObservableCollection();
+ var group1 = new Issue20855ItemGroup { Name = "Group 1" };
+ group1.Add(new Issue20855Item { Name = "Item 1", CreateDate = new DateTime(2025, 2, 20) });
+ group1.Add(new Issue20855Item { Name = "Item 2", CreateDate = new DateTime(2025, 2, 19) });
+ ItemGroups.Add(group1);
+ var group2 = new Issue20855ItemGroup { Name = "Group 2" };
+ group2.Add(new Issue20855Item { Name = "Item 3", CreateDate = new DateTime(2025, 2, 18) });
+ group2.Add(new Issue20855Item { Name = "Item 4", CreateDate = new DateTime(2025, 2, 17) });
+ ItemGroups.Add(group2);
+
+ var collectionView = new CollectionView
+ {
+ ItemsSource = ItemGroups,
+ IsGrouped = true,
+ ItemSizingStrategy = ItemSizingStrategy.MeasureFirstItem
+ };
+ collectionView.GroupHeaderTemplate = new DataTemplate(() =>
+ {
+ var label = new Label
+ {
+ FontSize = 18,
+ BackgroundColor = Colors.DarkGray,
+ TextColor = Colors.White,
+ Padding = new Thickness(10, 0)
+ };
+ label.SetBinding(Label.TextProperty, "Name");
+
+ return label;
+ });
+ collectionView.ItemTemplate = new DataTemplate(() =>
+ {
+ var flexLayout = new FlexLayout
+ {
+ JustifyContent = FlexJustify.SpaceBetween,
+ AlignItems = FlexAlignItems.Center,
+ HeightRequest = 100
+ };
+
+ var nameLabel = new Label
+ {
+ Padding = new Thickness(8, 0),
+ HeightRequest = 80
+ };
+ nameLabel.SetBinding(Label.TextProperty, "Name");
+
+ var dateLabel = new Label
+ {
+ Padding = new Thickness(8, 0),
+ HeightRequest = 85
+ };
+ dateLabel.SetBinding(Label.TextProperty, new Binding("CreateDate", stringFormat: "{0:MMM d}"));
+
+ flexLayout.Children.Add(nameLabel);
+ flexLayout.Children.Add(dateLabel);
+
+ return flexLayout;
+ });
+ var grid = new Grid();
+ grid.Children.Add(collectionView);
+ Content = grid;
+ }
+ }
+
+ public class Issue20855Item
+ {
+ public string Name { get; set; }
+ public DateTime CreateDate { get; set; }
+ }
+
+ public class Issue20855ItemGroup : ObservableCollection
+ {
+ public string Name { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue20922.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue20922.cs
new file mode 100644
index 000000000000..f6b28ce63039
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue20922.cs
@@ -0,0 +1,30 @@
+namespace Maui.Controls.Sample.Issues
+{
+ [Issue(IssueTracker.Github, 20922, "Shadow Doesn't Work on Grid in scroll view on Android", PlatformAffected.Android)]
+ public class Issue20922 : ContentPage
+ {
+ public Issue20922()
+ {
+ var scrollView = new ScrollView();
+
+ var grid = new Grid
+ {
+ HeightRequest = 200,
+ WidthRequest = 200,
+ AutomationId = "Grid",
+ BackgroundColor = Colors.Red
+ };
+
+ var shadow = new Shadow
+ {
+ Radius = 20,
+ Brush = new SolidColorBrush(Colors.Gray),
+ Offset = new Point(1, 50)
+ };
+
+ grid.Shadow = shadow;
+ scrollView.Content = grid;
+ Content = scrollView;
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21037.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue21037.cs
new file mode 100644
index 000000000000..f45591cef0f9
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21037.cs
@@ -0,0 +1,137 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 21037, "Switching to an existing page with SetTitleView used in Flyout menu causes crash on Windows", PlatformAffected.UWP)]
+public class Issue21037 : FlyoutPage
+{
+ static Issue21037 flyoutPageInstance;
+
+ public Issue21037()
+ {
+ flyoutPageInstance = this;
+ var menuPage = new _21037MenuPage();
+ var homePage = new NavigationPage(new _21037MainPage());
+ var secondPage = new NavigationPage(new _21037SecondPage());
+
+ Flyout = menuPage;
+ Detail = homePage;
+ FlyoutLayoutBehavior = FlyoutLayoutBehavior.Popover;
+
+ menuPage.MenuItemSelected += (sender, page) =>
+ {
+ Detail = page switch
+ {
+ "Home" => homePage,
+ "Second" => secondPage,
+ _ => homePage
+ };
+ IsPresented = false;
+ };
+ }
+
+ public class _21037MenuPage : ContentPage
+ {
+ public event EventHandler MenuItemSelected;
+
+ public _21037MenuPage()
+ {
+ Title = "Menu";
+ Content = new VerticalStackLayout
+ {
+ Padding = 20,
+ Spacing = 10,
+ Children =
+ {
+ new Button
+ {
+ Text = "Home Page",
+ AutomationId = "HomeButton",
+ Command = new Command(() => MenuItemSelected?.Invoke(this, "Home"))
+ },
+ new Button
+ {
+ Text = "Second Page",
+ AutomationId = "SecondButton",
+ Command = new Command(() => MenuItemSelected?.Invoke(this, "Second"))
+ }
+ }
+ };
+ }
+ }
+
+ public class _21037MainPage : ContentPage
+ {
+ public _21037MainPage()
+ {
+ Title = "Home";
+
+ var titleView = new Button
+ {
+ Text = "Main Page Title",
+ HeightRequest = 44,
+ WidthRequest = 200,
+ AutomationId = "MainTitleButton"
+ };
+ NavigationPage.SetTitleView(this, titleView);
+
+ var openMenuButton = new Button
+ {
+ Text = "Open Menu",
+ AutomationId = "OpenMenuButton"
+ };
+ openMenuButton.Clicked += (s, e) => flyoutPageInstance.IsPresented = true;
+
+ Content = new VerticalStackLayout
+ {
+ Padding = 20,
+ Spacing = 10,
+ Children =
+ {
+ new Label
+ {
+ Text = "This is the Home Page with Button TitleView",
+ AutomationId = "HomeLabel"
+ },
+ openMenuButton
+ }
+ };
+ }
+ }
+
+ public class _21037SecondPage : ContentPage
+ {
+ public _21037SecondPage()
+ {
+ Title = "Second";
+
+ var titleView = new Slider
+ {
+ HeightRequest = 44,
+ WidthRequest = 300,
+ AutomationId = "SecondTitleSlider"
+ };
+ NavigationPage.SetTitleView(this, titleView);
+
+ var openMenuButton = new Button
+ {
+ Text = "Open Menu",
+ AutomationId = "OpenMenuButton"
+ };
+ openMenuButton.Clicked += (s, e) => flyoutPageInstance.IsPresented = true;
+
+ Content = new VerticalStackLayout
+ {
+ Padding = 20,
+ Spacing = 10,
+ Children =
+ {
+ new Label
+ {
+ Text = "This is Page 2 with Slider TitleView",
+ AutomationId = "SecondLabel"
+ },
+ openMenuButton
+ }
+ };
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21646.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue21646.cs
new file mode 100644
index 000000000000..937a8bd9fd83
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21646.cs
@@ -0,0 +1,82 @@
+using Microsoft.Maui.Controls;
+using System;
+
+namespace Maui.Controls.Sample.Issues
+{
+ [Issue(IssueTracker.Github, 21646, "Flyout icon should remain visible when a page is pushed onto a NavigationPage with the back button disabled.", PlatformAffected.iOS | PlatformAffected.Android, issueTestNumber: 1)]
+ public partial class Issue21646 : FlyoutPage
+ {
+ public Issue21646()
+ {
+ FlyoutLayoutBehavior = FlyoutLayoutBehavior.Popover;
+ var flyoutPage = new ContentPage
+ {
+ Title = "OK",
+ BackgroundColor = Colors.LightGray,
+ Content = new StackLayout
+ {
+ Padding = new Thickness(20),
+ Children =
+ {
+ new Label { Text = "Flyout Menu", FontSize = 20 },
+ new Button { Text = "Go to Home", Command = new Command(GoToHomePage) }
+ }
+ }
+ };
+
+ var navigateButton = new Button { Text = "Go to Next Page", AutomationId="NavigateToNextPageButton" };
+ navigateButton.Clicked += OnNavigateButtonClicked;
+
+ var detailPage = new NavigationPage(new ContentPage
+ {
+ Content = new StackLayout
+ {
+ Children =
+ {
+ new Label { Text = "Welcome to Home Page!", FontSize = 24 },
+ navigateButton
+ }
+ }
+ });
+
+ Flyout = flyoutPage;
+ Detail = detailPage;
+ }
+
+ private async void OnNavigateButtonClicked(object sender, EventArgs e)
+ {
+ if (Detail is NavigationPage navPage)
+ {
+ await PushPageNoBackAsync(navPage, new ContentPage
+ {
+ Title = "Second Page",
+ Content = new StackLayout
+ {
+ Children = { new Label { Text = "This is the second page!", AutomationId="SecondPageLabel" } }
+ }
+ });
+ }
+ }
+
+ public static async Task PushPageNoBackAsync(NavigationPage np, Page p)
+ {
+ NavigationPage.SetHasBackButton(p, false);
+ await np.PushAsync(p);
+ }
+
+ private void GoToHomePage()
+ {
+ if (Detail is NavigationPage navPage)
+ {
+ Detail = new NavigationPage(new ContentPage
+ {
+ Content = new StackLayout
+ {
+ Children = { new Label { Text = "Welcome Back to Home!" } }
+ }
+ });
+ IsPresented = false;
+ }
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21646_ShellFlyout.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue21646_ShellFlyout.cs
new file mode 100644
index 000000000000..abc8fb244e87
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21646_ShellFlyout.cs
@@ -0,0 +1,96 @@
+using Microsoft.Maui.Controls;
+using System;
+
+namespace Maui.Controls.Sample.Issues
+{
+ [Issue(IssueTracker.Github, 21646, "Flyout icon should remain visible when a page is pushed onto a ShellPage with the back button disabled.", PlatformAffected.iOS | PlatformAffected.Android, issueTestNumber: 2)]
+ public class Issue21646_ShellFlyout : Shell
+ {
+ public Issue21646_ShellFlyout()
+ {
+ FlyoutHeader = new StackLayout
+ {
+ Padding = new Thickness(20),
+ BackgroundColor = Colors.LightGray,
+ Children =
+ {
+ new Label
+ {
+ Text = "Flyout Menu",
+ FontSize = 20
+ }
+ }
+ };
+
+ Items.Add(new ShellContent
+ {
+ Title = "Home",
+ Route = "home",
+ Content = new HomePage()
+ });
+
+ Items.Add(new ShellContent
+ {
+ Title = "Second Page",
+ Route = "second",
+ Content = new SecondPage()
+ });
+ }
+ }
+
+ public class HomePage : ContentPage
+ {
+ public HomePage()
+ {
+ Routing.RegisterRoute("second", typeof(SecondPage));
+
+ Content = new StackLayout
+ {
+ Children =
+ {
+ new Label
+ {
+ Text = "Welcome to Home Page!",
+ FontSize = 24
+ },
+ new Button
+ {
+ Text = "Go to Next Page",
+ Command = new Command(async () => await OnNavigateButtonClicked()),
+ AutomationId = "NavigateToNextPageButton"
+ }
+ }
+ };
+ }
+
+ private async Task OnNavigateButtonClicked()
+ {
+ await PushPageNoBackAsync(new SecondPage());
+ }
+
+ public static async Task PushPageNoBackAsync(Page p)
+ {
+ Shell.SetBackButtonBehavior(p, new BackButtonBehavior { IsVisible = false });
+ await Shell.Current.Navigation.PushAsync(p);
+ }
+ }
+
+ public class SecondPage : ContentPage
+ {
+ public SecondPage()
+ {
+ Content = new StackLayout
+ {
+ Children =
+ {
+ new Label
+ {
+ Text = "This is the second page!",
+ FontSize = 24,
+ AutomationId = "SecondPageLabel"
+ }
+ }
+ };
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21828.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue21828.cs
new file mode 100644
index 000000000000..bebd1b221aad
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21828.cs
@@ -0,0 +1,64 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 21828, "Flyout icon disappears after root page replacement and pop", PlatformAffected.iOS)]
+public class Issue21828 : FlyoutPage
+{
+ public Issue21828()
+ {
+ Detail = new NavigationPage(new Issue21828Page1());
+ Flyout = new ContentPage
+ {
+ Title = "Flyout Page",
+ IconImageSource = "menu_icon.png",
+ Content = new Label
+ {
+ Text = "This is flyout",
+ VerticalOptions = LayoutOptions.Center,
+ HorizontalOptions = LayoutOptions.Center
+ }
+ };
+ FlyoutLayoutBehavior = FlyoutLayoutBehavior.Popover;
+ }
+}
+
+public class Issue21828Page1 : ContentPage
+{
+ public Issue21828Page1()
+ {
+ Title = "Start Page";
+ var insertAndPopButton = new Button { Text = "Insert Page Before and Pop", AutomationId = "InsertAndPopButton" };
+ insertAndPopButton.Clicked += InsertAndPopButton_Clicked;
+ Content = new StackLayout
+ {
+ VerticalOptions = LayoutOptions.Center,
+ HorizontalOptions = LayoutOptions.Center,
+ Children = { insertAndPopButton }
+ };
+ }
+
+ private async void InsertAndPopButton_Clicked(object sender, EventArgs e)
+ {
+ if (Parent is NavigationPage navPage)
+ {
+ navPage.Navigation.InsertPageBefore(new Issue21828Page2(), navPage.RootPage);
+ await navPage.Navigation.PopAsync();
+ }
+ }
+}
+
+public class Issue21828Page2 : ContentPage
+{
+ public Issue21828Page2()
+ {
+ Title = "End Page";
+ Content = new StackLayout
+ {
+ VerticalOptions = LayoutOptions.Center,
+ HorizontalOptions = LayoutOptions.Center,
+ Children =
+ {
+ new Label { Text = "Flyout icon is visible", AutomationId = "Page2Label" },
+ }
+ };
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22060.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue22060.cs
new file mode 100644
index 000000000000..1395598b0f43
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue22060.cs
@@ -0,0 +1,33 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 22060, "Flyout icon and content page title disappeared after focusing on the search handler", PlatformAffected.iOS)]
+public class Issue22060Shell : Shell
+{
+ public Issue22060Shell()
+ {
+ this.FlyoutBehavior = FlyoutBehavior.Flyout;
+
+ var shellContent = new ShellContent
+ {
+ Title = "Home",
+ Route = "MainPage",
+ Content = new Issue22060() { Title = "Home" }
+ };
+
+ Items.Add(shellContent);
+ }
+
+ class Issue22060 : ContentPage
+ {
+ public Issue22060()
+ {
+ Shell.SetSearchHandler(this, new SearchHandler
+ {
+ AutomationId = "searchHandler",
+ Placeholder = "SearchHandler",
+ });
+
+ this.SetBinding(TitleProperty, new Binding("Title", source: Shell.Current));
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22565.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue22565.cs
new file mode 100644
index 000000000000..92cce32fb134
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue22565.cs
@@ -0,0 +1,50 @@
+namespace Controls.TestCases.HostApp.Issues;
+
+[Issue(IssueTracker.Github, 22565, "A disabled Picker prevents the parent container's GestureRecognizer from being triggered", PlatformAffected.Android)]
+public class Issue22565 : ContentPage
+{
+ Label descriptionLabel;
+ public Issue22565()
+ {
+ VerticalStackLayout verticalStackLayout = new VerticalStackLayout
+ {
+ Padding = new Thickness(30, 0),
+ Spacing = 25
+ };
+
+ Grid grid = new Grid
+ {
+ Padding = 20,
+ BackgroundColor = Colors.DarkRed
+ };
+
+ Picker picker = new Picker
+ {
+ AutomationId = "DisabledPicker",
+ BackgroundColor = Colors.Gray,
+ IsEnabled = false
+ };
+
+ TapGestureRecognizer tapGesture = new TapGestureRecognizer();
+ tapGesture.Tapped += OnCounterClicked;
+
+ grid.GestureRecognizers.Add(tapGesture);
+ grid.Children.Add(picker);
+
+ descriptionLabel = new Label
+ {
+ AutomationId = "22565DescriptionLabel",
+ Text = "The test passes if the disabled Picker does not intercept the parent container's GestureRecognizer; otherwise, it fails.",
+ };
+
+ verticalStackLayout.Children.Add(grid);
+ verticalStackLayout.Children.Add(descriptionLabel);
+
+ Content = verticalStackLayout;
+ }
+
+ private void OnCounterClicked(object sender, EventArgs e)
+ {
+ descriptionLabel.Text = "Parent Gesture recognizer triggered";
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22887.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue22887.cs
new file mode 100644
index 000000000000..3861fd4d025c
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue22887.cs
@@ -0,0 +1,33 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 22887, "Microsoft.Maui.Controls.ImageSource.FromFile fails in iOS when image in subfolder")]
+public class Issue22887 : TestContentPage
+{
+ protected override void Init()
+ {
+ Content = CreateContent();
+ }
+
+ VerticalStackLayout CreateContent()
+ {
+ var image = new Image
+ {
+ Source = ImageSource.FromFile("subfolder/dotnet_bot_red.png"),
+ AutomationId = "ImageView"
+ };
+
+ return new VerticalStackLayout()
+ {
+ Padding = new Thickness(20),
+ Children =
+ {
+ image,
+ new Label
+ {
+ Text = "If the image is displayed, the test has passed.",
+ AutomationId = "descriptionLabel"
+ }
+ }
+ };
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22938.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue22938.cs
new file mode 100644
index 000000000000..e332732e6e37
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue22938.cs
@@ -0,0 +1,92 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 22938, "Keyboard focus does not shift to a newly opened modal page", PlatformAffected.All)]
+public class Issue22938 : ContentPage
+{
+ public Issue22938()
+ {
+ var clickCountLabel = new Label
+ {
+ Text = "0",
+ AutomationId = "ClickCountLabel",
+ FontSize = 24
+ };
+
+ var mainPageButton = new Button
+ {
+ Text = "Click Me",
+ AutomationId = "MainPageButton",
+ Command = new Command(() =>
+ {
+ int count = int.Parse(clickCountLabel.Text);
+ clickCountLabel.Text = (count + 1).ToString();
+ })
+ };
+
+ var openModalButton = new Button
+ {
+ Text = "Open Modal",
+ AutomationId = "OpenModalButton",
+ Command = new Command(async () =>
+ {
+ // Use semi-transparent background to match the reproduction scenario.
+ // This causes the underlying page to remain in the visual tree
+ // (ModalNavigationManager does not call RemovePage for non-default backgrounds).
+ var modalPage = new ContentPage
+ {
+ BackgroundColor = Color.FromArgb("#40808080"),
+ Content = new VerticalStackLayout
+ {
+ Spacing = 20,
+ Padding = new Thickness(30),
+ VerticalOptions = LayoutOptions.Center,
+ Children =
+ {
+ new Label
+ {
+ Text = "Modal Page",
+ AutomationId = "ModalPageLabel",
+ FontSize = 24,
+ HorizontalOptions = LayoutOptions.Center
+ },
+ new Entry
+ {
+ Placeholder = "Focus target on modal",
+ AutomationId = "ModalEntry"
+ },
+ new Button
+ {
+ Text = "Close Modal",
+ AutomationId = "CloseModalButton",
+ Command = new Command(async () =>
+ {
+ await Navigation.PopModalAsync();
+ })
+ }
+ }
+ }
+ };
+
+ await Navigation.PushModalAsync(modalPage);
+ })
+ };
+
+ Content = new VerticalStackLayout
+ {
+ Spacing = 20,
+ Padding = new Thickness(30),
+ VerticalOptions = LayoutOptions.Center,
+ Children =
+ {
+ new Label
+ {
+ Text = "Main Page - Issue 22938",
+ FontSize = 24
+ },
+ mainPageButton,
+ clickCountLabel,
+ openModalButton
+ }
+ };
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue23014.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue23014.xaml
new file mode 100644
index 000000000000..8b985af6d674
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue23014.xaml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue23014.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue23014.xaml.cs
new file mode 100644
index 000000000000..1dc7624d3d8a
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue23014.xaml.cs
@@ -0,0 +1,35 @@
+using System.Collections.ObjectModel;
+
+namespace Maui.Controls.Sample.Issues
+{
+ [Issue(IssueTracker.Github, 23014, "App crashes when calling ItemsView.ScrollTo on unloaded CollectionView", PlatformAffected.All)]
+ public partial class Issue23014 : ContentPage
+ {
+ public Issue23014()
+ {
+ InitializeComponent();
+ BindingContext = new Issue23014ViewModel();
+ }
+
+ private void OnRemoveAndScrollToClicked(object sender, EventArgs e)
+ {
+ Stack.Remove(ItemList);
+
+ try
+ {
+ ItemList.ScrollTo(0);
+ ItemList.ScrollTo("Foo");
+ StatusLabel.Text = "Success";
+ }
+ catch (Exception ex)
+ {
+ StatusLabel.Text = $"Fail: {ex.Message}";
+ }
+ }
+ }
+
+ public class Issue23014ViewModel
+ {
+ public ObservableCollection Items { get; } = ["Foo", "Bar", "Baz", "Goo"];
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue23377.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue23377.cs
new file mode 100644
index 000000000000..b75b4f219ca6
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue23377.cs
@@ -0,0 +1,57 @@
+namespace Maui.Controls.Sample.Issues;
+[Issue(IssueTracker.Github, 23377, "Horizontal Item spacing in collectionView", PlatformAffected.UWP)]
+public class Issue23377 : TestContentPage
+{
+ public List Items { get; set; }
+ private Button button;
+ private CollectionView collectionView;
+
+ protected override void Init()
+ {
+ Items = new List
+ {
+ "Item 1", "Item 2", "Item 3", "Item 4",
+ "Item 5", "Item 6", "Item 7", "Item 8", "Item 9"
+ };
+ BindingContext = this;
+
+ var VerticalStackLayout = new VerticalStackLayout();
+
+ button = new Button
+ {
+ Text = "Change Item Space",
+ AutomationId = "ChangeItemSpace"
+ };
+
+ button.Clicked += Button_Clicked;
+
+ collectionView = new CollectionView
+ {
+ ItemsSource = Items,
+ Margin = new Thickness(100),
+ ItemsLayout = new LinearItemsLayout(ItemsLayoutOrientation.Horizontal),
+ HeightRequest = 200,
+ HorizontalScrollBarVisibility = ScrollBarVisibility.Never
+ };
+
+ collectionView.ItemTemplate = new DataTemplate(() =>
+ {
+ var label = new Label();
+ label.SetBinding(Label.TextProperty, ".");
+ return label;
+ });
+
+ VerticalStackLayout.Children.Add(collectionView);
+ VerticalStackLayout.Children.Add(button);
+
+ Content = VerticalStackLayout;
+ }
+
+ void Button_Clicked(object sender, EventArgs e)
+ {
+ if (collectionView.ItemsLayout is LinearItemsLayout linearItemsLayout)
+ {
+ linearItemsLayout.ItemSpacing = 80;
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue23832.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue23832.cs
new file mode 100644
index 000000000000..e721b4997e10
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue23832.cs
@@ -0,0 +1,53 @@
+using Microsoft.Maui.Graphics.Platform;
+using System.Reflection;
+using IImage = Microsoft.Maui.Graphics.IImage;
+
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 23832, "Some HEIC photos are upside down after using PlatformImage.Resize", PlatformAffected.Android | PlatformAffected.iOS)]
+public class Issue23832 : ContentPage
+{
+ public Issue23832()
+ {
+ VerticalStackLayout stackLayout = new VerticalStackLayout
+ {
+ Padding = new Thickness(20),
+ Spacing = 25,
+ };
+
+ Label labelResize = new Label
+ {
+ AutomationId = "DrawableLabel",
+ Text = "The test passes if the image is displayed correctly without being upside down.",
+ };
+
+ GraphicsView graphicsView = new GraphicsView
+ {
+ Drawable = new Issue23832_Drawable(),
+ HeightRequest = 300,
+ WidthRequest = 400,
+ };
+
+ stackLayout.Children.Add(graphicsView);
+ stackLayout.Children.Add(labelResize);
+ Content = stackLayout;
+ }
+}
+
+internal class Issue23832_Drawable : IDrawable
+{
+ public void Draw(ICanvas canvas, RectF dirtyRect)
+ {
+ IImage image;
+ Assembly assembly = GetType().GetTypeInfo().Assembly;
+ using (Stream stream = assembly.GetManifestResourceStream("Controls.TestCases.HostApp.Resources.Images.img_0111.heic"))
+ {
+ image = PlatformImage.FromStream(stream);
+ }
+
+ if (image is not null)
+ {
+ canvas.DrawImage(image, 0, 0, 300, 300);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue24252.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue24252.cs
new file mode 100644
index 000000000000..0c930527b5ca
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue24252.cs
@@ -0,0 +1,179 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 24252, "Overlapping gesture recognizers should only fire on the topmost child view on Windows", PlatformAffected.UWP)]
+public class Issue24252 : ContentPage
+{
+ public Issue24252()
+ {
+ Content = new VerticalStackLayout
+ {
+ Padding = 20,
+ Spacing = 15,
+ Children =
+ {
+ CreatePanSection(),
+ CreateSwipeSection(),
+ CreatePinchSection()
+ }
+ };
+ }
+
+ static View CreatePanSection()
+ {
+ var statusLabel = new Label { Text = "None", AutomationId = "PanStatusLabel" };
+
+ var parent = new Grid
+ {
+ BackgroundColor = Colors.LightBlue,
+ WidthRequest = 250,
+ HeightRequest = 150,
+ HorizontalOptions = LayoutOptions.Center
+ };
+
+ var parentPan = new PanGestureRecognizer();
+ parentPan.PanUpdated += (s, e) =>
+ {
+ if (e.StatusType == GestureStatus.Started)
+ {
+ statusLabel.Text = "Parent triggered";
+ }
+ };
+ parent.GestureRecognizers.Add(parentPan);
+
+ var child = new Image
+ {
+ Source = "dotnet_bot.png",
+ WidthRequest = 120,
+ HeightRequest = 100,
+ BackgroundColor = Colors.Orange,
+ HorizontalOptions = LayoutOptions.Center,
+ VerticalOptions = LayoutOptions.Center,
+ AutomationId = "PanChildBox"
+ };
+
+ var childPan = new PanGestureRecognizer();
+ childPan.PanUpdated += (s, e) =>
+ {
+ if (e.StatusType == GestureStatus.Started)
+ {
+ statusLabel.Text = "Child triggered";
+ }
+ };
+ child.GestureRecognizers.Add(childPan);
+
+ parent.Children.Add(child);
+
+ return new VerticalStackLayout
+ {
+ Spacing = 5,
+ Children =
+ {
+ new Label { Text = "Pan: Drag on orange child", FontAttributes = FontAttributes.Bold },
+ statusLabel,
+ parent
+ }
+ };
+ }
+
+ static View CreateSwipeSection()
+ {
+ var statusLabel = new Label { Text = "None", AutomationId = "SwipeStatusLabel" };
+
+ var parent = new Grid
+ {
+ BackgroundColor = Colors.LightGreen,
+ WidthRequest = 250,
+ HeightRequest = 150,
+ HorizontalOptions = LayoutOptions.Center
+ };
+
+ var parentSwipe = new SwipeGestureRecognizer { Direction = SwipeDirection.Right };
+ parentSwipe.Swiped += (s, e) => statusLabel.Text = "Parent triggered";
+ parent.GestureRecognizers.Add(parentSwipe);
+
+ var child = new Image
+ {
+ Source = "dotnet_bot.png",
+ WidthRequest = 120,
+ HeightRequest = 100,
+ BackgroundColor = Colors.Orange,
+ HorizontalOptions = LayoutOptions.Center,
+ VerticalOptions = LayoutOptions.Center,
+ AutomationId = "SwipeChildBox"
+ };
+
+ var childSwipe = new SwipeGestureRecognizer { Direction = SwipeDirection.Right };
+ childSwipe.Swiped += (s, e) => statusLabel.Text = "Child triggered";
+ child.GestureRecognizers.Add(childSwipe);
+
+ parent.Children.Add(child);
+
+ return new VerticalStackLayout
+ {
+ Spacing = 5,
+ Children =
+ {
+ new Label { Text = "Swipe: Swipe right on orange child", FontAttributes = FontAttributes.Bold },
+ statusLabel,
+ parent
+ }
+ };
+ }
+
+ static View CreatePinchSection()
+ {
+ var statusLabel = new Label { Text = "None", AutomationId = "PinchStatusLabel" };
+
+ var parent = new Grid
+ {
+ BackgroundColor = Colors.LightCoral,
+ WidthRequest = 250,
+ HeightRequest = 150,
+ HorizontalOptions = LayoutOptions.Center
+ };
+
+ var parentPinch = new PinchGestureRecognizer();
+ parentPinch.PinchUpdated += (s, e) =>
+ {
+ if (e.Status == GestureStatus.Started)
+ {
+ statusLabel.Text = "Parent triggered";
+ }
+ };
+ parent.GestureRecognizers.Add(parentPinch);
+
+ var child = new Image
+ {
+ Source = "dotnet_bot.png",
+ WidthRequest = 150,
+ HeightRequest = 150,
+ BackgroundColor = Colors.Orange,
+ HorizontalOptions = LayoutOptions.Center,
+ VerticalOptions = LayoutOptions.Center,
+ AutomationId = "PinchChildBox"
+ };
+
+ var childPinch = new PinchGestureRecognizer();
+ childPinch.PinchUpdated += (s, e) =>
+ {
+ if (e.Status == GestureStatus.Started)
+ {
+ statusLabel.Text = "Child triggered";
+ }
+ };
+ child.GestureRecognizers.Add(childPinch);
+
+ parent.Children.Add(child);
+
+ return new VerticalStackLayout
+ {
+ Spacing = 5,
+ Children =
+ {
+ new Label { Text = "Pinch: Pinch on orange child", FontAttributes = FontAttributes.Bold },
+ statusLabel,
+ parent
+ }
+ };
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25081.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue25081.cs
new file mode 100644
index 000000000000..f0a680aebaad
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue25081.cs
@@ -0,0 +1,71 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 25081, "[Windows] The flyout icon and background appear awkward when enabled alongside a TitleBar", PlatformAffected.UWP)]
+public class Issue25081 : TestShell
+{
+ protected override void Init()
+ {
+ FlyoutBehavior = FlyoutBehavior.Flyout;
+
+ var content = new Issue25081ContentPage();
+
+ Items.Add(new ShellContent
+ {
+ Title = "Home",
+ Route = "MainPage",
+ Content = content
+ });
+ }
+}
+
+public class Issue25081ContentPage : ContentPage
+{
+ TitleBar customTitleBar;
+
+ public Issue25081ContentPage()
+ {
+ customTitleBar = new TitleBar
+ {
+ Title = "MauiApp1",
+ Subtitle = "Welcome to .NET MAUI",
+ HeightRequest = 32,
+ BackgroundColor = Colors.YellowGreen
+ };
+
+ var button = new Button
+ {
+ Text = "Change Background color",
+ AutomationId = "ColorChangeButton",
+ VerticalOptions = LayoutOptions.Center,
+ HorizontalOptions = LayoutOptions.Center,
+ };
+
+ button.Clicked += (sender, e) =>
+ {
+ customTitleBar.BackgroundColor = Colors.Cyan;
+ };
+
+ var verticalStackLayout = new VerticalStackLayout()
+ {
+ Spacing = 20,
+ Padding = new Thickness(20),
+ };
+
+ verticalStackLayout.Add(button);
+
+ Content = verticalStackLayout;
+ }
+
+ protected override void OnAppearing()
+ {
+ base.OnAppearing();
+ if (Window is not null)
+ {
+ Window.TitleBar = customTitleBar;
+ }
+ else if (Shell.Current?.Window is not null)
+ {
+ Shell.Current.Window.TitleBar = customTitleBar;
+ }
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25093.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue25093.cs
new file mode 100644
index 000000000000..7630d67a2327
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue25093.cs
@@ -0,0 +1,73 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 25093, "[iOS] TintColor on UIButton image no longer working when button made visible", PlatformAffected.iOS)]
+public class Issue25093 : ContentPage
+{
+ public Issue25093()
+ {
+ var tintedButton = new Button
+ {
+ AutomationId = "TintedButton",
+ ImageSource = "red.png",
+ BackgroundColor = Colors.Black,
+ WidthRequest = 200,
+ HeightRequest = 200
+ };
+
+ var statusLabel = new Label
+ {
+ AutomationId = "StatusLabel",
+ Text = "Waiting"
+ };
+
+ var applyTintButton = new Button
+ {
+ Text = "Apply Tint and Resize",
+ AutomationId = "ApplyTintButton"
+ };
+
+ applyTintButton.Clicked += (s, e) =>
+ {
+#if IOS || MACCATALYST
+ if (tintedButton.Handler?.PlatformView is UIKit.UIButton platformButton)
+ {
+ // Simulate IconTintColorBehavior: set AlwaysTemplate + tint color
+ var image = platformButton.ImageView?.Image?.ImageWithRenderingMode(UIKit.UIImageRenderingMode.AlwaysTemplate);
+ if (image is not null)
+ {
+ platformButton.SetImage(image, UIKit.UIControlState.Normal);
+ platformButton.TintColor = UIKit.UIColor.Green;
+ platformButton.ImageView.TintColor = UIKit.UIColor.Green;
+ }
+
+ // Verify rendering mode is preserved after resize triggers ResizeImageIfNecessary
+ void OnSizeChanged(object sender, EventArgs args)
+ {
+ tintedButton.SizeChanged -= OnSizeChanged;
+ var currentMode = platformButton.ImageView?.Image?.RenderingMode;
+ statusLabel.Text = currentMode == UIKit.UIImageRenderingMode.AlwaysTemplate
+ ? "PASS"
+ : $"FAIL: RenderingMode is {currentMode}";
+ }
+
+ tintedButton.SizeChanged += OnSizeChanged;
+
+ // Shrink to trigger ResizeImageIfNecessary during the next measure pass
+ tintedButton.WidthRequest = 100;
+ tintedButton.HeightRequest = 100;
+ }
+ else
+ {
+ statusLabel.Text = "PASS";
+ }
+#else
+ statusLabel.Text = "PASS";
+#endif
+ };
+
+ Content = new VerticalStackLayout
+ {
+ Children = { applyTintButton, tintedButton, statusLabel }
+ };
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25233.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue25233.xaml
new file mode 100644
index 000000000000..ab115de3d951
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue25233.xaml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25233.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue25233.xaml.cs
new file mode 100644
index 000000000000..3d1e12aa78a4
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue25233.xaml.cs
@@ -0,0 +1,17 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 25233, "CollectionView with SwipeView items behaves strangely", PlatformAffected.All)]
+
+public partial class Issue25233 : ContentPage
+{
+ public Issue25233()
+ {
+ InitializeComponent();
+ cv.ItemsSource = Enumerable.Range(1, 15).Select(i => $"Item{i}");
+ }
+
+ private void Button_Clicked(object sender, EventArgs e)
+ {
+ cv.ScrollTo(14, position: ScrollToPosition.End, animate: false);
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25502.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue25502.cs
deleted file mode 100644
index 708e68ed2e6a..000000000000
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue25502.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-namespace Maui.Controls.Sample.Issues
-{
-
- [Issue(IssueTracker.Github, 25502, "Gray Line Appears on the Right Side of GraphicsView with Decimal WidthRequest on iOS Platform", PlatformAffected.iOS)]
- public class Issue25502 : ContentPage
- {
- public Issue25502()
- {
- GraphicsView graphicsView = new GraphicsView
- {
- AutomationId = "GraphicsView",
- HeightRequest = 200.25,
- WidthRequest = 248.25,
- BackgroundColor = Colors.White,
- Margin = new Thickness(20),
- };
- graphicsView.Drawable = new GraphicsDrawable(graphicsView);
-
- Button changeColorButton = new Button
- {
- Text = "Click to change Color",
- AutomationId = "ChangeColorButton"
- };
-
- changeColorButton.Clicked += ChangeColorButton_Clicked;
-
- Content = new StackLayout
- {
- Spacing = 10,
- Children =
- {
- graphicsView,
- changeColorButton
- }
- };
-
- void ChangeColorButton_Clicked(object sender, EventArgs e)
- {
- graphicsView.BackgroundColor = Colors.Yellow;
- }
- }
-
- public class GraphicsDrawable : IDrawable
- {
- GraphicsView _graphicsView;
- public GraphicsDrawable(GraphicsView graphicsView)
- {
- _graphicsView = graphicsView;
- }
-
- public void Draw(ICanvas canvas, RectF dirtyRect)
- {
- canvas.FillColor = _graphicsView.BackgroundColor;
- canvas.FillRectangle(new RectF(dirtyRect.X, dirtyRect.Y + 40, dirtyRect.Width - 40, dirtyRect.Height - 40));
- }
- }
- }
-}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25728.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue25728.cs
new file mode 100644
index 000000000000..a4a729597313
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue25728.cs
@@ -0,0 +1,52 @@
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 25728, "Java.Lang.IllegalArgumentException when clearing Entry text with StringFormat binding on Android", PlatformAffected.Android)]
+public class Issue25728 : ContentPage
+{
+ public Issue25728()
+ {
+ var vm = new Issue25728ViewModel();
+
+ var entry = new Entry
+ {
+ Keyboard = Keyboard.Numeric,
+ AutomationId = "FloatEntry"
+ };
+ entry.SetBinding(Entry.TextProperty, new Binding(nameof(Issue25728ViewModel.FloatValue), stringFormat: "{0:F2}"));
+
+ BindingContext = vm;
+
+ Content = new VerticalStackLayout
+ {
+ Padding = new Thickness(30, 0),
+ Spacing = 25,
+ Children = { entry }
+ };
+ }
+
+ public class Issue25728ViewModel : INotifyPropertyChanged
+ {
+ float _floatValue;
+
+ public float FloatValue
+ {
+ get => _floatValue;
+ set
+ {
+ if (!Equals(_floatValue, value))
+ {
+ _floatValue = value;
+ OnPropertyChanged();
+ }
+ }
+ }
+
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ void OnPropertyChanged([CallerMemberName] string propertyName = null) =>
+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+ }
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue25921.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue25921.cs
new file mode 100644
index 000000000000..5d79bbc8de17
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue25921.cs
@@ -0,0 +1,46 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 25921, "[Windows] Setting BackgroundColor for Slider updates the Maximum Track Color", PlatformAffected.UWP)]
+public class Issue25921 : ContentPage
+{
+ public Issue25921()
+ {
+ var layout = new VerticalStackLayout();
+ layout.VerticalOptions = LayoutOptions.Center;
+ layout.Spacing = 20;
+ var slider = new Slider()
+ {
+ WidthRequest = 300,
+ Maximum = 100,
+ Minimum = 0,
+ Value = 50,
+ BackgroundColor = Colors.Yellow,
+ MaximumTrackColor = Colors.Red,
+ MinimumTrackColor = Colors.Fuchsia,
+ };
+
+ var secondSlider = new Slider()
+ {
+ WidthRequest = 300,
+ Maximum = 100,
+ Minimum = 0,
+ Value = 50,
+ Background = Colors.Grey,
+ MaximumTrackColor = Colors.SpringGreen,
+ MinimumTrackColor = Colors.BlueViolet,
+ };
+
+ var button = new Button()
+ {
+ Text = "Change Background Color",
+ AutomationId = "ColorChangeButton",
+ Command = new Command(() => secondSlider.Background = Colors.Salmon)
+ };
+
+ layout.Children.Add(slider);
+ layout.Children.Add(secondSlider);
+ layout.Children.Add(button);
+
+ Content = layout;
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue26158.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue26158.cs
new file mode 100644
index 000000000000..e82df5463e9c
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue26158.cs
@@ -0,0 +1,23 @@
+namespace Maui.Controls.Sample.Issues
+{
+ [Issue(IssueTracker.Github, 26158, "SelectionLength property not applied when an entry is focused", PlatformAffected.Android | PlatformAffected.iOS)]
+ public class Issue26158 : ContentPage
+ {
+ public Issue26158()
+ {
+ Entry entry = new Entry()
+ {
+ AutomationId = "entry",
+ Text = "Microsoft Maui Entry",
+ };
+
+ entry.Focused += (s, e) =>
+ {
+ entry.CursorPosition = 0;
+ entry.SelectionLength = 4;
+ };
+
+ Content = entry;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue26187.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue26187.cs
index 764d78a25afe..18530870e834 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue26187.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue26187.cs
@@ -15,8 +15,6 @@ public class CollectionViewSelectedItemNullPage : ContentPage
{
public ObservableCollection Items { get; set; }
- public string SelectedItem { get; set; }
-
public CollectionViewSelectedItemNullPage()
{
Items = new ObservableCollection
@@ -27,7 +25,6 @@ public CollectionViewSelectedItemNullPage()
"Item 4",
"Item 5"
};
- SelectedItem = Items.LastOrDefault();
var cv = new CollectionView
{
SelectionMode = SelectionMode.Single,
@@ -51,20 +48,16 @@ public CollectionViewSelectedItemNullPage()
};
cv.SetBinding(CollectionView.ItemsSourceProperty, new Binding(nameof(Items)));
- // cv.SetBinding(CollectionView.SelectedItemProperty, new Binding(nameof(SelectedItem)));
Content = cv;
-
BindingContext = this;
- // cv.SelectedItem = SelectedItem;
-
cv.SelectionChanged += CollectionView_SelectionChanged;
}
- async void CollectionView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ void CollectionView_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
if (e.CurrentSelection.FirstOrDefault() is string issue)
{
- await Navigation.PushAsync(new NewPage(issue));
+ _ = Navigation.PushAsync(new NewPage(issue));
}
// Clear Selection
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue26864.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue26864.cs
new file mode 100644
index 000000000000..e17d1912444d
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue26864.cs
@@ -0,0 +1,39 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 26864, "Shell Content Title Not Rendering in Full-Screen Mode on Mac Catalyst", PlatformAffected.macOS)]
+public class Issue26864 : Shell
+{
+ public Issue26864()
+ {
+ var tabBar = new TabBar
+ {
+ AutomationId = "TabBar"
+ };
+ var tab = new Tab
+ {
+ Title = "Nested Tabs",
+ AutomationId = "tabbar"
+ };
+ var homeShellContent = new ShellContent
+ {
+ Title = "Home",
+ Content = new ContentPage
+ {
+ BackgroundColor = Microsoft.Maui.Graphics.Colors.White
+ }
+ };
+ var settingsShellContent = new ShellContent
+ {
+ Title = "Settings",
+ Content = new ContentPage
+ {
+ BackgroundColor = Microsoft.Maui.Graphics.Colors.White
+ }
+ };
+ tab.Items.Add(homeShellContent);
+ tab.Items.Add(settingsShellContent);
+ tabBar.Items.Add(tab);
+ this.Items.Add(tabBar);
+ }
+
+}
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue2708.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue2708.xaml
new file mode 100644
index 000000000000..9e21c5aa290a
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue2708.xaml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue2708.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue2708.xaml.cs
new file mode 100644
index 000000000000..619184ce1b8a
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue2708.xaml.cs
@@ -0,0 +1,64 @@
+namespace Maui.Controls.Sample.Issues
+{
+ [Issue(IssueTracker.Github, 2708, "Prevent tabs from being removed during modal navigation", PlatformAffected.Android)]
+ public partial class Issue2708 : TabbedPage
+ {
+ public Issue2708()
+ {
+ InitializeComponent();
+ }
+
+ async void OnOpenModalClicked(object sender, EventArgs e)
+ {
+ await Navigation.PushModalAsync(new Issue2708Modal());
+ }
+ }
+
+ public class Issue2708Modal : ContentPage
+ {
+ public Issue2708Modal()
+ {
+ Title = "Modal Page";
+
+ // Use a semi-transparent background so tabs can be verified as visible behind the modal
+ BackgroundColor = Color.FromArgb("#80000000");
+
+ var layout = new StackLayout
+ {
+ Padding = new Thickness(20),
+ BackgroundColor = Colors.White,
+ VerticalOptions = LayoutOptions.Center,
+ HorizontalOptions = LayoutOptions.Center,
+ WidthRequest = 300,
+ Children =
+ {
+ new Label
+ {
+ Text = "This is a modal page",
+ FontSize = 18,
+ HorizontalOptions = LayoutOptions.Center
+ },
+ new Label
+ {
+ Text = "The tabs should still be visible behind this modal on Android",
+ FontSize = 14,
+ HorizontalOptions = LayoutOptions.Center
+ },
+ new Button
+ {
+ Text = "Close Modal",
+ AutomationId = "CloseModalButton"
+ }
+ }
+ };
+
+ var closeButton = layout.Children.OfType