[Windows] Disconnect events and dispose the Content before close the Window

src/Core/src/Handlers/Application/ApplicationHandler.Windows.cs

@@ -1,3 +1,4 @@
+using System;
 using Microsoft.Maui.Platform;
 using Microsoft.UI.Xaml;
 
@@ -19,6 +20,8 @@ public static void MapCloseWindow(ApplicationHandler handler, IApplication appli
  {
  if (args is IWindow window)
  {
+ (window.Handler as WindowHandler)?.Dispose();
+
  (window.Handler?.PlatformView as Window)?.Close();
  }
  }

src/Core/src/Handlers/Window/WindowHandler.Windows.cs

@@ -1,7 +1,6 @@
 using System;
 using Microsoft.Maui.Graphics;
 using Microsoft.UI.Windowing;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.Maui.ApplicationModel;
 
@@ -32,22 +31,35 @@ protected override void ConnectHandler(UI.Xaml.Window platformView)
  }
 
  protected override void DisconnectHandler(UI.Xaml.Window platformView)
+ {
+ Dispose();
+
+ base.DisconnectHandler(platformView);
+ }
+
+ internal void Dispose()
  {
  MauiContext
  ?.GetNavigationRootManager()
  ?.Disconnect();
 
- if (platformView.Content is WindowRootViewContainer container)
+ if (PlatformView?.Content is WindowRootViewContainer container)
  {
  container.Children.Clear();
- platformView.Content = null;
+ VirtualView?.Content?.Handler?.DisconnectHandler();
+ PlatformView.Content = null;
  }
 
- var appWindow = platformView.GetAppWindow();
+ var appWindow = PlatformView?.GetAppWindow();
+
  if (appWindow is not null)
+ {
  appWindow.Changed -= OnWindowChanged;
+ appWindow.Destroy();
+ }
 
- base.DisconnectHandler(platformView);
+ if (PlatformView is MauiWinUIWindow mauiWinUIWindow)
+ mauiWinUIWindow.Dispose();
  }
 
  public static void MapTitle(IWindowHandler handler, IWindow window) =>

src/Core/src/Platform/Windows/MauiWinUIWindow.cs

@@ -10,7 +10,7 @@
 
 namespace Microsoft.Maui
 {
- public class MauiWinUIWindow : UI.Xaml.Window, IPlatformSizeRestrictedWindow
+ public class MauiWinUIWindow : UI.Xaml.Window, IPlatformSizeRestrictedWindow, IDisposable
  {
  static readonly SizeInt32 DefaultMinimumSize = new SizeInt32(0, 0);
  static readonly SizeInt32 DefaultMaximumSize = new SizeInt32(int.MaxValue, int.MaxValue);
@@ -178,6 +178,16 @@ internal void UpdateTitleOnCustomTitleBar()
 
  [DllImport("user32.dll", SetLastError = true)]
  static extern int DestroyIcon(IntPtr hIcon);
+
+ public void Dispose()
+ {
+ Activated -= OnActivated;
+ Closed -= OnClosedPrivate;
+ VisibilityChanged -= OnVisibilityChanged;
+
+ if (_windowManager != null)
+ _windowManager.Dispose();
+ }
  }
 
  interface IPlatformSizeRestrictedWindow

src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt

@@ -99,6 +99,7 @@ Microsoft.Maui.IMenuFlyoutSeparator
 Microsoft.Maui.IToolTipElement
 Microsoft.Maui.IToolTipElement.ToolTip.get -> Microsoft.Maui.ToolTip?
 Microsoft.Maui.IWindow.FrameChanged(Microsoft.Maui.Graphics.Rect frame) -> void
+Microsoft.Maui.MauiWinUIWindow.Dispose() -> void
 Microsoft.Maui.ToolTip
 Microsoft.Maui.ToolTip.Content.get -> object?
 Microsoft.Maui.ToolTip.Content.set -> void