fix-35615: Made code changes to fix Editor height ignoring HeightRequest when VerticalTextAlignment is Center or End under infinite height constraints on iOS and macOS.

Author: BagavathiPerumal

src/Controls/tests/DeviceTests/Elements/Editor/EditorTests.iOS.cs

@@ -64,6 +64,45 @@ Task<bool> GetPlatformIsVisible(EditorHandler editorHandler)
 			});
 		}
 
+		[Theory]
+		[InlineData(TextAlignment.Start, TextAlignment.Start)]
+		[InlineData(TextAlignment.Center, TextAlignment.Start)]
+		[InlineData(TextAlignment.End, TextAlignment.Start)]
+		[InlineData(TextAlignment.Start, TextAlignment.Center)]
+		[InlineData(TextAlignment.Center, TextAlignment.Center)]
+		[InlineData(TextAlignment.End, TextAlignment.Center)]
+		[InlineData(TextAlignment.Start, TextAlignment.End)]
+		[InlineData(TextAlignment.Center, TextAlignment.End)]
+		[InlineData(TextAlignment.End, TextAlignment.End)]
+		[Description("Editor height should honour HeightRequest for all text alignment combinations when placed in an infinite height constraint layout.")]
+		public async Task EditorHeightIsConsistentAcrossAllTextAlignments(TextAlignment horizontal, TextAlignment vertical)
+		{
+			SetupBuilder();
+
+			const double heightRequest = 100;
+
+			var editor = new Editor
+			{
+				Text = "testing",
+				HeightRequest = heightRequest,
+				HorizontalTextAlignment = horizontal,
+				VerticalTextAlignment = vertical,
+			};
+
+			var layout = new VerticalStackLayout
+			{
+				Children = { editor }
+			};
+
+			await AttachAndRun<LayoutHandler>(layout, async (_) =>
+			{
+				var frame = editor.Frame;
+				await WaitForUIUpdate(frame, editor);
+
+				Assert.Equal(heightRequest, editor.Height, tolerance: 1.0);
+			});
+		}
+
 		[Fact]
 		[Description("Editor with AutoSize=TextChanges should continue to grow after a simulated rotation (width constraint change)")]
 		public async Task AutoSizeTextChangesEditorGrowsAfterRotation()

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

@@ -55,6 +55,13 @@ public override bool NeedsContainer
 
 		public override Size GetDesiredSize(double widthConstraint, double heightConstraint)
 		{
+			// When the height constraint is infinite, the handler substitutes a finite value.
+			// This flag tracks whether the substitute came from SizeThatFits (a content measurement,
+			// not a real bound). If so, the cap at the bottom must be skipped — the base already
+			// returns the correct size. When the substitute is Bounds.Height (a real frame bound),
+			// the flag stays false and the cap applies to preserve scrollability.
+			bool heightSubstitutedFromSizeThatFits = false;
+
 			if (double.IsInfinity(widthConstraint) || double.IsInfinity(heightConstraint))
 			{
 				// If we drop an infinite value into base.GetDesiredSize for the Editor, we'll
@@ -72,31 +79,29 @@ public override Size GetDesiredSize(double widthConstraint, double heightConstra
 				{
 					var currentHeight = (double)PlatformView.Bounds.Height;
 
-					// NOTE: Bounds and ContentSize reflect the pre-rotation frame at this point.
-					// The check is intentionally based on the previous layout state to detect
-					// scrollable Editors that should not grow after cache invalidation (#35114).
-					// When content overflows the frame and auto-growth is off, cap the height
-					// to the current frame height to preserve scrollability after rotation (#35114).
-					// Skip when AllowAutoGrowth is set (AutoSize=TextChanges) — Editor should grow freely.
+					// When content overflows the current frame and auto-growth is disabled,
+					// use Bounds.Height as the constraint to preserve scrollability after rotation.
+					// Editors with AutoSize=TextChanges (AllowAutoGrowth=true) are exempt.
 					if (!PlatformView.AllowAutoGrowth
 						&& currentHeight > 0
 						&& PlatformView.ContentSize.Height > currentHeight)
 					{
-						heightConstraint = currentHeight;
+						heightConstraint = currentHeight; // real bound — cap will apply
 					}
 					else
 					{
 						heightConstraint = sizeThatFits.Height;
+						heightSubstitutedFromSizeThatFits = true; // not a real bound — cap will be skipped
 					}
 				}
 			}
 
 			var result = base.GetDesiredSize(widthConstraint, heightConstraint);
 
-			// Cap applies even for finite constraints: UITextView.SizeThatFits (UIScrollView subclass)
-			// ignores the height argument and always returns full content height.
-			// Capping here ensures GetDesiredSize honours the caller's constraint.
-			if (result.Height > heightConstraint)
+			// Clamp the result to the constraint only when it represents a real upper bound.
+			// UITextView (a UIScrollView subclass) ignores the height in SizeThatFits and always
+			// returns full content height, so clamping is needed for caller- or frame-derived bounds.
+			if (!heightSubstitutedFromSizeThatFits && result.Height > heightConstraint)
 			{
 				return new Size(result.Width, heightConstraint);
 			}