Prevent node autocomplete from autohiding

src/DynamoCoreWpf/ViewModels/Core/StateMachine.cs

@@ -117,11 +117,6 @@ internal void CancelActiveState()
             stateMachine.CancelActiveState();
         }
 
-        internal DateTime GetLastStateTimestamp()
-        {
-            return stateMachine.Timestamp;
-        }
-
         internal void BeginDragSelection(Point2D mouseCursor)
         {
             // This represents the first mouse-move event after the mouse-down
@@ -444,11 +439,6 @@ private enum State
             #endregion
 
             #region Public Class Properties
-            /// <summary>
-            /// Optionally record the last time a particular state is updated.
-            /// Currently only used for Node AutoComplete feature.
-            /// </summary>
-            internal DateTime Timestamp { get; set; }
 
             internal bool IsInIdleState
             {
@@ -819,7 +809,6 @@ internal bool HandlePortClicked(PortViewModel portViewModel)
                         this.currentState = State.Connection;
                         owningWorkspace.CurrentCursor = CursorLibrary.GetCursor(CursorSet.ArcSelect);
                         owningWorkspace.IsCursorForced = false;
-                        Timestamp = DateTime.Now;
                         return true;
                     }
 

src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml.cs

@@ -62,6 +62,7 @@ public enum CursorState
         private double currentNodeCascadeOffset;
         private Point inCanvasSearchPosition;
         private List<DependencyObject> hitResultsList = new List<DependencyObject>();
+        private bool isAutoCompleteLoading;
 
         public WorkspaceViewModel ViewModel
         {
@@ -108,7 +109,6 @@ void OnWorkspaceViewLoaded(object sender, RoutedEventArgs e)
             DynamoSelection.Instance.Selection.CollectionChanged += OnSelectionCollectionChanged;
 
             ViewModel.RequestShowInCanvasSearch += ShowHideInCanvasControl;
-            ViewModel.RequestNodeAutoCompleteSearch += ShowHideNodeAutoCompleteControl;
             ViewModel.DynamoViewModel.PropertyChanged += ViewModel_PropertyChanged;
 
             infiniteGridView.AttachToZoomBorder(zoomBorder);
@@ -146,7 +146,6 @@ private void removeViewModelsubscriptions(WorkspaceViewModel ViewModel)
             ViewModel.Model.RequestNodeCentered -= vm_RequestNodeCentered;
             ViewModel.Model.RequestNodeCentered -= vm_RequestNodeCentered;
             ViewModel.Model.CurrentOffsetChanged -= vm_CurrentOffsetChanged;
-            ViewModel.RequestNodeAutoCompleteSearch -= ShowHideNodeAutoCompleteControl;
         }
 
         void OnWorkspaceViewUnloaded(object sender, RoutedEventArgs e)
@@ -164,6 +163,14 @@ void OnWorkspaceViewUnloaded(object sender, RoutedEventArgs e)
 
         private void ShowHideNodeAutoCompleteControl(ShowHideFlags flag)
         {
+            // Prevents hiding the dialog from releasing the left mouse button
+            if (flag == ShowHideFlags.Hide && isAutoCompleteLoading)
+            {
+                isAutoCompleteLoading = false;
+                return;
+            }
+
+            isAutoCompleteLoading = flag == ShowHideFlags.Show && !NodeAutoCompleteSearchBar.IsOpen;
             ShowHidePopup(flag, NodeAutoCompleteSearchBar);
         }
 
@@ -214,13 +221,8 @@ public void HidePopUp()
             }
             if (NodeAutoCompleteSearchBar.IsOpen)
             {
-                // Suppress the mouse action from last 0.2 second otherwise mouse button release 
-                // in Dynamo window will forcefully shutdown all the open SearchBars
-                if ((new TimeSpan(DateTime.Now.Ticks - ViewModel.GetLastStateTimestamp().Ticks)).TotalSeconds > 0.2)
-                {
-                    ShowHideNodeAutoCompleteControl(ShowHideFlags.Hide);
-                    ViewModel.CancelActiveState();
-                }
+                ShowHideNodeAutoCompleteControl(ShowHideFlags.Hide);
+                ViewModel.CancelActiveState();
             }
         }
 
@@ -374,6 +376,7 @@ void OnWorkspaceViewDataContextChanged(object sender, DependencyPropertyChangedE
                 oldViewModel.RequestAddViewToOuterCanvas -= vm_RequestAddViewToOuterCanvas;
                 oldViewModel.WorkspacePropertyEditRequested -= VmOnWorkspacePropertyEditRequested;
                 oldViewModel.RequestSelectionBoxUpdate -= VmOnRequestSelectionBoxUpdate;
+                oldViewModel.RequestNodeAutoCompleteSearch -= ShowHideNodeAutoCompleteControl;
                 removeViewModelsubscriptions(oldViewModel);
             }
 

test/DynamoCoreWpfTests/NodeAutoCompleteSearchTests.cs

@@ -131,6 +131,9 @@ public void NodeSuggestions_InputPortZeroTouchNode_AreCorrect()
             Assert.IsTrue(currentWs.NodeAutoCompleteSearchBar.IsOpen);
 
             // Hide Node AutoCompleteSearchBar
+            // Note the event handler needs to be called twice. The first one is ignore because it is
+            // assumed to come from releasing the left mouse button when popping up AutoCompleteSearchBar
+            ViewModel.CurrentSpaceViewModel.OnRequestNodeAutoCompleteSearch(ShowHideFlags.Hide);
             ViewModel.CurrentSpaceViewModel.OnRequestNodeAutoCompleteSearch(ShowHideFlags.Hide);
             Assert.IsFalse(currentWs.NodeAutoCompleteSearchBar.IsOpen);
         }