Fixed port update custom method & order in graph context menu

Author: alelievr

Assets/com.alelievr.NodeGraphProcessor/Editor/Views/BaseGraphView.cs

@@ -449,9 +449,9 @@ public override List< Port > GetCompatiblePorts(Port startPort, NodeAdapter node
 		/// <param name="evt"></param>
 		public override void BuildContextualMenu(ContextualMenuPopulateEvent evt)
 		{
-			BuildGroupContextualMenu(evt);
-			BuildStickyNoteContextualMenu(evt);
 			base.BuildContextualMenu(evt);
+			BuildGroupContextualMenu(evt, 1);
+			BuildStickyNoteContextualMenu(evt, 2);
 			BuildViewContextualMenu(evt);
 			BuildSelectAssetContextualMenu(evt);
 			BuildSaveAssetContextualMenu(evt);
@@ -462,21 +462,25 @@ public override void BuildContextualMenu(ContextualMenuPopulateEvent evt)
 		/// Add the New Group entry to the context menu
 		/// </summary>
 		/// <param name="evt"></param>
-		protected virtual void BuildGroupContextualMenu(ContextualMenuPopulateEvent evt)
+		protected virtual void BuildGroupContextualMenu(ContextualMenuPopulateEvent evt, int menuPosition = -1)
 		{
+			if (menuPosition == -1)
+				menuPosition = evt.menu.MenuItems().Count;
 			Vector2 position = (evt.currentTarget as VisualElement).ChangeCoordinatesTo(contentViewContainer, evt.localMousePosition);
-            evt.menu.AppendAction("New Group", (e) => AddSelectionsToGroup(AddGroup(new Group("New Group", position))), DropdownMenuAction.AlwaysEnabled);
+            evt.menu.InsertAction(menuPosition, "Create Group", (e) => AddSelectionsToGroup(AddGroup(new Group("Create Group", position))), DropdownMenuAction.AlwaysEnabled);
 		}
 
 		/// <summary>
 		/// -Add the New Sticky Note entry to the context menu
 		/// </summary>
 		/// <param name="evt"></param>
-		protected virtual void BuildStickyNoteContextualMenu(ContextualMenuPopulateEvent evt)
+		protected virtual void BuildStickyNoteContextualMenu(ContextualMenuPopulateEvent evt, int menuPosition = -1)
 		{
+			if (menuPosition == -1)
+				menuPosition = evt.menu.MenuItems().Count;
 #if UNITY_2020_1_OR_NEWER
 			Vector2 position = (evt.currentTarget as VisualElement).ChangeCoordinatesTo(contentViewContainer, evt.localMousePosition);
-            evt.menu.AppendAction("New Sticky Note", (e) => AddStickyNote(new StickyNote("New Note", position)), DropdownMenuAction.AlwaysEnabled);
+            evt.menu.InsertAction(menuPosition, "Create Sticky Note", (e) => AddStickyNote(new StickyNote("Create Note", position)), DropdownMenuAction.AlwaysEnabled);
 #endif
 		}
 

Assets/com.alelievr.NodeGraphProcessor/Editor/Views/BaseNodeView.cs

@@ -758,7 +758,7 @@ protected VisualElement AddControlField(FieldInfo field, string label = null, bo
 			}, showInputDrawer ? "" : label);
 
 			// Disallow picking scene objects when the graph is not linked to a scene
-			if (!owner.graph.IsLinkedToScene())
+			if (element != null && !owner.graph.IsLinkedToScene())
 			{
 				var objectField = element.Q<ObjectField>();
 				if (objectField != null)
@@ -780,6 +780,7 @@ protected VisualElement AddControlField(FieldInfo field, string label = null, bo
 				}
 				else
 				{
+					element.name = field.Name;
 					controlsContainer.Add(element);
 				}
 			}

Assets/com.alelievr.NodeGraphProcessor/Runtime/Elements/BaseNode.cs

@@ -304,8 +304,11 @@ public bool UpdateAllPorts()
 		{
 			bool changed = false;
 
-			foreach (var field in nodeFields)
-				changed |= UpdatePortsForField(field.Value.fieldName);
+			foreach (var key in OverrideFieldOrder(nodeFields.Values.Select(k => k.info)))
+			{
+				var field = nodeFields[key.Name];
+				changed |= UpdatePortsForField(field.fieldName);
+			}
 
 			return changed;
 		}
@@ -317,8 +320,11 @@ public bool UpdateAllPortsLocal()
 		{
 			bool changed = false;
 
-			foreach (var field in nodeFields)
-				changed |= UpdatePortsForFieldLocal(field.Value.fieldName);
+			foreach (var key in OverrideFieldOrder(nodeFields.Values.Select(k => k.info)))
+			{
+				var field = nodeFields[key.Name];
+				changed |= UpdatePortsForFieldLocal(field.fieldName);
+			}
 
 			return changed;
 		}