Moved MapHtmlText to controls

Author: kubaflo

src/Controls/src/Core/Label/Label.Mapper.cs

@@ -41,6 +41,10 @@ public partial class Label
 			LabelHandler.Mapper.ModifyMapping<Label, ILabelHandler>(nameof(LineHeight), MapLineHeight);
 #endif
 
+#if IOS
+			LabelHandler.Mapper.AppendToMapping<Label, ILabelHandler>(nameof(ILabel.Font), MapHtmlText);
+#endif
+
 			// platform-specifics
 #if WINDOWS
 			LabelHandler.Mapper.ReplaceMapping<Label, ILabelHandler>(PlatformConfiguration.WindowsSpecific.InputView.DetectReadingOrderFromContentProperty.PropertyName, MapDetectReadingOrderFromContent);

src/Controls/src/Core/Label/Label.iOS.cs

@@ -26,6 +26,14 @@ public static void MapText(ILabelHandler handler, Label label)
 			MapFormatting(handler, label);
 		}
 
+		internal static void MapHtmlText(ILabelHandler handler, Label label)
+		{
+			if (handler.PlatformView?.AttributedText != null)
+			{
+				handler.PlatformView?.UpdateTextHtml(label);
+			}
+		}
+
 		public static void MapLineBreakMode(ILabelHandler handler, Label label)
 		{
 			handler.PlatformView?.UpdateLineBreakMode(label);

src/Core/src/Handlers/Label/LabelHandler.iOS.cs

@@ -63,9 +63,6 @@ public static void MapFont(ILabelHandler handler, ILabel label)
 			var fontManager = handler.GetRequiredService<IFontManager>();
 
 			handler.PlatformView?.UpdateFont(label, fontManager);
-
-			if (handler.PlatformView?.AttributedText != null)
-				handler.PlatformView?.UpdateTextHtml(label);
 		}
 
 		public static void MapLineHeight(ILabelHandler handler, ILabel label)

src/Core/src/Platform/iOS/LabelExtensions.cs

@@ -105,6 +105,12 @@ internal static void UpdateTextHtml(this UILabel platformLabel, ILabel label)
 					{
 						attributedString.AddAttribute(UIStringAttributeKey.Font, uiFontAttribute, range);
 					}
+
+					if(label?.TextColor != null)
+					{
+						var color = label.TextColor.ToPlatform();
+						attributedString.AddAttribute(UIStringAttributeKey.ForegroundColor, color, range);
+					}
 				});
 
 			platformLabel.AttributedText = attributedString;