From 15ffcd85c02aa9c32230828a5b650e2d51f1d3db Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <kubaflo123@gmail.com>
Date: Wed, 14 Feb 2024 15:19:29 +0100
Subject: [PATCH 1/3] [iOS] Double dash in input field fix (#20439)

---
 .../src/Core/Platform/iOS/Extensions/TextExtensions.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Controls/src/Core/Platform/iOS/Extensions/TextExtensions.cs b/src/Controls/src/Core/Platform/iOS/Extensions/TextExtensions.cs
index 6b34f6febe60..73f44ac7f853 100644
--- a/src/Controls/src/Core/Platform/iOS/Extensions/TextExtensions.cs
+++ b/src/Controls/src/Core/Platform/iOS/Extensions/TextExtensions.cs
@@ -41,6 +41,12 @@ static void UpdateText(this IUITextInput textInput, InputView inputView, bool is
 			// position if needed when the text was modified by a Converter.
 			var textRange = textInput.GetTextRange(textInput.BeginningOfDocument, textInput.EndOfDocument);
 			var oldText = textInput.TextInRange(textRange) ?? string.Empty;
+
+			// We need this variable because in some cases because of the iOS's
+			// auto correction eg. eg '--' => '—' the actual text in the input might have
+			// a different length that the one that has been set in the control.
+			var newTextLength = textInput.TextInRange(textRange)?.Length ?? 0;
+
 			var newText = TextTransformUtilites.GetTransformedText(
 				inputView?.Text,
 				textInput.GetSecureTextEntry() ? TextTransform.Default : inputView.TextTransform
@@ -50,8 +56,8 @@ static void UpdateText(this IUITextInput textInput, InputView inputView, bool is
 			{
 				// Re-calculate the cursor offset position if the text was modified by a Converter.
 				// but if the text is being set by code, let's just move the cursor to the end.
-				var cursorOffset = newText.Length - oldText.Length;
-				var cursorPosition = isEditing ? textInput.GetCursorPosition(cursorOffset) : newText.Length;
+				var cursorOffset = newTextLength - oldText.Length;
+				var cursorPosition = isEditing ? textInput.GetCursorPosition(cursorOffset) : newTextLength;
 
 				textInput.ReplaceText(textRange, newText);
 

From d6fd5d8af24d01592814acc8e7fb9e0b4f9f1f9c Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <kubaflo123@gmail.com>
Date: Wed, 14 Feb 2024 15:21:29 +0100
Subject: [PATCH 2/3] Added a UiTest (#20439)

---
 .../Issues/Issue20439.xaml                    | 25 +++++++++++++++++
 .../Issues/Issue20439.xaml.cs                 | 20 +++++++++++++
 .../tests/UITests/Tests/Issues/Issue20439.cs  | 28 +++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/Issue20439.xaml
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/Issue20439.xaml.cs
 create mode 100644 src/Controls/tests/UITests/Tests/Issues/Issue20439.cs

diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue20439.xaml b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue20439.xaml
new file mode 100644
index 000000000000..5213dd5a635a
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue20439.xaml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Shell xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.Controls.Sample.Issues.Issue20439"
+             xmlns:ns="clr-namespace:Maui.Controls.Sample.Issues">
+    <ShellContent
+            Title="Home">
+            <ContentPage>
+                <StackLayout VerticalOptions="Center">
+                    <Entry AutomationId="entry" Text="Tap here"/>
+                    <Button AutomationId="button" Text="Open the input page" Clicked="Button_Clicked"/>
+                </StackLayout>
+            </ContentPage>
+        </ShellContent>
+
+        <ShellContent
+            Title="Text input page">
+            <ContentPage>
+                   <Editor VerticalOptions="Center"
+                           AutomationId="editor"
+                           HeightRequest="100"
+                           Text="Potential auto correcting words: -- :-) ... omw \n" />
+            </ContentPage>
+        </ShellContent>
+</Shell>
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue20439.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue20439.xaml.cs
new file mode 100644
index 000000000000..0089faafcded
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue20439.xaml.cs
@@ -0,0 +1,20 @@
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+
+namespace Maui.Controls.Sample.Issues
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	[Issue(IssueTracker.Github, 20439, "[iOS] Double dash in Entry or Editor crashes the app", PlatformAffected.iOS)]
+	public partial class Issue20439 : Shell
+	{
+		public Issue20439()
+		{
+			InitializeComponent();
+		}
+
+		void Button_Clicked(object sender, System.EventArgs e)
+		{
+			CurrentItem = Items[1];
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue20439.cs b/src/Controls/tests/UITests/Tests/Issues/Issue20439.cs
new file mode 100644
index 000000000000..d4eb8bd02880
--- /dev/null
+++ b/src/Controls/tests/UITests/Tests/Issues/Issue20439.cs
@@ -0,0 +1,28 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.AppiumTests.Issues
+{
+	public class Issue20439 : _IssuesUITest
+	{
+		public override string Issue => "[iOS] Double dash in Entry or Editor crashes the app";
+
+		public Issue20439(TestDevice device) : base(device)
+		{
+		}
+
+		[Test]
+		public void ErrorShouldNotBeThrown()
+		{
+			this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.Windows });
+
+			_ = App.WaitForElement("entry");
+			App.Click("entry");
+			App.Click("button");
+
+			// The test passes if no crash is observed
+			App.FindElement("editor");
+		}
+	}
+}

From 4059c37d84892c39afab45bceae87c0cb34fd51d Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <kubaflo123@gmail.com>
Date: Tue, 20 Feb 2024 13:31:54 +0100
Subject: [PATCH 3/3] Double dash in input field fix - improvements(#20439)

---
 .../src/Core/Platform/iOS/Extensions/TextExtensions.cs       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Controls/src/Core/Platform/iOS/Extensions/TextExtensions.cs b/src/Controls/src/Core/Platform/iOS/Extensions/TextExtensions.cs
index 73f44ac7f853..0c6a97f1044a 100644
--- a/src/Controls/src/Core/Platform/iOS/Extensions/TextExtensions.cs
+++ b/src/Controls/src/Core/Platform/iOS/Extensions/TextExtensions.cs
@@ -45,13 +45,16 @@ static void UpdateText(this IUITextInput textInput, InputView inputView, bool is
 			// We need this variable because in some cases because of the iOS's
 			// auto correction eg. eg '--' => '—' the actual text in the input might have
 			// a different length that the one that has been set in the control.
-			var newTextLength = textInput.TextInRange(textRange)?.Length ?? 0;
+			var newTextLength = !string.IsNullOrWhiteSpace(inputView.Text) ? textInput.TextInRange(textRange)?.Length ?? 0 : 0;
 
 			var newText = TextTransformUtilites.GetTransformedText(
 				inputView?.Text,
 				textInput.GetSecureTextEntry() ? TextTransform.Default : inputView.TextTransform
 				);
 
+			if (!string.IsNullOrWhiteSpace(oldText))
+				newTextLength = newText.Length;
+
 			if (oldText != newText)
 			{
 				// Re-calculate the cursor offset position if the text was modified by a Converter.