DYN-8576 - change autocomplete popup to a Window to improve behavior (#16208)

chubakueno · web-flow · commit ff176e92c7bb · 2025-05-15T18:18:48.000-04:00
diff --git a/src/DynamoCoreWpf/Controls/NodeAutoCompleteSearchControl.xaml b/src/DynamoCoreWpf/Controls/NodeAutoCompleteSearchControl.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Dynamo.UI.Controls.NodeAutoCompleteSearchControl"
+<Window x:Class="Dynamo.UI.Controls.NodeAutoCompleteSearchControl"
              xmlns="https://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="https://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="https://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -8,10 +8,15 @@
              xmlns:uicontrols="clr-namespace:Dynamo.UI.Controls"
              xmlns:resx="clr-namespace:Dynamo.Properties;assembly=DynamoCore"
              mc:Ignorable="d"
-             MinWidth="280"
-             MaxWidth="400"
+             WindowStyle="None"
+             AllowsTransparency="True"
+             Background="Transparent"
+             ShowInTaskbar="False"
+             ResizeMode="NoResize"
+             Width="280"
+             Height="350"
              IsVisibleChanged="OnNodeAutoCompleteSearchControlVisibilityChanged">
-    <UserControl.Resources>
+    <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.SidebarGridDictionaryUri}" />
@@ -40,7 +45,7 @@
             </Style>
             <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
         </ResourceDictionary>
-    </UserControl.Resources>
+    </Window.Resources>
 
     <Grid>
         <Border Margin="0"
@@ -67,7 +72,7 @@
                     <Grid Name="HeaderContent">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
 
@@ -374,4 +379,4 @@
             </Grid>
         </Grid>
     </Grid>
-</UserControl>
+</Window>
diff --git a/src/DynamoCoreWpf/Controls/NodeAutoCompleteSearchControl.xaml.cs b/src/DynamoCoreWpf/Controls/NodeAutoCompleteSearchControl.xaml.cs
@@ -57,6 +57,23 @@ public NodeAutoCompleteSearchControl()
             HomeWorkspaceModel.WorkspaceClosed += this.CloseAutoCompletion;
         }
 
+        internal NodeAutoCompleteSearchControl(Window window, NodeAutoCompleteSearchViewModel viewModel)
+        {
+            Owner = window;
+            DataContext = viewModel;
+            ViewModel.IsOpen = true;
+            InitializeComponent();
+            if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
+            {
+                Application.Current.Deactivated += CurrentApplicationDeactivated;
+                if (Application.Current?.MainWindow != null)
+                {
+                    Application.Current.MainWindow.Closing += NodeAutoCompleteSearchControl_Unloaded;
+                }
+            }
+            HomeWorkspaceModel.WorkspaceClosed += this.CloseAutoCompletion;
+        }
+
         private void NodeAutoCompleteSearchControl_Unloaded(object sender, System.ComponentModel.CancelEventArgs e)
         {
             if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
@@ -72,12 +89,13 @@ private void NodeAutoCompleteSearchControl_Unloaded(object sender, System.Compon
 
         private void CurrentApplicationDeactivated(object sender, EventArgs e)
         {
-            OnRequestShowNodeAutoCompleteSearch(ShowHideFlags.Hide);
+            OnRequestHideNodeAutoCompleteSearch();
         }
 
-        private void OnRequestShowNodeAutoCompleteSearch(ShowHideFlags flags)
+        private void OnRequestHideNodeAutoCompleteSearch()
         {
-            RequestShowNodeAutoCompleteSearch?.Invoke(flags);
+            this.ViewModel.IsOpen = false;
+            this.Close();
         }
 
         private void OnSearchTextBoxTextChanged(object sender, TextChangedEventArgs e)
@@ -101,7 +119,7 @@ private void OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
             if (!(sender is ListBoxItem listBoxItem) || e.OriginalSource is Thumb) return;
 
             ExecuteSearchElement(listBoxItem);
-            OnRequestShowNodeAutoCompleteSearch(ShowHideFlags.Hide);
+            OnRequestHideNodeAutoCompleteSearch();
             e.Handled = true;
         }
 
@@ -236,7 +254,7 @@ private void OnParentNodeRemoved(NodeModel node)
             NodeModel parent_node = ViewModel.PortViewModel?.PortModel.Owner;
             if (node == parent_node)
             {
-                OnRequestShowNodeAutoCompleteSearch(ShowHideFlags.Hide);
+                OnRequestHideNodeAutoCompleteSearch();
                 ViewModel.ParentNodeRemoved -= OnParentNodeRemoved;
             }
         }
