Skip to content

[inflight regression] Fix: LifeCycleEvents Fire When Navigating Top Tabs test fails in candidate #36558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kubaflo merged 3 commits into from
Jul 15, 2026
+22 −2
Merged

[inflight regression] Fix: LifeCycleEvents Fire When Navigating Top Tabs test fails in candidate #36558

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54bf6c8
Fixed the OnNavigatingFrom event called when switching the tabs
Shalini-Ashokan Jul 8, 2026
627da31
Addressed the internal concerns
Shalini-Ashokan Jul 13, 2026
12db636
Fixed the shell test failure
Shalini-Ashokan Jul 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions src/Controls/src/Core/Handlers/Shell/ShellItemHandler.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,28 @@ private void OnNavigationTabChanged(NavigationView sender, NavigationViewSelecti
if (currentItem?.Title != shellContent.Title && currentItem != shellContent.Parent)
{
(parentShell.CurrentItem as IShellItemController)?.ProposeSection(shellContent);
parentShell.CurrentItem = shellContent;
}
else if (shellContent.Parent is ShellSection existingSection && existingSection.CurrentItem != shellContent && existingSection.IsVisibleSection)
{
// Fire OnNavigatingFrom before CurrentItem changes, so it captures the correct outgoing page.
parentShell.NavigationManager.ProposeNavigationOutsideGotoAsync(
ShellNavigationSource.ShellContentChanged,
parentShell.CurrentItem,
existingSection,
shellContent,
existingSection.Stack,
canCancel: false,
isAnimated: true);

// Set ShellSection.CurrentItem directly (using SetValueFromRenderer) to avoid
// re-triggering the mistimed-navigation bug via CreateFromShellContent.
existingSection.SetValueFromRenderer(ShellSection.CurrentItemProperty, shellContent);
}
else
{
parentShell.CurrentItem = shellContent;
}
parentShell.CurrentItem = shellContent;
}
}

Expand Down Expand Up @@ -344,7 +364,7 @@ void UpdateSearchHandler()
autoSuggestBox.UpdateSearchHandlerBackground(_currentSearchHandler);
autoSuggestBox.UpdateSearchHandlerVerticalTextAlignment(_currentSearchHandler);
autoSuggestBox.UpdateSearchHandlerHorizontalTextAlignment(_currentSearchHandler);

_currentSearchHandler.PropertyChanged += OnCurrentSearchHandlerPropertyChanged;

autoSuggestBox.Visibility = _currentSearchHandler.SearchBoxVisibility == SearchBoxVisibility.Hidden ? Microsoft.UI.Xaml.Visibility.Collapsed : Microsoft.UI.Xaml.Visibility.Visible;
Expand Down
Loading