From 84949cab1548b25ac36e00662f932fc812fe0a3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Tue, 27 Jun 2023 10:28:51 +0200
Subject: [PATCH 1/4] Fix iOS Editor placeholder size, characterspacing and
 fontsize issues

---
 .../Pages/Controls/EditorPage.xaml            | 14 ++++++++
 .../src/Handlers/Editor/EditorHandler.iOS.cs  |  5 ++-
 src/Core/src/Platform/iOS/MauiTextView.cs     | 35 +++++++++++++++----
 3 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/EditorPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/EditorPage.xaml
index fb276e602201..30dff03e086a 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/EditorPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/EditorPage.xaml
@@ -39,6 +39,20 @@
                     Style="{StaticResource Headline}" />
                 <Editor 
                     Text="Text"/>
+                <Label
+                    Text="FontSize"
+                    Style="{StaticResource Headline}" />
+                <Editor
+                    FontSize="Large"
+                    Placeholder="FontSize (Large)"
+                    Text="FontSize (Large)"/>
+                <Label
+                    Text="CharacterSpacing"
+                    Style="{StaticResource Headline}" />
+                <Editor
+                    CharacterSpacing="4"
+                    Placeholder="CharacterSpacing (4)"
+                    Text="CharacterSpacing (4)"/>
                 <Label
                     Text="ClearButtonVisibility = Never"
                     Style="{StaticResource Headline}" />
diff --git a/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs b/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs
index ade8b6ce3084..5de3a6554446 100644
--- a/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs
+++ b/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs
@@ -102,8 +102,11 @@ public static void MapText(IEditorHandler handler, IEditor editor)
 		public static void MapTextColor(IEditorHandler handler, IEditor editor) =>
 			handler.PlatformView?.UpdateTextColor(editor);
 
-		public static void MapPlaceholder(IEditorHandler handler, IEditor editor) =>
+		public static void MapPlaceholder(IEditorHandler handler, IEditor editor)
+		{
 			handler.PlatformView?.UpdatePlaceholder(editor);
+			handler.PlatformView?.UpdateCharacterSpacing(editor);
+		}
 
 		public static void MapPlaceholderColor(IEditorHandler handler, IEditor editor) =>
 			handler.PlatformView?.UpdatePlaceholderColor(editor);
diff --git a/src/Core/src/Platform/iOS/MauiTextView.cs b/src/Core/src/Platform/iOS/MauiTextView.cs
index caee95da5a69..baac34df20d5 100644
--- a/src/Core/src/Platform/iOS/MauiTextView.cs
+++ b/src/Core/src/Platform/iOS/MauiTextView.cs
@@ -15,6 +15,7 @@ public class MauiTextView : UITextView
 		public MauiTextView()
 		{
 			_placeholderLabel = InitPlaceholderLabel();
+			UpdatePlaceholderLabelConstraints();
 			Changed += OnChanged;
 		}
 
@@ -22,6 +23,7 @@ public MauiTextView(CGRect frame)
 			: base(frame)
 		{
 			_placeholderLabel = InitPlaceholderLabel();
+			UpdatePlaceholderLabelConstraints();
 			Changed += OnChanged;
 		}
 
@@ -126,15 +128,36 @@ UILabel InitPlaceholderLabel()
 
 			AddSubview(placeholderLabel);
 
-			var edgeInsets = TextContainerInset;
-			var lineFragmentPadding = TextContainer.LineFragmentPadding;
-
-			placeholderLabel.TextInsets = new UIEdgeInsets(edgeInsets.Top, edgeInsets.Left + lineFragmentPadding,
-				edgeInsets.Bottom, edgeInsets.Right + lineFragmentPadding);
-
 			return placeholderLabel;
 		}
 
+		void UpdatePlaceholderLabelConstraints()
+		{
+			if (_placeholderLabel is MauiLabel placeholderLabel)
+			{
+				var edgeInsets = TextContainerInset;
+				var lineFragmentPadding = TextContainer.LineFragmentPadding;
+
+				var vConstraints = NSLayoutConstraint.FromVisualFormat(
+					"V:|-" + edgeInsets.Top + "-[_placeholderLabel]-" + edgeInsets.Bottom + "-|", 0, new NSDictionary(),
+					NSDictionary.FromObjectsAndKeys(
+						new NSObject[] { _placeholderLabel }, new NSObject[] { new NSString("_placeholderLabel") })
+				);
+
+				var hConstraints = NSLayoutConstraint.FromVisualFormat(
+					"H:|-" + lineFragmentPadding + "-[_placeholderLabel]-" + lineFragmentPadding + "-|",
+					0, new NSDictionary(),
+					NSDictionary.FromObjectsAndKeys(
+						new NSObject[] { _placeholderLabel }, new NSObject[] { new NSString("_placeholderLabel") })
+				);
+
+				placeholderLabel.TranslatesAutoresizingMaskIntoConstraints = false;
+
+				AddConstraints(hConstraints);
+				AddConstraints(vConstraints);
+			}
+		}
+
 		void HidePlaceholderIfTextIsPresent(string? value)
 		{
 			_placeholderLabel.Hidden = !string.IsNullOrEmpty(value);

From 01b27240f308e159dd98860660d2ddb9ec35142b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Tue, 27 Jun 2023 10:49:44 +0200
Subject: [PATCH 2/4] Added Device Test

---
 .../Handlers/Editor/EditorHandlerTests.iOS.cs | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.iOS.cs b/src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.iOS.cs
index 6c03c6753c27..1e1db6e6f570 100644
--- a/src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.iOS.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.iOS.cs
@@ -101,6 +101,31 @@ public async Task PlaceholderHiddenWhenControlHasAttributedText()
 			Assert.True(isHidden);
 		}
 
+		[Fact(DisplayName = "Placeholder CharacterSpacing Initializes Correctly")]
+		public async Task PlaceholderCharacterSpacingInitializesCorrectly()
+		{
+			string originalText = "Test";
+			var xplatCharacterSpacing = 4;
+
+			var editor = new EditorStub()
+			{
+				CharacterSpacing = xplatCharacterSpacing,
+				Placeholder = originalText
+			};
+
+			var values = await GetValueAsync(editor, (handler) =>
+			{
+				return new
+				{
+					ViewValue = editor.CharacterSpacing,
+					PlatformViewValue = GetNativePlaceholderCharacterSpacing(handler)
+				};
+			});
+
+			Assert.Equal(xplatCharacterSpacing, values.ViewValue);
+			Assert.Equal(xplatCharacterSpacing, values.PlatformViewValue);
+		}
+
 		[Fact(DisplayName = "CharacterSpacing Initializes Correctly")]
 		public async Task CharacterSpacingInitializesCorrectly()
 		{
@@ -222,6 +247,11 @@ double GetNativeCharacterSpacing(EditorHandler editorHandler)
 			return editor.AttributedText.GetCharacterSpacing();
 		}
 
+		double GetNativePlaceholderCharacterSpacing(EditorHandler editorHandler)
+		{
+			return GetNativePlaceholder(editorHandler).AttributedText.GetCharacterSpacing();
+		}
+
 		double GetNativeUnscaledFontSize(EditorHandler editorHandler) =>
 			GetNativeEditor(editorHandler).Font.PointSize;
 

From 1a6dd9f7c629655d98c531bb0b930865ebfd28b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Fri, 7 Jul 2023 13:14:13 +0200
Subject: [PATCH 3/4] Invalidate CharacterSpacing updating the placeholder

---
 src/Core/src/Handlers/Editor/EditorHandler.iOS.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs b/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs
index 5de3a6554446..e62f5821b796 100644
--- a/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs
+++ b/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs
@@ -105,7 +105,7 @@ public static void MapTextColor(IEditorHandler handler, IEditor editor) =>
 		public static void MapPlaceholder(IEditorHandler handler, IEditor editor)
 		{
 			handler.PlatformView?.UpdatePlaceholder(editor);
-			handler.PlatformView?.UpdateCharacterSpacing(editor);
+			handler.UpdateValue(nameof(IEditor.CharacterSpacing));
 		}
 
 		public static void MapPlaceholderColor(IEditorHandler handler, IEditor editor) =>

From 91cc40b5574d5c68bb5620adc6e929cb280824bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Fri, 7 Jul 2023 13:19:17 +0200
Subject: [PATCH 4/4] Updated Impl

---
 src/Core/src/Platform/iOS/MauiTextView.cs | 36 ++++++++---------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/Core/src/Platform/iOS/MauiTextView.cs b/src/Core/src/Platform/iOS/MauiTextView.cs
index baac34df20d5..9e97e1022161 100644
--- a/src/Core/src/Platform/iOS/MauiTextView.cs
+++ b/src/Core/src/Platform/iOS/MauiTextView.cs
@@ -15,7 +15,7 @@ public class MauiTextView : UITextView
 		public MauiTextView()
 		{
 			_placeholderLabel = InitPlaceholderLabel();
-			UpdatePlaceholderLabelConstraints();
+			UpdatePlaceholderLabelFrame();
 			Changed += OnChanged;
 		}
 
@@ -23,7 +23,7 @@ public MauiTextView(CGRect frame)
 			: base(frame)
 		{
 			_placeholderLabel = InitPlaceholderLabel();
-			UpdatePlaceholderLabelConstraints();
+			UpdatePlaceholderLabelFrame();
 			Changed += OnChanged;
 		}
 
@@ -114,6 +114,8 @@ public override NSAttributedString AttributedText
 		public override void LayoutSubviews()
 		{
 			base.LayoutSubviews();
+
+			UpdatePlaceholderLabelFrame();
 			ShouldCenterVertically();
 		}
 
@@ -131,30 +133,16 @@ UILabel InitPlaceholderLabel()
 			return placeholderLabel;
 		}
 
-		void UpdatePlaceholderLabelConstraints()
+		void UpdatePlaceholderLabelFrame()
 		{
-			if (_placeholderLabel is MauiLabel placeholderLabel)
+			if (Bounds != CGRect.Empty && _placeholderLabel is not null)
 			{
-				var edgeInsets = TextContainerInset;
-				var lineFragmentPadding = TextContainer.LineFragmentPadding;
-
-				var vConstraints = NSLayoutConstraint.FromVisualFormat(
-					"V:|-" + edgeInsets.Top + "-[_placeholderLabel]-" + edgeInsets.Bottom + "-|", 0, new NSDictionary(),
-					NSDictionary.FromObjectsAndKeys(
-						new NSObject[] { _placeholderLabel }, new NSObject[] { new NSString("_placeholderLabel") })
-				);
-
-				var hConstraints = NSLayoutConstraint.FromVisualFormat(
-					"H:|-" + lineFragmentPadding + "-[_placeholderLabel]-" + lineFragmentPadding + "-|",
-					0, new NSDictionary(),
-					NSDictionary.FromObjectsAndKeys(
-						new NSObject[] { _placeholderLabel }, new NSObject[] { new NSString("_placeholderLabel") })
-				);
-
-				placeholderLabel.TranslatesAutoresizingMaskIntoConstraints = false;
-
-				AddConstraints(hConstraints);
-				AddConstraints(vConstraints);
+				var x = TextContainer.LineFragmentPadding;
+				var y = TextContainerInset.Top;
+				var width = Bounds.Width - (x * 2);
+				var height = Frame.Height - (TextContainerInset.Top + TextContainerInset.Bottom);
+
+				_placeholderLabel.Frame = new CGRect(x, y, width, height);
 			}
 		}