DYN-9089: autofocus search box (#16336)

chubakueno · Copilot · web-flow · commit 7fb748b51413 · 2025-07-03T12:05:02.000-05:00
Co-authored-by: Copilot &lt;175728472+Copilot@users.noreply.github.com&gt;
diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
@@ -486,15 +486,14 @@
                                         Background="#535353"
                                         BorderBrush="{DynamicResource MidLightBlueBrush}"
                                         BorderThickness="0,6,0,0" />
-                                <ScrollViewer Margin="0,6,0,6" SnapsToDevicePixels="True">
-                                    <StackPanel KeyboardNavigation.DirectionalNavigation="Contained">
-                                        <ContentControl x:Name="SearchSlot"
-                                            Content="{TemplateBinding Tag}"
-                                            Visibility="{Binding Content, RelativeSource={RelativeSource Self}, Converter={StaticResource NullToVisibiltyConverter}}"
-                                        />
-
-                                        <StackPanel IsItemsHost="True" />
-                                    </StackPanel>
+                                <ContentControl x:Name="SearchSlot"
+                                    Content="{TemplateBinding Tag}"
+                                    Visibility="{Binding Content, RelativeSource={RelativeSource Self}, Converter={StaticResource NullToVisibiltyConverter}}"
+                                    Margin="0,6,0,0"
+                                    VerticalAlignment="Top"/>
+                                <ScrollViewer Margin="0,36,0,0" SnapsToDevicePixels="True">
+                                    <StackPanel KeyboardNavigation.DirectionalNavigation="Contained"
+                                                IsItemsHost="True" />
                                 </ScrollViewer>
                             </Grid>
                         </Popup>
diff --git a/src/NodeAutoCompleteViewExtension/ViewModels/NodeAutoCompleteBarViewModel.cs b/src/NodeAutoCompleteViewExtension/ViewModels/NodeAutoCompleteBarViewModel.cs
@@ -1,39 +1,39 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using System.Windows.Data;
+using System.Windows.Media;
 using Dynamo.Configuration;
 using Dynamo.Engine;
+using Dynamo.Graph;
 using Dynamo.Graph.Connectors;
 using Dynamo.Graph.Nodes;
 using Dynamo.Graph.Nodes.CustomNodes;
 using Dynamo.Graph.Nodes.ZeroTouch;
+using Dynamo.Graph.Workspaces;
 using Dynamo.Logging;
 using Dynamo.Models;
+using Dynamo.NodeAutoComplete.Services;
 using Dynamo.PackageManager;
 using Dynamo.Properties;
 using Dynamo.Search;
 using Dynamo.Search.SearchElements;
 using Dynamo.Utilities;
+using Dynamo.ViewModels;
+using Dynamo.Wpf.Utilities;
 using Dynamo.Wpf.ViewModels;
 using Greg;
 using Newtonsoft.Json;
 using ProtoCore.AST.AssociativeAST;
 using ProtoCore.Mirror;
 using ProtoCore.Utils;
 using RestSharp;
-using Dynamo.Wpf.Utilities;
-using Dynamo.ViewModels;
-using System.Reflection;
-using Dynamo.Graph.Workspaces;
-using Dynamo.Graph;
-using System.Windows.Media;
-using System.ComponentModel;
-using System.Windows.Data;
-using Dynamo.NodeAutoComplete.Services;
 
 namespace Dynamo.NodeAutoComplete.ViewModels
 {
@@ -51,6 +51,7 @@ public class NodeAutoCompleteBarViewModel : SearchViewModel
         private const string nodeClusterAutocompleteMLEndpoint = "MLNodeClusterAutocomplete";
         private const double minClusterConfidenceScore = 0.001;
         private static Assembly dynamoCoreWpfAssembly;
+        private string lastSerializedAddedCluster = null;
 
         private bool _isSingleAutocomplete;
         public bool IsInput => PortViewModel.PortType == PortType.Input;
@@ -157,7 +158,7 @@ internal IEnumerable<DNADropdownViewModel> DropdownResults
         /// Return the filter associated currently with dropdown results.
         /// </summary>
         public ICollectionView FilteredView { get; set; }
-                
+
         /// <summary>
         /// Return the qualified results from the ML service above preferred confidence threshold
         /// </summary>
@@ -228,9 +229,14 @@ public string SearchInput
                 _searchInput = value;
 
                 if (FilteredView != null)
-                {                    
+                {
                     FilteredView.Refresh();
                 }
+                if (FilteredView.Cast<DNADropdownViewModel>().Any())
+                {
+                    SelectedIndex = 0;
+                    RefocusSearchBox?.Invoke();
+                }
 
                 RaisePropertyChanged(nameof(SearchInput));
             }
@@ -262,6 +268,26 @@ public int SelectedIndex
                 }
             }
         }
