Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Child Span font attributes inheritance #26197

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Child Span font attributes inheritance #26197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions src/Controls/src/Core/Platform/Android/Extensions/FormattedStringExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ public static SpannableString ToSpannableString(this Label label)
label.ToFont(),
label.TextColor,
label.TextTransform,
label.TextDecorations);
label.TextDecorations,
label.FontAttributes);

// TODO: NET8 this overload must be removed in net8.0 and replaced with the one below
public static SpannableString ToSpannableString(
Expand All @@ -44,7 +45,8 @@ public static SpannableString ToSpannableString(
defaultFont,
defaultColor,
defaultTextTransform,
TextDecorations.None);
TextDecorations.None,
FontAttributes.None);

internal static SpannableString ToSpannableStringNewWay(
this FormattedString formattedString,
Expand All @@ -55,7 +57,8 @@ internal static SpannableString ToSpannableStringNewWay(
Font? defaultFont = null,
Graphics.Color? defaultColor = null,
TextTransform defaultTextTransform = TextTransform.Default,
TextDecorations defaultTextDecorations = TextDecorations.None)
TextDecorations defaultTextDecorations = TextDecorations.None,
FontAttributes defaultFontAttributes = FontAttributes.None)
{
if (formattedString == null)
return new SpannableString(string.Empty);
Expand Down Expand Up @@ -126,6 +129,15 @@ internal static SpannableString ToSpannableStringNewWay(
spannable.SetSpan(new StrikethroughSpan(), start, end, SpanTypes.InclusiveInclusive);
if (textDecorations.HasFlag(TextDecorations.Underline))
spannable.SetSpan(new UnderlineSpan(), start, end, SpanTypes.InclusiveInclusive);

// FontAttributes
var fontAttributes = span.IsSet(Span.FontAttributesProperty)
? span.FontAttributes
: defaultFontAttributes;
if (fontAttributes.HasFlag(FontAttributes.Bold))
spannable.SetSpan(new StyleSpan(TypefaceStyle.Bold), start, end, SpanTypes.InclusiveInclusive);
if (fontAttributes.HasFlag(FontAttributes.Italic))
spannable.SetSpan(new StyleSpan(TypefaceStyle.Italic), start, end, SpanTypes.InclusiveInclusive);
}

return spannable;
Expand Down
56 changes: 52 additions & 4 deletions src/Controls/src/Core/Platform/iOS/Extensions/FormattedStringExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,16 @@ namespace Microsoft.Maui.Controls.Platform
public static class FormattedStringExtensions
{
public static NSAttributedString? ToNSAttributedString(this Label label)
=> ToNSAttributedString(
=> ToNSAttributedStringExtended(
label.FormattedText,
label.RequireFontManager(),
label.LineHeight,
label.HorizontalTextAlignment,
label.ToFont(),
label.TextColor,
label.TextTransform);
label.TextTransform,
label.TextDecorations,
label.FontAttributes);

public static NSAttributedString ToNSAttributedString(
this FormattedString formattedString,
Expand All @@ -38,6 +40,18 @@ public static NSAttributedString ToNSAttributedString(
Font? defaultFont = null,
Color? defaultColor = null,
TextTransform defaultTextTransform = TextTransform.Default)
=> formattedString.ToNSAttributedStringExtended(fontManager, defaultLineHeight, defaultHorizontalAlignment, defaultFont, defaultColor, defaultTextTransform);

internal static NSAttributedString ToNSAttributedStringExtended(
this FormattedString formattedString,
IFontManager fontManager,
double defaultLineHeight = 0d,
TextAlignment defaultHorizontalAlignment = TextAlignment.Start,
Font? defaultFont = null,
Color? defaultColor = null,
TextTransform defaultTextTransform = TextTransform.Default,
TextDecorations defaultTextDecorations = TextDecorations.None,
FontAttributes defaultFontAttributes = FontAttributes.None)
{
if (formattedString == null)
return new NSAttributedString(string.Empty);
Expand All @@ -49,8 +63,8 @@ public static NSAttributedString ToNSAttributedString(
if (span.Text == null)
continue;

attributed.Append(span.ToNSAttributedString(fontManager, defaultLineHeight, defaultHorizontalAlignment,
defaultFont, defaultColor, defaultTextTransform));
attributed.Append(span.ToNSAttributedStringExtended(fontManager, defaultLineHeight, defaultHorizontalAlignment,
defaultFont, defaultColor, defaultTextTransform, defaultTextDecorations, defaultFontAttributes));
}

return attributed;
Expand All @@ -64,6 +78,19 @@ public static NSAttributedString ToNSAttributedString(
Font? defaultFont = null,
Color? defaultColor = null,
TextTransform defaultTextTransform = TextTransform.Default)
=> span.ToNSAttributedStringExtended(fontManager, defaultLineHeight, defaultHorizontalAlignment, defaultFont, defaultColor, defaultTextTransform);


internal static NSAttributedString ToNSAttributedStringExtended(
this Span span,
IFontManager fontManager,
double defaultLineHeight = 0d, // TODO: NET8 should be -1, but too late to change for NET8
TextAlignment defaultHorizontalAlignment = TextAlignment.Start,
Font? defaultFont = null,
Color? defaultColor = null,
TextTransform defaultTextTransform = TextTransform.Default,
TextDecorations defaultTextDecorations = TextDecorations.None,
FontAttributes defaultFontAttributes = FontAttributes.None)
{
var defaultFontSize = defaultFont?.Size ?? fontManager.DefaultFontSize;

Expand Down Expand Up @@ -103,6 +130,27 @@ public static NSAttributedString ToNSAttributedString(
hasUnderline = (textDecorations & TextDecorations.Underline) != 0;
hasStrikethrough = (textDecorations & TextDecorations.Strikethrough) != 0;
}
else if (defaultTextDecorations != TextDecorations.None)
{
hasUnderline = (defaultTextDecorations & TextDecorations.Underline) != 0;
hasStrikethrough = (defaultTextDecorations & TextDecorations.Strikethrough) != 0;
}

if (span.IsSet(Span.FontAttributesProperty))
{
var fontAttributes = span.FontAttributes;
if (fontAttributes.HasFlag(FontAttributes.Bold))
font = font.WithWeight(FontWeight.Bold);
if (fontAttributes.HasFlag(FontAttributes.Italic))
font = font.WithSlant(FontSlant.Italic);
}
else if(defaultFontAttributes != FontAttributes.None)
{
if (defaultFontAttributes.HasFlag(FontAttributes.Bold))
font = font.WithWeight(FontWeight.Bold);
if (defaultFontAttributes.HasFlag(FontAttributes.Italic))
font = font.WithSlant(FontSlant.Italic);
}

var platformFont = font.IsDefault ? null : font.ToUIFont(fontManager);

Expand Down
Binary file added ...TestCases.Android.Tests/snapshots/android/SpanShouldInheritLabelsProperties.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions src/Controls/tests/TestCases.HostApp/Issues/Issue21034.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<ContentPage
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Maui.Controls.Sample.Issues.Issue21034">
<Label TextColor="Blue"
AutomationId="Label"
Margin="30"
VerticalOptions="Center"
TextDecorations="Underline"
FontAttributes="Bold">
<Label.FormattedText>
<FormattedString>
<Span Text="Bold, underlined, blue"/>
<Span Text=" "
TextDecorations="None"/>
<Span Text="Green, italic"
TextColor="Green"
TextDecorations="None"
FontAttributes="Italic"/>
<Span Text=" "
TextDecorations="None"/>
<Span FontAttributes="Bold"
TextColor="Red"
TextDecorations="Strikethrough"
Text="Red, bold, strikethrough"/>
<Span Text=" "
TextDecorations="None"/>
<Span TextColor="Black"
FontFamily="FA"
Text="&#xf133;"/>
</FormattedString>
</Label.FormattedText>
</Label>
</ContentPage>
12 changes: 12 additions & 0 deletions src/Controls/tests/TestCases.HostApp/Issues/Issue21034.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
namespace Maui.Controls.Sample.Issues
{

[Issue(IssueTracker.Github, 21034, "Child Span does not inherit TextColor or FontAttributes from parent Label", PlatformAffected.Android | PlatformAffected.iOS)]
public partial class Issue21034 : ContentPage
{
public Issue21034()
{
InitializeComponent();
}
}
}
23 changes: 23 additions & 0 deletions src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21034.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
using NUnit.Framework;
using UITest.Appium;
using UITest.Core;

namespace Microsoft.Maui.TestCases.Tests.Issues
{
public class Issue21034 : _IssuesUITest
{
public Issue21034(TestDevice device) : base(device)
{
}

public override string Issue => "Child Span does not inherit TextColor or FontAttributes from parent Label";

[Test]
[Category(UITestCategories.Label)]
public void SpanShouldInheritLabelsProperties()
{
App.WaitForElement("Label");
VerifyScreenshot();
}
}
}
Binary file added ...s/TestCases.WinUI.Tests/snapshots/windows/SpanShouldInheritLabelsProperties.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...s/tests/TestCases.iOS.Tests/snapshots/ios/SpanShouldInheritLabelsProperties.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading