diff --git a/src/SamplesApp/SamplesApp.UITests/Extensions/AppExtensions.cs b/src/SamplesApp/SamplesApp.UITests/Extensions/AppExtensions.cs
index 059ec3350558..e8e499f67238 100644
--- a/src/SamplesApp/SamplesApp.UITests/Extensions/AppExtensions.cs
+++ b/src/SamplesApp/SamplesApp.UITests/Extensions/AppExtensions.cs
@@ -5,6 +5,8 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 using Uno.UITest;
 using Uno.UITest.Helpers;
 using Uno.UITest.Helpers.Queries;
@@ -13,6 +15,14 @@ namespace SamplesApp.UITests.Extensions
 {
 	public static class AppExtensions
 	{
+#if !IS_RUNTIME_UI_TESTS
+		public static async Task<FileInfo> TakeScreenshotAsync(this IApp app, string title)
+			=> app.Screenshot(title);
+
+		public static async ValueTask DragCoordinatesAsync(this IApp app, float fromX, float fromY, float toX, float toY, CancellationToken ct = default)
+			=> app.DragCoordinates(fromX, fromY, toX, toY);
+#endif
+
 		public static void DragCoordinates(this IApp app, PointF from, PointF to) => app.DragCoordinates(from.X, from.Y, to.X, to.Y);
 
 #if !IS_RUNTIME_UI_TESTS
diff --git a/src/SamplesApp/SamplesApp.UITests/SampleControlUITestBase.cs b/src/SamplesApp/SamplesApp.UITests/SampleControlUITestBase.cs
index dbeaa0ff1279..dacf493805d8 100644
--- a/src/SamplesApp/SamplesApp.UITests/SampleControlUITestBase.cs
+++ b/src/SamplesApp/SamplesApp.UITests/SampleControlUITestBase.cs
@@ -281,6 +281,9 @@ private void WriteSystemLogs(string fileName)
 			}
 		}
 
