feat: Initialize property respecting platform spec

unoplatform · Oct 5, 2020 · 28640cc · 28640cc
1 parent 40fe514
commit 28640cc
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.Android.cs b/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.Android.cs
@@ -64,6 +64,12 @@ public bool PreventKeyboardDisplayOnProgrammaticFocus
 			typeof(TextBox),
 			new FrameworkPropertyMetadata(false));
 
+
+		partial void InitializePropertiesPartial()
+		{
+			OnVerticalContentAlignmentChanged(VerticalAlignment.Center, VerticalContentAlignment);
+		}
+
 		private protected override void OnUnloaded()
 		{
 			base.OnUnloaded();

diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.cs b/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.cs
@@ -1,4 +1,4 @@
-#if NET461 || NETSTANDARD2_0 || __MACOS__
+#if NET461 || NETSTANDARD2_0 || __MACOS__
 #pragma warning disable CS0067, CS649
 #endif
 
@@ -97,7 +97,7 @@ private void InitializeProperties()
 			OnTextAlignmentChanged(CreateInitialValueChangerEventArgs(TextAlignmentProperty, TextAlignmentProperty.GetMetadata(GetType()).DefaultValue, TextAlignment));
 			OnTextWrappingChanged(CreateInitialValueChangerEventArgs(TextWrappingProperty, TextWrappingProperty.GetMetadata(GetType()).DefaultValue, TextWrapping));
 			OnFocusStateChanged((FocusState)FocusStateProperty.GetMetadata(GetType()).DefaultValue, FocusState, initial: true);
-			OnVerticalContentAlignmentChanged(VerticalAlignment.Center, VerticalContentAlignment);
+			OnVerticalContentAlignmentChanged(VerticalAlignment.Top, VerticalContentAlignment);
 
 			var buttonRef = _deleteButton?.GetTarget();
 
@@ -726,7 +726,7 @@ protected override void OnVerticalContentAlignmentChanged(VerticalAlignment oldV
 			if (_placeHolder != null)
 			{
 				_placeHolder.VerticalAlignment = newVerticalContentAlignment;
-			}			
+			}
 		}
 	}
 }
diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.iOS.cs b/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.iOS.cs
@@ -27,6 +27,7 @@ public partial class TextBox
 			OnTextAlignmentChanged(CreateInitialValueChangerEventArgs(TextAlignmentProperty, null, TextAlignment));
 			OnReturnKeyTypeChanged(ReturnKeyType);
 			OnKeyboardAppearanceChanged(KeyboardAppearance);
+			OnVerticalContentAlignmentChanged(GetDefaultVerticalContentAlignment(), VerticalContentAlignment);
 		}
 
 		partial void OnFocusStateChangedPartial(FocusState focusState)
@@ -324,5 +325,10 @@ private void OnKeyboardAppearanceChanged(UIKeyboardAppearance newValue)
 		}
 
 		#endregion
+
+		private VerticalAlignment GetDefaultVerticalContentAlignment() =>
+			AcceptsReturn || TextWrapping != TextWrapping.NoWrap
+							? VerticalAlignment.Top
+							: VerticalAlignment.Center;
 	}
 }
diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.macOS.cs b/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.macOS.cs
@@ -30,6 +30,7 @@ protected TextBox(bool isPassword)
 		partial void InitializePropertiesPartial()
 		{
 			OnTextAlignmentChanged(CreateInitialValueChangerEventArgs(TextAlignmentProperty, null, TextAlignment));
+			OnVerticalContentAlignmentChanged(VerticalAlignment.Top, VerticalContentAlignment);
 		}
 
 		partial void OnFocusStateChangedPartial(FocusState focusState)
@@ -232,6 +233,5 @@ protected void SetSecureTextEntry(bool isSecure)
 
 			_isSecured = isSecure;
 		}
-
 	}
 }