@ -20,6 +20,7 @@ namespace Avalonia.Controls
private bool _ singleSelect ; private bool _ singleSelect ;
private bool _ autoSelect ; private bool _ autoSelect ;
private int _ operationCount ; private int _ operationCount ;
private IndexPath _ oldAnchorIndex ;
private IReadOnlyList < IndexPath > ? _ selectedIndicesCached ; private IReadOnlyList < IndexPath > ? _ selectedIndicesCached ;
private IReadOnlyList < object? > ? _ selectedItemsCached ; private IReadOnlyList < object? > ? _ selectedItemsCached ;
private SelectionModelChildrenRequestedEventArgs ? _ childrenRequestedEventArgs ; private SelectionModelChildrenRequestedEventArgs ? _ childrenRequestedEventArgs ;
@ -45,17 +46,25 @@ namespace Avalonia.Controls
if ( _ rootNode . Source ! = null ) if ( _ rootNode . Source ! = null )
{ {
if ( _ rootNode . Source ! = null ) // Temporarily prevent auto-select when switching source.
var restoreAutoSelect = _ autoSelect ;
_ autoSelect = false ;
try
{ {
using ( var operation = new Operation ( this ) ) using ( var operation = new Operation ( this ) )
{ {
ClearSelection ( resetAnchor : true ) ; ClearSelection ( resetAnchor : true ) ;
} }
} }
finally
{
_ autoSelect = restoreAutoSelect ;
}
} }
_ rootNode . Source = value ; _ rootNode . Source = value ;
ApplyAutoSelect ( ) ; ApplyAutoSelect ( true ) ;
RaisePropertyChanged ( "Source" ) ; RaisePropertyChanged ( "Source" ) ;
@ -113,7 +122,7 @@ namespace Avalonia.Controls
if ( _ autoSelect ! = value ) if ( _ autoSelect ! = value )
{ {
_ autoSelect = value ; _ autoSelect = value ;
ApplyAutoSelect ( ) ; ApplyAutoSelect ( true ) ;
} }
} }
} }
@ -132,7 +141,7 @@ namespace Avalonia.Controls
while ( current ? . AnchorIndex > = 0 ) while ( current ? . AnchorIndex > = 0 )
{ {
path . Add ( current . AnchorIndex ) ; path . Add ( current . AnchorIndex ) ;
current = current . GetAt ( current . AnchorIndex , false ) ; current = current . GetAt ( current . AnchorIndex , false , default ) ;
} }
anchor = new IndexPath ( path ) ; anchor = new IndexPath ( path ) ;
@ -142,6 +151,8 @@ namespace Avalonia.Controls
} }
set set
{ {
var oldValue = AnchorIndex ;
if ( value ! = null ) if ( value ! = null )
{ {
SelectionTreeHelper . TraverseIndexPath ( SelectionTreeHelper . TraverseIndexPath (
@ -155,7 +166,10 @@ namespace Avalonia.Controls
_ rootNode . AnchorIndex = - 1 ; _ rootNode . AnchorIndex = - 1 ;
} }
RaisePropertyChanged ( "AnchorIndex" ) ; if ( _ operationCount = = 0 & & oldValue ! = AnchorIndex )
{
RaisePropertyChanged ( "AnchorIndex" ) ;
}
} }
} }
@ -182,7 +196,6 @@ namespace Avalonia.Controls
using var operation = new Operation ( this ) ; using var operation = new Operation ( this ) ;
ClearSelection ( resetAnchor : true ) ; ClearSelection ( resetAnchor : true ) ;
SelectWithPathImpl ( value , select : true ) ; SelectWithPathImpl ( value , select : true ) ;
ApplyAutoSelect ( ) ;
} }
} }
} }
@ -378,21 +391,18 @@ namespace Avalonia.Controls
{ {
using var operation = new Operation ( this ) ; using var operation = new Operation ( this ) ;
SelectImpl ( index , select : false ) ; SelectImpl ( index , select : false ) ;
ApplyAutoSelect ( ) ;
} }
public void Deselect ( int groupIndex , int itemIndex ) public void Deselect ( int groupIndex , int itemIndex )
{ {
using var operation = new Operation ( this ) ; using var operation = new Operation ( this ) ;
SelectWithGroupImpl ( groupIndex , itemIndex , select : false ) ; SelectWithGroupImpl ( groupIndex , itemIndex , select : false ) ;
ApplyAutoSelect ( ) ;
} }
public void DeselectAt ( IndexPath index ) public void DeselectAt ( IndexPath index )
{ {
using var operation = new Operation ( this ) ; using var operation = new Operation ( this ) ;
SelectWithPathImpl ( index , select : false ) ; SelectWithPathImpl ( index , select : false ) ;
ApplyAutoSelect ( ) ;
} }
public bool IsSelected ( int index ) = > _ rootNode . IsSelected ( index ) ; public bool IsSelected ( int index ) = > _ rootNode . IsSelected ( index ) ;
@ -410,7 +420,7 @@ namespace Avalonia.Controls
for ( int i = 0 ; i < path . GetSize ( ) - 1 ; i + + ) for ( int i = 0 ; i < path . GetSize ( ) - 1 ; i + + )
{ {
var childIndex = path . GetAt ( i ) ; var childIndex = path . GetAt ( i ) ;
node = node . GetAt ( childIndex , realizeChild : false ) ; node = node . GetAt ( childIndex , false , default ) ;
if ( node = = null ) if ( node = = null )
{ {
@ -445,7 +455,7 @@ namespace Avalonia.Controls
} }
var isSelected = ( bool? ) false ; var isSelected = ( bool? ) false ;
var childNode = _ rootNode . GetAt ( groupIndex , realizeChild : false ) ; var childNode = _ rootNode . GetAt ( groupIndex , false , default ) ;
if ( childNode ! = null ) if ( childNode ! = null )
{ {
@ -464,7 +474,7 @@ namespace Avalonia.Controls
for ( int i = 0 ; i < path . GetSize ( ) - 1 ; i + + ) for ( int i = 0 ; i < path . GetSize ( ) - 1 ; i + + )
{ {
var childIndex = path . GetAt ( i ) ; var childIndex = path . GetAt ( i ) ;
node = node . GetAt ( childIndex , realizeChild : false ) ; node = node . GetAt ( childIndex , false , default ) ;
if ( node = = null ) if ( node = = null )
{ {
@ -559,7 +569,6 @@ namespace Avalonia.Controls
{ {
using var operation = new Operation ( this ) ; using var operation = new Operation ( this ) ;
ClearSelection ( resetAnchor : true ) ; ClearSelection ( resetAnchor : true ) ;
ApplyAutoSelect ( ) ;
} }
public IDisposable Update ( ) = > new Operation ( this ) ; public IDisposable Update ( ) = > new Operation ( this ) ;
@ -586,10 +595,13 @@ namespace Avalonia.Controls
} }
OnSelectionChanged ( e ) ; OnSelectionChanged ( e ) ;
ApplyAutoSelect ( ) ; ApplyAutoSelect ( true ) ;
} }
internal IObservable < object? > ? ResolvePath ( object data , IndexPath dataIndexPath ) internal IObservable < object? > ? ResolvePath (
object data ,
IndexPath dataIndexPath ,
IndexPath finalIndexPath )
{ {
IObservable < object? > ? resolved = null ; IObservable < object? > ? resolved = null ;
@ -598,18 +610,22 @@ namespace Avalonia.Controls
{ {
if ( _ childrenRequestedEventArgs = = null ) if ( _ childrenRequestedEventArgs = = null )
{ {
_ childrenRequestedEventArgs = new SelectionModelChildrenRequestedEventArgs ( data , dataIndexPath , false ) ; _ childrenRequestedEventArgs = new SelectionModelChildrenRequestedEventArgs (
data ,
dataIndexPath ,
finalIndexPath ,
false ) ;
} }
else else
{ {
_ childrenRequestedEventArgs . Initialize ( data , dataIndexPath , false ) ; _ childrenRequestedEventArgs . Initialize ( data , dataIndexPath , finalIndexPath , false ) ;
} }
ChildrenRequested ( this , _ childrenRequestedEventArgs ) ; ChildrenRequested ( this , _ childrenRequestedEventArgs ) ;
resolved = _ childrenRequestedEventArgs . Children ; resolved = _ childrenRequestedEventArgs . Children ;
// Clear out the values in the args so that it cannot be used after the event handler call.
// Clear out the values in the args so that it cannot be used after the event handler call.
_ childrenRequestedEventArgs . Initialize ( null , default , true ) ; _ childrenRequestedEventArgs . Initialize ( null , default , default , true ) ;
} }
return resolved ; return resolved ;
@ -626,6 +642,8 @@ namespace Avalonia.Controls
{ {
AnchorIndex = default ; AnchorIndex = default ;
} }
OnSelectionChanged ( ) ;
} }
private void OnSelectionChanged ( SelectionModelSelectionChangedEventArgs ? e = null ) private void OnSelectionChanged ( SelectionModelSelectionChangedEventArgs ? e = null )
@ -633,19 +651,18 @@ namespace Avalonia.Controls
_ selectedIndicesCached = null ; _ selectedIndicesCached = null ;
_ selectedItemsCached = null ; _ selectedItemsCached = null ;
// Raise SelectionChanged event
if ( e ! = null ) if ( e ! = null )
{ {
SelectionChanged ? . Invoke ( this , e ) ; SelectionChanged ? . Invoke ( this , e ) ;
}
RaisePropertyChanged ( nameof ( SelectedIndex ) ) ; RaisePropertyChanged ( nameof ( SelectedIndex ) ) ;
RaisePropertyChanged ( nameof ( SelectedIndices ) ) ; RaisePropertyChanged ( nameof ( SelectedIndices ) ) ;
if ( _ rootNode . Source ! = null ) if ( _ rootNode . Source ! = null )
{ {
RaisePropertyChanged ( nameof ( SelectedItem ) ) ; RaisePropertyChanged ( nameof ( SelectedItem ) ) ;
RaisePropertyChanged ( nameof ( SelectedItems ) ) ; RaisePropertyChanged ( nameof ( SelectedItems ) ) ;
}
} }
} }
@ -662,6 +679,8 @@ namespace Avalonia.Controls
{ {
AnchorIndex = new IndexPath ( index ) ; AnchorIndex = new IndexPath ( index ) ;
} }
OnSelectionChanged ( ) ;
} }
private void SelectWithGroupImpl ( int groupIndex , int itemIndex , bool select ) private void SelectWithGroupImpl ( int groupIndex , int itemIndex , bool select )
@ -671,13 +690,15 @@ namespace Avalonia.Controls
ClearSelection ( resetAnchor : true ) ; ClearSelection ( resetAnchor : true ) ;
} }
var childNode = _ rootNode . GetAt ( groupIndex , realizeChild : true ) ; var childNode = _ rootNode . GetAt ( groupIndex , true , new IndexPath ( groupIndex , itemIndex ) ) ;
var selected = childNode ! . Select ( itemIndex , select ) ; var selected = childNode ! . Select ( itemIndex , select ) ;
if ( selected ) if ( selected )
{ {
AnchorIndex = new IndexPath ( groupIndex , itemIndex ) ; AnchorIndex = new IndexPath ( groupIndex , itemIndex ) ;
} }
OnSelectionChanged ( ) ;
} }
private void SelectWithPathImpl ( IndexPath index , bool select ) private void SelectWithPathImpl ( IndexPath index , bool select )
@ -706,6 +727,8 @@ namespace Avalonia.Controls
{ {
AnchorIndex = index ; AnchorIndex = index ;
} }
OnSelectionChanged ( ) ;
} }
private void SelectRangeFromAnchorImpl ( int index , bool select ) private void SelectRangeFromAnchorImpl ( int index , bool select )
@ -719,6 +742,7 @@ namespace Avalonia.Controls
} }
_ rootNode . SelectRange ( new IndexRange ( anchorIndex , index ) , select ) ; _ rootNode . SelectRange ( new IndexRange ( anchorIndex , index ) , select ) ;
OnSelectionChanged ( ) ;
} }
private void SelectRangeFromAnchorWithGroupImpl ( int endGroupIndex , int endItemIndex , bool select ) private void SelectRangeFromAnchorWithGroupImpl ( int endGroupIndex , int endItemIndex , bool select )
@ -747,11 +771,13 @@ namespace Avalonia.Controls
for ( int groupIdx = startGroupIndex ; groupIdx < = endGroupIndex ; groupIdx + + ) for ( int groupIdx = startGroupIndex ; groupIdx < = endGroupIndex ; groupIdx + + )
{ {
var groupNode = _ rootNode . GetAt ( groupIdx , realizeChild : true ) ! ; var groupNode = _ rootNode . GetAt ( groupIdx , true , new IndexPath ( endGroupIndex , endItemIndex ) ) ! ;
int startIndex = groupIdx = = startGroupIndex ? startItemIndex : 0 ; int startIndex = groupIdx = = startGroupIndex ? startItemIndex : 0 ;
int endIndex = groupIdx = = endGroupIndex ? endItemIndex : groupNode . DataCount - 1 ; int endIndex = groupIdx = = endGroupIndex ? endItemIndex : groupNode . DataCount - 1 ;
groupNode . SelectRange ( new IndexRange ( startIndex , endIndex ) , select ) ; groupNode . SelectRange ( new IndexRange ( startIndex , endIndex ) , select ) ;
} }
OnSelectionChanged ( ) ;
} }
private void SelectRangeImpl ( IndexPath start , IndexPath end , bool select ) private void SelectRangeImpl ( IndexPath start , IndexPath end , bool select )
@ -774,14 +800,20 @@ namespace Avalonia.Controls
winrtEnd , winrtEnd ,
info = > info = >
{ {
info . ParentNode ! . Select ( info . Path . GetAt ( info . Path . GetSize ( ) - 1 ) , select ) ; if ( info . Path > = winrtStart & & info . Path < = winrtEnd )
{
info . ParentNode ! . Select ( info . Path . GetAt ( info . Path . GetSize ( ) - 1 ) , select ) ;
}
} ) ; } ) ;
OnSelectionChanged ( ) ;
} }
private void BeginOperation ( ) private void BeginOperation ( )
{ {
if ( _ operationCount + + = = 0 ) if ( _ operationCount + + = = 0 )
{ {
_ oldAnchorIndex = AnchorIndex ;
_ rootNode . BeginOperation ( ) ; _ rootNode . BeginOperation ( ) ;
} }
} }
@ -797,6 +829,8 @@ namespace Avalonia.Controls
if ( - - _ operationCount = = 0 ) if ( - - _ operationCount = = 0 )
{ {
ApplyAutoSelect ( false ) ;
var changes = new List < SelectionNodeOperation > ( ) ; var changes = new List < SelectionNodeOperation > ( ) ;
_ rootNode . EndOperation ( changes ) ; _ rootNode . EndOperation ( changes ) ;
@ -805,13 +839,20 @@ namespace Avalonia.Controls
var changeSet = new SelectionModelChangeSet ( changes ) ; var changeSet = new SelectionModelChangeSet ( changes ) ;
e = changeSet . CreateEventArgs ( ) ; e = changeSet . CreateEventArgs ( ) ;
} }
}
OnSelectionChanged ( e ) ; OnSelectionChanged ( e ) ;
_ rootNode . Cleanup ( ) ;
if ( _ oldAnchorIndex ! = AnchorIndex )
{
RaisePropertyChanged ( nameof ( AnchorIndex ) ) ;
}
_ rootNode . Cleanup ( ) ;
_ oldAnchorIndex = default ;
}
} }
private void ApplyAutoSelect ( ) private void ApplyAutoSelect ( bool createOperation )
{ {
if ( AutoSelect ) if ( AutoSelect )
{ {
@ -819,8 +860,15 @@ namespace Avalonia.Controls
if ( SelectedIndex = = default & & _ rootNode . ItemsSourceView ? . Count > 0 ) if ( SelectedIndex = = default & & _ rootNode . ItemsSourceView ? . Count > 0 )
{ {
using var operation = new Operation ( this ) ; if ( createOperation )
SelectImpl ( 0 , true ) ; {
using var operation = new Operation ( this ) ;
SelectImpl ( 0 , true ) ;
}
else
{
SelectImpl ( 0 , true ) ;
}
} }
} }
} }
Steven Kirk
6 years ago
GitHub