Merge pull request #112 from PaulNonatomic/feat/delete-selected

PaulNonatomic · web-flow · commit 5330d0d43464 · 2024-09-17T19:31:16.000+01:00
Feat/delete selected
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+# [0.8.5-beta] - Sept 17, 2024
+- Fix for deleting a selection via the context menu
+
 ## [0.8.4-beta] - Sept 11, 2024
 - SharedData.ClearData is now Obsolete and will be removed in a future release. Use SharedData.ClearAllData instead.
 - Added SharedData.ClearAllData method to clear all shared data.
diff --git a/Editor/StateGraph/StateGraphContextMenu.cs b/Editor/StateGraph/StateGraphContextMenu.cs
@@ -43,7 +43,7 @@ private void BuildContextMenu(ContextualMenuPopulateEvent evt)
 
 		private void BuildNodeContext(ContextualMenuPopulateEvent evt, NodeView nodeView)
 		{
-			evt.menu.AppendAction("Delete", action 
+			evt.menu.AppendAction( "Delete", action 
 				=> OnDeleteStateNode?.Invoke(nodeView));
 
 			if (_graphView.selection.Count > 0)
diff --git a/Editor/StateGraph/StateNodeGraphStateManager.cs b/Editor/StateGraph/StateNodeGraphStateManager.cs
@@ -1,6 +1,5 @@
 ﻿using System.Linq;
 using Nonatomic.VSM2.Editor.NodeGraph;
-using Nonatomic.VSM2.Editor.Persistence;
 using Nonatomic.VSM2.StateGraph;
 using UnityEditor;
 using UnityEngine;
diff --git a/Editor/StateGraph/VisualElements/StateGraphView.cs b/Editor/StateGraph/VisualElements/StateGraphView.cs
@@ -279,11 +279,7 @@ private void HandleDeleteSelection()
 		{
 			if (GuardUtils.GuardAgainstRuntimeOperation()) return;
 			
-			var selectedNodeModels = selection
-				.OfType<NodeView>()
-				.ToList();
-			
-			DeleteNodes(selectedNodeModels);
+			DeleteSelection();
 		}
 
 		private void HandleDeleteStateNode(NodeView nodeView)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 ﻿{
   "name": "com.nonatomic.visualstatemachinev2",
-  "version": "0.8.4-beta",
+  "version": "0.8.5-beta",
   "displayName": "Visual State Machine V2",
   "description": "Visual State Machine V2",
   "unity": "2022.3",

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ private void BuildContextMenu(ContextualMenuPopulateEvent evt)`
`43`	`43`
`44`	`44`	`private void BuildNodeContext(ContextualMenuPopulateEvent evt, NodeView nodeView)`
`45`	`45`	`{`
`46`		`- evt.menu.AppendAction("Delete", action`
	`46`	`+ evt.menu.AppendAction( "Delete", action`
`47`	`47`	`=> OnDeleteStateNode?.Invoke(nodeView));`
`48`	`48`
`49`	`49`	`if (_graphView.selection.Count > 0)`
Original file line number	Diff line number	Diff line change
`@@ -279,11 +279,7 @@ private void HandleDeleteSelection()`
`279`	`279`	`{`
`280`	`280`	`if (GuardUtils.GuardAgainstRuntimeOperation()) return;`
`281`	`281`
`282`		`- var selectedNodeModels = selection`
`283`		`- .OfType<NodeView>()`
`284`		`- .ToList();`
`285`		`-`
`286`		`- DeleteNodes(selectedNodeModels);`
	`282`	`+ DeleteSelection();`
`287`	`283`	`}`
`288`	`284`
`289`	`285`	`private void HandleDeleteStateNode(NodeView nodeView)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "com.nonatomic.visualstatemachinev2",`
`3`		`- "version": "0.8.4-beta",`
	`3`	`+ "version": "0.8.5-beta",`
`4`	`4`	`"displayName": "Visual State Machine V2",`
`5`	`5`	`"description": "Visual State Machine V2",`
`6`	`6`	`"unity": "2022.3",`