SelectableFilterCollection SelectRow() fails on sorted/filtered collection

[desmetdirk]

Expected Behavior

Calling SelectRow(rownr) should select the correct row in the GridView on filtered or sorted views

Actual Behavior

The wrong row gets selected.

Steps to Reproduce the Problem

1. see C# code below

Code that Demonstrates the Problem

var grid = new GridView<MyClass>();
.....
var collection = new SelectableFilterCollection<MyClass>(grid, somelist) {};
grid.DataStore = collection;
collection.Sort = coll.Sort = (e1, e2) => e1.Name.CompareTo(e2.Name);
....
coll.SelectRow(5);

Proposed fix

The problem seems to be in the Rebuild method, that gets viewToModel wrong. Can be fixed by adding 1 line, see below

        protected override void Rebuild()
        {
            base.Rebuild();
            if (base.HasFilterOrSort)
            {
                viewToModel = new Dictionary<T, int>(base.Count);
                for (int i = 0; i < base.Count; i++)
                {
                    viewToModel.Add(this[i], i);
                }

                modelToView = new Dictionary<int, int>(base.Count);
                for (int j = 0; j < base.Items.Count; j++)
                {
                    if (viewToModel.TryGetValue(base.Items[j], out var value))
                    {
                        modelToView.Add(j, value);
                        // -------->  my proposed fix for  viewToModel
                        viewToModel[base.Items[j]] = j;
                    }
                }
            }
            else
            {
                viewToModel = null;
                modelToView = null;
            }
        }

Specifications

• Version: 2.8.3
• Platform(s): WPF
• Operating System(s): Windows 10,