Skip to content
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
21 changes: 18 additions & 3 deletions src/Core/Components/Menu/FluentMenu.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public partial class FluentMenu : FluentComponentBase, IAsyncDisposable
private IMenuService? _menuService = null;
private IJSObjectReference _jsModule = default!;
private IJSObjectReference _anchoredRegionModule = default!;
private bool _disposed;

private (int top, int right, int bottom, int left) _stylePositions;

Expand Down Expand Up @@ -223,7 +224,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)

if (Trigger != MouseButton.None)
{
if (Anchor is not null)
if (!_disposed && Anchor is not null)
{
// Add LeftClick event
if (Trigger == MouseButton.Left)
Expand All @@ -240,14 +241,14 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
}
}

if (_jsModule is not null && _anchoredRegionModule is not null)
if (!_disposed)
{
await _jsModule.InvokeVoidAsync("initialize", Anchor, Id, Open, _anchoredRegionModule, _dotNetHelper);
}
}
else
{
if (_jsModule is not null && _anchoredRegionModule is not null && _reinitializeEventListeners)
if (!_disposed && _reinitializeEventListeners)
{
// If the menu was closed, remove its set event listeners. If it opened (ie if the menu starts out closed),
// we should set them now.
Expand Down Expand Up @@ -385,6 +386,10 @@ internal async Task NotifyCheckedChangedAsync(FluentMenuItem fluentMenuItem)

internal async Task<bool> IsCheckedAsync(FluentMenuItem item)
{
if (_jsModule is null)
{
return false;
}
return await _jsModule.InvokeAsync<bool>("isChecked", item.Id);
}

Expand All @@ -393,6 +398,12 @@ internal async Task<bool> IsCheckedAsync(FluentMenuItem item)
/// </summary>
public async ValueTask DisposeAsync()
{
if (_disposed)
{
return;
}

_disposed = true;
_dotNetHelper?.Dispose();

try
Expand All @@ -414,5 +425,9 @@ public async ValueTask DisposeAsync()
// The JSRuntime side may routinely be gone already if the reason we're disposing is that
// the client disconnected. This is not an error.
}
finally
{
GC.SuppressFinalize(this);
}
}
}
Loading