fix(textbox): [MacOS] Allow <TextBox> to appear on multi-lines when n…

…ot focused.
jeromelaban · Feb 9, 2021 · 8af85fd · 8af85fd
1 parent 01a38fa
commit 8af85fd
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 15 deletions.
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/TextBox/Input_Multiline.xaml b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/TextBox/Input_Multiline.xaml
@@ -1,4 +1,4 @@
-<UserControl
+<Page
 	x:Class="Uno.UI.Samples.Content.UITests.TextBoxControl.Input_Multiline"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -12,15 +12,37 @@
 	d:DesignHeight="300"
 	d:DesignWidth="400">
 
-	<StackPanel>
-		<TextBox Header="Enter data:"
-		         Height="120"
+	<StackPanel Spacing="6">
+		<TextBlock>TextWrapping="Wrap" / AcceptsReturn="True"</TextBlock>
+		<TextBox Header="Header Text:"
+		         MinHeight="120"
 		         MaxWidth="300"
-		         Text="{Binding [MyInput], Mode=TwoWay}"
+		         Text="{Binding MyInput, Mode=TwoWay}"
 		         TextWrapping="Wrap"
 		         AcceptsReturn="True" />
+		<TextBlock>TextWrapping="WrapWholeWords" / AcceptsReturn="True"</TextBlock>
+		<TextBox Header="Header Text:"
+		         MinHeight="120"
+		         MaxWidth="300"
+		         Text="{Binding MyInput, Mode=TwoWay}"
+		         TextWrapping="WrapWholeWords"
+		         AcceptsReturn="True" />
+		<TextBlock>TextWrapping="Wrap" / AcceptsReturn="False"</TextBlock>
+		<TextBox Header="Header Text:"
+		         MinHeight="120"
+		         MaxWidth="300"
+		         Text="{Binding MyInput, Mode=TwoWay}"
+		         TextWrapping="Wrap"
+		         AcceptsReturn="False" />
+		<TextBlock>TextWrapping="WrapWholeWords" / AcceptsReturn="False"</TextBlock>
+		<TextBox Header="Header Text:"
+		         MinHeight="120"
+		         MaxWidth="300"
+		         Text="{Binding MyInput, Mode=TwoWay}"
+		         TextWrapping="WrapWholeWords"
+		         AcceptsReturn="False" />
 		<TextBlock Text="Result :" />
-		<TextBlock Text="{Binding [Result]}" />
+		<TextBlock Text="{Binding Result}" />
 	</StackPanel>
 
-</UserControl>
+</Page>
diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/TextBox/Input_Multiline.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/TextBox/Input_Multiline.xaml.cs
@@ -4,8 +4,8 @@
 
 namespace Uno.UI.Samples.Content.UITests.TextBoxControl
 {
-	[SampleControlInfo("TextBox", "Input_Multiline", typeof(TextBoxViewModel))]
-	public sealed partial class Input_Multiline : UserControl
+	[Sample("TextBox", ViewModelType = typeof(TextBoxViewModel))]
+	public sealed partial class Input_Multiline : Page
 	{
 		public Input_Multiline()
 		{

diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.macOS.cs b/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.macOS.cs
@@ -43,15 +43,11 @@ protected TextBox(bool isPassword)
 				else
 				{
 					_textBoxView.BecomeFirstResponder();
-
 				}
 			}
 		}
 
-		public override bool BecomeFirstResponder()
-		{
-			return (_textBoxView?.BecomeFirstResponder()).GetValueOrDefault(false);
-		}
+		public override bool BecomeFirstResponder() => _textBoxView?.BecomeFirstResponder() ?? false;
 
 		partial void OnAcceptsReturnChangedPartial(DependencyPropertyChangedEventArgs e)
 		{
@@ -84,7 +80,13 @@ private void UpdateTextBoxView()
 				}
 				else
 				{
-					_textBoxView = new TextBoxView(this) { UsesSingleLineMode = AcceptsReturn || TextWrapping != TextWrapping.NoWrap };
+					var textWrapping = TextWrapping;
+					var usesSingleLineMode = !(AcceptsReturn || textWrapping != TextWrapping.NoWrap);
+					_textBoxView = new TextBoxView(this)
+					{
+						UsesSingleLineMode = usesSingleLineMode,
+						LineBreakMode = textWrapping == TextWrapping.WrapWholeWords ? NSLineBreakMode.ByWordWrapping : NSLineBreakMode.CharWrapping,
+					};
 				}
 
 				_contentElement.Content = _textBoxView;