Add a done button to Entry

Author: kubaflo

src/Core/src/Handlers/Editor/EditorHandler.iOS.cs

@@ -14,28 +14,10 @@ public partial class EditorHandler : ViewHandler<IEditor, MauiTextView>
 		protected override MauiTextView CreatePlatformView()
 		{
 			var platformEditor = new MauiTextView();
-
-#if !MACCATALYST
-			var accessoryView = new MauiDoneAccessoryView();
-			accessoryView.SetDataContext(this);
-			accessoryView.SetDoneClicked(OnDoneClicked);
-			platformEditor.InputAccessoryView = accessoryView;
-#endif
-
+			platformEditor.AddMauiDoneAccessoryView(this);
 			return platformEditor;
 		}
 
-#if !MACCATALYST
-		static void OnDoneClicked(object sender)
-		{
-			if (sender is IEditorHandler handler)
-			{
-				handler.PlatformView.ResignFirstResponder();
-				handler.VirtualView.Completed();
-			}
-		}
-#endif
-
 		public override void SetVirtualView(IView view)
 		{
 			base.SetVirtualView(view);

src/Core/src/Handlers/Entry/EntryHandler.iOS.cs

@@ -11,13 +11,18 @@ public partial class EntryHandler : ViewHandler<IEntry, MauiTextField>
 	{
 		readonly MauiTextFieldProxy _proxy = new();
 
-		protected override MauiTextField CreatePlatformView() =>
-			new MauiTextField
+		protected override MauiTextField CreatePlatformView()
+		{
+			var platformEntry = new MauiTextField
 			{
 				BorderStyle = UITextBorderStyle.RoundedRect,
 				ClipsToBounds = true
 			};
 
+			platformEntry.AddMauiDoneAccessoryView(this);
+			return platformEntry;
+		}
+
 		public override void SetVirtualView(IView view)
 		{
 			base.SetVirtualView(view);

src/Core/src/Platform/iOS/TextFieldExtensions.cs

@@ -244,5 +244,24 @@ internal static void UpdateClearButtonColor(this UITextField textField, IEntry e
 
 			return tintedImage;
 		}
+
+		internal static void AddMauiDoneAccessoryView(this UITextField textField, IViewHandler handler)
+		{
+#if !MACCATALYST
+			var accessoryView = new MauiDoneAccessoryView();
+			accessoryView.SetDataContext(handler);
+			accessoryView.SetDoneClicked(OnDoneClicked);
+			textField.InputAccessoryView = accessoryView;
+#endif
+		}
+
+		static void OnDoneClicked(object sender)
+		{
+			if (sender is IEntryHandler entryHandler)
+			{
+				entryHandler.PlatformView.ResignFirstResponder();
+				entryHandler.VirtualView.Completed();
+			}
+		}
 	}
 }

src/Core/src/Platform/iOS/TextViewExtensions.cs

@@ -177,5 +177,24 @@ static UITextPosition GetSelectionEnd(UITextView textView, IEditor editor, UITex
 
 			return end;
 		}
+
+		internal static void AddMauiDoneAccessoryView(this UITextView textView, IViewHandler handler)
+		{
+#if !MACCATALYST
+			var accessoryView = new MauiDoneAccessoryView();
+			accessoryView.SetDataContext(handler);
+			accessoryView.SetDoneClicked(OnDoneClicked);
+			textView.InputAccessoryView = accessoryView;
+#endif
+		}
+
+		static void OnDoneClicked(object sender)
+		{
+			if (sender is IEditorHandler entryHandler)
+			{
+				entryHandler.PlatformView.ResignFirstResponder();
+				entryHandler.VirtualView.Completed();
+			}
+		}
 	}
 }