swcs/QuestPDF
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Text element improvement: null string behaves like an empty text, not throws an exception

Browse Source
This commit is contained in:
Marcin Ziąbek
2021-11-03 21:21:23 +01:00
parent d260fa7587
commit 22cdad69b7
1 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
QuestPDF/Fluent/TextExtensions.cs
+29 -12
View File
@@ -50,8 +50,11 @@ namespace QuestPDF.Fluent
TextBlocks.Last().Children.Add(item);
}
public void Span(string text, TextStyle? style = null)
public void Span(string? text, TextStyle? style = null)
{
if (IsNullOrEmpty(text))
return;
style ??= TextStyle.Default;
var items = text
@@ -76,16 +79,12 @@ namespace QuestPDF.Fluent
.ForEach(TextBlocks.Add);
}
public void Line(string text, TextStyle? style = null)
public void Line(string? text, TextStyle? style = null)
{
text ??= string.Empty;
Span(text + Environment.NewLine, style);
}
public void Line(string text)
{
Span(text + Environment.NewLine);
}
public void EmptyLine()
{
Span(Environment.NewLine);
@@ -93,6 +92,9 @@ namespace QuestPDF.Fluent
private void PageNumber(string slotName, TextStyle? style = null)
{
if (IsNullOrEmpty(slotName))
throw new ArgumentException(nameof(slotName));
style ??= TextStyle.Default;
AddItemToLastTextBlock(new TextBlockPageNumber()
@@ -114,11 +116,20 @@ namespace QuestPDF.Fluent
public void PageNumberOfLocation(string locationName, TextStyle? style = null)
{
if (IsNullOrEmpty(locationName))
throw new ArgumentException(nameof(locationName));
PageNumber(locationName, style);
}
public void InternalLocation(string text, string locationName, TextStyle? style = null)
public void InternalLocation(string? text, string locationName, TextStyle? style = null)
{
if (IsNullOrEmpty(text))
return;
if (IsNullOrEmpty(locationName))
throw new ArgumentException(nameof(locationName));
style ??= TextStyle.Default;
AddItemToLastTextBlock(new TextBlockInternalLink
@@ -129,8 +140,14 @@ namespace QuestPDF.Fluent
});
}
public void ExternalLocation(string text, string url, TextStyle? style = null)
public void ExternalLocation(string? text, string url, TextStyle? style = null)
{
if (IsNullOrEmpty(text))
return;
if (IsNullOrEmpty(url))
throw new ArgumentException(nameof(url));
style ??= TextStyle.Default;
AddItemToLastTextBlock(new TextBlockExternalLink
@@ -183,9 +200,9 @@ namespace QuestPDF.Fluent
descriptor.Compose(element);
}
public static void Text(this IContainer element, object text, TextStyle? style = null)
public static void Text(this IContainer element, object? text, TextStyle? style = null)
{
element.Text(x => x.Span(text.ToString(), style));
element.Text(x => x.Span(text?.ToString(), style));
}
}
}