+		public async ValueTask<ScreenshotInfo> TakeScreenshotAsync(string stepName, bool? ignoreInSnapshotCompare = null)
+			=> TakeScreenshot(stepName, ignoreInSnapshotCompare);
+
 		public ScreenshotInfo TakeScreenshot(string stepName, bool? ignoreInSnapshotCompare = null)
 			=> TakeScreenshot(
 				stepName,
@@ -289,6 +292,9 @@ public ScreenshotInfo TakeScreenshot(string stepName, bool? ignoreInSnapshotComp
 					: null
 			);
 
+		public async ValueTask<ScreenshotInfo> TakeScreenshotAsync(string stepName, ScreenshotOptions options)
+			=> TakeScreenshot(stepName, options);
+
 		public ScreenshotInfo TakeScreenshot(string stepName, ScreenshotOptions options)
 		{
 			if (_app == null)
diff --git a/src/SamplesApp/SamplesApp.UITests/SamplesApp.UITests.csproj b/src/SamplesApp/SamplesApp.UITests/SamplesApp.UITests.csproj
index f7c4c2ece07e..3b26d315785f 100644
--- a/src/SamplesApp/SamplesApp.UITests/SamplesApp.UITests.csproj
+++ b/src/SamplesApp/SamplesApp.UITests/SamplesApp.UITests.csproj
@@ -8,7 +8,7 @@
 		<DefineConstants Condition="$(UnoTargetFrameworkOverride.ToLowerInvariant().Contains('-ios'))">$(DefineConstants);TARGET_FRAMEWORK_OVERRIDE_IOS</DefineConstants>
 
 		<!-- Use 'GeneratedRegexAttribute' to generate the regular expression -->
-		<NoWarn>$(NoWarn);SYSLIB1045</NoWarn>
+		<NoWarn>$(NoWarn);SYSLIB1045;CS1998</NoWarn>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/src/SamplesApp/SamplesApp.UITests/TestFramework/ImageAssert.cs b/src/SamplesApp/SamplesApp.UITests/TestFramework/ImageAssert.cs
index 78350753dd12..4f09ccb0ced0 100644
--- a/src/SamplesApp/SamplesApp.UITests/TestFramework/ImageAssert.cs
+++ b/src/SamplesApp/SamplesApp.UITests/TestFramework/ImageAssert.cs
@@ -37,16 +37,27 @@ static ImageAssert()
 		#region Are[Almost]Equal
 		public static void AreEqual(ScreenshotInfo expected, ScreenshotInfo actual, IAppRect rect, double expectedToActualScale = 1, PixelTolerance tolerance = default, [CallerLineNumber] int line = 0)
 			=> AreEqualImpl(expected, rect.ToRectangle(), actual, rect.ToRectangle(), expectedToActualScale, tolerance, line);
+		public static async Task AreEqualAsync(ScreenshotInfo expected, ScreenshotInfo actual, IAppRect rect, double expectedToActualScale = 1, PixelTolerance tolerance = default, [CallerLineNumber] int line = 0)
+			=> AreEqualImpl(expected, rect.ToRectangle(), actual, rect.ToRectangle(), expectedToActualScale, tolerance, line);
 
 		public static void AreEqual(ScreenshotInfo expected, ScreenshotInfo actual, Rectangle? rect = null, double expectedToActualScale = 1, PixelTolerance tolerance = default, [CallerLineNumber] int line = 0)
 			=> AreEqualImpl(expected, rect ?? FirstQuadrant, actual, rect ?? FirstQuadrant, expectedToActualScale, tolerance, line);
 
+		public static async Task AreEqualAsync(ScreenshotInfo expected, ScreenshotInfo actual, Rectangle? rect = null, double expectedToActualScale = 1, PixelTolerance tolerance = default, [CallerLineNumber] int line = 0)
+			=> AreEqualImpl(expected, rect ?? FirstQuadrant, actual, rect ?? FirstQuadrant, expectedToActualScale, tolerance, line);
+
 		public static void AreEqual(ScreenshotInfo expected, IAppRect expectedRect, ScreenshotInfo actual, IAppRect actualRect, double expectedToActualScale = 1, PixelTolerance tolerance = default, [CallerLineNumber] int line = 0)
 			=> AreEqualImpl(expected, expectedRect.ToRectangle(), actual, actualRect.ToRectangle(), expectedToActualScale, tolerance, line);
 
+		public static async Task AreEqualAsync(ScreenshotInfo expected, IAppRect expectedRect, ScreenshotInfo actual, IAppRect actualRect, double expectedToActualScale = 1, PixelTolerance tolerance = default, [CallerLineNumber] int line = 0)
+			=> AreEqualImpl(expected, expectedRect.ToRectangle(), actual, actualRect.ToRectangle(), expectedToActualScale, tolerance, line);
+
 		public static void AreEqual(ScreenshotInfo expected, Rectangle expectedRect, ScreenshotInfo actual, Rectangle actualRect, double expectedToActualScale = 1, PixelTolerance tolerance = default, [CallerLineNumber] int line = 0)
 			=> AreEqualImpl(expected, expectedRect, actual, actualRect, expectedToActualScale, tolerance, line);
 
+		public static async Task AreEqualAsync(ScreenshotInfo expected, Rectangle expectedRect, ScreenshotInfo actual, Rectangle actualRect, double expectedToActualScale = 1, PixelTolerance tolerance = default, [CallerLineNumber] int line = 0)
+			=> AreEqualImpl(expected, expectedRect, actual, actualRect, expectedToActualScale, tolerance, line);
+
 		/// <summary>
 		/// Asserts that two screenshots are equal to each other inside the area of the nominated rect to within the given pixel error
 		/// (ie, the A, R, G, or B values cumulatively differ by more than the permitted error for any pixel).
diff --git a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml/DragAndDropTests/DragDrop_TreeView_Reorder_Automated.cs b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml/DragAndDropTests/DragDrop_TreeView_Reorder_Automated.cs
index 38af39b9120a..a23d23545668 100644
--- a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml/DragAndDropTests/DragDrop_TreeView_Reorder_Automated.cs
+++ b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml/DragAndDropTests/DragDrop_TreeView_Reorder_Automated.cs
@@ -1,14 +1,36 @@
-using NUnit.Framework;
+#if IS_RUNTIME_UI_TESTS
+#define CAN_ASSERT_CONTENT
+#if HAS_RENDER_TARGET_BITMAP
+#define CAN_ASSERT_IMAGE
+#endif
+using Microsoft/* UWP don't rename */.UI.Xaml.Controls;
+using Uno.UI.RuntimeTests.Helpers;
+#else
+#define CAN_ASSERT_IMAGE
+#endif
+
+#if !CAN_ASSERT_CONTENT && !CAN_ASSERT_IMAGE
+#error No way to assert the test result
+#endif
+
+using NUnit.Framework;
 using SamplesApp.UITests.TestFramework;
 using Uno.UITest;
 using Uno.UITest.Helpers;
 using Uno.UITest.Helpers.Queries;
 using System.Linq;
 using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
 using System.Threading.Tasks;
+using Windows.Devices.Input;
+using SamplesApp.UITests.Extensions;
+using Uno.Testing;
 
 namespace SamplesApp.UITests.Windows_UI_Xaml.DragAndDropTests
 {
+	[TestFixture]
 	public partial class DragDrop_TreeView_Reorder_Automated : SampleControlUITestBase
 	{
 		const int _itemHeight = 70;
@@ -16,87 +38,213 @@ public partial class DragDrop_TreeView_Reorder_Automated : SampleControlUITestBa
 		[Test]
 		[AutoRetry]
 		[ActivePlatforms(Platform.Browser)]
-		public void When_Dragging_TreeView_Item()
+		[InjectedPointer(PointerDeviceType.Mouse)]
+#if !IS_RUNTIME_UI_TESTS
+		[Ignore("Flaky")]
+#endif
+		public async Task When_Dragging_TreeView_Item()
 		{
-			Run("UITests.Windows_UI_Xaml.DragAndDrop.DragDrop_TreeView", skipInitialScreenshot: true);
-
-			var tv = _app.Marked("tv");
-			var bt0 = _app.Marked("bt0");
-			var bt1 = _app.Marked("bt1");
-			var bt2 = _app.Marked("bt2");
-			var bt3 = _app.Marked("bt3");
-			var focusbt = _app.Marked("focusbt");
-			var radio_disable = _app.Marked("radio_disable");
-
-			_app.WaitForElement(radio_disable);
-			_app.Tap(radio_disable);
-
-			_app.WaitForElement(tv);
-			_app.Tap(bt1);
-			_app.Tap(focusbt);
-			var case1 = _app.Screenshot("case1");
-
-			_app.Tap(bt2);
-			_app.Tap(focusbt);
-			var case2 = _app.Screenshot("case2");
-
-			_app.Tap(bt3);
-			_app.Tap(focusbt);
-			var case3 = _app.Screenshot("case3");
-
-			_app.Tap(bt0);
-			var tvBounds = _app.Query("tv").Single().Rect;
-			float fromX = tvBounds.X + 100;
-			float fromY = tvBounds.Y + _itemHeight * 3 + _offset;
-			float toX = tvBounds.X + 100;
-			float toY = tvBounds.Y + _offset;
-			_app.DragCoordinates(fromX, fromY, toX, toY);
-			_app.Tap(focusbt);
-			var result = _app.Screenshot("result1");
-			ImageAssert.AreEqual(case1, result);
+			await RunAsync("UITests.Windows_UI_Xaml.DragAndDrop.DragDrop_TreeView", skipInitialScreenshot: true);
+
+			var tv = App.Marked("tv");
+			var bt0 = App.Marked("bt0");
+			var bt1 = App.Marked("bt1");
+			var bt2 = App.Marked("bt2");
+			var bt3 = App.Marked("bt3");
+			var focusbt = App.Marked("focusbt");
+			var radio_disable = App.Marked("radio_disable");
+
+			App.WaitForElement(radio_disable);
+			App.Tap(radio_disable);
+
+			App.WaitForElement(tv);
+
+#if CAN_ASSERT_IMAGE
+			App.Tap(bt1);
+			App.Tap(focusbt);
+			var case1 = await Screenshot("case1");
+
+			App.Tap(bt2);
+			App.Tap(focusbt);
+			var case2 = await Screenshot("ase2");
+
+			App.Tap(bt3);
+			App.Tap(focusbt);
+			var case3 = await Screenshot("case3");
+
+			App.Tap(bt0);
+#endif
+#if CAN_ASSERT_CONTENT
+			App.Tap(bt0);
+			await UITestHelper.WaitForIdle();
+			await UITestHelper.WaitForIdle();
+			await UITestHelper.WaitForIdle();
+
+			var treeView = (TreeView)App.Query(tv).Single().Element;
+			Assert.IsNotNull(treeView);
+			Assert.AreEqual(
+				""""
+				v aaa
+					- bbb
+				- ccc
+				- ddd
+				- eee
+				"""".Trim().Replace("\r\n", "\n"),
+				Dump(treeView));
+#endif
+
+			var tvBounds = App.Query("tv").Single().Rect;
+			var fromX = tvBounds.X + 100;
+			var fromY = tvBounds.Y + _itemHeight * 3 + _offset;
+			var toX = tvBounds.X + 100;
+			var toY = tvBounds.Y + _offset;
+
+			await App.DragCoordinatesAsync(fromX, fromY, toX, toY);
+			App.Tap(focusbt);
+
+#if CAN_ASSERT_IMAGE
+			var result = await Screenshot("result1");
+			await ImageAssert.AreEqualAsync(case1, result);
+#endif
+#if CAN_ASSERT_CONTENT
+			await UITestHelper.WaitForIdle();
+			Assert.AreEqual(
+				""""
+				v aaa
+					- bbb
+					- ddd
+				- ccc
+				- eee
+				"""".Trim().Replace("\r\n", "\n"),
+				Dump(treeView));
+#endif
 
 			fromY = tvBounds.Y + _itemHeight * 1 + _offset;
 			toY = tvBounds.Y + _itemHeight * 4 + _offset;
-			_app.DragCoordinates(fromX, fromY, toX, toY);
-			_app.Tap(focusbt);
-			result = _app.Screenshot("result2");
-			ImageAssert.AreEqual(case2, result);
+			await App.DragCoordinatesAsync(fromX, fromY, toX, toY);
+			App.Tap(focusbt);
+
+#if CAN_ASSERT_IMAGE
+			result = await Screenshot("result2");
+			await ImageAssert.AreEqualAsync(case2, result);
+#endif
+#if CAN_ASSERT_CONTENT
+			await UITestHelper.WaitForIdle();
+			Assert.AreEqual(
+				""""
+				v aaa
+					- ddd
+				- ccc
+				> eee
+				"""".Trim().Replace("\r\n", "\n"),
+				Dump(treeView));
+#endif
 
 			fromY = tvBounds.Y + _itemHeight * 3 + _offset;
 			toY = tvBounds.Y + _itemHeight - 5;
-			_app.DragCoordinates(fromX, fromY, toX, toY);
-			_app.Tap(focusbt);
-			result = _app.Screenshot("result3");
-			ImageAssert.AreEqual(case3, result);
+			await App.DragCoordinatesAsync(fromX, fromY, toX, toY);
+			App.Tap(focusbt);
+
+#if CAN_ASSERT_IMAGE
+			result = await Screenshot("result3");
+			await ImageAssert.AreEqualAsync(case3, result);
+#endif
+#if CAN_ASSERT_CONTENT
+			await UITestHelper.WaitForIdle();
+			Assert.AreEqual(
+				""""
+				v aaa
+					> eee
+					- ddd
+				- ccc
+				"""".Trim().Replace("\r\n", "\n"),
+				Dump(treeView));
+#endif
+
+#if CAN_ASSERT_IMAGE
+#if IS_RUNTIME_UI_TESTS
+			async ValueTask<RawBitmap> Screenshot(string name) => await UITestHelper.ScreenShot((TreeView)App.Query(tv).Single().Element);
+#else
+			async ValueTask<FileInfo> Screenshot(string name) => await App.TakeScreenshotAsync(name);
+#endif
+#endif
 		}
 
 		[Test]
 		[AutoRetry]
 		[ActivePlatforms(Platform.Browser)]
-		public void When_OnDragItemsCompleted()
+		[InjectedPointer(PointerDeviceType.Mouse)]
+		public async Task When_OnDragItemsCompleted()
 		{
-			Run("UITests.Windows_UI_Xaml.DragAndDrop.DragDrop_TreeView", skipInitialScreenshot: true);
-			var tv = _app.Marked("tv");
-			var bt0 = _app.Marked("bt0");
-			var radio_enable = _app.Marked("radio_enable");
-			var tb = _app.Marked("tb");
-
-			_app.WaitForElement(tv);
-
-			_app.WaitForElement(radio_enable);
-			_app.Tap(radio_enable);
-			_app.WaitForElement(bt0);
-			_app.Tap(bt0);
-
-			var tvBounds = _app.Query("tv").Single().Rect;
-			float fromX = tvBounds.X + 100;
-			float fromY = tvBounds.Y + _itemHeight * 3 + _offset;
-			float toX = tvBounds.X + 100;
-			float toY = tvBounds.Y + _offset;
-			_app.DragCoordinates(fromX, fromY, toX, toY);
-
-			string text = _app.GetText("tb").Trim();
+			await RunAsync("UITests.Windows_UI_Xaml.DragAndDrop.DragDrop_TreeView", skipInitialScreenshot: true);
+			var tv = App.Marked("tv");
+			var bt0 = App.Marked("bt0");
+			var radio_enable = App.Marked("radio_enable");
+			var tb = App.Marked("tb");
+
+			App.WaitForElement(tv);
+
+			App.WaitForElement(radio_enable);
+			App.Tap(radio_enable);
+			App.WaitForElement(bt0);
+			App.Tap(bt0);
+
+#if IS_RUNTIME_UI_TESTS
+			await UITestHelper.WaitForIdle();
+			await UITestHelper.WaitForIdle();
+			await UITestHelper.WaitForIdle();
+#endif
+
+			var tvBounds = App.Query("tv").Single().Rect;
+			var fromX = tvBounds.X + 100;
+			var fromY = tvBounds.Y + _itemHeight * 3 + _offset;
+			var toX = tvBounds.X + 100;
+			var toY = tvBounds.Y + _offset;
+			await App.DragCoordinatesAsync(fromX, fromY, toX, toY);
+
+#if IS_RUNTIME_UI_TESTS
+			await UITestHelper.WaitForIdle();
+			await UITestHelper.WaitForIdle();
+			await UITestHelper.WaitForIdle();
+#endif
+
+			string text = App.GetText("tb").Trim();
 			Assert.AreEqual("DragItemsCompleted is triggered", text);
 		}
+
+#if CAN_ASSERT_CONTENT
+		private string Dump(TreeView tv)
+		{
+			var dump = new StringBuilder();
+			DumpCore(0, tv.RootNodes);
+			return dump.ToString().Trim().Replace("\r\n", "\n");
+
+			void DumpCore(int level, IList<TreeViewNode> nodes)
+			{
+				foreach (var node in nodes)
+				{
+					dump.Append(new string('\t', level));
+					switch (node)
+					{
+						case { Children: null or { Count: 0 } }:
+							dump.Append("- ");
+							dump.AppendLine(node.Content?.ToString() ?? "--null--");
+							break;
+
+						case { IsExpanded: false }:
+							dump.Append("> ");
+							dump.AppendLine(node.Content?.ToString() ?? "--null--");
+							break;
+
+						default:
+							dump.Append("v ");
+							dump.AppendLine(node.Content?.ToString() ?? "--null--");
+							DumpCore(level + 1, node.Children);
+							break;
+					}
+				}
+			}
+		}
+#endif
 	}
 }
diff --git a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/ContentDialog/UnoSamples_Tests.ContentDialog.cs b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/ContentDialog/UnoSamples_Tests.ContentDialog.cs
index e39ae29e004a..61a944472cc6 100644
--- a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/ContentDialog/UnoSamples_Tests.ContentDialog.cs
+++ b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/ContentDialog/UnoSamples_Tests.ContentDialog.cs
@@ -409,7 +409,8 @@ public void ContentDialog_Simple_NotLightDismissible()
 			var dialogClosedScreenshot = CurrentTestTakeScreenShot("3 ContentDialog Closed");
 
 			// Test only to the left of the TextBox, which can have a blinking cursor and might fail the screenshot tests
-			var testRect = new Rectangle(0, 0, (int)dialogRectangle.X + 10, dialogOpenedScreenshot.Height);
+			// Note: We also make sure to exclude the opening buttons below the overlay as the focus might have changed
+			var testRect = new Rectangle(dialogRectangle.X, dialogRectangle.Y, 10, dialogRectangle.Height);
 
 			// compare
 			ImageAssert.AreNotEqual(initialScreenshot, dialogOpenedScreenshot);
diff --git a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/FlyoutTests/UnoSamples_Tests.Flyout_OverlayInputPassThroughElement.cs b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/FlyoutTests/UnoSamples_Tests.Flyout_OverlayInputPassThroughElement.cs
index 2b187dffc6a4..d6ed4d47c83c 100644
--- a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/FlyoutTests/UnoSamples_Tests.Flyout_OverlayInputPassThroughElement.cs
+++ b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/FlyoutTests/UnoSamples_Tests.Flyout_OverlayInputPassThroughElement.cs
@@ -11,7 +11,7 @@
 
 namespace SamplesApp.UITests.Windows_UI_Xaml_Controls.FlyoutTests;
 
-#if __SKIA__
+#if IS_RUNTIME_UI_TESTS
 [TestFixture]
 partial class Flyout_Tests : SampleControlUITestBase
 #else
diff --git a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/ListViewTests/Selection_Pointers.cs b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/ListViewTests/Selection_Pointers.cs
index aedc61d2f0f6..b908e6fe44a2 100644
--- a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/ListViewTests/Selection_Pointers.cs
+++ b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/ListViewTests/Selection_Pointers.cs
@@ -19,36 +19,42 @@ public partial class ListViewTests_Tests : SampleControlUITestBase
 	[Test]
 	[AutoRetry]
 	[InjectedPointer(PointerDeviceType.Touch)]
+	[InjectedPointer(PointerDeviceType.Mouse)]
 	public Task When_NoSelection_Then_PointersEvents()
 		=> RunTest("_noSelection_noClick", clicked: false);
 
 	[Test]
 	[AutoRetry]
 	[InjectedPointer(PointerDeviceType.Touch)]
+	[InjectedPointer(PointerDeviceType.Mouse)]
 	public Task When_SingleSelectionWithoutItemClick_Then_PointersEvents()
 		=> RunTest("_singleSelection_noClick", clicked: false);
 
 	[Test]
 	[AutoRetry]
 	[InjectedPointer(PointerDeviceType.Touch)]
+	[InjectedPointer(PointerDeviceType.Mouse)]
 	public Task When_MultipleSelectionWithoutItemClick_Then_PointersEvents()
 		=> RunTest("_multipleSelection_noClick", clicked: false);
 
 	[Test]
 	[AutoRetry]
 	[InjectedPointer(PointerDeviceType.Touch)]
+	[InjectedPointer(PointerDeviceType.Mouse)]
 	public Task When_ExtendedSelectionWithoutItemClick_Then_PointersEvents()
 		=> RunTest("_extendedSelection_noClick", clicked: false);
 
 	[Test]
 	[AutoRetry]
 	[InjectedPointer(PointerDeviceType.Touch)]
+	[InjectedPointer(PointerDeviceType.Mouse)]
 	public Task When_NoSelectionWithItemClick_Then_PointersEvents()
 		=> RunTest("_noSelection_withClick", clicked: true);
 
 	[Test]
 	[AutoRetry]
 	[InjectedPointer(PointerDeviceType.Touch)]
+	[InjectedPointer(PointerDeviceType.Mouse)]
 	public Task When_SingleSelectionWithItemClick_Then_PointersEvents()
 		=> RunTest("_singleSelection_withClick", clicked: true);
 
diff --git a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/SwipeControlTests/SwipeControlTests.cs b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/SwipeControlTests/SwipeControlTests.cs
index cd23b074de81..cb0166daa1f0 100644
--- a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/SwipeControlTests/SwipeControlTests.cs
+++ b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Controls/SwipeControlTests/SwipeControlTests.cs
@@ -11,6 +11,10 @@
 using Uno.Testing;
 using Uno.UITest.Helpers.Queries;
 
+#if IS_RUNTIME_UI_TESTS
+using Uno.UI.RuntimeTests.Helpers;
+#endif
+
 namespace SamplesApp.UITests.Windows_UI_Xaml_Controls.SwipeControlTests
 {
 	[TestFixture]
@@ -66,16 +70,25 @@ public async Task When_MultipleItems()
 		}
 
 
-#if !__SKIA__ // No screenshot on skia
 		[Test]
 		[AutoRetry]
 		[ActivePlatforms(Platform.iOS, Platform.Android)]
+#if __SKIA__
+		[Ignore("Invalid layout of items")]
+#elif !HAS_RENDER_TARGET_BITMAP
+		[Ignore("Cannot take screenshot on this platform.")]
+#endif
 		public Task When_InListView()
 			=> When_InScrollableContainer("UITests.Windows_UI_Xaml_Controls.SwipeControlTests.SwipeControl_ListView");
 
 		[Test]
 		[AutoRetry]
 		[ActivePlatforms(Platform.iOS, Platform.Android)]
+#if __SKIA__
+		[Ignore("Invalid layout of items")]
+#elif !HAS_RENDER_TARGET_BITMAP
+		[Ignore("Cannot take screenshot on this platform.")]
+#endif
 		public Task When_InScrollViewer()
 			=> When_InScrollableContainer("UITests.Windows_UI_Xaml_Controls.SwipeControlTests.SwipeControl_ScrollViewer");
 
@@ -84,37 +97,36 @@ private async Task When_InScrollableContainer(string testName)
 			QueryEx sut = new QueryEx(q => q.All().Marked("SUT"));
 			QueryEx output = new QueryEx(q => q.All().Marked("Output"));
 
-			Run(testName, skipInitialScreenshot: true);
+			await RunAsync(testName);
 
-			var sutPhyRect = _app.GetPhysicalRect(sut);
-			var item2PhyPosition = new Point((int)sutPhyRect.X + 150, (int)sutPhyRect.Y + 150).LogicalToPhysicalPixels(_app);
+			var sutPhyRect = App.GetPhysicalRect(sut);
+			var item2PhyPosition = new Point((int)sutPhyRect.X + 150, (int)sutPhyRect.Y + 150).LogicalToPhysicalPixels(App);
 
 			// Validate initial state
-			var initial = TakeScreenshot("initial");
+			var initial = await TakeScreenshotAsync("initial");
 			ImageAssert.HasColorAt(initial, item2PhyPosition.X, item2PhyPosition.Y, "#FFFFA52C");
 
 			// Execute left command on item 2
-			_app.DragCoordinates(item2PhyPosition.X, item2PhyPosition.Y, item2PhyPosition.X + 300.LogicalToPhysicalPixels(_app), item2PhyPosition.Y);
+			App.DragCoordinates(item2PhyPosition.X, item2PhyPosition.Y, item2PhyPosition.X + 300.LogicalToPhysicalPixels(App), item2PhyPosition.Y);
 			await Task.Delay(1000); // We cannot detect the animation ...
 
 			var swippedItem = output.GetDependencyPropertyValue<string>("Text");
 			Assert.AreEqual("#FFFFA52C", swippedItem);
 
 			// Scroll up
-			_app.DragCoordinates(sutPhyRect.CenterX, sutPhyRect.Bottom - 10.LogicalToPhysicalPixels(_app), sutPhyRect.CenterX, sutPhyRect.Y + 10.LogicalToPhysicalPixels(_app));
+			App.DragCoordinates(sutPhyRect.CenterX, sutPhyRect.Bottom - 10.LogicalToPhysicalPixels(App), sutPhyRect.CenterX, sutPhyRect.Y + 10.LogicalToPhysicalPixels(App));
 
 			// Validate scrolled successfully
-			var postScroll = TakeScreenshot("after scroll");
+			var postScroll = await TakeScreenshotAsync("after scroll");
 			ImageAssert.DoesNotHaveColorAt(postScroll, item2PhyPosition.X, item2PhyPosition.Y, "#FFFFA52C");
 
 			// Execute left command on item that is now at item 2 location
-			_app.DragCoordinates(item2PhyPosition.X, item2PhyPosition.Y, item2PhyPosition.X + 300.LogicalToPhysicalPixels(_app), item2PhyPosition.Y);
+			App.DragCoordinates(item2PhyPosition.X, item2PhyPosition.Y, item2PhyPosition.X + 300.LogicalToPhysicalPixels(App), item2PhyPosition.Y);
 			await Task.Delay(1000); // We cannot detect the animation ...
 
 			swippedItem = output.GetDependencyPropertyValue<string>("Text");
 			Assert.AreNotEqual("#FFFFA52C", swippedItem);
 		}
-#endif
 
 		[Test]
 		[AutoRetry]
diff --git a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Input/Capture_Tests.cs b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Input/Capture_Tests.cs
index e3007d924e48..165414f207b0 100644
--- a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Input/Capture_Tests.cs
+++ b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Input/Capture_Tests.cs
@@ -70,8 +70,8 @@ private async Task RunTest(string testName, Action<QueryEx> act = null)
 		App.WaitForElement(target);
 		act(target);
 
-#if !__SKIA__
-		TakeScreenshot("Result");
+#if HAS_RENDER_TARGET_BITMAP
+		await TakeScreenshotAsync("Result");
 #endif
 
 		result.GetDependencyPropertyValue<string>("Text").Should().Be("SUCCESS");
diff --git a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Input/NestedHandling_Tests.cs b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Input/NestedHandling_Tests.cs
index 10aedaeec85d..e2f0af7ad85d 100644
--- a/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Input/NestedHandling_Tests.cs
+++ b/src/SamplesApp/SamplesApp.UITests/Windows_UI_Xaml_Input/NestedHandling_Tests.cs
@@ -21,6 +21,7 @@ public partial class NestedHandling_Tests : SampleControlUITestBase
 #endif
 		[Test]
 		[AutoRetry]
+		[InjectedPointer(PointerDeviceType.Mouse)]
 		[InjectedPointer(PointerDeviceType.Touch)]
 		public async Task When_NestedHandlesPressed_Then_ContainerStillGetsSubsequentEvents()
 		{
@@ -35,9 +36,11 @@ public async Task When_NestedHandlesPressed_Then_ContainerStillGetsSubsequentEve
 
 		[Test]
 		[AutoRetry]
-#if !__SKIA__
 		[ActivePlatforms(Platform.Browser)] // Not supported on iOS and Android where dispatch is native and has "implicit capture".
+#if !IS_RUNTIME_UI_TESTS
+		[Ignore("Flaky")]
 #endif
+		[InjectedPointer(PointerDeviceType.Mouse)]
 		[InjectedPointer(PointerDeviceType.Touch)]
 		public async Task When_Nested_Then_EnterAndExitedDoesNotBubble()
 		{
@@ -63,11 +66,7 @@ public async Task When_Nested_Then_EnterAndExitedDoesNotBubble()
 
 			// The results should be "ENTERED SUCCESS" and "EXITED SUCCESS", but even if tests are passing locally they are failing on CI
 			// We are validating as much as we can to reduce risk of regression ...
-#if __SKIA__
 			enterResult.Should().Contain("ENTERED SUCCESS", "we should have received ENTER only on '_intermediate' which has subscribed to handled events too.");
-#else
-			enterResult.Should().BeOneOf(new[] { "ENTERED", "ENTERED SUCCESS" }, "we should have received ENTER only on '_intermediate' which has subscribed to handled events too.");
-#endif
 #if false
 			exitResult.Should().Be("EXITED SUCCESS", "we should have received EXIT only on '_intermediate' which has subscribed to handled events too.");
 #endif
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Input/PointersTests/EventsSequences.xaml b/src/SamplesApp/UITests.Shared/Windows_UI_Input/PointersTests/EventsSequences.xaml
index 47742f12b9d5..cace5f594ca4 100644
--- a/src/SamplesApp/UITests.Shared/Windows_UI_Input/PointersTests/EventsSequences.xaml
+++ b/src/SamplesApp/UITests.Shared/Windows_UI_Input/PointersTests/EventsSequences.xaml
@@ -76,7 +76,7 @@
 
 			<StackPanel Orientation="Horizontal">
 				<Border Background="#86007D" Width="100" Height="100">
-					<ListView x:Name="TestListViewTarget" ItemsSource="0123456789" IsItemClickEnabled="True" />
+					<ListView x:Name="TestListViewTarget" IsItemClickEnabled="True" />
 				</Border>
 				<StackPanel>
 					<Button x:Name="TestListViewReset" Content="Reset" Click="ResetListViewTest" />
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Input/PointersTests/EventsSequences.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Input/PointersTests/EventsSequences.xaml.cs
index b764ee5be67e..dbe333ab0ea6 100644
--- a/src/SamplesApp/UITests.Shared/Windows_UI_Input/PointersTests/EventsSequences.xaml.cs
+++ b/src/SamplesApp/UITests.Shared/Windows_UI_Input/PointersTests/EventsSequences.xaml.cs
@@ -42,7 +42,7 @@ private enum EventsKind
 		public EventsSequences()
 		{
 			this.InitializeComponent();
-
+			TestListViewTarget.ItemsSource = "0123456789".ToCharArray();
 			SetupEvents(TestTapTarget, _tapResult, EventsKind.Pointers | EventsKind.Manipulation | EventsKind.Gestures);
 			SetupEvents(TestClickTarget, _clickResult, EventsKind.Pointers | EventsKind.Manipulation | EventsKind.Gestures | EventsKind.Click);
 			SetupEvents(TestTranslatedTapTarget, _translatedTapResult, EventsKind.Pointers | EventsKind.Manipulation | EventsKind.Gestures);
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Input/PointersTests/HitTest_Image.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Input/PointersTests/HitTest_Image.xaml.cs
index 0a34262536bd..f6c7d620a739 100644
--- a/src/SamplesApp/UITests.Shared/Windows_UI_Input/PointersTests/HitTest_Image.xaml.cs
+++ b/src/SamplesApp/UITests.Shared/Windows_UI_Input/PointersTests/HitTest_Image.xaml.cs
@@ -17,25 +17,25 @@ public HitTest_Image()
 			{
 				e.Handled = true;
 				LastPressed.Text = Root.Name;
-				LastPressedSrc.Text = (e.OriginalSource as FrameworkElement)?.Name ?? "-unknown-";
+				LastPressedSrc.Text = (e.OriginalSource as FrameworkElement)?.Name ?? $"-unknown/{e.OriginalSource?.GetType()}-";
 			};
 			Root.PointerMoved += (snd, e) =>
 			{
 				e.Handled = true;
 				LastHovered.Text = Root.Name;
-				LastHoveredSrc.Text = (e.OriginalSource as FrameworkElement)?.Name ?? "-unknown-";
+				LastHoveredSrc.Text = (e.OriginalSource as FrameworkElement)?.Name ?? $"-unknown/{e.OriginalSource?.GetType()}-";
 			};
 			TheImage.PointerPressed += (snd, e) =>
 			{
 				e.Handled = true;
 				LastPressed.Text = TheImage.Name;
-				LastPressedSrc.Text = (e.OriginalSource as FrameworkElement)?.Name ?? "-unknown-";
+				LastPressedSrc.Text = (e.OriginalSource as FrameworkElement)?.Name ?? $"-unknown/{e.OriginalSource?.GetType()}-";
 			};
 			TheImage.PointerMoved += (snd, e) =>
 			{
 				e.Handled = true;
 				LastHovered.Text = TheImage.Name;
-				LastHoveredSrc.Text = (e.OriginalSource as FrameworkElement)?.Name ?? "-unknown-";
+				LastHoveredSrc.Text = (e.OriginalSource as FrameworkElement)?.Name ?? $"-unknown/{e.OriginalSource?.GetType()}-";
 			};
 		}
 	}
diff --git a/src/Uno.CrossTargetting.targets b/src/Uno.CrossTargetting.targets
index 2e2de37aa02a..a19d815a80f3 100644
--- a/src/Uno.CrossTargetting.targets
+++ b/src/Uno.CrossTargetting.targets
@@ -54,6 +54,9 @@
 									  uses render transforms instead of native scroll feature (if any)
   - UNO_HAS_MANAGED_POINTERS: Determines if the pointer events are dispatched by uno instead of the system (if any).
   - HAS_NATIVE_IMPLICIT_POINTER_CAPTURE: Indicate if the OS once a pointer is pressed, OS will send all pointer event to the same target (a.k.a. OriginalSource)
+  - HAS_RENDER_TARGET_BITMAP : Determines if the render target bitmap is implemented (and can be used to take screenshot in runtime tests)
+  - UNO_HAS_BORDER_VISUAL: Determine if borders are rendered using compostion APIs by Uno (or using native promitives)
+  - HAS_COMPOSITION_API : Determines if teh composition APIs (i.e. UIElement.Visual) are supported or not.
 
   - Constants for Xamarin backends and SDK versions: https://docs.microsoft.com/en-us/xamarin/cross-platform/app-fundamentals/building-cross-platform-applications/platform-divergence-abstraction-divergent-implementation#conditional-compilation
   -->
@@ -63,12 +66,14 @@
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(UnoRuntimeIdentifier)'=='WebAssembly'">
-		<DefineConstants>$(DefineConstants);__WASM__;UNO_HAS_ENHANCED_HIT_TEST_PROPERTY;UNO_HAS_ENHANCED_LIFECYCLE</DefineConstants>
+		<DefineConstants>$(DefineConstants);__WASM__;UNO_HAS_ENHANCED_HIT_TEST_PROPERTY;UNO_HAS_ENHANCED_LIFECYCLE;UNO_HAS_MANAGED_POINTERS;HAS_INPUT_INJECTOR</DefineConstants>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(UnoRuntimeIdentifier)'=='Skia'">
-		<DefineConstants>$(DefineConstants);__SKIA__;UNO_HAS_ENHANCED_HIT_TEST_PROPERTY;UNO_HAS_MANAGED_SCROLL_PRESENTER;UNO_HAS_MANAGED_POINTERS;SUPPORTS_RTL;UNO_HAS_ENHANCED_LIFECYCLE;UNO_HAS_BORDER_VISUAL</DefineConstants>
-		<DefineConstants>$(DefineConstants);UNO_SUPPORTS_NATIVEHOST;HAS_INPUT_INJECTOR</DefineConstants>
+		<DefineConstants>$(DefineConstants);__SKIA__;SUPPORTS_RTL;UNO_SUPPORTS_NATIVEHOST;UNO_HAS_ENHANCED_LIFECYCLE</DefineConstants>
+		<DefineConstants>$(DefineConstants);UNO_HAS_MANAGED_POINTERS;UNO_HAS_ENHANCED_HIT_TEST_PROPERTY;UNO_HAS_MANAGED_SCROLL_PRESENTER;HAS_INPUT_INJECTOR</DefineConstants>
+		<DefineConstants>$(DefineConstants);HAS_COMPOSITION_API;UNO_HAS_BORDER_VISUAL</DefineConstants>
+		<DefineConstants>$(DefineConstants);HAS_RENDER_TARGET_BITMAP</DefineConstants>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(UnoRuntimeIdentifier)'=='Reference'">
@@ -80,21 +85,21 @@
 	</PropertyGroup>
 
 	<PropertyGroup Condition="$(IsIOS)">
-		<DefineConstants>$(DefineConstants);XAMARIN;UNO_HAS_UIELEMENT_IMPLICIT_PINNING;HAS_NATIVE_IMPLICIT_POINTER_CAPTURE</DefineConstants>
+		<DefineConstants>$(DefineConstants);XAMARIN;UNO_HAS_UIELEMENT_IMPLICIT_PINNING;HAS_NATIVE_IMPLICIT_POINTER_CAPTURE;HAS_RENDER_TARGET_BITMAP</DefineConstants>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="$(IsCatalyst)">
-		<DefineConstants>$(DefineConstants);XAMARIN;UNO_HAS_UIELEMENT_IMPLICIT_PINNING;HAS_NATIVE_IMPLICIT_POINTER_CAPTURE</DefineConstants>
+		<DefineConstants>$(DefineConstants);XAMARIN;UNO_HAS_UIELEMENT_IMPLICIT_PINNING;HAS_NATIVE_IMPLICIT_POINTER_CAPTURE;HAS_RENDER_TARGET_BITMAP</DefineConstants>
 		<SupportedOSPlatformVersion>13.1</SupportedOSPlatformVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="$(IsMacOS)">
-		<DefineConstants>$(DefineConstants);__MACOS__;XAMARIN;UNO_HAS_UIELEMENT_IMPLICIT_PINNING;UNO_HAS_MANAGED_SCROLL_PRESENTER;UNO_HAS_MANAGED_POINTERS</DefineConstants>
+		<DefineConstants>$(DefineConstants);__MACOS__;XAMARIN;UNO_HAS_UIELEMENT_IMPLICIT_PINNING;UNO_HAS_MANAGED_SCROLL_PRESENTER;UNO_HAS_MANAGED_POINTERS;HAS_RENDER_TARGET_BITMAP</DefineConstants>
 		<SupportedOSPlatformVersion>10.15</SupportedOSPlatformVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="$(IsAndroid)">
-		<DefineConstants>$(DefineConstants);__ANDROID__;XAMARIN;HAS_NATIVE_IMPLICIT_POINTER_CAPTURE</DefineConstants>
+		<DefineConstants>$(DefineConstants);__ANDROID__;XAMARIN;HAS_NATIVE_IMPLICIT_POINTER_CAPTURE;HAS_RENDER_TARGET_BITMAP</DefineConstants>
 		<SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
 	</PropertyGroup>
 
@@ -108,13 +113,13 @@
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(TargetFramework)'=='net8.0-windows10.0.19041.0'">
-		<DefineConstants>$(DefineConstants);HAS_INPUT_INJECTOR;WINDOWS_WINUI</DefineConstants>
+		<DefineConstants>$(DefineConstants);HAS_INPUT_INJECTOR;WINDOWS_WINUI;HAS_RENDER_TARGET_BITMAP;HAS_COMPOSITION_API</DefineConstants>
 	</PropertyGroup>
 
 	<PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0.19041' ">
 		<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
 		<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
-		<DefineConstants>$(DefineConstants);NETFX_CORE;HAS_INPUT_INJECTOR</DefineConstants>
+		<DefineConstants>$(DefineConstants);NETFX_CORE;HAS_INPUT_INJECTOR;HAS_RENDER_TARGET_BITMAP;HAS_COMPOSITION_API</DefineConstants>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(CI_Build)'!='' OR '$(TF_BUILD)' == 'true'">
diff --git a/src/Uno.UI.RuntimeTests/Helpers/UITestHelper.cs b/src/Uno.UI.RuntimeTests/Helpers/UITestHelper.cs
index 996698afc6cf..42ebadf92f8a 100644
--- a/src/Uno.UI.RuntimeTests/Helpers/UITestHelper.cs
+++ b/src/Uno.UI.RuntimeTests/Helpers/UITestHelper.cs
@@ -67,6 +67,7 @@ public static async Task<Rect> Load<T>(T element, Func<T, bool>? isLoaded = null
 	/// <returns></returns>
 	public static async Task<RawBitmap> ScreenShot(FrameworkElement element, bool opaque = false, ScreenShotScalingMode scaling = ScreenShotScalingMode.UsePhysicalPixelsWithImplicitScaling)
 	{
+#if HAS_RENDER_TARGET_BITMAP
 		var renderer = new RenderTargetBitmap();
 		element.UpdateLayout();
 		await TestServices.WindowHelper.WaitForIdle();
@@ -96,6 +97,9 @@ public static async Task<RawBitmap> ScreenShot(FrameworkElement element, bool op
 		}
 
 		return bitmap;
+#else
+		throw new NotSupportedException("Cannot take screenshot on this platform.");
+#endif
 	}
 
 	public enum ScreenShotScalingMode
diff --git a/src/Uno.UI.RuntimeTests/IntegrationTests/common/TestServices.InputHelper.cs b/src/Uno.UI.RuntimeTests/IntegrationTests/common/TestServices.InputHelper.cs
index f8c00a04582f..71add1ece833 100644
--- a/src/Uno.UI.RuntimeTests/IntegrationTests/common/TestServices.InputHelper.cs
+++ b/src/Uno.UI.RuntimeTests/IntegrationTests/common/TestServices.InputHelper.cs
@@ -50,7 +50,7 @@ public static void Hold(UIElement element)
 
 			public static void Tap(UIElement element, uint waitBetweenPressRelease = 0)
 			{
-#if WINAPPSDK || __SKIA__
+#if WINAPPSDK || HAS_INPUT_INJECTOR
 				Finger finger = null;
 				MUXControlsTestApp.Utilities.RunOnUIThread.Execute(() =>
 				{
diff --git a/src/Uno.UI.RuntimeTests/MUX/Microsoft_UI_Xaml_Controls/NavigationView/NavigationViewTests.uno.cs b/src/Uno.UI.RuntimeTests/MUX/Microsoft_UI_Xaml_Controls/NavigationView/NavigationViewTests.uno.cs
index 6d634d757e91..08eb73e4eb15 100644
--- a/src/Uno.UI.RuntimeTests/MUX/Microsoft_UI_Xaml_Controls/NavigationView/NavigationViewTests.uno.cs
+++ b/src/Uno.UI.RuntimeTests/MUX/Microsoft_UI_Xaml_Controls/NavigationView/NavigationViewTests.uno.cs
@@ -16,7 +16,7 @@ public partial class NavigationViewTests : MUXApiTestBase
 {
 	[TestMethod]
 #if !HAS_INPUT_INJECTOR || !HAS_UNO_WINUI
-	[Ignore("InputInjector is only supported on skia")]
+	[Ignore("InputInjector is not supported on this platform.")]
 #endif
 	public async Task VerifyNavigationViewItemExpandsCollapsesWhenChevronTapped()
 	{
diff --git a/src/Uno.UI.RuntimeTests/MUX/Microsoft_UI_Xaml_Controls/SplitButton/SplitButtonTests_InteractionTests.cs b/src/Uno.UI.RuntimeTests/MUX/Microsoft_UI_Xaml_Controls/SplitButton/SplitButtonTests_InteractionTests.cs
index 97688f13aa40..033029d7a67b 100644
--- a/src/Uno.UI.RuntimeTests/MUX/Microsoft_UI_Xaml_Controls/SplitButton/SplitButtonTests_InteractionTests.cs
+++ b/src/Uno.UI.RuntimeTests/MUX/Microsoft_UI_Xaml_Controls/SplitButton/SplitButtonTests_InteractionTests.cs
@@ -31,8 +31,8 @@ namespace Windows.UI.Xaml.Tests.MUXControls.InteractionTests
 	public partial class SplitButtonTests
 	{
 		[TestMethod]
-#if !__SKIA__
-		[Ignore("InputInjector is only supported on skia")]
+#if !HAS_INPUT_INJECTOR
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task BasicInteractionTest()
 		{
@@ -70,8 +70,8 @@ public async Task BasicInteractionTest()
 		}
 
 		[TestMethod]
-#if !__SKIA__
-		[Ignore("InputInjector is only supported on skia")]
+#if !HAS_INPUT_INJECTOR
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task CommandTest()
 		{
@@ -123,8 +123,8 @@ public async Task CommandTest()
 		}
 
 		[TestMethod]
-#if !__SKIA__
-		[Ignore("InputInjector is only supported on skia")]
+#if !HAS_INPUT_INJECTOR
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task TouchTest()
 		{
@@ -216,7 +216,7 @@ public async Task AccessibilityTest()
 
 		[TestMethod]
 #if !__SKIA__
-		[Ignore("InputInjector is only supported on skia")]
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task KeyboardTest()
 		{
@@ -265,8 +265,8 @@ public async Task KeyboardTest()
 		}
 
 		[TestMethod]
-#if !__SKIA__
-		[Ignore("InputInjector is only supported on skia")]
+#if !HAS_INPUT_INJECTOR
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task ToggleTest()
 		{
diff --git a/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_RatingControl.cs b/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_RatingControl.cs
index c5e475aa4116..f97750f53c3c 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_RatingControl.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_RatingControl.cs
@@ -19,7 +19,7 @@ public class Given_RatingControl
 	[TestMethod]
 	[RunsOnUIThread]
 #if !HAS_INPUT_INJECTOR
-	[Ignore("InputInjector is only supported on Skia #14948")]
+	[Ignore("InputInjector is not supported on this platform.")]
 #endif
 	public async Task When_Loaded_Then_Unloaded_Tap()
 	{
diff --git a/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_TabView.cs b/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_TabView.cs
index f8caa88ce8e7..1d7155a74ea8 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_TabView.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_TabView.cs
@@ -26,7 +26,7 @@ public class Given_TabView
 #if HAS_UNO
 	[TestMethod]
 #if !HAS_INPUT_INJECTOR
-	[Ignore("InputInjector is only supported on skia")]
+	[Ignore("InputInjector is not supported on this platform.")]
 #endif
 	public async Task When_First_Item_Unselected()
 	{
diff --git a/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_TreeView.cs b/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_TreeView.cs
index 07e4a71a11b0..e4d8509aa6ad 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_TreeView.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_TreeView.cs
@@ -69,7 +69,7 @@ public partial class Given_TreeView
 #if HAS_UNO
 		[TestMethod]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("InputInjector is only supported on skia")]
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task When_TreeViewItem_Dragged_Near_the_Edge()
 		{
@@ -240,7 +240,7 @@ public async Task When_TreeViewItem_Collapsed_Children_Removed_From_Tree()
 		// https://github.com/unoplatform/uno/issues/16041
 		[TestMethod]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("InputInjector is only supported on skia")]
+		[Ignore("InputInjector is not supported on this platform.")]
 #elif HAS_UNO && !HAS_UNO_WINUI
 		[Ignore("Fails on UWP branch as mixing WUX and MUX types causes errors.")]
 #endif
@@ -322,7 +322,7 @@ public async Task When_TreeViewItem_Dragged_NRE()
 
 		[TestMethod]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("InputInjector is only supported on skia")]
+		[Ignore("InputInjector is not supported on this platform.")]
 #elif HAS_UNO && !HAS_UNO_WINUI
 		[Ignore("Fails on UWP branch as mixing WUX and MUX types causes errors.")]
 #endif
diff --git a/src/Uno.UI.RuntimeTests/Tests/Uno_UI_Xaml_Core/Given_InputManager.cs b/src/Uno.UI.RuntimeTests/Tests/Uno_UI_Xaml_Core/Given_InputManager.cs
index 1de289638a6c..77972928366f 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Uno_UI_Xaml_Core/Given_InputManager.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Uno_UI_Xaml_Core/Given_InputManager.cs
@@ -1,4 +1,4 @@
-#if __SKIA__
+#if HAS_INPUT_INJECTOR && !WINAPPSDK
 using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -28,7 +28,7 @@ public class Given_InputManager
 {
 	[TestMethod]
 #if !HAS_INPUT_INJECTOR
-	[Ignore("Pointer injection supported only on skia for now.")]
+	[Ignore("InputInjector is not supported on this platform.")]
 #endif
 	public async Task When_VisibilityChangesWhileDispatching_Then_RecomputeOriginalSource()
 	{
@@ -69,7 +69,7 @@ public async Task When_VisibilityChangesWhileDispatching_Then_RecomputeOriginalS
 
 	[TestMethod]
 #if !HAS_INPUT_INJECTOR
-	[Ignore("Pointer injection supported only on skia for now.")]
+	[Ignore("InputInjector is not supported on this platform.")]
 #endif
 	public async Task When_LeaveElementWhileManipulating_Then_CaptureNotLost()
 	{
@@ -124,7 +124,7 @@ public async Task When_LeaveElementWhileManipulating_Then_CaptureNotLost()
 
 	[TestMethod]
 #if !HAS_INPUT_INJECTOR
-	[Ignore("Pointer injection supported only on skia for now.")]
+	[Ignore("InputInjector is not supported on this platform.")]
 #endif
 	public async Task When_Hover_No_Delay_For_VisualState_Update()
 	{
@@ -146,8 +146,10 @@ public async Task When_Hover_No_Delay_For_VisualState_Update()
 	}
 
 	[TestMethod]
-#if !HAS_INPUT_INJECTOR
-	[Ignore("Pointer injection supported only on skia for now.")]
+#if __WASM__
+	[Ignore("Scrolling is handled by native code and InputInjector is not yet able to inject native pointers.")]
+#elif !HAS_INPUT_INJECTOR
+	[Ignore("InputInjector is not supported on this platform.")]
 #endif
 	public async Task When_Scroll_No_Delay_For_VisualState_Update()
 	{
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Composition/Given_InteractionTracker.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Composition/Given_InteractionTracker.cs
index d876e0e82eda..55a36911e0d6 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Composition/Given_InteractionTracker.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Composition/Given_InteractionTracker.cs
@@ -52,6 +52,9 @@ private async Task<string> WaitTrackerLogs(TrackerOwner owner)
 	}
 
 	[TestMethod]
+#if !HAS_COMPOSITION_API
+	[Ignore("Composition APIs are not supported on this platform.")]
+#endif
 	public async Task When_TryUpdatePositionWithAdditionalVelocity_SingleCall()
 	{
 		var border = new Border()
@@ -113,6 +116,9 @@ public async Task When_TryUpdatePositionWithAdditionalVelocity_SingleCall()
 	}
 
 	[TestMethod]
+#if !HAS_COMPOSITION_API
+	[Ignore("Composition APIs are not supported on this platform.")]
+#endif
 	public async Task When_TryUpdatePositionWithAdditionalVelocity_TwoCalls()
 	{
 		var border = new Border()
@@ -176,8 +182,10 @@ public async Task When_TryUpdatePositionWithAdditionalVelocity_TwoCalls()
 
 	[TestMethod]
 	[RequiresFullWindow]
-#if !HAS_INPUT_INJECTOR
-	[Ignore("InputInjector is only supported on skia")]
+#if !HAS_COMPOSITION_API
+	[Ignore("Composition APIs are not supported on this platform.")]
+#elif !HAS_INPUT_INJECTOR
+	[Ignore("InputInjector is not supported on this platform.")]
 #elif !HAS_UNO
 	[Ignore("Test fails on Windows. For some reason, Drag isn't doing what we expect it to for an unknown reason.")]
 #endif
@@ -267,8 +275,10 @@ public async Task When_UserInteraction()
 #if HAS_UNO
 	[TestMethod]
 	[RequiresFullWindow]
-#if !HAS_INPUT_INJECTOR
-	[Ignore("InputInjector is only supported on skia")]
+#if !HAS_COMPOSITION_API
+	[Ignore("Composition APIs are not supported on this platform.")]
+#elif !HAS_INPUT_INJECTOR
+	[Ignore("InputInjector is not supported on this platform.")]
 #endif
 	public async Task When_MouseWheel()
 	{
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Input_Preview_Injection/Given_InputInjector.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Input_Preview_Injection/Given_InputInjector.cs
index 4b05de419f0b..eb79f60cf283 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Input_Preview_Injection/Given_InputInjector.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Input_Preview_Injection/Given_InputInjector.cs
@@ -1,4 +1,4 @@
-#if __SKIA__
+#if HAS_INPUT_INJECTOR
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Given_UIElement.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Given_UIElement.cs
index e586e3e089dd..fa8acc766dd1 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Given_UIElement.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Given_UIElement.cs
@@ -29,17 +29,16 @@
 using Uno.Extensions;
 using Uno.UI.RuntimeTests.Helpers;
 using Point = System.Drawing.Point;
-
-#if __IOS__
-using UIKit;
-#elif __MACOS__
-using AppKit;
-#else
 using Uno.UI;
 using Windows.UI;
 using Windows.ApplicationModel.Appointments;
 using Microsoft.UI.Xaml.Hosting;
 using Uno.UI.Toolkit.Extensions;
+
+#if __IOS__
+using UIKit;
+#elif __MACOS__
+using AppKit;
 #endif
 
 namespace Uno.UI.RuntimeTests.Tests.Windows_UI_Xaml
@@ -1320,13 +1319,15 @@ public async Task When_Explicit_Size_Clip_Changes()
 		}
 #endif
 
-#if __SKIA__ || WINAPPSDK
 		[TestMethod]
 		[RunsOnUIThread]
 		[RequiresFullWindow]
+#if !HAS_COMPOSITION_API
+		[Ignore("Composition APIs are not supported on this platform.")]
+#endif
 		public async Task When_Visual_Offset_Changes_HitTest()
 		{
-			var sut = new Button()
+			var sut = new Button
 			{
 				Content = "Click",
 			};
@@ -1335,7 +1336,7 @@ public async Task When_Visual_Offset_Changes_HitTest()
 
 			var rect = await UITestHelper.Load(sut);
 
-#if __SKIA__
+#if HAS_UNO
 			var (element, _) = VisualTreeHelper.HitTest(rect.GetCenter(), sut.XamlRoot);
 			Assert.IsTrue(sut.IsAncestorOf(element));
 #endif
@@ -1371,7 +1372,7 @@ public async Task When_Visual_Offset_Changes_HitTest()
 			Assert.AreEqual(rect.Height * 2, matrix4.OffsetY - matrix1.OffsetY);
 #endif
 
-#if __SKIA__
+#if HAS_UNO
 			var (element2, _) = VisualTreeHelper.HitTest(rect.GetCenter(), sut.XamlRoot);
 			Assert.IsFalse(sut.IsAncestorOf(element2));
 
@@ -1383,9 +1384,14 @@ public async Task When_Visual_Offset_Changes_HitTest()
 		[TestMethod]
 		[RunsOnUIThread]
 		[RequiresFullWindow]
+#if !HAS_COMPOSITION_API
+		[Ignore("Composition APIs are not supported on this platform.")]
+#elif !HAS_INPUT_INJECTOR
+		[Ignore("InputInjector is not supported on this platform.")]
+#endif
 		public async Task When_Visual_Offset_Changes_InjectedPointer()
 		{
-			var sut = new Button()
+			var sut = new Button
 			{
 				Content = "Click",
 			};
@@ -1553,7 +1559,6 @@ public async Task When_Element_Has_Translation_And_Visual_Has_Offset()
 #endif
 		}
 #endif
-#endif
 
 #if HAS_UNO
 		[TestMethod]
@@ -1674,13 +1679,18 @@ public async Task When_ScaleTransform_HitTest(bool addClip)
 		}
 #endif
 
-#if HAS_UNO && HAS_INPUT_INJECTOR
+#if HAS_UNO
 		#region Drag and Drop
 
 		[TestMethod]
 		[RunsOnUIThread]
 		[DataRow(true)]
 		[DataRow(false)]
+#if !HAS_INPUT_INJECTOR
+		[Ignore("InputInjector is not supported on this platform.")]
+#elif __WASM__
+		[Ignore("Failing on WASM: https://github.com/unoplatform/uno/issues/17742")]
+#endif
 		public async Task When_DragOver_Fires_Along_DragEnter_Drop(bool waitAfterRelease)
 		{
 			if (TestServices.WindowHelper.IsXamlIsland)
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Border.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Border.cs
index 8af63367f579..81251999fa6f 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Border.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Border.cs
@@ -577,7 +577,7 @@ public async Task Border_LinearGradient()
 
 #if HAS_UNO
 #if !HAS_INPUT_INJECTOR
-		[Ignore("InputInjector is only supported on skia")]
+		[Ignore("InputInjector is not supported on this platform.")]
 #else
 		[TestMethod]
 		[RunsOnUIThread]
@@ -616,7 +616,7 @@ public async Task Nested_Element_Tapped()
 		}
 
 #if !HAS_INPUT_INJECTOR
-		[Ignore("InputInjector is only supported on skia")]
+		[Ignore("InputInjector is not supported on this platform.")]
 #else
 		[TestMethod]
 		[RunsOnUIThread]
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Button.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Button.cs
index f8efe8ed5fc7..418e97659d07 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Button.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Button.cs
@@ -123,6 +123,9 @@ public async Task When_Command_Executing_With_Delay_IsEnabled()
 		[DataRow(typeof(Button))]
 		[DataRow(typeof(ToggleButton))]
 		[DataRow(typeof(RepeatButton))]
+#if !HAS_RENDER_TARGET_BITMAP
+		[Ignore("Cannot take screenshot on this platform.")]
+#endif
 		public async Task When_BorderThickness_Zero(Type type)
 		{
 			using var fluent = StyleHelper.UseFluentStyles();
@@ -178,7 +181,7 @@ public async Task When_Command_Never_Stops()
 #if HAS_UNO
 		[TestMethod]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("InputInjector is only supported on skia")]
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task When_DoubleTap_Timing()
 		{
@@ -255,7 +258,7 @@ async Task Release(uint i)
 #if HAS_UNO
 		[TestMethod]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("InputInjector is only supported on skia")]
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task When_Tapped_PointerPressed_Is_Not_Raised()
 		{
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_ComboBox.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_ComboBox.cs
index 3db3a894edfe..ea7da9715b48 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_ComboBox.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_ComboBox.cs
@@ -235,7 +235,7 @@ public async Task When_ComboBox_Constrained_By_Parent()
 #if HAS_UNO
 		[TestMethod]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("InputInjector is only supported on skia")]
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task When_PointerWheel()
 		{
@@ -1058,7 +1058,9 @@ public async Task When_SelectedItem_Active_VisualState()
 		[RequiresFullWindow]
 		[RunsOnUIThread]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("Pointer injection supported only on skia for now.")]
+		[Ignore("InputInjector is not supported on this platform.")]
+#elif !HAS_RENDER_TARGET_BITMAP
+		[Ignore("Cannot take screenshot on this platform.")]
 #endif
 		public async Task When_Mouse_Opened_And_Closed()
 		{
@@ -1129,7 +1131,9 @@ public async Task When_Mouse_Opened_And_Closed()
 		[RequiresFullWindow]
 		[RunsOnUIThread]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("Pointer injection supported only on skia for now.")]
+		[Ignore("InputInjector is not supported on this platform.")]
+#elif !HAS_RENDER_TARGET_BITMAP
+		[Ignore("Cannot take screenshot on this platform.")]
 #endif
 		public async Task When_Mouse_Opened_And_Closed_Fluent()
 		{
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_CommandBar.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_CommandBar.cs
index 54d9acfb20b8..b81f9c3a48e3 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_CommandBar.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_CommandBar.cs
@@ -45,7 +45,7 @@ public async Task TestNativeCommandBarIcon()
 
 		[TestMethod]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("InputInjector is only supported on skia")]
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task When_Popup_Open_Then_Click_Outside()
 		{
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_ContentDialog.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_ContentDialog.cs
index 84effd8fe43a..b7b1dd2f54df 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_ContentDialog.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_ContentDialog.cs
@@ -28,7 +28,7 @@ public class Given_ContentDialog
 #if HAS_UNO
 		[TestMethod]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("Pointer injection supported only on skia for now.")]
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 
 		public async Task When_Press_Should_Not_Lose_Focus()
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Control_Visibility.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Control_Visibility.cs
index 43c87b373e11..14d7ca44b37c 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Control_Visibility.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Control_Visibility.cs
@@ -21,6 +21,9 @@ public class Given_Control_Visibility
 #if HAS_UNO_WINUI
 	[TestMethod]
 	[UnoWorkItem("https://github.com/unoplatform/uno/issues/16369")]
+#if !HAS_RENDER_TARGET_BITMAP
+	[Ignore("Cannot take screenshot on this platform.")]
+#endif
 	public async Task When_Visibility_Changes()
 	{
 		foreach (var type in typeof(Control).Assembly.GetTypes())
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_FlipView.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_FlipView.cs
index ac624d3a017f..bfa55b3960a2 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_FlipView.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_FlipView.cs
@@ -500,7 +500,7 @@ void UpdateRadioButtonSelection(int selectedIndex)
 #if HAS_UNO
 		[TestMethod]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("Pointer injection supported only on skia for now.")]
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task When_ScrollWheel()
 		{
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Grid.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Grid.cs
index 1f4e730f2e00..83b86db7d323 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Grid.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Grid.cs
@@ -187,7 +187,9 @@ await RunOnUIThread.ExecuteAsync(() =>
 		[TestMethod]
 		[RunsOnUIThread]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("InputInjector is only supported on skia")]
+		[Ignore("InputInjector is not supported on this platform.")]
+#elif __WASM__
+		[Ignore("Failing on WASM: https://github.com/unoplatform/uno/issues/17742")]
 #endif
 		public async Task When_Grid_Child_Canvas_ZIndex()
 		{
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_ListViewBase.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_ListViewBase.cs
index 8972b3e4b0a7..b945ed49008f 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_ListViewBase.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_ListViewBase.cs
@@ -842,7 +842,7 @@ public async Task When_Different_Selections_IsMultiSelectCheckBoxEnabled()
 		[TestMethod]
 		[RunsOnUIThread]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("InputInjector is only supported on skia")]
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task When_Multiple_Selection_Pointer()
 		{
@@ -975,7 +975,7 @@ async Task AssertSelected()
 		[TestMethod]
 		[RunsOnUIThread]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("InputInjector is only supported on skia")]
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task When_Extended_Selection_Pointer()
 		{
@@ -1186,7 +1186,7 @@ async Task AssertSelected()
 		[TestMethod]
 		[RunsOnUIThread]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("InputInjector is only supported on skia")]
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task When_Extended_Selection_SelectedIndex_Changed_Mixed()
 		{
@@ -1751,7 +1751,9 @@ string RandomString(int length)
 		[TestMethod]
 		[RunsOnUIThread]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("InputInjector is only supported on skia")]
+		[Ignore("InputInjector is not supported on this platform.")]
+#elif !HAS_RENDER_TARGET_BITMAP
+		[Ignore("Cannot take screenshot on this platform.")]
 #endif
 		public async Task When_Large_List_Scroll_To_End_Then_Back_Up_TryClick()
 		{
@@ -4625,7 +4627,9 @@ public async Task When_ScrollIntoView_Containers_With_Varying_Heights()
 		[TestMethod]
 		[RunsOnUIThread]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("InputInjector is only supported on skia")]
+		[Ignore("InputInjector is not supported on this platform.")]
+#elif __WASM__
+		[Ignore("Failing on WASM: https://github.com/unoplatform/uno/issues/17742")]
 #endif
 		public async Task When_UpdateLayout_In_DragDropping()
 		{
@@ -4683,7 +4687,9 @@ public async Task When_UpdateLayout_In_DragDropping()
 		[TestMethod]
 		[RunsOnUIThread]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("InputInjector is only supported on skia")]
+		[Ignore("InputInjector is not supported on this platform.")]
+#elif __WASM__
+		[Ignore("Failing on WASM https://github.com/unoplatform/uno/issues/17742")]
 #endif
 		public async Task When_DragDrop_ItemsSource_Is_Subclass_Of_ObservableCollection()
 		{
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_ScrollViewer.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_ScrollViewer.cs
index fa4bd43cd2f2..da0e7235f4e7 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_ScrollViewer.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_ScrollViewer.cs
@@ -322,7 +322,7 @@ public async Task When_ArrowKeys_Pressed(int width, int height, int horizontalDe
 
 		[TestMethod]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("InputInjector is only supported on skia")]
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task When_ScrollViewer_Pressed()
 		{
@@ -598,7 +598,7 @@ public async Task When_Scrolled_ViewportSizeLargerThanContent()
 #if HAS_UNO
 		[TestMethod]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("InputInjector is only supported on skia")]
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task When_WheelChanged_OnlyHorizontallyScrollable()
 		{
@@ -650,8 +650,10 @@ public async Task When_WheelChanged_OnlyHorizontallyScrollable()
 		}
 
 		[TestMethod]
-#if !HAS_INPUT_INJECTOR
-		[Ignore("InputInjector is only supported on skia")]
+#if __WASM__
+		[Ignore("Scrolling is handled by native code and InputInjector is not yet able to inject native pointers.")]
+#elif !HAS_INPUT_INJECTOR
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task When_Nested_ScrollViewers_WheelChanged()
 		{
@@ -751,7 +753,7 @@ public async Task When_Space_Already_Handled()
 		[RunsOnUIThread]
 		[RequiresFullWindow]
 #if !__SKIA__
-		[Ignore("InputInjector is only supported on skia")]
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task When_Pointer_Clicks_Inside_ScrollViewer()
 		{
@@ -1262,8 +1264,10 @@ await WindowHelper.WaitFor<double>(
 
 		[TestMethod]
 		[RunsOnUIThread]
-#if !HAS_INPUT_INJECTOR
-		[Ignore("Pointer injection supported only on skia for now.")]
+#if __WASM__
+		[Ignore("Scrolling is handled by native code and InputInjector is not yet able to inject native pointers.")]
+#elif !HAS_INPUT_INJECTOR
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task When_TouchScroll_Then_NestedElementReceivePointerEvents()
 		{
@@ -1307,7 +1311,7 @@ public async Task When_TouchScroll_Then_NestedElementReceivePointerEvents()
 		[TestMethod]
 		[RunsOnUIThread]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("Pointer injection supported only on skia for now.")]
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task When_TouchTap_Then_NestedElementReceivePointerEvents()
 		{
@@ -1348,8 +1352,10 @@ public async Task When_TouchTap_Then_NestedElementReceivePointerEvents()
 
 		[TestMethod]
 		[RunsOnUIThread]
-#if !HAS_INPUT_INJECTOR
-		[Ignore("Pointer injection supported only on skia for now.")]
+#if __WASM__
+		[Ignore("Scrolling is handled by native code and InputInjector is not yet able to inject native pointers.")]
+#elif !HAS_INPUT_INJECTOR
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task When_ReversedMouseWheel_Then_ScrollInReversedDirection()
 		{
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Slider.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Slider.cs
index c8fc2668ff87..4def1e82f94c 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Slider.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Slider.cs
@@ -3,6 +3,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Windows.UI.Input.Preview.Injection;
+using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -101,7 +102,7 @@ public async Task When_Value_Decimal()
 #if HAS_UNO
 		[TestMethod]
 #if !HAS_INPUT_INJECTOR
-		[Ignore("InputInjector is only supported on skia")]
+		[Ignore("InputInjector is not supported on this platform.")]
 #endif
 		public async Task When_Slider_Dragged()
 		{
@@ -129,13 +130,13 @@ public async Task When_Slider_Dragged()
 			mouse.Press(slider.GetAbsoluteBounds().GetCenter());
 			await WindowHelper.WaitForIdle();
 
-			Assert.IsTrue(Math.Abs(50 - slider.Value) < 1);
+			slider.Value.Should().BeInRange(49, 52, "we dragged the thumb at the center of the slider");
 
 			var clickableLength = slider.ActualWidth - slider.FindVisualChildByType<Thumb>().ActualWidth;
 
 			mouse.MoveBy(clickableLength / 4, 0);
 
-			Assert.IsTrue(Math.Abs(75 - slider.Value) < 1);
+			slider.Value.Should().BeInRange(74, 76, "we dragged the thumb 1/4 of width on right");
 
 			mouse.Release();
 		}
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_TextBlock.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_TextBlock.cs
index 138b83c82719..6d9c46cc6b56 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_TextBlock.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_TextBlock.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Uno.Helpers;
 using Uno.UI.RuntimeTests.Helpers;
@@ -8,8 +9,12 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Documents;
+using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Imaging;
+using Windows.ApplicationModel.DataTransfer;
+using Windows.System;
+using Windows.UI.Input.Preview.Injection;
 using FluentAssertions;
 using static Private.Infrastructure.TestServices;
 using System.Collections.Generic;
@@ -20,13 +25,8 @@
 using Size = Windows.Foundation.Size;
 
 #if __SKIA__
-using System;
-using Windows.ApplicationModel.DataTransfer;
-using Windows.System;
-using Windows.UI.Input.Preview.Injection;
 using SkiaSharp;
 using Microsoft.UI.Xaml.Documents.TextFormatting;
-using Microsoft.UI.Xaml.Input;
 #endif
 
 namespace Uno.UI.RuntimeTests.Tests.Windows_UI_Xaml_Controls
@@ -37,6 +37,8 @@ public class Given_TextBlock
 	{
 #if __ANDROID__
 		[Ignore("Visually looks good, but fails :(")]
+#elif !HAS_RENDER_TARGET_BITMAP
+		[Ignore("Cannot take screenshot on this platform.")]
 #endif
 		[TestMethod]
 		[DataRow((ushort)400, FontStyle.Italic, FontStretch.Condensed, "ms-appx:///Assets/Fonts/OpenSans/OpenSans_Condensed-MediumItalic.ttf")]
@@ -711,16 +713,13 @@ public async Task When_FontFamily_In_AndroidAsset()
 		}
 
 		[TestMethod]
-		public async Task When_SolidColorBrush_With_Opacity()
-		{
-			if (!ApiInformation.IsTypePresent("Microsoft.UI.Xaml.Media.Imaging.RenderTargetBitmap"))
-			{
-				Assert.Inconclusive(); // System.NotImplementedException: RenderTargetBitmap is not supported on this platform.;
-			}
-
 #if __MACOS__
-			Assert.Inconclusive();
+		[Ignore("Currently fails on macOS, part of #9282 epic")]
+#elif !HAS_RENDER_TARGET_BITMAP
+		[Ignore("Cannot take screenshot on this platform.")]
 #endif
+		public async Task When_SolidColorBrush_With_Opacity()
+		{
 			var SUT = new TextBlock
 			{
 				Text = "••••••••",
@@ -903,8 +902,12 @@ public async Task When_TextTrimmingNone()
 #if HAS_UNO // GetMouse is not available on WinUI
 		#region IsTextSelectionEnabled
 
-#if __SKIA__ // enable this region when InputInjector and IsTextSelectionEnabled are supported on more platforms
 		[TestMethod]
+#if !HAS_INPUT_INJECTOR
+		[Ignore("InputInjector is not supported on this platform.")]
+#elif !HAS_RENDER_TARGET_BITMAP
+		[Ignore("Cannot take screenshot on this platform.")]
+#endif
 		public async Task When_IsTextSelectionEnabled_PointerDrag()
 		{
 			var SUT = new TextBlock
@@ -948,6 +951,11 @@ public async Task When_IsTextSelectionEnabled_PointerDrag()
 		}
 
 		[TestMethod]
+#if !HAS_INPUT_INJECTOR
+		[Ignore("InputInjector is not supported on this platform.")]
+#elif !HAS_RENDER_TARGET_BITMAP
+		[Ignore("Cannot take screenshot on this platform.")]
+#endif
 		public async Task When_IsTextSelectionEnabled_DoubleTapped()
 		{
 			var SUT = new TextBlock
@@ -993,6 +1001,11 @@ public async Task When_IsTextSelectionEnabled_DoubleTapped()
 		}
 
 		[TestMethod]
+#if !HAS_INPUT_INJECTOR
+		[Ignore("InputInjector is not supported on this platform.")]
+#elif !HAS_RENDER_TARGET_BITMAP
+		[Ignore("Cannot take screenshot on this platform.")]
+#endif
 		public async Task When_IsTextSelectionEnabled_Chunking_DoubleTapped()
 		{
 			var SUT = new TextBlock
@@ -1039,6 +1052,11 @@ public async Task When_IsTextSelectionEnabled_Chunking_DoubleTapped()
 		}
 
 		[TestMethod]
+#if !HAS_INPUT_INJECTOR
+		[Ignore("InputInjector is not supported on this platform.")]
+#elif !HAS_RENDER_TARGET_BITMAP
+		[Ignore("Cannot take screenshot on this platform.")]
+#endif
 		public async Task When_IsTextSelectionEnabled_Wrapping_DoubleTapped()
 		{
 			var SUT = new TextBlock
@@ -1087,6 +1105,11 @@ public async Task When_IsTextSelectionEnabled_Wrapping_DoubleTapped()
 		}
 
 		[TestMethod]
+#if !HAS_INPUT_INJECTOR
+		[Ignore("InputInjector is not supported on this platform.")]
+#elif __WASM__
+		[Ignore("Requires authorization to access to the clipboard on WASM.")]
+#endif
 		public async Task When_IsTextSelectionEnabled_SurrogatePair_Copy()
 		{
 			var SUT = new TextBlock
@@ -1116,6 +1139,11 @@ public async Task When_IsTextSelectionEnabled_SurrogatePair_Copy()
 		}
 
 		[TestMethod]
+#if !HAS_INPUT_INJECTOR
+		[Ignore("InputInjector is not supported on this platform.")]
+#elif __WASM__
+		[Ignore("Requires authorization to access to the clipboard on WASM.")]
+#endif
 		public async Task When_IsTextSelectionEnabled_CRLF()
 		{
 			var SUT = new TextBlock
@@ -1177,7 +1205,9 @@ public async Task When_IsTextSelectionEnabled_CRLF()
 		}
 
 		[TestMethod]
-#if !__SKIA__
+#if !HAS_INPUT_INJECTOR
+		[Ignore("InputInjector is not supported on this platform.")]
+#elif !__SKIA__
 		[Ignore("The context menu is only implemented on skia.")]
 #endif
 		[DataRow(true)]
@@ -1208,6 +1238,11 @@ public async Task When_TextBlock_RightTapped(bool isTextSelectionEnabled)
 		}
 
 		[TestMethod]
+#if !HAS_INPUT_INJECTOR
+		[Ignore("InputInjector is not supported on this platform.")]
+#elif !HAS_RENDER_TARGET_BITMAP
+		[Ignore("Cannot take screenshot on this platform.")]
+#endif
 		public async Task When_IsTextSelectionEnabled_Keyboard_SelectAll_Copy()
 		{
 			var SUT = new TextBlock
@@ -1250,6 +1285,11 @@ public async Task When_IsTextSelectionEnabled_Keyboard_SelectAll_Copy()
 		}
 
 		[TestMethod]
+#if !HAS_INPUT_INJECTOR
+		[Ignore("InputInjector is not supported on this platform.")]
+#elif !HAS_RENDER_TARGET_BITMAP
+		[Ignore("Cannot take screenshot on this platform.")]
+#endif
 		public async Task When_IsTextSelectionEnabled_ContextMenu_SelectAll()
 		{
 			var SUT = new TextBlock
@@ -1289,6 +1329,11 @@ public async Task When_IsTextSelectionEnabled_ContextMenu_SelectAll()
 		}
 
 		[TestMethod]
+#if !HAS_INPUT_INJECTOR
+		[Ignore("InputInjector is not supported on this platform.")]
+#elif !__SKIA__
+		[Ignore("The context menu is only implemented on skia.")]
+#endif
 		public async Task When_IsTextSelectionEnabled_ContextMenu_Copy()
 		{
 			var SUT = new TextBlock
@@ -1320,9 +1365,8 @@ public async Task When_IsTextSelectionEnabled_ContextMenu_Copy()
 
 			Assert.AreEqual("world", await Clipboard.GetContent()!.GetTextAsync());
 		}
-#endif
-
 		#endregion
+#endif
 
 #if __SKIA__
 		[TestMethod]
@@ -1337,7 +1381,6 @@ public async Task When_Inside_TextBox_FireDrawingEventsOnEveryRedraw()
 
 			Assert.IsFalse(textBox.TextBoxView.DisplayBlock.Inlines.FireDrawingEventsOnEveryRedraw);
 		}
-#endif
 #endif
 	}
 }
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_TextBox.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_TextBox.cs
index 5b46b67bdb5d..eaa5528bcd92 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_TextBox.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_TextBox.cs
@@ -107,6 +107,9 @@ public async Task When_TwoWay_Text_Binding(UpdateSourceTrigger trigger)
 		}
 
 		[TestMethod]
+#if !HAS_RENDER_TARGET_BITMAP
+		[Ignore("Cannot take screenshot on this platform.")]
+#endif
 		public async Task When_BorderThickness_Zero()
 		{
 			using var fluent = StyleHelper.UseFluentStyles();
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Icons/Given_BitmapIcon.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Icons/Given_BitmapIcon.cs
index 9d56447454aa..ef0d27b15016 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Icons/Given_BitmapIcon.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Icons/Given_BitmapIcon.cs
@@ -55,6 +55,9 @@ public async Task When_Themed_Fluent()
 	}
 
 	[TestMethod]
+#if !HAS_RENDER_TARGET_BITMAP
+	[Ignore("Cannot take screenshot on this platform.")]
+#endif
 	public async Task When_Foreground_Set_With_ShowAsMonochrome_False()
 	{
 		var bitmapIcon = new BitmapIcon()
@@ -76,6 +79,9 @@ public async Task When_Foreground_Set_With_ShowAsMonochrome_False()
 	}
 
 	[TestMethod]
+#if !HAS_RENDER_TARGET_BITMAP
+	[Ignore("Cannot take screenshot on this platform.")]
+#endif
 	public async Task When_Foreground_Set_With_ShowAsMonochrome_True()
 	{
 		var bitmapIcon = new BitmapIcon
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Documents/Given_Hyperlink.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Documents/Given_Hyperlink.cs
index 7f4e645e5f93..af072003c04c 100644
--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Documents/Given_Hyperlink.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Documents/Given_Hyperlink.cs
@@ -48,8 +48,10 @@ public async Task TestSimpleHyperlink(bool useDark, bool useFluent, string expec
 #if HAS_UNO
 	[TestMethod]
 	[RunsOnUIThread]
-#if !HAS_INPUT_INJECTOR
-	[Ignore("InputInjector is only supported on skia")]
+#if __WASM__
+	[Ignore("Visual states/Colors are handled by browser.")]
+#elif !HAS_INPUT_INJECTOR
+	[Ignore("InputInjector is not supported on this platform.")]
 #endif
 	[DataRow(true, false, "#FF0078D7", "#99FFFFFF")]
 	[DataRow(false, false, "#FF0078D7", "#99000000")]
@@ -99,8 +101,10 @@ public async Task TestHoveredHyperlink(bool useDark, bool useFluent, string expe
 #if HAS_UNO
 	[TestMethod]
 	[RunsOnUIThread]
-#if !HAS_INPUT_INJECTOR
-	[Ignore("InputInjector is only supported on skia")]
+#if __WASM__
+	[Ignore("Visual states/Colors are handled by browser.")]
+#elif !HAS_INPUT_INJECTOR
+	[Ignore("InputInjector is not supported on this platform.")]
 #endif
 	[DataRow(true, false, "#FF0078D7", "#99FFFFFF", "#66FFFFFF")]
 	[DataRow(false, false, "#FF0078D7", "#99000000", "#66000000")]
diff --git a/src/Uno.UI.RuntimeTests/UITests/_Engine/SkiaApp.MouseHelper.cs b/src/Uno.UI.RuntimeTests/UITests/_Engine/RuntimeTestsApp.MouseHelper.cs
similarity index 98%
rename from src/Uno.UI.RuntimeTests/UITests/_Engine/SkiaApp.MouseHelper.cs
rename to src/Uno.UI.RuntimeTests/UITests/_Engine/RuntimeTestsApp.MouseHelper.cs
index 5e5d14622fc0..4a737acd1ae9 100644
--- a/src/Uno.UI.RuntimeTests/UITests/_Engine/SkiaApp.MouseHelper.cs
+++ b/src/Uno.UI.RuntimeTests/UITests/_Engine/RuntimeTestsApp.MouseHelper.cs
@@ -9,7 +9,7 @@
 
 namespace Uno.UITest;
 
-public partial class SkiaApp
+public partial class RuntimeTestsApp
 {
 	private class MouseHelper
 	{
diff --git a/src/Uno.UI.RuntimeTests/UITests/_Engine/SkiaApp.cs b/src/Uno.UI.RuntimeTests/UITests/_Engine/RuntimeTestsApp.cs
similarity index 67%
rename from src/Uno.UI.RuntimeTests/UITests/_Engine/SkiaApp.cs
rename to src/Uno.UI.RuntimeTests/UITests/_Engine/RuntimeTestsApp.cs
index c45ab63e2d68..a7dbcae94523 100644
--- a/src/Uno.UI.RuntimeTests/UITests/_Engine/SkiaApp.cs
+++ b/src/Uno.UI.RuntimeTests/UITests/_Engine/RuntimeTestsApp.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using System.Threading;
 using System.Threading.Tasks;
 using Windows.Devices.Input;
 using Windows.UI.Input.Preview.Injection;
@@ -14,19 +15,20 @@
 using Private.Infrastructure;
 using Uno.UI.Extensions;
 using Uno.UI.RuntimeTests;
+using Uno.UI.RuntimeTests.Helpers;
 using Uno.UITest.Helpers.Queries;
 
 namespace Uno.UITest;
 
-public partial class SkiaApp : IApp
+public partial class RuntimeTestsApp : IApp
 {
-	private static SkiaApp? _current; // Make sure to not create multiple instances of the app (with a single InputInjector instance)!
-	internal static SkiaApp Current => _current ??= new();
+	private static RuntimeTestsApp? _current; // Make sure to not create multiple instances of the app (with a single InputInjector instance)!
+	internal static RuntimeTestsApp Current => _current ??= new();
 
 	private readonly InputInjector _input;
 	private MouseHelper Mouse { get; }
 
-	private SkiaApp()
+	private RuntimeTestsApp()
 	{
 		_input = InputInjector.TryCreate() ?? throw new InvalidOperationException("Cannot create input injector");
 		Mouse = new MouseHelper(_input);
@@ -46,11 +48,20 @@ private SkiaApp()
 
 	public async Task RunAsync(string metadataName)
 	{
+#if __SKIA__
 		var assemblyName = "SamplesApp.Skia";
+#elif __WASM__
+		var assemblyName = "SamplesApp.Wasm";
+#else
+		throw new PlatformNotSupportedException();
+#pragma warning disable CS0162
+		var assemblyName = "";
+#endif
 		if (TestServices.WindowHelper.IsXamlIsland)
 		{
 			assemblyName = "UnoIslands" + assemblyName;
 		}
+
 		if (Type.GetType($"{metadataName}, {assemblyName}") is { } sampleType
 			&& Activator.CreateInstance(sampleType) is FrameworkElement sample)
 		{
@@ -73,6 +84,7 @@ public async Task RunAsync(string metadataName)
 		{
 			throw new InvalidOperationException($"Failed to run sample '{metadataName}'");
 		}
+#pragma warning restore CS0162
 	}
 
 	QueryResult[] IApp.Query(string marked) => Query(marked);
@@ -248,12 +260,110 @@ IEnumerable<InjectedInputTouchInfo> Inputs()
 		}
 	}
 
+#if HAS_UNO
+	public async ValueTask DragCoordinatesAsync(double fromX, double fromY, double toX, double toY, CancellationToken ct = default)
+	{
+		switch (CurrentPointerType)
+		{
+			case PointerDeviceType.Touch:
+				_input.InitializeTouchInjection(InjectedInputVisualizationMode.Default);
+				await _input.InjectTouchInputAsync(Inputs(), ct);
+				_input.UninitializeTouchInjection();
+
+				IEnumerable<InjectedInputTouchInfo> Inputs()
+				{
+					yield return new()
+					{
+						PointerInfo = new()
+						{
+							PointerId = 42,
+							PixelLocation = new()
+							{
+								PositionX = (int)fromX,
+								PositionY = (int)fromY
+							},
+							PointerOptions = InjectedInputPointerOptions.New
+								| InjectedInputPointerOptions.FirstButton
+								| InjectedInputPointerOptions.PointerDown
+								| InjectedInputPointerOptions.InContact
+								| InjectedInputPointerOptions.InRange
+						}
+					};
+
+					var steps = 10;
+					var stepX = (toX - fromX) / steps;
+					var stepY = (toY - fromY) / steps;
+					for (var step = 0; step <= steps; step++)
+					{
+						yield return new()
+						{
+							PointerInfo = new()
+							{
+								PixelLocation = new()
+								{
+									PositionX = (int)(fromX + step * stepX),
+									PositionY = (int)(fromY + step * stepY)
+								},
+								PointerOptions = InjectedInputPointerOptions.Update
+									| InjectedInputPointerOptions.FirstButton
+									| InjectedInputPointerOptions.InContact
+									| InjectedInputPointerOptions.InRange
+							}
+						};
+					}
+
+					yield return new()
+					{
+						PointerInfo = new()
+						{
+							PixelLocation =
+							{
+								PositionX = (int)toX,
+								PositionY = (int)toY
+							},
+							PointerOptions = InjectedInputPointerOptions.FirstButton
+								| InjectedInputPointerOptions.PointerUp
+						}
+					};
+				}
+				break;
+
+			case PointerDeviceType.Mouse:
+				await InjectMouseInputAsync(Mouse.ReleaseAny(), ct);
+				await InjectMouseInputAsync(Mouse.MoveTo(fromX, fromY), ct);
+				await InjectMouseInputAsync(Mouse.Press(), ct);
+				await InjectMouseInputAsync(Mouse.MoveTo(toX, toY), ct);
+				await InjectMouseInputAsync(Mouse.Release(), ct);
+				break;
+
+			default:
+				throw NotSupported();
+		}
+	}
+
+	private ValueTask InjectMouseInputAsync(IEnumerable<InjectedInputMouseInfo?> input, CancellationToken ct)
+		=> _input.InjectMouseInputAsync(input.Where(i => i is not null).Cast<InjectedInputMouseInfo>(), ct);
+
+	private ValueTask InjectMouseInputAsync(InjectedInputMouseInfo? input, CancellationToken ct)
+		=> _input.InjectMouseInputAsync(new[] { input }.Where(i => i is not null).Cast<InjectedInputMouseInfo>(), ct);
+#endif
+
 	private void InjectMouseInput(IEnumerable<InjectedInputMouseInfo?> input)
 		=> _input.InjectMouseInput(input.Where(i => i is not null).Cast<InjectedInputMouseInfo>());
 
+
 	private void InjectMouseInput(params InjectedInputMouseInfo?[] input)
 		=> _input.InjectMouseInput(input.Where(i => i is not null).Cast<InjectedInputMouseInfo>());
 
 	private Exception NotSupported([CallerMemberName] string operation = "")
 		=> new NotSupportedException($"'{operation}' with type '{CurrentPointerType}' is not supported yet on this platform. Feel free to contribute!");
+
+	public async ValueTask<RawBitmap> TakeScreenshotAsync(string name)
+	{
+		var screenshot = await UITestHelper.ScreenShot((FrameworkElement)TestServices.WindowHelper.XamlRoot.Content!);
+#if false
+		UITestHelper.Save(screenshot, name);
+#endif
+		return screenshot;
+	}
 }
diff --git a/src/Uno.UI.RuntimeTests/UITests/_Engine/SkiaAppExtensions.cs b/src/Uno.UI.RuntimeTests/UITests/_Engine/RuntimeTestsAppExtensions.cs
similarity index 90%
rename from src/Uno.UI.RuntimeTests/UITests/_Engine/SkiaAppExtensions.cs
rename to src/Uno.UI.RuntimeTests/UITests/_Engine/RuntimeTestsAppExtensions.cs
index 49b681de59e1..1621dd74c7f7 100644
--- a/src/Uno.UI.RuntimeTests/UITests/_Engine/SkiaAppExtensions.cs
+++ b/src/Uno.UI.RuntimeTests/UITests/_Engine/RuntimeTestsAppExtensions.cs
@@ -5,7 +5,7 @@
 
 namespace Uno.UITest.Helpers.Queries;
 
-internal static class SkiaAppExtensions
+internal static class RuntimeTestsAppExtensions
 {
 	// This class contains compatibility method to match the Uno.UITest.IApp contract.
 	// Those methods are directly on the IApp interface but are not expected to be imported on the refreshed
@@ -17,6 +17,9 @@ public static QueryEx Marked(this IApp app, string elementName)
 	public static void Tap(this IApp app, string elementName)
 		=> app.Marked(elementName).Tap();
 
+	public static void Tap(this IApp app, QueryEx marked)
+		=> marked.Tap();
+
 	// WARNING: Those version does not wait on runtime UI tests ...
 	// TODO: We need to create async versions (and remove those!).
 	public static IEnumerable<QueryResult> WaitForElement(this IApp app, string elementName)
diff --git a/src/Uno.UI.RuntimeTests/UITests/_Engine/SampleControlUITestBase.cs b/src/Uno.UI.RuntimeTests/UITests/_Engine/SampleControlUITestBase.cs
index a4e2935107b7..24b47167a1d4 100644
--- a/src/Uno.UI.RuntimeTests/UITests/_Engine/SampleControlUITestBase.cs
+++ b/src/Uno.UI.RuntimeTests/UITests/_Engine/SampleControlUITestBase.cs
@@ -5,6 +5,7 @@
 using Windows.Devices.Input;
 using Uno.Testing;
 using Uno.UI.RuntimeTests;
+using Uno.UI.RuntimeTests.Helpers;
 using Uno.UITest;
 
 namespace SamplesApp.UITests;
@@ -12,7 +13,7 @@ namespace SamplesApp.UITests;
 // Note: All tests that are inheriting from this base class will run on UI thread.
 public class SampleControlUITestBase : IInjectPointers
 {
-	protected SkiaApp App => SkiaApp.Current;
+	protected RuntimeTestsApp App => RuntimeTestsApp.Current;
 
 	/// <summary>
 	/// Gets the default pointer type for the current platform
@@ -21,8 +22,13 @@ public class SampleControlUITestBase : IInjectPointers
 
 	public PointerDeviceType CurrentPointerType => App.CurrentPointerType;
 
-	protected async Task RunAsync(string metadataName)
+	protected async Task RunAsync(string metadataName, bool skipInitialScreenshot = true)
 	{
+		if (skipInitialScreenshot is not true)
+		{
+			throw new NotSupportedException("Initial screenshot is not supported by runtime tests.");
+		}
+
 		await App.RunAsync(metadataName);
 	}
 
@@ -32,4 +38,7 @@ void IInjectPointers.CleanupPointers()
 	/// <inheritdoc />
 	public IDisposable SetPointer(PointerDeviceType type)
 		=> App.SetPointer(type);
+
+	public ValueTask<RawBitmap> TakeScreenshotAsync(string name)
+		=> App.TakeScreenshotAsync(name);
 }
diff --git a/src/Uno.UI.RuntimeTests/UITests/_Engine/UnoUITests/Helpers/QueryExtensions.cs b/src/Uno.UI.RuntimeTests/UITests/_Engine/UnoUITests/Helpers/QueryExtensions.cs
index af107a7b776e..5c92ad2167f0 100644
--- a/src/Uno.UI.RuntimeTests/UITests/_Engine/UnoUITests/Helpers/QueryExtensions.cs
+++ b/src/Uno.UI.RuntimeTests/UITests/_Engine/UnoUITests/Helpers/QueryExtensions.cs
@@ -11,14 +11,14 @@ namespace Uno.UITest.Helpers.Queries;
 
 internal static class Helpers
 {
-	internal static SkiaApp App { get; set; }
+	internal static RuntimeTestsApp App { get; set; }
 }
 
 internal static partial class QueryExtensions
 {
 	// This class contains extensions method to match the Uno.UITest.Helpers.Queries.QueryExtensions contract.
 
-	private static SkiaApp App => Helpers.App;
+	private static RuntimeTestsApp App => Helpers.App;
 
 	public static void Tap(this QueryEx query)
 	{
diff --git a/src/Uno.UI.RuntimeTests/UITestsImport.props b/src/Uno.UI.RuntimeTests/UITestsImport.props
index c0ecc81aa60c..12211a97d4d2 100644
--- a/src/Uno.UI.RuntimeTests/UITestsImport.props
+++ b/src/Uno.UI.RuntimeTests/UITestsImport.props
@@ -2,6 +2,7 @@
 
 	<ItemGroup>
 		<!-- File path or directy with globbing relative to SamplesApp\SamplesApp.UITests directory -->
+		<UITests Include="$(MSBuildThisFileDirectory)..\SamplesApp\SamplesApp.UITests\**\Windows_UI_Xaml\DragAndDropTests\DragDrop_TreeView_Reorder_Automated.cs" />
 		<UITests Include="$(MSBuildThisFileDirectory)..\SamplesApp\SamplesApp.UITests\**\Windows_UI_Xaml_Controls\FlyoutTests\UnoSamples_Tests.Flyout_OverlayInputPassThroughElement.cs" />
 		<UITests Include="$(MSBuildThisFileDirectory)..\SamplesApp\SamplesApp.UITests\**\Windows_UI_Xaml_Controls\ListViewTests\Selection_Pointers.cs" />
 		<UITests Include="$(MSBuildThisFileDirectory)..\SamplesApp\SamplesApp.UITests\**\Windows_UI_Xaml_Controls\SwipeControlTests\SwipeControlTests.cs" />
diff --git a/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Wasm.csproj b/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Wasm.csproj
index 19b6d9556d96..1b9f1b598365 100644
--- a/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Wasm.csproj
+++ b/src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.Wasm.csproj
@@ -40,6 +40,7 @@
 	</ItemGroup>
 
 	<Import Project="UnitTestsImport.props" />
+	<Import Project="UITestsImport.props" />
 
 	<ItemGroup>
 		<EmbeddedResource Include="Assets\Border_Snapshot.bgra8" />
diff --git a/src/Uno.UI/Runtime/BrowserPointerInputSource.wasm.cs b/src/Uno.UI/Runtime/BrowserPointerInputSource.wasm.cs
new file mode 100644
index 000000000000..4e9b854d4c1d
--- /dev/null
+++ b/src/Uno.UI/Runtime/BrowserPointerInputSource.wasm.cs
@@ -0,0 +1,376 @@
+#nullable enable
+
+using System;
+using Windows.Devices.Input;
+using Windows.Foundation;
+using Windows.UI.Core;
+using Windows.UI.Input;
+using Microsoft.UI.Xaml.Controls;
+using static Windows.UI.Input.PointerUpdateKind;
+using Uno.Foundation.Logging;
+using System.Runtime.InteropServices.JavaScript;
+
+using _PointerIdentifierPool = Windows.Devices.Input.PointerIdentifierPool; // internal type (should be in Uno namespace)
+using _PointerIdentifier = Windows.Devices.Input.PointerIdentifier; // internal type (should be in Uno namespace)
+using _NativeMethods = __Windows.UI.Core.CoreWindow.NativeMethods;
+using System.Runtime.InteropServices;
+using Windows.System;
+
+namespace Uno.UI.Runtime;
+
+internal partial class BrowserPointerInputSource : IUnoCorePointerInputSource
+{
+	// Ref:
+	// https://www.w3.org/TR/pointerevents/
+	// https://developer.mozilla.org/en-US/docs/Web/API/PointerEvent
+	// https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent
+
+	private static readonly Logger _log = typeof(BrowserPointerInputSource).Log();
+	private static readonly Logger? _logTrace = _log.IsTraceEnabled(LogLevel.Trace) ? _log : null;
+
+	private ulong _bootTime;
+	private PointerPoint? _lastPoint;
+	private CoreCursor _pointerCursor = new(CoreCursorType.Arrow, 0);
+
+#pragma warning disable CS0067 // Some event are not raised on skia browser ... yet!
+	public event TypedEventHandler<object, Windows.UI.Core.PointerEventArgs>? PointerCaptureLost;
+#pragma warning restore CS0067 // Some event are not raised on skia browser ... yet!
+	public event TypedEventHandler<object, Windows.UI.Core.PointerEventArgs>? PointerEntered;
+	public event TypedEventHandler<object, Windows.UI.Core.PointerEventArgs>? PointerExited;
+	public event TypedEventHandler<object, Windows.UI.Core.PointerEventArgs>? PointerMoved;
+	public event TypedEventHandler<object, Windows.UI.Core.PointerEventArgs>? PointerPressed;
+	public event TypedEventHandler<object, Windows.UI.Core.PointerEventArgs>? PointerReleased;
+	public event TypedEventHandler<object, Windows.UI.Core.PointerEventArgs>? PointerWheelChanged;
+	public event TypedEventHandler<object, Windows.UI.Core.PointerEventArgs>? PointerCancelled; // Uno Only
+
+	public BrowserPointerInputSource()
+	{
+		_logTrace?.Trace("Initializing BrowserPointerInputSource");
+
+		Initialize(this);
+	}
+
+	[JSImport("globalThis.Uno.UI.Runtime.Skia.BrowserPointerInputSource.initialize")]
+	private static partial void Initialize([JSMarshalAs<JSType.Any>] object inputSource);
+
+	[JSExport]
+	private static void OnInitialized([JSMarshalAs<JSType.Any>] object inputSource, double bootTime)
+	{
+		((BrowserPointerInputSource)inputSource)._bootTime = (ulong)bootTime;
+
+		_logTrace?.Trace("Complete initialization of BrowserPointerInputSource, we are now ready to receive pointer events!");
+	}
+
+	[JSExport]
+	[return: JSMarshalAs<JSType.Number>]
+	private static int OnNativeEvent(
+		[JSMarshalAs<JSType.Any>] object inputSource,
+		byte @event, // ONE of NativePointerEvent
+		double timestamp,
+		int deviceType, // ONE of _PointerDeviceType
+		double pointerId, // Warning: This is a Number in JS, and it might be negative on safari for iOS
+		double x,
+		double y,
+		bool ctrl,
+		bool shift,
+		int buttons,
+		int buttonUpdate,
+		double pressure,
+		double wheelDeltaX,
+		double wheelDeltaY,
+		bool hasRelatedTarget)
+	{
+
+		try
+		{
+			_logTrace?.Trace($"Pointer evt={(HtmlPointerEvent)@event}|id={pointerId}|x={x}|y={x}|ctrl={ctrl}|shift={shift}|bts={buttons}|btUpdate={buttonUpdate}|type={(PointerDeviceType)deviceType}|ts={timestamp}|pres={pressure}|wheelX={wheelDeltaX}|wheelY={wheelDeltaY}|relTarget={hasRelatedTarget}");
+
+			var that = (BrowserPointerInputSource)inputSource;
+			var evt = (HtmlPointerEvent)@event;
+			var pointerType = (PointerDeviceType)deviceType;
+			var pointerDevice = PointerDevice.For(pointerType);
+			var pointerIdentifier = _PointerIdentifierPool.RentManaged(new _PointerIdentifier((PointerDeviceType)deviceType, (uint)pointerId));
+
+			var frameId = ToFrameId(timestamp);
+			var ts = that.ToTimeStamp(timestamp);
+			var isInContact = buttons != 0;
+			var isInRange = GetIsInRange(@event, hasRelatedTarget, pointerType, isInContact);
+			var keyModifiers = GetKeyModifiers(ctrl, shift);
+			var position = new Point(x, y);
+
+			var properties = GetProperties(pointerType, isInRange, (HtmlPointerButtonsState)buttons, (HtmlPointerButtonUpdate)buttonUpdate, wheel: (false, -wheelDeltaY), pressure);
+
+			var point = new PointerPoint(frameId, ts, pointerDevice, pointerIdentifier.Id, position, position, isInContact, properties);
+			var args = new PointerEventArgs(point, keyModifiers);
+
+			that._lastPoint = point;
+
+			switch (evt)
+			{
+				case HtmlPointerEvent.pointerover:
+					that.PointerEntered?.Invoke(that, args);
+					break;
+
+				case HtmlPointerEvent.pointerleave:
+					that.PointerExited?.Invoke(that, args);
+					break;
+
+				case HtmlPointerEvent.pointerdown:
+					that.PointerPressed?.Invoke(that, args);
+					break;
+
+				case HtmlPointerEvent.pointerup:
+					//case HtmlPointerEvent.lostpointercapture: // if pointer is captured, we don't get a up, just a capture lost (with skia for wasm)
+					that.PointerReleased?.Invoke(that, args);
+					_PointerIdentifierPool.ReleaseManaged(pointerIdentifier);
+					break;
+
+				case HtmlPointerEvent.pointermove:
+					that.PointerMoved?.Invoke(that, args);
+					break;
+
+				case HtmlPointerEvent.wheel:
+					if (wheelDeltaY is not 0)
+					{
+						that.PointerWheelChanged?.Invoke(that, args);
+					}
+
+					if (wheelDeltaX is not 0)
+					{
+						properties = GetProperties(pointerType, isInRange, (HtmlPointerButtonsState)buttons, (HtmlPointerButtonUpdate)buttonUpdate, wheel: (true, wheelDeltaX), pressure);
+						point = new PointerPoint(frameId, ts, pointerDevice, pointerIdentifier.Id, position, position, isInContact, properties);
+						args = new PointerEventArgs(point, keyModifiers);
+
+						that.PointerWheelChanged?.Invoke(that, args);
+					}
+
+					break;
+
+				case HtmlPointerEvent.pointercancel:
+					that.PointerCancelled?.Invoke(that, args);
+					_PointerIdentifierPool.ReleaseManaged(pointerIdentifier);
+					break;
+
+				default:
+					throw new ArgumentOutOfRangeException(nameof(@event), $"Unknown event ({@event}-{evt}).");
+			}
+
+			return (int)Microsoft.UI.Xaml.HtmlEventDispatchResult.Ok;
+		}
+		catch (Exception error)
+		{
+			if (_log.IsEnabled(LogLevel.Error))
+			{
+				_log.Error($"Failed to dispatch native pointer event: {error}");
+			}
+
+			return (int)Microsoft.UI.Xaml.HtmlEventDispatchResult.Ok;
+		}
+	}
+
+	[NotImplemented] public bool HasCapture => false;
+
+	public CoreCursor PointerCursor
+	{
+		get => _pointerCursor;
+		set
+		{
+			_pointerCursor = value;
+			_NativeMethods.SetCursor(_pointerCursor.Type.ToCssCursor());
+		}
+	}
+
+	public Point PointerPosition => _lastPoint?.Position ?? default;
+
+	#region Captures
+	public void SetPointerCapture()
+	{
+		if (_lastPoint is not null)
+		{
+			SetPointerCapture(_lastPoint.Pointer);
+		}
+	}
+	public void SetPointerCapture(PointerIdentifier pointer)
+	{
+		if (_PointerIdentifierPool.TryGetNative(pointer, out var native))
+		{
+			SetPointerCaptureNative(native.Id);
+		}
+		else if (this.Log().IsEnabled(LogLevel.Warning))
+		{
+			this.Log().Warn($"Cannot capture pointer, could not find native pointer id for managed pointer id {pointer}");
+		}
+	}
+
+	[JSImport("globalThis.Uno.UI.Runtime.Skia.BrowserPointerInputSource.setPointerCapture")]
+	private static partial void SetPointerCaptureNative(double pointerId); // double as it might be negative on safari for iOS
+
+	public void ReleasePointerCapture()
+	{
+		if (_lastPoint is not null)
+		{
+			ReleasePointerCapture(_lastPoint.Pointer);
+		}
+	}
+
+	public void ReleasePointerCapture(PointerIdentifier pointer)
+	{
+		if (_PointerIdentifierPool.TryGetNative(pointer, out var native))
+		{
+			ReleasePointerCaptureNative(native.Id);
+		}
+		else if (this.Log().IsEnabled(LogLevel.Warning))
+		{
+			this.Log().Warn($"Cannot release pointer, could not find native pointer id for managed pointer id {pointer}");
+		}
+	}
+
+	[JSImport("globalThis.Uno.UI.Runtime.Skia.BrowserPointerInputSource.releasePointerCapture")]
+	private static partial void ReleasePointerCaptureNative(double pointerId); // double as it might be negative on safari for iOS
+	#endregion
+
+	#region Native to manage convertion helpers
+	private static VirtualKeyModifiers GetKeyModifiers(bool ctrl, bool shift)
+	{
+		var keyModifiers = VirtualKeyModifiers.None;
+		if (ctrl) keyModifiers |= VirtualKeyModifiers.Control;
+		if (shift) keyModifiers |= VirtualKeyModifiers.Shift;
+		return keyModifiers;
+	}
+
+	private static bool GetIsInRange(byte @event, bool hasRelatedTarget, PointerDeviceType pointerType, bool isInContact)
+	{
+		const int cancel = (int)HtmlPointerEvent.pointercancel;
+		const int exitOrUp = (int)(HtmlPointerEvent.pointerleave | HtmlPointerEvent.pointerup);
+
+		var isInRange = true;
+		if (@event is cancel)
+		{
+			isInRange = false;
+		}
+		else if ((@event & exitOrUp) != 0)
+		{
+			isInRange = pointerType switch
+			{
+				PointerDeviceType.Mouse => true, // Mouse is always in range (unless for 'cancel' eg. if it was unplugged from computer)
+				PointerDeviceType.Touch => false, // If we get a pointer out for touch, it means that pointer left the screen (pt up - a.k.a. Implicit capture)
+				PointerDeviceType.Pen => hasRelatedTarget, // If the relatedTarget is null it means pointer left the detection range ... but only for out event!
+				_ => !isInContact // Safety!
+			};
+		}
+
+		return isInRange;
+	}
+
+	private static PointerPointProperties GetProperties(
+		PointerDeviceType deviceType,
+		bool isInRange,
+		HtmlPointerButtonsState buttons,
+		HtmlPointerButtonUpdate buttonUpdate,
+		(bool isHorizontalWheel, double delta) wheel,
+		double pressure)
+	{
+		var props = new PointerPointProperties
+		{
+			IsPrimary = true,
+			IsInRange = isInRange,
+			IsLeftButtonPressed = buttons.HasFlag(HtmlPointerButtonsState.Left),
+			IsMiddleButtonPressed = buttons.HasFlag(HtmlPointerButtonsState.Middle),
+			IsRightButtonPressed = buttons.HasFlag(HtmlPointerButtonsState.Right),
+			IsXButton1Pressed = buttons.HasFlag(HtmlPointerButtonsState.X1),
+			IsXButton2Pressed = buttons.HasFlag(HtmlPointerButtonsState.X2),
+			IsEraser = buttons.HasFlag(HtmlPointerButtonsState.Eraser),
+			IsHorizontalMouseWheel = wheel.isHorizontalWheel,
+			MouseWheelDelta = (int)wheel.delta
+		};
+
+		switch (deviceType)
+		{
+			// For touch and mouse, we keep the default pressure of .5, as WinUI
+
+			case PointerDeviceType.Pen:
+				// !!! WARNING !!! Here we have a slight different behavior compared to WinUI:
+				// On WinUI we will get IsRightButtonPressed (with IsBarrelButtonPressed) only if the user is pressing
+				// the barrel button when pen goes "in contact" (i.e. touches the screen), otherwise we will get
+				// IsLeftButtonPressed and IsBarrelButtonPressed.
+				// Here we set IsRightButtonPressed as soon as the barrel button was pressed, no matter
+				// if the pen was already in contact or not.
+				// This is acceptable since the UIElement pressed state is **per pointer** (not buttons of pointer)
+				// and GestureRecognizer always checks that pressed buttons didn't changed for a single gesture.
+				props.IsBarrelButtonPressed = props.IsRightButtonPressed;
+				props.Pressure = (float)pressure;
+				break;
+		}
+
+		// Needs to be computed only after the props is almost completed
+		props.PointerUpdateKind = ToUpdateKind(buttonUpdate, props);
+
+		return props;
+	}
+
+	internal static uint ToFrameId(double timestamp)
+		// Known limitation: After 49 days, we will overflow the uint and frame IDs will restart at 0.
+		=> (uint)(timestamp % uint.MaxValue);
+
+	private ulong ToTimeStamp(double timestamp)
+		=> _bootTime + (ulong)(timestamp * TimeSpan.TicksPerMillisecond);
+
+	private static PointerUpdateKind ToUpdateKind(HtmlPointerButtonUpdate update, PointerPointProperties props)
+		=> update switch
+		{
+			HtmlPointerButtonUpdate.Left when props.IsLeftButtonPressed => PointerUpdateKind.LeftButtonPressed,
+			HtmlPointerButtonUpdate.Left => PointerUpdateKind.LeftButtonReleased,
+			HtmlPointerButtonUpdate.Middle when props.IsMiddleButtonPressed => PointerUpdateKind.MiddleButtonPressed,
+			HtmlPointerButtonUpdate.Middle => PointerUpdateKind.MiddleButtonReleased,
+			HtmlPointerButtonUpdate.Right when props.IsRightButtonPressed => PointerUpdateKind.RightButtonPressed,
+			HtmlPointerButtonUpdate.Right => PointerUpdateKind.RightButtonReleased,
+			HtmlPointerButtonUpdate.X1 when props.IsXButton1Pressed => PointerUpdateKind.XButton1Pressed,
+			HtmlPointerButtonUpdate.X1 => PointerUpdateKind.XButton1Released,
+			HtmlPointerButtonUpdate.X2 when props.IsXButton2Pressed => PointerUpdateKind.XButton1Pressed,
+			HtmlPointerButtonUpdate.X2 => PointerUpdateKind.XButton1Released,
+			_ => PointerUpdateKind.Other
+		};
+
+	private enum HtmlPointerEvent : byte
+	{
+		// WARNING: This enum has a corresponding version in TypeScript!
+
+		// Minimal default pointer required to maintain state
+		pointerover = 1,
+		pointerleave = 1 << 1,
+		pointerdown = 1 << 2,
+		pointerup = 1 << 3,
+		pointercancel = 1 << 4,
+		pointermove = 1 << 5, // Required since when pt is captured, isOver will be maintained by the moveWithOverCheck
+		lostpointercapture = 1 << 6, // Required to get pointer up when pointer is captured
+
+		// Optional pointer events
+		wheel = 1 << 7,
+	}
+
+	[Flags]
+	internal enum HtmlPointerButtonsState
+	{
+		// https://developer.mozilla.org/en-US/docs/Web/API/Pointer_events#Determining_button_states
+
+		None = 0,
+		Left = 1,
+		Middle = 4,
+		Right = 2,
+		X1 = 8,
+		X2 = 16,
+		Eraser = 32,
+	}
+
+	private enum HtmlPointerButtonUpdate
+	{
+		None = -1,
+		Left = 0,
+		Middle = 1,
+		Right = 2,
+		X1 = 3,
+		X2 = 4,
+		Eraser = 5
+	}
+	#endregion
+}
diff --git a/src/Uno.UI/UI/Xaml/Application.wasm.cs b/src/Uno.UI/UI/Xaml/Application.wasm.cs
index 6ceb301fc845..41b240f3e855 100644
--- a/src/Uno.UI/UI/Xaml/Application.wasm.cs
+++ b/src/Uno.UI/UI/Xaml/Application.wasm.cs
@@ -23,7 +23,7 @@
 using Uno.Helpers;
 using Uno.UI.Xaml.Controls;
 using Uno.UI.Dispatching;
-
+using Uno.UI.Runtime;
 
 #if HAS_UNO_WINUI
 using LaunchActivatedEventArgs = Microsoft/* UWP don't rename */.UI.Xaml.LaunchActivatedEventArgs;
@@ -46,6 +46,9 @@ partial void InitializePartial()
 				throw new InvalidOperationException("The application must be started using Application.Start first, e.g. Microsoft.UI.Xaml.Application.Start(_ => new App());");
 			}
 
+			global::Uno.Foundation.Extensibility.ApiExtensibility.Register(
+				typeof(IUnoCorePointerInputSource),
+				o => new BrowserPointerInputSource());
 			global::Uno.Foundation.Extensibility.ApiExtensibility.Register(
 				typeof(global::Windows.ApplicationModel.DataTransfer.DragDrop.Core.IDragDropExtension),
 				o => global::Windows.ApplicationModel.DataTransfer.DragDrop.Core.DragDropExtension.GetForCurrentView());
diff --git a/src/Uno.UI/UI/Xaml/Controls/Image/HtmlImage.wasm.cs b/src/Uno.UI/UI/Xaml/Controls/Image/HtmlImage.wasm.cs
index 8e35da26190a..b24c60de7d67 100644
--- a/src/Uno.UI/UI/Xaml/Controls/Image/HtmlImage.wasm.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/Image/HtmlImage.wasm.cs
@@ -9,4 +9,8 @@ public HtmlImage() : base("img")
 		// Avoid the "drag effect" which is set by default in browsers
 		SetAttribute("draggable", "false");
 	}
+
+	// We don't want HtmlImage to be the OriginalSource of PointerRoutedEventArgs.
+	// We want the HitTest call to return Image instead of HtmlImage to match WinUI behavior.
+	internal override bool IsViewHit() => false;
 }
diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.cs b/src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.cs
index cb96236fd7f9..f543ba1c8dca 100644
--- a/src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.cs
@@ -42,11 +42,13 @@ public partial class TextBlock : DependencyObject
 		private string _inlinesText; // Text derived from the content of Inlines
 
 #if !__WASM__
-		private Hyperlink _hyperlinkOver;
-		private bool _subscribeToPointerEvents;
+		// Used for text selection which is handled natively
 		private bool _isPressed;
 #endif
 
+		private Hyperlink _hyperlinkOver;
+		private bool _subscribeToPointerEvents;
+
 		private Action _foregroundChanged;
 
 		private Run _reusableRun;
@@ -881,56 +883,6 @@ private void UpdateInlines(string text)
 
 		#region pointer events
 
-#if __WASM__
-		// As on wasm the TextElements are UIElement, when the hosting TextBlock will capture the pointer on Pressed,
-		// the original source of the Release event will be this TextBlock (and we won't receive 'pointerup' nor 'click'
-		// events on the Hyperlink itself - On FF we will still get the 'click').
-		// To workaround that, we subscribe to the events directly on the Hyperlink, and make the Capture on this hyperlink.
-
-		private void UpdateHyperlinks() { } // Events are subscribed in Hyperlink's ctor.
-
-		internal static readonly PointerEventHandler OnPointerPressed = (object sender, PointerRoutedEventArgs e) =>
-		{
-			if (sender is Hyperlink hyperlink
-				&& e.GetCurrentPoint(hyperlink).Properties.IsLeftButtonPressed
-				&& hyperlink.CapturePointer(e.Pointer))
-			{
-				hyperlink.SetPointerPressed(e.Pointer);
-				e.Handled = true;
-				// hyperlink.CompleteGesture(); No needs to complete the gesture as the TextBlock won't even receive the Pressed.
-			}
-			else if (sender is TextBlock textBlock && textBlock.IsTextSelectionEnabled)
-			{
-				// Selectable TextBlock should also handle pointer pressed to ensure
-				// RootVisual does not steal its focus.
-				e.Handled = true;
-			}
-		};
-
-		internal static readonly PointerEventHandler OnPointerReleased = (object sender, PointerRoutedEventArgs e) =>
-		{
-			if (sender is Hyperlink hyperlink
-				&& hyperlink.IsCaptured(e.Pointer))
-			{
-				// Un UWP we don't get the Tapped event, so make sure to abort it
-				(hyperlink.GetParent() as TextBlock)?.CompleteGesture();
-
-				hyperlink.ReleasePointerPressed(e.Pointer);
-			}
-
-			// e.Handled = true; ==> On UWP the pointer released is **NOT** handled
-		};
-
-		internal static readonly PointerEventHandler OnPointerCaptureLost = (object sender, PointerRoutedEventArgs e) =>
-		{
-			if (sender is Hyperlink hyperlink)
-			{
-				var handled = hyperlink.AbortPointerPressed(e.Pointer);
-
-				e.Handled = handled;
-			}
-		};
-#else
 		private static readonly PointerEventHandler OnPointerPressed = (object sender, PointerRoutedEventArgs e) =>
 		{
 			if (sender is not TextBlock that)
@@ -938,15 +890,16 @@ private void UpdateHyperlinks() { } // Events are subscribed in Hyperlink's ctor
 				return;
 			}
 
-			var point = e.GetCurrentPoint(that);
-			if (!point.Properties.IsLeftButtonPressed)
+			if (!e.GetCurrentPoint(null).Properties.IsLeftButtonPressed)
 			{
 				return;
 			}
 
+#if !__WASM__
 			that._isPressed = true;
+#endif
 
-			if (that.FindHyperlinkAt(point.Position) is Hyperlink hyperlink)
+			if (that.FindHyperlinkAt(e) is Hyperlink hyperlink)
 			{
 				if (!that.CapturePointer(e.Pointer))
 				{
@@ -957,8 +910,11 @@ private void UpdateHyperlinks() { } // Events are subscribed in Hyperlink's ctor
 				e.Handled = true;
 				that.CompleteGesture(); // Make sure to mute Tapped
 			}
+#if !__WASM__
 			else if (that.IsTextSelectionEnabled)
 			{
+				var point = e.GetCurrentPoint(that);
+
 #if __SKIA__ // GetCharacterIndexAtPoint returns -1 if point isn't on any char. For pointers, we still want to get the closest char
 				var index = that.GetCharacterIndexAtPoint(point.Position, true);
 #else // TODO: add an option to get the closest char to point
@@ -974,6 +930,7 @@ private void UpdateHyperlinks() { } // Events are subscribed in Hyperlink's ctor
 
 				that.CapturePointer(e.Pointer);
 			}
+#endif
 		};
 
 		private static readonly PointerEventHandler OnPointerReleased = (object sender, PointerRoutedEventArgs e) =>
@@ -983,18 +940,19 @@ private void UpdateHyperlinks() { } // Events are subscribed in Hyperlink's ctor
 				return;
 			}
 
-
-			if (that._isPressed && that.IsTextSelectionEnabled && that.FindHyperlinkAt(e.GetCurrentPoint(that).Position) is { })
+#if !__WASM__
+			if (that._isPressed && that.IsTextSelectionEnabled && that.FindHyperlinkAt(e) is { })
 			{
 				// if we release on a hyperlink, we don't select anything
 				that.Selection = new Range(0, 0);
 			}
 
 			that._isPressed = false;
+#endif
 
 			if (that.IsCaptured(e.Pointer))
 			{
-				var hyperlink = that.FindHyperlinkAt(e.GetCurrentPoint(that).Position);
+				var hyperlink = that.FindHyperlinkAt(e);
 				// On UWP we don't get the Tapped event if we tapped a hyperlink, so make sure to abort it.
 				if (hyperlink is { })
 				{
@@ -1013,13 +971,11 @@ private void UpdateHyperlinks() { } // Events are subscribed in Hyperlink's ctor
 					// so we won't receive the CaptureLost. So make sure to AbortPointerPressed on the Hyperlink which made the capture.
 					that.AbortHyperlinkCaptures(e.Pointer);
 				}
-				else
-				{
-					e.Handled = true;
-				}
 			}
 
+#if !__WASM__
 			e.Handled |= that.IsTextSelectionEnabled;
+#endif
 		};
 
 		private static readonly PointerEventHandler OnPointerCaptureLost = (object sender, PointerRoutedEventArgs e) =>
@@ -1037,9 +993,7 @@ private void UpdateHyperlinks() { } // Events are subscribed in Hyperlink's ctor
 				return;
 			}
 
-			var point = e.GetCurrentPoint(that);
-
-			var hyperlink = that.FindHyperlinkAt(point.Position);
+			var hyperlink = that.FindHyperlinkAt(e);
 			if (that._hyperlinkOver != hyperlink)
 			{
 				that._hyperlinkOver?.ReleasePointerOver(e.Pointer);
@@ -1047,8 +1001,10 @@ private void UpdateHyperlinks() { } // Events are subscribed in Hyperlink's ctor
 				hyperlink?.SetPointerOver(e.Pointer);
 			}
 
+#if !__WASM__
 			if (that._isPressed && that.IsTextSelectionEnabled)
 			{
+				var point = e.GetCurrentPoint(that);
 #if __SKIA__ // GetCharacterIndexAtPoint returns -1 if point isn't on any char. For pointers, we still want to get the closest char
 				var index = that.GetCharacterIndexAtPoint(point.Position, true);
 #else // TODO: add an option to get the closest char to point
@@ -1059,6 +1015,7 @@ private void UpdateHyperlinks() { } // Events are subscribed in Hyperlink's ctor
 					that.Selection = that.Selection with { end = index };
 				}
 			}
+#endif
 		};
 
 		private static readonly PointerEventHandler OnPointerEntered = (sender, e) =>
@@ -1072,9 +1029,7 @@ private void UpdateHyperlinks() { } // Events are subscribed in Hyperlink's ctor
 			// TODO: make it such that this assertion doesn't fail
 			// global::System.Diagnostics.Debug.Assert(that._hyperlinkOver == null);
 
-			var point = e.GetCurrentPoint(that);
-
-			var hyperlink = that.FindHyperlinkAt(point.Position);
+			var hyperlink = that.FindHyperlinkAt(e);
 
 			that._hyperlinkOver = hyperlink;
 			hyperlink?.SetPointerOver(e.Pointer);
@@ -1112,7 +1067,11 @@ private bool AbortHyperlinkCaptures(Pointer pointer)
 
 		private void RecalculateSubscribeToPointerEvents()
 		{
-			SubscribeToPointerEvents = HasHyperlink || IsTextSelectionEnabled;
+			SubscribeToPointerEvents = HasHyperlink
+#if !__WASM__
+				|| IsTextSelectionEnabled
+#endif
+				;
 		}
 
 		private void UpdateHyperlinks()
@@ -1212,18 +1171,43 @@ private bool SubscribeToPointerEvents
 			}
 		}
 
-
-		private Hyperlink FindHyperlinkAt(Point point)
+		private Hyperlink FindHyperlinkAt(PointerRoutedEventArgs e)
 		{
+#if __WASM__
+			var point = e.GetCurrentPoint(null).Position;
+			var elementInCoordinate = WindowManagerInterop.TryGetElementInCoordinate(point) as TextElement;
+			while (elementInCoordinate is not null)
+			{
+				if (elementInCoordinate is Hyperlink)
+				{
+					break;
+				}
+
+				elementInCoordinate = elementInCoordinate.GetParent() as TextElement;
+			}
+
+			if (elementInCoordinate is Hyperlink hyperlink)
+			{
+				foreach (var candidate in _hyperlinks)
+				{
+					if (hyperlink == candidate.hyperlink)
+					{
+						return hyperlink;
+					}
+				}
+			}
+
+			return null;
+#else
+			var point = e.GetCurrentPoint(this).Position;
 			var characterIndex = GetCharacterIndexAtPoint(point);
 			var hyperlink = _hyperlinks
 				.FirstOrDefault(h => h.start <= characterIndex && h.end > characterIndex)
 				.hyperlink;
 
 			return hyperlink;
-		}
 #endif
-
+		}
 		#endregion
 
 		private void InvalidateTextBlock()
diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.wasm.cs b/src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.wasm.cs
index bd550087f863..3c8720e16c96 100644
--- a/src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.wasm.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.wasm.cs
@@ -53,6 +53,7 @@ public TextBlock() : base("p")
 			OnIsTextSelectionEnabledChangedPartial();
 			InitializeDefaultValues();
 
+			_hyperlinks.CollectionChanged += HyperlinksOnCollectionChanged;
 		}
 
 		/// <summary>
diff --git a/src/Uno.UI/UI/Xaml/Documents/Hyperlink.wasm.cs b/src/Uno.UI/UI/Xaml/Documents/Hyperlink.wasm.cs
index 7cff3680b208..08db88218c47 100644
--- a/src/Uno.UI/UI/Xaml/Documents/Hyperlink.wasm.cs
+++ b/src/Uno.UI/UI/Xaml/Documents/Hyperlink.wasm.cs
@@ -13,9 +13,6 @@ public Hyperlink() : base("a")
 		{
 			UpdateNavigationProperties(null, _defaultNavigationTarget);
 
-			PointerPressed += TextBlock.OnPointerPressed;
-			PointerReleased += TextBlock.OnPointerReleased;
-			PointerCaptureLost += TextBlock.OnPointerCaptureLost;
 			OnUnderlineStyleChanged();
 		}
 
diff --git a/src/Uno.UI/UI/Xaml/Documents/InlineCollection.cs b/src/Uno.UI/UI/Xaml/Documents/InlineCollection.cs
index 8437802b89ad..014c7df86ae2 100644
--- a/src/Uno.UI/UI/Xaml/Documents/InlineCollection.cs
+++ b/src/Uno.UI/UI/Xaml/Documents/InlineCollection.cs
@@ -1,27 +1,51 @@
-#if !__WASM__
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
+#if __WASM__
+using System.Collections.Specialized;
+using System.Linq;
+
+#endif
 using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.UI.Xaml.Documents
 {
 	public partial class InlineCollection : IList<Inline>, IEnumerable<Inline>
 	{
+#if __WASM__
+		private readonly UIElementCollection _collection;
+#else
 		private readonly DependencyObjectCollection<Inline> _collection = new DependencyObjectCollection<Inline>();
+#endif
 
+#if __WASM__
+		internal InlineCollection(UIElement containerElement)
+		{
+			_collection = new UIElementCollection(containerElement);
+			_collection.CollectionChanged += OnCollectionChanged;
+		}
+#else
 		internal InlineCollection(DependencyObject parent)
 		{
 			_collection.SetParent(parent);
 			_collection.VectorChanged += (s, e) => OnCollectionChanged();
 		}
+#endif
 
-		private void OnCollectionChanged()
+		private void OnCollectionChanged(
+#if __WASM__
+			 object sender, NotifyCollectionChangedEventArgs e
+#endif
+			)
 		{
 #if !IS_UNIT_TESTS
 			_preorderTree = null;
 
+#if __WASM__
+			switch (_collection.Owner)
+#else
 			switch (_collection.GetParent())
+#endif
 			{
 				case TextBlock textBlock:
 					textBlock.InvalidateInlines(true);
@@ -43,7 +67,7 @@ private Inline[] GetPreorderTree()
 		{
 			if (_collection.Count == 1 && _collection[0] is not Span)
 			{
-				return new Inline[] { _collection[0] };
+				return new Inline[] { (Inline)_collection[0] };
 			}
 			else if (_collection.Count == 0)
 			{
@@ -53,12 +77,20 @@ private Inline[] GetPreorderTree()
 			{
 				var result = new List<Inline>(4);
 
+
+#if __WASM__
+				foreach (var current in _collection)
+				{
+					GetPreorderTreeInner((Inline)current, result);
+				}
+#else
 				var enumerator = _collection.GetEnumeratorFast();
 
 				while (enumerator.MoveNext())
 				{
 					GetPreorderTreeInner(enumerator.Current, result);
 				}
+#endif
 
 				return result.ToArray();
 			}
@@ -69,21 +101,35 @@ static void GetPreorderTreeInner(Inline inline, List<Inline> accumulator)
 
 				if (inline is Span span)
 				{
+#if __WASM__
+					foreach (var current in span.Inlines._collection)
+					{
+						GetPreorderTreeInner((Inline)current, accumulator);
+					}
+#else
 					var enumerator = span.Inlines.GetEnumeratorFast();
 
 					while (enumerator.MoveNext())
 					{
 						GetPreorderTreeInner(enumerator.Current, accumulator);
 					}
+#endif
 				}
 			}
 		}
 
-		public IEnumerator<Inline> GetEnumerator() => _collection.GetEnumerator();
+		public IEnumerator<Inline> GetEnumerator() =>
+#if __WASM__
+			_collection.OfType<Inline>().GetEnumerator();
+#else
+			_collection.GetEnumerator();
+#endif
 
 		IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
+#if !__WASM__
 		internal List<Inline>.Enumerator GetEnumeratorFast() => _collection.GetEnumeratorFast();
+#endif
 
 		/// <inheritdoc />
 		public void Add(Inline item) => _collection.Add(item);
@@ -123,4 +169,3 @@ public Inline this[int index]
 		}
 	}
 }
-#endif
diff --git a/src/Uno.UI/UI/Xaml/Documents/InlineCollection.wasm.cs b/src/Uno.UI/UI/Xaml/Documents/InlineCollection.wasm.cs
deleted file mode 100644
index 160cd4f7e6c8..000000000000
--- a/src/Uno.UI/UI/Xaml/Documents/InlineCollection.wasm.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using Microsoft.UI.Xaml.Controls;
-
-namespace Microsoft.UI.Xaml.Documents
-{
-	partial class InlineCollection : IList<Inline>, IEnumerable<Inline>
-	{
-		private readonly UIElementCollection _collection;
-
-		internal InlineCollection(UIElement containerElement)
-		{
-			_collection = new UIElementCollection(containerElement);
-			_collection.CollectionChanged += OnCollectionChanged;
-		}
-
-		private void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-		{
-			switch (_collection.Owner)
-			{
-				case TextBlock textBlock:
-					textBlock.InvalidateInlines(true);
-					break;
-				case Inline inline:
-					inline.InvalidateInlines(true);
-					break;
-				default:
-					break;
-			}
-		}
-
-		/// <inheritdoc />
-		public IEnumerator<Inline> GetEnumerator() => _collection.OfType<Inline>().GetEnumerator();
-
-		IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-
-		/// <inheritdoc />
-		public void Add(Inline item) => _collection.Add(item);
-
-		/// <inheritdoc />
-		public void Clear() => _collection.Clear();
-
-		/// <inheritdoc />
-		public bool Contains(Inline item) => _collection.Contains(item);
-
-		/// <inheritdoc />
-		public void CopyTo(Inline[] array, int arrayIndex) => _collection.CopyTo(array, arrayIndex);
-
-		/// <inheritdoc />
-		public bool Remove(Inline item) => _collection.Remove(item);
-
-		/// <inheritdoc />
-		public int Count => _collection.Count;
-
-		/// <inheritdoc />
-		public bool IsReadOnly => false;
-
-		/// <inheritdoc />
-		public int IndexOf(Inline item) => _collection.IndexOf(item);
-
-		/// <inheritdoc />
-		public void Insert(int index, Inline item) => _collection.Insert(index, item);
-
-		/// <inheritdoc />
-		public void RemoveAt(int index) => _collection.RemoveAt(index);
-
-		/// <inheritdoc />
-		public Inline this[int index]
-		{
-			get => (Inline)_collection[index];
-			set => _collection[index] = value;
-		}
-	}
-}
diff --git a/src/Uno.UI/UI/Xaml/DragDrop/DragDropExtension.wasm.cs b/src/Uno.UI/UI/Xaml/DragDrop/DragDropExtension.wasm.cs
index 02c433dd0dc7..a77c7e999089 100644
--- a/src/Uno.UI/UI/Xaml/DragDrop/DragDropExtension.wasm.cs
+++ b/src/Uno.UI/UI/Xaml/DragDrop/DragDropExtension.wasm.cs
@@ -32,6 +32,8 @@
 
 using NativeMethods = __Windows.ApplicationModel.DataTransfer.DragDrop.Core.DragDropExtension.NativeMethods;
 using System.Runtime.InteropServices.JavaScript;
+using Uno.UI.Runtime;
+using _HtmlPointerButtonsState = Uno.UI.Runtime.BrowserPointerInputSource.HtmlPointerButtonsState;
 
 // As IDragDropExtension is internal, the generated registration cannot be used.
 // [assembly: ApiExtension(typeof(Windows.ApplicationModel.DataTransfer.DragDrop.Core.IDragDropExtension), typeof(Windows.ApplicationModel.DataTransfer.DragDrop.Core.DragDropExtension))]
@@ -381,7 +383,7 @@ public NativeDrop(DragDropExtensionEventArgs args)
 			public long Id => _args.id;
 
 			/// <inheritdoc />
-			public uint FrameId => PointerRoutedEventArgs.ToFrameId(_args.timestamp);
+			public uint FrameId => BrowserPointerInputSource.ToFrameId(_args.timestamp);
 
 			/// <inheritdoc />
 			public (Point location, DragDropModifiers modifier) GetState()
@@ -389,16 +391,16 @@ public NativeDrop(DragDropExtensionEventArgs args)
 				var position = new Point(_args.x, _args.y);
 				var modifier = DragDropModifiers.None;
 
-				var buttons = (WindowManagerInterop.HtmlPointerButtonsState)_args.buttons;
-				if (buttons.HasFlag(WindowManagerInterop.HtmlPointerButtonsState.Left))
+				var buttons = (_HtmlPointerButtonsState)_args.buttons;
+				if (buttons.HasFlag(_HtmlPointerButtonsState.Left))
 				{
 					modifier |= DragDropModifiers.LeftButton;
 				}
-				if (buttons.HasFlag(WindowManagerInterop.HtmlPointerButtonsState.Middle))
+				if (buttons.HasFlag(_HtmlPointerButtonsState.Middle))
 				{
 					modifier |= DragDropModifiers.MiddleButton;
 				}
-				if (buttons.HasFlag(WindowManagerInterop.HtmlPointerButtonsState.Right))
+				if (buttons.HasFlag(_HtmlPointerButtonsState.Right))
 				{
 					modifier |= DragDropModifiers.RightButton;
 				}
@@ -465,7 +467,7 @@ private struct DragDropExtensionEventArgs
 			public override string ToString()
 			{
 				return $"[{eventName}] {timestamp:F0} @({x:F2},{y:F2})"
-					+ $" | buttons: {(WindowManagerInterop.HtmlPointerButtonsState)buttons}"
+					+ $" | buttons: {(_HtmlPointerButtonsState)buttons}"
 					+ $" | modifiers: {string.Join(", ", GetModifiers(this))}"
 					+ $" | allowed: {allowedOperations} ({ToDataPackageOperation(allowedOperations)})"
 					+ $" | accepted: {acceptedOperation}"
diff --git a/src/Uno.UI/UI/Xaml/Input/PointerRoutedEventArgs.cs b/src/Uno.UI/UI/Xaml/Input/PointerRoutedEventArgs.cs
index 0462f8932e59..f419bb54d6d9 100644
--- a/src/Uno.UI/UI/Xaml/Input/PointerRoutedEventArgs.cs
+++ b/src/Uno.UI/UI/Xaml/Input/PointerRoutedEventArgs.cs
@@ -53,6 +53,8 @@ public IList<PointerPoint> GetIntermediatePoints(UIElement relativeTo)
 
 		internal bool CanceledByDirectManipulation { get; set; }
 
+		internal bool IsInjected { get; set; }
+
 		public bool IsGenerated { get; } // Generated events are not supported by UNO
 
 		public bool Handled { get; set; }
diff --git a/src/Uno.UI/UI/Xaml/Input/PointerRoutedEventArgs.wasm.cs b/src/Uno.UI/UI/Xaml/Input/PointerRoutedEventArgs.wasm.cs
index b9e81c09255d..69ff1f43e62b 100644
--- a/src/Uno.UI/UI/Xaml/Input/PointerRoutedEventArgs.wasm.cs
+++ b/src/Uno.UI/UI/Xaml/Input/PointerRoutedEventArgs.wasm.cs
@@ -1,149 +1,17 @@
 using System;
-using System.Globalization;
 using Windows.Foundation;
-using Windows.System;
-using Uno.Foundation;
-using Uno.UI.Xaml;
 using Uno.UI.Xaml.Input;
 
-using PointerIdentifier = Windows.Devices.Input.PointerIdentifier; // internal type (should be in Uno namespace)
-#if HAS_UNO_WINUI
-using Microsoft.UI.Input;
-#else
-using Windows.Devices.Input;
-using Windows.UI.Input;
-#endif
+namespace Microsoft.UI.Xaml.Input;
 
-namespace Microsoft.UI.Xaml.Input
+partial class PointerRoutedEventArgs : IHtmlHandleableRoutedEventArgs
 {
-	partial class PointerRoutedEventArgs : IHtmlHandleableRoutedEventArgs
-	{
-		private readonly double _timestamp;
-		private readonly Point _absolutePosition;
-		private readonly WindowManagerInterop.HtmlPointerButtonsState _buttons;
-		private readonly WindowManagerInterop.HtmlPointerButtonUpdate _buttonUpdate;
-		private readonly double _pressure;
-		private readonly (bool isHorizontalWheel, double delta) _wheel;
-
-		internal PointerRoutedEventArgs(
-			double timestamp,
-			PointerIdentifier pointerUniqueId,
-			Point absolutePosition,
-			bool isInContact,
-			bool isInRange,
-			WindowManagerInterop.HtmlPointerButtonsState buttons,
-			WindowManagerInterop.HtmlPointerButtonUpdate buttonUpdate,
-			VirtualKeyModifiers keys,
-			double pressure,
-			(bool isHorizontalWheel, double delta) wheel,
-			UIElement source)
-			: this()
-		{
-			_timestamp = timestamp;
-			_absolutePosition = absolutePosition;
-			_buttons = buttons;
-			_buttonUpdate = buttonUpdate;
-			_pressure = pressure;
-			_wheel = wheel;
-
-			FrameId = ToFrameId(timestamp);
-			Pointer = new Pointer(pointerUniqueId, isInContact, isInRange);
-			KeyModifiers = keys;
-			OriginalSource = source;
-		}
-
-		/// <inheritdoc />
-		/// <remarks>Default value for pointers is <see cref="HtmlEventDispatchResult.StopPropagation"/>.</remarks>
-		HtmlEventDispatchResult IHtmlHandleableRoutedEventArgs.HandledResult { get; set; } = HtmlEventDispatchResult.StopPropagation;
-
-		public PointerPoint GetCurrentPoint(UIElement relativeTo)
-		{
-			var timestamp = ToTimeStamp(_timestamp);
-			var device = global::Windows.Devices.Input.PointerDevice.For((global::Windows.Devices.Input.PointerDeviceType)Pointer.PointerDeviceType);
-			var rawPosition = _absolutePosition;
-			var position = relativeTo == null
-				? rawPosition
-				: relativeTo.TransformToVisual(null).Inverse.TransformPoint(_absolutePosition);
-			var properties = GetProperties();
-
-			return new PointerPoint(FrameId, timestamp, device, Pointer.PointerId, rawPosition, position, Pointer.IsInContact, properties);
-		}
-
-		private PointerPointProperties GetProperties()
-		{
-			var props = new PointerPointProperties()
-			{
-				IsPrimary = true,
-				IsInRange = Pointer.IsInRange,
-			};
-
-			props.IsLeftButtonPressed = _buttons.HasFlag(WindowManagerInterop.HtmlPointerButtonsState.Left);
-			props.IsMiddleButtonPressed = _buttons.HasFlag(WindowManagerInterop.HtmlPointerButtonsState.Middle);
-			props.IsRightButtonPressed = _buttons.HasFlag(WindowManagerInterop.HtmlPointerButtonsState.Right);
-			props.IsXButton1Pressed = _buttons.HasFlag(WindowManagerInterop.HtmlPointerButtonsState.X1);
-			props.IsXButton2Pressed = _buttons.HasFlag(WindowManagerInterop.HtmlPointerButtonsState.X2);
-			props.IsEraser = _buttons.HasFlag(WindowManagerInterop.HtmlPointerButtonsState.Eraser);
-
-			props.IsHorizontalMouseWheel = _wheel.isHorizontalWheel;
-			props.MouseWheelDelta = (int)_wheel.delta;
-
-			switch (Pointer.PointerDeviceType)
-			{
-				// For touch and mouse, we keep the default pressure of .5, as WinUI
-
-				case PointerDeviceType.Pen:
-					// !!! WARNING !!! Here we have a slight different behavior compared to WinUI:
-					// On WinUI we will get IsRightButtonPressed (with IsBarrelButtonPressed) only if the user is pressing
-					// the barrel button when pen goes "in contact" (i.e. touches the screen), otherwise we will get
-					// IsLeftButtonPressed and IsBarrelButtonPressed.
-					// Here we set IsRightButtonPressed as soon as the barrel button was pressed, no matter
-					// if the pen was already in contact or not.
-					// This is acceptable since the UIElement pressed state is **per pointer** (not buttons of pointer)
-					// and GestureRecognizer always checks that pressed buttons didn't changed for a single gesture.
-					props.IsBarrelButtonPressed = props.IsRightButtonPressed;
-					props.Pressure = (float)_pressure;
-					break;
-			}
-
-			props.PointerUpdateKind = ToUpdateKind(_buttonUpdate, props);
-
-			return props;
-		}
-
-		#region Misc static helpers
-		private static ulong? _bootTime;
-
-		private static ulong ToTimeStamp(double timestamp)
-		{
-			_bootTime ??= (ulong)(WindowManagerInterop.GetBootTime() * TimeSpan.TicksPerMillisecond);
-
-			return _bootTime.Value + (ulong)(timestamp * TimeSpan.TicksPerMillisecond);
-		}
-
-		internal static uint ToFrameId(double timestamp)
-			// Known limitation: After 49 days, we will overflow the uint and frame IDs will restart at 0.
-			=> (uint)(timestamp % uint.MaxValue);
-
-		internal static Point ToRelativePosition(Point absolutePosition, UIElement relativeTo)
-			=> relativeTo == null
-				? absolutePosition
-				: relativeTo.TransformToVisual(null).Inverse.TransformPoint(absolutePosition);
-
-		private static PointerUpdateKind ToUpdateKind(WindowManagerInterop.HtmlPointerButtonUpdate update, PointerPointProperties props)
-			=> update switch
-			{
-				WindowManagerInterop.HtmlPointerButtonUpdate.Left when props.IsLeftButtonPressed => PointerUpdateKind.LeftButtonPressed,
-				WindowManagerInterop.HtmlPointerButtonUpdate.Left => PointerUpdateKind.LeftButtonReleased,
-				WindowManagerInterop.HtmlPointerButtonUpdate.Middle when props.IsMiddleButtonPressed => PointerUpdateKind.MiddleButtonPressed,
-				WindowManagerInterop.HtmlPointerButtonUpdate.Middle => PointerUpdateKind.MiddleButtonReleased,
-				WindowManagerInterop.HtmlPointerButtonUpdate.Right when props.IsRightButtonPressed => PointerUpdateKind.RightButtonPressed,
-				WindowManagerInterop.HtmlPointerButtonUpdate.Right => PointerUpdateKind.RightButtonReleased,
-				WindowManagerInterop.HtmlPointerButtonUpdate.X1 when props.IsXButton1Pressed => PointerUpdateKind.XButton1Pressed,
-				WindowManagerInterop.HtmlPointerButtonUpdate.X1 => PointerUpdateKind.XButton1Released,
-				WindowManagerInterop.HtmlPointerButtonUpdate.X2 when props.IsXButton2Pressed => PointerUpdateKind.XButton1Pressed,
-				WindowManagerInterop.HtmlPointerButtonUpdate.X2 => PointerUpdateKind.XButton1Released,
-				_ => PointerUpdateKind.Other
-			};
-		#endregion
-	}
+	/// <inheritdoc />
+	/// <remarks>Default value for pointers is <see cref="HtmlEventDispatchResult.StopPropagation"/>.</remarks>
+	HtmlEventDispatchResult IHtmlHandleableRoutedEventArgs.HandledResult { get; set; } = HtmlEventDispatchResult.StopPropagation;
+
+	internal static Point ToRelativePosition(Point absolutePosition, UIElement relativeTo)
+		=> relativeTo == null
+			? absolutePosition
+			: relativeTo.TransformToVisual(null).Inverse.TransformPoint(absolutePosition);
 }
diff --git a/src/Uno.UI/UI/Xaml/Internal/InputManager.Pointers.Managed.cs b/src/Uno.UI/UI/Xaml/Internal/InputManager.Pointers.Managed.cs
index 31d3042f411b..c2dd932db439 100644
--- a/src/Uno.UI/UI/Xaml/Internal/InputManager.Pointers.Managed.cs
+++ b/src/Uno.UI/UI/Xaml/Internal/InputManager.Pointers.Managed.cs
@@ -74,8 +74,7 @@ public void Init(object host)
 			{
 				if (this.Log().IsEnabled(LogLevel.Error))
 				{
-					this.Log().Error(
-						"Failed to initialize the PointerManager: cannot resolve the IUnoCorePointerInputSource.");
+					this.Log().Error("Failed to initialize the PointerManager: cannot resolve the IUnoCorePointerInputSource.");
 				}
 				return;
 			}
@@ -192,7 +191,7 @@ public void Dispose()
 		}
 		#endregion
 
-		private void OnPointerWheelChanged(Windows.UI.Core.PointerEventArgs args)
+		private void OnPointerWheelChanged(Windows.UI.Core.PointerEventArgs args, bool isInjected = false)
 		{
 			if (IsRedirectedToInteractionTracker(args.CurrentPoint.PointerId))
 			{
@@ -239,7 +238,7 @@ private void OnPointerWheelChanged(Windows.UI.Core.PointerEventArgs args)
 			}
 #endif
 
-			var routedArgs = new PointerRoutedEventArgs(args, originalSource);
+			var routedArgs = new PointerRoutedEventArgs(args, originalSource) { IsInjected = isInjected };
 
 			// First raise the event, either on the OriginalSource or on the capture owners if any
 			RaiseUsingCaptures(Wheel, originalSource, routedArgs, setCursor: true);
@@ -270,7 +269,7 @@ private void OnPointerWheelChanged(Windows.UI.Core.PointerEventArgs args)
 			}
 		}
 
-		private void OnPointerEntered(Windows.UI.Core.PointerEventArgs args)
+		private void OnPointerEntered(Windows.UI.Core.PointerEventArgs args, bool isInjected = false)
 		{
 			if (IsRedirectedToInteractionTracker(args.CurrentPoint.PointerId))
 			{
@@ -299,12 +298,12 @@ private void OnPointerEntered(Windows.UI.Core.PointerEventArgs args)
 				Trace($"PointerEntered [{originalSource.GetDebugName()}]");
 			}
 
-			var routedArgs = new PointerRoutedEventArgs(args, originalSource);
+			var routedArgs = new PointerRoutedEventArgs(args, originalSource) { IsInjected = isInjected };
 
 			Raise(Enter, originalSource, routedArgs);
 		}
 
-		private void OnPointerExited(Windows.UI.Core.PointerEventArgs args)
+		private void OnPointerExited(Windows.UI.Core.PointerEventArgs args, bool isInjected = false)
 		{
 			if (IsRedirectedToInteractionTracker(args.CurrentPoint.PointerId))
 			{
@@ -339,7 +338,7 @@ private void OnPointerExited(Windows.UI.Core.PointerEventArgs args)
 				Trace($"PointerExited [{overBranchLeaf.GetDebugName()}]");
 			}
 
-			var routedArgs = new PointerRoutedEventArgs(args, originalSource);
+			var routedArgs = new PointerRoutedEventArgs(args, originalSource) { IsInjected = isInjected };
 
 			Raise(Leave, overBranchLeaf, routedArgs);
 			if (!args.CurrentPoint.IsInContact && (PointerDeviceType)args.CurrentPoint.Pointer.Type == PointerDeviceType.Touch)
@@ -350,7 +349,7 @@ private void OnPointerExited(Windows.UI.Core.PointerEventArgs args)
 			}
 		}
 
-		private void OnPointerPressed(Windows.UI.Core.PointerEventArgs args)
+		private void OnPointerPressed(Windows.UI.Core.PointerEventArgs args, bool isInjected = false)
 		{
 			// If 2+ mouse buttons are pressed, we only respond to the first.
 			var buttonsPressed = 0;
@@ -394,13 +393,13 @@ private void OnPointerPressed(Windows.UI.Core.PointerEventArgs args)
 				Trace($"PointerPressed [{originalSource.GetDebugName()}]");
 			}
 
-			var routedArgs = new PointerRoutedEventArgs(args, originalSource);
+			var routedArgs = new PointerRoutedEventArgs(args, originalSource) { IsInjected = isInjected };
 
 			_pressedElements[routedArgs.Pointer] = originalSource;
 			Raise(Pressed, originalSource, routedArgs);
 		}
 
-		private void OnPointerReleased(Windows.UI.Core.PointerEventArgs args)
+		private void OnPointerReleased(Windows.UI.Core.PointerEventArgs args, bool isInjected = false)
 		{
 			// When multiple mouse buttons are pressed and then released, we only respond to the last OnPointerReleased
 			// (i.e when no more buttons are still pressed).
@@ -438,7 +437,7 @@ private void OnPointerReleased(Windows.UI.Core.PointerEventArgs args)
 				Trace($"PointerReleased [{originalSource.GetDebugName()}]");
 			}
 
-			var routedArgs = new PointerRoutedEventArgs(args, originalSource);
+			var routedArgs = new PointerRoutedEventArgs(args, originalSource) { IsInjected = isInjected };
 
 			RaiseUsingCaptures(Released, originalSource, routedArgs, setCursor: false);
 			if (isOutOfWindow || (PointerDeviceType)args.CurrentPoint.Pointer.Type != PointerDeviceType.Touch)
@@ -454,7 +453,7 @@ private void OnPointerReleased(Windows.UI.Core.PointerEventArgs args)
 			ClearPressedState(routedArgs);
 		}
 
-		private void OnPointerMoved(Windows.UI.Core.PointerEventArgs args)
+		private void OnPointerMoved(Windows.UI.Core.PointerEventArgs args, bool isInjected = false)
 		{
 			if (TryRedirectPointerMove(args))
 			{
@@ -482,7 +481,7 @@ private void OnPointerMoved(Windows.UI.Core.PointerEventArgs args)
 				Trace($"PointerMoved [{originalSource.GetDebugName()}]");
 			}
 
-			var routedArgs = new PointerRoutedEventArgs(args, originalSource);
+			var routedArgs = new PointerRoutedEventArgs(args, originalSource) { IsInjected = isInjected };
 
 			// First raise the PointerExited events on the stale branch
 			if (staleBranch.HasValue)
@@ -506,7 +505,7 @@ private void OnPointerMoved(Windows.UI.Core.PointerEventArgs args)
 			RaiseUsingCaptures(Move, originalSource, routedArgs, setCursor: true);
 		}
 
-		private void OnPointerCancelled(Windows.UI.Core.PointerEventArgs args)
+		private void OnPointerCancelled(PointerEventArgs args, bool isInjected = false)
 		{
 			if (TryClearPointerRedirection(args.CurrentPoint.PointerId))
 			{
@@ -534,7 +533,7 @@ private void OnPointerCancelled(Windows.UI.Core.PointerEventArgs args)
 				Trace($"PointerCancelled [{originalSource.GetDebugName()}]");
 			}
 
-			var routedArgs = new PointerRoutedEventArgs(args, originalSource);
+			var routedArgs = new PointerRoutedEventArgs(args, originalSource) { IsInjected = isInjected };
 
 			RaiseUsingCaptures(Cancelled, originalSource, routedArgs, setCursor: false);
 			// Note: No ReleaseCaptures(routedArgs);, the cancel automatically raise it
@@ -567,23 +566,23 @@ internal void InjectPointerUpdated(PointerEventArgs args)
 
 			if (args.CurrentPoint.Properties.IsCanceled)
 			{
-				OnPointerCancelled(args);
+				OnPointerCancelled(args, isInjected: true);
 			}
 			else if (args.CurrentPoint.Properties.MouseWheelDelta is not 0)
 			{
-				OnPointerWheelChanged(args);
+				OnPointerWheelChanged(args, isInjected: true);
 			}
 			else if (kind is PointerUpdateKind.Other)
 			{
-				OnPointerMoved(args);
+				OnPointerMoved(args, isInjected: true);
 			}
 			else if (((int)kind & 1) == 1)
 			{
-				OnPointerPressed(args);
+				OnPointerPressed(args, isInjected: true);
 			}
 			else
 			{
-				OnPointerReleased(args);
+				OnPointerReleased(args, isInjected: true);
 			}
 		}
 		#endregion
diff --git a/src/Uno.UI/UI/Xaml/Internal/InputManager.Pointers.cs b/src/Uno.UI/UI/Xaml/Internal/InputManager.Pointers.cs
index 73bf0ea793d1..13099ab950bd 100644
--- a/src/Uno.UI/UI/Xaml/Internal/InputManager.Pointers.cs
+++ b/src/Uno.UI/UI/Xaml/Internal/InputManager.Pointers.cs
@@ -71,12 +71,6 @@ public PointerManager(InputManager inputManager)
 				UIElement.PointerReleasedEvent,
 				new PointerEventHandler((snd, args) => ProcessPointerUp(args, false)),
 				handledEventsToo: true);
-#if __WASM__
-			rootElement.AddHandler(
-				UIElement.PointerCanceledEvent,
-				new PointerEventHandler((snd, args) => ProcessPointerCancelled(args)),
-				handledEventsToo: true);
-#endif
 		}
 
 		#region Re-routing (Flyout.OverlayInputPassThroughElement)
@@ -206,21 +200,12 @@ internal void ProcessPointerUp(PointerRoutedEventArgs args, bool isAfterHandledU
 
 			ReleaseCaptures(args.Reset(canBubbleNatively: false));
 
-#if __WASM__
-			PointerIdentifierPool.ReleaseManaged(args.Pointer.UniqueId);
-#endif
-
 			// At the end of our "up" processing, we reset the flag to make sure that the native handler (iOS, Android and WASM)
 			// won't try to sent it to us again (if not already the case ^^).
 			// (This could be the case if the args was flagged as handled in the ReleaseCaptures call above, like in RatingControl).
 			args.Handled = isAfterHandledUp;
 		}
 
-#if __WASM__
-		private static void ProcessPointerCancelled(PointerRoutedEventArgs args)
-			=> PointerIdentifierPool.ReleaseManaged(args.Pointer.UniqueId);
-#endif
-
 		// As focus event are either async or cancellable,
 		// the FocusManager will explicitly notify us instead of listing to its events
 		internal void NotifyFocusChanged()
diff --git a/src/Uno.UI/UI/Xaml/Internal/PointerCapture.wasm.cs b/src/Uno.UI/UI/Xaml/Internal/PointerCapture.wasm.cs
deleted file mode 100644
index 474a5428e841..000000000000
--- a/src/Uno.UI/UI/Xaml/Internal/PointerCapture.wasm.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-#nullable enable
-
-using System;
-using System.Linq;
-using Windows.Devices.Input;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Input;
-using Uno.Foundation.Logging;
-
-namespace Uno.UI.Xaml.Core;
-
-internal partial class PointerCapture
-{
-	partial void CaptureNative(UIElement target, Pointer pointer)
-	{
-		if (PointerIdentifierPool.TryGetNative(pointer.UniqueId, out var native))
-		{
-			WindowManagerInterop.SetPointerCapture(target.HtmlId, native.Id);
-		}
-		else if (this.Log().IsEnabled(LogLevel.Warning))
-		{
-			this.Log().Warn($"Cannot capture pointer, could not find native pointer id for managed pointer id {pointer.UniqueId}");
-		}
-	}
-
-	partial void ReleaseNative(UIElement target, Pointer pointer)
-	{
-		if (PointerIdentifierPool.TryGetNative(pointer.UniqueId, out var native))
-		{
-			WindowManagerInterop.ReleasePointerCapture(target.HtmlId, native.Id);
-		}
-		else if (this.Log().IsEnabled(LogLevel.Warning))
-		{
-			this.Log().Warn($"Cannot release pointer, could not find native pointer id for managed pointer id {pointer.UniqueId}");
-		}
-	}
-}
diff --git a/src/Uno.UI/UI/Xaml/Media/Imaging/RenderTargetBitmap.UnmanagedArrayOfBytes.cs b/src/Uno.UI/UI/Xaml/Media/Imaging/RenderTargetBitmap.UnmanagedArrayOfBytes.cs
new file mode 100644
index 000000000000..b6edfc4e1e35
--- /dev/null
+++ b/src/Uno.UI/UI/Xaml/Media/Imaging/RenderTargetBitmap.UnmanagedArrayOfBytes.cs
@@ -0,0 +1,86 @@
+#if !__ANDROID__
+#nullable enable
+using System;
+using System.Buffers;
+using System.Linq;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.UI.Xaml.Media.Imaging;
+
+public partial class RenderTargetBitmap
+{
+	private unsafe class UnmanagedArrayOfBytes
+	{
+		public nint Pointer;
+		public int Length { get; }
+
+		public UnmanagedArrayOfBytes(int length)
+		{
+			Length = length;
+			Pointer = Marshal.AllocHGlobal(length);
+			GC.AddMemoryPressure(length);
+		}
+
+		public byte this[int index]
+		{
+			get
+			{
+				return ((byte*)Pointer.ToPointer())[index];
+			}
+			set
+			{
+				((byte*)Pointer.ToPointer())[index] = value;
+			}
+		}
+
+		~UnmanagedArrayOfBytes()
+		{
+			Marshal.FreeHGlobal(Pointer);
+			GC.RemoveMemoryPressure(Length);
+		}
+	}
+
+	// This is to avoid LOH array allocations
+	// https://stackoverflow.com/questions/52190423/c-sharp-access-unmanaged-array-using-memoryt-or-arraysegmentt
+	private sealed unsafe class UnmanagedMemoryManager<T> : MemoryManager<T>
+		where T : unmanaged
+	{
+		private readonly T* _pointer;
+		private readonly int _length;
+
+		/// <summary>
+		/// Create a new UnmanagedMemoryManager instance at the given pointer and size
+		/// </summary>
+		public UnmanagedMemoryManager(T* pointer, int length)
+		{
+			if (length < 0) throw new ArgumentOutOfRangeException(nameof(length));
+			_pointer = pointer;
+			_length = length;
+		}
+		/// <summary>
+		/// Obtains a span that represents the region
+		/// </summary>
+		public override Span<T> GetSpan() => new(_pointer, _length);
+
+		/// <summary>
+		/// Provides access to a pointer that represents the data (note: no actual pin occurs)
+		/// </summary>
+		public override MemoryHandle Pin(int elementIndex = 0)
+		{
+			if (elementIndex < 0 || elementIndex >= _length)
+				throw new ArgumentOutOfRangeException(nameof(elementIndex));
+			return new MemoryHandle(_pointer + elementIndex);
+		}
+
+		/// <summary>
+		/// Has no effect
+		/// </summary>
+		public override void Unpin() { }
+
+		/// <summary>
+		/// Releases all resources associated with this object
+		/// </summary>
+		protected override void Dispose(bool disposing) { }
+	}
+}
+#endif
diff --git a/src/Uno.UI/UI/Xaml/Media/Imaging/RenderTargetBitmap.cs b/src/Uno.UI/UI/Xaml/Media/Imaging/RenderTargetBitmap.cs
index 745016074829..04d776da28af 100644
--- a/src/Uno.UI/UI/Xaml/Media/Imaging/RenderTargetBitmap.cs
+++ b/src/Uno.UI/UI/Xaml/Media/Imaging/RenderTargetBitmap.cs
@@ -1,7 +1,4 @@
 #nullable enable
-#if !__IOS__ && !__ANDROID__ && !__SKIA__ && !__MACOS__
-#define NOT_IMPLEMENTED
-#endif
 
 using System;
 using System.Collections.Generic;
@@ -14,107 +11,39 @@
 using Uno.UI.Xaml.Media;
 using Buffer = Windows.Storage.Streams.Buffer;
 using System.Buffers;
-using System.Runtime.InteropServices;
-
 using WinUICoreServices = Uno.UI.Xaml.Core.CoreServices;
 
 namespace Microsoft.UI.Xaml.Media.Imaging
 {
-#if NOT_IMPLEMENTED
+#if !HAS_RENDER_TARGET_BITMAP
 	[global::Uno.NotImplemented("IS_UNIT_TESTS", "__WASM__", "__NETSTD_REFERENCE__")]
 #endif
 	public partial class RenderTargetBitmap : ImageSource
 	{
-#if !__ANDROID__
-		// This is to avoid LOH array allocations
-		private unsafe class UnmanagedArrayOfBytes
-		{
-			public nint Pointer;
-			public int Length { get; }
-
-			public UnmanagedArrayOfBytes(int length)
-			{
-				Length = length;
-				Pointer = Marshal.AllocHGlobal(length);
-				GC.AddMemoryPressure(length);
-			}
-
-			public byte this[int index]
-			{
-				get
-				{
-					return ((byte*)Pointer.ToPointer())[index];
-				}
-				set
-				{
-					((byte*)Pointer.ToPointer())[index] = value;
-				}
-			}
-
-			~UnmanagedArrayOfBytes()
-			{
-				Marshal.FreeHGlobal(Pointer);
-				GC.RemoveMemoryPressure(Length);
-			}
-		}
-
-		// https://stackoverflow.com/questions/52190423/c-sharp-access-unmanaged-array-using-memoryt-or-arraysegmentt
-		private sealed unsafe class UnmanagedMemoryManager<T> : MemoryManager<T>
-			where T : unmanaged
-		{
-			private readonly T* _pointer;
-			private readonly int _length;
-
-			/// <summary>
-			/// Create a new UnmanagedMemoryManager instance at the given pointer and size
-			/// </summary>
-			public UnmanagedMemoryManager(T* pointer, int length)
-			{
-				if (length < 0) throw new ArgumentOutOfRangeException(nameof(length));
-				_pointer = pointer;
-				_length = length;
-			}
-			/// <summary>
-			/// Obtains a span that represents the region
-			/// </summary>
-			public override Span<T> GetSpan() => new Span<T>(_pointer, _length);
-
-			/// <summary>
-			/// Provides access to a pointer that represents the data (note: no actual pin occurs)
-			/// </summary>
-			public override MemoryHandle Pin(int elementIndex = 0)
-			{
-				if (elementIndex < 0 || elementIndex >= _length)
-					throw new ArgumentOutOfRangeException(nameof(elementIndex));
-				return new MemoryHandle(_pointer + elementIndex);
-			}
-
-			/// <summary>
-			/// Has no effect
-			/// </summary>
-			public override void Unpin() { }
-
-			/// <summary>
-			/// Releases all resources associated with this object
-			/// </summary>
-			protected override void Dispose(bool disposing) { }
-		}
-#endif
-
-#if NOT_IMPLEMENTED
+#if !HAS_RENDER_TARGET_BITMAP
 		internal const bool IsImplemented = false;
 #else
 		internal const bool IsImplemented = true;
 #endif
 
+#if !HAS_RENDER_TARGET_BITMAP
+		// The partial API that has to be implemented in each platform
+
+		private static ImageData Open(UnmanagedArrayOfBytes buffer, int bufferLength, int width, int height)
+			=> default;
+
+		private (int ByteCount, int Width, int Height) RenderAsBgra8_Premul(UIElement element, ref UnmanagedArrayOfBytes? buffer, Size? scaledSize = null)
+			=> throw new NotImplementedException("RenderTargetBitmap is not supported on this platform.");
+#endif
+
 		#region PixelWidth
-#if NOT_IMPLEMENTED
+#if !HAS_RENDER_TARGET_BITMAP
 		[global::Uno.NotImplemented("IS_UNIT_TESTS", "__WASM__", "__NETSTD_REFERENCE__")]
 #endif
 		public static DependencyProperty PixelWidthProperty { get; } = DependencyProperty.Register(
 			"PixelWidth", typeof(int), typeof(RenderTargetBitmap), new FrameworkPropertyMetadata(default(int)));
 
-#if NOT_IMPLEMENTED
+#if !HAS_RENDER_TARGET_BITMAP
 		[global::Uno.NotImplemented("IS_UNIT_TESTS", "__WASM__", "__NETSTD_REFERENCE__")]
 #endif
 		public int PixelWidth
@@ -126,13 +55,13 @@ public int PixelWidth
 
 		#region PixelHeight
 
-#if NOT_IMPLEMENTED
+#if !HAS_RENDER_TARGET_BITMAP
 		[global::Uno.NotImplemented("IS_UNIT_TESTS", "__WASM__", "__NETSTD_REFERENCE__")]
 #endif
 		public static DependencyProperty PixelHeightProperty { get; } = DependencyProperty.Register(
 			"PixelHeight", typeof(int), typeof(RenderTargetBitmap), new FrameworkPropertyMetadata(default(int)));
 
-#if NOT_IMPLEMENTED
+#if !HAS_RENDER_TARGET_BITMAP
 		[global::Uno.NotImplemented("IS_UNIT_TESTS", "__WASM__", "__NETSTD_REFERENCE__")]
 #endif
 		public int PixelHeight
@@ -142,10 +71,10 @@ public int PixelHeight
 		}
 		#endregion
 
-#if !__ANDROID__
-		private UnmanagedArrayOfBytes? _buffer;
-#else
+#if __ANDROID__
 		private byte[]? _buffer;
+#else
+		private UnmanagedArrayOfBytes? _buffer;
 #endif
 		private int _bufferSize;
 
@@ -166,12 +95,7 @@ private protected override bool TryOpenSourceSync(int? targetWidth, int? targetH
 			return image.HasData;
 		}
 
-#if NOT_IMPLEMENTED
-		private static ImageData Open(UnmanagedArrayOfBytes buffer, int bufferLength, int width, int height)
-			=> default;
-#endif
-
-#if NOT_IMPLEMENTED
+#if !HAS_RENDER_TARGET_BITMAP
 		[global::Uno.NotImplemented("IS_UNIT_TESTS", "__WASM__", "__NETSTD_REFERENCE__")]
 #endif
 		public IAsyncAction RenderAsync(UIElement? element, int scaledWidth, int scaledHeight)
@@ -199,7 +123,7 @@ public IAsyncAction RenderAsync(UIElement? element, int scaledWidth, int scaledH
 				return Task.CompletedTask;
 			});
 
-#if NOT_IMPLEMENTED
+#if !HAS_RENDER_TARGET_BITMAP
 		[global::Uno.NotImplemented("IS_UNIT_TESTS", "__WASM__", "__NETSTD_REFERENCE__")]
 #endif
 		public IAsyncAction RenderAsync(UIElement? element)
@@ -227,7 +151,7 @@ public IAsyncAction RenderAsync(UIElement? element)
 				return Task.CompletedTask;
 			});
 
-#if NOT_IMPLEMENTED
+#if !HAS_RENDER_TARGET_BITMAP
 		[global::Uno.NotImplemented("IS_UNIT_TESTS", "__WASM__", "__NETSTD_REFERENCE__")]
 #endif
 		public IAsyncOperation<IBuffer> GetPixelsAsync()
@@ -235,27 +159,22 @@ public IAsyncOperation<IBuffer> GetPixelsAsync()
 			{
 				if (_buffer is null)
 				{
-					return Task.FromResult<IBuffer>(new Buffer(Array.Empty<byte>()));
+					return Task.FromResult<IBuffer>(new Buffer([]));
 				}
 
-#if !__ANDROID__
+#if __ANDROID__
+				return Task.FromResult<IBuffer>(new Buffer(_buffer.AsMemory().Slice(0, _bufferSize)));
+#else
 				unsafe
 				{
 					var mem = new UnmanagedMemoryManager<byte>((byte*)_buffer.Pointer.ToPointer(), _bufferSize);
 					return Task.FromResult<IBuffer>(new Buffer(mem.Memory.Slice(0, _bufferSize)));
 				}
-#else
-				return Task.FromResult<IBuffer>(new Buffer(_buffer.AsMemory().Slice(0, _bufferSize)));
 #endif
 			});
 
-#if NOT_IMPLEMENTED
-		private (int ByteCount, int Width, int Height) RenderAsBgra8_Premul(UIElement element, ref UnmanagedArrayOfBytes? buffer, Size? scaledSize = null)
-			=> throw new NotImplementedException("RenderTargetBitmap is not supported on this platform.");
-#endif
-
 		#region Misc static helpers
-#if !NOT_IMPLEMENTED
+#if HAS_RENDER_TARGET_BITMAP
 #if __ANDROID__
 		private static void EnsureBuffer(ref byte[]? buffer, int length)
 		{
diff --git a/src/Uno.UI/UI/Xaml/Media/VisualTreeHelper.cs b/src/Uno.UI/UI/Xaml/Media/VisualTreeHelper.cs
index f89ea6102355..062faf76c595 100644
--- a/src/Uno.UI/UI/Xaml/Media/VisualTreeHelper.cs
+++ b/src/Uno.UI/UI/Xaml/Media/VisualTreeHelper.cs
@@ -39,6 +39,7 @@
 using _View = Microsoft.UI.Xaml.UIElement;
 using _ViewGroup = Microsoft.UI.Xaml.UIElement;
 using Microsoft.UI.Composition;
+using Microsoft.UI.Xaml.Shapes;
 #endif
 
 namespace Microsoft.UI.Xaml.Media
@@ -662,10 +663,14 @@ internal static (UIElement? element, Branch? stale) SearchDownForTopMostElementA
 			// We didn't find any child at the given position, validate that element can be touched,
 			// and the position is in actual bounds(which might be different than the clipping bounds)
 #if __SKIA__
-			if (element.HitTest(transformToElement.Inverse().Transform(testPosition)) && renderingBounds.Contains(testPosition))
+			if (renderingBounds.Contains(testPosition) && element.HitTest(transformToElement.Inverse().Transform(testPosition)))
 #else
 
-			if (elementHitTestVisibility == HitTestability.Visible && renderingBounds.Contains(testPosition))
+			if (elementHitTestVisibility == HitTestability.Visible && renderingBounds.Contains(testPosition)
+#if __WASM__
+				&& element.HitTest(testPosition)
+#endif
+				)
 #endif
 			{
 				TRACE($"> LEAF! ({element.GetDebugName()} is the OriginalSource) | stale branch: {stale?.ToString() ?? "-- none --"}");
diff --git a/src/Uno.UI/UI/Xaml/Shapes/Path.wasm.cs b/src/Uno.UI/UI/Xaml/Shapes/Path.wasm.cs
index 7b96e1a17410..6806bb59c8ca 100644
--- a/src/Uno.UI/UI/Xaml/Shapes/Path.wasm.cs
+++ b/src/Uno.UI/UI/Xaml/Shapes/Path.wasm.cs
@@ -1,6 +1,7 @@
 #nullable enable
 using Windows.Foundation;
 using Microsoft.UI.Xaml.Wasm;
+using Uno.UI.Xaml;
 
 namespace Microsoft.UI.Xaml.Shapes
 {
@@ -38,5 +39,41 @@ internal override void OnPropertyChanged2(DependencyPropertyChangedEventArgs arg
 				}
 			}
 		}
+
+		internal override bool HitTest(Point relativePosition)
+		{
+			// ContainsPoint acts on SVGGeometryElement, and "g" HTML element is not SVGGeometryElement.
+			// So, we override ContainsPoint for Path specifically to operate on the inner child.
+			var considerFill = Fill != null;
+
+			// TODO: Verify if this should also consider StrokeThickness (likely it should)
+			var considerStroke = Stroke != null;
+
+			if (!considerFill && !considerStroke)
+			{
+				return false;
+			}
+
+			if (_mainSvgElement._children.Count == 0)
+			{
+				return false;
+			}
+
+			if (_mainSvgElement._children.Count == 1)
+			{
+				return WindowManagerInterop.ContainsPoint(_mainSvgElement._children[0].HtmlId, relativePosition.X, relativePosition.Y, considerFill, considerStroke);
+			}
+
+			foreach (var child in _mainSvgElement._children)
+			{
+				// Unexpected to be hit, but just in case.
+				if (WindowManagerInterop.ContainsPoint(child.HtmlId, relativePosition.X, relativePosition.Y, considerFill, considerStroke))
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
 	}
 }
diff --git a/src/Uno.UI/UI/Xaml/Shapes/Shape.cs b/src/Uno.UI/UI/Xaml/Shapes/Shape.cs
index 1849f6bfdf84..79f8699810d8 100644
--- a/src/Uno.UI/UI/Xaml/Shapes/Shape.cs
+++ b/src/Uno.UI/UI/Xaml/Shapes/Shape.cs
@@ -171,7 +171,8 @@ public DoubleCollection StrokeDashArray
 		// Do not invoke base.IsViewHit(): We don't have to have de FrameworkElement.Background to be hit testable!
 		internal override bool IsViewHit()
 			=> Fill != null
-#if __SKIA__ // we only add this condition for skia because it's the only platform with proper hit-testing support for shapes. If we add it for other platforms, we get a different but still inaccurate behaviour, so we prefer to keep the behaviour as is.
+#if __SKIA__ || __WASM__ // we only add this condition for Skia and Wasm because these are the only platforms with proper hit-testing support for shapes. If we add it for other platforms, we get a different but still inaccurate behaviour, so we prefer to keep the behaviour as is.
+				// TODO: Verify if this should also consider StrokeThickness (likely it should)
 				|| Stroke != null
 #endif
 				;
diff --git a/src/Uno.UI/UI/Xaml/Shapes/Shape.wasm.cs b/src/Uno.UI/UI/Xaml/Shapes/Shape.wasm.cs
index f46caa449680..dad06272de6d 100644
--- a/src/Uno.UI/UI/Xaml/Shapes/Shape.wasm.cs
+++ b/src/Uno.UI/UI/Xaml/Shapes/Shape.wasm.cs
@@ -11,6 +11,7 @@
 using RadialGradientBrush = Microsoft/* UWP don't rename */.UI.Xaml.Media.RadialGradientBrush;
 using System.Numerics;
 using System.Diagnostics;
+using Uno.UI.Xaml;
 
 namespace Microsoft.UI.Xaml.Shapes
 {
@@ -42,13 +43,6 @@ private protected void UpdateRender()
 			UpdateStrokeDashArray();
 		}
 
-
-		private protected override void OnHitTestVisibilityChanged(HitTestability oldValue, HitTestability newValue)
-		{
-			// We don't invoke the base, so we stay at the default "pointer-events: none" defined in Uno.UI.css in class svg.uno-uielement.
-			// This is required to avoid this SVG element (which is actually only a collection) to stoll pointer events.
-		}
-
 		private void OnFillBrushChanged()
 		{
 			// We don't request an update of the HitTest (UpdateHitTest()) since this element is never expected to be hit testable.
@@ -221,5 +215,15 @@ private protected void Render(Shape shape, Size? size = null, double scaleX = 1d
 			_mainSvgElement.SetNativeTransform(matrix);
 		}
 
+		internal override bool HitTest(Point relativePosition)
+		{
+			var considerFill = Fill != null;
+
+			// TODO: Verify if this should also consider StrokeThickness (likely it should)
+			var considerStroke = Stroke != null;
+
+			return (considerFill || considerStroke) &&
+				WindowManagerInterop.ContainsPoint(_mainSvgElement.HtmlId, relativePosition.X, relativePosition.Y, considerFill, considerStroke);
+		}
 	}
 }
diff --git a/src/Uno.UI/UI/Xaml/UIElement.Pointers.Managed.cs b/src/Uno.UI/UI/Xaml/UIElement.Pointers.Managed.cs
index 7475c668a2ca..1052ee069908 100644
--- a/src/Uno.UI/UI/Xaml/UIElement.Pointers.Managed.cs
+++ b/src/Uno.UI/UI/Xaml/UIElement.Pointers.Managed.cs
@@ -79,7 +79,9 @@ private object CoerceHitTestVisibility(object baseValue)
 
 			// If we're not locally hit-test visible, visible, or enabled, we should be collapsed. Our children will be collapsed as well.
 			if (
-#if !__MACOS__
+#if __WASM__
+				!(IsLoaded || HtmlTagIsSvg) ||
+#elif !__MACOS__
 				!IsLoaded ||
 #endif
 				!IsHitTestVisible || Visibility != Visibility.Visible || !IsEnabledOverride())
@@ -87,6 +89,14 @@ private object CoerceHitTestVisibility(object baseValue)
 				return HitTestability.Collapsed;
 			}
 
+#if __WASM__
+			// Special case for external html element, we are always considering them as hit testable.
+			if (HtmlTagIsExternallyDefined && !FeatureConfiguration.FrameworkElement.UseLegacyHitTest)
+			{
+				return HitTestability.Visible;
+			}
+#endif
+
 			// If we're not hit (usually means we don't have a Background/Fill), we're invisible. Our children will be visible or not, depending on their state.
 			if (!IsViewHit())
 			{
diff --git a/src/Uno.UI/UI/Xaml/UIElement.Pointers.cs b/src/Uno.UI/UI/Xaml/UIElement.Pointers.cs
index cfae8a839eb8..bedd8ab61201 100644
--- a/src/Uno.UI/UI/Xaml/UIElement.Pointers.cs
+++ b/src/Uno.UI/UI/Xaml/UIElement.Pointers.cs
@@ -728,7 +728,7 @@ private async Task<DataPackageOperation> StartDragAsyncCore(PointerPoint pointer
 			PrepareShare(routedArgs.Data); // Gives opportunity to the control to fulfill the data
 			SafeRaiseEvent(DragStartingEvent, routedArgs); // The event won't bubble, cf. PrepareManagedDragAndDropEventBubbling
 
-			// We need to give a chance for  for layout updates, etc. This is particularly problematic with TreeView
+			// We need to give a chance for layout updates, etc. This is particularly problematic with TreeView
 			// dragging where the DragStarting event on the TreeView will "internally" collapse some nodes,
 			// but actually removing them from the visual tree needs a layout cycle. Without waiting here,
 			// we can also get a DragEnter event on one of the to-be-collapsed containers in the same
diff --git a/src/Uno.UI/UI/Xaml/UIElement.Pointers.wasm.cs b/src/Uno.UI/UI/Xaml/UIElement.Pointers.wasm.cs
index 1b56726e2ded..d5007e7206b3 100644
--- a/src/Uno.UI/UI/Xaml/UIElement.Pointers.wasm.cs
+++ b/src/Uno.UI/UI/Xaml/UIElement.Pointers.wasm.cs
@@ -1,527 +1,30 @@
 #nullable enable
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Globalization;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.JavaScript;
-using Uno.Foundation;
-using Windows.Foundation;
-using Microsoft.UI.Xaml.Input;
-using Windows.System;
-using Uno;
-using Uno.Foundation.Interop;
-using Uno.Foundation.Logging;
 using Uno.UI;
-using Uno.UI.Extensions;
 using Uno.UI.Xaml;
-using Uno.UI.Xaml.Core;
-using Uno.UI.Xaml.Islands;
-using WinUICoreServices = Uno.UI.Xaml.Core.CoreServices;
-
-using PointerIdentifierPool = Windows.Devices.Input.PointerIdentifierPool; // internal type (should be in Uno namespace)
-using PointerIdentifier = Windows.Devices.Input.PointerIdentifier; // internal type (should be in Uno namespace)
-using PointerIdentifierDeviceType = Windows.Devices.Input.PointerDeviceType; // PointerIdentifier always uses Windows.Devices as it does noe have access to Microsoft.UI.Input (Uno.UI assembly)
-#if HAS_UNO_WINUI
-using Microsoft.UI.Input;
-using PointerDeviceType = Microsoft.UI.Input.PointerDeviceType;
-#else
-using Windows.UI.Input;
-using PointerDeviceType = Windows.Devices.Input.PointerDeviceType;
-#endif
 
 namespace Microsoft.UI.Xaml;
 
 public partial class UIElement : DependencyObject
 {
-	private static TSInteropMarshaller.HandleRef<NativePointerEventArgs> _pointerEventArgs;
-	private static TSInteropMarshaller.HandleRef<NativePointerEventResult> _pointerEventResult;
-
-	private static Microsoft/* UWP don't rename */.UI.Input.InputSystemCursorShape? _lastSetCursor;
-
-	// Ref:
-	// https://www.w3.org/TR/pointerevents/
-	// https://developer.mozilla.org/en-US/docs/Web/API/PointerEvent
-	// https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent
-
-	#region Native event registration handling
-	private NativePointerEvent _subscribedNativeEvents;
-
-	partial void OnGestureRecognizerInitialized(GestureRecognizer recognizer)
-	{
-		// When a gesture recognizer is initialized, we subscribe to pointer events in order to feed it.
-		// Note: We register to Move, so it will also register Enter, Exited, Pressed, Released and Cancel.
-		//		 Gesture recognizer does not needs CaptureLost nor Wheel events.
-		AddPointerHandler(PointerMovedEvent, 1, default, default);
-	}
-
-	partial void AddPointerHandler(RoutedEvent routedEvent, int handlersCount, object handler, bool handledEventsToo)
-	{
-		if (_pointerEventArgs == null)
-		{
-			_pointerEventArgs = TSInteropMarshaller.Allocate<NativePointerEventArgs>("UnoStatic_Windows_UI_Xaml_UIElement:setPointerEventArgs");
-			_pointerEventResult = TSInteropMarshaller.Allocate<NativePointerEventResult>("UnoStatic_Windows_UI_Xaml_UIElement:setPointerEventResult");
-		}
-
-		if (handlersCount != 1
-			|| routedEvent == PointerCaptureLostEvent) // Captures are handled in managed code only
-		{
-			return;
-		}
-
-		var events = default(NativePointerEvent);
-
-		// First we make sure to subscribe to the missing defaults events
-		events |= ~_subscribedNativeEvents & NativePointerEvent.Defaults;
-
-		// Add optional events
-		switch (routedEvent.Flag)
-		{
-			case RoutedEventFlag.PointerWheelChanged when !_subscribedNativeEvents.HasFlag(NativePointerEvent.wheel):
-				events |= NativePointerEvent.wheel;
-				break;
-		}
-
-		if (events is not default(NativePointerEvent))
-		{
-			TSInteropMarshaller.InvokeJS(
-				"UnoStatic_Windows_UI_Xaml_UIElement:subscribePointerEvents",
-				new NativePointerSubscriptionParams
-				{
-					HtmlId = Handle,
-					Events = (byte)events
-				});
-
-			_subscribedNativeEvents |= events;
-		}
-	}
-
-	partial void RemovePointerHandler(RoutedEvent routedEvent, int remainingHandlersCount, object handler)
-	{
-		if (remainingHandlersCount > 0)
-		{
-			return;
-		}
-
-		if (!IsLoaded)
-		{
-			// If element is not in the visual tree its native element might also have been already destroyed,
-			// in that case we just ignore the native handler removal.
-			// The native handler will somehow leak, but if the control is re-used we will actually avoid the cost to re-create the handler,
-			// and if the control if dropped, then native handler will also be dropped.
-			// Even if not recommended, it might happen that users use the control finalizer to remove pointer events
-			// (cf. WinUI's TreeViewItem.RecycleEvents() invoked by the finalizer), this check make sure to not crash in the finalizer!
-			return;
-		}
-
-		if (_gestures is null
-			&& CountHandler(PointerEnteredEvent) is 0
-			&& CountHandler(PointerExitedEvent) is 0
-			&& CountHandler(PointerPressedEvent) is 0
-			&& CountHandler(PointerReleasedEvent) is 0
-			&& CountHandler(PointerCanceledEvent) is 0
-			&& CountHandler(PointerMovedEvent) is 0
-			&& CountHandler(PointerWheelChangedEvent) is 0)
-		{
-			TSInteropMarshaller.InvokeJS(
-				"UnoStatic_Windows_UI_Xaml_UIElement:unSubscribePointerEvents",
-				new NativePointerSubscriptionParams
-				{
-					HtmlId = Handle,
-					Events = (byte)_subscribedNativeEvents
-				});
-
-			_subscribedNativeEvents = default;
-		}
-	}
-	#endregion
-
-	#region Native event dispatch
-	[EditorBrowsable(EditorBrowsableState.Never)]
-	[JSExport]
-	internal static void OnNativePointerEvent()
-	{
-		var result = new HtmlEventDispatchResultHelper();
-		try
-		{
-			_logTrace?.Trace("Receiving native pointer event.");
-
-			var args = _pointerEventArgs.Value;
-			var element = GetElementFromHandle(args.HtmlId);
-
-			if (element is null)
-			{
-				if (_log.IsEnabled(LogLevel.Error))
-				{
-					_log.Error($"Received pointer event for '{args.HtmlId}' but element does not exists anymore.");
-				}
-
-				return;
-			}
-
-			_logTrace?.Trace($"Dispatching to {element.GetDebugName()} pointer arg: {args}.");
-
-			PointerRoutedEventArgs? routedArgs = null;
-			switch ((NativePointerEvent)args.Event)
-			{
-				case NativePointerEvent.pointerover:
-					{
-						// On WASM we do get 'pointerover' event for sub elements,
-						// so we can avoid useless work by validating if the pointer is already flagged as over element.
-						// If so, we stop bubbling since our parent will do the same!
-						routedArgs = ToPointerArgs(element, args);
-						if (element.IsOver(routedArgs.Pointer))
-						{
-							result.Add(HtmlEventDispatchResult.StopPropagation);
-						}
-						else
-						{
-							result.Add(routedArgs, element.OnNativePointerEnter(routedArgs));
-						}
-
-						break;
-					}
-
-				case NativePointerEvent.pointerout: // No needs to check IsOver (leaving vs. bubbling), it's already done in native code
-					{
-						routedArgs = ToPointerArgs(element, args);
-						var handled = element.OnNativePointerExited(routedArgs);
-						result.Add(routedArgs, handled);
-
-						break;
-					}
-
-				case NativePointerEvent.pointerdown:
-					{
-						routedArgs = ToPointerArgs(element, args);
-						var handled = element.OnNativePointerDown(routedArgs);
-						result.Add(routedArgs, handled);
-
-						break;
-					}
-
-				case NativePointerEvent.pointerup:
-					{
-						routedArgs = ToPointerArgs(element, args);
-						var handled = element.OnNativePointerUp(routedArgs);
-						result.Add(routedArgs, handled);
-
-						if (result.ShouldStop)
-						{
-							element.XamlRoot?.VisualTree.ContentRoot.InputManager.Pointers.ProcessPointerUp(routedArgs, isAfterHandledUp: true);
-						}
-
-						break;
-					}
-
-				case NativePointerEvent.pointermove:
-					{
-						routedArgs = ToPointerArgs(element, args);
-
-						// We do have "implicit capture" for touch and pen on chromium browsers, they won't raise 'pointerout' once in contact,
-						// this means that we need to validate the isOver to raise enter and exit like on UWP.
-						var needsToCheckIsOver = routedArgs.Pointer.PointerDeviceType switch
-						{
-							PointerDeviceType.Touch => routedArgs.Pointer.IsInRange, // If pointer no longer in range, isOver is always false
-							PointerDeviceType.Pen => routedArgs.Pointer.IsInContact, // We can ignore check when only hovering elements, browser does its job in that case
-							PointerDeviceType.Mouse => PointerCapture.TryGet(routedArgs.Pointer, out _), // Browser won't raise pointerenter/out as soon has we have an active capture
-							_ => true // For safety
-						};
-						var handled = needsToCheckIsOver
-							? element.OnNativePointerMoveWithOverCheck(routedArgs, isOver: routedArgs.IsPointCoordinatesOver(element))
-							: element.OnNativePointerMove(routedArgs);
-						result.Add(routedArgs, handled);
-
-						break;
-					}
-
-				case NativePointerEvent.pointercancel:
-					{
-						routedArgs = ToPointerArgs(element, args);
-						var handled = element.OnNativePointerCancel(routedArgs, isSwallowedBySystem: true);
-						result.Add(routedArgs, handled);
-
-						break;
-					}
-
-				case NativePointerEvent.wheel:
-					if (args.wheelDeltaX is not 0)
-					{
-						routedArgs = ToPointerArgs(element, args, wheel: (true, args.wheelDeltaX));
-						var handled = element.OnNativePointerWheel(routedArgs);
-						result.Add(routedArgs, handled);
-					}
-
-					if (args.wheelDeltaY is not 0)
-					{
-						// Note: Web browser vertical scrolling is the opposite compared to WinUI!
-						routedArgs = ToPointerArgs(element, args, wheel: (false, -args.wheelDeltaY));
-						var handled = element.OnNativePointerWheel(routedArgs);
-						result.Add(routedArgs, handled);
-					}
-
-					break;
-			}
-
-			if (routedArgs is { } && (NativePointerEvent)args.Event is not NativePointerEvent.pointerout)
-			{
-				// This corresponds to SetSourceCursor in InputManager.Pointers.managed.cs
-				if ((routedArgs.OriginalSource as UIElement)?.CalculatedFinalCursor is { } cursorShape)
-				{
-					if (_lastSetCursor is not { } c || c != cursorShape)
-					{
-						WindowManagerInterop.SetBodyCursor(Microsoft/* UWP don't rename */.UI.Input.InputSystemCursorShapeExtensions.ToCssProtectedCursor(cursorShape));
-						_lastSetCursor = cursorShape;
-					}
-				}
-				else
-				{
-					WindowManagerInterop.SetBodyCursor("none"); // hides the cursor
-				}
-			}
-		}
-		catch (Exception error)
-		{
-			if (_log.IsEnabled(LogLevel.Error))
-			{
-				_log.Error($"Failed to dispatch native pointer event: {error}");
-			}
-		}
-		finally
-		{
-			_pointerEventResult.Value = new NativePointerEventResult
-			{
-				Result = (byte)result.Value
-			};
-		}
-	}
-
-	private static PointerRoutedEventArgs ToPointerArgs(
-		UIElement snd,
-		NativePointerEventArgs args,
-		(bool isHorizontalWheel, double delta) wheel = default)
-	{
-		const int cancel = (int)NativePointerEvent.pointercancel;
-		const int exitOrUp = (int)(NativePointerEvent.pointerout | NativePointerEvent.pointerup);
-
-		var pointerType = (PointerDeviceType)args.deviceType;
-		var pointerId = PointerIdentifierPool.RentManaged(new PointerIdentifier((PointerIdentifierDeviceType)pointerType, (uint)args.pointerId));
-
-		var src = GetElementFromHandle(args.srcHandle) ?? (UIElement)snd;
-		var position = new Point(args.x, args.y);
-		var isInContact = args.buttons != 0;
-		var isInRange = true;
-		if (args.Event is cancel)
-		{
-			isInRange = false;
-		}
-		else if ((args.Event & exitOrUp) != 0)
-		{
-			isInRange = pointerType switch
-			{
-				PointerDeviceType.Mouse => true, // Mouse is always in range (unless for 'cancel' eg. if it was unplugged from computer)
-				PointerDeviceType.Touch => false, // If we get a pointer out for touch, it means that pointer left the screen (pt up - a.k.a. Implicit capture)
-				PointerDeviceType.Pen => args.hasRelatedTarget, // If the relatedTarget is null it means pointer left the detection range ... but only for out event!
-				_ => !isInContact // Safety!
-			};
-		}
-		var keyModifiers = VirtualKeyModifiers.None;
-		if (args.ctrl) keyModifiers |= VirtualKeyModifiers.Control;
-		if (args.shift) keyModifiers |= VirtualKeyModifiers.Shift;
-
-		var buttons = (WindowManagerInterop.HtmlPointerButtonsState)args.buttons;
-		var buttonUpdate = (WindowManagerInterop.HtmlPointerButtonUpdate)args.buttonUpdate;
-
-		if (args.Event == (int)NativePointerEvent.pointerdown &&
-			buttons == WindowManagerInterop.HtmlPointerButtonsState.None &&
-			args.deviceType == (int)PointerDeviceType.Mouse)
-		{
-			// This scenario should technically not occur, but it may happen for macOS devices with the trackpad tap to click setting
-			// enabled (see discussion in issue #16076). To work around this, we use the buttonUpdate value which seems to be reliable.
-			buttons = buttonUpdate switch
-			{
-				WindowManagerInterop.HtmlPointerButtonUpdate.Left => WindowManagerInterop.HtmlPointerButtonsState.Left,
-				WindowManagerInterop.HtmlPointerButtonUpdate.Middle => WindowManagerInterop.HtmlPointerButtonsState.Middle,
-				WindowManagerInterop.HtmlPointerButtonUpdate.Right => WindowManagerInterop.HtmlPointerButtonsState.Right,
-				WindowManagerInterop.HtmlPointerButtonUpdate.X1 => WindowManagerInterop.HtmlPointerButtonsState.X1,
-				WindowManagerInterop.HtmlPointerButtonUpdate.X2 => WindowManagerInterop.HtmlPointerButtonsState.X2,
-				WindowManagerInterop.HtmlPointerButtonUpdate.Eraser => WindowManagerInterop.HtmlPointerButtonsState.Eraser,
-				_ => WindowManagerInterop.HtmlPointerButtonsState.None
-			};
-		}
-
-		return new PointerRoutedEventArgs(
-			args.timestamp,
-			pointerId,
-			position,
-			isInContact,
-			isInRange,
-			buttons,
-			buttonUpdate,
-			keyModifiers,
-			args.pressure,
-			wheel,
-			src);
-	}
-	#endregion
-
-	partial void OnManipulationModeChanged(ManipulationModes oldMode, ManipulationModes newMode)
-	{
-		if (newMode == ManipulationModes.System)
-		{
-			ResetStyle("touch-action");
-		}
-		else
-		{
-			// 'none' here means that the browser is not allowed to steal pointer for it's own manipulations
-			SetStyle("touch-action", "none");
-		}
-	}
-
-	#region HitTestVisibility
-	internal void UpdateHitTest()
-	{
-		this.CoerceValue(HitTestVisibilityProperty);
-	}
-
-	[GeneratedDependencyProperty(DefaultValue = HitTestability.Collapsed, ChangedCallback = true, CoerceCallback = true, Options = FrameworkPropertyMetadataOptions.Inherits)]
-	internal static DependencyProperty HitTestVisibilityProperty { get; } = CreateHitTestVisibilityProperty();
-
-	internal HitTestability HitTestVisibility
-	{
-		get => GetHitTestVisibilityValue();
-		set => SetHitTestVisibilityValue(value);
-	}
-
-	/// <summary>
-	/// This calculates the final hit-test visibility of an element.
-	/// </summary>
-	/// <returns></returns>
-	private object CoerceHitTestVisibility(object baseValue)
-	{
-		if (this is RootVisual or XamlIsland)
-		{
-			return HitTestability.Visible;
-		}
-
-		// The HitTestVisibilityProperty is never set directly. This means that baseValue is always the result of the parent's CoerceHitTestVisibility.
-		var baseHitTestVisibility = (HitTestability)baseValue;
-
-		// If the parent is collapsed, we should be collapsed as well. This takes priority over everything else, even if we would be visible otherwise.
-		if (baseHitTestVisibility == HitTestability.Collapsed)
-		{
-			return HitTestability.Collapsed;
-		}
-
-		// If we're not locally hit-test visible, visible, or enabled, we should be collapsed. Our children will be collapsed as well.
-		// SvgElements are an exception here since they won't be loaded.
-		if (!(IsLoaded || HtmlTagIsSvg) || !IsHitTestVisible || Visibility != Visibility.Visible || !IsEnabledOverride())
-		{
-			return HitTestability.Collapsed;
-		}
-
-		// Special case for external html element, we are always considering them as hit testable.
-		if (HtmlTagIsExternallyDefined && !FeatureConfiguration.FrameworkElement.UseLegacyHitTest)
-		{
-			return HitTestability.Visible;
-		}
-
-		// If we're not collapsed or invisible, we can be targeted by hit-testing. This means that we can be the source of pointer events.		
-		if (IsViewHit())
-		{
-			return HitTestability.Visible;
-		}
-
-		// If we're not hit (usually means we don't have a Background/Fill), we're invisible. Our children will be visible or not, depending on their state.
-		return HitTestability.Invisible;
-	}
-
 	private protected virtual void OnHitTestVisibilityChanged(HitTestability oldValue, HitTestability newValue)
-	{
-		ApplyHitTestVisibility(newValue);
-	}
-
-	private void ApplyHitTestVisibility(HitTestability value)
 	{
 		// By default, elements have 'pointer-event' set to 'none' (see Uno.UI.css .uno-uielement class)
 		// which is aligned with HitTestVisibilityProperty's default value of Visible.
 		// If HitTestVisibilityProperty is calculated to Invisible or Collapsed,
 		// we don't want to be the target of hit-testing and raise any pointer events.
 		// This is done by setting 'pointer-events' to 'none'.
-		// However setting it to 'none' will allow pointer event to pass through the element (a.k.a. Invisible)
+		// However, setting it to 'none' will allow pointer event to pass through the element (a.k.a. Invisible)
 
-		WindowManagerInterop.SetPointerEvents(HtmlId, value is HitTestability.Visible);
+		// Note: Even if we are now dispatching events in managed code only, we still want to properly set the pointer-events value in order to
+		//		1. support managed only element, 
+		//		2. support "default" behavior of browser (like scrolling).
+
+		WindowManagerInterop.SetPointerEvents(HtmlId, newValue is HitTestability.Visible);
 
 		if (FeatureConfiguration.UIElement.AssignDOMXamlProperties)
 		{
 			UpdateDOMProperties();
 		}
 	}
-
-	#endregion
-
-	[TSInteropMessage(Marshaller = CodeGeneration.Disabled, UnMarshaller = CodeGeneration.Enabled)]
-	[StructLayout(LayoutKind.Sequential, Pack = 4)]
-	private struct NativePointerSubscriptionParams
-	{
-		public IntPtr HtmlId;
-
-		public byte Events; // One or multiple NativePointerEvent
-	}
-
-	[TSInteropMessage(Marshaller = CodeGeneration.Enabled, UnMarshaller = CodeGeneration.Disabled)]
-	[StructLayout(LayoutKind.Sequential, Pack = 4)]
-	private struct NativePointerEventArgs
-	{
-		public IntPtr HtmlId;
-
-		public byte Event; // ONE of NativePointerEvent
-
-		public double pointerId; // Warning: This is a Number in JS, and it might be negative on safari for iOS
-		public double x;
-		public double y;
-		public bool ctrl;
-		public bool shift;
-		public int buttons;
-		public int buttonUpdate;
-		public int deviceType;
-		public int srcHandle;
-		public double timestamp;
-		public double pressure;
-		public double wheelDeltaX;
-		public double wheelDeltaY;
-		public bool hasRelatedTarget;
-
-		/// <inheritdoc />
-		public override string ToString()
-			=> $"elt={HtmlId}|evt={(NativePointerEvent)Event}|id={pointerId}|x={x}|y={x}|ctrl={ctrl}|shift={shift}|bts={buttons}|btUpdate={buttonUpdate}|type={(PointerDeviceType)deviceType}|srcId={srcHandle}|ts={timestamp}|pres={pressure}|wheelX={wheelDeltaX}|wheelY={wheelDeltaY}|relTarget={hasRelatedTarget}";
-	}
-
-	[TSInteropMessage(Marshaller = CodeGeneration.Disabled, UnMarshaller = CodeGeneration.Enabled)]
-	[StructLayout(LayoutKind.Sequential, Pack = 4)]
-	private struct NativePointerEventResult
-	{
-		public byte Result; // HtmlEventDispatchResult
-	}
-
-	[Flags]
-	private enum NativePointerEvent : byte
-	{
-		// WARNING: This enum has a corresponding version in TypeScript!
-
-		// Minimal default pointer required to maintain state
-		pointerover = 1,
-		pointerout = 1 << 1,
-		pointerdown = 1 << 2,
-		pointerup = 1 << 3,
-		pointercancel = 1 << 4,
-		pointermove = 1 << 5, // Required since when pt is captured, isOver will be maintained by the moveWithOverCheck
-
-		// Optional pointer events
-		wheel = 1 << 6,
-
-		Defaults = pointerover | pointerout | pointerdown | pointerup | pointercancel | pointermove,
-	}
 }
diff --git a/src/Uno.UI/UI/Xaml/UIElement.wasm.cs b/src/Uno.UI/UI/Xaml/UIElement.wasm.cs
index 105ce64a377c..72895baae249 100644
--- a/src/Uno.UI/UI/Xaml/UIElement.wasm.cs
+++ b/src/Uno.UI/UI/Xaml/UIElement.wasm.cs
@@ -628,6 +628,12 @@ internal void UpdateDOMXamlProperty(string propertyName, object value)
 			WindowManagerInterop.SetAttribute(HtmlId, "xaml" + propertyName.ToLowerInvariant().Replace('.', '_'), value?.ToString() ?? "[null]");
 		}
 
+		/// <remarks>
+		/// This doesn't consider renderingBounds and defaults to true, where currently only Shapes override it to provide proper hit testing.
+		/// Caller is responsible for checking rendering bounds
+		/// </remarks>
+		internal virtual bool HitTest(Point relativePosition) => true;
+
 		private static KeyRoutedEventArgs PayloadToKeyArgs(object src, string payload)
 		{
 			var key = VirtualKey.None;
diff --git a/src/Uno.UI/UI/Xaml/Window/WindowManagerInterop.wasm.cs b/src/Uno.UI/UI/Xaml/Window/WindowManagerInterop.wasm.cs
index 2d08394a6a56..405279c7613c 100644
--- a/src/Uno.UI/UI/Xaml/Window/WindowManagerInterop.wasm.cs
+++ b/src/Uno.UI/UI/Xaml/Window/WindowManagerInterop.wasm.cs
@@ -49,6 +49,9 @@ internal static string BeforeLaunch()
 		internal static double GetBootTime()
 			=> NativeMethods.GetBootTime();
 
+		internal static bool ContainsPoint(IntPtr htmlId, double x, double y, bool considerFill, bool considerStroke)
+			=> NativeMethods.ContainsPoint(htmlId, x, y, considerFill, considerStroke);
+
 		#region CreateContent
 		internal static void CreateContent(IntPtr htmlId, string htmlTag, IntPtr handle, int uiElementRegistrationId, bool htmlTagIsSvg, bool isFocusable)
 		{
@@ -144,27 +147,8 @@ internal static void SetPointerEvents(IntPtr htmlId, bool enabled)
 			NativeMethods.SetPointerEvents(htmlId, enabled);
 		}
 
-		[TSInteropMessage]
-		[StructLayout(LayoutKind.Sequential, Pack = 4)]
-		private struct WindowManagerSetPointerEventsParams
-		{
-			public IntPtr HtmlId;
-
-			public bool Enabled;
-		}
-
 		#endregion
 
-		internal static void SetPointerCapture(IntPtr htmlId, uint pointerId)
-		{
-			NativeMethods.SetPointerCapture(htmlId, pointerId);
-		}
-
-		internal static void ReleasePointerCapture(IntPtr htmlId, uint pointerId)
-		{
-			NativeMethods.ReleasePointerCapture(htmlId, pointerId);
-		}
-
 		#region MeasureView
 		internal static Size MeasureView(IntPtr htmlId, Size availableSize, bool measureContent)
 		{
@@ -775,25 +759,6 @@ private struct WindowManagerRegisterEventOnViewParams
 		}
 		#endregion
 
-		#region registerPointerEventsOnView
-		internal static void RegisterPointerEventsOnView(IntPtr htmlId)
-		{
-			var parms = new WindowManagerRegisterPointerEventsOnViewParams()
-			{
-				HtmlId = htmlId,
-			};
-
-			TSInteropMarshaller.InvokeJS("Uno:registerPointerEventsOnView", parms);
-		}
-
-		[TSInteropMessage]
-		[StructLayout(LayoutKind.Sequential, Pack = 4)]
-		private struct WindowManagerRegisterPointerEventsOnViewParams
-		{
-			public IntPtr HtmlId;
-		}
-		#endregion
-
 		#region GetBBox
 
 		internal static Rect GetBBox(IntPtr htmlId)
@@ -1061,33 +1026,12 @@ internal static bool GetIsOverflowing(IntPtr htmlId)
 		internal static void SetIsFocusable(IntPtr htmlId, bool isFocusable)
 			=> NativeMethods.SetIsFocusable(htmlId, isFocusable);
 
-		#region Pointers
-		[Flags]
-		internal enum HtmlPointerButtonsState
+		internal static UIElement TryGetElementInCoordinate(Point point)
 		{
-			// https://developer.mozilla.org/en-US/docs/Web/API/Pointer_events#Determining_button_states
-
-			None = 0,
-			Left = 1,
-			Middle = 4,
-			Right = 2,
-			X1 = 8,
-			X2 = 16,
-			Eraser = 32,
+			var htmlId = NativeMethods.GetElementInCoordinate(point.X, point.Y);
+			return UIElement.GetElementFromHandle(htmlId);
 		}
 
-		internal enum HtmlPointerButtonUpdate
-		{
-			None = -1,
-			Left = 0,
-			Middle = 1,
-			Right = 2,
-			X1 = 3,
-			X2 = 4,
-			Eraser = 5
-		}
-		#endregion
-
 		internal static partial class NativeMethods
 		{
 			[JSImport("globalThis.Uno.UI.WindowManager.current.arrangeElementNativeFast")]
@@ -1145,9 +1089,6 @@ internal static partial void ArrangeElement(
 			[JSImport("globalThis.Uno.UI.WindowManager.current.rawPixelsToBase64EncodeImage")]
 			internal static partial string RawPixelsToBase64EncodeImage(IntPtr data, int width, int height);
 
-			[JSImport("globalThis.Uno.UI.WindowManager.current.releasePointerCapture")]
-			internal static partial void ReleasePointerCapture(IntPtr htmlId, double pointerId);
-
 			[JSImport("globalThis.Uno.UI.WindowManager.current.selectInputRange")]
 			internal static partial void SelectInputRange(IntPtr htmlId, int start, int length);
 
@@ -1163,10 +1104,7 @@ internal static partial void ArrangeElement(
 			[JSImport("globalThis.Uno.UI.WindowManager.current.setCornerRadius")]
 			internal static partial void SetCornerRadius(IntPtr htmlId, float topLeftX, float topLeftY, float topRightX, float topRightY, float bottomRightX, float bottomRightY, float bottomLeftX, float bottomLeftY);
 
-			[JSImport("globalThis.Uno.UI.WindowManager.current.setPointerCapture")]
-			internal static partial void SetPointerCapture(IntPtr htmlId, double pointerId);
-
-			[JSImport("globalThis.Uno.UI.WindowManager.current.setPointerEventsNativeFast")]
+			[JSImport("globalThis.Uno.UI.WindowManager.current.setPointerEvents")]
 			internal static partial void SetPointerEvents(IntPtr htmlId, bool enabled);
 
 			[JSImport("globalThis.Uno.UI.WindowManager.current.setPropertyNativeFast")]
@@ -1195,6 +1133,12 @@ internal static partial void ArrangeElement(
 
 			[JSImport("globalThis.Uno.UI.WindowManager.current.setIsFocusable")]
 			internal static partial void SetIsFocusable(nint htmlId, bool isFocusable);
+
+			[JSImport("globalThis.Uno.UI.WindowManager.current.getElementInCoordinate")]
+			internal static partial IntPtr GetElementInCoordinate(double x, double y);
+
+			[JSImport("globalThis.Uno.UI.WindowManager.current.containsPoint")]
+			internal static partial bool ContainsPoint(IntPtr htmlId, double x, double y, bool considerFill, bool considerStroke);
 		}
 	}
 }
diff --git a/src/Uno.UI/ts/MonoSupport.ts b/src/Uno.UI/ts/MonoSupport.ts
index e532ae224dc7..faa7ad6c07bd 100644
--- a/src/Uno.UI/ts/MonoSupport.ts
+++ b/src/Uno.UI/ts/MonoSupport.ts
@@ -32,7 +32,6 @@ namespace MonoSupport {
 					jsCallDispatcher.registerScope("UnoStatic_Windows_Storage_StorageFolder", Windows.Storage.StorageFolder);
 					jsCallDispatcher.registerScope("UnoStatic_Windows_Storage_ApplicationDataContainer", Windows.Storage.ApplicationDataContainer);
 					jsCallDispatcher.registerScope("UnoStatic_Windows_ApplicationModel_DataTransfer_DragDrop_Core_DragDropExtension", Windows.ApplicationModel.DataTransfer.DragDrop.Core.DragDropExtension);
-					jsCallDispatcher.registerScope("UnoStatic_Windows_UI_Xaml_UIElement", Microsoft.UI.Xaml.UIElement);
 					jsCallDispatcher._isUnoRegistered = true;
 				}
 
diff --git a/src/Uno.UI/ts/Runtime/BrowserPointerInputSource.ts b/src/Uno.UI/ts/Runtime/BrowserPointerInputSource.ts
new file mode 100644
index 000000000000..8ed54f359677
--- /dev/null
+++ b/src/Uno.UI/ts/Runtime/BrowserPointerInputSource.ts
@@ -0,0 +1,194 @@
+namespace Uno.UI.Runtime.Skia {
+	//TODO import PointerDeviceType = Windows.Devices.Input.PointerDeviceType;
+	import HtmlEventDispatchResult = Uno.UI.HtmlEventDispatchResult;
+
+	export enum PointerDeviceType {
+		Touch = 0,
+		Pen = 1,
+		Mouse = 2,
+	}
+
+	export enum HtmlPointerEvent {
+		pointerover = 1,
+		pointerleave = 1 << 1,
+		pointerdown = 1 << 2,
+		pointerup = 1 << 3,
+		pointercancel = 1 << 4,
+
+		// Optional pointer events
+		pointermove = 1 << 5,
+		lostpointercapture = 1 << 6,
+		wheel = 1 << 7,
+	}
+
+	export class BrowserPointerInputSource {
+
+		private static _exports: any;
+		
+		public static async initialize(inputSource: any): Promise<any> {
+
+			const module = <any>window.Module;
+			if (BrowserPointerInputSource._exports == undefined
+				&& module.getAssemblyExports !== undefined) {
+					
+				const browserExports = (await module.getAssemblyExports("Uno.UI"));
+
+				BrowserPointerInputSource._exports = browserExports.Uno.UI.Runtime.BrowserPointerInputSource;
+			}
+
+			return new BrowserPointerInputSource(inputSource);
+		}
+
+		public static setPointerCapture(pointerId: number): void {
+			document.body.setPointerCapture(pointerId);
+		}
+
+		public static releasePointerCapture(pointerId: number): void {
+			document.body.releasePointerCapture(pointerId);
+		}
+
+		private _source: any;
+		private _bootTime: Number;
+
+		private constructor(manageSource: any) {
+			this._bootTime = Date.now() - performance.now();
+			this._source = manageSource;
+
+			BrowserPointerInputSource._exports.OnInitialized(manageSource, this._bootTime);
+			this.subscribePointerEvents(); // Subscribe only after the managed initialization is done
+		}
+
+		private subscribePointerEvents() {
+			const element = document.body;
+
+			element.addEventListener("pointerover", this.onPointerEventReceived.bind(this), { capture: false });
+			element.addEventListener("pointerleave", this.onPointerEventReceived.bind(this), { capture: false });
+			element.addEventListener("pointerdown", this.onPointerEventReceived.bind(this), { capture: false });
+			element.addEventListener("pointerup", this.onPointerEventReceived.bind(this), { capture: false });
+			element.addEventListener("pointercancel", this.onPointerEventReceived.bind(this), { capture: false });
+			element.addEventListener("pointermove", this.onPointerEventReceived.bind(this), { capture: false });
+			element.addEventListener("wheel", this.onPointerEventReceived.bind(this), { capture: false });
+		}
+
+		private onPointerEventReceived(evt: PointerEvent): void {
+			const event = BrowserPointerInputSource.toHtmlPointerEvent(evt.type);
+
+			let pointerId: number, pointerType: PointerDeviceType, pressure: number;
+			let wheelDeltaX: number, wheelDeltaY: number;
+			if (evt instanceof WheelEvent) {
+				pointerId = (evt as any).mozInputSource ? 0 : 1; // Try to match the mouse pointer ID 0 for FF, 1 for others
+				pointerType = PointerDeviceType.Mouse;
+				pressure = 0.5; // like WinUI
+				wheelDeltaX = evt.deltaX;
+				wheelDeltaY = evt.deltaY;
+
+				switch (evt.deltaMode) {
+					case WheelEvent.DOM_DELTA_LINE: // Actually this is supported only by FF
+						const lineSize = BrowserPointerInputSource.wheelLineSize;
+						wheelDeltaX *= lineSize;
+						wheelDeltaY *= lineSize;
+						break;
+					case WheelEvent.DOM_DELTA_PAGE:
+						wheelDeltaX *= document.documentElement.clientWidth;
+						wheelDeltaY *= document.documentElement.clientHeight;
+						break;
+				}
+			} else {
+				pointerId = evt.pointerId;
+				pointerType = BrowserPointerInputSource.toPointerDeviceType(evt.pointerType);
+				pressure = evt.pressure;
+				wheelDeltaX = 0;
+				wheelDeltaY = 0;
+			}
+
+			const result = BrowserPointerInputSource._exports.OnNativeEvent(
+				this._source,
+				event, //byte @event, // ONE of NativePointerEvent
+				evt.timeStamp, //double timestamp,
+				pointerType, //int deviceType, // ONE of _PointerDeviceType
+				pointerId, //double pointerId, // Warning: This is a Number in JS, and it might be negative on safari for iOS
+				evt.clientX, //double x,
+				evt.clientY, //double y,
+				evt.ctrlKey, //bool ctrl,
+				evt.shiftKey, //bool shift,
+				evt.buttons, //int buttons,
+				evt.button, //int buttonUpdate,
+				pressure, //double pressure,
+				wheelDeltaX, //double wheelDeltaX,
+				wheelDeltaY, //double wheelDeltaY,
+				evt.relatedTarget !== null //bool hasRelatedTarget)
+			);
+			// This is uesless with root pointer management
+			//if (result & HtmlEventDispatchResult.StopPropagation) {
+			//	evt.stopPropagation();
+			//}
+			if (result & HtmlEventDispatchResult.PreventDefault) {
+				evt.preventDefault();
+			}
+		}
+
+		//#region WheelLineSize
+		private static _wheelLineSize: number = undefined;
+		private static get wheelLineSize(): number {
+			// In web browsers, scroll might happen by pixels, line or page.
+			// But WinUI works only with pixels, so we have to convert it before send the value to the managed code.
+			// The issue is that there is no easy way get the "size of a line", instead we have to determine the CSS "line-height"
+			// defined in the browser settings. 
+			// https://stackoverflow.com/questions/20110224/what-is-the-height-of-a-line-in-a-wheel-event-deltamode-dom-delta-line
+			if (this._wheelLineSize == undefined) {
+				const el = document.createElement("div");
+				el.style.fontSize = "initial";
+				el.style.display = "none";
+				document.body.appendChild(el);
+				const fontSize = window.getComputedStyle(el).fontSize;
+				document.body.removeChild(el);
+
+				this._wheelLineSize = fontSize ? parseInt(fontSize) : 16; /* 16 = The current common default font size */
+
+				// Based on observations, even if the event reports 3 lines (the settings of windows),
+				// the browser will actually scroll of about 6 lines of text.
+				this._wheelLineSize *= 2.0;
+			}
+
+			return this._wheelLineSize;
+		}
+		//#endregion
+
+		//#region Helpers
+		private static toHtmlPointerEvent(eventName: string): HtmlPointerEvent {
+			switch (eventName) {
+				case "pointerover":
+					return HtmlPointerEvent.pointerover;
+				case "pointerleave":
+					return HtmlPointerEvent.pointerleave;
+				case "pointerdown"	 :
+					return HtmlPointerEvent.pointerdown;
+				case "pointerup"	 :
+					return HtmlPointerEvent.pointerup;
+				case "pointercancel" :
+					return HtmlPointerEvent.pointercancel;
+				case "pointermove"	 :
+					return HtmlPointerEvent.pointermove;
+				case "wheel":
+					return HtmlPointerEvent.wheel;
+				default:
+					return undefined;
+			}
+		}
+
+		private static toPointerDeviceType(type: string): PointerDeviceType {
+			switch (type) {
+				case "touch":
+					return PointerDeviceType.Touch;
+				case "pen":
+					// Note: As of 2019-11-28, once pen pressed events pressed/move/released are reported as TOUCH on Firefox
+					//		 https://bugzilla.mozilla.org/show_bug.cgi?id=1449660
+					return PointerDeviceType.Pen;
+				case "mouse":
+				default:
+					return PointerDeviceType.Mouse;
+			}
+		}
+		//#endregion
+	}
+}
diff --git a/src/Uno.UI/ts/WindowManager.ts b/src/Uno.UI/ts/WindowManager.ts
index 1cb003d2cbf8..a0ae82cdf15e 100644
--- a/src/Uno.UI/ts/WindowManager.ts
+++ b/src/Uno.UI/ts/WindowManager.ts
@@ -222,6 +222,28 @@ namespace Uno.UI {
 			return Date.now() - performance.now();
 		}
 
+		public containsPoint(htmlId: number, x: number, y: number, considerFill: boolean, considerStroke: boolean): boolean {
+			const view = this.getView(htmlId);
+			if (view instanceof SVGGeometryElement) {
+				try {
+					const point = new DOMPoint(x, y);
+					return (considerFill && view.isPointInFill(point)) ||
+						(considerStroke && view.isPointInStroke(point));
+				}
+				catch (e) {
+					// SVGPoint is deprecated, but only Firefox and Safari supports DOMPoint
+					const svgElement = view.closest("svg");
+					const point = svgElement.createSVGPoint();
+					point.x = x;
+					point.y = y;
+					return (considerFill && view.isPointInFill(point)) ||
+						(considerStroke && view.isPointInStroke(point));
+				}
+			}
+
+			return false;
+		}
+
 		/**
 			* Create a html DOM element representing a Xaml element.
 			*
@@ -832,19 +854,7 @@ namespace Uno.UI {
 			this.setAsArranged(element);
 		}
 
-		private setPointerEvents(htmlId: number, enabled: boolean) {
-			const element = this.getView(htmlId);
-			element.style.pointerEvents = enabled ? "auto" : "none";
-		}
-
-		public setPointerEventsNative(pParams: number): boolean {
-			const params = WindowManagerSetPointerEventsParams.unmarshal(pParams);
-			this.setPointerEvents(params.HtmlId, params.Enabled);
-
-			return true;
-		}
-
-		public setPointerEventsNativeFast(htmlId: number, enabled: boolean) {
+		public setPointerEvents(htmlId: number, enabled: boolean) {
 			this.getView(htmlId).style.pointerEvents = enabled ? "auto" : "none";
 		}
 
@@ -1465,14 +1475,6 @@ namespace Uno.UI {
 			element.style.overflow = "hidden"; // overflow: hidden is required here because the clipping can't do its job when it's non-rectangular.
 		}
 
-		public setPointerCapture(viewId: number, pointerId: number): void {
-			this.getView(viewId).setPointerCapture(pointerId);
-		}
-
-		public releasePointerCapture(viewId: number, pointerId: number): void {
-			this.getView(viewId).releasePointerCapture(pointerId);
-		}
-
 		public focusView(elementId: number): void {
 			const element = this.getView(elementId);
 
@@ -1693,6 +1695,11 @@ namespace Uno.UI {
 			return "#" + color.toString(16).padStart(8, "0");
 		}
 
+		public getElementInCoordinate(x: number, y: number): number {
+			const element = document.elementFromPoint(x, y) as HTMLElement;
+			return Number(element.getAttribute("XamlHandle"));
+		}
+
 		public setCursor(cssCursor: string): string {
 			const unoBody = document.getElementById(this.containerElementId);
 
diff --git a/src/Uno.UI/ts/Windows/UI/Xaml/UIElement.Pointers.ts b/src/Uno.UI/ts/Windows/UI/Xaml/UIElement.Pointers.ts
deleted file mode 100644
index 5e6fe81d25da..000000000000
--- a/src/Uno.UI/ts/Windows/UI/Xaml/UIElement.Pointers.ts
+++ /dev/null
@@ -1,351 +0,0 @@
-namespace Microsoft.UI.Xaml {
-	import WindowManager = Uno.UI.WindowManager;
-	import HtmlEventDispatchResult = Uno.UI.HtmlEventDispatchResult;
-	import PointerDeviceType = Windows.Devices.Input.PointerDeviceType;
-
-	export enum NativePointerEvent {
-		pointerover = 1,
-		pointerout = 1 << 1,
-		pointerdown = 1 << 2,
-		pointerup = 1 << 3,
-		pointercancel = 1 << 4,
-
-		// Optional pointer events
-		pointermove = 1 << 5,
-		wheel = 1 << 6,
-	}
-
-	export class UIElement_Pointers {
-
-		private static _dispatchPointerEventMethod: any;
-		private static _dispatchPointerEventArgs: number;
-		private static _dispatchPointerEventResult: number;
-		private static _isManualyDispatchingOut: boolean = false;
-
-		private static ensurePointersInit(): void {
-			if (!UIElement._dispatchPointerEventMethod) {
-				if ((<any>globalThis).DotnetExports !== undefined) {
-					UIElement._dispatchPointerEventMethod = (<any>globalThis).DotnetExports.UnoUI.Microsoft.UI.Xaml.UIElement.OnNativePointerEvent;
-				} else {
-					UIElement._dispatchPointerEventMethod = (<any>Module).mono_bind_static_method("[Uno.UI] Microsoft.UI.Xaml.UIElement:OnNativePointerEvent");
-				}
-
-				document.getRootNode().addEventListener("pointerover", UIElement_Pointers.onRootPointerOverDispatching, { capture: true, passive: true });
-			}
-		}
-
-		public static setPointerEventArgs(pArgs: number): void {
-			UIElement_Pointers.ensurePointersInit();
-			UIElement._dispatchPointerEventArgs = pArgs;
-		}
-
-		public static setPointerEventResult(pArgs: number): void {
-			UIElement_Pointers.ensurePointersInit();
-			UIElement._dispatchPointerEventResult = pArgs;
-		}
-
-		public static subscribePointerEvents(pParams: number): void {
-			const params = Microsoft.UI.Xaml.NativePointerSubscriptionParams.unmarshal(pParams);
-			const element = WindowManager.current.getView(params.HtmlId);
-
-			if (params.Events & NativePointerEvent.pointerover) {
-				element.addEventListener("pointerover", UIElement.onPointerEventReceived);
-			}
-			if (params.Events & NativePointerEvent.pointerout) {
-				element.addEventListener("pointerout", UIElement.onPointerOutReceived);
-			}
-			if (params.Events & NativePointerEvent.pointerdown) {
-				element.addEventListener("pointerdown", UIElement.onPointerEventReceived);
-			}
-			if (params.Events & NativePointerEvent.pointerup) {
-				element.addEventListener("pointerup", UIElement.onPointerEventReceived);
-			}
-			if (params.Events & NativePointerEvent.pointercancel) {
-				element.addEventListener("pointercancel", UIElement.onPointerEventReceived);
-			}
-			if (params.Events & NativePointerEvent.pointermove) {
-				element.addEventListener("pointermove", UIElement.onPointerEventReceived);
-			}
-			if (params.Events & NativePointerEvent.wheel) {
-				element.addEventListener("wheel", UIElement.onPointerEventReceived);
-			}
-		}
-
-		public static unSubscribePointerEvents(pParams: number): void {
-			const params = Microsoft.UI.Xaml.NativePointerSubscriptionParams.unmarshal(pParams);
-			const element = WindowManager.current.getView(params.HtmlId);
-
-			if (!element) {
-				return;
-			}
-
-			if (params.Events & NativePointerEvent.pointerover) {
-				element.removeEventListener("pointerover", UIElement.onPointerEventReceived);
-			}
-			if (params.Events & NativePointerEvent.pointerout) {
-				element.removeEventListener("pointerout", UIElement.onPointerOutReceived);
-			}
-			if (params.Events & NativePointerEvent.pointerdown) {
-				element.removeEventListener("pointerdown", UIElement.onPointerEventReceived);
-			}
-			if (params.Events & NativePointerEvent.pointerup) {
-				element.removeEventListener("pointerup", UIElement.onPointerEventReceived);
-			}
-			if (params.Events & NativePointerEvent.pointercancel) {
-				element.removeEventListener("pointercancel", UIElement.onPointerEventReceived);
-			}
-			if (params.Events & NativePointerEvent.pointermove) {
-				element.removeEventListener("pointermove", UIElement.onPointerEventReceived);
-			}
-			if (params.Events & NativePointerEvent.wheel) {
-				element.removeEventListener("wheel", UIElement.onPointerEventReceived);
-			}
-		}
-
-		private static onPointerEventReceived(evt: PointerEvent): void {
-			UIElement.dispatchPointerEvent(evt.currentTarget as HTMLElement | SVGElement, evt);
-		}
-
-		private static onRootPointerOverDispatching(evt: PointerEvent): void {
-			const target = evt.target as HTMLElement | SVGElement;
-			if (!target) {
-				return;
-			}
-
-			if (target.hasPointerCapture(evt.pointerId)) {
-				return;
-			}
-
-			let prevElt: Element = null;
-			for (let elt of document.elementsFromPoint(evt.clientX, evt.clientY)) {
-				if (!elt.contains(target) // The elt is under the target (not a parent!)
-					&& !elt.contains(prevElt) // The elt is not a parent of the previous element (so it has already been processed!)
-				) {
-					// The element is under the target (not a parent!), with chromium browsers, if the target just popped up,
-					// it happens that the pointerout event is not raised on those elemnts under.
-					// Here we ensure to raise it manually before the pointerover event is being dispatched.
-					try {
-						UIElement._isManualyDispatchingOut = true;
-						elt.dispatchEvent(new PointerEvent("pointerout", evt));
-					}
-					finally {
-						UIElement._isManualyDispatchingOut = false;
-					}
-				}
-				prevElt = elt;
-			}
-		}
-
-		private static onPointerOutReceived(evt: PointerEvent): void {
-			if (UIElement._isManualyDispatchingOut) {
-				UIElement.onPointerEventReceived(evt);
-				return;
-			}
-
-			const element = evt.currentTarget as HTMLElement | SVGElement;
-
-			// When we capture the pointer, browser will raise an "out" event on nested elements
-			// and then an "over" on the element that captured the pointer.
-			// But those events will be raise right BEFORE the NEXT pointer event (e.g. a move).
-			// Note: We don't filter out the "over" event because it's handled in managed by tracking the IsOver state.
-
-			// Here we filter the "out" event that is being raised after capture or release
-			// If the relatedTarget (the element that capture or release the pointer) is a child of (or is) the current element,
-			// it means pointer might not leaving the current element!
-			let elt = evt.relatedTarget as HTMLElement | SVGElement;
-			if (elt
-				&& element.contains(elt)
-				&& (
-					// on capture, we just check if it has the the capture
-					elt.hasPointerCapture(evt.pointerId)
-					// on release, the target is the element itself
-					|| evt.target == element)
-				)
-			{
-				evt.stopPropagation();
-				return;
-			}
-
-			// Finally, here we filter out the events that are being raised when the pointer is leaving a nested element (which is bubbling in browser)
-			const targetBounds = (evt.target as HTMLElement | SVGElement).getBoundingClientRect();
-			elt = evt.target as HTMLElement | SVGElement;
-			while (elt && elt != element) {
-				if (elt.style.pointerEvents != "none") {
-					const bounds = elt.getBoundingClientRect();
-					if (
-						(evt.clientY > bounds.top && (Math.abs(targetBounds.top - bounds.top) > 1))
-						&& (evt.clientY < bounds.bottom && (Math.abs(targetBounds.bottom - bounds.bottom) > 1))
-						&& (evt.clientX > bounds.left && (Math.abs(targetBounds.left - bounds.left) > 1))
-						&& (evt.clientX < bounds.right && (Math.abs(targetBounds.right - bounds.right) > 1))
-					) {
-						// There is child that is still under the pointer (and which will raise pointer events), so we should not propagate the event.
-						// Note: If the child is sharing the bounds with the target, we consider that the pointer is also leaving the intermediate child.
-						evt.stopPropagation();
-						return;
-					}
-				}
-				elt = elt.parentElement;
-			}
-
-			UIElement.onPointerEventReceived(evt);
-		}
-
-		private static dispatchPointerEvent(element: HTMLElement | SVGElement, evt: PointerEvent): void {
-			if (!evt) {
-				return;
-			}
-
-			const args = UIElement.toNativePointerEventArgs(evt);
-			args.HtmlId = Number(element.getAttribute("XamlHandle"));
-
-			args.marshal(UIElement._dispatchPointerEventArgs);
-			UIElement._dispatchPointerEventMethod();
-			const response = Microsoft.UI.Xaml.NativePointerEventResult.unmarshal(UIElement._dispatchPointerEventResult);
-
-			if (response.Result & HtmlEventDispatchResult.StopPropagation) {
-				evt.stopPropagation();
-			}
-			if (response.Result & HtmlEventDispatchResult.PreventDefault) {
-				evt.preventDefault();
-			}
-		}
-
-		//#region WheelLineSize
-		private static _wheelLineSize: number = undefined;
-		private static get wheelLineSize(): number {
-			// In web browsers, scroll might happen by pixels, line or page.
-			// But WinUI works only with pixels, so we have to convert it before send the value to the managed code.
-			// The issue is that there is no easy way get the "size of a line", instead we have to determine the CSS "line-height"
-			// defined in the browser settings. 
-			// https://stackoverflow.com/questions/20110224/what-is-the-height-of-a-line-in-a-wheel-event-deltamode-dom-delta-line
-			if (this._wheelLineSize == undefined) {
-				const el = document.createElement("div");
-				el.style.fontSize = "initial";
-				el.style.display = "none";
-				document.body.appendChild(el);
-				const fontSize = window.getComputedStyle(el).fontSize;
-				document.body.removeChild(el);
-
-				this._wheelLineSize = fontSize ? parseInt(fontSize) : 16; /* 16 = The current common default font size */
-
-				// Based on observations, even if the event reports 3 lines (the settings of windows),
-				// the browser will actually scroll of about 6 lines of text.
-				this._wheelLineSize *= 2.0;
-			}
-
-			return this._wheelLineSize;
-		}
-		//#endregion
-
-		//#region Helpers
-		private static toNativePointerEventArgs(evt: PointerEvent | WheelEvent): Microsoft.UI.Xaml.NativePointerEventArgs {
-			let src = evt.target as HTMLElement | SVGElement;
-			if (src instanceof SVGElement) {
-				// The XAML SvgElement are UIElement in Uno (so they have a XamlHandle),
-				// but as on WinUI they are not part of the visual tree, they should not be used as OriginalElement.
-				// Instead we should use the actual parent <svg /> which is the XAML Shape.
-				const shape = (src as any).ownerSVGElement;
-				if (shape) {
-					src = shape;
-				}
-			} else if (src instanceof HTMLImageElement) {
-				// Same as above for images (<img /> == HtmlImage, we use the parent <div /> which is the XAML Image).
-				src = src.parentElement;
-			}
-
-			let srcHandle = "0";
-			while (src) {
-				const handle = src.getAttribute("XamlHandle");
-				if (handle) {
-					srcHandle = handle;
-					break;
-				}
-
-				src = src.parentElement;
-			}
-
-			let pointerId: number, pointerType: PointerDeviceType, pressure: number;
-			let wheelDeltaX: number, wheelDeltaY: number;
-			if (evt instanceof WheelEvent) {
-				pointerId = (evt as any).mozInputSource ? 0 : 1; // Try to match the mouse pointer ID 0 for FF, 1 for others
-				pointerType = PointerDeviceType.Mouse;
-				pressure = 0.5; // like WinUI
-				wheelDeltaX = evt.deltaX;
-				wheelDeltaY = evt.deltaY;
-
-				switch (evt.deltaMode) {
-					case WheelEvent.DOM_DELTA_LINE: // Actually this is supported only by FF
-						const lineSize = UIElement.wheelLineSize;
-						wheelDeltaX *= lineSize;
-						wheelDeltaY *= lineSize;
-						break;
-					case WheelEvent.DOM_DELTA_PAGE:
-						wheelDeltaX *= document.documentElement.clientWidth;
-						wheelDeltaY *= document.documentElement.clientHeight;
-						break;
-				}
-			} else {
-				pointerId = evt.pointerId;
-				pointerType = UIElement.toPointerDeviceType(evt.pointerType);
-				pressure = evt.pressure;
-				wheelDeltaX = 0;
-				wheelDeltaY = 0;
-			}
-
-			const args = new Microsoft.UI.Xaml.NativePointerEventArgs();
-			args.Event = UIElement.toNativeEvent(evt.type);
-			args.pointerId = pointerId;
-			args.x = evt.clientX;
-			args.y = evt.clientY;
-			args.ctrl = evt.ctrlKey;
-			args.shift = evt.shiftKey;
-			args.hasRelatedTarget = evt.relatedTarget !== null;
-			args.buttons = evt.buttons;
-			args.buttonUpdate = evt.button;
-			args.deviceType = pointerType;
-			args.srcHandle = Number(srcHandle);
-			args.timestamp = evt.timeStamp;
-			args.pressure = pressure;
-			args.wheelDeltaX = wheelDeltaX;
-			args.wheelDeltaY = wheelDeltaY;
-
-			return args;
-		}
-
-		private static toNativeEvent(eventName: string): NativePointerEvent {
-			switch (eventName) {
-				case "pointerover":
-					return NativePointerEvent.pointerover;
-				case "pointerout":
-					return NativePointerEvent.pointerout;
-				case "pointerdown"	 :
-					return NativePointerEvent.pointerdown;
-				case "pointerup"	 :
-					return NativePointerEvent.pointerup;
-				case "pointercancel" :
-					return NativePointerEvent.pointercancel;
-				case "pointermove"	 :
-					return NativePointerEvent.pointermove;
-				case "wheel":
-					return NativePointerEvent.wheel;
-				default:
-					return undefined;
-			}
-		}
-
-		private static toPointerDeviceType(type: string): PointerDeviceType {
-			switch (type) {
-				case "touch":
-					return PointerDeviceType.Touch;
-				case "pen":
-					// Note: As of 2019-11-28, once pen pressed events pressed/move/released are reported as TOUCH on Firefox
-					//		 https://bugzilla.mozilla.org/show_bug.cgi?id=1449660
-					return PointerDeviceType.Pen;
-				case "mouse":
-				default:
-					return PointerDeviceType.Mouse;
-			}
-		}
-		//#endregion
-	}
-}
diff --git a/src/Uno.UI/ts/Windows/UI/Xaml/UIElement.ts b/src/Uno.UI/ts/Windows/UI/Xaml/UIElement.ts
deleted file mode 100644
index 0b14b6bf5125..000000000000
--- a/src/Uno.UI/ts/Windows/UI/Xaml/UIElement.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/// <reference path="UIElement.Pointers.ts" />
-
-namespace Microsoft.UI.Xaml {
-	export class UIElement extends Microsoft.UI.Xaml.UIElement_Pointers {
-
-	}
-}
diff --git a/src/Uno.UWP/Generated/3.0.0.0/Windows.UI.Core/CoreWindow.cs b/src/Uno.UWP/Generated/3.0.0.0/Windows.UI.Core/CoreWindow.cs
index c04a752e834d..e49b4947f834 100644
--- a/src/Uno.UWP/Generated/3.0.0.0/Windows.UI.Core/CoreWindow.cs
+++ b/src/Uno.UWP/Generated/3.0.0.0/Windows.UI.Core/CoreWindow.cs
@@ -101,15 +101,15 @@ public void Close()
 #endif
 		// Skipping already declared method Windows.UI.Core.CoreWindow.GetAsyncKeyState(Windows.System.VirtualKey)
 		// Skipping already declared method Windows.UI.Core.CoreWindow.GetKeyState(Windows.System.VirtualKey)
-#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || false || __NETSTD_REFERENCE__ || false
-		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__NETSTD_REFERENCE__")]
+#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || false || false || __NETSTD_REFERENCE__ || false
+		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__NETSTD_REFERENCE__")]
 		public void ReleasePointerCapture()
 		{
 			global::Windows.Foundation.Metadata.ApiInformation.TryRaiseNotImplemented("Windows.UI.Core.CoreWindow", "void CoreWindow.ReleasePointerCapture()");
 		}
 #endif
-#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || false || __NETSTD_REFERENCE__ || false
-		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__NETSTD_REFERENCE__")]
+#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || false || false || __NETSTD_REFERENCE__ || false
+		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__NETSTD_REFERENCE__")]
 		public void SetPointerCapture()
 		{
 			global::Windows.Foundation.Metadata.ApiInformation.TryRaiseNotImplemented("Windows.UI.Core.CoreWindow", "void CoreWindow.SetPointerCapture()");
@@ -286,7 +286,7 @@ public string GetCurrentKeyEventDeviceId()
 			}
 		}
 #endif
-#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || false || __NETSTD_REFERENCE__ || false
+#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || false || false || __NETSTD_REFERENCE__ || false
 		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__NETSTD_REFERENCE__")]
 		public event global::Windows.Foundation.TypedEventHandler<global::Windows.UI.Core.CoreWindow, global::Windows.UI.Core.PointerEventArgs> PointerEntered
 		{
@@ -302,7 +302,7 @@ public string GetCurrentKeyEventDeviceId()
 			}
 		}
 #endif
-#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || false || __NETSTD_REFERENCE__ || false
+#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || false || false || __NETSTD_REFERENCE__ || false
 		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__NETSTD_REFERENCE__")]
 		public event global::Windows.Foundation.TypedEventHandler<global::Windows.UI.Core.CoreWindow, global::Windows.UI.Core.PointerEventArgs> PointerExited
 		{
@@ -318,7 +318,7 @@ public string GetCurrentKeyEventDeviceId()
 			}
 		}
 #endif
-#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || false || __NETSTD_REFERENCE__ || false
+#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || false || false || __NETSTD_REFERENCE__ || false
 		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__NETSTD_REFERENCE__")]
 		public event global::Windows.Foundation.TypedEventHandler<global::Windows.UI.Core.CoreWindow, global::Windows.UI.Core.PointerEventArgs> PointerMoved
 		{
@@ -334,7 +334,7 @@ public string GetCurrentKeyEventDeviceId()
 			}
 		}
 #endif
-#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || false || __NETSTD_REFERENCE__ || false
+#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || false || false || __NETSTD_REFERENCE__ || false
 		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__NETSTD_REFERENCE__")]
 		public event global::Windows.Foundation.TypedEventHandler<global::Windows.UI.Core.CoreWindow, global::Windows.UI.Core.PointerEventArgs> PointerPressed
 		{
@@ -350,7 +350,7 @@ public string GetCurrentKeyEventDeviceId()
 			}
 		}
 #endif
-#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || false || __NETSTD_REFERENCE__ || false
+#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || false || false || __NETSTD_REFERENCE__ || false
 		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__NETSTD_REFERENCE__")]
 		public event global::Windows.Foundation.TypedEventHandler<global::Windows.UI.Core.CoreWindow, global::Windows.UI.Core.PointerEventArgs> PointerReleased
 		{
@@ -366,7 +366,7 @@ public string GetCurrentKeyEventDeviceId()
 			}
 		}
 #endif
