DYN-8308: Fix temporary connector and Node memory leak (#16198)

zeusongit · web-flow · commit 3cb36266538f · 2025-05-13T19:09:15.000-04:00
diff --git a/src/DynamoCoreWpf/ViewModels/Core/ConnectorViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/ConnectorViewModel.cs
@@ -1204,25 +1204,32 @@ private void UpdateDynamicStrokeThickness()
         /// </summary>
         public override void Dispose()
         {
-            model.PropertyChanged -= HandleConnectorPropertyChanged;
+            if (model != null)
+            {
+                model.PropertyChanged -= HandleConnectorPropertyChanged;
+
+                model.Start.PropertyChanged -= StartPortModel_PropertyChanged;
+                model.End.PropertyChanged -= EndPortModel_PropertyChanged;
 
-            model.Start.PropertyChanged -= StartPortModel_PropertyChanged;
-            model.End.PropertyChanged -= EndPortModel_PropertyChanged;
+                model.Start.Owner.PropertyChanged -= StartOwner_PropertyChanged;
+                model.End.Owner.PropertyChanged -= EndOwner_PropertyChanged;
+                model.ConnectorPinModels.CollectionChanged -= ConnectorPinModelCollectionChanged;
 
-            model.Start.Owner.PropertyChanged -= StartOwner_PropertyChanged;
-            model.End.Owner.PropertyChanged -= EndOwner_PropertyChanged;
-            model.ConnectorPinModels.CollectionChanged -= ConnectorPinModelCollectionChanged;
+                // Nodevm and NodeEnd props are found via model
+                if (Nodevm != null)
+                {
+                    Nodevm.PropertyChanged -= nodeViewModel_PropertyChanged;
+                }
+                if (NodeEnd != null)
+                {
+                    NodeEnd.PropertyChanged -= nodeEndViewModel_PropertyChanged;
+                }
+            }
+
+            workspaceViewModel.PropertyChanged -= WorkspaceViewModel_PropertyChanged;
 
             workspaceViewModel.DynamoViewModel.PropertyChanged -= DynamoViewModel_PropertyChanged;
             workspaceViewModel.DynamoViewModel.Model.PreferenceSettings.PropertyChanged -= DynamoViewModel_PropertyChanged;
-            if (Nodevm != null)
-            {
-                Nodevm.PropertyChanged -= nodeViewModel_PropertyChanged;
-            }
-            if (NodeEnd != null)
-            {
-                NodeEnd.PropertyChanged -= nodeEndViewModel_PropertyChanged;
-            }
 
             if (ConnectorPinViewCollection != null)
             {
@@ -1235,16 +1242,14 @@ public override void Dispose()
                 }
             }
 
-            workspaceViewModel.PropertyChanged -= WorkspaceViewModel_PropertyChanged;
-
             this.PropertyChanged -= ConnectorViewModelPropertyChanged;
             DiscardAllConnectorPinModels();
 
-            if(ConnectorContextMenuViewModel != null)
+            if (ConnectorContextMenuViewModel != null)
             {
                 ConnectorContextMenuViewModel.Dispose();
             }
-            if(ConnectorAnchorViewModel != null)
+            if (ConnectorAnchorViewModel != null)
             {
                 ConnectorAnchorViewModel.Dispose();
             }
diff --git a/src/DynamoCoreWpf/ViewModels/Core/StateMachine.cs b/src/DynamoCoreWpf/ViewModels/Core/StateMachine.cs
@@ -332,6 +332,7 @@ internal void UpdateActiveConnector(System.Windows.Point mouseCursor)
                     foreach (ConnectorViewModel a in activeConnectors)
                     {
                         this.WorkspaceElements.Remove(a);
+                        a.Dispose();
                     }
                 }
                 this.activeConnectors = null;
diff --git a/src/DynamoCoreWpf/Views/Core/NodeView.xaml.cs b/src/DynamoCoreWpf/Views/Core/NodeView.xaml.cs
@@ -128,7 +128,6 @@ public NodeView()
             nodeBorder.SizeChanged += OnSizeChanged;
             DataContextChanged += OnDataContextChanged;
 
-
             Panel.SetZIndex(this, 1);
         }
 
@@ -154,6 +153,8 @@ private void OnNodeViewUnloaded(object sender, RoutedEventArgs e)
                 previewControl = null;
             }
             nodeBorder.SizeChanged -= OnSizeChanged;
+            DataContextChanged -= OnDataContextChanged;
+            Loaded -= OnNodeViewLoaded;
         }
 
         #endregion
diff --git a/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml.cs b/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml.cs
@@ -1292,6 +1292,7 @@ private void OnGeometryScaling_Click(object sender, RoutedEventArgs e)
         public void Dispose()
         {
             RemoveViewModelsubscriptions(ViewModel);
+            DataContextChanged -= OnWorkspaceViewDataContextChanged;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -332,6 +332,7 @@ internal void UpdateActiveConnector(System.Windows.Point mouseCursor)`
`332`	`332`	`foreach (ConnectorViewModel a in activeConnectors)`
`333`	`333`	`{`
`334`	`334`	`this.WorkspaceElements.Remove(a);`
	`335`	`+ a.Dispose();`
`335`	`336`	`}`
`336`	`337`	`}`
`337`	`338`	`this.activeConnectors = null;`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,6 @@ public NodeView()`
`128`	`128`	`nodeBorder.SizeChanged += OnSizeChanged;`
`129`	`129`	`DataContextChanged += OnDataContextChanged;`
`130`	`130`
`131`		`-`
`132`	`131`	`Panel.SetZIndex(this, 1);`
`133`	`132`	`}`
`134`	`133`
`@@ -154,6 +153,8 @@ private void OnNodeViewUnloaded(object sender, RoutedEventArgs e)`
`154`	`153`	`previewControl = null;`
`155`	`154`	`}`
`156`	`155`	`nodeBorder.SizeChanged -= OnSizeChanged;`
	`156`	`+ DataContextChanged -= OnDataContextChanged;`
	`157`	`+ Loaded -= OnNodeViewLoaded;`
`157`	`158`	`}`
`158`	`159`
`159`	`160`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -1292,6 +1292,7 @@ private void OnGeometryScaling_Click(object sender, RoutedEventArgs e)`
`1292`	`1292`	`public void Dispose()`
`1293`	`1293`	`{`
`1294`	`1294`	`RemoveViewModelsubscriptions(ViewModel);`
	`1295`	`+ DataContextChanged -= OnWorkspaceViewDataContextChanged;`
`1295`	`1296`	`}`
`1296`	`1297`	`}`
`1297`	`1298`	`}`