Skip to content

Commit ab28b35

Browse files
committed
(not finished) Reworked components to remove useless checks, bloats, class name stacks, switch statements replaced with dictionaries. Need some drilling for potential bugs
1 parent 25208e8 commit ab28b35

File tree

168 files changed

+2992
-2289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+2992
-2289
lines changed

BlazorBootstrap.Demo.RCL/Components/Shared/Demo.razor.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,7 @@ public void ResetCopyStatusJS()
101101
#endregion
102102

103103
#region Properties, Indexers
104-
105-
protected override string? ClassNames => BuildClassNames(Class, ("bd-example-snippet bd-code-snippet", true));
106-
104+
107105
[Inject] protected IJSRuntime JS { get; set; } = default!;
108106

109107
[Parameter] public LanguageCode LanguageCode { get; set; } = LanguageCode.Razor;

BlazorBootstrap.Demo.RCL/Components/Shared/Section.razor

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
<section @ref="@Element"
55
id="@Id"
6-
class="@ClassNames"
7-
style="@StyleNames"
6+
class="@Class"
7+
88
@attributes="@AdditionalAttributes">
99

1010
@if (Size == HeadingSize.H2)

BlazorBootstrap.Demo.RCL/Enums/LanguageCode.cs

Lines changed: 0 additions & 68 deletions
This file was deleted.

BlazorBootstrap.Demo.RCL/Extensions/EnumExtensions.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ public static class EnumExtensions
88
LanguageCode.AspNet => "language-aspnet",
99
LanguageCode.CSharp => "language-csharp",
1010
LanguageCode.Css => "language-css",
11-
LanguageCode.HTML => "language-html",
11+
LanguageCode.Html => "language-html",
1212
LanguageCode.JavaScript => "language-js",
13-
LanguageCode.JSON => "language-json",
14-
LanguageCode.JSONP => "language-jsonp",
13+
LanguageCode.Json => "language-json",
14+
LanguageCode.Jsonp => "language-jsonp",
1515
LanguageCode.Markdown => "language-md",
1616
LanguageCode.PowerShell => "language-powershell",
1717
LanguageCode.Razor => "language-razor",
18-
LanguageCode.Text => "language-none",
19-
LanguageCode.YAML => "language-yaml",
18+
LanguageCode.StructuredText => "language-none",
19+
LanguageCode.Yaml => "language-yaml",
2020
_ => null
2121
};
2222

@@ -26,15 +26,15 @@ public static class EnumExtensions
2626
LanguageCode.AspNet => "ASP.NET",
2727
LanguageCode.CSharp => "C#",
2828
LanguageCode.Css => "CSS",
29-
LanguageCode.HTML => "HTML",
29+
LanguageCode.Html => "HTML",
3030
LanguageCode.JavaScript => "JS",
31-
LanguageCode.JSON => "JSON",
32-
LanguageCode.JSONP => "JSONP",
31+
LanguageCode.Json => "JSON",
32+
LanguageCode.Jsonp => "JSONP",
3333
LanguageCode.Markdown => "Markdown",
3434
LanguageCode.PowerShell => "PowerShell",
3535
LanguageCode.Razor => "Razor",
36-
LanguageCode.Text => "Text",
37-
LanguageCode.YAML => "yaml",
36+
LanguageCode.StructuredText => "Text",
37+
LanguageCode.Yaml => "yaml",
3838
_ => null
3939
};
4040
}

blazorbootstrap/Components/Accordion/Accordion.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@inherits BlazorBootstrapComponentBase
33

