Merge pull request #487 from Blazor-Diagrams/develop

Version 3.0.3
Blazor-Diagrams · Dec 3, 2024 · f5f3d9d · f5f3d9d
2 parents ac4eef3 + 5942c8a
commit f5f3d9d
Show file tree

Hide file tree

Showing 23 changed files with 175 additions and 76 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,11 +16,14 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 17
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '9'
       - name: Cache SonarCloud packages
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~\sonar\cache
           key: ${{ runner.os }}-sonar

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,6 +1,6 @@
 name: DeployDemoToGitHubPages
 env:
-  PUBLISH_DIR: site/Site/bin/Release/net8.0/publish/wwwroot
+  PUBLISH_DIR: site/Site/bin/Release/net9.0/publish/wwwroot
 
 on:
   push:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,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).
 
-## Diagram (3.0.0) - 2024-02-24
+## Diagrams (3.0.3) - 2024-12-03
+
+### Added
+
+- Support for .NET 9 (thanks to @[PanayiotisTheodosiou](https://github.com/PanayiotisTheodosiou))
+- `registerDefaultBehaviors` argument to `BlazorDiagram` constructor, it's `true` by default and can be disabled if you want to control what behaviors are added and their order.
+
+### Changed
+
+- Make `DiagramCanvas` await un-subscription to resizes subscription (thanks to @[toluwtglobal](https://github.com/toluwtglobal))
+
+### Fixed
+
+- Exception thrown when `node.Visible` was `false` from the creation and the library was trying to observe its resizes when the element won't exist (fixes #476).
+
+### Removed
+
+- gzip versions of assets, it was causing an issue with .NET 9 (fixes #471, thanks a lot @[robertmclaws](https://github.com/robertmclaws))
+
+## Diagram (3.0.2) - 2024-02-24
 
 ### Added
 

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,37 +1,47 @@
 <Project>
 
-  <ItemGroup>
-    <PackageVersion Include="SvgPathProperties" Version="1.1.2" />
-    <PackageVersion Include="System.Net.Http.Json" Version="8.0.0" />
-    <PackageVersion Include="GraphShape" Version="1.2.1" />
-    <PackageVersion Include="MatBlazor" Version="2.10.0" />
-    <PackageVersion Include="bunit" Version="1.25.3" />
-    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageVersion Include="xunit" Version="2.6.3" />
-    <PackageVersion Include="Moq" Version="[4.18.4]" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.5"/>
-    <PackageVersion Include="coverlet.collector" Version="6.0.0"/>
-  </ItemGroup>
+	<ItemGroup>
+		<PackageVersion Include="SvgPathProperties" Version="1.1.2" />
+		<PackageVersion Include="System.Net.Http" Version="4.3.4" />
+		<PackageVersion Include="System.Net.Http.Json" Version="9.0.0" />
+		<PackageVersion Include="GraphShape" Version="1.2.1" />
+		<PackageVersion Include="MatBlazor" Version="2.10.0" />
+		<PackageVersion Include="bunit" Version="1.36.0" />
+		<PackageVersion Include="FluentAssertions" Version="6.12.0" />
+		<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+		<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
+		<PackageVersion Include="xunit" Version="2.6.3" />
+		<PackageVersion Include="Moq" Version="[4.18.4]" />
+		<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.5" />
+		<PackageVersion Include="coverlet.collector" Version="6.0.0" />
+	</ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageVersion Include="Microsoft.AspNetCore.Components" Version="6.0.25" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.25" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.25" />
-  </ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+		<PackageVersion Include="Microsoft.AspNetCore.Components" Version="6.0.25" />
+		<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
+		<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.25" />
+		<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.25" />
+	</ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-    <PackageVersion Include="Microsoft.AspNetCore.Components" Version="7.0.14" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="7.0.14" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.14" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.14" />
-  </ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+		<PackageVersion Include="Microsoft.AspNetCore.Components" Version="7.0.14" />
+		<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="7.0.14" />
+		<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.14" />
+		<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.14" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+		<PackageVersion Include="Microsoft.AspNetCore.Components" Version="[8, 9.0.0)" />
+		<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="[8, 9.0.0)" />
+		<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="[8,9.0.0)" />
+		<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="[8,9.0.0)" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+		<PackageVersion Include="Microsoft.AspNetCore.Components" Version="[9, 10.0.0)" />
+		<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="[9, 10.0.0)" />
+		<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="[9, 10.0.0)" />
+		<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="[9, 10.0.0)" />
+	</ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageVersion Include="Microsoft.AspNetCore.Components" Version="[8, 9.0.0)" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="[8, 9.0.0)" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="[8,9.0.0)" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="[8,9.0.0)" />
-  </ItemGroup>
 </Project>
diff --git a/docs/Directory.Build.props b/docs/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>

diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>

diff --git a/site/Site/Site.csproj b/site/Site/Site.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>

diff --git a/src/Blazor.Diagrams.Algorithms/Blazor.Diagrams.Algorithms.csproj b/src/Blazor.Diagrams.Algorithms/Blazor.Diagrams.Algorithms.csproj
@@ -5,10 +5,10 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Authors>zHaytam</Authors>
     <Description>Algorithms for Z.Blazor.Diagrams</Description>
-    <AssemblyVersion>3.0.2</AssemblyVersion>
-    <FileVersion>3.0.2</FileVersion>
+    <AssemblyVersion>3.0.3</AssemblyVersion>
+    <FileVersion>3.0.3</FileVersion>
     <RepositoryUrl>https://github.com/zHaytam/Blazor.Diagrams</RepositoryUrl>
-    <Version>3.0.2</Version>
+    <Version>3.0.3</Version>
     <PackageId>Z.Blazor.Diagrams.Algorithms</PackageId>
     <PackageTags>blazor diagrams diagramming svg drag algorithms layouts</PackageTags>
     <Product>Z.Blazor.Diagrams.Algorithms</Product>

diff --git a/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj b/src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj
@@ -5,10 +5,10 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Authors>zHaytam</Authors>
     <Description>A fully customizable and extensible all-purpose diagrams library for Blazor</Description>
-    <AssemblyVersion>3.0.2</AssemblyVersion>
-    <FileVersion>3.0.2</FileVersion>
+    <AssemblyVersion>3.0.3</AssemblyVersion>
+    <FileVersion>3.0.3</FileVersion>
     <RepositoryUrl>https://github.com/Blazor-Diagrams/Blazor.Diagrams</RepositoryUrl>
-    <Version>3.0.2</Version>
+    <Version>3.0.3</Version>
     <PackageId>Z.Blazor.Diagrams.Core</PackageId>
     <PackageTags>blazor diagrams diagramming svg drag</PackageTags>
     <Product>Z.Blazor.Diagrams.Core</Product>

diff --git a/src/Blazor.Diagrams.Core/Diagram.cs b/src/Blazor.Diagrams.Core/Diagram.cs
@@ -4,9 +4,6 @@
 using Blazor.Diagrams.Core.Layers;
 using Blazor.Diagrams.Core.Models.Base;
 using Blazor.Diagrams.Core.Events;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using Blazor.Diagrams.Core.Options;
 using Blazor.Diagrams.Core.Controls;
@@ -38,7 +35,7 @@ public abstract class Diagram
     public event Action? ContainerChanged;
     public event Action? Changed;
 
-    protected Diagram()
+    protected Diagram(bool registerDefaultBehaviors = true)
     {
         _behaviors = new Dictionary<Type, Behavior>();
         _orderedSelectables = new List<SelectableModel>();
@@ -56,6 +53,9 @@ protected Diagram()
         Links.Removed += OnSelectableRemoved;
         Groups.Removed += OnSelectableRemoved;
 
+        if (!registerDefaultBehaviors)
+            return;
+
         RegisterBehavior(new SelectionBehavior(this));
         RegisterBehavior(new DragMovablesBehavior(this));
         RegisterBehavior(new DragNewLinkBehavior(this));

diff --git a/src/Blazor.Diagrams/Blazor.Diagrams.csproj b/src/Blazor.Diagrams/Blazor.Diagrams.csproj
@@ -4,11 +4,11 @@
     <Nullable>enable</Nullable>
     <Authors>zHaytam</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <AssemblyVersion>3.0.2</AssemblyVersion>
-    <FileVersion>3.0.2</FileVersion>
+    <AssemblyVersion>3.0.3</AssemblyVersion>
+    <FileVersion>3.0.3</FileVersion>
     <RepositoryUrl>https://github.com/Blazor-Diagrams/Blazor.Diagrams</RepositoryUrl>
     <Description>A fully customizable and extensible all-purpose diagrams library for Blazor</Description>
-    <Version>3.0.2</Version>
+    <Version>3.0.3</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageTags>blazor diagrams diagramming svg drag</PackageTags>
     <PackageId>Z.Blazor.Diagrams</PackageId>
@@ -47,7 +47,7 @@
   </Target>
 
   <Target Name="CompileStaticAssets" AfterTargets="CoreCompile;TestWebCompiler" Condition="'$(ErrorCode)' == '0'">
-    <Exec Command="webcompiler -r wwwroot" StandardOutputImportance="high" StandardErrorImportance="high" />
+    <Exec Command="webcompiler --zip disable -r wwwroot" StandardOutputImportance="high" StandardErrorImportance="high" />
   </Target>
 
 </Project>
diff --git a/src/Blazor.Diagrams/BlazorDiagram.cs b/src/Blazor.Diagrams/BlazorDiagram.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Blazor.Diagrams.Components.Controls;
+using Blazor.Diagrams.Components.Controls;
 using Blazor.Diagrams.Core;
 using Blazor.Diagrams.Core.Controls.Default;
 using Blazor.Diagrams.Core.Models.Base;
@@ -12,7 +10,7 @@ public class BlazorDiagram : Diagram
 {
     private readonly Dictionary<Type, Type> _componentsMapping;
 
-    public BlazorDiagram(BlazorDiagramOptions? options = null)
+    public BlazorDiagram(BlazorDiagramOptions? options = null, bool registerDefaultBehaviors = true) : base(registerDefaultBehaviors)
     {
         _componentsMapping = new Dictionary<Type, Type>
         {

diff --git a/src/Blazor.Diagrams/Components/DiagramCanvas.razor.cs b/src/Blazor.Diagrams/Components/DiagramCanvas.razor.cs
@@ -8,7 +8,7 @@
 
 namespace Blazor.Diagrams.Components;
 
-public partial class DiagramCanvas : IDisposable
+public partial class DiagramCanvas : IAsyncDisposable
 {
     private DotNetObjectReference<DiagramCanvas>? _reference;
     private bool _shouldRender;
@@ -27,15 +27,15 @@ public partial class DiagramCanvas : IDisposable
 
     [Inject] public IJSRuntime JSRuntime { get; set; } = null!;
 
-    public void Dispose()
+    public async ValueTask DisposeAsync()
     {
         BlazorDiagram.Changed -= OnDiagramChanged;
 
         if (_reference == null)
             return;
 
         if (elementReference.Id != null)
-            _ = JSRuntime.UnobserveResizes(elementReference);
+            await JSRuntime.UnobserveResizes(elementReference);
 
         _reference.Dispose();
     }

diff --git a/src/Blazor.Diagrams/Components/Renderers/NodeRenderer.cs b/src/Blazor.Diagrams/Components/Renderers/NodeRenderer.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Text;
-using System.Threading.Tasks;
+using System.Text;
 using Blazor.Diagrams.Core.Extensions;
 using Blazor.Diagrams.Core.Geometry;
 using Blazor.Diagrams.Core.Models;
@@ -129,6 +127,9 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
+        if (firstRender && !Node.Visible)
+            return;
+
         if (firstRender || _becameVisible)
         {
             _becameVisible = false;

diff --git a/src/Blazor.Diagrams/wwwroot/default.styles.min.css.gz b/src/Blazor.Diagrams/wwwroot/default.styles.min.css.gz
diff --git a/src/Blazor.Diagrams/wwwroot/script.min.js.gz b/src/Blazor.Diagrams/wwwroot/script.min.js.gz
diff --git a/src/Blazor.Diagrams/wwwroot/style.min.css.gz b/src/Blazor.Diagrams/wwwroot/style.min.css.gz
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
-  <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0;</TargetFrameworks>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net9.0;net8.0;net7.0;net6.0;</TargetFrameworks>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+	</PropertyGroup>
 </Project>
diff --git a/tests/Blazor.Diagrams.Core.Tests/Blazor.Diagrams.Core.Tests.csproj b/tests/Blazor.Diagrams.Core.Tests/Blazor.Diagrams.Core.Tests.csproj
@@ -7,13 +7,15 @@
   <ItemGroup>
     <PackageReference Include="FluentAssertions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="System.Net.Http" />
+    <PackageReference Include="System.Text.RegularExpressions" />
     <PackageReference Include="xunit" />
     <PackageReference Include="Moq" />
-    <PackageReference Include="xunit.runner.visualstudio" >
+    <PackageReference Include="xunit.runner.visualstudio">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" >
+    <PackageReference Include="coverlet.collector">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/tests/Blazor.Diagrams.Tests/Blazor.Diagrams.Tests.csproj b/tests/Blazor.Diagrams.Tests/Blazor.Diagrams.Tests.csproj
@@ -9,6 +9,8 @@
     <PackageReference Include="bunit" />
     <PackageReference Include="FluentAssertions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="System.Net.Http" />
+    <PackageReference Include="System.Text.RegularExpressions" />
     <PackageReference Include="xunit" />
     <PackageReference Include="Moq" />
     <PackageReference Include="xunit.runner.visualstudio" />

diff --git a/tests/Blazor.Diagrams.Tests/Components/DiagramCanvasTests.cs b/tests/Blazor.Diagrams.Tests/Components/DiagramCanvasTests.cs
@@ -0,0 +1,28 @@
+using Blazor.Diagrams.Components;
+using Blazor.Diagrams.Core.Geometry;
+using Bunit;
+using Xunit;
+
+namespace Blazor.Diagrams.Tests.Components
+{
+    public class DiagramCanvasTests
+    {
+        [Fact]
+        public void Behavior_WhenDisposing_ShouldUnsubscribeToResizes()
+        {
+            // Arrange
+            JSRuntimeInvocationHandler call;
+            using (var ctx = new TestContext())
+            {
+                ctx.JSInterop.Setup<Rectangle>("ZBlazorDiagrams.getBoundingClientRect", _ => true);
+                call = ctx.JSInterop.SetupVoid("ZBlazorDiagrams.unobserve", _ => true).SetVoidResult();
+
+                // Act
+                var cut = ctx.RenderComponent<DiagramCanvas>(p => p.Add(n => n.BlazorDiagram, new BlazorDiagram()));
+            }
+
+            // Assert
+            call.VerifyInvoke("ZBlazorDiagrams.unobserve", calledTimes: 1);
+        }
+    }
+}