Skip to content

DYN-9091: move view to new port and reuse window #16324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chubakueno merged 3 commits into from
Jun 27, 2025
Merged

DYN-9091: move view to new port and reuse window #16324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c159eb3
DYN-9091: move view to new port and reuse window
chubakueno Jun 25, 2025
2a3bc1b
minor refactor and event management fixes
chubakueno Jun 25, 2025
25ba325
Update src/NodeAutoCompleteViewExtension/NodeAutoCompleteViewExtensio…
johnpierson Jun 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions src/NodeAutoCompleteViewExtension/NodeAutoCompleteViewExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
using System.Windows;
using System.Windows.Controls;
using Dynamo.Extensions;
using Dynamo.Logging;
using Dynamo.Graph.Workspaces;
using Dynamo.Logging;
using Dynamo.NodeAutoComplete.ViewModels;
using Dynamo.NodeAutoComplete.Views;
using Dynamo.Search.SearchElements;
Expand All @@ -25,6 +25,7 @@ public class NodeAutoCompleteViewExtension : ViewExtensionBase, IViewExtension,
private const String extensionName = "Node Auto Complete";
private ViewLoadedParams viewLoadedParamsReference;
private NodeAutoCompletePanelViewModel nodeAutoCompleteViewModel;
private NodeAutoCompleteBarView nodeAutoCompleteBarView;

internal MenuItem nodeAutocompleteMenuItem;

Expand All @@ -34,7 +35,7 @@ public class NodeAutoCompleteViewExtension : ViewExtensionBase, IViewExtension,
/// </summary>
internal IEnumerable<NodeAutocompleteCluster> nodeAutocompleteClusters;



internal NodeAutoCompleteView DependencyView
{
Expand Down Expand Up @@ -170,29 +171,36 @@ private void OnNodeAutoCompleteBarRequested(Window parentWindow, ViewModelBase v
{
return;
}

if (nodeAutoCompleteBarViewModel is null)
{
DynamoViewModel dynamoViewModel = portViewModel?.NodeViewModel?.WorkspaceViewModel?.DynamoViewModel;
nodeAutoCompleteBarViewModel = new NodeAutoCompleteBarViewModel(dynamoViewModel);
}

if(nodeAutoCompleteBarViewModel.IsOpen)
{
return;
}

if (nodeAutoCompleteBarViewModel.PortViewModel != null)
{
nodeAutoCompleteBarViewModel.PortViewModel.Highlight = Visibility.Collapsed;
}

nodeAutoCompleteBarViewModel.PortViewModel = portViewModel;
portViewModel.Highlight = Visibility.Visible;

if (nodeAutoCompleteBarViewModel.IsOpen)
{
Comment thread
johnpierson marked this conversation as resolved.
if (nodeAutoCompleteBarView == null)
{
nodeAutoCompleteBarView = new NodeAutoCompleteBarView(parentWindow, nodeAutoCompleteBarViewModel);
nodeAutoCompleteBarView.Show();
}
nodeAutoCompleteBarView.ReloadDataContext(nodeAutoCompleteBarViewModel);
portViewModel.SetupNodeAutoCompleteClusterWindowPlacement(nodeAutoCompleteBarView);
Comment thread
johnpierson marked this conversation as resolved.
return;
}

//TODO : I think we can reuse the window too.
var nodeAutoCompleteBarWindow = new NodeAutoCompleteBarView(parentWindow, nodeAutoCompleteBarViewModel);
nodeAutoCompleteBarWindow.Show();
portViewModel.SetupNodeAutoCompleteClusterWindowPlacement(nodeAutoCompleteBarWindow);
nodeAutoCompleteBarView = new NodeAutoCompleteBarView(parentWindow, nodeAutoCompleteBarViewModel);
nodeAutoCompleteBarView.Show();
portViewModel.SetupNodeAutoCompleteClusterWindowPlacement(nodeAutoCompleteBarView);
}
}
}
48 changes: 24 additions & 24 deletions src/NodeAutoCompleteViewExtension/Views/NodeAutoCompleteBarView.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using Dynamo.Graph.Nodes;
using Dynamo.Graph.Workspaces;
using Dynamo.Logging;
using Dynamo.Models;
using Dynamo.NodeAutoComplete.ViewModels;
using System;
using System.Linq;
using System.Windows;
using System.Windows.Input;
using System.Windows.Threading;
using Dynamo.Graph.Nodes;
using Dynamo.Graph.Workspaces;
using Dynamo.Logging;
using Dynamo.Models;
using Dynamo.NodeAutoComplete.ViewModels;

