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

🆕 feat(Sortable): add a parameter for container element of type ElementReference #2158

Merged
merged 1 commit into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/Masa.Blazor/Components/Sortable/MSortable.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public partial class MSortable<TItem> : MSortableProviderBase<TItem>
private static Block _block = new("m-sortable");
private ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();

protected override string ContainerSelector => Ref.GetSelector();
protected override string? ContainerSelector => Ref.TryGetSelector(out var selector) ? selector : null;

protected override IEnumerable<string> BuildComponentClass()
{
Expand Down
21 changes: 15 additions & 6 deletions src/Masa.Blazor/Components/Sortable/MSortableProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,26 @@

public class MSortableProvider<TItem> : MSortableProviderBase<TItem>
{
[Parameter] [EditorRequired] public string Container { get; set; } = null!;
[Parameter] public string? Container { get; set; }

[Parameter] public RenderFragment<SortableItemContext<TItem>>? ItemContent { get; set; }
[Parameter]
[MasaApiParameter(ReleasedOn = "v1.7.3")]
public ElementReference ContainerRef { get; set; }

protected override string ContainerSelector => Container;
[Parameter] public RenderFragment<SortableItemContext<TItem>>? ItemContent { get; set; }

protected override void OnParametersSet()
protected override string? ContainerSelector
{
base.OnParametersSet();
get
{
if (Container is not null && ContainerRef.Id is not null)
{
throw new InvalidOperationException(
$"{nameof(MSortableProvider<TItem>)} requires one of {nameof(Container)} or {nameof(ContainerRef)}, but both were provided.");
}

Container.ThrowIfNull(ComponentName);
return Container ?? (ContainerRef.TryGetSelector(out var selector) ? selector : null);
}
}

protected override void BuildRenderTree(RenderTreeBuilder builder)
Expand Down
25 changes: 16 additions & 9 deletions src/Masa.Blazor/Components/Sortable/MSortableProviderBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ public bool Disabled

private RenderRateLimiter? _renderRateLimiter;

protected abstract string ContainerSelector { get; }
protected abstract string? ContainerSelector { get; }

protected override void OnInitialized()
{
Expand Down Expand Up @@ -247,16 +247,23 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
{
await base.OnAfterRenderAsync(firstRender);

if (firstRender)
{
if (_sortableJSInteropHandle is null)
{
return;
}
await InitAsync();
}

_jsObjectReference =
await SortableJSModule.InitAsync(ContainerSelector, GenOptions(), Order, _sortableJSInteropHandle);
private async Task InitAsync()
{
if (_jsObjectReference is not null)
{
return;
}

if (_sortableJSInteropHandle is null || ContainerSelector is null)
{
return;
}

_jsObjectReference =
await SortableJSModule.InitAsync(ContainerSelector, GenOptions(), Order, _sortableJSInteropHandle);
}

private SortableOptions GenOptions()
Expand Down
11 changes: 11 additions & 0 deletions src/Masa.Blazor/Core/Styles/StyleBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,17 @@ public StyleBuilder AddLength(string name, double value, string unit = "px")
return Add(value == 0 ? $"{name}: 0" : $"{name}: {value}{unit}".ToString(CultureInfo.InvariantCulture));
}

public void Clear()
{
_stringBuilder.Clear();
}

public StyleBuilder Reset()
{
_stringBuilder.Clear();
return this;
}

public IEnumerable<string> GenerateCssStyles()
{
yield return _stringBuilder.ToString();
Expand Down
Loading