Have Frame use MinimumHeight/Width for minimums instead of constraints

src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs

@@ -4,6 +4,7 @@
 using Android.Graphics;
 using Android.Graphics.Drawables;
 using Android.Views;
+using Android.Views.Animations;
 using AndroidX.CardView.Widget;
 using AndroidX.Core.View;
 using Microsoft.Maui.Controls.Platform;
@@ -96,17 +97,28 @@ protected Frame? Element
  }
  }
 
- Size IViewHandler.GetDesiredSize(double widthMeasureSpec, double heightMeasureSpec)
+ Size IViewHandler.GetDesiredSize(double widthConstraint, double heightConstraint)
  {
- double minWidth = 20;
- if (Primitives.Dimension.IsExplicitSet(widthMeasureSpec) && !double.IsInfinity(widthMeasureSpec))
- minWidth = widthMeasureSpec;
+ var virtualView = (this as IViewHandler)?.VirtualView;
+ if (virtualView is null)
+ {
+ return Size.Zero;
+ }
+
+ var minWidth = virtualView.MinimumWidth;
+ var minHeight = virtualView.MinimumHeight;
+
+ if (!Primitives.Dimension.IsExplicitSet(minWidth))
+ {
+ minWidth = 20; // Legacy minimum value
+ }
 
- double minHeight = 20;
- if (Primitives.Dimension.IsExplicitSet(widthMeasureSpec) && !double.IsInfinity(heightMeasureSpec))
- minHeight = heightMeasureSpec;
+ if (!Primitives.Dimension.IsExplicitSet(minHeight))
+ {
+ minHeight = 20; // Legacy minimum value
+ }
 
- return VisualElementRenderer<Frame>.GetDesiredSize(this, widthMeasureSpec, heightMeasureSpec,
+ return VisualElementRenderer<Frame>.GetDesiredSize(this, widthConstraint, heightConstraint,
  new Size(minWidth, minHeight));
  }
 

src/Controls/tests/DeviceTests/Elements/Frame/FrameTests.cs

@@ -91,30 +91,7 @@ public async Task FrameWithEntryMeasuresCorrectly()
  }
  };
 
- var layoutFrame =
- await InvokeOnMainThreadAsync(() =>
- layout.ToPlatform(MauiContext).AttachAndRun(async () =>
- {
- var size = (layout as IView).Measure(double.PositiveInfinity, double.PositiveInfinity);
- (layout as IView).Arrange(new Graphics.Rect(0, 0, size.Width, size.Height));
-
- await OnFrameSetToNotEmpty(layout);
- await OnFrameSetToNotEmpty(frame);
-
- // verify that the PlatformView was measured
- var frameControlSize = (frame.Handler as IPlatformViewHandler).PlatformView.GetBoundingBox();
- Assert.True(frameControlSize.Width > 0);
- Assert.True(frameControlSize.Width > 0);
-
- // if the control sits inside a container make sure that also measured
- var containerControlSize = frame.ToPlatform().GetBoundingBox();
- Assert.True(frameControlSize.Width > 0);
- Assert.True(frameControlSize.Width > 0);
-
- return layout.Frame;
-
- })
- );
+ var layoutFrame = await LayoutFrame(layout, frame, double.PositiveInfinity, double.PositiveInfinity);
 
  Assert.True(entry.Width > 0);
  Assert.True(entry.Height > 0);
@@ -187,5 +164,92 @@ await InvokeOnMainThreadAsync(() =>
  platformView.AssertContainsColor(expectedColor);
  });
  }
+
+ [Fact(DisplayName = "Frame Respects minimum height/width")]
+ public async Task FrameRespectsMinimums()
+ {
+ SetupBuilder();
+
+ var content = new Button { Text = "Hey", WidthRequest = 50, HeightRequest = 50 };
+
+ var frame = new Frame()
+ {
+ Content = content,
+ MinimumHeightRequest = 100,
+ MinimumWidthRequest = 100,
+ VerticalOptions = LayoutOptions.Start,
+ HorizontalOptions = LayoutOptions.Start
+ };
+
+ var layout = new StackLayout()
+ {
+ Children =
+ {
+ frame
+ }
+ };
+
+ var layoutFrame = await LayoutFrame(layout, frame, 500, 500);
+
+ Assert.True(100 <= layoutFrame.Height);
+ Assert.True(100 <= layoutFrame.Width);
+ }
+
+ [Fact]
+ public async Task FrameDoesNotInterpretConstraintsAsMinimums()
+ {
+ SetupBuilder();
+
+ var content = new Button { Text = "Hey", WidthRequest = 50, HeightRequest = 50 };
+
+ var frame = new Frame()
+ {
+ Content = content,
+ MinimumHeightRequest = 100,
+ MinimumWidthRequest = 100,
+ VerticalOptions = LayoutOptions.Start,
+ HorizontalOptions = LayoutOptions.Start
+ };
+
+ var layout = new StackLayout()
+ {
+ Children =
+ {
+ frame
+ }
+ };
+
+ var layoutFrame = await LayoutFrame(layout, frame, 500, 500);
+
+ Assert.True(500 > layoutFrame.Width);
+ Assert.True(500 > layoutFrame.Height);
+ }
+
+ async Task<Rect> LayoutFrame(Layout layout, Frame frame, double measureWidth, double measureHeight)
+ {
+ return await InvokeOnMainThreadAsync(() =>
+ layout.ToPlatform(MauiContext).AttachAndRun(async () =>
+ {
+ var size = (layout as IView).Measure(measureWidth, measureHeight);
+ (layout as IView).Arrange(new Graphics.Rect(0, 0, size.Width, size.Height));
+
+ await OnFrameSetToNotEmpty(layout);
+ await OnFrameSetToNotEmpty(frame);
+
+ // verify that the PlatformView was measured
+ var frameControlSize = (frame.Handler as IPlatformViewHandler).PlatformView.GetBoundingBox();
+ Assert.True(frameControlSize.Width > 0);
+ Assert.True(frameControlSize.Width > 0);
+
+ // if the control sits inside a container make sure that also measured
+ var containerControlSize = frame.ToPlatform().GetBoundingBox();
+ Assert.True(frameControlSize.Width > 0);
+ Assert.True(frameControlSize.Width > 0);
+
+ return layout.Frame;
+
+ })
+ );
+ }
  }
 }

src/Core/tests/DeviceTests.Shared/HandlerTests/HandlerTestBaseOfT.Tests.cs

@@ -287,6 +287,14 @@ public async Task ReturnsNonEmptyNativeBoundingBounds(int size)
  {
  // https://github.com/dotnet/maui/issues/11020
  }
+
+ // This type name check is gross, but this project doesn't know anything about Frame/FrameStub
+ else if(size == 1 && view.GetType().Name.EndsWith("FrameStub")) 
+ {
+ // Frames have a legacy hard-coded minimum size of 20x20
+ Assert.True(CloseEnough(20, nativeBoundingBox.Size.Width));
+ Assert.True(CloseEnough(20, nativeBoundingBox.Size.Height));
+ }
 #endif
  else if (view is IProgress)
  {