[iOS] Read only Editor is editable when Next from on screen keyboard (#…

…22501) * Fix #22079 * Added a device test #22079
dotnet · Jul 13, 2024 · ba19cff · ba19cff
1 parent 79dd879
commit ba19cff
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/src/Core/src/Platform/iOS/KeyboardAutoManager.cs b/src/Core/src/Platform/iOS/KeyboardAutoManager.cs
@@ -29,7 +29,7 @@ internal static void GoToNextResponderOrResign(UIView view, UIView? customSuperV
 
 		var nextField = view.FindNextView(superview, view =>
 		{
-			var isValidTextView = view is UITextView textView && textView.Editable;
+			var isValidTextView = view is UITextView textView && textView.Editable && textView.UserInteractionEnabled;
 			var isValidTextField = view is UITextField textField && textField.Enabled;
 
 			return (isValidTextView || isValidTextField) && !view.Hidden && view.Alpha != 0f;

diff --git a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.iOS.cs b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.iOS.cs
@@ -543,6 +543,35 @@ await NextMovesHelper(() =>
 			}, vsl1, vsl2, vsl3);
 		}
 
+		[Fact]
+		public async Task NextMovesSkipsReadonlyFields()
+		{
+			var entry1 = new EntryStub
+			{
+				ReturnType = ReturnType.Next,
+			};
+
+			var editor1 = new EditorStub
+			{
+				IsReadOnly = true
+			};
+
+			var editor2 = new EditorStub();
+
+			var vsl = new VerticalStackLayoutStub
+			{
+				entry1,
+				editor1,
+				editor2
+			};
+
+			await NextMovesHelper(() =>
+			{
+				KeyboardAutoManager.GoToNextResponderOrResign(entry1.ToPlatform(), customSuperView: vsl.ToPlatform().Superview);
+				Assert.True(editor2.IsFocused);
+			}, vsl);
+		}
+
 		async Task NextMovesHelper(Action action = null, params StubBase[] views)
 		{
 			EnsureHandlerCreated(builder =>