Revert "February 21st, 2026 Candidate Branch" by jfversluis · Pull Request #34292 · dotnet/maui

jfversluis · 2026-03-02T14:02:38Z

This reverts commit 6f3847e.

github-actions · 2026-03-02T14:02:50Z

🚀 Dogfood this PR with:

⚠️ WARNING: Do not do this without first carefully reviewing the code of this PR to satisfy yourself it is safe.

curl -fsSL https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.sh | bash -s -- 34292

Or

Run remotely in PowerShell:

iex "& { $(irm https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.ps1) } 34292"

Copilot

Pull request overview

This PR reverts "February 21st, 2026 Candidate Branch" (#34173), undoing a batch of changes that were merged into the main branch. The revert removes iOS 26-specific workarounds from UI tests, removes several new test files and host app pages, and reverts functional code changes in both Android and iOS platform handlers.

Changes:

Removes iOS 26-specific Assert.Ignore guards and conditional back-arrow logic from numerous UI tests, restoring original test behavior
Deletes newly added test files (Issue27117, Issue28827, Issue31445, Issue31680, Issue32223, Issue32867, Issue33523, Issue33690, etc.) from both TestCases.HostApp and TestCases.Shared.Tests
Reverts functional changes in Android/iOS source code including TapAndPanGestureDetector, ToolbarExtensions, ShellNavigationManager, MauiRecyclerView, and others

Reviewed changes

Copilot reviewed 109 out of 933 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
`eng/pipelines/common/ui-tests.yml`	Reverts iOS test version from 26.0 back to 18.5
`eng/pipelines/ci-uitests.yml`	Reverts iOS test versions from `18.5`/`latest` to `18.4`
`src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs`	Reverts ScrollTo index offset logic for ungrouped source with header
`src/Controls/src/Core/Handlers/Items/Android/MauiCarouselRecyclerView.cs`	Reverts guard for `carouselPosition < 0` in `SetCurrentItem`
`src/Controls/src/Core/Handlers/Items/Android/SimpleItemTouchHelperCallback.cs`	Reverts reorder blocking logic to original view-type equality check
`src/Controls/src/Core/Handlers/Items/Android/RecyclerViewScrollListener.cs`	Reverts scroll offset reset-on-empty logic
`src/Controls/src/Core/Handlers/Items/Android/ObservableGroupedSource.cs`	Reverts group source null-check refactor
`src/Controls/src/Core/Platform/Android/TapAndPanGestureDetector.cs`	Reverts pointer gesture handling and return value logic
`src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs`	Reverts duplicate title icon prevention fix
`src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellToolbarTracker.cs`	Reverts `OnBackButtonPressed` interception in `OnNavigateBack`
`src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellPageRendererTracker.cs`	Reverts iOS 26 tint color fix and foreground color variable scope
`src/Controls/src/Core/InputView/InputView.Platform.cs`	Reverts `MapIsVisible` keyboard-dismiss logic for hidden inputs
`src/Controls/src/Core/Entry/Entry.Mapper.cs`	Reverts `MapIsVisible` mapper registration for Entry
`src/Controls/src/Core/Editor/Editor.Mapper.cs`	Reverts `MapIsVisible` mapper registration for Editor
`src/Controls/src/Core/Shell/ShellNavigationManager.cs`	Reverts iOS/MacCatalyst route deduplication logic
`src/Controls/src/Core/Handlers/Items/CarouselViewHandler.Android.cs`	Reverts `Position < 0` guard in `MapPosition`
Multiple `TestCases.Shared.Tests` files	Removes iOS 26 guards and restores original back-arrow/test logic
Multiple `TestCases.HostApp` files	Removes new host app issue pages added in the candidate branch
`.github/agent-pr-session/pr-31487.md`	Removes agent PR session document

Comments suppressed due to low confidence (1)

src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs:1

The reverted code always creates a new ToolbarTitleIconImageView and adds it at index 0 without checking whether one already exists. This reintroduces the duplicate title icon bug that was fixed in the candidate branch: calling SetTitleIconImageSource more than once for the same page will add a new icon each time, resulting in multiple icons in the toolbar.

using System;

Copilot · 2026-03-02T14:03:51Z

src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs

+				if (ItemsViewAdapter.ItemsSource is UngroupedItemsSource)
 				{
-					return ungroupedSource.HasHeader ? args.Index + 1 : args.Index;
+					return args.Index;
 				}


The reverted code returns args.Index directly for UngroupedItemsSource, even when the source has a header. The removed code accounted for the header offset (ungroupedSource.HasHeader ? args.Index + 1 : args.Index), so reverting this will cause ScrollTo by index to land on the wrong item when a header is present in the CollectionView.

Copilot · 2026-03-02T14:03:52Z

src/Controls/src/Core/Handlers/Items/Android/RecyclerViewScrollListener.cs

+			// See https://stackoverflow.com/questions/27507715/android-how-to-get-the-current-x-offset-of-recyclerview
+			_horizontalOffset += dx;
+			_verticalOffset += dy;



The removed code reset _horizontalOffset and _verticalOffset to 0 when the adapter's item count is 0. Without that reset, the accumulated offsets will carry over incorrectly after the CollectionView items are cleared and repopulated, causing the Scrolled event to report stale offset values.

Suggested change

// When there are no items, reset the accumulated offsets so that

// subsequent scrolled events after repopulating the items do not

// report stale offset values from the previous dataset.

if (ItemsViewAdapter?.ItemsSource?.Count == 0)

{

_horizontalOffset = 0;

_verticalOffset = 0;

}

Copilot · 2026-03-02T14:03:53Z

src/Controls/src/Core/Handlers/Items/Android/SimpleItemTouchHelperCallback.cs

-			var targetViewType = target.ItemViewType;
-			if (targetViewType == ItemViewType.Header || targetViewType == ItemViewType.Footer
-				|| targetViewType == ItemViewType.GroupHeader || targetViewType == ItemViewType.GroupFooter)
+			if (viewHolder.ItemViewType != target.ItemViewType)


The reverted condition blocks reordering between items of different view types. This prevents items from being reordered onto Header, Footer, GroupHeader, or GroupFooter positions, but it also prevents reordering between items that use a DataTemplateSelector (which can produce different view types for regular items). The removed code only blocked reordering onto structural elements, which is the correct behavior. This revert reintroduces the original bug where drag-and-drop reordering fails for CollectionViews using DataTemplateSelector.

Suggested change

if (viewHolder.ItemViewType != target.ItemViewType)

var targetViewType = target.ItemViewType;

if (targetViewType == ItemViewType.Header || targetViewType == ItemViewType.Footer

|| targetViewType == ItemViewType.GroupHeader || targetViewType == ItemViewType.GroupFooter)

Copilot · 2026-03-02T14:03:53Z

src/Controls/src/Core/Handlers/Items/Android/MauiCarouselRecyclerView.cs

+			if (ItemsViewAdapter?.ItemsSource?.Count == 0)
 				return;

 			var item = ItemsViewAdapter.ItemsSource.GetItem(carouselPosition);


The removed guard carouselPosition < 0 has been reverted. Without it, passing a negative carouselPosition (e.g., -1) to SetCurrentItem will proceed to call ItemsViewAdapter.ItemsSource.GetItem(carouselPosition) with a negative index, which is likely to throw an ArgumentOutOfRangeException.

Suggested change

if (ItemsViewAdapter?.ItemsSource?.Count == 0)

return;

var item = ItemsViewAdapter.ItemsSource.GetItem(carouselPosition);

var itemsSource = ItemsViewAdapter?.ItemsSource;

var count = itemsSource?.Count ?? 0;

// Guard against invalid positions (including negative indices)

if (itemsSource == null || count == 0 || carouselPosition < 0 || carouselPosition >= count)

return;

var item = itemsSource.GetItem(carouselPosition);

Copilot · 2026-03-02T14:03:53Z

src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellToolbarTracker.cs

@@ -233,10 +233,6 @@ protected async virtual void OnNavigateBack()
 		{
 			try
 			{


The removed code called Page?.SendBackButtonPressed() before popping the navigation stack, allowing the page to intercept the back navigation via OnBackButtonPressed. Without this call, tapping the Shell navigation bar back button on Android will always pop the page, bypassing any custom OnBackButtonPressed override on the page. This reintroduces the issue originally fixed for Issue33523.

Suggested change

{

{

// Allow the current page to intercept the back navigation via OnBackButtonPressed

// If SendBackButtonPressed returns true, the back press has been handled and

// we should not pop the navigation stack.

if (Page?.SendBackButtonPressed() ?? false)

return;

Copilot · 2026-03-02T14:03:54Z

src/Controls/src/Core/InputView/InputView.Platform.cs

@@ -15,21 +14,6 @@ internal static void MapIsFocused(IViewHandler handler, IView view)
 					?.UpdateFocusForView(iv);
 			}
 		}


The removed MapIsVisible method, which dismissed the soft keyboard when an InputView (Entry/Editor) is hidden, has been reverted. This reintroduces the original problem where typing can continue in a hidden input field on Android and iOS, because the soft keyboard is not dismissed when IsVisible is set to false.

Suggested change

}

}

internal static void MapIsVisible(IViewHandler handler, IView view)

{

if (view is InputView iv)

{

handler

?.GetService<HideSoftInputOnTappedChangedManager>()

?.UpdateFocusForView(iv);

}

}

Revert "February 21st, 2026 Candidate Branch (#34173)"

d659aa9

This reverts commit 6f3847e.

Copilot AI review requested due to automatic review settings March 2, 2026 14:02

jfversluis merged commit e26c222 into main Mar 2, 2026
2 of 3 checks passed

jfversluis deleted the revert-34173-inflight/candidate branch March 2, 2026 14:02

Copilot AI reviewed Mar 2, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Revert "February 21st, 2026 Candidate Branch"#34292

Revert "February 21st, 2026 Candidate Branch"#34292
jfversluis merged 1 commit intomainfrom
revert-34173-inflight/candidate

jfversluis commented Mar 2, 2026

Uh oh!

github-actions bot commented Mar 2, 2026

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Mar 2, 2026

Uh oh!

Copilot AI Mar 2, 2026

Uh oh!

Copilot AI Mar 2, 2026

Uh oh!

Copilot AI Mar 2, 2026

Uh oh!

Copilot AI Mar 2, 2026

Uh oh!

Copilot AI Mar 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

+			// When there are no items, reset the accumulated offsets so that
+			// subsequent scrolled events after repopulating the items do not
+			// report stale offset values from the previous dataset.
+			if (ItemsViewAdapter?.ItemsSource?.Count == 0)
+			{
+				_horizontalOffset = 0;
+				_verticalOffset = 0;
+			}

-			if (ItemsViewAdapter?.ItemsSource?.Count == 0)
-				return;
-			var item = ItemsViewAdapter.ItemsSource.GetItem(carouselPosition);
+			var itemsSource = ItemsViewAdapter?.ItemsSource;
+			var count = itemsSource?.Count ?? 0;
+			// Guard against invalid positions (including negative indices)
+			if (itemsSource == null || count == 0 || carouselPosition < 0 || carouselPosition >= count)
+				return;
+			var item = itemsSource.GetItem(carouselPosition);

@@ @@ -233,10 +233,6 @@ protected async virtual void OnNavigateBack() @@
               		{
               			try
               			{

-			{
+			{
+				// Allow the current page to intercept the back navigation via OnBackButtonPressed
+				// If SendBackButtonPressed returns true, the back press has been handled and
+				// we should not pop the navigation stack.
+				if (Page?.SendBackButtonPressed() ?? false)
+					return;

-		}
+		}
+		internal static void MapIsVisible(IViewHandler handler, IView view)
+		{
+			if (view is InputView iv)
+			{
+				handler
+					?.GetService<HideSoftInputOnTappedChangedManager>()
+					?.UpdateFocusForView(iv);
+			}
+		}

Conversation

jfversluis commented Mar 2, 2026

Uh oh!

github-actions bot commented Mar 2, 2026

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Mar 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 2, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants