[iOS 26] Fix Shell TitleView not resizing on device rotation #35883
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| namespace Maui.Controls.Sample.Issues; | ||
|
|
||
| [Issue(IssueTracker.Github, 35844, "Shell TitleView does not resize after rotation on iOS 26+", PlatformAffected.iOS)] | ||
| public class Issue35844Shell : Shell | ||
| { | ||
| public Issue35844Shell() | ||
| { | ||
| Issue35844 contentPage = new Issue35844(); | ||
|
|
||
| ShellContent shellContent = new ShellContent | ||
| { | ||
| Content = contentPage, | ||
| Route = "Issue35844" | ||
| }; | ||
|
|
||
| Items.Add(shellContent); | ||
| } | ||
| } | ||
|
|
||
| public class Issue35844 : ContentPage | ||
| { | ||
| public Issue35844() | ||
| { | ||
| Shell.SetTitleView(this, new Grid | ||
| { | ||
| BackgroundColor = Colors.LightBlue, | ||
| AutomationId = "TitleViewGrid", | ||
| HorizontalOptions = LayoutOptions.Fill, | ||
| Children = | ||
| { | ||
| new Label | ||
| { | ||
| Text = "Shell TitleView", | ||
| AutomationId = "TitleLabel", | ||
| TextColor = Colors.White, | ||
| FontSize = 18, | ||
| FontAttributes = FontAttributes.Bold, | ||
| VerticalOptions = LayoutOptions.Center, | ||
| HorizontalOptions = LayoutOptions.Center | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| Content = new VerticalStackLayout | ||
| { | ||
| Padding = new Thickness(20), | ||
| Spacing = 10, | ||
| Children = | ||
| { | ||
| new Label | ||
| { | ||
| Text = "Issue 35844", | ||
| FontSize = 20, | ||
| FontAttributes = FontAttributes.Bold, | ||
| AutomationId = "HeaderLabel", | ||
| HorizontalOptions = LayoutOptions.Center | ||
| }, | ||
| new Label | ||
| { | ||
| Text = "Shell TitleView should fill the navigation bar width after rotation on iOS 26+.", | ||
| FontSize = 14, | ||
| AutomationId = "DescriptionLabel" | ||
| }, | ||
| new Label | ||
| { | ||
| Text = "Rotate device to test", | ||
| AutomationId = "StatusLabel", | ||
| FontSize = 16, | ||
| TextColor = Colors.Gray | ||
| } | ||
| } | ||
| }; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| #if TEST_FAILS_ON_WINDOWS && TEST_FAILS_ON_CATALYST // SetOrientationLandscape/Portrait is only supported on iOS and Android. | ||
|
Collaborator
There was a problem hiding this comment. [major] Regression Prevention - This preprocessor guard also includes the test in the Android test project: Android defines |
||
|
|
||
| using NUnit.Framework; | ||
| using UITest.Appium; | ||
| using UITest.Core; | ||
|
|
||
| namespace Microsoft.Maui.TestCases.Tests.Issues | ||
| { | ||
| public class Issue35844 : _IssuesUITest | ||
| { | ||
| public override string Issue => "Shell TitleView does not resize after rotation on iOS 26+"; | ||
|
|
||
| public Issue35844(TestDevice device) : base(device) { } | ||
|
|
||
| [Test] | ||
| [Category(UITestCategories.Shell)] | ||
| public void ShellTitleViewResizesOnRotation() | ||
| { | ||
| App.WaitForElement("TitleViewGrid"); | ||
| App.WaitForElement("StatusLabel"); | ||
|
|
||
| // Capture portrait width | ||
| var portraitRect = App.WaitForElement("TitleViewGrid").GetRect(); | ||
| var portraitWidth = portraitRect.Width; | ||
|
|
||
| App.SetOrientationLandscape(); | ||
| App.WaitForElement("TitleViewGrid"); // re-wait to ensure layout has settled after rotation | ||
|
|
||
| // After rotation, TitleView width must change to fill the wider nav bar | ||
| var landscapeRect = App.WaitForElement("TitleViewGrid").GetRect(); | ||
| var landscapeWidth = landscapeRect.Width; | ||
|
|
||
| Assert.That(landscapeWidth, Is.Not.EqualTo(portraitWidth).Within(50), | ||
| "Shell TitleView width should expand after rotating to landscape on iOS 26+"); | ||
| Assert.That(landscapeWidth, Is.GreaterThan(portraitWidth), | ||
| "Shell TitleView should be wider in landscape than portrait"); | ||
|
|
||
| // Rotate back and verify TitleView returns to original width | ||
| App.SetOrientationPortrait(); | ||
| App.WaitForElement("TitleViewGrid"); // re-wait to ensure layout has settled after rotation | ||
|
|
||
| var finalRect = App.WaitForElement("TitleViewGrid").GetRect(); | ||
| Assert.That(finalRect.Width, Is.EqualTo(portraitWidth).Within(5), | ||
| "Shell TitleView should return to original portrait width after rotating back"); | ||
| } | ||
| } | ||
| } | ||
| #endif | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[major] iOS Shell layout —
UpdateTitleViewFrameForOrientation()resizes the nativeTitleViewContainer.Frame, but it does not refresh the container'sHeightvalue used byUIContainerView.LayoutSubviews()whenMatchHeightis true. On iPhone rotation the navigation bar height can change between portrait and landscape, so the container frame can match the new bar while the MAUI title view is still measured/arranged with the previous bar height, causing vertical clipping or stale layout. Please update the stored height together with the frame, or route this through a helper that keepsFrameandHeightin sync, and cover the rotated height/clipping case in the regression test.