Merge pull request #9349 from Gillibald/fixes/txtBlockTextUpdate

Fixes TextBlock TextProperty update handling

src/Avalonia.Controls/Documents/InlineCollection.cs

@@ -89,56 +89,45 @@ namespace Avalonia.Controls.Documents
 
         }
 
+        public override void Add(Inline inline)
+        {
+            if (InlineHost is TextBlock textBlock && !string.IsNullOrEmpty(textBlock._text))
+            {          
+                base.Add(new Run(textBlock._text));
+
+                textBlock._text = null;                
+            }
+
+            base.Add(inline);
+        }
+
         /// <summary>
-        /// Add a text segment to the collection.
+        /// Adds a text segment to the collection.
         /// <remarks>
         /// For non complex content this appends the text to the end of currently held text.
         /// For complex content this adds a <see cref="Run"/> to the collection.
         /// </remarks>
         /// </summary>
-        /// <param name="text"></param>
+        /// <param name="text">The to be added text.</param>
         public void Add(string text)
         {
-            AddText(text);
-        }
-
-        public override void Add(Inline inline)
-        {
-            OnAdd();
-
-            base.Add(inline);
-        }
-
-        public void Add(IControl child)
-        {
-            OnAdd();
-
-            base.Add(new InlineUIContainer(child));
-        }
-
-        private void AddText(string text)
-        {
-            if (LogicalChildren is TextBlock textBlock && !textBlock.HasComplexContent)
+            if (InlineHost is TextBlock textBlock && !textBlock.HasComplexContent)
             {
                 textBlock._text += text;
             }
             else
             {
-                base.Add(new Run(text));
+                Add(new Run(text));
             }
         }
 
-        private void OnAdd()
+        /// <summary>
+        /// Adds a control wrapped inside a <see cref="InlineUIContainer"/> to the collection.
+        /// </summary>
+        /// <param name="control">The to be added control.</param>
+        public void Add(IControl control)
         {
-            if (LogicalChildren is TextBlock textBlock)
-            {
-                if (!textBlock.HasComplexContent && !string.IsNullOrEmpty(textBlock._text))
-                {
-                    base.Add(new Run(textBlock._text));
-
-                    textBlock._text = null;
-                }
-            }
+            Add(new InlineUIContainer(control));
         }
 
         /// <summary>

src/Avalonia.Controls/TextBlock.cs

@@ -597,23 +597,12 @@ namespace Avalonia.Controls
 
         protected virtual void SetText(string? text)
         {
-            if (Inlines != null && Inlines.Count > 0)
-            {
-                var oldValue = Inlines.Text;
-
-                if (!string.IsNullOrEmpty(text))
-                {
-                    Inlines.Add(text);
-                }
-
-                text = Inlines.Text;
-
-                RaisePropertyChanged(TextProperty, oldValue, text);
-            }
-            else
+            if (HasComplexContent)
             {
-                SetAndRaise(TextProperty, ref _text, text);
+                Inlines?.Clear();
             }
+           
+            SetAndRaise(TextProperty, ref _text, text);           
         }
 
         /// <summary>

tests/Avalonia.Controls.UnitTests/TextBlockTests.cs

@@ -3,6 +3,7 @@ using Avalonia.Controls.Documents;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Media;
+using Avalonia.Metadata;
 using Avalonia.Rendering;
 using Avalonia.UnitTests;
 using Moq;
@@ -181,5 +182,26 @@ namespace Avalonia.Controls.UnitTests
                 Assert.Equal(60, button.Bounds.Left);
             }
         }
+
+        [Fact]
+        public void Setting_Text_Should_Reset_Inlines()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var target = new TextBlock();
+
+                target.Inlines.Add(new Run("Hello World"));
+
+                Assert.Equal("Hello World", target.Text);
+
+                Assert.Equal(1, target.Inlines.Count);
+
+                target.Text = "1234";
+
+                Assert.Equal("1234", target.Text);
+
+                Assert.Equal(0, target.Inlines.Count);
+            }
+        }
     }
 }