@@ -307,13 +325,13 @@ private void OnInCanvasSearchKeyDown(object sender, KeyEventArgs e)
             switch (key)
             {
                 case Key.Escape:
-                    OnRequestShowNodeAutoCompleteSearch(ShowHideFlags.Hide);
+                    OnRequestHideNodeAutoCompleteSearch();
                     break;
                 case Key.Enter:
                     if (HighlightedItem != null && ViewModel.CurrentMode != SearchViewModel.ViewMode.LibraryView)
                     {
                         ExecuteSearchElement(HighlightedItem);
-                        OnRequestShowNodeAutoCompleteSearch(ShowHideFlags.Hide);
+                        OnRequestHideNodeAutoCompleteSearch();
                     }
                     break;
                 case Key.Up:
@@ -382,7 +400,7 @@ internal void CloseAutocompletionWindow(object sender, RoutedEventArgs e)
 
         internal void CloseAutoCompletion()
         {
-            OnRequestShowNodeAutoCompleteSearch(ShowHideFlags.Hide);
+            OnRequestHideNodeAutoCompleteSearch();
             ViewModel?.OnNodeAutoCompleteWindowClosed();
         }
 
diff --git a/src/DynamoCoreWpf/ViewModels/Core/NodeViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/NodeViewModel.cs
@@ -39,7 +39,7 @@ public partial class NodeViewModel : ViewModelBase
         public delegate void SnapInputEventHandler(PortViewModel portViewModel);
         public delegate void PreviewPinStatusHandler(bool pinned);
 
-        internal delegate void NodeAutoCompletePopupEventHandler(Popup popup);
+        internal delegate void NodeAutoCompletePopupEventHandler(Window window, PortModel portType, double spacing);
         internal delegate void NodeClusterAutoCompletePopupEventHandler(Window window, double spacing);
         internal delegate void PortContextMenuPopupEventHandler(Popup popup);
         #endregion
@@ -831,9 +831,9 @@ internal bool IsWatchNode
         internal event NodeAutoCompletePopupEventHandler RequestAutoCompletePopupPlacementTarget;
         internal event PortContextMenuPopupEventHandler RequestPortContextMenuPopupPlacementTarget;
 
-        internal void OnRequestAutoCompletePopupPlacementTarget(Popup popup)
+        internal void OnRequestAutoCompletePopupPlacementTarget(Window window, PortModel portModel, double spacing)
         {
-            RequestAutoCompletePopupPlacementTarget?.Invoke(popup);
+            RequestAutoCompletePopupPlacementTarget?.Invoke(window, portModel, spacing);
         }
 
         internal void OnClusterRequestAutoCompletePopupPlacementTarget(Window window, double spacing)
diff --git a/src/DynamoCoreWpf/ViewModels/Core/PortViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/PortViewModel.cs
@@ -330,11 +330,10 @@ private T FindChild<T>(DependencyObject parent, Func<T, bool> predicate) where T
         /// <summary>
         /// Sets up the node autocomplete window to be placed relative to the node.
         /// </summary>
-        /// <param name="popup">Node autocomplete popup.</param>
-        internal void SetupNodeAutoCompleteWindowPlacement(Popup popup)
+        /// <param name="window">Node autocomplete popup.</param>
+        internal void SetupNodeAutoCompleteWindowPlacement(Window window)
         {
-            node.OnRequestAutoCompletePopupPlacementTarget(popup);
-            popup.CustomPopupPlacementCallback = PlaceAutocompletePopup;
+            node.OnRequestAutoCompletePopupPlacementTarget(window, PortModel, autocompletePopupSpacing);
         }
 
         /// <summary>
@@ -394,33 +393,6 @@ private void ConfigurePopupPlacement(Popup popup, double zoom)
             };
         }
 
