Skip to content

Commit 12aa8f1

Browse files
Fix: Get NavigationParameter from corresponding TabBarItem
1 parent d52a657 commit 12aa8f1

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/Files.App/Views/MainPage.xaml.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,9 @@ public async void MultitaskingControl_CurrentInstanceChanged(object? sender, Cur
139139
if (SidebarAdaptiveViewModel.PaneHolder is not null)
140140
SidebarAdaptiveViewModel.PaneHolder.PropertyChanged -= PaneHolder_PropertyChanged;
141141

142-
var navArgs = e.CurrentInstance.TabBarItemParameter?.NavigationParameter;
142+
// Find the TabBarItem that contains this ITabBarItemContent instance
143+
var correspondingTabItem = ViewModel.AppInstances.FirstOrDefault(tabItem => tabItem.TabItemContent == e.CurrentInstance);
144+
var navArgs = correspondingTabItem?.NavigationParameter?.NavigationParameter;
143145
if (e.CurrentInstance is IShellPanesPage currentInstance)
144146
{
145147
SidebarAdaptiveViewModel.PaneHolder = currentInstance;

0 commit comments

Comments
 (0)