Skip to content

Commit f5f3d9d

Browse files
zHaytamzHaytam
authored
Merge pull request #487 from Blazor-Diagrams/develop
Version 3.0.3
2 parents ac4eef3 + 5942c8a commit f5f3d9d

File tree

23 files changed

+175
-76
lines changed

23 files changed

+175
-76
lines changed

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,14 @@ jobs:
1616
uses: actions/setup-java@v1
1717
with:
1818
java-version: 17
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v4
2020
with:
2121
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
22+
- uses: actions/setup-dotnet@v4
23+
with:
24+
dotnet-version: '9'
2225
- name: Cache SonarCloud packages
23-
uses: actions/cache@v1
26+
uses: actions/cache@v4
2427
with:
2528
path: ~\sonar\cache
2629
key: ${{ runner.os }}-sonar

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: DeployDemoToGitHubPages
22
env:
3-
PUBLISH_DIR: site/Site/bin/Release/net8.0/publish/wwwroot
3+
PUBLISH_DIR: site/Site/bin/Release/net9.0/publish/wwwroot
44

55
on:
66
push:

‎CHANGELOG.md‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,26 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## Diagram (3.0.0) - 2024-02-24
8+
## Diagrams (3.0.3) - 2024-12-03
9+
10+
### Added
11+
12+
- Support for .NET 9 (thanks to @[PanayiotisTheodosiou](https://github.com/PanayiotisTheodosiou))
13+
- `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.
14+
15+
### Changed
16+
17+
- Make `DiagramCanvas` await un-subscription to resizes subscription (thanks to @[toluwtglobal](https://github.com/toluwtglobal))
18+
19+
### Fixed
20+
21+
- 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).
22+
23+
### Removed
24+
25+
- gzip versions of assets, it was causing an issue with .NET 9 (fixes #471, thanks a lot @[robertmclaws](https://github.com/robertmclaws))
26+
27+
## Diagram (3.0.2) - 2024-02-24
928

1029
### Added
1130

‎Directory.Packages.props‎

Lines changed: 41 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,47 @@
11
<Project>
22

3-
<ItemGroup>
4-
<PackageVersion Include="SvgPathProperties" Version="1.1.2" />
5-
<PackageVersion Include="System.Net.Http.Json" Version="8.0.0" />
6-
<PackageVersion Include="GraphShape" Version="1.2.1" />
7-
<PackageVersion Include="MatBlazor" Version="2.10.0" />
8-
<PackageVersion Include="bunit" Version="1.25.3" />
9-
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
10-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
11-
<PackageVersion Include="xunit" Version="2.6.3" />
12-
<PackageVersion Include="Moq" Version="[4.18.4]" />
13-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.5"/>
14-
<PackageVersion Include="coverlet.collector" Version="6.0.0"/>
15-
</ItemGroup>
3+
<ItemGroup>
4+
<PackageVersion Include="SvgPathProperties" Version="1.1.2" />
5+
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
6+
<PackageVersion Include="System.Net.Http.Json" Version="9.0.0" />
7+
<PackageVersion Include="GraphShape" Version="1.2.1" />
8+
<PackageVersion Include="MatBlazor" Version="2.10.0" />
9+
<PackageVersion Include="bunit" Version="1.36.0" />
10+
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
11+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
12+
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
13+
<PackageVersion Include="xunit" Version="2.6.3" />
14+
<PackageVersion Include="Moq" Version="[4.18.4]" />
15+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.5" />
16+
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
17+
</ItemGroup>
1618

17-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
18-
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="6.0.25" />
19-
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
20-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.25" />
21-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.25" />
22-
</ItemGroup>
19+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
20+
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="6.0.25" />
21+
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
22+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.25" />
23+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.25" />
24+
</ItemGroup>
2325

24-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
25-
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="7.0.14" />
26-
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="7.0.14" />
27-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.14" />
28-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.14" />
29-
</ItemGroup>
26+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
27+
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="7.0.14" />
28+
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="7.0.14" />
29+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.14" />
30+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.14" />
31+
</ItemGroup>
32+
33+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
34+
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="[8, 9.0.0)" />
35+
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="[8, 9.0.0)" />
36+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="[8,9.0.0)" />
37+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="[8,9.0.0)" />
38+
</ItemGroup>
39+
40+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
41+
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="[9, 10.0.0)" />
42+
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="[9, 10.0.0)" />
43+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="[9, 10.0.0)" />
44+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="[9, 10.0.0)" />
45+
</ItemGroup>
3046

31-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
32-
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="[8, 9.0.0)" />
33-
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="[8, 9.0.0)" />
34-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="[8,9.0.0)" />
35-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="[8,9.0.0)" />
36-
</ItemGroup>
3747
</Project>

‎docs/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<Nullable>enable</Nullable>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>

‎samples/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<Nullable>enable</Nullable>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>

‎site/Site/Site.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>

‎src/Blazor.Diagrams.Algorithms/Blazor.Diagrams.Algorithms.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<PackageLicenseExpression>MIT</PackageLicenseExpression>
66
<Authors>zHaytam</Authors>
77
<Description>Algorithms for Z.Blazor.Diagrams</Description>
8-
<AssemblyVersion>3.0.2</AssemblyVersion>
9-
<FileVersion>3.0.2</FileVersion>
8+
<AssemblyVersion>3.0.3</AssemblyVersion>
9+
<FileVersion>3.0.3</FileVersion>
1010
<RepositoryUrl>https://github.com/zHaytam/Blazor.Diagrams</RepositoryUrl>
11-
<Version>3.0.2</Version>
11+
<Version>3.0.3</Version>
1212
<PackageId>Z.Blazor.Diagrams.Algorithms</PackageId>
1313
<PackageTags>blazor diagrams diagramming svg drag algorithms layouts</PackageTags>
1414
<Product>Z.Blazor.Diagrams.Algorithms</Product>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<PackageLicenseExpression>MIT</PackageLicenseExpression>
66
<Authors>zHaytam</Authors>
77
<Description>A fully customizable and extensible all-purpose diagrams library for Blazor</Description>
8-
<AssemblyVersion>3.0.2</AssemblyVersion>
9-
<FileVersion>3.0.2</FileVersion>
8+
<AssemblyVersion>3.0.3</AssemblyVersion>
9+
<FileVersion>3.0.3</FileVersion>
1010
<RepositoryUrl>https://github.com/Blazor-Diagrams/Blazor.Diagrams</RepositoryUrl>
11-
<Version>3.0.2</Version>
11+
<Version>3.0.3</Version>
1212
<PackageId>Z.Blazor.Diagrams.Core</PackageId>
1313
<PackageTags>blazor diagrams diagramming svg drag</PackageTags>
1414
<Product>Z.Blazor.Diagrams.Core</Product>

‎src/Blazor.Diagrams.Core/Diagram.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
using Blazor.Diagrams.Core.Layers;
55
using Blazor.Diagrams.Core.Models.Base;
66
using Blazor.Diagrams.Core.Events;
7-
using System;
8-
using System.Collections.Generic;
9-
using System.Linq;
107
using System.Runtime.CompilerServices;
118
using Blazor.Diagrams.Core.Options;
129
using Blazor.Diagrams.Core.Controls;
@@ -38,7 +35,7 @@ public abstract class Diagram
3835
public event Action? ContainerChanged;
3936
public event Action? Changed;
4037

41-
protected Diagram()
38+
protected Diagram(bool registerDefaultBehaviors = true)
4239
{
4340
_behaviors = new Dictionary<Type, Behavior>();
4441
_orderedSelectables = new List<SelectableModel>();
@@ -56,6 +53,9 @@ protected Diagram()
5653
Links.Removed += OnSelectableRemoved;
5754
Groups.Removed += OnSelectableRemoved;
5855

56+
if (!registerDefaultBehaviors)
57+
return;
58+
5959
RegisterBehavior(new SelectionBehavior(this));
6060
RegisterBehavior(new DragMovablesBehavior(this));
6161
RegisterBehavior(new DragNewLinkBehavior(this));

0 commit comments

Comments
 (0)