From a6e936d74accdcf7ead6b776f374defb501e4434 Mon Sep 17 00:00:00 2001
From: Emmanuel Hansen <emmausssss@gmail.com>
Date: Tue, 7 Nov 2023 09:02:22 +0000
Subject: [PATCH] Implement Next action in android IME (#13222)

* implement Next action in android IME

* Handle UIReturnKeyType.Next on iOS

* Remove NavigationMethod.Directional (do we need focus adorner?)

---------

Co-authored-by: Max Katz <maxkatz6@outlook.com>
Co-authored-by: Julien Lebosquain <julien@lebosquain.net>
---
 samples/MobileSandbox/MainView.xaml                   |  2 +-
 .../Platform/SkiaPlatform/TopLevelImpl.cs             |  6 ++++++
 src/Avalonia.Base/Input/FocusManager.cs               | 11 +++++++++++
 src/iOS/Avalonia.iOS/TextInputResponder.cs            |  4 ++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/samples/MobileSandbox/MainView.xaml b/samples/MobileSandbox/MainView.xaml
index 5d35ec3fec..ccdfb090d2 100644
--- a/samples/MobileSandbox/MainView.xaml
+++ b/samples/MobileSandbox/MainView.xaml
@@ -8,7 +8,7 @@
     <TextBox TextInputOptions.Multiline="True" AcceptsReturn="True" Watermark="Text" Height="200" TextWrapping="Wrap"/>
     <TextBox Watermark="Username" TextInputOptions.ContentType="Email" TextInputOptions.ReturnKeyType="Done" />
     <TextBox Watermark="Password" PasswordChar="*" TextInputOptions.ContentType="Password" />
-    <TextBox Watermark="Pin" PasswordChar="*" TextInputOptions.ContentType="Digits" />
+    <TextBox Watermark="Pin" PasswordChar="*" TextInputOptions.ContentType="Digits" TextInputOptions.ReturnKeyType="Next" />
     <Button Content="Login" Command="{Binding ButtonCommand}" />
   </StackPanel>
 </UserControl>
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
index a6e8d10777..374536e36c 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
@@ -624,6 +624,12 @@ namespace Avalonia.Android.Platform.SkiaPlatform
                         _inputMethod.IMM.HideSoftInputFromWindow(_inputMethod.View.WindowToken, HideSoftInputFlags.ImplicitOnly);
                         break;
                     }
+                case ImeAction.Next:
+                    {
+                        FocusManager.GetFocusManager(_toplevel.InputRoot)?
+                            .TryMoveFocus(NavigationDirection.Next);
+                        break;
+                    }
             }
 
             return base.PerformEditorAction(actionCode);
diff --git a/src/Avalonia.Base/Input/FocusManager.cs b/src/Avalonia.Base/Input/FocusManager.cs
index c3316eb278..e110fc0827 100644
--- a/src/Avalonia.Base/Input/FocusManager.cs
+++ b/src/Avalonia.Base/Input/FocusManager.cs
@@ -200,6 +200,17 @@ namespace Avalonia.Input
                    // In our unit tests some elements might not have a root. Remove when we migrate to headless tests.
                 ?? (FocusManager?)AvaloniaLocator.Current.GetService<IFocusManager>();
         }
+
+        internal bool TryMoveFocus(NavigationDirection direction)
+        {
+            if (GetFocusedElement() is {} focusedElement
+                && KeyboardNavigationHandler.GetNext(focusedElement, direction) is {} newElement)
+            {
+                return newElement.Focus();
+            }
+
+            return false;
+        }
         
         /// <summary>
         /// Checks if the specified element can be focused.
diff --git a/src/iOS/Avalonia.iOS/TextInputResponder.cs b/src/iOS/Avalonia.iOS/TextInputResponder.cs
index 935cf227da..05a3c208c3 100644
--- a/src/iOS/Avalonia.iOS/TextInputResponder.cs
+++ b/src/iOS/Avalonia.iOS/TextInputResponder.cs
@@ -182,6 +182,10 @@ partial class AvaloniaView
 
                 switch (ReturnKeyType)
                 {
+                    case UIReturnKeyType.Next:
+                        FocusManager.GetFocusManager(_view._topLevel)?
+                            .TryMoveFocus(NavigationDirection.Next);
+                        break;
                     case UIReturnKeyType.Done:
                     case UIReturnKeyType.Go:
                     case UIReturnKeyType.Send: