Merge pull request #11113 from Youssef1313/textbox-text-null

fix(TextBox): Setting `TextBox.Text` to `null` should only throw in UWP
unoplatform · Jan 31, 2023 · 46b2708 · 46b2708
2 parents 0ed5416 + 507d35c
commit 46b2708
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Uno.UI.Tests/Windows_UI_XAML_Controls/TextBoxTests/Given_TextBox.cs b/src/Uno.UI.Tests/Windows_UI_XAML_Controls/TextBoxTests/Given_TextBox.cs
@@ -39,11 +39,19 @@ public void When_Setting_Text_Null()
 			textBox.Text = "Rhubarb";
 			Assert.AreEqual("Rhubarb", textBox.Text);
 			Assert.AreEqual(1, callbackCount);
-
+
+#if !HAS_UNO_WINUI
+			// Setting TextBox.Text to null throws an exception in UWP but not WinUI.
 			Assert.ThrowsException<ArgumentNullException>(() => textBox.Text = null);
+#endif
 
 			Assert.AreEqual("Rhubarb", textBox.Text);
 			Assert.AreEqual(1, callbackCount);
+
+#if HAS_UNO_WINUI
+			textBox.Text = null;
+			Assert.AreEqual("", textBox.Text);
+#endif
 		}
 
 		[TestMethod]

diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.cs b/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.cs
@@ -193,7 +193,11 @@ public string Text
 			{
 				if (value == null)
 				{
+#if HAS_UNO_WINUI
+					value = string.Empty;
+#else
 					throw new ArgumentNullException();
+#endif
 				}
 
 				this.SetValue(TextProperty, value);