Merge pull request #56 from zHaytam/develop

Version 1.3.0

Author: zHaytam

CHANGELOG.md

@@ -4,6 +4,26 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Diagrams [1.3.0] - 2020-11-29
+
+### Added
+- Abstract `MovableModel`, which inherits from `SelectableModel` and represents models that can be move with the mouse (e.g. nodes and groups).
+- Groups widget customization using `RegisterModelComponent`.
+- `SizeChanged` event on `NodeModel`.
+
+### Changed
+- `SelectableModel` is now abstract.
+- Groups:
+  - Renamed model `Group` to `GroupModel`.
+  - Rendered as a single entity (HTML div) with padding.
+  - Movable and Selectable.
+  - Selecting a node inside a group doesn't select the others anymore.
+- **[BREAKING]** Renamed `DiagramManager.ChangePan` to `UpdatePan`.
+- **[BREAKING]** Renamed `DiagramManager.ChangeZoom` to `SetZoom`.
+
+### Fixed
+- `ZoomToFit` wasn't unhiding hidden nodes.
+
 ## Diagrams [1.2.0] - 2020-11-08
 ### Added
 - `DefaultLinkModel` in `DiagramLinkOptions` ([@joezearing](https://github.com/joezearing)).

README.md

@@ -57,6 +57,7 @@ You can get started very easily & quickly using:
 
 ![](https://i.imgur.com/k4UThmh.png)
 
+
 ### Sample project
 
 Repository: https://github.com/zHaytam/Blazor.DatabaseDesigner
@@ -65,7 +66,7 @@ Repository: https://github.com/zHaytam/Blazor.DatabaseDesigner
 
 ## Roadmap
 
-- [ ] Better way to handle/render groups
+- [x] Better way to handle/render groups
 - [ ] Pluggable history (undo/redo)
 - [ ] Auto layout
 

samples/SharedDemo/Demos/DynamicInsertions.razor.cs

@@ -10,7 +10,10 @@ namespace SharedDemo.Demos
     public class DynamicInsertionsComponent : ComponentBase
     {
         private static readonly Random _random = new Random();
-        protected readonly DiagramManager diagramManager = new DiagramManager();
+        protected readonly DiagramManager diagramManager = new DiagramManager(new DiagramOptions
+        {
+            GroupingEnabled = true
+        });
 
         protected override void OnInitialized()
         {

samples/SharedDemo/Demos/Grouping.razor

@@ -9,8 +9,8 @@
         base.OnInitialized();
 
         LayoutData.Title = "Grouping";
-        LayoutData.Info = "You can group nodes using CTRL+G and ungroup using CTRL+SHIFT+G.<br>" +
-                "Whenever you select a node that belongs to a group, every other node in the group is also selected.";
+        LayoutData.Info = "You can (un)group nodes using CTRL+ALT+G.<br>" +
+                "Currently, the library doesn't handle nested groups yet nor ports.";
         LayoutData.DataChanged();
     }
 }

samples/SharedDemo/Demos/Grouping.razor.cs

@@ -17,11 +17,13 @@ protected override void OnInitialized()
             base.OnInitialized();
 
             var node1 = NewNode(50, 50);
-            var node2 = NewNode(300, 300);
+            var node2 = NewNode(250, 250);
+            var node3 = NewNode(450, 100);
+
             diagramManager.AddLink(node1.GetPort(PortAlignment.Right), node2.GetPort(PortAlignment.Left));
-            diagramManager.AddNode(node1);
-            diagramManager.AddNode(node2);
-            diagramManager.AddNode(NewNode(300, 50));
+            diagramManager.AddLink(node2.GetPort(PortAlignment.Right), node3.GetPort(PortAlignment.Left));
+            diagramManager.Group(node1, node2);
+            diagramManager.AddNode(node3);
         }
 
         private NodeModel NewNode(double x, double y)

src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj

@@ -7,10 +7,10 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Authors>zHaytam</Authors>
     <Description>A fully customizable and extensible all-purpose diagrams library for Blazor</Description>
-    <AssemblyVersion>1.2.0</AssemblyVersion>
-    <FileVersion>1.2.0</FileVersion>
+    <AssemblyVersion>1.3.0</AssemblyVersion>
+    <FileVersion>1.3.0</FileVersion>
     <RepositoryUrl>https://github.com/zHaytam/Blazor.Diagrams</RepositoryUrl>
-    <Version>1.2.0</Version>
+    <Version>1.3.0</Version>
     <PackageId>Z.Blazor.Diagrams.Core</PackageId>
     <PackageTags>blazor diagrams diagramming svg drag</PackageTags>
     <Product>Z.Blazor.Diagrams.Core</Product>

src/Blazor.Diagrams.Core/Default/DragNodeSubManager.cs renamed to src/Blazor.Diagrams.Core/Default/DragMovablesSubManager.cs

@@ -1,20 +1,18 @@
-using Blazor.Diagrams.Core.Extensions;
-using Blazor.Diagrams.Core.Models;
-using Blazor.Diagrams.Core.Models.Base;
+using Blazor.Diagrams.Core.Models.Base;
 using Blazor.Diagrams.Core.Models.Core;
 using Microsoft.AspNetCore.Components.Web;
 using System;
 using System.Linq;
 
 namespace Blazor.Diagrams.Core.Default
 {
-    public class DragNodeSubManager : DiagramSubManager
+    public class DragMovablesSubManager : DiagramSubManager
     {
         private Point[]? _initialPositions;
         private double? _lastClientX;
         private double? _lastClientY;
 
-        public DragNodeSubManager(DiagramManager diagramManager) : base(diagramManager)
+        public DragMovablesSubManager(DiagramManager diagramManager) : base(diagramManager)
         {
             DiagramManager.MouseDown += DiagramManager_MouseDown;
             DiagramManager.MouseMove += DiagramManager_MouseMove;
@@ -23,13 +21,13 @@ public DragNodeSubManager(DiagramManager diagramManager) : base(diagramManager)
 
         private void DiagramManager_MouseDown(Model model, MouseEventArgs e)
         {
-            if (!(model is NodeModel))
+            if (!(model is MovableModel))
                 return;
 
             // Don't link this linq
             _initialPositions = DiagramManager.SelectedModels
-                .Where(m => m is NodeModel)
-                .Select(m => (m as NodeModel).Position)
+                .Where(m => m is MovableModel)
+                .Select(m => (m as MovableModel)!.Position)
                 .ToArray();
 
             _lastClientX = e.ClientX;
@@ -47,14 +45,13 @@ private void DiagramManager_MouseMove(Model model, MouseEventArgs e)
 
             foreach (var sm in DiagramManager.SelectedModels)
             {
-                if (!(sm is NodeModel node) || node.Locked)
+                if (!(sm is MovableModel node) || node.Locked)
                     continue;
 
                 var initialPosition = _initialPositions[i];
                 var ndx = ApplyGridSize(deltaX + initialPosition.X);
                 var ndy = ApplyGridSize(deltaY + initialPosition.Y);
                 node.SetPosition(ndx, ndy);
-                node.RefreshAll();
                 i++;
             }
         }

src/Blazor.Diagrams.Core/Default/GroupingSubManager.cs

@@ -1,5 +1,4 @@
 using Blazor.Diagrams.Core.Models;
-using Blazor.Diagrams.Core.Models.Base;
 using Microsoft.AspNetCore.Components.Web;
 using System;
 using System.Linq;
@@ -11,34 +10,6 @@ public class GroupingSubManager : DiagramSubManager
         public GroupingSubManager(DiagramManager diagramManager) : base(diagramManager)
         {
             DiagramManager.KeyDown += DiagramManager_KeyDown;
-            DiagramManager.SelectionChanged += DiagramManager_SelectionChanged;
-        }
-
-        private void DiagramManager_SelectionChanged(SelectableModel model, bool selected)
-        {
-            if (!DiagramManager.Options.GroupingEnabled)
-                return;
-
-            if (!(model is NodeModel node))
-                return;
-
-            if (node.Group == null)
-                return;
-
-            foreach (var n in node.Group.Nodes)
-            {
-                if (n == node || n.Selected == selected)
-                    continue;
-
-                if (selected)
-                {
-                    DiagramManager.SelectModel(n, false);
-                }
-                else
-                {
-                    DiagramManager.UnselectModel(n);
-                }
-            }
         }
 
         private void DiagramManager_KeyDown(KeyboardEventArgs e)

src/Blazor.Diagrams.Core/Default/PanSubManager.cs

@@ -34,7 +34,7 @@ private void DiagramManager_MouseMove(Model model, MouseEventArgs e)
 
             var deltaX = e.ClientX - _lastClientX - (DiagramManager.Pan.X - _initialPan.X);
             var deltaY = e.ClientY - _lastClientY - (DiagramManager.Pan.Y - _initialPan.Y);
-            DiagramManager.ChangePan(deltaX, deltaY);
+            DiagramManager.UpdatePan(deltaX, deltaY);
         }
 
         private void DiagramManager_MouseUp(Model model, MouseEventArgs e)

src/Blazor.Diagrams.Core/Default/ZoomSubManager.cs

@@ -38,7 +38,7 @@ private void DiagramManager_Wheel(WheelEventArgs e)
             var newPanY = DiagramManager.Pan.Y - heightDiff * yFactor;
 
             DiagramManager.Pan = new Point(newPanX, newPanY);
-            DiagramManager.ChangeZoom(newZoom);
+            DiagramManager.SetZoom(newZoom);
         }
 
         public override void Dispose()