Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,6 @@ public void ScrollToY()
// ScrollToYTwice (src\Compatibility\ControlGallery\src\UITests.Shared\Tests\ScrollViewUITests.cs)
[Test]
[Description("ScrollTo Y = 100")]
[FailsOnIOSWhenRunningOnXamarinUITest("This test is failing, likely due to product issue, More Information: https://github.com/dotnet/maui/issues/27250")]
[FailsOnMacWhenRunningOnXamarinUITest("This test is failing, likely due to product issue, More Information: https://github.com/dotnet/maui/issues/27250")]
[FailsOnWindowsWhenRunningOnXamarinUITest("This test is failing, likely due to product issue, More Information: https://github.com/dotnet/maui/issues/27250")]
public void ScrollToYTwice()
{
App.WaitForElement("WaitForStubControl");
Expand Down
4 changes: 4 additions & 0 deletions src/Core/src/Handlers/ScrollView/ScrollViewHandler.Windows.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ public static void MapRequestScrollTo(IScrollViewHandler handler, IScrollView sc
if (args is ScrollToRequest request)
{
handler.PlatformView.ChangeView(request.HorizontalOffset, request.VerticalOffset, null, request.Instant);
if(request.VerticalOffset == handler.PlatformView.VerticalOffset && request.HorizontalOffset == handler.PlatformView.HorizontalOffset)
{
handler.VirtualView.ScrollFinished();
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public static void MapRequestScrollTo(IScrollViewHandler handler, IScrollView sc
var minScrollVertical = Math.Clamp(request.VerticalOffset, 0, availableScrollHeight);
uiScrollView.SetContentOffset(new CGPoint(minScrollHorizontal, minScrollVertical), !request.Instant);

if (request.Instant)
if (request.Instant || (uiScrollView.ContentOffset.Y == minScrollVertical && uiScrollView.ContentOffset.X == minScrollHorizontal))
{
scrollView.ScrollFinished();
}
Expand Down
Loading