Unicode text

src/Directory.Build.targets

@@ -65,6 +65,7 @@
 		<MicrosoftTestingPlatformVersion>1.9.0</MicrosoftTestingPlatformVersion>
 		<SkiaSharpVersion>3.119.0</SkiaSharpVersion>
 		<HarfbuzzSharpVersion>8.3.1.1</HarfbuzzSharpVersion>
+		<UnoICUVersion>77.1.0-dev.44</UnoICUVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -161,6 +162,12 @@
 		<PackageReference Update="Xamarin.AndroidX.SwipeRefreshLayout" Version="1.1.0.28" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Update="Uno.icu-macos" Version="$(UnoICUVersion)" />
+		<PackageReference Update="Uno.icu-wasm" Version="$(UnoICUVersion)" />
+		<PackageReference Update="Uno.icu-ios" Version="$(UnoICUVersion)" />
+	</ItemGroup>
+
 	<Target Name="ValidateSolutionPath" BeforeTargets="Build">
 		<Error Condition="$(MSBuildThisFileDirectory.Contains(' '))"
 			 Text="The Uno.UI Solution cannot build with a space in the path. Consider changing to a path without spaces."/>

src/Uno.UI.Runtime.Skia.AppleUIKit/Uno.UI.Runtime.Skia.AppleUIKit.csproj

@@ -47,6 +47,7 @@
 		<PackageReference Include="SkiaSharp" />
 		<PackageReference Include="HarfBuzzSharp" />
 		<PackageReference Include="SkiaSharp.Views" />
+		<PackageReference Include="Uno.icu-ios" />
 	</ItemGroup>
 
 	<ItemGroup>

src/Uno.UI.Runtime.Skia.MacOS/Uno.UI.Runtime.Skia.MacOS.csproj

@@ -29,6 +29,7 @@
 		<PackageReference Include="HarfBuzzSharp.NativeAssets.macOS" />
 		<PackageReference Include="HarfBuzzSharp" />
 		<PackageReference Include="SkiaSharp" />
+		<PackageReference Include="Uno.icu-macos" />
 	</ItemGroup>
 
 	<PropertyGroup>

src/Uno.UI.Runtime.Skia.WebAssembly.Browser/Uno.UI.Runtime.Skia.WebAssembly.Browser.csproj

@@ -37,6 +37,7 @@
 		<PackageReference Include="SkiaSharp" />
 		<PackageReference Include="HarfBuzzSharp" />
 		<PackageReference Include="Microsoft.TypeScript.MSBuild" PrivateAssets="all" />
+		<PackageReference Include="Uno.icu-wasm" />
 	</ItemGroup>
 
 	<ItemGroup>

src/Uno.UI.Runtime.Skia.Win32/Uno.UI.Runtime.Skia.Win32.csproj

@@ -29,6 +29,7 @@
 
 		<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106" />
 		<PackageReference Include="HarfBuzzSharp" />
+		<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3" />
 	</ItemGroup>
 
 	<ItemGroup>

src/Uno.UI.Runtime.Skia.Wpf/Uno.UI.Runtime.Skia.Wpf.csproj

@@ -29,6 +29,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Web.WebView2" Aliases="WpfWebView" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3" />
 
 		<!-- 
 			Required to ensure that this reference is latest and not

src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_TextBox.skia.cs

@@ -20,6 +20,7 @@
 using Windows.System;
 using Windows.UI;
 using Windows.UI.Input.Preview.Injection;
+using Uno.UI.Xaml.Media;
 using static Private.Infrastructure.TestServices;
 using Color = Windows.UI.Color;
 using Point = Windows.Foundation.Point;
@@ -2057,6 +2058,7 @@ public async Task When_Paste_History_Remains_Intact()
 			var text = "copied content";
 			dp.SetText(text);
 			Clipboard.SetContent(dp);
+			await Task.Delay(500);
 
 			// This actually matches WinUI. text comes before "initial" and text2 comes after text
 
@@ -2068,6 +2070,7 @@ public async Task When_Paste_History_Remains_Intact()
 			var text2 = "copied content 2";
 			dp2.SetText(text2);
 			Clipboard.SetContent(dp2);
+			await Task.Delay(500);
 
 			SUT.PasteFromClipboard();
 			await WindowHelper.WaitForIdle();
@@ -2737,7 +2740,7 @@ public async Task When_Multiline_Pointer_Tap()
 			using var mouse = injector.GetMouse();
 
 			var bounds = SUT.GetAbsoluteBounds();
-			mouse.MoveTo(bounds.GetCenter());
+			mouse.MoveTo(bounds.Location.Offset(145, 55));
 			await WindowHelper.WaitForIdle();
 
 			mouse.Press();
@@ -2955,8 +2958,8 @@ public async Task When_Multiline_Pointer_TripleTap()
 			mouse.Release();
 			await WindowHelper.WaitForIdle();
 
-			Assert.AreEqual(13, SUT.SelectionStart);
-			Assert.AreEqual(26, SUT.SelectionLength);
+			Assert.AreEqual(25, SUT.SelectionStart);
+			Assert.AreEqual(14, SUT.SelectionLength);
 		}
 
 		[TestMethod]
@@ -4213,10 +4216,10 @@ public async Task When_Caret_Color_DarkMode()
 			{
 				await Task.Delay(random.Next(75, 126));
 				var screenshot = await UITestHelper.ScreenShot(SUT);
-				// For some reason, the caret sometimes appears black, and sometimes as very dark grey (#FF030303), so we check for both
-				Color[] blacks = [Colors.Black, Colors.FromARGB(0xFF, 0x03, 0x03, 0x03)];
-				if (blacks.Any(b => HasColorInRectangle(screenshot, new Rectangle(0, 0, screenshot.Width / 2, screenshot.Height), b)) &&
-					blacks.All(b => !HasColorInRectangle(screenshot, new Rectangle(screenshot.Width / 2, 0, screenshot.Width / 2, screenshot.Height), Colors.Black)))
+				// this color is the result of alpha blending 0xE4000000 (the default caret color) on top of 0xFFFFFFFF
+				var black = Colors.White.AlphaBlend(((SolidColorBrush)DefaultBrushes.TextForegroundBrush).Color);
+				if (HasColorInRectangle(screenshot, new Rectangle(0, 0, screenshot.Width / 2, screenshot.Height), black) &&
+					!HasColorInRectangle(screenshot, new Rectangle(screenshot.Width / 2, 0, screenshot.Width / 2, screenshot.Height), black))
 				{
 					break;
 				}

src/Uno.UI/Generated/3.0.0.0/Microsoft.UI.Xaml.Documents/Run.cs

@@ -9,8 +9,8 @@ namespace Microsoft.UI.Xaml.Documents
 	public partial class Run : global::Microsoft.UI.Xaml.Documents.Inline
 	{
 		// Skipping already declared property Text
-#if __ANDROID__ || __IOS__ || __TVOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__
-		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "__TVOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__")]
+#if __ANDROID__ || __IOS__ || __TVOS__ || IS_UNIT_TESTS || __WASM__ || __NETSTD_REFERENCE__
+		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "__TVOS__", "IS_UNIT_TESTS", "__WASM__", "__NETSTD_REFERENCE__")]
 		public global::Microsoft.UI.Xaml.FlowDirection FlowDirection
 		{
 			get
@@ -23,8 +23,8 @@ public partial class Run : global::Microsoft.UI.Xaml.Documents.Inline
 			}
 		}
 #endif
-#if __ANDROID__ || __IOS__ || __TVOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__
-		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "__TVOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__")]
+#if __ANDROID__ || __IOS__ || __TVOS__ || IS_UNIT_TESTS || __WASM__ || __NETSTD_REFERENCE__
+		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "__TVOS__", "IS_UNIT_TESTS", "__WASM__", "__NETSTD_REFERENCE__")]
 		public static global::Microsoft.UI.Xaml.DependencyProperty FlowDirectionProperty { get; } =
 		Microsoft.UI.Xaml.DependencyProperty.Register(
 			nameof(FlowDirection), typeof(global::Microsoft.UI.Xaml.FlowDirection),

src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.cs

@@ -60,7 +60,7 @@ public partial class TextBlock : DependencyObject, IThemeChangeAware
 
 		// end can be less than or equal to start when the selection starts ahead and then goes back
 		// see the selection in TextBox.skia.cs for more info
-		private Range Selection
+		internal Range Selection
 		{
 			get => _selection;
 			set
@@ -153,7 +153,7 @@ internal void InvalidateInlines(bool updateText)
 				}
 
 				UpdateHyperlinks();
-				Inlines.InvalidatePreorderTree();
+				Inlines.InvalidateTraversedTree();
 			}
 
 			OnInlinesChangedPartial();
