From 939c78047ee1a564eed46770d705f7cbada9eb27 Mon Sep 17 00:00:00 2001 From: Rastislav Svoboda Date: Fri, 21 Feb 2025 17:09:11 +0100 Subject: [PATCH] TextBox: clear selection when moving the caret horizontally (#18255) * TextBox: clear selection when moving the caret horizontally * fix and add unit tests --- src/Avalonia.Controls/TextBox.cs | 8 +- .../TextBoxTests.cs | 166 ++++++++++++++++++ 2 files changed, 172 insertions(+), 2 deletions(-) diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs index ad96829b28..3d3dc87b01 100644 --- a/src/Avalonia.Controls/TextBox.cs +++ b/src/Avalonia.Controls/TextBox.cs @@ -1983,9 +1983,13 @@ namespace Avalonia.Controls { if (selectionStart != selectionEnd) { - _presenter.MoveCaretToTextPosition(direction > 0 ? + // clear the selection and move to the appropriate side of previous selection + var newPosition = direction > 0 ? Math.Max(selectionStart, selectionEnd) : - Math.Min(selectionStart, selectionEnd)); + Math.Min(selectionStart, selectionEnd); + SetCurrentValue(SelectionStartProperty, newPosition); + SetCurrentValue(SelectionEndProperty, newPosition); + _presenter.MoveCaretToTextPosition(newPosition); } else { diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs index 5228522ade..66108952ad 100644 --- a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs +++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs @@ -1535,6 +1535,172 @@ namespace Avalonia.Controls.UnitTests } } + [Theory] + [InlineData(2,4)] + [InlineData(0,4)] + [InlineData(2,6)] + [InlineData(0,6)] + public void When_Selection_From_Left_To_Right_Pressing_Right_Should_Remove_Selection_Moving_Caret_To_End_Of_Previous_Selection(int selectionStart, int selectionEnd) + { + using (UnitTestApplication.Start(Services)) + { + var tb = new TextBox + { + Template = CreateTemplate(), + Text = "ABCDEF" + }; + + tb.Measure(Size.Infinity); + tb.CaretIndex = selectionStart; + tb.SelectionStart = selectionStart; + tb.SelectionEnd = selectionEnd; + + RaiseKeyEvent(tb, Key.Right, KeyModifiers.None); + + Assert.Equal(selectionEnd, tb.SelectionStart); + Assert.Equal(selectionEnd, tb.SelectionEnd); + Assert.Equal(selectionEnd, tb.CaretIndex); + } + } + + [Theory] + [InlineData(2,4)] + [InlineData(0,4)] + [InlineData(2,6)] + [InlineData(0,6)] + public void When_Selection_From_Left_To_Right_Pressing_Left_Should_Remove_Selection_Moving_Caret_To_Start_Of_Previous_Selection(int selectionStart, int selectionEnd) + { + using (UnitTestApplication.Start(Services)) + { + var tb = new TextBox + { + Template = CreateTemplate(), + Text = "ABCDEF" + }; + + tb.Measure(Size.Infinity); + tb.CaretIndex = selectionStart; + tb.SelectionStart = selectionStart; + tb.SelectionEnd = selectionEnd; + + RaiseKeyEvent(tb, Key.Left, KeyModifiers.None); + + Assert.Equal(selectionStart, tb.SelectionStart); + Assert.Equal(selectionStart, tb.SelectionEnd); + Assert.Equal(selectionStart, tb.CaretIndex); + } + } + + [Theory] + [InlineData(4,2)] + [InlineData(4,0)] + [InlineData(6,2)] + [InlineData(6,0)] + public void When_Selection_From_Right_To_Left_Pressing_Right_Should_Remove_Selection_Moving_Caret_To_Start_Of_Previous_Selection(int selectionStart, int selectionEnd) + { + using (UnitTestApplication.Start(Services)) + { + var tb = new TextBox + { + Template = CreateTemplate(), + Text = "ABCDEF" + }; + + tb.Measure(Size.Infinity); + tb.CaretIndex = selectionStart; + tb.SelectionStart = selectionStart; + tb.SelectionEnd = selectionEnd; + + RaiseKeyEvent(tb, Key.Right, KeyModifiers.None); + + Assert.Equal(selectionStart, tb.SelectionStart); + Assert.Equal(selectionStart, tb.SelectionEnd); + Assert.Equal(selectionStart, tb.CaretIndex); + } + } + + [Theory] + [InlineData(4,2)] + [InlineData(4,0)] + [InlineData(6,2)] + [InlineData(6,0)] + public void When_Selection_From_Right_To_Left_Pressing_Left_Should_Remove_Selection_Moving_Caret_To_End_Of_Previous_Selection(int selectionStart, int selectionEnd) + { + using (UnitTestApplication.Start(Services)) + { + var tb = new TextBox + { + Template = CreateTemplate(), + Text = "ABCDEF" + }; + + tb.Measure(Size.Infinity); + tb.CaretIndex = selectionStart; + tb.SelectionStart = selectionStart; + tb.SelectionEnd = selectionEnd; + + RaiseKeyEvent(tb, Key.Left, KeyModifiers.None); + + Assert.Equal(selectionEnd, tb.SelectionStart); + Assert.Equal(selectionEnd, tb.SelectionEnd); + Assert.Equal(selectionEnd, tb.CaretIndex); + } + } + + [Theory] + [InlineData(0)] + [InlineData(2)] + [InlineData(4)] + [InlineData(6)] + public void When_Select_All_From_Position_Left_Should_Remove_Selection_Moving_Caret_To_Start(int caretIndex) + { + using (UnitTestApplication.Start(Services)) + { + var tb = new TextBox + { + Template = CreateTemplate(), + Text = "ABCDEF" + }; + + tb.Measure(Size.Infinity); + tb.CaretIndex = caretIndex; + + RaiseKeyEvent(tb, Key.A, KeyModifiers.Control); + RaiseKeyEvent(tb, Key.Left, KeyModifiers.None); + + Assert.Equal(0, tb.SelectionStart); + Assert.Equal(0, tb.SelectionEnd); + Assert.Equal(0, tb.CaretIndex); + } + } + + [Theory] + [InlineData(0)] + [InlineData(2)] + [InlineData(4)] + [InlineData(6)] + public void When_Select_All_From_Position_Right_Should_Remove_Selection_Moving_Caret_To_End(int caretIndex) + { + using (UnitTestApplication.Start(Services)) + { + var tb = new TextBox + { + Template = CreateTemplate(), + Text = "ABCDEF" + }; + + tb.Measure(Size.Infinity); + tb.CaretIndex = caretIndex; + + RaiseKeyEvent(tb, Key.A, KeyModifiers.Control); + RaiseKeyEvent(tb, Key.Right, KeyModifiers.None); + + Assert.Equal(tb.Text.Length, tb.SelectionStart); + Assert.Equal(tb.Text.Length, tb.SelectionEnd); + Assert.Equal(tb.Text.Length, tb.CaretIndex); + } + } + [Fact] public void TextBox_In_AdornerLayer_Will_Not_Cause_Collection_Modified_In_VisualLayerManager_Measure() {