- match android to windows behavior

dotnet · Sep 6, 2023 · b83dd72 · b83dd72
1 parent 8203055
commit b83dd72
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.Android.cs b/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
@@ -192,10 +192,11 @@ void OnEditorAction(object? sender, EditorActionEventArgs e)
 				if (e.IsCompletedAction(currentInputImeFlag))
 				{
 					VirtualView?.Completed();
+
+					if (returnType == ReturnType.Done)
+						handled = true;
 				}
-				else if (
-					currentInputImeFlag == ImeAction.Done
-					&& e.ActionId == ImeAction.ImeNull
+				else if (e.ActionId == ImeAction.ImeNull
 					&& e.Event?.KeyCode == Keycode.Enter
 					&& e.Event?.Action == KeyEventActions.Down)
 				{

diff --git a/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs b/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs
@@ -123,10 +123,6 @@ void OnPlatformKeyUp(object? sender, KeyRoutedEventArgs args)
 			{
 				PlatformView?.TryMoveFocus(FocusNavigationDirection.Next);
 			}
-			else
-			{
-				// TODO: Hide the soft keyboard; this matches the behavior of .NET MAUI on Android/iOS
-			}
 
 			VirtualView?.Completed();
 		}
-Original file line number
+Diff line change
@@ Expand Up @@
     			{
     				PlatformView?.TryMoveFocus(FocusNavigationDirection.Next);
     			}
-    			else
-    			{
-    				// TODO: Hide the soft keyboard; this matches the behavior of .NET MAUI on Android/iOS
-    			}
     			VirtualView?.Completed();
     		}
@@ Expand Down @@