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.

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

Jump to bottom

🐛 fix(Sortable): the re-order should be triggered after the Order property value changes #2120

Merged
merged 1 commit into from
Aug 28, 2024
Merged

🐛 fix(Sortable): the re-order should be triggered after the Order property value changes #2120

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
17 changes: 9 additions & 8 deletions src/Masa.Blazor/Components/Sortable/MSortableProviderBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,7 @@ public abstract class MSortableProviderBase<TItem> : MasaComponentBase, ISortabl

[Parameter] [EditorRequired] public IEnumerable<TItem> Items { get; set; } = Enumerable.Empty<TItem>();

[Parameter]
public List<string>? Order
{
get => GetValue<List<string>>();
set => SetValue(value);
}
[Parameter] public List<string>? Order { get; set; }

[Parameter] public EventCallback<List<string>> OrderChanged { get; set; }

Expand Down Expand Up @@ -178,6 +173,7 @@ public bool Disabled
private IEnumerable<TItem>? _prevItems;
private HashSet<string> _prevItemKeys;
private List<string> _internalOrder;
private string[] _prevOrder = [];

private DotNetObjectReference<SortableJSInteropHandle>? _sortableJSInteropHandle;
private SortableJSObjectReference? _jsObjectReference;
Expand Down Expand Up @@ -205,8 +201,7 @@ protected override void RegisterWatchers(PropertyWatcher watcher)
base.RegisterWatchers(watcher);

watcher.Watch<bool>(nameof(Disabled),
val => { _jsObjectReference?.InvokeVoidAsync("option", "disabled", val); })
.Watch<List<string>>(nameof(Order), val => { _ = _jsObjectReference?.SortAsync(val, false); });
val => { _jsObjectReference?.InvokeVoidAsync("option", "disabled", val); });
}

protected override void OnParametersSet()
Expand All @@ -232,6 +227,12 @@ protected override void OnParametersSet()
SortByInternalOrder();
}
}

if (Order is not null && !_prevOrder.SequenceEqual(Order))
{
_prevOrder = Order.ToArray();
_ = _jsObjectReference?.SortAsync(Order, false);
}
}

protected override async Task OnAfterRenderAsync(bool firstRender)
Expand Down
Loading