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

Untrack DialogReference when dialog is closed #2465

Merged
merged 7 commits into from
Feb 27, 2024
Merged

Untrack DialogReference when dialog is closed #2465

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
435d958
Untrack DialogReference when dialog is closed
tlmii Feb 27, 2024
f2cb39e
Fix keyboard shortcuts and url casing
tlmii Feb 27, 2024
eae03aa
Suppress JSDisconnectedException
tlmii Feb 27, 2024
3ca0976
Check MetaKey and refactor modifier key checks
tlmii Feb 27, 2024
83529fc
Merge branch 'main' into dev/fix-keyboard-shortcuts
adamint Feb 27, 2024
0a9cec3
Merge remote-tracking branch 'origin/dev/fix-help-dialog' into dev/fi…
adamint Feb 27, 2024
2f3491f
removed redundant extra OnDialogCloseRequested call
adamint Feb 27, 2024
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
11 changes: 9 additions & 2 deletions src/Aspire.Dashboard/Components/Layout/MainLayout.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ private async Task LaunchHelpAsync()
Alignment = HorizontalAlignment.Center,
Width = "700px",
Height = "auto",
Id = HelpDialogId
Id = HelpDialogId,
OnDialogResult = EventCallback.Factory.Create<DialogResult>(this, HandleDialogResult)
};

if (_openPageDialog is not null)
Expand All @@ -117,6 +118,11 @@ private async Task LaunchHelpAsync()
_openPageDialog = await DialogService.ShowDialogAsync<HelpDialog>(parameters).ConfigureAwait(true);
}

private void HandleDialogResult(DialogResult dialogResult)
{
_openPageDialog = null;
}

public async Task LaunchSettingsAsync()
{
DialogParameters parameters = new()
Expand All @@ -130,7 +136,8 @@ public async Task LaunchSettingsAsync()
Alignment = HorizontalAlignment.Right,
Width = "300px",
Height = "auto",
Id = SettingsDialogId
Id = SettingsDialogId,
OnDialogResult = EventCallback.Factory.Create<DialogResult>(this, HandleDialogResult)
};

if (_openPageDialog is not null)
Expand Down