+        bool isDropDownOpen = false;
+        public bool IsDropDownOpen
+        {
+            get
+            {
+                return isDropDownOpen;
+            }
+            set
+            {
+                if (isDropDownOpen != value)
+                {
+                    isDropDownOpen = value;
+                    if (value)
+                    {
+                        RefocusSearchBox?.Invoke();
+                    }
+                    RaisePropertyChanged(nameof(IsDropDownOpen));
+                }
+            }
+        }
 
         internal void ConsolidateTransientNodes()
         {
@@ -380,6 +406,7 @@ public bool IsDNAClusterPlacementEnabled
         }
 
         internal event Action<NodeModel> ParentNodeRemoved;
+        internal event Action RefocusSearchBox;
 
         internal MLNodeClusterAutoCompletionResponse FullResults { private set; get; }
         private Guid LastRequestGuid;
@@ -413,7 +440,8 @@ internal void ResetAutoCompleteSearchViewState()
             FilteredResults = new List<NodeSearchElementViewModel>();
             FilteredHighConfidenceResults = new List<NodeSearchElementViewModel>();
             FilteredLowConfidenceResults = new List<NodeSearchElementViewModel>();
-            SearchInput = string.Empty;            
+            SearchInput = string.Empty;
+            lastSerializedAddedCluster = null;
         }
 
         internal MLNodeAutoCompletionRequest GenerateRequestForMLAutocomplete()