-        private CustomPopupPlacement[] PlaceAutocompletePopup(Size popupSize, Size targetSize, Point offset)
-        {
-            var zoom = node.WorkspaceViewModel.Zoom;
-
-            double x;
-            var scaledSpacing = autocompletePopupSpacing * targetSize.Width / node.ActualWidth;
-            if (PortModel.PortType == PortType.Input)
-            {
-                // Offset popup to the left by its width from left edge of node and spacing.
-                x = -scaledSpacing - popupSize.Width;
-            }
-            else
-            {
-                // Offset popup to the right by node width and spacing from left edge of node.
-                x = scaledSpacing + targetSize.Width;
-            }
-            // Offset popup down from the upper edge of the node by the node header and corresponding to the respective port.
-            // Scale the absolute heights by the target height (passed to the callback) and the actual height of the node.
-            var scaledHeight = targetSize.Height / node.ActualHeight;
-            var absoluteHeight = NodeModel.HeaderHeight + (PortModel.Index * PortModel.Height);
-            var y = absoluteHeight * scaledHeight;
-
-            var placement = new CustomPopupPlacement(new Point(x, y), PopupPrimaryAxis.None);
-
-            return new[] { placement };
-        }
-
         private CustomPopupPlacement[] PlacePortContextMenu(Size popupSize, Size targetSize, Point offset)
         {
             // The actual zoom here is confusing
@@ -575,7 +547,7 @@ private void AutoComplete(object parameter)
 
             wsViewModel.NodeAutoCompleteSearchViewModel.PortViewModel = this;
 
-            wsViewModel.OnRequestNodeAutoCompleteSearch(ShowHideFlags.Show);
+            wsViewModel.OnRequestNodeAutoCompleteSearch();
         }
 
         // Handler to invoke Node autocomplete cluster
diff --git a/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs
@@ -170,14 +170,14 @@ private void OnRequestHideAllPopup(object param)
             RequestHideAllPopup?.Invoke(param);
         }
 
-        internal event Action<ShowHideFlags> RequestNodeAutoCompleteSearch;
+        internal event Action RequestNodeAutoCompleteSearch;
         internal event Action<PortViewModel> RequestNodeAutoCompleteBar;
         internal event Action<ShowHideFlags, PortViewModel> RequestPortContextMenu;
         internal static event Action<MLNodeClusterAutoCompletionResponse> RequestNodeAutoCompleteViewExtension;
 
-        internal void OnRequestNodeAutoCompleteSearch(ShowHideFlags flag, bool ClusterNodeAutocomplete = false)
+        internal void OnRequestNodeAutoCompleteSearch()
         {
-            RequestNodeAutoCompleteSearch?.Invoke(flag);
+            RequestNodeAutoCompleteSearch?.Invoke();
         }
 
         internal void OnRequestNodeAutocompleteBar(PortViewModel viewModel)
diff --git a/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs
@@ -45,6 +45,7 @@ public class NodeAutoCompleteSearchViewModel : SearchViewModel
         private bool displayLowConfidence;
         private const string nodeAutocompleteMLEndpoint = "MLNodeAutocomplete";
         private const string nodeClusterAutocompleteMLEndpoint = "MLNodeClusterAutocomplete";
+        internal bool IsOpen { get; set; }
 
         // Lucene search utility to perform indexing operations just for NodeAutocomplete.
         internal LuceneSearchUtility LuceneUtility
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -3147,7 +3147,6 @@ public void Dispose()
             //TODO code smell.
             var workspaceView = this.ChildOfType<WorkspaceView>();
             workspaceView?.Dispose();
-            (workspaceView?.NodeAutoCompleteSearchBar?.Child as IDisposable)?.Dispose();
         }
     }
 }
