Prevent Shift Drag Crash when single group selected (#13098)

QilongTang · web-flow · commit 2600beb575a5 · 2022-07-13T11:35:00.000-04:00
* Prevent Shift Drag Crash

* Update message
diff --git a/src/DynamoCoreWpf/Commands/DynamoCommands.cs b/src/DynamoCoreWpf/Commands/DynamoCommands.cs
@@ -112,9 +112,20 @@ void OnModelCommandCompleted(DynamoModel.RecordableCommand command)
                     var dragC = command as DynamoModel.DragSelectionCommand;
 
                     if (DynamoModel.DragSelectionCommand.Operation.BeginDrag == dragC.DragOperation)
-                        CurrentSpaceViewModel.BeginDragSelection(dragC.MouseCursor);
+                    {
+                        try
+                        {
+                            CurrentSpaceViewModel.BeginDragSelection(dragC.MouseCursor);
+                        }
+                        catch (Exception ex)
+                        {
+                            model.Logger.Log(ex.Message);
+                        }
+                    }
                     else
+                    {
                         CurrentSpaceViewModel.EndDragSelection(dragC.MouseCursor);
+                    }
                     break;
 
                 case "DeleteModelCommand":
diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -3252,4 +3252,7 @@ You can manage this in Preferences -&gt; Security.</value>
   <data name="UnableToAccessTrustedDirectory" xml:space="preserve">
     <value>Unable To Access Trusted Directory</value>
   </data>
+  <data name="InvalidDraggingOperationMessgae" xml:space="preserve">
+    <value>Nothing is being dragged. If you see this message, most likely your recent Dynamo interaction is not recommended.</value>
+  </data>
 </root>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -3239,4 +3239,7 @@ You can manage this in Preferences -&gt; Security.</value>
   <data name="UnableToAccessTrustedDirectory" xml:space="preserve">
     <value>Unable To Access Directory</value>
   </data>
+  <data name="InvalidDraggingOperationMessgae" xml:space="preserve">
+    <value>Nothing is being dragged. If you see this message, most likely your recent Dynamo interaction is not recommended.</value>
+  </data>
 </root>
diff --git a/src/DynamoCoreWpf/ViewModels/Core/StateMachine.cs b/src/DynamoCoreWpf/ViewModels/Core/StateMachine.cs
@@ -27,7 +27,7 @@ partial class WorkspaceViewModel
 
         #region State Machine Related Methods/Data Members
 
-        private StateMachine stateMachine = null;
+        private readonly StateMachine stateMachine = null;
         private List<DraggedNode> draggedNodes = new List<DraggedNode>();
 
         // When a new connector is created or a single connector is selected,
@@ -146,19 +146,12 @@ internal void BeginDragSelection(Point2D mouseCursor)
 
             if (draggedNodes.Count <= 0) // There is nothing to drag.
             {
-                string message = "Shouldn't get here if nothing is dragged";
-                throw new InvalidOperationException(message);
+                throw new InvalidOperationException(Wpf.Properties.Resources.InvalidDraggingOperationMessgae);
             }
         }
 
         internal void UpdateDraggedSelection(Point2D mouseCursor)
         {
-            if (draggedNodes.Count <= 0)
-            {
-                throw new InvalidOperationException(
-                    "UpdateDraggedSelection cannot be called now");
-            }
-
             foreach (DraggedNode draggedNode in draggedNodes)
                 draggedNode.Update(mouseCursor);
         }
@@ -343,15 +336,15 @@ private void RecordSelectionForUndo(Point2D mousePoint)
             List<ModelBase> changedPositionModels = new List<ModelBase>();
             foreach (DraggedNode draggedNode in draggedNodes)
             {
-                //Checks if the draggednoded has changed its position
+                //Checks if the dragged node has changed its position
                 if (draggedNode.HasChangedPosition(mousePoint))
                 {
                     ModelBase model = DynamoSelection.Instance.Selection.
                         Where((x) => (x is ModelBase)).Cast<ModelBase>().FirstOrDefault(x => x.GUID == draggedNode.guid);
 
                     changedPositionModels.Add(model);
 
-                    //The nodes are being reseted to inital position for recording the model purposes 
+                    //The nodes are being reseted to initial position for recording the model purposes 
                     draggedNode.UpdateInitialPosition();
                 }
             }
