Skip to content
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.

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

Improve bit BlazorUI source generator's SetParametersAsync generator (#10206) #10207

Merged
merged 6 commits into from
Mar 8, 2025
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -35,6 +35,7 @@ private static string GeneratePartialClass(INamedTypeSymbol classSymbol, List<Bl
var className = GetClassName(classSymbol);
var twoWayParameters = parameters.Where(p => p.IsTwoWayBound).ToArray();
var isBaseTypeComponentBase = classSymbol.BaseType?.ToDisplayString() == "Microsoft.AspNetCore.Components.ComponentBase";
var doesSupporteParametersViewCache = InheritsFromBitComponentBase(classSymbol);

StringBuilder builder = new StringBuilder($@"using System;
using System.Threading.Tasks;
@@ -62,7 +63,14 @@ public override Task SetParametersAsync(ParameterView parameters)
{
builder.AppendLine($" {par.PropertySymbol.Name}HasBeenSet = false;");
}
builder.AppendLine(" var parametersDictionary = parameters.ToDictionary() as Dictionary<string, object>;");
if (doesSupporteParametersViewCache)
{
builder.AppendLine(" var parametersDictionary = (ParametersCache ??= parameters.ToDictionary() as Dictionary<string, object>);");
}
else
{
builder.AppendLine(" var parametersDictionary = parameters.ToDictionary() as Dictionary<string, object>;");
}
builder.AppendLine(" foreach (var parameter in parametersDictionary!)");
builder.AppendLine(" {");
builder.AppendLine(" switch (parameter.Key)");
@@ -117,7 +125,14 @@ public override Task SetParametersAsync(ParameterView parameters)
}
else
{
builder.AppendLine(" return base.SetParametersAsync(ParameterView.FromDictionary(parametersDictionary as IDictionary<string, object?>));");
if (doesSupporteParametersViewCache)
{
builder.AppendLine(" return base.SetParametersAsync(ParameterView.Empty);");
}
else
{
builder.AppendLine(" return base.SetParametersAsync(ParameterView.FromDictionary(parametersDictionary as IDictionary<string, object?>));");
}
}
builder.AppendLine(@" }");

@@ -171,4 +186,18 @@ private static string GetClassName(INamedTypeSymbol classSymbol)

return sbName.ToString();
}

private static bool InheritsFromBitComponentBase(INamedTypeSymbol? typeSymbol)
{
if (typeSymbol is null)
return false;

if (typeSymbol.TypeKind is not TypeKind.Class)
return false;

if (typeSymbol.Name == "BitComponentBase")
return true;

return InheritsFromBitComponentBase(typeSymbol.BaseType);
}
}
7 changes: 5 additions & 2 deletions src/BlazorUI/Bit.BlazorUI/Components/BitComponentBase.cs
Original file line number Diff line number Diff line change
@@ -74,11 +74,11 @@ public BitDir? Dir
[Parameter] public BitVisibility Visibility { get; set; }



internal protected Dictionary<string, object?>? ParametersCache { get; set; }
public override Task SetParametersAsync(ParameterView parameters)
{
HtmlAttributes.Clear();
var parametersDictionary = parameters.ToDictionary() as Dictionary<string, object>;
var parametersDictionary = ParametersCache ?? throw new InvalidOperationException();
foreach (var parameter in parametersDictionary!)
{
switch (parameter.Key)
@@ -140,6 +140,9 @@ public override Task SetParametersAsync(ParameterView parameters)
break;
}
}

ParametersCache = null;

return base.SetParametersAsync(ParameterView.Empty);
}

Original file line number Diff line number Diff line change
@@ -139,7 +139,7 @@ public override Task SetParametersAsync(ParameterView parameters)
{
ValueHasBeenSet = false;

var parametersDictionary = parameters.ToDictionary() as Dictionary<string, object>;
var parametersDictionary = (ParametersCache ??= parameters.ToDictionary() as Dictionary<string, object?>);

foreach (var parameter in parametersDictionary!)
{
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ public abstract class BitTextInputBase<TValue> : BitInputBase<TValue>

public override Task SetParametersAsync(ParameterView parameters)
{
var parametersDictionary = parameters.ToDictionary() as Dictionary<string, object>;
var parametersDictionary = (ParametersCache ??= parameters.ToDictionary() as Dictionary<string, object?>); ;

foreach (var parameter in parametersDictionary!)
{
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@ public abstract class BitLoadingBase : BitComponentBase

public override Task SetParametersAsync(ParameterView parameters)
{
var parametersDictionary = parameters.ToDictionary() as Dictionary<string, object>;
var parametersDictionary = (ParametersCache ??= parameters.ToDictionary() as Dictionary<string, object?>);

foreach (var parameter in parametersDictionary!)
{