prevent leaks

akgulebubekir · Mar 25, 2024 · b4c8750 · b4c8750
1 parent 69d2002
commit b4c8750
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/Maui.DataGrid/DataGrid.xaml.cs b/Maui.DataGrid/DataGrid.xaml.cs
@@ -50,11 +50,6 @@ public DataGrid()
         {
             _collectionView.ItemsSource = InternalItems;
         }
-
-        Loaded += (sender, e) =>
-        {
-            Initialize();
-        };
     }
 
     #endregion ctor
@@ -1226,6 +1221,16 @@ protected override void OnParentSet()
     {
         base.OnParentSet();
 
+        if (Parent is null)
+        {
+            Loaded -= OnLoaded;
+        }
+        else
+        {
+            Loaded -= OnLoaded;
+            Loaded += OnLoaded;
+        }
+
         if (Parent is null)
         {
             _collectionView.SelectionChanged -= OnSelectionChanged;
@@ -1268,6 +1273,8 @@ protected override void OnParentSet()
         }
     }
 
+    private void OnLoaded(object? sender, EventArgs e) => Initialize();
+
     /// <inheritdoc/>
     protected override void OnBindingContextChanged()
     {