From c82687426c116608d7dda77eaa0cd8fd1b1147a2 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 15 Sep 2022 18:51:35 +0100
Subject: [PATCH] implement return key and accepts return, and closing keyboard
 on done return keys.

---
 samples/MobileSandbox/MainView.xaml             |  4 ++--
 samples/MobileSandbox/MainView.xaml.cs          |  9 +++++++++
 .../TextInputResponder.Properties.cs            | 17 ++++++++++++++++-
 src/iOS/Avalonia.iOS/TextInputResponder.cs      | 10 ++++++++++
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/samples/MobileSandbox/MainView.xaml b/samples/MobileSandbox/MainView.xaml
index c7bd0fe61f..9c46f3eae9 100644
--- a/samples/MobileSandbox/MainView.xaml
+++ b/samples/MobileSandbox/MainView.xaml
@@ -3,9 +3,9 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <StackPanel Margin="100 50" Spacing="50">
     <TextBlock Text="Login" Foreground="White" />
-    <TextBox Watermark="Username" TextInputOptions.ContentType="Email" />
+    <TextBox Watermark="Username" TextInputOptions.ContentType="Email" AcceptsReturn="True" TextInputOptions.ReturnKeyType="Search" />
     <TextBox Watermark="Password" PasswordChar="*" TextInputOptions.ContentType="Password" />
     <TextBox Watermark="Pin" PasswordChar="*" TextInputOptions.ContentType="Digits" />
-    <Button Content="Login" />
+    <Button Content="Login" Command="{Binding ButtonCommand}" />
   </StackPanel>
 </UserControl>
diff --git a/samples/MobileSandbox/MainView.xaml.cs b/samples/MobileSandbox/MainView.xaml.cs
index ce5f7ddb5b..4b2b546b1c 100644
--- a/samples/MobileSandbox/MainView.xaml.cs
+++ b/samples/MobileSandbox/MainView.xaml.cs
@@ -1,3 +1,5 @@
+using System;
+using System.Windows.Input;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
@@ -8,6 +10,13 @@ namespace MobileSandbox
         public MainView()
         {
             AvaloniaXamlLoader.Load(this);
+
+            DataContext = this;
+        }
+
+        public void ButtonCommand()
+        {
+            Console.WriteLine("Button pressed");
         }
     }
 }
diff --git a/src/iOS/Avalonia.iOS/TextInputResponder.Properties.cs b/src/iOS/Avalonia.iOS/TextInputResponder.Properties.cs
index a331c4689b..cdc58d0c21 100644
--- a/src/iOS/Avalonia.iOS/TextInputResponder.Properties.cs
+++ b/src/iOS/Avalonia.iOS/TextInputResponder.Properties.cs
@@ -35,7 +35,22 @@ partial class AvaloniaView
         [Export("keyboardAppearance")]
         public UIKeyboardAppearance KeyboardAppearance => UIKeyboardAppearance.Alert;
 
-        [Export("returnKeyType")] public UIReturnKeyType ReturnKeyType => (UIReturnKeyType)(_view._options?.ReturnKeyType ?? TextInputReturnKeyType.Default);
+        [Export("returnKeyType")]
+        public UIReturnKeyType ReturnKeyType
+        {
+            get
+            {
+                if (_view._options != null)
+                {
+                    if (_view._options.ReturnKeyType == TextInputReturnKeyType.Default)
+                    {
+                        return _view._options.Multiline ? UIReturnKeyType.Default : UIReturnKeyType.Done;
+                    }
+                }
+
+                return UIReturnKeyType.Default;
+            }
+        } 
 
         [Export("enablesReturnKeyAutomatically")]
         public bool EnablesReturnKeyAutomatically { get; set; }
diff --git a/src/iOS/Avalonia.iOS/TextInputResponder.cs b/src/iOS/Avalonia.iOS/TextInputResponder.cs
index c3c0a9f792..feb8ef1bb7 100644
--- a/src/iOS/Avalonia.iOS/TextInputResponder.cs
+++ b/src/iOS/Avalonia.iOS/TextInputResponder.cs
@@ -149,6 +149,16 @@ partial class AvaloniaView
             if (text == "\n")
             {
                 KeyPress(Key.Enter);
+
+                switch (ReturnKeyType)
+                {
+                    case UIReturnKeyType.Done:
+                        case UIReturnKeyType.Go:
+                        case UIReturnKeyType.Send:
+                        case UIReturnKeyType.Search:
+                        ResignFirstResponder();
+                        break;
+                }
                 return;
             }