@@ -1095,8 +1095,8 @@ private bool AbortHyperlinkCaptures(Pointer pointer)
 			var aborted = false;
 			foreach (var hyperlink in _hyperlinks.ToList()) // .ToList() : for a strange reason on WASM the collection gets modified
 			{
-				aborted |= hyperlink.hyperlink.AbortPointerPressed(pointer);
-				aborted |= hyperlink.hyperlink.ReleasePointerOver(pointer);
+				aborted |= hyperlink.AbortPointerPressed(pointer);
+				aborted |= hyperlink.ReleasePointerOver(pointer);
 			}
 
 			aborted |= _hyperlinkOver?.ReleasePointerOver(pointer) ?? false;
@@ -1105,7 +1105,7 @@ private bool AbortHyperlinkCaptures(Pointer pointer)
 			return aborted;
 		}
 
-		private readonly ObservableCollection<(int start, int end, Hyperlink hyperlink)> _hyperlinks = new();
+		private readonly ObservableCollection<Hyperlink> _hyperlinks = new();
 
 		private void HyperlinksOnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e) => RecalculateSubscribeToPointerEvents();
 
@@ -1120,7 +1120,7 @@ private void RecalculateSubscribeToPointerEvents()
 
 		private void UpdateHyperlinks()
 		{
-			global::System.Diagnostics.Debug.Assert(_hyperlinkOver is null || _hyperlinks.Where(h => h.hyperlink == _hyperlinkOver).Count() == 1);
+			global::System.Diagnostics.Debug.Assert(_hyperlinkOver is null || _hyperlinks.Count(h => h == _hyperlinkOver) == 1);
 
 			if (UseInlinesFastPath) // i.e. no Inlines
 			{
@@ -1129,7 +1129,7 @@ private void UpdateHyperlinks()
 					// Make sure to clear the pressed state of removed hyperlinks
 					foreach (var hyperlink in _hyperlinks)
 					{
-						hyperlink.hyperlink.AbortAllPointerState();
+						hyperlink.AbortAllPointerState();
 					}
 
 					_hyperlinkOver = null;
@@ -1139,26 +1139,13 @@ private void UpdateHyperlinks()
 				return;
 			}
 
-			var previousHyperLinks = _hyperlinks.SelectToList(hyperlink => hyperlink.hyperlink);
-
 			_hyperlinkOver = null;
+			var previousHyperLinks = _hyperlinks.ToHashSet();
 			_hyperlinks.Clear();
-
-			var start = 0;
-			foreach (var inline in Inlines.PreorderTree)
+			foreach (var hyperlink in Inlines.TraversedTree.preorderTree.OfType<Hyperlink>())
 			{
-				switch (inline)
-				{
-					case Hyperlink hyperlink:
-						previousHyperLinks.Remove(hyperlink);
-						_hyperlinks.Add((start, start + hyperlink.GetText().Length, hyperlink));
-						break;
-					case Span span:
-						break;
-					default: // Leaf node
-						start += inline.GetText().Length;
-						break;
-				}
+				_hyperlinks.Add(hyperlink);
+				previousHyperLinks.Remove(hyperlink);
 			}
 
 			// Make sure to clear the pressed state of removed hyperlinks
@@ -1242,14 +1229,10 @@ private Hyperlink FindHyperlinkAt(PointerRoutedEventArgs e)
 			}
 
 			return null;
+#elif __SKIA__
+			return ParsedText.GetHyperlinkAt(e.GetCurrentPoint(this).Position);
 #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;
+			return null;
 #endif
 		}
 		#endregion
@@ -1298,13 +1281,6 @@ internal override void UpdateThemeBindings(Data.ResourceUpdateReason updateReaso
 			/*IsEnabled() &&*/ (IsTextSelectionEnabled || IsTabStop || FocusProperties.GetCaretBrowsingModeEnable()) &&
 			AreAllAncestorsVisible();
 
-		private record struct Range(int start, int end)
-		{
-			public Range((int start, int end) tuple) : this(tuple.start, tuple.end)
-			{
-			}
-		}
-
 		[SuppressMessage("CodeQuality", "IDE0051:Remove unused private members", Justification = "Used only by some platforms")]
 		private bool IsTextTrimmable =>
 			TextTrimming != TextTrimming.None ||
@@ -1316,5 +1292,7 @@ public Range((int start, int end) tuple) : this(tuple.start, tuple.end)
 		// The way this works in WinUI is by the MarkInheritedPropertyDirty call in CFrameworkElement::NotifyThemeChangedForInheritedProperties
 		// There is a special handling for Foreground specifically there.
 		void IThemeChangeAware.OnThemeChanged() => OnForegroundChanged();
+
+		internal record struct Range(int start, int end);
 	}
 }