fix: Adjust InputScope on iOS and implement for Wasm

unoplatform · Sep 21, 2021 · 7a28cd2 · 7a28cd2
1 parent e5fea16
commit 7a28cd2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBox/InputScopeHelper.iOS.cs b/src/Uno.UI/UI/Xaml/Controls/TextBox/InputScopeHelper.iOS.cs
@@ -13,7 +13,7 @@ internal static class InputScopeHelper
     {
 		public static UITextAutocapitalizationType ConvertInputScopeToCapitalization(InputScope value)
 		{
-			switch (GetInputScopeName(value))
+			switch (value.GetFirstInputScopeNameValue())
 			{
 				case InputScopeNameValue.PersonalFullName:
 					return UITextAutocapitalizationType.Sentences;
@@ -25,14 +25,21 @@ public static UITextAutocapitalizationType ConvertInputScopeToCapitalization(Inp
 
 		public static UIKeyboardType ConvertInputScopeToKeyboardType(InputScope value)
 		{
-			switch (GetInputScopeName(value) ?? InputScopeNameValue.Default)
+			switch (value.GetFirstInputScopeNameValue())
 			{
 				default:
 					return UIKeyboardType.Default;
 
 				case InputScopeNameValue.Number:
+				case InputScopeNameValue.DateDayNumber:
+				case InputScopeNameValue.DateMonthNumber:
+				case InputScopeNameValue.DateYear:
+				case InputScopeNameValue.Digits:
 					return UIKeyboardType.NumberPad;
 
+				case InputScopeNameValue.NameOrPhoneNumber:
+					return UIKeyboardType.NamePhonePad;
+
 				case InputScopeNameValue.NumberFullWidth:
 				case InputScopeNameValue.NumericPin:
 					return UIKeyboardType.NumbersAndPunctuation;
@@ -47,17 +54,14 @@ public static UIKeyboardType ConvertInputScopeToKeyboardType(InputScope value)
 					return UIKeyboardType.PhonePad;
 
 				case InputScopeNameValue.Search:
-					return UIKeyboardType.Default;
+					return UIKeyboardType.WebSearch;
 
 				case InputScopeNameValue.EmailNameOrAddress:
 				case InputScopeNameValue.EmailSmtpAddress:
 					return UIKeyboardType.EmailAddress;
 			}
 		}
 
-		private static InputScopeNameValue? GetInputScopeName(InputScope value)
-			=> value?.Names?.FirstOrDefault()?.NameValue;
-
 		public static InputScopeNameValue ConvertInputScope(UIKeyboardType keyboardType)
 		{
 			switch (keyboardType)

diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.wasm.cs b/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.wasm.cs
@@ -113,10 +113,20 @@ partial void OnIsReadonlyChangedPartial(DependencyPropertyChangedEventArgs e)
 			}
 		}
 
+		partial void OnInputScopeChangedPartial(DependencyPropertyChangedEventArgs e)
+		{
+			if (e.NewValue is InputScope scope)
+			{
+				ApplyInputScope(scope);
+			}
+		}
+
 		private void ApplyEnabled(bool? isEnabled = null) => _textBoxView?.SetEnabled(isEnabled ?? IsEnabled);
 
 		private void ApplyIsReadonly(bool? isReadOnly = null) => _textBoxView?.SetIsReadOnly(isReadOnly ?? IsReadOnly);
 
+		private void ApplyInputScope(InputScope scope) => _textBoxView?.SetInputScope(scope);
+
 		partial void SelectPartial(int start, int length)
 		{
 			_textBoxView?.Select(start, length);

diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBoxView.wasm.cs b/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBoxView.wasm.cs
@@ -158,7 +158,7 @@ internal void SetInputScope(InputScope scope)
 				InputScopeNameValue.Search => "search",
 				InputScopeNameValue.SearchIncremental => "search",
 
-				InputScopeNameValue.EmailNameOrAddresso => "email",
+				InputScopeNameValue.EmailNameOrAddress => "email",
 				InputScopeNameValue.EmailSmtpAddress => "email",
 
 				InputScopeNameValue.Url => "url",