dan/Toolkit2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issue with dialog opening but is not closing due to request running into a "ContentControlHandler" after the dialog's await state has been completed.

Browse Source
This commit is contained in:
Daniel Clark
2022-12-21 10:12:54 +00:00
parent e9dd86e0e0
commit b8e50e4dc0
8 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Framework/Avalonia/Navigation/NavigateHandler.cs
+8 -10
View File
@@ -1,5 +1,6 @@
using Avalonia.Controls;
using FluentAvalonia.UI.Controls;
using System.Diagnostics;
using Toolkit.Controls.Avalonia;
using Toolkit.Framework.Foundation;
namespace Toolkit.Framework.Avalonia;
@@ -28,7 +29,7 @@ public class NavigateHandler : IRequestHandler<Navigate>
this.descriptors = descriptors;
}
public async ValueTask<Unit> Handle(Navigate request, CancellationToken cancellationToken)
public ValueTask<Unit> Handle(Navigate request, CancellationToken cancellationToken)
{
object? content = null;
object? template = null;
@@ -75,20 +76,17 @@ public class NavigateHandler : IRequestHandler<Navigate>
target = template;
}
bool hasNavigated = false;
if (target is Frame frame)
{
hasNavigated = await mediator.Send(new FrameNavigation(frame, content, template, keyedParameters));
mediator.Send(new FrameNavigation(frame, content, template, keyedParameters));
}
if (target is ContentDialog dialog)
else if (target is ContentDialog dialog)
{
hasNavigated = await mediator.Send(new ContentDialogNavigation(dialog, content, template, keyedParameters));
mediator.Send(new ContentDialogNavigation(dialog, content, template, keyedParameters));
}
if (target is ContentControl contentControl)
else if (target is ContentControl contentControl)
{
hasNavigated = await mediator.Send(new ContentControlNavigation(contentControl, content, template, keyedParameters));
mediator.Send(new ContentControlNavigation(contentControl, content, template, keyedParameters));
}
}
else