Skip to content

https://github.com/NeverMorewd/Lemon.ModuleNavigation/issues/58 #59

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
NeverMorewd merged 1 commit into from
Jul 28, 2025
Merged

https://github.com/NeverMorewd/Lemon.ModuleNavigation/issues/58 #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 20 additions & 33 deletions src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,29 +68,40 @@ public virtual void ScrollIntoView(NavigationContext item)
protected IView? ResolveView(NavigationContext context)
{
var view = context.View;
INavigationAware? navigationAware = null;

if (view is null)
{
view = context.ServiceProvider.GetRequiredKeyedService<IView>(context.ViewName);
var navigationAware = context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.ViewName);

if (Current.TryTakeData(out var previousData))
{
previousData.NavigationAware.OnNavigatedFrom(context);
}
navigationAware = context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.ViewName);

view.DataContext = navigationAware;
navigationAware.OnNavigatedTo(context);

if (navigationAware is ICanUnload canUnloadNavigationAware)
{
canUnloadNavigationAware.RequestUnload += () =>
{
DeActivate(context);
};
}
Current.SetData((view, navigationAware));

context.View = view;
ViewCache.AddOrUpdate(context, view, (key, value) => view);
}
else
{
navigationAware = view.DataContext as INavigationAware
?? context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.ViewName);
}
if (Current.TryTakeData(out var previousData))
{
previousData.NavigationAware.OnNavigatedFrom(context);
}

navigationAware.OnNavigatedTo(context);

Current.SetData((view, navigationAware));
context.Alias = navigationAware.Alias;
return view;
}

Expand Down Expand Up @@ -127,31 +138,7 @@ private IDataTemplate CreateRegionDataTemplate()
{
return null;
}
var view = context.View;
if (view is null)
{
view = context.ServiceProvider.GetRequiredKeyedService<IView>(context.ViewName);
var navigationAware = context.ServiceProvider.GetRequiredKeyedService<INavigationAware>(context.ViewName);

if (Current.TryTakeData(out var previousData))
{
previousData.NavigationAware.OnNavigatedFrom(context);
}

view.DataContext = navigationAware;
navigationAware.OnNavigatedTo(context);
context.Alias = navigationAware.Alias;
if (navigationAware is ICanUnload canUnloadNavigationAware)
{
canUnloadNavigationAware.RequestUnload += () =>
{
DeActivate(context);
};
}
Current.SetData((view, navigationAware));
context.View = view;
ViewCache.AddOrUpdate(context, view, (key, value) => view);
}
var view = ResolveView(context);
return view as Control;
});
}
Expand Down