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

Merge pull request #503 from Soar360/pin-code-command

Browse Source 
优化 PinCode 类
This commit is contained in:
Dong Bin
2024-12-05 21:31:08 +08:00
committed by GitHub
parent 9001322f87 0c24c121a8
commit 7510a4e7f4
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Ursa/Controls/PinCode/PinCode.cs
View File

@@ -11,7 +11,7 @@ using Irihi.Avalonia.Shared.Helpers;
namespace Ursa.Controls;
[TemplatePart(PART_ItemsControl, typeof(ItemsControl))]
public class PinCode: TemplatedControl
public class PinCode : TemplatedControl
{
public const string PART_ItemsControl = "PART_ItemsControl";
private ItemsControl? _itemsControl;
@@ -79,7 +79,7 @@ public class PinCode: TemplatedControl
{
CountProperty.Changed.AddClassHandler<PinCode, int>((code, args) => code.OnCountOfDigitChanged(args));
FocusableProperty.OverrideDefaultValue<PinCode>(true);
KeyDownEvent.AddClassHandler<PinCode>((o,e)=>o.OnPreviewKeyDown(e), RoutingStrategies.Tunnel);
KeyDownEvent.AddClassHandler<PinCode>((o, e) => o.OnPreviewKeyDown(e), RoutingStrategies.Tunnel);
}
public PinCode()
@@ -181,6 +181,11 @@ public class PinCode: TemplatedControl
presenter.Text = newText[i].ToString();
}
}
if (newText.Length == Count)
{
CompleteCommand?.Execute(Digits);
RaiseEvent(new PinCodeCompleteEventArgs(Digits, CompleteEvent));
}
}
return;
}
@@ -210,7 +215,7 @@ public class PinCode: TemplatedControl
_currentIndex = MathHelpers.SafeClamp(_currentIndex, 0, Count - 1);
_itemsControl?.ContainerFromIndex(_currentIndex)?.Focus();
}
else if(e.Key is Key.Right or Key.FnRightArrow)
else if (e.Key is Key.Right or Key.FnRightArrow)
{
_currentIndex++;
_currentIndex = MathHelpers.SafeClamp(_currentIndex, 0, Count - 1);

13
tests/HeadlessTest.Ursa/Controls/PinCodeTests/PasteTest.cs
View File

@@ -3,6 +3,7 @@ using Avalonia.Headless;
using Avalonia.Headless.XUnit;
using Avalonia.Input;
using Avalonia.Threading;
using CommunityToolkit.Mvvm.Input;
using Ursa.Controls;
namespace HeadlessTest.Ursa.Controls.PinCodeTests;
@@ -13,9 +14,11 @@ public class PasteTest
public async void Paste_Should_Insert_Text()
{
var window = new Window();
bool commandInvoked = false;
var pinCode = new PinCode()
{
Count = 4,
CompleteCommand = new RelayCommand(() => commandInvoked = true),
};
window.Content = pinCode;
window.Show();
@@ -27,15 +30,18 @@ public class PasteTest
// add await for clipboard processing.
await Task.Delay(1);
Assert.Equal("abcd", string.Join("", pinCode.Digits));
Assert.True(commandInvoked);
}
[AvaloniaFact]
public async void Paste_Should_Insert_Text_When_Text_Is_Shorter()
{
var window = new Window();
bool commandInvoked = false;
var pinCode = new PinCode()
{
Count = 4,
CompleteCommand = new RelayCommand(() => commandInvoked = true),
};
window.Content = pinCode;
window.Show();
@@ -46,15 +52,18 @@ public class PasteTest
window.KeyPressQwerty(PhysicalKey.V, RawInputModifiers.Control);
await Task.Delay(1);
Assert.Equal("abc", string.Join("", pinCode.Digits));
Assert.False(commandInvoked);
}
[AvaloniaFact]
public async void Paste_Should_Insert_Text_When_Text_Is_Longer()
{
var window = new Window();
bool commandInvoked = false;
var pinCode = new PinCode()
{
Count = 4,
CompleteCommand = new RelayCommand(() => commandInvoked = true),
};
window.Content = pinCode;
window.Show();
@@ -65,16 +74,19 @@ public class PasteTest
window.KeyPressQwerty(PhysicalKey.V, RawInputModifiers.Control);
await Task.Delay(1);
Assert.Equal("abcd", string.Join("", pinCode.Digits));
Assert.True(commandInvoked);
}
[AvaloniaFact]
public async void Paste_Should_Not_Insert_Text_When_Text_Is_In_Invalid_Mode()
{
var window = new Window();
var commandInvoked = false;
var pinCode = new PinCode()
{
Count = 4,
Mode = PinCodeMode.Digit,
CompleteCommand = new RelayCommand(() => commandInvoked = true),
};
window.Content = pinCode;
window.Show();
@@ -85,5 +97,6 @@ public class PasteTest
window.KeyPressQwerty(PhysicalKey.V, RawInputModifiers.Control);
await Task.Delay(1);
Assert.Equal("", string.Join("", pinCode.Digits));
Assert.False(commandInvoked);
}
}