@@ -363,15 +356,13 @@ private void RecordSelectionForUndo(Point2D mousePoint)
         private void OnDragSelectionStarted(object sender, EventArgs e)
         {
             //Debug.WriteLine("Drag started : Visualization paused.");
-            if (DragSelectionStarted != null)
-                DragSelectionStarted(sender, e);
+            DragSelectionStarted?.Invoke(sender, e);
         }
 
         private void OnDragSelectionEnded(object sender, EventArgs e)
         {
             //Debug.WriteLine("Drag ended : Visualization unpaused.");
-            if (DragSelectionEnded != null)
-                DragSelectionEnded(sender, e);
+            DragSelectionEnded?.Invoke(sender, e);
         }
 
         #endregion
@@ -384,10 +375,12 @@ private void OnDragSelectionEnded(object sender, EventArgs e)
         /// </summary>
         public class DraggedNode
         {
-            double deltaX = 0, deltaY = 0;
-            ILocatable locatable = null;
+            private readonly double deltaX = 0;
+            private readonly double deltaY = 0;
+            readonly ILocatable locatable = null;
             internal Guid guid;
-            double initialPositionX = 0, initialPositionY = 0;
+            private readonly double initialPositionX = 0;
+            private readonly double initialPositionY = 0;
 
             /// <summary>
             /// Construct a DraggedNode for a given ILocatable object.
@@ -399,9 +392,6 @@ public class DraggedNode
             /// <param name="mouseCursor">The mouse cursor at the point this 
             /// DraggedNode object is constructed. This is used to determine the 
             /// offset of the ILocatable from the mouse cursor.</param>
-            /// <param name="region">The region within which the ILocatable can 
-            /// be moved. However, the movement of ILocatable will be limited by 
-            /// region and that it cannot be moved beyond the region.</param>
             /// 
             public DraggedNode(ILocatable locatable, Point2D mouseCursor)
             {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ partial class WorkspaceViewModel`
`27`	`27`
`28`	`28`	`#region State Machine Related Methods/Data Members`
`29`	`29`
`30`		`- private StateMachine stateMachine = null;`
	`30`	`+ private readonly StateMachine stateMachine = null;`
`31`	`31`	`private List<DraggedNode> draggedNodes = new List<DraggedNode>();`
`32`	`32`
`33`	`33`	`// When a new connector is created or a single connector is selected,`
`@@ -146,19 +146,12 @@ internal void BeginDragSelection(Point2D mouseCursor)`
`146`	`146`
`147`	`147`	`if (draggedNodes.Count <= 0) // There is nothing to drag.`
`148`	`148`	`{`
`149`		`- string message = "Shouldn't get here if nothing is dragged";`
`150`		`- throw new InvalidOperationException(message);`
	`149`	`+ throw new InvalidOperationException(Wpf.Properties.Resources.InvalidDraggingOperationMessgae);`
`151`	`150`	`}`
`152`	`151`	`}`
`153`	`152`
`154`	`153`	`internal void UpdateDraggedSelection(Point2D mouseCursor)`
`155`	`154`	`{`
`156`		`- if (draggedNodes.Count <= 0)`
`157`		`- {`
`158`		`- throw new InvalidOperationException(`
`159`		`- "UpdateDraggedSelection cannot be called now");`
`160`		`- }`
`161`		`-`
`162`	`155`	`foreach (DraggedNode draggedNode in draggedNodes)`
`163`	`156`	`draggedNode.Update(mouseCursor);`
`164`	`157`	`}`
`@@ -343,15 +336,15 @@ private void RecordSelectionForUndo(Point2D mousePoint)`
`343`	`336`	`List<ModelBase> changedPositionModels = new List<ModelBase>();`
`344`	`337`	`foreach (DraggedNode draggedNode in draggedNodes)`
`345`	`338`	`{`
`346`		`- //Checks if the draggednoded has changed its position`
	`339`	`+ //Checks if the dragged node has changed its position`
`347`	`340`	`if (draggedNode.HasChangedPosition(mousePoint))`
`348`	`341`	`{`
`349`	`342`	`ModelBase model = DynamoSelection.Instance.Selection.`
`350`	`343`	`Where((x) => (x is ModelBase)).Cast<ModelBase>().FirstOrDefault(x => x.GUID == draggedNode.guid);`
`351`	`344`
`352`	`345`	`changedPositionModels.Add(model);`
`353`	`346`
`354`		`- //The nodes are being reseted to inital position for recording the model purposes`
	`347`	`+ //The nodes are being reseted to initial position for recording the model purposes`
`355`	`348`	`draggedNode.UpdateInitialPosition();`
`356`	`349`	`}`
`357`	`350`	`}`
`@@ -363,15 +356,13 @@ private void RecordSelectionForUndo(Point2D mousePoint)`
`363`	`356`	`private void OnDragSelectionStarted(object sender, EventArgs e)`
`364`	`357`	`{`
`365`	`358`	`//Debug.WriteLine("Drag started : Visualization paused.");`
`366`		`- if (DragSelectionStarted != null)`
`367`		`- DragSelectionStarted(sender, e);`
	`359`	`+ DragSelectionStarted?.Invoke(sender, e);`
`368`	`360`	`}`
`369`	`361`
`370`	`362`	`private void OnDragSelectionEnded(object sender, EventArgs e)`
`371`	`363`	`{`
`372`	`364`	`//Debug.WriteLine("Drag ended : Visualization unpaused.");`
`373`		`- if (DragSelectionEnded != null)`
`374`		`- DragSelectionEnded(sender, e);`
	`365`	`+ DragSelectionEnded?.Invoke(sender, e);`
`375`	`366`	`}`
`376`	`367`
`377`	`368`	`#endregion`
`@@ -384,10 +375,12 @@ private void OnDragSelectionEnded(object sender, EventArgs e)`
`384`	`375`	`/// </summary>`
`385`	`376`	`public class DraggedNode`
`386`	`377`	`{`
`387`		`- double deltaX = 0, deltaY = 0;`
`388`		`- ILocatable locatable = null;`
	`378`	`+ private readonly double deltaX = 0;`
	`379`	`+ private readonly double deltaY = 0;`
	`380`	`+ readonly ILocatable locatable = null;`
`389`	`381`	`internal Guid guid;`
`390`		`- double initialPositionX = 0, initialPositionY = 0;`
	`382`	`+ private readonly double initialPositionX = 0;`
	`383`	`+ private readonly double initialPositionY = 0;`
`391`	`384`
`392`	`385`	`/// <summary>`
`393`	`386`	`/// Construct a DraggedNode for a given ILocatable object.`
`@@ -399,9 +392,6 @@ public class DraggedNode`
`399`	`392`	`/// <param name="mouseCursor">The mouse cursor at the point this`
`400`	`393`	`/// DraggedNode object is constructed. This is used to determine the`
`401`	`394`	`/// offset of the ILocatable from the mouse cursor.</param>`
`402`		`- /// <param name="region">The region within which the ILocatable can`
`403`		`- /// be moved. However, the movement of ILocatable will be limited by`
`404`		`- /// region and that it cannot be moved beyond the region.</param>`
`405`	`395`	`///`
`406`	`396`	`public DraggedNode(ILocatable locatable, Point2D mouseCursor)`
`407`	`397`	`{`