Skip to content

Commit 27b16b1

Browse files
author
Christophe Peugnet
committed
V4.0 uses a service declared via DI
1 parent 89561bc commit 27b16b1

15 files changed

+513
-337
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: Dotnet Publish
2525
run:
26-
dotnet publish --configuration Release -f net8.0
26+
dotnet publish --configuration Release -f net9.0
2727

2828
- name: Change base-tag in index.html to repo name
2929
run: sed -i 's/<base href="\/" \/>/<base href="\/${{ env.REPO_NAME }}\/" \/>/g' $GITHUB_WORKSPACE/$PUBLISH_FOLDER/index.html

Blazor-Color-Picker-Library/BlazorColorPicker.csproj

+6-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<RootNamespace>BlazorColorPicker</RootNamespace>
66
<Authors>Christophe Peugnet</Authors>
77
<PackageIcon>icon.png</PackageIcon>
8-
<Version>3.1.2</Version>
8+
<Version>4.0.0</Version>
99
<Description>Opens a modal palette with the Material colors for Blazor Application</Description>
1010
<PackageProjectUrl>https://github.com/tossnet/Blazor-Color-Picker</PackageProjectUrl>
1111
<RepositoryUrl>https://github.com/tossnet/Blazor-Color-Picker</RepositoryUrl>
1212
<RepositoryType>git</RepositoryType>
1313
<PackageReleaseNotes>Update nuget package</PackageReleaseNotes>
14-
<Copyright>Copyright 2020-2024</Copyright>
14+
<Copyright>Copyright 2020-2025</Copyright>
1515
<PackageTags>blazor, color, picker, material, component</PackageTags>
1616
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1717
<AssemblyVersion>2.0.0.0</AssemblyVersion>
@@ -28,6 +28,9 @@
2828
</None>
2929
</ItemGroup>
3030

31+
<PropertyGroup Condition="'$(Configuration)'=='Release'">
32+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
33+
</PropertyGroup>
3134

3235
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
3336
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.11" />
@@ -38,7 +41,7 @@
3841
</ItemGroup>
3942

4043
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
41-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0" />
44+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.3" />
4245
</ItemGroup>
4346

4447

+33-32
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
1-
2-
<div @ref="myPalette"
3-
class="color-picker-modal @CssClass"
4-
tabindex="0"
5-
@onkeydown="@KeyDown" >
6-
<div class="color-picker-content"
7-
style="@Style">
8-
@if (!string.IsNullOrEmpty(Title))
9-
{
10-
<div class="color-picker-header">
11-
<h5 class="color-picker-title">@Title</h5>
12-
<span class="color-picker-close-button" @onclick="Close">X</span>
13-
</div>
14-
}
15-
<div class="color-picker-body">
16-
<div class="color-picker-palette" style="@CustomStyle @Style">
17-
@foreach (string item in colors)
18-
{
19-
<div class="color-picker-case text-center"
20-
style="background-color:@item"
21-
@onclick="() => ColorClick(item)">
22-
@if (MyColor == item)
23-
{
24-
<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24 24"><path d="M20.285 2l-11.285 11.567-5.286-5.011-3.714 3.716 9 8.728 15-15.285z" /></svg>
25-
}
26-
</div>
27-
}
28-
</div>
29-
</div>
30-
31-
</div>
32-
</div>
1+
@if (IsVisible)
2+
{
3+
<div @ref="Element"
4+
class="color-picker-modal @CssClass"
5+
tabindex="0"
6+
@onkeydown="@KeyDown" >
7+
<div class="color-picker-content"
8+
style="@Parameters.Style">
9+
@if (!string.IsNullOrEmpty(Parameters.Title))
10+
{
11+
<div class="color-picker-header">
12+
<h5 class="color-picker-title">@Parameters.Title</h5>
13+
<span class="color-picker-close-button" @onclick="HandleCancel">X</span>
14+
</div>
15+
}
16+
<div class="color-picker-body">
17+
<div class="color-picker-palette" style="@CustomStyle @Parameters.Style">
18+
@foreach (string item in colors)
19+
{
20+
<div class="color-picker-case text-center"
21+
style="background-color:@item"
22+
@onclick="() => ColorClick(item)">
23+
@if (Parameters.ColorSelected == item)
24+
{
25+
<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24 24"><path d="M20.285 2l-11.285 11.567-5.286-5.011-3.714 3.716 9 8.728 15-15.285z" /></svg>
26+
}
27+
</div>
28+
}
29+
</div>
30+
</div>
3331

32+
</div>
33+
</div>
34+
}

0 commit comments

Comments
 (0)