44
<CascadingValue Value="@(this)" IsFixed="true">
5-
<div @ref="@Element" id="@Id" class="@ClassNames" style="@StyleNames" @attributes="@AdditionalAttributes">
5+
<div @ref="@Element" id="@Id" class="@BootstrapClass.Accordion @(Flush ? BootstrapClass.AccordionFlush : "") @Class" @attributes="@AdditionalAttributes">
66
@if (ChildContent != null)
77
{
88
@ChildContent

blazorbootstrap/Components/Accordion/Accordion.razor.cs

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,7 @@ public partial class Accordion : BlazorBootstrapComponentBase
1313
#endregion
1414

1515
#region Methods
16-
17-
/// <inheritdoc />
18-
protected override async ValueTask DisposeAsyncCore(bool disposing)
19-
{
20-
if (disposing) items = null;
21-
22-
await base.DisposeAsyncCore(disposing);
23-
}
24-
16+
2517
/// <summary>
2618
/// Hides the <see cref="AccordionItem" /> by index.
2719
/// </summary>
@@ -188,7 +180,6 @@ public override Task SetParametersAsync(ParameterView parameters)
188180
case nameof(OnHiding): OnHiding = (EventCallback<AccordionEventArgs>)parameter.Value; break;
189181
case nameof(OnShowing): OnShowing = (EventCallback<AccordionEventArgs>)parameter.Value; break;
190182
case nameof(OnShown): OnShown = (EventCallback<AccordionEventArgs>)parameter.Value; break;
191-
case nameof(Style): Style = (string)parameter.Value; break;
192183
default:
193184
AdditionalAttributes![parameter.Name] = parameter.Value;
194185
break;
@@ -200,13 +191,7 @@ public override Task SetParametersAsync(ParameterView parameters)
200191

201192
#endregion
202193

203-
#region Properties, Indexers
204-
205-
/// <inheritdoc />
206-
protected override string? ClassNames =>
207-
BuildClassNames(Class,
208-
(BootstrapClass.Accordion, true),
209-
(BootstrapClass.AccordionFlush, Flush));
194+
#region Properties, Indexers
210195

211196
/// <summary>
212197
/// If <see langword="true" />, accordion items stay open when another item is opened.
@@ -233,8 +218,7 @@ public override Task SetParametersAsync(ParameterView parameters)
233218
/// <remarks>
234219
/// Default value is <see langword="false" />.
235220
/// </remarks>
236-
[Parameter]
237-
public bool Flush { get; set; }
221+
[Parameter] public bool Flush { get; set; }
238222

239223
/// <summary>
240224
/// This event is fired when an accordion item has been hidden from the user (will wait for CSS transitions to complete).

blazorbootstrap/Components/Accordion/AccordionItem.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@namespace BlazorBootstrap
22
@inherits BlazorBootstrapComponentBase
33

4-
<div @ref="@Element" id="@Id" class="@ClassNames" style="@StyleNames" @attributes="@AdditionalAttributes">
4+
<div @ref="@Element" id="@Id" class="@BootstrapClass.AccordionItem @Class" @attributes="@AdditionalAttributes">
55
<h2 class="accordion-header">
66
<button class="accordion-button @ButtonCollapsedStateCssClass" type="button" @onclick="(async() => await ToggleAsync())">
77
@if (TitleTemplate is not null)

blazorbootstrap/Components/Accordion/AccordionItem.razor.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ public override Task SetParametersAsync(ParameterView parameters)
7878
case nameof(Id): Id = (string)parameter.Value; break;
7979
case nameof(Name): Name = (string)parameter.Value; break;
8080
case nameof(Parent): Parent = (Accordion)parameter.Value; break;
81-
case nameof(Style): Style = (string)parameter.Value; break;
8281
case nameof(Title): Title = (string)parameter.Value; break;
8382
case nameof(TitleTemplate): TitleTemplate = (RenderFragment)parameter.Value; break;
8483
default:
@@ -95,19 +94,14 @@ public override Task SetParametersAsync(ParameterView parameters)
9594
#endregion
9695

9796
#region Properties, Indexers
98-
99-
/// <inheritdoc />
100-
protected override string? ClassNames =>
101-
BuildClassNames(Class, (BootstrapClass.AccordionItem, true));
102-
97+
10398
/// <summary>
10499
/// Gets or sets the active state.
105100
/// </summary>
106101
/// <remarks>
107102
/// Default value is <see langword="false" />.
108103
/// </remarks>
109-
[Parameter]
110-
public bool Active { get; set; }
104+
[Parameter] public bool Active { get; set; }
111105

112106
private string ButtonCollapsedStateCssClass => isCollapsed ? "collapsed" : string.Empty;
113107

blazorbootstrap/Components/Alert/Alert.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@namespace BlazorBootstrap
22
@inherits BlazorBootstrapComponentBase
33

4-
<div @ref="@Element" id="@Id" class="@ClassNames" style="@StyleNames" role="alert" @attributes="@AdditionalAttributes">
4+
<div @ref="@Element" id="@Id" class="@BootstrapClass.Alert @EnumExtensions.AlertColorClassMap[Color] @(Dismissable ? BootstrapClass.AlertDismissable : "") @Class" role="alert" @attributes="@AdditionalAttributes">
55
@if (ChildContent != null)
66
{
77
@ChildContent

blazorbootstrap/Components/Alert/Alert.razor.cs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ public override Task SetParametersAsync(ParameterView parameters)
8787
case nameof(Id): Id = (string)parameter.Value; break;
8888
case nameof(OnClose): OnClose = (EventCallback)parameter.Value; break;
8989
case nameof(OnClosed): OnClosed = (EventCallback)parameter.Value; break;
90-
case nameof(Style): Style = (string)parameter.Value; break;
91-
9290
default:
9391
AdditionalAttributes![parameter.Name] = parameter.Value;
9492
break;
@@ -101,14 +99,7 @@ public override Task SetParametersAsync(ParameterView parameters)
10199
#endregion
102100

103101
#region Properties, Indexers
104-
105-
/// <inheritdoc />
106-
protected override string? ClassNames =>
107-
BuildClassNames(Class,
108-
(BootstrapClass.Alert, true),
109-
(Color.ToAlertColorClass(), Color != AlertColor.None),
110-
(BootstrapClass.AlertDismisable, Dismissable));
111-
102+
112103
/// <summary>
113104
/// Gets or sets the content to be rendered within the component.
114105
/// </summary>

0 commit comments

Comments
 (0)