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

feat: enhance PopConfirm with async command support and improve binding. add more demo.

Browse Source
This commit is contained in:
Dong Bin
2025-04-18 17:54:16 +08:00
parent 2a081c0f95
commit 67025dca9c
4 changed files with 52 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
demo/Ursa.Demo/Pages/PopConfirmDemo.axaml
View File

@@ -9,9 +9,23 @@
x:DataType="viewModels:PopConfirmDemoViewModel"
x:Class="Ursa.Demo.Pages.PopConfirmDemo">
<StackPanel HorizontalAlignment="Left">
<TextBlock Text="Default PopConfirm" Margin="0 16" />
<u:PopConfirm PopupHeader="Header" PopupContent="Content"
ConfirmCommand="{Binding ConfirmCommand}"
CancelCommand="{Binding Path=CancelCommand}" >
ConfirmCommand="{Binding ConfirmCommand}"
CancelCommand="{Binding Path=CancelCommand}" >
<Button Content="Hello World"></Button>
</u:PopConfirm>
<TextBlock Text="Hover to trigger" Margin="0 16" />
<u:PopConfirm PopupHeader="Header" PopupContent="Content"
TriggerMode="Focus"
ConfirmCommand="{Binding ConfirmCommand}"
CancelCommand="{Binding Path=CancelCommand}" >
<Button Content="Hello World"></Button>
</u:PopConfirm>
<TextBlock Text="Asynchronized command support" Margin="0 16" />
<u:PopConfirm PopupHeader="Header" PopupContent="Content"
ConfirmCommand="{Binding AsyncConfirmCommand}"
CancelCommand="{Binding Path=AsyncCancelCommand}" >
<Button Content="Hello World"></Button>
</u:PopConfirm>
</StackPanel>

45
demo/Ursa.Demo/ViewModels/PopConfirmDemoViewModel.cs
View File

@@ -7,27 +7,42 @@ using Ursa.Controls;
namespace Ursa.Demo.ViewModels;
public partial class PopConfirmDemoViewModel: ObservableObject
public class PopConfirmDemoViewModel : ObservableObject
{
internal WindowToastManager? ToastManager { get; set; }
public ICommand ConfirmCommand { get; }
public ICommand CancelCommand { get; }
public PopConfirmDemoViewModel()
{
ConfirmCommand = new AsyncRelayCommand(OnConfirm);
AsyncConfirmCommand = new AsyncRelayCommand(OnConfirmAsync);
AsyncCancelCommand = new RelayCommand(OnCancelAsync);
ConfirmCommand = new RelayCommand(OnConfirm);
CancelCommand = new RelayCommand(OnCancel);
}
private async Task OnConfirm()
{
await Task.Delay(3000);
ToastManager?.Show(new Toast("Confirmed"), type: NotificationType.Success, classes: ["Light"]);
}
internal WindowToastManager? ToastManager { get; set; }
public ICommand ConfirmCommand { get; }
public ICommand CancelCommand { get; }
public ICommand AsyncConfirmCommand { get; }
public ICommand AsyncCancelCommand { get; }
private void OnCancel()
{
ToastManager?.Show(new Toast("Canceled"), type:NotificationType.Error, classes: ["Light"]);
ToastManager?.Show(new Toast("Canceled"), NotificationType.Error, classes: ["Light"]);
}
private void OnConfirm()
{
ToastManager?.Show(new Toast("Confirmed"), NotificationType.Success, classes: ["Light"]);
}
private async Task OnConfirmAsync()
{
await Task.Delay(3000);
ToastManager?.Show(new Toast("Async Confirmed"), NotificationType.Success, classes: ["Light"]);
}
private void OnCancelAsync()
{
ToastManager?.Show(new Toast("Async Canceled"), NotificationType.Error, classes: ["Light"]);
}
}

2
src/Ursa.Themes.Semi/Controls/PopConfirm.axaml
View File

@@ -12,7 +12,7 @@
ContentTemplate="{TemplateBinding ContentTemplate}" />
<Popup
IsLightDismissEnabled="True"
IsOpen="{TemplateBinding IsDropdownOpen, Mode=TwoWay}"
IsOpen="{Binding IsDropdownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
OverlayInputPassThroughElement="{Binding #PART_ContentPresenter}"
Name="{x:Static u:PopConfirm.PART_Popup}"
Placement="{TemplateBinding Placement}" >

7
src/Ursa/Controls/PopConfirm/PopConfirm.cs
View File

@@ -201,8 +201,11 @@ public class PopConfirm : ContentControl
protected override bool RegisterContentPresenter(ContentPresenter presenter)
{
var result = base.RegisterContentPresenter(presenter);
_childChangeDisposable = presenter.GetPropertyChangedObservable(ContentPresenter.ChildProperty)
.Subscribe(OnChildChanged);
if (result)
{
_childChangeDisposable = presenter.GetPropertyChangedObservable(ContentPresenter.ChildProperty)
.Subscribe(OnChildChanged);
}
return result;
}