chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed: The propagation issue of OverlayFeedbackElement.ClosedEvent.

Browse Source
This commit is contained in:
望尘空忧
2025-01-14 19:47:48 +08:00
parent dae550ece7
commit 93fe82c100
9 changed files with 184 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Ursa/Controls/Drawer/DrawerControlBase.cs
View File

@@ -49,11 +49,6 @@ public abstract class DrawerControlBase: OverlayFeedbackElement
internal bool? IsCloseButtonVisible { get; set; }
protected internal bool CanLightDismiss { get; set; }
static DrawerControlBase()
{
DataContextProperty.Changed.AddClassHandler<DrawerControlBase, object?>((o, e) => o.OnDataContextChange(e));
}
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{
@@ -63,23 +58,6 @@ public abstract class DrawerControlBase: OverlayFeedbackElement
Button.ClickEvent.AddHandler(OnCloseButtonClick, _closeButton);
}
private void OnDataContextChange(AvaloniaPropertyChangedEventArgs<object?> args)
{
if(args.OldValue.Value is IDialogContext oldContext)
{
oldContext.RequestClose -= OnContextRequestClose;
}
if(args.NewValue.Value is IDialogContext newContext)
{
newContext.RequestClose += OnContextRequestClose;
}
}
private void OnContextRequestClose(object? sender, object? e)
{
RaiseEvent(new ResultEventArgs(ClosedEvent, e));
}
private void OnCloseButtonClick(object? sender, RoutedEventArgs e) => Close();
public override void Close()

7
src/Ursa/Controls/OverlayShared/OverlayDialogHost.Dialog.cs
View File

