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

Fixes

Browse Source
This commit is contained in:
Dan Clark
2024-11-25 10:39:14 +00:00
parent d1ee8add0c
commit f7a96b3784
5 changed files with 41 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Toolkit.Avalonia/ContentDialogHandler.cs
-3
View File
@@ -62,15 +62,12 @@ public class ContentDialogHandler :
dialog.Closing -= HandleClosing;
if (dialog.DataContext is object content)
{
bool cancelled = false;
if (content is IAsyncConfirmation confirmation)
{
Deferral deferral = args.GetDeferral();
if (!await confirmation.Confirm())
{
args.Cancel = true;
cancelled = true;
dialog.Closing += HandleClosing;
}
Toolkit.Foundation/AsyncHandlerInitialization.cs
+11 -18
View File
@@ -12,28 +12,24 @@ public class AsyncHandlerInitialization<TMessage, TResponse, THandler>(IServiceP
if (!StrongReferenceMessenger.Default.IsRegistered<AsyncResponseEventArgs<TMessage, TResponse>>(provider))
{
StrongReferenceMessenger.Default.Register<IServiceProvider, AsyncResponseEventArgs<TMessage, TResponse>>(provider,
async (provider, args) =>
(provider, args) =>
{
IEnumerable<IAsyncHandler<TMessage, TResponse>> handlers = provider.GetServices<IAsyncHandler<TMessage, TResponse>>();
IEnumerable<IAsyncPipelineBehavior<TMessage, TResponse>> behaviors = provider.GetServices<IAsyncPipelineBehavior<TMessage, TResponse>>();
AsyncHandlerDelegate<TResponse> handlerDelegate = async () =>
{
TResponse response = default!;
foreach (IAsyncHandler<TMessage, TResponse> handler in handlers)
{
response = await handler.Handle(args.Message, args.CancellationToken);
}
return response;
};
AsyncHandlerDelegate<TResponse> handlerDelegate = () =>
handler.Handle(args.Message, args.CancellationToken);
foreach (IAsyncPipelineBehavior<TMessage, TResponse> behavior in behaviors.Reverse())
foreach (IAsyncPipelineBehavior<TMessage, TResponse>? behavior in behaviors.Reverse())
{
AsyncHandlerDelegate<TResponse> next = handlerDelegate;
handlerDelegate = () => behavior.Handle(args.Message, next);
}
args.Reply(await handlerDelegate());
args.Reply(handlerDelegate());
}
});
}
}
@@ -48,19 +44,15 @@ public class AsyncHandlerInitialization<TMessage, THandler>(IServiceProvider pro
if (!StrongReferenceMessenger.Default.IsRegistered<AsyncResponseEventArgs<TMessage, Unit>>(provider))
{
StrongReferenceMessenger.Default.Register<IServiceProvider, AsyncResponseEventArgs<TMessage, Unit>>(provider,
async (provider, args) =>
(provider, args) =>
{
IEnumerable<IAsyncHandler<TMessage>> handlers = provider.GetServices<IAsyncHandler<TMessage>>();
IEnumerable<IAsyncPipelineBehavior<TMessage, Unit>> behaviors = provider.GetServices<IAsyncPipelineBehavior<TMessage, Unit>>();
AsyncHandlerDelegate<Unit> handlerDelegate = async () =>
{
foreach (IAsyncHandler<TMessage> handler in handlers)
{
await handler.Handle(args.Message, args.CancellationToken);
}
return Unit.Value;
};
AsyncHandlerDelegate<Unit> handlerDelegate = () =>
handler.Handle(args.Message, args.CancellationToken).ContinueWith(_ => Unit.Value);
foreach (IAsyncPipelineBehavior<TMessage, Unit> behavior in behaviors.Reverse())
{
@@ -68,8 +60,9 @@ public class AsyncHandlerInitialization<TMessage, THandler>(IServiceProvider pro
handlerDelegate = () => behavior.Handle(args.Message, next);
}
await handlerDelegate();
handlerDelegate();
args.Reply(Unit.Value);
}
});
}
}
Toolkit.Foundation/AsyncHandlerKeyedInitialization.cs
+10 -17
View File
@@ -12,19 +12,15 @@ public class AsyncHandlerKeyedInitialization<TMessage, THandler>(string key, ISe
if (!StrongReferenceMessenger.Default.IsRegistered<AsyncResponseEventArgs<TMessage, Unit>, string>(provider, key))
{
StrongReferenceMessenger.Default.Register<IServiceProvider, AsyncResponseEventArgs<TMessage, Unit>, string>(provider, key,
async (provider, args) =>
(provider, args) =>
{
IEnumerable<IAsyncHandler<TMessage>> handlers = provider.GetKeyedServices<IAsyncHandler<TMessage>>(key);
IEnumerable<IAsyncPipelineBehavior<TMessage, Unit>> behaviors = provider.GetServices<IAsyncPipelineBehavior<TMessage, Unit>>();
AsyncHandlerDelegate<Unit> handlerDelegate = async () =>
{
foreach (IAsyncHandler<TMessage> handler in handlers)
{
await handler.Handle(args.Message, args.CancellationToken);
}
return Unit.Value;
};
AsyncHandlerDelegate<Unit> handlerDelegate = () =>
handler.Handle(args.Message, args.CancellationToken).ContinueWith(_ => Unit.Value);
foreach (IAsyncPipelineBehavior<TMessage, Unit> behavior in behaviors.Reverse())
{
@@ -32,8 +28,9 @@ public class AsyncHandlerKeyedInitialization<TMessage, THandler>(string key, ISe
handlerDelegate = () => behavior.Handle(args.Message, next);
}
await handlerDelegate();
handlerDelegate();
args.Reply(Unit.Value);
}
});
}
}
@@ -48,20 +45,15 @@ public class AsyncHandlerKeyedInitialization<TMessage, TResponse, THandler>(stri
if (!StrongReferenceMessenger.Default.IsRegistered<AsyncResponseEventArgs<TMessage, TResponse>, string>(provider, key))
{
StrongReferenceMessenger.Default.Register<IServiceProvider, AsyncResponseEventArgs<TMessage, TResponse>, string>(provider, key,
async (provider, args) =>
(provider, args) =>
{
IEnumerable<IAsyncHandler<TMessage, TResponse>> handlers = provider.GetKeyedServices<IAsyncHandler<TMessage, TResponse>>(key);
IEnumerable<IAsyncPipelineBehavior<TMessage, TResponse>> behaviors = provider.GetServices<IAsyncPipelineBehavior<TMessage, TResponse>>();
AsyncHandlerDelegate<TResponse> handlerDelegate = async () =>
{
TResponse response = default!;
foreach (IAsyncHandler<TMessage, TResponse> handler in handlers)
{
response = await handler.Handle(args.Message, args.CancellationToken);
}
return response;
};
AsyncHandlerDelegate<TResponse> handlerDelegate = () =>
handler.Handle(args.Message, args.CancellationToken);
foreach (IAsyncPipelineBehavior<TMessage, TResponse> behavior in behaviors.Reverse())
{
@@ -69,7 +61,8 @@ public class AsyncHandlerKeyedInitialization<TMessage, TResponse, THandler>(stri
handlerDelegate = () => behavior.Handle(args.Message, next);
}
args.Reply(await handlerDelegate());
args.Reply(handlerDelegate());
}
});
}
}
Toolkit.Foundation/ConfigurationInitializer.cs
+1 -1
View File
@@ -22,6 +22,6 @@ public class ConfigurationInitializer<TConfiguration>(IConfigurationReader<TConf
}
}
messenger.Send(new ActivatedEventArgs<TConfiguration>(configuration));
messenger.Send(new ActivatedEventArgs<TConfiguration?>(configuration));
}
}
Toolkit.UI.Avalonia/EventListenerBehaviour.cs
-6
View File
@@ -14,7 +14,6 @@ public class EventListenerBehaviour :
public static readonly StyledProperty<object> SourceProperty =
AvaloniaProperty.Register<EventListenerBehaviour, object>(nameof(Source));
private readonly Delegate? eventHandler;
private object? resolvedSource;
static EventListenerBehaviour()
@@ -109,11 +108,6 @@ public class EventListenerBehaviour :
private void UnregisterEvent(string eventName)
{
if (eventHandler is null)
{
return;
}
if (eventName is { Length: 0 })
{
return;