fix: IsTabStop handling for TextBox on Android

unoplatform · Jan 12, 2022 · 276d195 · 276d195
1 parent a0bd585
commit 276d195
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 18 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
@@ -411,29 +411,37 @@ private static TypefaceStyle GetTypefaceStyle(FontStyle fontStyle, FontWeight fo
 			return style;
 		}
 
-		partial void OnIsReadonlyChangedPartial(DependencyPropertyChangedEventArgs e)
+		partial void OnIsReadonlyChangedPartial(DependencyPropertyChangedEventArgs e) => UpdateTextBoxViewReadOnly();
+
+		partial void OnIsTabStopChangedPartial() => UpdateTextBoxViewReadOnly();
+
+		private void UpdateTextBoxViewReadOnly()
 		{
-			if (_textBoxView != null)
+			if (_textBoxView == null)
 			{
-				var isReadOnly = IsReadOnly;
+				return;
+			}
 
-				_textBoxView.Focusable = !isReadOnly;
-				_textBoxView.FocusableInTouchMode = !isReadOnly;
-				_textBoxView.Clickable = !isReadOnly;
-				_textBoxView.LongClickable = !isReadOnly;
-				_textBoxView.SetCursorVisible(!isReadOnly);
+			// Both IsReadOnly = true and IsTabStop = false make the control
+			// not receive any input.
+			var isReadOnly = IsReadOnly || !IsTabStop;
 
-				if (isReadOnly)
-				{
-					_listener = _textBoxView.KeyListener;
-					_textBoxView.KeyListener = null;
-				}
-				else
+			_textBoxView.Focusable = !isReadOnly;
+			_textBoxView.FocusableInTouchMode = !isReadOnly;
+			_textBoxView.Clickable = !isReadOnly;
+			_textBoxView.LongClickable = !isReadOnly;
+			_textBoxView.SetCursorVisible(!isReadOnly);
+
+			if (isReadOnly)
+			{
+				_listener = _textBoxView.KeyListener;
+				_textBoxView.KeyListener = null;
+			}
+			else
+			{
+				if (_listener != null)
 				{
-					if (_listener != null)
-					{
-						_textBoxView.KeyListener = _listener;
-					}
+					_textBoxView.KeyListener = _listener;
 				}
 			}
 		}

diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.cs b/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.cs
@@ -694,6 +694,14 @@ public TextAlignment TextAlignment
 
 		#endregion
 
+		private protected override void OnIsTabStopChanged(bool oldValue, bool newValue)
+		{
+			base.OnIsTabStopChanged(oldValue, newValue);
+			OnIsTabStopChangedPartial();
+		}
+
+		partial void OnIsTabStopChangedPartial();
+
 		internal override void UpdateFocusState(FocusState focusState)
 		{
 			var oldValue = FocusState;