tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Don't only select leaf nodes from SelectRange. 

Related issues:

https://github.com/microsoft/microsoft-ui-xaml/issues/1969
https://github.com/microsoft/microsoft-ui-xaml/issues/1984
pull/3509/head
Steven Kirk 6 years ago
parent
c7a0188014
commit
96fbd6c531
2 changed files with 60 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/Avalonia.Controls/SelectionModel.cs
  2. 81
      tests/Avalonia.Controls.UnitTests/SelectionModelTests.cs

6
src/Avalonia.Controls/SelectionModel.cs
View File

@ -759,11 +759,7 @@ namespace Avalonia.Controls
winrtEnd, winrtEnd,
info => info =>
{ {
if (info.Node.DataCount == 0) info.ParentNode!.Select(info.Path.GetAt(info.Path.GetSize() - 1), select);
{
// Select only leaf nodes
info.ParentNode!.Select(info.Path.GetAt(info.Path.GetSize() - 1), select);
}
}); });
} }

81
tests/Avalonia.Controls.UnitTests/SelectionModelTests.cs
View File

@ -305,16 +305,19 @@ namespace Avalonia.Controls.UnitTests
ValidateSelection(selectionModel, ValidateSelection(selectionModel,
new List<IndexPath>() new List<IndexPath>()
{ {
Path(1, 0),
Path(1, 1),
Path(1, 0, 1),
Path(1, 0, 1, 0), Path(1, 0, 1, 0),
Path(1, 0, 1, 1), Path(1, 0, 1, 1),
Path(1, 0, 1, 2), Path(1, 0, 1, 2),
Path(1, 0, 1, 3), Path(1, 0, 1, 3),
Path(1, 0, 1), Path(1, 1, 0),
Path(1, 1, 1),
Path(1, 1, 0, 0), Path(1, 1, 0, 0),
Path(1, 1, 0, 1), Path(1, 1, 0, 1),
Path(1, 1, 0, 2), Path(1, 1, 0, 2),
Path(1, 1, 0, 3), Path(1, 1, 0, 3),
Path(1, 1, 0),
Path(1, 1, 1, 0), Path(1, 1, 1, 0),
}, },
new List<IndexPath>() new List<IndexPath>()
@ -324,8 +327,7 @@ namespace Avalonia.Controls.UnitTests
Path(1, 0), Path(1, 0),
Path(1, 1), Path(1, 1),
Path(1, 1, 1), Path(1, 1, 1),
}, });
2 /* selectedInnerNodes */);
ClearSelection(selectionModel); ClearSelection(selectionModel);
ValidateSelection(selectionModel, new List<IndexPath>() { }); ValidateSelection(selectionModel, new List<IndexPath>() { });
@ -337,16 +339,20 @@ namespace Avalonia.Controls.UnitTests
ValidateSelection(selectionModel, ValidateSelection(selectionModel,
new List<IndexPath>() new List<IndexPath>()
{ {
Path(0, 0, 0, 2), Path(0, 0),
Path(0, 0, 0, 3), Path(0, 1),
Path(0, 0, 1, 0), Path(0, 0, 0),
Path(0, 0, 1, 1), Path(0, 0, 1),
Path(0, 0, 1, 2), Path(0, 0, 0, 2),
Path(0, 0, 1, 3), Path(0, 0, 0, 3),
Path(0, 0, 1), Path(0, 0, 1, 0),
Path(0, 1, 0, 0), Path(0, 0, 1, 1),
Path(0, 1, 0, 1), Path(0, 0, 1, 2),
Path(0, 1, 0, 2), Path(0, 0, 1, 3),
Path(0, 1, 0),
Path(0, 1, 0, 0),
Path(0, 1, 0, 1),
Path(0, 1, 0, 2),
}, },
new List<IndexPath>() new List<IndexPath>()
{ {
@ -356,8 +362,7 @@ namespace Avalonia.Controls.UnitTests
Path(0, 0, 0), Path(0, 0, 0),
Path(0, 1), Path(0, 1),
Path(0, 1, 0), Path(0, 1, 0),
}, });
1 /* selectedInnerNodes */);
startPath = Path(0, 1, 0, 2); startPath = Path(0, 1, 0, 2);
SetAnchorIndex(selectionModel, startPath); SetAnchorIndex(selectionModel, startPath);
@ -853,10 +858,11 @@ namespace Avalonia.Controls.UnitTests
ValidateSelection(selectionModel, ValidateSelection(selectionModel,
new List<IndexPath>() new List<IndexPath>()
{ {
Path(0),
Path(1),
Path(0, 0), Path(0, 0),
Path(0, 1), Path(0, 1),
Path(0, 2), Path(0, 2),
Path(0),
Path(1, 0), Path(1, 0),
Path(1, 1) Path(1, 1)
}, },
@ -864,8 +870,7 @@ namespace Avalonia.Controls.UnitTests
{ {
Path(), Path(),
Path(1) Path(1)
}, });
1 /* selectedInnerNodes */);
} }
[Fact] [Fact]
@ -1271,7 +1276,7 @@ namespace Avalonia.Controls.UnitTests
target.SelectionChanged += (s, e) => target.SelectionChanged += (s, e) =>
{ {
Assert.Empty(e.DeselectedIndices); Assert.Empty(e.DeselectedIndices);
Assert.Equal(new object[] { 0, 1, 2 }, e.DeselectedItems); Assert.Equal(new object[] { new AvaloniaList<int> { 0, 1, 2 }, 0, 1, 2 }, e.DeselectedItems);
Assert.Empty(e.SelectedIndices); Assert.Empty(e.SelectedIndices);
Assert.Empty(e.SelectedItems); Assert.Empty(e.SelectedItems);
++raised; ++raised;
@ -1371,6 +1376,38 @@ namespace Avalonia.Controls.UnitTests
Assert.Equal(0, GetSubscriberCount(toRemove)); Assert.Equal(0, GetSubscriberCount(toRemove));
} }
[Fact]
public void SelectRange_Behaves_The_Same_As_Multiple_Selects()
{
var data = new[] { 1, 2, 3 };
var target = new SelectionModel { Source = data };
target.Select(1);
Assert.Equal(new[] { IndexPath.CreateFrom(1) }, target.SelectedIndices);
target.ClearSelection();
target.SelectRange(new IndexPath(1), new IndexPath(1));
Assert.Equal(new[] { IndexPath.CreateFrom(1) }, target.SelectedIndices);
}
[Fact]
public void SelectRange_Behaves_The_Same_As_Multiple_Selects_Nested()
{
var data = CreateNestedData(3, 2, 2);
var target = new SelectionModel { Source = data };
target.Select(1);
Assert.Equal(new[] { IndexPath.CreateFrom(1) }, target.SelectedIndices);
target.ClearSelection();
target.SelectRange(new IndexPath(1), new IndexPath(1));
Assert.Equal(new[] { IndexPath.CreateFrom(1) }, target.SelectedIndices);
}
[Fact] [Fact]
public void Should_Not_Treat_Strings_As_Nested_Selections() public void Should_Not_Treat_Strings_As_Nested_Selections()
{ {
@ -2005,7 +2042,7 @@ namespace Avalonia.Controls.UnitTests
foreach (var index in allIndices) foreach (var index in allIndices)
{ {
bool? isSelected = selectionModel.IsSelectedAt(index); bool? isSelected = selectionModel.IsSelectedAt(index);
if (Contains(expectedSelected, index)) if (Contains(expectedSelected, index) && !Contains(expectedPartialSelected, index))
{ {
Assert.True(isSelected.Value, index + " is Selected"); Assert.True(isSelected.Value, index + " is Selected");
} }
@ -2037,7 +2074,7 @@ namespace Avalonia.Controls.UnitTests
if (expectedSelected.Count > 0) if (expectedSelected.Count > 0)
{ {
_output.WriteLine("SelectedIndex is " + selectionModel.SelectedIndex); _output.WriteLine("SelectedIndex is " + selectionModel.SelectedIndex);
Assert.Equal(0, selectionModel.SelectedIndex.CompareTo(expectedSelected[0])); Assert.Equal(expectedSelected[0], selectionModel.SelectedIndex);
if (selectionModel.Source != null) if (selectionModel.Source != null)
{ {
Assert.Equal(selectionModel.SelectedItem, GetData(selectionModel, expectedSelected[0])); Assert.Equal(selectionModel.SelectedItem, GetData(selectionModel, expectedSelected[0]));

Write Preview
Loading…
Cancel
Save