Skip to content

[InputFile] Better handling of dispose error. #3605

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

Merged
vnbaaij merged 3 commits into from
Apr 1, 2025
Merged

[InputFile] Better handling of dispose error. #3605

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9528b1e
Swallow the JSDisconnectedException when trying to call the 'dispose'…
StevenRasmussen Apr 1, 2025
aaedb45
All items in dispose will fail if the circuit is closed. Wrap the try…
StevenRasmussen Apr 1, 2025
9daaec0
Updated per comments.
StevenRasmussen Apr 1, 2025
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
23 changes: 16 additions & 7 deletions src/Core/Components/InputFile/FluentInputFile.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public partial class FluentInputFile : FluentComponentBase, IAsyncDisposable
private ElementReference? _containerElement;
private InputFile? _inputFile;
private IJSObjectReference? _containerInstance;

public static string ResourceLoadingBefore = "Loading...";
public static string ResourceLoadingCompleted = "Completed";
public static string ResourceLoadingCanceled = "Canceled";
Expand Down Expand Up @@ -427,15 +427,24 @@ private async Task UpdateProgressAsync(int percent, string title)
// Unregister the drop zone events
public async ValueTask DisposeAsync()
{
if (_containerInstance != null)
try
{
await _containerInstance.InvokeVoidAsync("dispose");
await _containerInstance.DisposeAsync();
}
if (_containerInstance is not null)
{
await _containerInstance.InvokeVoidAsync("dispose");
await _containerInstance.DisposeAsync().ConfigureAwait(false);
}

if (Module != null)
if (Module != null)
{
await Module.DisposeAsync().ConfigureAwait(false);
}
}
catch (Exception ex) when (ex is JSDisconnectedException ||
ex is OperationCanceledException)
{
await Module.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.
}
}
}
Loading