fix(scrollviewer): fix scrollArgs.IsIntermediate on WASm

unoplatform · Nov 21, 2024 · 84c85fe · 84c85fe
1 parent 23feb21
commit 84c85fe
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/ScrollContentPresenter/ScrollContentPresenter.wasm.cs b/src/Uno.UI/UI/Xaml/Controls/ScrollContentPresenter/ScrollContentPresenter.wasm.cs
@@ -262,9 +262,16 @@ internal bool Set(
 			}
 
 			_pendingScrollTo = (horizontalOffset, verticalOffset);
-			_lastScrollToRequest = (horizontalOffset, verticalOffset);
 
-			WindowManagerInterop.ScrollTo(HtmlId, horizontalOffset, verticalOffset, disableAnimation);
+			try
+			{
+				_lastScrollToRequest = (horizontalOffset, verticalOffset);
+				WindowManagerInterop.ScrollTo(HtmlId, horizontalOffset, verticalOffset, disableAnimation);
+			}
+			finally
+			{
+				_lastScrollToRequest = (null, null);
+			}
 
 			if (_pendingScrollTo.HasValue)
 			{
@@ -356,10 +363,6 @@ private bool OnScroll(object sender, RoutedEventArgs routedEventArgs)
 			var isIntermediate =
 				(_lastScrollToRequest.horizontal.HasValue && _lastScrollToRequest.horizontal.Value != horizontalOffset) ||
 				(_lastScrollToRequest.vertical.HasValue && _lastScrollToRequest.vertical.Value != verticalOffset);
-			if (!isIntermediate)
-			{
-				_lastScrollToRequest = (null, null);
-			}
 
 			if (IsArrangeDirty
 				&& _pendingScrollTo is { } pending