Adding functionality for GroupModel Removal to RemoveControl

Author: K0369

src/Blazor.Diagrams.Core/Controls/Default/RemoveControl.cs

@@ -25,23 +25,42 @@ public RemoveControl(IPositionProvider positionProvider)
 
     public override async ValueTask OnPointerDown(Diagram diagram, Model model, PointerEventArgs _)
     {
-        switch (model)
+        if (await ShouldDeleteModel(diagram, model))
         {
+            DeleteModel(diagram, model);
+        }
+    }
 
+    private static void DeleteModel(Diagram diagram, Model model)
+    {
+       switch (model)
+        {
+            case GroupModel group:
+                diagram.Groups.Delete(group);
+                return;
             case NodeModel node:
-                if (await diagram.Options.Constraints.ShouldDeleteNode.Invoke(node))
-                {
-                    diagram.Nodes.Remove(node);
-                }
-                break;
+                diagram.Nodes.Remove(node);
+                return;
+
             case BaseLinkModel link:
-                if (await diagram.Options.Constraints.ShouldDeleteLink.Invoke(link))
-                {
-                    diagram.Links.Remove(link);
-                }
-                break;
+                diagram.Links.Remove(link);
+                return;
+        }
+    }
 
-            
+    private static async ValueTask<bool> ShouldDeleteModel(Diagram diagram, Model model)
+    {
+        if (model.Locked)
+        {
+            return false;
         }
+
+        return model switch
+        {
+            GroupModel group => await diagram.Options.Constraints.ShouldDeleteGroup.Invoke(group),
+            NodeModel node => await diagram.Options.Constraints.ShouldDeleteNode.Invoke(node),
+            BaseLinkModel link => await diagram.Options.Constraints.ShouldDeleteLink.Invoke(link),
+            _ => false,
+        };
     }
 }

tests/Blazor.Diagrams.Core.Tests/Controls/RemoveControlTests.cs

@@ -175,5 +175,98 @@ public async Task OnPointerDown_ShouldDeleteLinkFalse_KeepsLink()
             Assert.Contains(link, diagram.Links);
         }
 
+        [Fact]
+        public async Task OnPointerDown_NoConstraints_RemovesGroup()
+        {
+            // Arrange
+            RemoveControl removeControl = new(0, 0);
+            Diagram diagram = new TestDiagram();
+
+            var node1 = new NodeModel(new Point(50, 50));
+            var node2 = new NodeModel(new Point(300, 300));
+            diagram.Nodes.Add(new[] { node1, node2 });
+            node1.AddPort(PortAlignment.Right);
+            node2.AddPort(PortAlignment.Left);
+
+            var group = new GroupModel(new[] { node1, node2 });
+
+
+            diagram.Groups.Add(group);
+
+            // Act
+            await removeControl.OnPointerDown(diagram, group, PointerEventArgs);
+
+            // Assert
+            Assert.Empty(diagram.Groups);
+            Assert.Empty(diagram.Nodes);
+        }
+
+        [Fact]
+        public async Task OnPointerDown_ShouldDeleteGroupTrue_RemovesGroup()
+        {
+            // Arrange
+            RemoveControl removeControl = new(0, 0);
+            Diagram diagram = new TestDiagram(
+                new Options.DiagramOptions
+                {
+                    Constraints =
+                    {
+                        ShouldDeleteGroup = (node) => ValueTask.FromResult(true)
+                    }
+                });
+
+            var node1 = new NodeModel(new Point(50, 50));
+            var node2 = new NodeModel(new Point(300, 300));
+            diagram.Nodes.Add(new[] { node1, node2 });
+            node1.AddPort(PortAlignment.Right);
+            node2.AddPort(PortAlignment.Left);
+
+            var group = new GroupModel(new[] { node1, node2 });
+
+
+            diagram.Groups.Add(group);
+
+            // Act
+            await removeControl.OnPointerDown(diagram, group, PointerEventArgs);
+
+            // Assert
+            Assert.Empty(diagram.Groups);
+            Assert.Empty(diagram.Nodes);
+        }
+
+        [Fact]
+        public async Task OnPointerDown_ShouldDeleteGroupFalse_KeepsGroup()
+        {
+            // Arrange
+            RemoveControl removeControl = new(0, 0);
+            Diagram diagram = new TestDiagram(
+                new Options.DiagramOptions
+                {
+                    Constraints =
+                    {
+                        ShouldDeleteGroup = (node) => ValueTask.FromResult(false)
+                    }
+                });
+
+            var node1 = new NodeModel(new Point(50, 50));
+            var node2 = new NodeModel(new Point(300, 300));
+            diagram.Nodes.Add(new[] { node1, node2 });
+            node1.AddPort(PortAlignment.Right);
+            node2.AddPort(PortAlignment.Left);
+
+            var group = new GroupModel(new[] { node1, node2 });
+
+
+            diagram.Groups.Add(group);
+
+            // Act
+            await removeControl.OnPointerDown(diagram, group, PointerEventArgs);
+
+            // Assert
+            Assert.Contains(group, diagram.Groups);
+            Assert.Contains(node1, diagram.Nodes);
+            Assert.Contains(node2, diagram.Nodes);
+        }
+
     }
 }