namespace Dynamo.NodeAutoComplete.Views
{
Expand All @@ -19,13 +19,24 @@ public partial class NodeAutoCompleteBarView
private NodeAutoCompleteBarViewModel ViewModel => DataContext as NodeAutoCompleteBarViewModel;

public NodeAutoCompleteBarView(Window window, NodeAutoCompleteBarViewModel viewModel)
{
{
Owner = window;
DataContext = viewModel;
InitializeComponent();
SubscribeEvents();
LoadAndPopulate();
}

viewModel.PortViewModel.Highlight = Visibility.Visible;
internal void ReloadDataContext(NodeAutoCompleteBarViewModel dataContext)
{
DataContext = dataContext;
UnsubscribeEvents(this, null);
SubscribeEvents();
LoadAndPopulate();
}

private void SubscribeEvents()
{
if (string.IsNullOrEmpty(DynamoModel.HostAnalyticsInfo.HostName) && Application.Current != null)
{
if (Application.Current?.MainWindow != null)
Comment thread
johnpierson marked this conversation as resolved.
Expand All @@ -34,8 +45,7 @@ public NodeAutoCompleteBarView(Window window, NodeAutoCompleteBarViewModel viewM
}
}
HomeWorkspaceModel.WorkspaceClosed += CloseAutoComplete;
viewModel.IsOpen = true;
LoadAndPopulate();
ViewModel.ParentNodeRemoved += OnParentNodeRemoved;
}

private void UnsubscribeEvents(object sender, System.ComponentModel.CancelEventArgs e)
Expand All @@ -48,24 +58,15 @@ private void UnsubscribeEvents(object sender, System.ComponentModel.CancelEventA
}
}
HomeWorkspaceModel.WorkspaceClosed -= CloseAutoComplete;
ViewModel.ParentNodeRemoved -= OnParentNodeRemoved;
}

private void LoadAndPopulate()
{
Analytics.TrackEvent(
Dynamo.Logging.Actions.Open,
Dynamo.Logging.Categories.NodeAutoCompleteOperations);
ViewModel.DropdownResults = null;
ViewModel.IsOpen = true;
Analytics.TrackEvent(Actions.Open, Categories.NodeAutoCompleteOperations);

// Visibility of textbox changed, but text box has not been initialized(rendered) yet.
// Call asynchronously focus, when textbox will be ready.
Dispatcher.BeginInvoke(new Action(() =>
{
ViewModel.PopulateAutoComplete();
//ViewModel.PopulateAutoCompleteCandidates();
}), DispatcherPriority.Loaded);

ViewModel.ParentNodeRemoved += OnParentNodeRemoved;
ViewModel.PopulateAutoComplete();
}

private void GripHandle_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
Expand Down Expand Up @@ -103,7 +104,6 @@ private void OnParentNodeRemoved(NodeModel node)
if (node == parent_node)
{
CloseAutoComplete();
ViewModel.ParentNodeRemoved -= OnParentNodeRemoved;
}
}

Expand Down Expand Up @@ -161,7 +161,7 @@ internal void CloseAutoComplete()
ViewModel?.DeleteTransientNodes();
ViewModel?.ToggleUndoRedoLocked(false);
}), DispatcherPriority.Loaded);

Close();
UnsubscribeEvents(this, null);
}
Expand Down
Loading