diff --git a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewDelegator.cs b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewDelegator.cs index ee59bbeb8105..0c492a691d99 100644 --- a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewDelegator.cs +++ b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewDelegator.cs @@ -29,12 +29,9 @@ public override void Scrolled(UIScrollView scrollView) { var (visibleItems, firstVisibleItemIndex, centerItemIndex, lastVisibleItemIndex) = GetVisibleItemsIndex(); - if (!visibleItems) - return; - var contentInset = scrollView.ContentInset; - var contentOffsetX = scrollView.ContentOffset.X + contentInset.Left; - var contentOffsetY = scrollView.ContentOffset.Y + contentInset.Top; + var contentOffsetX = !visibleItems ? 0 : scrollView.ContentOffset.X + contentInset.Left; + var contentOffsetY = !visibleItems ? 0 : scrollView.ContentOffset.Y + contentInset.Top; var itemsViewScrolledEventArgs = new ItemsViewScrolledEventArgs { diff --git a/src/Controls/src/Core/Handlers/Items2/iOS/ItemsViewDelegator2.cs b/src/Controls/src/Core/Handlers/Items2/iOS/ItemsViewDelegator2.cs index 06a31fb5ec1e..65316f388d7f 100644 --- a/src/Controls/src/Core/Handlers/Items2/iOS/ItemsViewDelegator2.cs +++ b/src/Controls/src/Core/Handlers/Items2/iOS/ItemsViewDelegator2.cs @@ -29,12 +29,9 @@ public override void Scrolled(UIScrollView scrollView) { var (visibleItems, firstVisibleItemIndex, centerItemIndex, lastVisibleItemIndex) = GetVisibleItemsIndex(); - if (!visibleItems) - return; - var contentInset = scrollView.ContentInset; - var contentOffsetX = scrollView.ContentOffset.X + contentInset.Left; - var contentOffsetY = scrollView.ContentOffset.Y + contentInset.Top; + var contentOffsetX = !visibleItems ? 0 : scrollView.ContentOffset.X + contentInset.Left; + var contentOffsetY = !visibleItems ? 0 : scrollView.ContentOffset.Y + contentInset.Top; var itemsViewScrolledEventArgs = new ItemsViewScrolledEventArgs { diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue21708.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue21708.xaml new file mode 100644 index 000000000000..aa8df9695582 --- /dev/null +++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue21708.xaml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + +