Skip to content

[Dialog] Fix error when module hasn't finished loading #4324

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 2 commits into from
Nov 17, 2025
Merged

[Dialog] Fix error when module hasn't finished loading #4324

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd428a2
Fix dialog provider error when module hasn't finished loading
JamesNK Nov 17, 2025
04c50ba
Refactor
JamesNK Nov 17, 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
29 changes: 16 additions & 13 deletions src/Core/Components/Dialog/FluentDialogProvider.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,31 +61,34 @@ protected override async Task OnAfterRenderAsync(bool firstRender)

private void ShowDialog(IDialogReference dialogReference, Type? dialogComponent, DialogParameters parameters, object content)
{
if (_module is null)
{
throw new InvalidOperationException("JS module is not loaded.");
}

InvokeAsync(async () =>
{
var previouslyFocusedElement = await _module.InvokeAsync<IJSObjectReference>("getActiveElement");
var previouslyFocusedElement = await GetPreviouslyFocusedElementAsync();

DialogInstance dialog = new(dialogComponent, parameters, content, previouslyFocusedElement);
dialogReference.Instance = dialog;

_internalDialogContext.References.Add(dialogReference);
});
}

private async Task<IDialogReference> ShowDialogAsync(IDialogReference dialogReference, Type? dialogComponent, DialogParameters parameters, object content)
private async Task<IJSObjectReference?> GetPreviouslyFocusedElementAsync()
{
if (_module is null)
// If the module hasn't been loaded then the page hasn't rendered yet, so there is no previously focused element.
IJSObjectReference? previouslyFocusedElement = null;
if (_module is not null)
{
throw new InvalidOperationException("JS module is not loaded.");
previouslyFocusedElement = await _module.InvokeAsync<IJSObjectReference>("getActiveElement");
}

return previouslyFocusedElement;
}

private async Task<IDialogReference> ShowDialogAsync(IDialogReference dialogReference, Type? dialogComponent, DialogParameters parameters, object content)
{
return await Task.Run(async () =>
{
var previouslyFocusedElement = await _module.InvokeAsync<IJSObjectReference>("getActiveElement");
var previouslyFocusedElement = await GetPreviouslyFocusedElementAsync();

DialogInstance dialog = new(dialogComponent, parameters, content, previouslyFocusedElement);
dialogReference.Instance = dialog;
Expand Down Expand Up @@ -166,12 +169,12 @@ internal void DismissInstance(string id, DialogResult result)

internal async Task ReturnFocusAsync(IJSObjectReference element)
{
if (_module is null)
// Module should always be loaded here, but check just in case.
if (_module is not null)
{
throw new InvalidOperationException("JS module is not loaded.");
await _module.InvokeVoidAsync("focusElement", element);
}

await _module.InvokeVoidAsync("focusElement", element);
await element.DisposeAsync();
}

Expand Down
Loading