From 58b404a3ab25a8a7e6df0300f6356ce7f9e01dc6 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 13 Dec 2022 18:25:37 +0100
Subject: [PATCH 1/2] Added failing test for #7974.

---
 .../Selection/SelectionModelTests_Single.cs   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Single.cs b/tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Single.cs
index 668af3b5d7..1b629be695 100644
--- a/tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Single.cs
+++ b/tests/Avalonia.Controls.UnitTests/Selection/SelectionModelTests_Single.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Specialized;
+using System.Linq;
 using Avalonia.Collections;
 using Avalonia.Controls.Selection;
 using Avalonia.Controls.Utils;
@@ -1144,6 +1145,24 @@ namespace Avalonia.Controls.UnitTests.Selection
                 Assert.Equal(new[] { "foo" }, target.SelectedItems);
                 Assert.Equal(0, target.AnchorIndex);
             }
+
+            [Fact]
+            public void SelectedItems_Indexer_Is_Correct()
+            {
+                // Issue #7974
+                var target = CreateTarget();
+                var raised = 0;
+
+                target.SelectionChanged += (s, e) =>
+                {
+                    Assert.Equal("bar", e.SelectedItems.First());
+                    Assert.Equal("bar", e.SelectedItems[0]);
+                    ++raised;
+                };
+
+                target.Select(1);
+                Assert.Equal(1, raised);
+            }
         }
 
         public class BatchUpdate

From 467303099cc5ebcb8e091c508d888d8c66e690c8 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 13 Dec 2022 18:32:52 +0100
Subject: [PATCH 2/2] Fix SelectedItems indexer.

The index is an index into `Ranges`, not `Items`.

Fixes #7974.
---
 src/Avalonia.Controls/Selection/SelectedItems.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Selection/SelectedItems.cs b/src/Avalonia.Controls/Selection/SelectedItems.cs
index 4fbcfde438..ef642b7bdc 100644
--- a/src/Avalonia.Controls/Selection/SelectedItems.cs
+++ b/src/Avalonia.Controls/Selection/SelectedItems.cs
@@ -35,9 +35,9 @@ namespace Avalonia.Controls.Selection
                 {
                     return _owner.SelectedItem;
                 }
-                else if (Items is object)
+                else if (Items is not null && Ranges is not null)
                 {
-                    return Items[index];
+                    return Items[IndexRange.GetAt(Ranges, index)];
                 }
                 else
                 {