-#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || false || __NETSTD_REFERENCE__ || false
+#if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || false || false || __NETSTD_REFERENCE__ || false
 		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__NETSTD_REFERENCE__")]
 		public event global::Windows.Foundation.TypedEventHandler<global::Windows.UI.Core.CoreWindow, global::Windows.UI.Core.PointerEventArgs> PointerWheelChanged
 		{
diff --git a/src/Uno.UWP/UI/Core/CoreWindow.wasm.cs b/src/Uno.UWP/UI/Core/CoreWindow.wasm.cs
deleted file mode 100644
index 93a0d97f3457..000000000000
--- a/src/Uno.UWP/UI/Core/CoreWindow.wasm.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Uno.Foundation;
-
-using NativeMethods = __Windows.UI.Core.CoreWindow.NativeMethods;
-
-namespace Windows.UI.Core;
-
-public partial class CoreWindow
-{
-	private CoreCursor _pointerCursor = new CoreCursor(CoreCursorType.Arrow, 0);
-
-	public global::Windows.UI.Core.CoreCursor PointerCursor
-	{
-		get => _pointerCursor;
-		set
-		{
-			_pointerCursor = value;
-			Internal_SetPointerCursor();
-		}
-
-	}
-
-	private void Internal_SetPointerCursor()
-	{
-		NativeMethods.SetCursor(_pointerCursor.Type.ToCssCursor());
-	}
-}
diff --git a/src/Uno.UWP/UI/Input/Preview.Injection/InjectedInputState.cs b/src/Uno.UWP/UI/Input/Preview.Injection/InjectedInputState.cs
index d4263da45344..c66f41dee36b 100644
--- a/src/Uno.UWP/UI/Input/Preview.Injection/InjectedInputState.cs
+++ b/src/Uno.UWP/UI/Input/Preview.Injection/InjectedInputState.cs
@@ -13,8 +13,7 @@ internal class InjectedInputState
 	public InjectedInputState(PointerDeviceType type)
 	{
 		Type = type;
-		Timestamp = (ulong)DateTime.Now.Ticks;
-		FrameId = (uint)(Timestamp / TimeSpan.TicksPerMillisecond);
+		StartNewSequence();
 	}
 
 	public PointerDeviceType Type { get; }
@@ -29,6 +28,12 @@ public InjectedInputState(PointerDeviceType type)
 
 	public PointerPointProperties Properties { get; set; } = new();
 
+	public void StartNewSequence()
+	{
+		Timestamp = (ulong)DateTime.Now.Ticks;
+		FrameId = (uint)(Timestamp / TimeSpan.TicksPerMillisecond);
+	}
+
 	public void Update(PointerEventArgs args)
 	{
 		PointerId = args.CurrentPoint.PointerId;
diff --git a/src/Uno.UWP/UI/Input/Preview.Injection/InputInjector.cs b/src/Uno.UWP/UI/Input/Preview.Injection/InputInjector.cs
index a6d4be333c7e..e302677ed3c2 100644
--- a/src/Uno.UWP/UI/Input/Preview.Injection/InputInjector.cs
+++ b/src/Uno.UWP/UI/Input/Preview.Injection/InputInjector.cs
@@ -2,6 +2,8 @@
 
 using System;
 using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
 using Uno.Foundation.Logging;
 using Windows.Devices.Input;
 using Windows.System;
@@ -24,7 +26,7 @@ internal static void SetTargetForCurrentThread(IInputInjectorTarget manager)
 		_inputManager ??= manager; // Set only once per thread.
 	}
 
-	[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__NETSTD_REFERENCE__", "__MACOS__")]
+	[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__NETSTD_REFERENCE__", "__MACOS__")]
 	public static InputInjector? TryCreate()
 		=> _inputManager is not null ? new InputInjector(_inputManager) : null;
 
@@ -95,18 +97,78 @@ public void InjectTouchInput(IEnumerable<InjectedInputTouchInfo> input)
 		}
 	}
 
+	// TODO: Move as extension method
+	internal async ValueTask InjectTouchInputAsync(IEnumerable<InjectedInputTouchInfo> input, CancellationToken ct)
+	{
+		if (_touch is null)
+		{
+			InitializeTouchInjection(InjectedInputVisualizationMode.Default);
+		}
+
+		var touch = _touch!.Value.state;
+		foreach (var info in input)
+		{
+			var args = info.ToEventArgs(touch);
+
+			if (_touch is { isAdded: false })
+			{
+				_target.InjectPointerAdded(args);
+				_touch = (touch, isAdded: true);
+				await WaitForIdle(ct);
+			}
+
+			touch.Update(args);
+
+			_target.InjectPointerUpdated(args);
+			await WaitForIdle(ct);
+
+			if (info.PointerInfo.PointerOptions.HasFlag(InjectedInputPointerOptions.PointerUp))
+			{
+				_target.InjectPointerRemoved(args);
+				_touch = (touch, isAdded: false);
+				await WaitForIdle(ct);
+			}
+		}
+	}
+
+	private const InjectedInputMouseOptions _mouseButtonDown = InjectedInputMouseOptions.LeftDown | InjectedInputMouseOptions.MiddleDown | InjectedInputMouseOptions.RightDown | InjectedInputMouseOptions.XDown;
+
 	[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__NETSTD_REFERENCE__", "__MACOS__")]
 	public void InjectMouseInput(IEnumerable<InjectedInputMouseInfo> input)
 	{
 		foreach (var info in input)
 		{
+			if ((info.MouseOptions & _mouseButtonDown) != 0 && !_mouse.Properties.HasPressedButton)
+			{
+				_mouse.StartNewSequence();
+			}
+
+			var args = info.ToEventArgs(_mouse!, VirtualKeyModifiers.None);
+			_mouse!.Update(args);
+
+			_target.InjectPointerUpdated(args);
+		}
+	}
+
+	// TODO: Move as extension method
+	internal async ValueTask InjectMouseInputAsync(IEnumerable<InjectedInputMouseInfo> input, CancellationToken ct)
+	{
+		foreach (var info in input)
+		{
+			if ((info.MouseOptions & _mouseButtonDown) != 0 && !_mouse.Properties.HasPressedButton)
+			{
+				_mouse.StartNewSequence();
+			}
+
 			var args = info.ToEventArgs(_mouse!, VirtualKeyModifiers.None);
 			_mouse!.Update(args);
 
 			_target.InjectPointerUpdated(args);
+			await WaitForIdle(ct);
 		}
 	}
 
+	// TODO: Move as extension method
 	internal void InjectMouseInput(IEnumerable<(InjectedInputMouseInfo, VirtualKeyModifiers)> input)
 	{
 		foreach (var (info, modifiers) in input)
@@ -117,4 +179,41 @@ internal void InjectMouseInput(IEnumerable<(InjectedInputMouseInfo, VirtualKeyMo
 			_target.InjectPointerUpdated(args);
 		}
 	}
+
+	// TODO: Move as extension method
+	internal async ValueTask InjectMouseInputAsync(IEnumerable<(InjectedInputMouseInfo, VirtualKeyModifiers)> input, CancellationToken ct)
+	{
+		foreach (var (info, modifiers) in input)
+		{
+			if ((info.MouseOptions & _mouseButtonDown) != 0 && !_mouse.Properties.HasPressedButton)
+			{
+				_mouse.StartNewSequence();
+			}
+
+			var args = info.ToEventArgs(_mouse!, modifiers);
+			_mouse!.Update(args);
+
+			_target.InjectPointerUpdated(args);
+			await WaitForIdle(ct);
+		}
+	}
+
+	private async ValueTask WaitForIdle(CancellationToken ct)
+	{
+		var dispatcher = DispatcherQueue.GetForCurrentThread() ?? throw new InvalidOperationException();
+		var tcs = new TaskCompletionSource();
+		await using var _ = ct.Register(() => tcs.TrySetCanceled());
+
+		Enqueue(() => Enqueue(() => tcs.TrySetResult()));
+
+		await tcs.Task;
+
+		void Enqueue(DispatcherQueueHandler action)
+		{
+			if (!dispatcher.TryEnqueue(DispatcherQueuePriority.Low, action))
+			{
+				tcs.TrySetException(new Exception("Cannot enqueue work item on dispatcher"));
+			}
+		}
+	}
 }