dan/Toolkit2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve sub navigations

Browse Source
This commit is contained in:
TheXamlGuy
2024-05-27 18:44:09 +01:00
parent 3498c1d678
commit cad74f31e1
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Toolkit.Avalonia/FrameHandler.cs
+17 -12
View File
@@ -3,7 +3,6 @@ using Avalonia.Interactivity;
using FluentAvalonia.UI.Media.Animation;
using FluentAvalonia.UI.Navigation;
using Toolkit.Foundation;
using Toolkit.UI.Avalonia;
using Toolkit.UI.Controls.Avalonia;
namespace Toolkit.Avalonia;
@@ -24,8 +23,6 @@ public class FrameHandler :
async void HandleNavigatedTo(object? _,
NavigationEventArgs __)
{
sender.RemoveHandler(Frame.NavigatedToEvent, HandleNavigatedTo);
async void HandleNavigatingFrom(object? _,
NavigatingCancelEventArgs args)
{
@@ -43,9 +40,13 @@ public class FrameHandler :
await deactivated.OnDeactivated();
}
if (content is IDisposable disposable)
if (content is not IBackStack)
{
disposable.Dispose();
if (content is IDisposable disposable)
{
disposable.Dispose();
}
}
}
}
@@ -85,7 +86,9 @@ public class FrameHandler :
async void HandleUnloaded(object? _, RoutedEventArgs __)
{
sender.RemoveHandler(Frame.NavigatedToEvent, HandleNavigatedTo);
sender.RemoveHandler(Frame.NavigatingFromEvent, HandleNavigatingFrom);
control.Unloaded -= HandleUnloaded;
if (control.DataContext is object content)
@@ -116,7 +119,7 @@ public class FrameHandler :
{
if (args.Parameters.TryGetValue("Transition", out object? transition))
{
switch($"{transition}")
switch ($"{transition}")
{
case "FromLeft":
case "FromRight":
@@ -129,6 +132,14 @@ public class FrameHandler :
};
break;
}
if (args.Parameters.TryGetValue("NavigationStackEnabled", out object? navigationStackEnabled))
{
if (navigationStackEnabled is bool value)
{
navigationOptions.IsNavigationStackEnabled = value;
}
}
}
}
@@ -144,12 +155,6 @@ public class FrameHandler :
{
if (args.Context is Frame frame)
{
//NavigationTransitionInfo? navigationTransitionInfo = null;
//if (frame.Content is IBackwardNavigation navigation)
//{
// navigationTransitionInfo = navigation.Transition;
//}
frame.GoBack();
}
Toolkit.Foundation/IBackStack.cs
+3
View File
@@ -0,0 +1,3 @@
namespace Toolkit.Foundation;
public interface IBackStack;