diff --git a/src/DynamoCoreWpf/Views/Core/NodeView.xaml.cs b/src/DynamoCoreWpf/Views/Core/NodeView.xaml.cs
@@ -292,19 +292,33 @@ private void CachedValueChanged()
             }));
         }
 
-        private void ViewModel_RequestAutoCompletePopupPlacementTarget(Popup popup)
+        private Point PointToLocal(double x, double y, UIElement target)
         {
-            popup.PlacementTarget = this;
+            Point positionFromScreen = target.PointToScreen(new Point(x, y));
+            PresentationSource source = PresentationSource.FromVisual(target);
+            Point targetPoints = source.CompositionTarget.TransformFromDevice.Transform(positionFromScreen);
+            return targetPoints;
+        }
 
-            ViewModel.ActualHeight = ActualHeight;
-            ViewModel.ActualWidth = ActualWidth;
+        private void ViewModel_RequestAutoCompletePopupPlacementTarget(Window window, PortModel portModel, double spacing)
+        {
+            if (portModel.PortType == PortType.Input)
+            {
+                var portView = inputPortControl.ItemContainerGenerator.ContainerFromIndex(portModel.Index) as FrameworkElement;
+                window.Top = PointToLocal(0, 0, portView).Y;
+                window.Left = PointToLocal(0, 0, this).X - window.Width - spacing;
+            }
+            else
+            {
+                var portView = outputPortControl.ItemContainerGenerator.ContainerFromIndex(portModel.Index) as FrameworkElement;
+                window.Top = PointToLocal(0, 0, portView).Y;
+                window.Left = PointToLocal(ActualWidth, 0, this).X + spacing;
+            }
         }
 
         private void ViewModel_RequestClusterAutoCompletePopupPlacementTarget(Window window, double spacing)
         {
-            Point positionFromScreen = PointToScreen(new Point(0, this.ActualHeight));
-            PresentationSource source = PresentationSource.FromVisual(this);
-            Point targetPoints = source.CompositionTarget.TransformFromDevice.Transform(positionFromScreen);
+            Point targetPoints = PointToLocal(0, ActualHeight, this);
                 
             window.Left = targetPoints.X;
             window.Top = targetPoints.Y + spacing;
diff --git a/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml b/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml
@@ -369,15 +369,6 @@
             <ui:InCanvasSearchControl RequestShowInCanvasSearch="ShowHideInCanvasControl" />
         </Popup>
 
-        <Popup Name="NodeAutoCompleteSearchBar"
-               StaysOpen="True"
-               AllowsTransparency="True"
-               IsOpen="False"
-               Placement="Custom"
-               DataContext="{Binding NodeAutoCompleteSearchViewModel}">
-            <ui:NodeAutoCompleteSearchControl RequestShowNodeAutoCompleteSearch="ShowHideNodeAutoCompleteControl" />
-        </Popup>
-       
         <Popup Name="ContextMenuPopup"
                AllowsTransparency="True"
                Opened="OnContextMenuOpened"
diff --git a/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml.cs b/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml.cs
@@ -134,7 +134,7 @@ private void RemoveViewModelsubscriptions(WorkspaceViewModel ViewModel)
         {
             ViewModel.RequestShowInCanvasSearch -= ShowHideInCanvasControl;
             ViewModel.RequestHideAllPopup -= HideAllPopUp;
-            ViewModel.RequestNodeAutoCompleteSearch -= ShowHideNodeAutoCompleteControl;
+            ViewModel.RequestNodeAutoCompleteSearch -= ShowNodeAutoCompleteControl;
             ViewModel.RequestNodeAutoCompleteBar -= ShowNodeAutoCompleteBar;
             ViewModel.RequestPortContextMenu -= ShowHidePortContextMenu;
             ViewModel.DynamoViewModel.PropertyChanged -= ViewModel_PropertyChanged;
@@ -166,7 +166,7 @@ private void AttachViewModelsubscriptions(WorkspaceViewModel ViewModel)
         {
             ViewModel.RequestShowInCanvasSearch += ShowHideInCanvasControl;
             ViewModel.RequestHideAllPopup += HideAllPopUp;
-            ViewModel.RequestNodeAutoCompleteSearch += ShowHideNodeAutoCompleteControl;
+            ViewModel.RequestNodeAutoCompleteSearch += ShowNodeAutoCompleteControl;
             ViewModel.RequestNodeAutoCompleteBar += ShowNodeAutoCompleteBar;
             ViewModel.RequestPortContextMenu += ShowHidePortContextMenu;
             ViewModel.DynamoViewModel.PropertyChanged += ViewModel_PropertyChanged;
@@ -188,9 +188,22 @@ private void AttachViewModelsubscriptions(WorkspaceViewModel ViewModel)
             infiniteGridView.AttachToZoomBorder(zoomBorder);
         }
 
-        private void ShowHideNodeAutoCompleteControl(ShowHideFlags flag)
+        private void ShowNodeAutoCompleteControl()
         {
-            ShowHidePopup(flag, NodeAutoCompleteSearchBar);
+            if (ViewModel.NodeAutoCompleteSearchViewModel.IsOpen) return;
+            if (ViewModel.NodeAutoCompleteSearchViewModel.PortViewModel == null) return;
+            // if the MLRecommendation is default but user not accepting TOU, display notification
+            if (ViewModel.NodeAutoCompleteSearchViewModel.IsDisplayingMLRecommendation && !ViewModel.NodeAutoCompleteSearchViewModel.IsMLAutocompleteTOUApproved)
+            {
+                ViewModel.DynamoViewModel.MainGuideManager.CreateRealTimeInfoWindow(Wpf.Properties.Resources.NotificationToAgreeMLNodeautocompleteTOU, true);
+                return;
+            }
+
+            //TODO : Reuse this window?
+            var nodeAutoCompleteBarWindow = new NodeAutoCompleteSearchControl(Window.GetWindow(this), ViewModel.NodeAutoCompleteSearchViewModel);
+            nodeAutoCompleteBarWindow.Show();
+
+            ViewModel.NodeAutoCompleteSearchViewModel.PortViewModel.SetupNodeAutoCompleteWindowPlacement(nodeAutoCompleteBarWindow);
         }
 
         private void ShowNodeAutoCompleteBar(PortViewModel viewModel)
@@ -234,24 +247,7 @@ private void ShowHidePopup(ShowHideFlags flag, Popup popup)
 
                     if (displayPopup)
                     {
-                        if (popup == NodeAutoCompleteSearchBar)
-                        {
-                            if (ViewModel.NodeAutoCompleteSearchViewModel.PortViewModel == null) return;
-                            // if the MLRecommendation is default but user not accepting TOU, display notification
-                            if (ViewModel.NodeAutoCompleteSearchViewModel.IsDisplayingMLRecommendation && !ViewModel.NodeAutoCompleteSearchViewModel.IsMLAutocompleteTOUApproved)
-                            {
-                                ViewModel.DynamoViewModel.MainGuideManager.CreateRealTimeInfoWindow(Wpf.Properties.Resources.NotificationToAgreeMLNodeautocompleteTOU, true);
-                                return;
-                            }
-                            // Force the Child visibility to change here because
-                            // 1. Popup isOpen change does not necessarily update the child control before it take effect
-                            // 2. Dynamo rely on child visibility change hander to setup Node AutoComplete control
-                            // 3. This should not be set to in canvas search control
-                            popup.Child.Visibility = Visibility.Collapsed;
-                            ViewModel.NodeAutoCompleteSearchViewModel.PortViewModel.SetupNodeAutoCompleteWindowPlacement(popup);
-                        }
-
-                        else if (popup == PortContextMenu)
+                        if (popup == PortContextMenu)
                         {
                             popup.Child.Visibility = Visibility.Hidden;
                             if (!(PortContextMenu.DataContext is PortViewModel portViewModel)) return;
@@ -312,10 +308,9 @@ public void HideAllPopUp(object sender)
                 ShowHideGeoScalingPopup(ShowHideFlags.Hide);
             }
             // If triggered on node level, make sure node popups are also hidden
-            if(sender is NodeView && (PortContextMenu.IsOpen || NodeAutoCompleteSearchBar.IsOpen) )
+            if(sender is NodeView && PortContextMenu.IsOpen)
             {
                 ShowHidePopup(ShowHideFlags.Hide, PortContextMenu);
-                ShowHidePopup(ShowHideFlags.Hide, NodeAutoCompleteSearchBar);
             }
         }
 
diff --git a/test/DynamoCoreWpf3Tests/NodeAutoCompleteSearchTests.cs b/test/DynamoCoreWpf3Tests/NodeAutoCompleteSearchTests.cs

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,23 @@ public NodeAutoCompleteSearchControl()`
`57`	`57`	`HomeWorkspaceModel.WorkspaceClosed += this.CloseAutoCompletion;`
`58`	`58`	`}`
`59`	`59`
	`60`	`+ internal NodeAutoCompleteSearchControl(Window window, NodeAutoCompleteSearchViewModel viewModel)`
	`61`	`+ {`
	`62`	`+ Owner = window;`
	`63`	`+ DataContext = viewModel;`
	`64`	`+ ViewModel.IsOpen = true;`
	`65`	`+ InitializeComponent();`
	`66`	`+ if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)`
	`67`	`+ {`
	`68`	`+ Application.Current.Deactivated += CurrentApplicationDeactivated;`
	`69`	`+ if (Application.Current?.MainWindow != null)`
	`70`	`+ {`
	`71`	`+ Application.Current.MainWindow.Closing += NodeAutoCompleteSearchControl_Unloaded;`
	`72`	`+ }`
	`73`	`+ }`
	`74`	`+ HomeWorkspaceModel.WorkspaceClosed += this.CloseAutoCompletion;`
	`75`	`+ }`
	`76`	`+`
`60`	`77`	`private void NodeAutoCompleteSearchControl_Unloaded(object sender, System.ComponentModel.CancelEventArgs e)`
`61`	`78`	`{`
`62`	`79`	`if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)`
`@@ -72,12 +89,13 @@ private void NodeAutoCompleteSearchControl_Unloaded(object sender, System.Compon`
`72`	`89`
`73`	`90`	`private void CurrentApplicationDeactivated(object sender, EventArgs e)`
`74`	`91`	`{`
`75`		`- OnRequestShowNodeAutoCompleteSearch(ShowHideFlags.Hide);`
	`92`	`+ OnRequestHideNodeAutoCompleteSearch();`
`76`	`93`	`}`
`77`	`94`
`78`		`- private void OnRequestShowNodeAutoCompleteSearch(ShowHideFlags flags)`
	`95`	`+ private void OnRequestHideNodeAutoCompleteSearch()`
`79`	`96`	`{`
`80`		`- RequestShowNodeAutoCompleteSearch?.Invoke(flags);`
	`97`	`+ this.ViewModel.IsOpen = false;`
	`98`	`+ this.Close();`
`81`	`99`	`}`
`82`	`100`
`83`	`101`	`private void OnSearchTextBoxTextChanged(object sender, TextChangedEventArgs e)`
`@@ -101,7 +119,7 @@ private void OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)`
`101`	`119`	`if (!(sender is ListBoxItem listBoxItem) \|\| e.OriginalSource is Thumb) return;`
`102`	`120`
`103`	`121`	`ExecuteSearchElement(listBoxItem);`
`104`		`- OnRequestShowNodeAutoCompleteSearch(ShowHideFlags.Hide);`
	`122`	`+ OnRequestHideNodeAutoCompleteSearch();`
`105`	`123`	`e.Handled = true;`
`106`	`124`	`}`
`107`	`125`
`@@ -236,7 +254,7 @@ private void OnParentNodeRemoved(NodeModel node)`
`236`	`254`	`NodeModel parent_node = ViewModel.PortViewModel?.PortModel.Owner;`
`237`	`255`	`if (node == parent_node)`
`238`	`256`	`{`
`239`		`- OnRequestShowNodeAutoCompleteSearch(ShowHideFlags.Hide);`
	`257`	`+ OnRequestHideNodeAutoCompleteSearch();`
`240`	`258`	`ViewModel.ParentNodeRemoved -= OnParentNodeRemoved;`
`241`	`259`	`}`
`242`	`260`	`}`
`@@ -307,13 +325,13 @@ private void OnInCanvasSearchKeyDown(object sender, KeyEventArgs e)`
`307`	`325`	`switch (key)`
`308`	`326`	`{`
`309`	`327`	`case Key.Escape:`
`310`		`- OnRequestShowNodeAutoCompleteSearch(ShowHideFlags.Hide);`
	`328`	`+ OnRequestHideNodeAutoCompleteSearch();`
`311`	`329`	`break;`
`312`	`330`	`case Key.Enter:`
`313`	`331`	`if (HighlightedItem != null && ViewModel.CurrentMode != SearchViewModel.ViewMode.LibraryView)`
`314`	`332`	`{`
`315`	`333`	`ExecuteSearchElement(HighlightedItem);`
`316`		`- OnRequestShowNodeAutoCompleteSearch(ShowHideFlags.Hide);`
	`334`	`+ OnRequestHideNodeAutoCompleteSearch();`
`317`	`335`	`}`
`318`	`336`	`break;`
`319`	`337`	`case Key.Up:`
`@@ -382,7 +400,7 @@ internal void CloseAutocompletionWindow(object sender, RoutedEventArgs e)`
`382`	`400`
`383`	`401`	`internal void CloseAutoCompletion()`
`384`	`402`	`{`
`385`		`- OnRequestShowNodeAutoCompleteSearch(ShowHideFlags.Hide);`
	`403`	`+ OnRequestHideNodeAutoCompleteSearch();`
`386`	`404`	`ViewModel?.OnNodeAutoCompleteWindowClosed();`
`387`	`405`	`}`
`388`	`406`
Original file line number	Diff line number	Diff line change
`@@ -170,14 +170,14 @@ private void OnRequestHideAllPopup(object param)`
`170`	`170`	`RequestHideAllPopup?.Invoke(param);`
`171`	`171`	`}`
`172`	`172`
`173`		`- internal event Action<ShowHideFlags> RequestNodeAutoCompleteSearch;`
	`173`	`+ internal event Action RequestNodeAutoCompleteSearch;`
`174`	`174`	`internal event Action<PortViewModel> RequestNodeAutoCompleteBar;`
`175`	`175`	`internal event Action<ShowHideFlags, PortViewModel> RequestPortContextMenu;`
`176`	`176`	`internal static event Action<MLNodeClusterAutoCompletionResponse> RequestNodeAutoCompleteViewExtension;`
`177`	`177`
`178`		`- internal void OnRequestNodeAutoCompleteSearch(ShowHideFlags flag, bool ClusterNodeAutocomplete = false)`
	`178`	`+ internal void OnRequestNodeAutoCompleteSearch()`
`179`	`179`	`{`
`180`		`- RequestNodeAutoCompleteSearch?.Invoke(flag);`
	`180`	`+ RequestNodeAutoCompleteSearch?.Invoke();`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`internal void OnRequestNodeAutocompleteBar(PortViewModel viewModel)`
Original file line number	Diff line number	Diff line change
`@@ -3147,7 +3147,6 @@ public void Dispose()`
`3147`	`3147`	`//TODO code smell.`
`3148`	`3148`	`var workspaceView = this.ChildOfType<WorkspaceView>();`
`3149`	`3149`	`workspaceView?.Dispose();`
`3150`		`- (workspaceView?.NodeAutoCompleteSearchBar?.Child as IDisposable)?.Dispose();`
`3151`	`3150`	`}`
`3152`	`3151`	`}`
`3153`	`3152`	`}`