Skip to content

Upgrade spinner component to .NET 9 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TaylorWatson wants to merge 1 commit into
base: main
Choose a base branch
from
+45 −63
Open

Upgrade spinner component to .NET 9 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions src/TailBlazor.Spinner/EnumExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
using System;
using System.ComponentModel;
using System.Linq;
using System.Reflection;

namespace TailBlazor.Spinner
namespace TailBlazor.Spinner;

internal static class EnumExtensions
{
internal class EnumExtension
internal static string ToCssValue(this LineStyle lineStyle) => lineStyle switch
{
internal static string GetEnumDescription(Enum value)
{
FieldInfo fi = value.GetType().GetField(value.ToString());

DescriptionAttribute[] attributes = fi.GetCustomAttributes(typeof(DescriptionAttribute), false) as DescriptionAttribute[];
LineStyle.Butt => "butt",
LineStyle.Square => "square",
LineStyle.Round => "round",
_ => throw new ArgumentOutOfRangeException(nameof(lineStyle), lineStyle, null)
};

if (attributes != null && attributes.Any())
{
return attributes.First().Description;
}

return value.ToString();
}
}
}
internal static string ToCssValue(this LineAnimation lineAnimation) => lineAnimation switch
{
LineAnimation.Linear => "linear",
LineAnimation.Ease => "ease",
LineAnimation.EaseIn => "ease-in",
LineAnimation.EaseOut => "ease-out",
LineAnimation.EaseInOut => "ease-in-out",
_ => throw new ArgumentOutOfRangeException(nameof(lineAnimation), lineAnimation, null)
};
}
29 changes: 9 additions & 20 deletions src/TailBlazor.Spinner/LineAnimation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,10 @@
using System.ComponentModel;

namespace TailBlazor.Spinner {
public enum LineAnimation {

[Description("linear")]
Linear,

[Description("ease")]
Ease,

[Description("ease-in")]
EaseIn,

[Description("ease-out")]
EaseOut,

[Description("ease-in-out")]
EaseInOut
}
namespace TailBlazor.Spinner;

public enum LineAnimation
{
Linear,
Ease,
EaseIn,
EaseOut,
EaseInOut
}
19 changes: 6 additions & 13 deletions src/TailBlazor.Spinner/LineStyle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
using System.ComponentModel;
namespace TailBlazor.Spinner;

namespace TailBlazor.Spinner {
public enum LineStyle {

[Description("butt")]
Butt,

[Description("square")]
Square,

[Description("round")]
Round
}
public enum LineStyle
{
Butt,
Square,
Round
}
10 changes: 5 additions & 5 deletions src/TailBlazor.Spinner/TailBlazor.Spinner.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<PackageId>TailBlazor.Spinner</PackageId>
<RootNamespace>TailBlazor.Spinner</RootNamespace>
<Version>1.0.1</Version>
Expand All @@ -28,9 +28,9 @@
<SupportedPlatform Include="browser" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
<None Include="../../logo.png" Pack="true" PackagePath="">
Expand Down
12 changes: 6 additions & 6 deletions src/TailBlazor.Spinner/TailBlazorSpinner.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
svg.spinner circle {
fill: transparent;
stroke-width: @(StrokeWidth);
stroke-linecap: @(EnumExtension.GetEnumDescription(LineStyle));
stroke-linecap: @(LineStyle.ToCssValue());
stroke-dasharray: 125.6;
-webkit-transform-origin: 20px 20px 0;
-moz-transform-origin: 20px 20px 0;
-ms-transform-origin: 20px 20px 0;
-o-transform-origin: 20px 20px 0;
transform-origin: 20px 20px 0;
-webkit-animation: spinner @(Speed)s @(EnumExtension.GetEnumDescription(LineAnimation)) infinite;
-moz-animation: spinner @(Speed)s @(EnumExtension.GetEnumDescription(LineAnimation)) infinite;
-ms-animation: spinner @(Speed)s @(EnumExtension.GetEnumDescription(LineAnimation)) infinite;
-o-animation: spinner @(Speed)s @(EnumExtension.GetEnumDescription(LineAnimation)) infinite;
animation: spinner @(Speed)s @(EnumExtension.GetEnumDescription(LineAnimation)) infinite;
-webkit-animation: spinner @(Speed)s @(LineAnimation.ToCssValue()) infinite;
-moz-animation: spinner @(Speed)s @(LineAnimation.ToCssValue()) infinite;
-ms-animation: spinner @(Speed)s @(LineAnimation.ToCssValue()) infinite;
-o-animation: spinner @(Speed)s @(LineAnimation.ToCssValue()) infinite;
animation: spinner @(Speed)s @(LineAnimation.ToCssValue()) infinite;
}

@@-webkit-keyframes spinner {
Expand Down