Don’t call NSAttributedString with HTML from a background thread

dotnet · Dec 10, 2024 · b515625 · b515625
1 parent 94f6c92
commit b515625
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/Controls/src/Core/Label/Label.iOS.cs b/src/Controls/src/Core/Label/Label.iOS.cs
@@ -38,13 +38,6 @@ public static void MapMaxLines(ILabelHandler handler, Label label)
 
 		static void MapFormatting(ILabelHandler handler, Label label)
 		{
-			// we need to re-apply color and font for HTML labels
-			if (!label.HasFormattedTextSpans && label.TextType == TextType.Html)
-			{
-				handler.UpdateValue(nameof(ILabel.TextColor));
-				handler.UpdateValue(nameof(ILabel.Font));
-			}
-
 			if (!IsPlainText(label))
 				return;
 

diff --git a/src/Core/src/Platform/iOS/LabelExtensions.cs b/src/Core/src/Platform/iOS/LabelExtensions.cs
@@ -88,9 +88,16 @@ internal static void UpdateTextHtml(this UILabel platformLabel, ILabel label)
 			};
 
 			NSError nsError = new();
-#pragma warning disable CS8601
-			platformLabel.AttributedText = new NSAttributedString(text, attr, ref nsError);
-#pragma warning restore CS8601
+			CoreFoundation.DispatchQueue.MainQueue.DispatchAsync(() =>
+			{
+				platformLabel.AttributedText = new NSAttributedString(text, attr, ref nsError);
+				if (label.Handler is ILabelHandler labelHandler)
+				{
+					labelHandler.UpdateValue(nameof(ILabel.TextColor));
+					labelHandler.UpdateValue(nameof(ILabel.Font));
+				}
+				label.InvalidateMeasure();
+			});
 		}
 
 		internal static void UpdateTextPlainText(this UILabel platformLabel, IText label)