From 465c9898d71866d5957a17755352f112da36327b Mon Sep 17 00:00:00 2001
From: Oleksandr Liakhevych <liakh.oleksandr32@gmail.com>
Date: Sat, 11 Jun 2022 18:40:39 +0300
Subject: [PATCH] Allow text content for Label

---
 .../Views/Controls/Labels.razor               | 32 +++++++++++++++++++
 .../ControlGallery/Views/PlaygroundList.razor |  1 +
 .../TextSpanContainer.cs                      |  4 +--
 .../Elements/Handlers/LabelHandler.cs         | 21 +++++++++++-
 4 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 samples/ControlGallery/Views/Controls/Labels.razor

diff --git a/samples/ControlGallery/Views/Controls/Labels.razor b/samples/ControlGallery/Views/Controls/Labels.razor
new file mode 100644
index 00000000..2253bf57
--- /dev/null
+++ b/samples/ControlGallery/Views/Controls/Labels.razor
@@ -0,0 +1,32 @@
+@page "/controls/labels"
+
+<ContentPage>
+    <ScrollView>
+        <VerticalStackLayout Padding="10" Spacing="20">
+
+            <Label Text="Static label with Text property" />
+
+            <Label>Static label with child content</Label>
+
+            <Label Text=@($"Dynamic - {RandomText} - label with Text property") />
+
+            <Label>Dynamic - @RandomText - label with child content</Label>
+
+            <Label>
+                <Span Text="Label with spans " />
+                <Span TextColor="Colors.Red">with color, </Span>
+                <Span TextDecorations="TextDecorations.Strikethrough" Text="text decorations" />
+                <Span FontAttributes="FontAttributes.Bold" Text=" and font attributes." />
+            </Label>
+
+            <Label Text="Label with bigger font size" FontSize="24" />
+
+        </VerticalStackLayout>
+    </ScrollView>
+</ContentPage>
+
+@code {
+    Random _random = new();
+
+    string RandomText => _random.Next().ToString();
+}
diff --git a/samples/ControlGallery/Views/PlaygroundList.razor b/samples/ControlGallery/Views/PlaygroundList.razor
index 144ebc12..3f568d1b 100644
--- a/samples/ControlGallery/Views/PlaygroundList.razor
+++ b/samples/ControlGallery/Views/PlaygroundList.razor
@@ -6,6 +6,7 @@
             <Label Text="Select a playground..." FontSize="30" FontAttributes="FontAttributes.Bold" />
             <BoxView Margin="10" HeightRequest="2" Color="Colors.DarkGray" HorizontalOptions="LayoutOptions.FillAndExpand" />
             <Button Text="Common controls" OnClick="@(async () => await NavigationManager.NavigateToAsync("/commoncontrols"))"></Button>
+            <Button Text="Labels" OnClick="@(async () => await NavigationManager.NavigateToAsync("/controls/labels"))"></Button>
             <Button Text="Navigation playground" OnClick="@(async () => await NavigationManager.NavigateToAsync("/navigation"))"></Button>
             <Button Text="Gesture playground" OnClick="@(async () => await NavigationManager.NavigateToAsync("/gestureplayground"))"></Button>
             <Button Text="Skia Playground" OnClick="@(async () => await NavigationManager.NavigateToAsync("/skia"))"></Button>
diff --git a/src/Microsoft.MobileBlazorBindings.Core/TextSpanContainer.cs b/src/Microsoft.MobileBlazorBindings.Core/TextSpanContainer.cs
index 9aa68e5a..c65122d2 100644
--- a/src/Microsoft.MobileBlazorBindings.Core/TextSpanContainer.cs
+++ b/src/Microsoft.MobileBlazorBindings.Core/TextSpanContainer.cs
@@ -42,9 +42,9 @@ public string GetUpdatedText(int index, string text)
             }
             _textSpans[index] = text;
 
-            var allText = string.Join(string.Empty, _textSpans);
+            var allText = string.Concat(_textSpans);
             return TrimWhitespace
-                ? allText?.Trim()
+                ? allText.Trim()
                 : allText;
         }
     }
diff --git a/src/Microsoft.MobileBlazorBindings/Elements/Handlers/LabelHandler.cs b/src/Microsoft.MobileBlazorBindings/Elements/Handlers/LabelHandler.cs
index ed1f1de9..43b403a1 100644
--- a/src/Microsoft.MobileBlazorBindings/Elements/Handlers/LabelHandler.cs
+++ b/src/Microsoft.MobileBlazorBindings/Elements/Handlers/LabelHandler.cs
@@ -1,13 +1,17 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
+using Microsoft.MobileBlazorBindings.Core;
+using System;
 using System.Diagnostics;
 using MC = Microsoft.Maui.Controls;
 
 namespace Microsoft.MobileBlazorBindings.Elements.Handlers
 {
-    public partial class LabelHandler : ViewHandler, IMauiContainerElementHandler
+    public partial class LabelHandler : ViewHandler, IMauiContainerElementHandler, IHandleChildContentText
     {
+        private readonly TextSpanContainer _textSpanContainer = new();
+
         public virtual void AddChild(MC.Element child, int physicalSiblingIndex)
         {
             var childAsSpan = child as MC.Span;
@@ -47,6 +51,21 @@ public virtual void RemoveChild(MC.Element child)
             formattedString.Spans.Remove(childAsSpan);
         }
 
+        public void HandleText(int index, string text)
+        {
+            if (LabelControl.FormattedText != null)
+            {
+                if (!string.IsNullOrWhiteSpace(text))
+                {
+                    throw new InvalidOperationException("Cannot use both string content and Spans for Label.");
+                }
+            }
+            else
+            {
+                LabelControl.Text = _textSpanContainer.GetUpdatedText(index, text);
+            }
+        }
+
         private MC.FormattedString GetFormattedString()
         {
             if (LabelControl.FormattedText == null)