Used Math.Clamp instead of Math.Max to ensure that visible item indices stay within the valid range.

SyedAbdulAzeemSF4852 · SyedAbdulAzeemSF4852 · commit 9e6da5dddfde · 2025-12-08T16:37:14.000+05:30
diff --git a/src/Controls/src/Core/Handlers/Items/Android/RecyclerViewScrollListener.cs b/src/Controls/src/Core/Handlers/Items/Android/RecyclerViewScrollListener.cs
@@ -116,8 +116,10 @@ protected virtual (int First, int Center, int Last) GetVisibleItemsIndex(Recycle
 				centerItemIndex--;
 			}
 
-			firstVisibleItemIndex = Math.Max(0, firstVisibleItemIndex);
-			lastVisibleItemIndex = Math.Max(0, lastVisibleItemIndex);
+			int maxValidIndex = Math.Max(0, itemsSource.Count - 1);
+			firstVisibleItemIndex = Math.Clamp(firstVisibleItemIndex, 0, maxValidIndex);
+			lastVisibleItemIndex = Math.Clamp(lastVisibleItemIndex, 0, maxValidIndex);
+			centerItemIndex = Math.Clamp(centerItemIndex, 0, maxValidIndex);
 
 			return (firstVisibleItemIndex, centerItemIndex, lastVisibleItemIndex);
 		}
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17664.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17664.cs
@@ -19,6 +19,10 @@ public void VerifyGroupedCollectionViewVisibleItemIndices()
 		App.WaitForElement("Issue17664ScrollBtn");
 		App.Tap("Issue17664ScrollBtn");
 
+#if WINDOWS
+		Thread.Sleep(1000);
+#endif
+
 		var resultItem = App.WaitForElement("Issue17664DescriptionLabel").GetText();
 		Assert.That(resultItem, Is.EqualTo("Category C item #2"));
 	}

Original file line number	Diff line number	Diff line change
`@@ -116,8 +116,10 @@ protected virtual (int First, int Center, int Last) GetVisibleItemsIndex(Recycle`
`116`	`116`	`centerItemIndex--;`
`117`	`117`	`}`
`118`	`118`
`119`		`- firstVisibleItemIndex = Math.Max(0, firstVisibleItemIndex);`
`120`		`- lastVisibleItemIndex = Math.Max(0, lastVisibleItemIndex);`
	`119`	`+ int maxValidIndex = Math.Max(0, itemsSource.Count - 1);`
	`120`	`+ firstVisibleItemIndex = Math.Clamp(firstVisibleItemIndex, 0, maxValidIndex);`
	`121`	`+ lastVisibleItemIndex = Math.Clamp(lastVisibleItemIndex, 0, maxValidIndex);`
	`122`	`+ centerItemIndex = Math.Clamp(centerItemIndex, 0, maxValidIndex);`
`121`	`123`
`122`	`124`	`return (firstVisibleItemIndex, centerItemIndex, lastVisibleItemIndex);`
`123`	`125`	`}`