[DYN-7845] Hide input and output ports from collapsed groups (#16302)

ivaylo-matov · Copilot · zeusongit · web-flow · commit bac3902a86b5 · 2025-07-10T10:53:26.000-04:00
Co-authored-by: Copilot &lt;175728472+Copilot@users.noreply.github.com&gt;
Co-authored-by: Ashish Aggarwal &lt;ashish.aggarwal@autodesk.com&gt;
diff --git a/src/DynamoCore/Graph/Annotations/AnnotationModel.cs b/src/DynamoCore/Graph/Annotations/AnnotationModel.cs
@@ -548,24 +548,6 @@ public double MinWidthOnCollapsed
             }
         }
 
-        private double minCollapsedPortAreaHeight;
-        /// <summary>
-        /// Gets or sets the minimum height of the port area when the group is collapsed.
-        /// Used to calculate the total height of the collapsed group based on proxy ports
-        /// </summary>
-        public double MinCollapsedPortAreaHeight
-        {
-            get => minCollapsedPortAreaHeight;
-            set
-            {
-                if (minCollapsedPortAreaHeight != value)
-                {
-                    minCollapsedPortAreaHeight = value;
-                    RaisePropertyChanged(nameof(MinCollapsedPortAreaHeight));
-                }
-            }
-        }
-
         #endregion
 
         /// <summary>
diff --git a/src/DynamoCore/PublicAPI.Unshipped.txt b/src/DynamoCore/PublicAPI.Unshipped.txt
@@ -728,8 +728,6 @@ Dynamo.Graph.Annotations.AnnotationModel.IsUnconnectedOutPortsCollapsed.set -> v
 Dynamo.Graph.Annotations.AnnotationModel.IsVisible.get -> bool
 Dynamo.Graph.Annotations.AnnotationModel.loadFromXML.get -> bool
 Dynamo.Graph.Annotations.AnnotationModel.loadFromXML.set -> void
-Dynamo.Graph.Annotations.AnnotationModel.MinCollapsedPortAreaHeight.get -> double
-Dynamo.Graph.Annotations.AnnotationModel.MinCollapsedPortAreaHeight.set -> void
 Dynamo.Graph.Annotations.AnnotationModel.MinWidthOnCollapsed.get -> double
 Dynamo.Graph.Annotations.AnnotationModel.MinWidthOnCollapsed.set -> void
 Dynamo.Graph.Annotations.AnnotationModel.ModelAreaHeight.get -> double
diff --git a/src/DynamoCoreWpf/ViewModels/Core/AnnotationViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/AnnotationViewModel.cs
@@ -34,7 +34,7 @@ public class AnnotationViewModel : ViewModelBase
         // vertical offset accounts for the port margins
         private const int verticalOffset = 17;
         private const int portVerticalMidPoint = 17;
-        private const int portToggleOffset = 30;
+        private const int portToggleOffset = 32;
         private ObservableCollection<Dynamo.Configuration.StyleItem> groupStyleList;
         private IEnumerable<Configuration.StyleItem> preferencesStyleItemsList;
         private PreferenceSettings preferenceSettings;
@@ -50,13 +50,6 @@ public class AnnotationViewModel : ViewModelBase
         private const double MinSpacing = 50;
         private const double MinChangeThreshold = 1;
 
-        // Collapsed proxy ports for Code Block Nodes appear visually misaligned - 0.655px
-        // taller compared to their actual ports. This is due to the fixed height - 16.345px
-        // used inside CBNs for code lines, while proxy ports use 14px height + 3px top margin.
-        // To compensate for this visual mismatch and keep connector alignment consistent,
-        // we apply this adjusted proxy height.
-        private const double CodeBlockCollapsedPortVisualHeight = 17;
-
         public readonly WorkspaceViewModel WorkspaceViewModel;
 
         #region Properties
@@ -1498,13 +1491,29 @@ private Dictionary<ModelBase, double> GetAffectedModels(
             bool isHorizontal,
             HashSet<ModelBase> skip)
         {
+            // Track already processed items from prior horizontal/vertical pass
             var visited = new HashSet<ModelBase>(skip);
-            foreach (var node in expandingGroup.Nodes)
-                visited.Add(node);
+
+            // Ensure expanding group and all its content (including nested groups) are ignored
+            if (!visited.Any())
+            {
+                visited.Add(expandingGroup);
+
+                foreach (var node in expandingGroup.Nodes)
+                {
+                    visited.Add(node);
+
+                    if (node is AnnotationModel nestedGroup)
+                    {
+                        foreach (var nestedNode in nestedGroup.Nodes)
+                            visited.Add(nestedNode);
+                    }
+                }
+            }
 
             var toProcess = new List<ModelBase>();
             var directlyAffected = new List<ModelBase>();
-            var otherGroups = WorkspaceViewModel.Model.Annotations.Where(g => g != expandingGroup);
+            var otherGroups = WorkspaceViewModel.Model.Annotations.Where(g => !visited.Contains(g));
             var allGroupedItems = WorkspaceViewModel.Model.Annotations.SelectMany(g => g.Nodes);
             double smallestSpacing = double.MaxValue;
 
diff --git a/src/DynamoCoreWpf/Views/Core/AnnotationView.xaml.cs b/src/DynamoCoreWpf/Views/Core/AnnotationView.xaml.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
@@ -58,7 +57,7 @@ public partial class AnnotationView : IViewModelView<AnnotationViewModel>
         private Grid outputPortsGrid;
         private Grid groupContent;
         private Border nodeCountBorder;
-
+        
         private Thumb mainGroupThumb;
 
         private bool _isUpdatingLayout = false;
@@ -188,6 +187,11 @@ private void InitializeUI()
                 IsHitTestVisible = true
             };
 
+            AnnotationGrid.SetBinding(VisibilityProperty, new Binding("IsCollapsed")
+            {
+                Converter = _inverseBooleanToVisibilityCollapsedConverter
+            });
+
             // Add RowDefinitions
             AnnotationGrid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
             AnnotationGrid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
@@ -470,7 +474,6 @@ private void GroupTextBox_OnTextChanged(object sender, TextChangedEventArgs e)
             {
                 ViewModel.WorkspaceViewModel.HasUnsavedChanges = true;
             }
-            
         }
 
         /// <summary>
