Skip to content

Commit 3b9ec58

Browse files
ArgoZhangArgoZhang
authored
feat(UniverIcon): add UniverIcon lib (#353)
* feat: 增加 UniverIcon * test: 增加单元测试 * chore: 解决方案增加 UniverIcon 工程 * chore: bump version 9.0.1 * test: 更新单元测试
1 parent 8325c37 commit 3b9ec58

10 files changed

Lines changed: 1490 additions & 6 deletions

File tree

‎BootstrapBlazor.Extensions.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.Html2Image"
178178
EndProject
179179
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.UniverSheet", "src\components\BootstrapBlazor.UniverSheet\BootstrapBlazor.UniverSheet.csproj", "{E30AAB64-BF28-4960-89C1-1F521025F531}"
180180
EndProject
181+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazor.UniverIcon", "src\components\BootstrapBlazor.UniverIcon\BootstrapBlazor.UniverIcon.csproj", "{A657E04C-1495-439E-BC2E-1EEAB2D1B4DA}"
182+
EndProject
181183
Global
182184
GlobalSection(SolutionConfigurationPlatforms) = preSolution
183185
Debug|Any CPU = Debug|Any CPU
@@ -480,6 +482,10 @@ Global
480482
{E30AAB64-BF28-4960-89C1-1F521025F531}.Debug|Any CPU.Build.0 = Debug|Any CPU
481483
{E30AAB64-BF28-4960-89C1-1F521025F531}.Release|Any CPU.ActiveCfg = Release|Any CPU
482484
{E30AAB64-BF28-4960-89C1-1F521025F531}.Release|Any CPU.Build.0 = Release|Any CPU
485+
{A657E04C-1495-439E-BC2E-1EEAB2D1B4DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
486+
{A657E04C-1495-439E-BC2E-1EEAB2D1B4DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
487+
{A657E04C-1495-439E-BC2E-1EEAB2D1B4DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
488+
{A657E04C-1495-439E-BC2E-1EEAB2D1B4DA}.Release|Any CPU.Build.0 = Release|Any CPU
483489
EndGlobalSection
484490
GlobalSection(SolutionProperties) = preSolution
485491
HideSolutionNode = FALSE
@@ -563,6 +569,7 @@ Global
563569
{C882891F-4A6A-C9BE-AC96-227764A4A46A} = {FF1089BE-C704-4374-B629-C57C08E1798F}
564570
{F184D96E-7855-4E3B-B447-D09DBC1C91C6} = {FF1089BE-C704-4374-B629-C57C08E1798F}
565571
{E30AAB64-BF28-4960-89C1-1F521025F531} = {FF1089BE-C704-4374-B629-C57C08E1798F}
572+
{A657E04C-1495-439E-BC2E-1EEAB2D1B4DA} = {FF1089BE-C704-4374-B629-C57C08E1798F}
566573
EndGlobalSection
567574
GlobalSection(ExtensibilityGlobals) = postSolution
568575
SolutionGuid = {D5EB1960-6F30-4CE1-B375-EAE1F787D6FF}

‎src/components/BootstrapBlazor.UniverIcon/BootstrapBlazor.UniverIcon.csproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project Sdk="Microsoft.NET.Sdk.Razor">
2+
3+
<PropertyGroup>
4+
<Version>9.0.1</Version>
5+
</PropertyGroup>
6+
7+
<PropertyGroup>
8+
<PackageTags>Bootstrap Blazor WebAssembly wasm UI Components Icon</PackageTags>
9+
<Description>Bootstrap UI components extensions of Univer Icon</Description>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<PackageReference Include="BootstrapBlazor" Version="$(BBVersion)" />
14+
</ItemGroup>
15+
16+
</Project>

‎src/components/BootstrapBlazor.UniverIcon/UniverIcon.razor‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
@inherits BootstrapComponentBase
2+
@namespace BootstrapBlazor.Components
3+
4+
<div @attributes="@AdditionalAttributes" class="@ClassString" style="@StyleString">
5+
<svg xmlns="http://www.w3.org/2000/svg"><use href="@Href"></use></svg>
6+
</div>

‎src/components/BootstrapBlazor.UniverIcon/UniverIcon.razor.cs‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
// Copyright (c) Argo Zhang (argo@163.com). All rights reserved.
2+
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
3+
// Website: https://www.blazor.zone or https://argozhang.github.io/
4+
5+
using Microsoft.AspNetCore.Components;
6+
7+
namespace BootstrapBlazor.Components;
8+
9+
/// <summary>
10+
/// UniverIcon Component
11+
/// </summary>
12+
public partial class UniverIcon
13+
{
14+
/// <summary>
15+
/// Gets or sets the icon name
16+
/// </summary>
17+
[Parameter, NotNull]
18+
[EditorRequired]
19+
public string? Name { get; set; }
20+
21+
/// <summary>
22+
/// Gets the icon URL
23+
/// </summary>
24+
[Parameter, NotNull]
25+
public string? Href { get; set; }
26+
27+
/// <summary>
28+
/// Gets the icon color, default is null (not set)
29+
/// </summary>
30+
[Parameter]
31+
public string? Color { get; set; }
32+
33+
/// <summary>
34+
/// Gets the style string
35+
/// </summary>
36+
private string? ClassString => CssBuilder.Default("bb-univer-icon")
37+
.AddClass($"bb-univer-icon-{Name}", !string.IsNullOrEmpty(Name))
38+
.Build();
39+
40+
private string? StyleString => CssBuilder.Default()
41+
.AddClass($"--bb-univer-icon-color: {Color};", !string.IsNullOrEmpty(Color))
42+
.AddStyleFromAttributes(AdditionalAttributes)
43+
.Build();
44+
45+
/// <summary>
46+
/// <inheritdoc/>
47+
/// </summary>
48+
protected override void OnParametersSet()
49+
{
50+
base.OnParametersSet();
51+
52+
Href ??= $"./_content/BootstrapBlazor.UniverIcon/univer.svg#{Name}";
53+
}
54+
}

‎src/components/BootstrapBlazor.UniverIcon/UniverIcon.razor.css‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
.bb-univer-icon {
2+
--bb-svg-icon-width: 16px;
3+
display: inline-flex;
4+
color: var(--bb-univer-icon-color);
5+
}
6+
7+
.bb-univer-icon > svg {
8+
width: var(--bb-svg-icon-width);
9+
height: var(--bb-svg-icon-width);
10+
fill: none;
11+
}

‎src/components/BootstrapBlazor.UniverIcon/_Imports.razor‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@namespace BootstrapBlazor.Components
2+
@using Microsoft.AspNetCore.Components.Web

‎src/components/BootstrapBlazor.UniverIcon/wwwroot/univer.svg‎

Lines changed: 1300 additions & 0 deletions
Loading

‎test/UniTestSvgIcon/UniTestSvgIcon.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@
4141
<None Update="OctIcon\octicons.zip">
4242
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
4343
</None>
44+
<None Update="Univer\univer.zip">
45+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
46+
</None>
4447
</ItemGroup>
4548

4649
</Project>

‎test/UniTestSvgIcon/UnitTest.cs‎

Lines changed: 91 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
// Licensed to the .NET Foundation under one or more agreements.
2-
// The .NET Foundation licenses this file to you under the Apache 2.0 License
3-
// See the LICENSE file in the project root for more information.
4-
// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
1+
// Copyright (c) Argo Zhang (argo@163.com). All rights reserved.
2+
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
3+
// Website: https://www.blazor.zone or https://argozhang.github.io/
54

65
using BootstrapBlazor.Components;
7-
using Microsoft.Extensions.DependencyInjection;
86
using System.Text.RegularExpressions;
7+
using static System.Runtime.InteropServices.JavaScript.JSType;
98

109
namespace UniTestIconPark;
1110

@@ -206,7 +205,6 @@ public void ElementIcon_Ok()
206205
[GeneratedRegex("svg\">(.*)</svg>")]
207206
private static partial Regex SvgRegex();
208207

209-
210208
[Fact]
211209
public void OctIcon_Ok()
212210
{
@@ -275,4 +273,91 @@ public void OctIcon_Ok()
275273
writer.WriteLine("</svg>");
276274
writer.Close();
277275
}
276+
277+
[Fact]
278+
public void UniverIcon_Ok()
279+
{
280+
var services = new ServiceCollection();
281+
services.AddBootstrapBlazor();
282+
var provider = services.BuildServiceProvider();
283+
var zipService = provider.GetRequiredService<IZipArchiveService>();
284+
285+
var root = AppContext.BaseDirectory;
286+
var downloadFile = Path.Combine(root, "Univer", "univer.zip");
287+
Assert.True(File.Exists(downloadFile));
288+
289+
var downloadFolder = Path.Combine(root, "univer-icons");
290+
if (Directory.Exists(downloadFolder))
291+
{
292+
Directory.Delete(downloadFolder, true);
293+
}
294+
zipService.ExtractToDirectory(downloadFile, downloadFolder, true);
295+
296+
var folder = new DirectoryInfo(downloadFolder);
297+
298+
// 处理 List 文件
299+
var iconListFile = Path.Combine(root, $"../../../Univer/UniverIconList.razor");
300+
if (File.Exists(iconListFile))
301+
{
302+
File.Delete(iconListFile);
303+
}
304+
305+
// 处理 svg 文件
306+
var svgFile = Path.Combine(root, $"../../../Univer/univer.svg");
307+
if (File.Exists(svgFile))
308+
{
309+
File.Delete(svgFile);
310+
}
311+
using var listWriter = new StreamWriter(File.OpenWrite(iconListFile));
312+
using var writer = new StreamWriter(File.OpenWrite(svgFile));
313+
writer.WriteLine("<svg xmlns=\"http://www.w3.org/2000/svg\">");
314+
foreach (var icon in folder.EnumerateFiles("*.svg", SearchOption.AllDirectories))
315+
{
316+
var id = Path.GetFileNameWithoutExtension(icon.Name);
317+
using var reader = new StreamReader(icon.OpenRead());
318+
var data = reader.ReadToEnd();
319+
reader.Close();
320+
321+
// find viewBox
322+
var viewBox = FindViewBox(data);
323+
324+
// find <svg
325+
var index = data.IndexOf("<svg ");
326+
if (index > -1)
327+
{
328+
data = data[index..];
329+
}
330+
index = data.IndexOf('>');
331+
if (index > -1)
332+
{
333+
data = data[(index + 1)..];
334+
}
335+
336+
var target = data.Replace("</svg>", "").Trim();
337+
target = target.Replace("fill=\"black\"", "fill=\"currentColor\"");
338+
target = target.Replace("stroke=\"black\"", "stroke=\"currentColor\"");
339+
target = $" <symbol viewBox=\"{viewBox}\" id=\"{id}\">{target}</symbol>";
340+
writer.WriteLine(target);
341+
342+
listWriter.WriteLine($"<UniverIcon Name=\"{id}\"></UniverIcon>");
343+
}
344+
writer.WriteLine("</svg>");
345+
writer.Close();
346+
}
347+
348+
private static string FindViewBox(string svg)
349+
{
350+
var index = svg.IndexOf(" viewBox=\"");
351+
if (index > -1)
352+
{
353+
index += 10;
354+
svg = svg[index..];
355+
}
356+
index = svg.IndexOf('\"');
357+
if (index > -1)
358+
{
359+
svg = svg[..index];
360+
}
361+
return svg;
362+
}
278363
}

‎test/UniTestSvgIcon/Univer/univer.zip‎

358 KB
Binary file not shown.

0 commit comments

Comments
 (0)