Get ContentControl navigation working

2024-02-11 18:09:22 +00:00
parent 565c6866d8
commit 812556f8b0
133 changed files with 335 additions and 195 deletions
@@ -3,24 +3,28 @@ using Microsoft.UI.Xaml.Controls;

 namespace Hyperbar.UI.Windows;

-public class FrameHandler :
-    INavigationHandler<Frame>
+public class ContentControlHandler(IViewModelContentBinder viewModelContentBinder) :
+    INavigationHandler<ContentControl>
 {
-    public Task Handle(Navigate<Frame> args,
-        CancellationToken cancellationToken = default)
+    public Task Handle(Navigate<ContentControl> args,
+        CancellationToken cancellationToken)
    {
+        if (args.Target is ContentControl contentControl)
+        {
+            contentControl.Content = args.View;
+        }

        return Task.CompletedTask;
    }
 }

-public class WindowHandler :
+public class WindowHandler(IViewModelContentBinder viewModelContentBinder) :
    INavigationHandler<Window>
 {
    public Task Handle(Navigate<Window> args,
        CancellationToken cancellationToken)
    {
-        if (args.View is Window window)
+        if (args.Target is Window window)
        {
            if (window.Content is FrameworkElement content)
            {
@@ -33,8 +37,9 @@ public class WindowHandler :
                    }
                }

-                //ViewModelBinder.Bind(args.ViewModel, content);
+                viewModelContentBinder.Bind(content, window);
                window.Closed += HandleClosed;
+                content.DataContext = args.ViewModel;
            }

            window.Activate();