moer changes

Hyperbar.UI.Windows/WindowHandler.cs

@@ -1,7 +1,19 @@
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 
 namespace Hyperbar.UI.Windows;
 
+public class FrameHandler :
+    INavigationHandler<Frame>
+{
+    public Task Handle(Navigate<Frame> args,
+        CancellationToken cancellationToken = default)
+    {
+
+        return Task.CompletedTask;
+    }
+}
+
 public class WindowHandler :
     INavigationHandler<Window>
 {
@@ -10,9 +22,19 @@ public class WindowHandler :
     {
         if (args.Template is Window window)
         {
-            if (window.Content is FrameworkElement frameworkElement)
+            if (window.Content is FrameworkElement content)
             {
-                frameworkElement.DataContext = args.Content;
+                void HandleClosed(object sender, WindowEventArgs args)
+                {
+                    window.Closed -= HandleClosed;
+                    if (content.DataContext is IObservableViewModel observableViewModel)
+                    {
+                        observableViewModel.Dispose();
+                    }
+                }
+
+                window.Closed += HandleClosed;
+                content.DataContext = args.Content;
             }
 
             window.Activate();