Fixed memory leak where modal pages with ToolbarItems were retained after dismissal when using x:Name on any element in the page or Clicked event on the ToolbarItem. (#839)

Author: Vetle444

CHANGELOG.md

@@ -1,3 +1,6 @@
+## [55.6.7]
+- Fixed memory leak where modal pages with `ToolbarItems` were retained after dismissal when using `x:Name` on any element in the page or `Clicked` event on the `ToolbarItem`.
+
 ## [55.6.6]
 - [Toolbar] Supports IsVisible and other visual element properties.
 

src/library/DIPS.Mobile.UI/Components/Shell/Shell.cs

@@ -150,6 +150,7 @@ private static async Task TryResolvePoppedModalPages(List<ModalPageReference> mo
                 GarbageCollection.Print($"--- 🪟 Attempting to check for leaks in every page that has ever been opened in modal: {modalPage.Name}, number of pages: {modalPage.WeakPages.Count}");
 
                 TryAutoDisconnectModalNavigationPageHandler(modalPage);
+                ClearToolbarItems(modalPage);
 
                 // The object has already been garbage collected
                 if (!modalPage.IsAlive)
@@ -244,6 +245,30 @@ private static void TryAutoDisconnectModalPageHandlers(List<CollectionContentTar
         }
     }
 
+    /// <summary>
+    /// Clears ToolbarItems on modal pages to break the reference chain from native toolbar infrastructure
+    /// back to the page. Without this, the native navigation bar retains toolbar item handlers which root
+    /// the page, and any x:Name'd elements remain alive through the generated code-behind fields.
+    /// TODO: May remove this method when https://github.com/dotnet/maui/issues/34892 is merged
+    /// </summary>
+    private static void ClearToolbarItems(ModalPageReference modalPage)
+    {
+        GarbageCollection.Print("ℹ️ Clearing ToolbarItems...");
+        
+        foreach (var weakPage in modalPage.WeakPages)
+        {
+            if (weakPage.Target is Page page)
+            {
+                page.ToolbarItems.Clear();
+            }
+        }
+        
+        if (modalPage.Target is Page modalRoot)
+        { 
+            modalRoot.ToolbarItems.Clear();
+        }
+    }
+
     private async static Task TryResolvePoppedPages(List<PageReference> pages,
         ShellNavigationSource shellNavigatedEventArgs)
     {