Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -295,13 +295,7 @@ protected override void OnDisplayedPageChanged(Page newPage, Page oldPage)
oldPage.PropertyChanged -= OnDisplayedElementPropertyChanged;

if (newPage is not null)
{
newPage.PropertyChanged += OnDisplayedElementPropertyChanged;
if (oldPage is null)
{
_menuSetup = false;
}
}

if (newPage is not null && !_menuSetup)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -357,10 +357,6 @@ void GoTo(ShellSection shellSection)
if (shellSection == null || _currentSection == shellSection)
return;
var renderer = RendererForShellContent(shellSection);

if (renderer == null)
return;

if (renderer?.ViewController != SelectedViewController)
SelectedViewController = renderer.ViewController;
CurrentRenderer = renderer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ void OnCurrentShellSectionPropertyChanged(object? sender, System.ComponentModel.
if (_mainLevelTabs == null)
return;

var currentItem = VirtualView.CurrentItem?.CurrentItem;
var currentItem = VirtualView.CurrentItem.CurrentItem;
NavigationViewItemViewModel? navigationViewItemViewModel = null;

foreach (var item in _mainLevelTabs)
Expand Down
3 changes: 0 additions & 3 deletions src/Controls/src/Core/Shell/ShellItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,7 @@ static void OnCurrentItemChanged(BindableObject bindable, object oldValue, objec
var shellItem = (ShellItem)bindable;

if (newValue == null)
{
shellItem.CurrentItem = null;
return;
}

if (shellItem.Parent is Shell)
{
Expand Down
Binary file not shown.
25 changes: 0 additions & 25 deletions src/Controls/tests/TestCases.HostApp/Issues/Issue8788.xaml

This file was deleted.

81 changes: 0 additions & 81 deletions src/Controls/tests/TestCases.HostApp/Issues/Issue8788.xaml.cs

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.