@@ -500,7 +528,7 @@ internal MLNodeAutoCompletionRequest GenerateRequestForMLAutocomplete()
 
                 if (startNode.Equals(nodeInfo) || endNode.Equals(nodeInfo) || upstreamAndDownstreamNodes.Contains(startNode) || upstreamAndDownstreamNodes.Contains(endNode))
                 {
-                    var startPortName = (startNode is VariableInputNode || startNode is DSVarArgFunction) ? ParseVariableInputPortName(connector.Start.Name): connector.Start.Name;
+                    var startPortName = (startNode is VariableInputNode || startNode is DSVarArgFunction) ? ParseVariableInputPortName(connector.Start.Name) : connector.Start.Name;
                     var endPortName = (endNode is VariableInputNode || endNode is DSVarArgFunction) ? ParseVariableInputPortName(connector.End.Name) : connector.End.Name;
 
                     var connectorRequest = new ConnectionItem
@@ -570,7 +598,7 @@ private IEnumerable<SingleResultItem> GetNodeAutocompleMLResults()
 
                         // Set PortToConnect for each element based on port-index and port-name
                         nodeSearchElement.AutoCompletionNodeElementInfo = new AutoCompletionNodeElementInfo
-                        {   
+                        {
                             PortToConnect = portIndex
                         };
 
@@ -621,7 +649,7 @@ private IEnumerable<SingleResultItem> GetNodeAutocompleMLResults()
 
 
         private T GetGenericAutocompleteResult<T>(string endpoint)
-        {   
+        {
             var requestDTO = GenerateRequestForMLAutocomplete();
             var jsonRequest = JsonConvert.SerializeObject(requestDTO);
 
@@ -795,14 +823,23 @@ internal void AddCluster(int filterredIndex)
             var currentFilter = FilteredView.Cast<DNADropdownViewModel>().ToList();
             var currentItem = filterredIndex >= 0 && filterredIndex < currentFilter.Count ? currentFilter[filterredIndex] : null;
 
-            AddCluster(currentItem.ClusterResultItem);
+            if (currentItem?.ClusterResultItem != null)
+            {
+                AddCluster(currentItem.ClusterResultItem);
+            }
         }
 
         // Add Cluster from server result into the workspace
         internal void AddCluster(ClusterResultItem clusterResultItem)
         {
             if (clusterResultItem == null || clusterResultItem.Topology == null)
                 return;
+            var nextCluster = JsonConvert.SerializeObject(clusterResultItem);
+            if (lastSerializedAddedCluster == nextCluster)
+            {
+                return; // Avoid adding the same cluster multiple times when filtered items dont change
+            }
+            lastSerializedAddedCluster = nextCluster;
 
             List<ModelBase> createdClusterItems = new List<ModelBase>();
 
@@ -833,7 +870,7 @@ internal void AddCluster(ClusterResultItem clusterResultItem)
                     var typeInfo = new NodeModelTypeId(nodeItem.Type.Id);
 
                     NodeModel newNode = dynamoModel.CreateNodeFromNameOrType(Guid.NewGuid(), typeInfo.FullName, true);
-                    
+
                     if (newNode != null)
                     {
                         newNode.X = offset; // Adjust X position
@@ -856,7 +893,7 @@ internal void AddCluster(ClusterResultItem clusterResultItem)
                 if (PortViewModel.PortType == PortType.Output)
                 {
                     var portIndex = clusterResultItem.EntryNodeInPort;
-                    if (entryNode.InPorts.Count > portIndex &&!entryNode.InPorts[portIndex].Connectors.Any())
+                    if (entryNode.InPorts.Count > portIndex && !entryNode.InPorts[portIndex].Connectors.Any())
                     {
                         entryConnector = ConnectorModel.Make(PortViewModel.NodeViewModel.NodeModel, entryNode, PortViewModel.PortModel.Index, portIndex);
                     }
@@ -946,7 +983,7 @@ internal void PopulateAutoComplete()
             ResetAutoCompleteSearchViewState();
 
             FullResults = null;
-            if(DropdownResults != null)
+            if (DropdownResults != null)
             {
                 DropdownResults = null;
             }
@@ -979,7 +1016,7 @@ internal void PopulateAutoComplete()
 
                 dynamoViewModel.UIDispatcher.BeginInvoke(() =>
                 {
-                    if(LastRequestGuid != myRequest)
+                    if (LastRequestGuid != myRequest)
                     {
                         //a newer request came, we're no longer interested in the results of this one
                         //only latest request has the right to be committed to the UI and internal data structures
@@ -1029,11 +1066,11 @@ internal void PopulateAutoComplete()
                     }
                     // this runs synchronously on the UI thread, so the UI can't disappear during execution
                     DropdownResults = comboboxResults;
-                    if (comboboxResults.Any())
+                    IsDropDownOpen = true;
+                    if (FilteredView.Cast<DNADropdownViewModel>().Any())
                     {
                         SelectedIndex = 0;
                     }
-                    
                 });
             });
             //Tracking Analytics when raising Node Autocomplete with the Recommended Nodes option selected (Machine Learning)
diff --git a/src/NodeAutoCompleteViewExtension/Views/NodeAutoCompleteBarView.xaml b/src/NodeAutoCompleteViewExtension/Views/NodeAutoCompleteBarView.xaml
@@ -162,6 +162,7 @@
                             FontFamily="{StaticResource ArtifaktElementRegular}"
                             Foreground="{StaticResource DefaultSearchTextBlockText}"
                             ItemsSource="{Binding FilteredView, NotifyOnTargetUpdated=True}"
+                            IsDropDownOpen="{Binding IsDropDownOpen, Mode=TwoWay}"
                             Visibility="{Binding ResultsLoaded, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityConverter}}"
                             TabIndex="0"
                         >
diff --git a/src/NodeAutoCompleteViewExtension/Views/NodeAutoCompleteBarView.xaml.cs b/src/NodeAutoCompleteViewExtension/Views/NodeAutoCompleteBarView.xaml.cs
@@ -35,6 +35,14 @@ internal void ReloadDataContext(NodeAutoCompleteBarViewModel dataContext)
             LoadAndPopulate();
         }
 
+        private void OnRefocusSearchbox()
+        {
+            Dispatcher.BeginInvoke(new Action(() =>
+            {
+                AutoCompleteSearchBox.Focus();
+            }), DispatcherPriority.ApplicationIdle);
+        }
+
         private void SubscribeEvents()
         {
             if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
@@ -46,6 +54,7 @@ private void SubscribeEvents()
             }
             HomeWorkspaceModel.WorkspaceClosed += CloseAutoComplete;
             ViewModel.ParentNodeRemoved += OnParentNodeRemoved;
+            ViewModel.RefocusSearchBox += OnRefocusSearchbox;
         }
 
         private void UnsubscribeEvents(object sender, System.ComponentModel.CancelEventArgs e)
@@ -59,6 +68,7 @@ private void UnsubscribeEvents(object sender, System.ComponentModel.CancelEventA
             }
             HomeWorkspaceModel.WorkspaceClosed -= CloseAutoComplete;
             ViewModel.ParentNodeRemoved -= OnParentNodeRemoved;
+            ViewModel.RefocusSearchBox -= OnRefocusSearchbox;
         }
 
         private void LoadAndPopulate()

Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,7 @@`
`162`	`162`	`FontFamily="{StaticResource ArtifaktElementRegular}"`
`163`	`163`	`Foreground="{StaticResource DefaultSearchTextBlockText}"`
`164`	`164`	`ItemsSource="{Binding FilteredView, NotifyOnTargetUpdated=True}"`
	`165`	`+ IsDropDownOpen="{Binding IsDropDownOpen, Mode=TwoWay}"`
`165`	`166`	`Visibility="{Binding ResultsLoaded, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BooleanToVisibilityConverter}}"`
`166`	`167`	`TabIndex="0"`
`167`	`168`	`>`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,14 @@ internal void ReloadDataContext(NodeAutoCompleteBarViewModel dataContext)`
`35`	`35`	`LoadAndPopulate();`
`36`	`36`	`}`
`37`	`37`
	`38`	`+ private void OnRefocusSearchbox()`
	`39`	`+ {`
	`40`	`+ Dispatcher.BeginInvoke(new Action(() =>`
	`41`	`+ {`
	`42`	`+ AutoCompleteSearchBox.Focus();`
	`43`	`+ }), DispatcherPriority.ApplicationIdle);`
	`44`	`+ }`
	`45`	`+`
`38`	`46`	`private void SubscribeEvents()`
`39`	`47`	`{`
`40`	`48`	`if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)`
`@@ -46,6 +54,7 @@ private void SubscribeEvents()`
`46`	`54`	`}`
`47`	`55`	`HomeWorkspaceModel.WorkspaceClosed += CloseAutoComplete;`
`48`	`56`	`ViewModel.ParentNodeRemoved += OnParentNodeRemoved;`
	`57`	`+ ViewModel.RefocusSearchBox += OnRefocusSearchbox;`
`49`	`58`	`}`
`50`	`59`
`51`	`60`	`private void UnsubscribeEvents(object sender, System.ComponentModel.CancelEventArgs e)`
`@@ -59,6 +68,7 @@ private void UnsubscribeEvents(object sender, System.ComponentModel.CancelEventA`
`59`	`68`	`}`
`60`	`69`	`HomeWorkspaceModel.WorkspaceClosed -= CloseAutoComplete;`
`61`	`70`	`ViewModel.ParentNodeRemoved -= OnParentNodeRemoved;`
	`71`	`+ ViewModel.RefocusSearchBox -= OnRefocusSearchbox;`
`62`	`72`	`}`
`63`	`73`
`64`	`74`	`private void LoadAndPopulate()`