@@ -1,6 +1,8 @@
using Avalonia;
using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.VisualTree;
using Irihi.Avalonia.Shared.Contracts;
using Irihi.Avalonia.Shared.Helpers;
using Irihi.Avalonia.Shared.Shapes;
using Ursa.Controls.OverlayShared;
@@ -63,6 +65,8 @@ public partial class OverlayDialogHost
private async void OnDialogControlClosing(object? sender, object? e)
{
if (sender is not DialogControlBase control) return;
if (control.IsShowAsync is false && e is RoutedEventArgs args)
args.Handled = true;
var layer = _layers.FirstOrDefault(a => a.Element == control);
if (layer is null) return;
_layers.Remove(layer);
@@ -116,11 +120,12 @@ public partial class OverlayDialogHost
if (!IsAnimationDisabled) MaskAppearAnimation.RunAsync(mask);
var element = control.GetVisualDescendants().OfType<InputElement>()
.FirstOrDefault(FocusHelper.GetDialogFocusHint);
.FirstOrDefault(FocusHelper.GetDialogFocusHint);
if (element is null)
{
element = control.GetVisualDescendants().OfType<InputElement>().FirstOrDefault(a => a.Focusable);
}
element?.Focus();
_modalCount++;
IsInModalStatus = _modalCount > 0;

44
src/Ursa/Controls/OverlayShared/OverlayDialogHost.Drawer.cs
View File

@@ -5,6 +5,7 @@ using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Styling;
using Avalonia.VisualTree;
using Irihi.Avalonia.Shared.Contracts;
using Irihi.Avalonia.Shared.Shapes;
using Ursa.Common;
using Ursa.Controls.OverlayShared;
@@ -22,9 +23,10 @@ public partial class OverlayDialogHost
{
mask = CreateOverlayMask(false, true);
}
_layers.Add(new DialogPair(mask, control));
ResetZIndices();
if(mask is not null)this.Children.Add(mask);
if (mask is not null) this.Children.Add(mask);
this.Children.Add(control);
control.Measure(this.Bounds.Size);
control.Arrange(new Rect(control.DesiredSize));
@@ -47,7 +49,7 @@ public partial class OverlayDialogHost
}
}
}
internal async void AddModalDrawer(DrawerControlBase control)
{
PureRectangle mask = CreateOverlayMask(true, control.CanLightDismiss);
@@ -72,26 +74,28 @@ public partial class OverlayDialogHost
}
var element = control.GetVisualDescendants().OfType<InputElement>()
.FirstOrDefault(FocusHelper.GetDialogFocusHint);
.FirstOrDefault(FocusHelper.GetDialogFocusHint);
if (element is null)
{
element = control.GetVisualDescendants().OfType<InputElement>().FirstOrDefault(a => a.Focusable);
}
element?.Focus();
}
private void SetDrawerPosition(DrawerControlBase control)
{
if(control.Position is Position.Left or Position.Right)
if (control.Position is Position.Left or Position.Right)
{
control.Height = this.Bounds.Height;
}
if(control.Position is Position.Top or Position.Bottom)
if (control.Position is Position.Top or Position.Bottom)
{
control.Width = this.Bounds.Width;
}
}
private static void ResetDrawerPosition(DrawerControlBase control, Size newSize)
{
if (control.Position == Position.Right)
@@ -112,7 +116,7 @@ public partial class OverlayDialogHost
else
{
control.Width = newSize.Width;
SetTop(control, newSize.Height-control.Bounds.Height);
SetTop(control, newSize.Height - control.Bounds.Height);
}
}
@@ -132,26 +136,28 @@ public partial class OverlayDialogHost
source = appear ? Bounds.Width : Bounds.Width - elementBounds.Width;
target = appear ? Bounds.Width - elementBounds.Width : Bounds.Width;
}
if (position == Position.Top)
{
source = appear ? -elementBounds.Height : 0;
target = appear ? 0 : -elementBounds.Height;
}
if (position == Position.Bottom)
{
source = appear ? Bounds.Height : Bounds.Height - elementBounds.Height;
target = appear ? Bounds.Height - elementBounds.Height : Bounds.Height;
}
var targetProperty = position==Position.Left || position==Position.Right ? Canvas.LeftProperty : Canvas.TopProperty;
var targetProperty = position == Position.Left || position == Position.Right
? Canvas.LeftProperty
: Canvas.TopProperty;
var animation = new Animation
{
Easing = new CubicEaseOut(),
FillMode = FillMode.Forward
};
var keyFrame1 = new KeyFrame(){ Cue = new Cue(0.0) };
var keyFrame1 = new KeyFrame() { Cue = new Cue(0.0) };
keyFrame1.Setters.Add(new Setter()
{ Property = targetProperty, Value = source });
var keyFrame2 = new KeyFrame() { Cue = new Cue(1.0) };
@@ -162,16 +168,19 @@ public partial class OverlayDialogHost
animation.Duration = TimeSpan.FromSeconds(0.3);
return animation;
}
private async void OnDrawerControlClosing(object? sender, ResultEventArgs e)
{
if (sender is DrawerControlBase control)
{
if (control.IsShowAsync is false)
e.Handled = true;
var layer = _layers.FirstOrDefault(a => a.Element == control);
if(layer is null) return;
if (layer is null) return;
_layers.Remove(layer);
control.RemoveHandler(OverlayFeedbackElement.ClosedEvent, OnDialogControlClosing);
control.RemoveHandler(DialogControlBase.LayerChangedEvent, OnDialogLayerChanged);
control.RemoveHandler(DialogControlBase.LayerChangedEvent, OnDialogLayerChanged);
if (layer.Mask is not null)
{
_modalCount--;
@@ -181,8 +190,10 @@ public partial class OverlayDialogHost
if (!IsAnimationDisabled)
{
var disappearAnimation = CreateAnimation(control.Bounds.Size, control.Position, false);
await Task.WhenAll(disappearAnimation.RunAsync(control), MaskDisappearAnimation.RunAsync(layer.Mask));
await Task.WhenAll(disappearAnimation.RunAsync(control),
MaskDisappearAnimation.RunAsync(layer.Mask));
}
Children.Remove(layer.Mask);
}
else
@@ -193,6 +204,7 @@ public partial class OverlayDialogHost
await disappearAnimation.RunAsync(control);
}
}
Children.Remove(control);
ResetZIndices();
}

21
src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs
View File

@@ -2,6 +2,7 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.LogicalTree;
using Avalonia.Threading;
using Avalonia.VisualTree;
using Irihi.Avalonia.Shared.Contracts;
@@ -35,19 +36,13 @@ public abstract class OverlayFeedbackElement : ContentControl
ClosedEvent.AddClassHandler<OverlayFeedbackElement>((o, e) => o.OnClosed(e));
}
protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
{
base.OnDetachedFromVisualTree(e);
Content = null;
}
public bool IsClosed
{
get => GetValue(IsClosedProperty);
set => SetValue(IsClosedProperty, value);
}
private void OnClosed(ResultEventArgs _)
private void OnClosed(ResultEventArgs args)
{
SetCurrentValue(IsClosedProperty, true);
}
@@ -74,13 +69,25 @@ public abstract class OverlayFeedbackElement : ContentControl
RaiseEvent(new ResultEventArgs(ClosedEvent, args));
}
protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
{
base.OnDetachedFromLogicalTree(e);
Content = null;
}
internal bool IsShowAsync { get; set; }
public Task<T?> ShowAsync<T>(CancellationToken? token = default)
{
IsShowAsync = true;
var tcs = new TaskCompletionSource<T?>();
token?.Register(() => { Dispatcher.UIThread.Invoke(Close); });
void OnCloseHandler(object? sender, ResultEventArgs? args)
{
IsShowAsync = false;
if (args is not null)
args.Handled = true;
if (args?.Result is T result)
tcs.SetResult(result);
else