Further remove dependency of Compatibility.Layout on all modern .NET MAUI controls by jfversluis · Pull Request #29281 · dotnet/maui

jfversluis · 2025-05-01T18:27:54Z

Note

Are you waiting for the changes in this PR to be merged?
It would be very helpful if you could test the resulting artifacts from this PR and let us know in a comment if this change resolves your issue. Thank you!

Description of Change

Ideally we will eventually be able to remove Compatibility.Layout but we are still in a state where if users have overridden certain methods or are calling some properties that are still on Compatibility.Layout then the binary isn't compatible. This PR copies all of the public APIs to the subclasses so whenever users override or call those methods/properties on the base class the IL will resolved to the derived type vs the Compatibility.Layout

We have also implemented a property that will detect if the Compatibility.Layout is being used with any of our modern layouts. If it is then we just bypass all of the Compatibility.Layout logic so that it doesn't interfere with performance or the MAUI logic

Issues Fixed

Fixes #28736

jfversluis · 2025-05-01T19:16:50Z

@albyrock87 can't add you as a reviewer, so tagging you like this. Would be great to get your perspective here!

src/Controls/src/Core/IClippedToBoundsElement.cs

src/Controls/src/Core/ClippedToBoundsElement.cs

src/Controls/src/Core/LegacyLayouts/Layout.cs

src/Controls/src/Core/RefreshView/RefreshView.cs

src/Controls/src/Core/ScrollView/ScrollView.cs

jsuarezruiz

C:\a\_work\1\s\src\Controls\tests\TestCases.HostApp\Issues\Bugzilla\Bugzilla36788.cs(68,5): error CS0117: 'ContentView' does not contain a definition for 'IsClippedToBounds' [C:\a\_work\1\s\src\Controls\tests\TestCases.HostApp\Controls.TestCases.HostApp.csproj::TargetFramework=net10.0-android]
C:\a\_work\1\s\src\Compatibility\Core\src\Windows\RadioButtonRenderer.cs(59,35): error CS0117: 'RadioButton' does not contain a definition for 'PaddingProperty' [C:\a\_work\1\s\src\Compatibility\Core\src\Compatibility.csproj::TargetFramework=net10.0-windows10.0.20348.0]
C:\a\_work\1\s\src\Compatibility\Core\src\Windows\RadioButtonRenderer.cs(59,97): error CS0117: 'RadioButton' does not contain a definition for 'PaddingProperty' [C:\a\_work\1\s\src\Compatibility\Core\src\Compatibility.csproj::TargetFramework=net10.0-windows10.0.20348.0]
C:\a\_work\1\s\src\Compatibility\Core\src\Windows\RadioButtonRenderer.cs(112,43): error CS0117: 'RadioButton' does not contain a definition for 'PaddingProperty' [C:\a\_work\1\s\src\Compatibility\Core\src\Compatibility.csproj::TargetFramework=net10.0-windows10.0.20348.0]
    33 Error(s)

PureWeen · 2025-06-10T23:18:46Z

I did a basic test with the nuget from this PR against MCT version 12.0

I was still able to use the SemanticOrderView which inherits from ContentView and it didn't crash or throw any exceptions.

src/Controls/src/Core/ScrollView/ScrollView.cs

MartyIX · 2025-06-11T07:01:15Z

src/Controls/src/Core/TemplatedView/TemplatedView.cs

+		/// <summary>The children contained in this layout.</summary>
+		/// <remarks>For internal use only. This API can be changed or removed without notice at any time.</remarks>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public IReadOnlyList<Element> Children => LogicalChildrenInternal;


Isn't it a good opportunity to enable #nullable for modified properties? It's always so frustrating to guess if something can or cannot be null.

mattleibow

A quick toilet review 😉

src/Controls/src/Core/InputTransparentContainerElement.cs

src/Controls/src/Core/LegacyLayouts/Layout.cs

src/Controls/src/Core/ContentPresenter.cs

PureWeen · 2025-07-13T22:54:21Z

/rebase

…d modernize layout system Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>

# Conflicts: # src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt

… a modal

…view to measure/layout correctly

PureWeen · 2025-07-17T04:50:42Z

Moved PR to here

…d modernize layout system Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>

…d modernize layout system Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com> # Conflicts: # src/Compatibility/Core/src/iOS/Renderers/CarouselPageRenderer.cs # src/Controls/src/Core/Platform/Windows/FormsListView.cs

…MAUI controls (#30672) * Initial plan * Copy all changes from PR #29281 - Remove CarouselPage dependencies and modernize layout system Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com> # Conflicts: # src/Compatibility/Core/src/iOS/Renderers/CarouselPageRenderer.cs # src/Controls/src/Core/Platform/Windows/FormsListView.cs * - Fix Compatibility # Conflicts: # src/Controls/src/Core/ClippedToBoundsElement.cs # src/Controls/src/Core/ContentPresenter.cs # src/Controls/src/Core/IClippedToBoundsElement.cs # src/Controls/src/Core/InputTransparentContainerElement.cs # Conflicts: # src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt # src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt * Update ScrollViewHandler.Android.cs * - fix compat tests * - fixes based on comments * - address comments and fix txt file * no need for this * - remove redundant if statements * - fix unshipped files * - fix windows --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Jakub Florkowski <kubaflo123@gmail.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>

jfversluis added t/breaking 💥 area-layout StackLayout, GridLayout, ContentView, AbsoluteLayout, FlexLayout, ContentPresenter labels May 1, 2025

jfversluis added this to the .NET 10.0-preview5 milestone May 1, 2025

jfversluis requested a review from PureWeen May 1, 2025 19:17

jfversluis commented May 1, 2025

View reviewed changes

src/Controls/src/Core/IClippedToBoundsElement.cs Outdated Show resolved Hide resolved

jsuarezruiz previously approved these changes May 2, 2025

View reviewed changes

src/Controls/src/Core/ClippedToBoundsElement.cs Show resolved Hide resolved

jfversluis dismissed jsuarezruiz’s stale review via 77951ce May 2, 2025 10:23

jfversluis force-pushed the remove-compat-layout-net10 branch from c4000a5 to a3468ba Compare May 2, 2025 12:19

albyrock87 reviewed May 2, 2025

View reviewed changes

src/Controls/src/Core/LegacyLayouts/Layout.cs Show resolved Hide resolved

src/Controls/src/Core/RefreshView/RefreshView.cs Outdated Show resolved Hide resolved

src/Controls/src/Core/ScrollView/ScrollView.cs Outdated Show resolved Hide resolved

jsuarezruiz reviewed May 5, 2025

View reviewed changes

PureWeen modified the milestones: .NET 10.0-preview5, .NET 10.0-preview6 Jun 10, 2025

PureWeen force-pushed the remove-compat-layout-net10 branch from a3468ba to 985ff86 Compare June 10, 2025 21:27

PureWeen requested a review from mattleibow June 10, 2025 22:16

PureWeen previously requested changes Jun 10, 2025

View reviewed changes

src/Controls/src/Core/ScrollView/ScrollView.cs Outdated Show resolved Hide resolved

MartyIX reviewed Jun 11, 2025

View reviewed changes

mattleibow previously requested changes Jun 11, 2025

View reviewed changes

src/Controls/src/Core/InputTransparentContainerElement.cs Outdated Show resolved Hide resolved

src/Controls/src/Core/LegacyLayouts/Layout.cs Show resolved Hide resolved

src/Controls/src/Core/ContentPresenter.cs Outdated Show resolved Hide resolved

PureWeen force-pushed the remove-compat-layout-net10 branch from bc05887 to a5780b2 Compare June 11, 2025 17:28

PureWeen mentioned this pull request Jun 18, 2025

Add overrides to Help with Obsoleting Compatibility.Layout #30058

Merged

PureWeen force-pushed the remove-compat-layout-net10 branch 2 times, most recently from fa29135 to 58b2dd0 Compare June 23, 2025 22:15

PureWeen changed the title ~~Remove Compatibility.Layout as a subclass of all modern .NET MAUI controls~~ Further remove dependency of Compatibility.Layout on all modern .NET MAUI controls Jun 23, 2025

PureWeen requested review from albyrock87 and mattleibow June 23, 2025 23:20

PureWeen marked this pull request as ready for review June 25, 2025 01:55

PureWeen requested a review from a team as a code owner June 25, 2025 01:55

PureWeen requested review from PureWeen and removed request for albyrock87 June 25, 2025 01:55

github-actions bot force-pushed the remove-compat-layout-net10 branch from f143719 to 647926d Compare July 13, 2025 22:55

PureWeen force-pushed the remove-compat-layout-net10 branch 2 times, most recently from 0f2420c to 53fb5cf Compare July 17, 2025 04:13

PureWeen mentioned this pull request Jul 17, 2025

Further remove dependency of Compatibility.Layout on all modern .NET MAUI controls #30672

Merged

Copilot AI added a commit that referenced this pull request Jul 17, 2025

Copy all changes from PR #29281 - Remove CarouselPage dependencies an…

6d39be1

…d modernize layout system Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>

PureWeen added a commit that referenced this pull request Jul 17, 2025

Copy all changes from PR #29281 - Remove CarouselPage dependencies an…

ae74da4

…d modernize layout system Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>

PureWeen added 14 commits July 16, 2025 23:42

- fix timing on Disconnecting CV

f3dad9c

- fix empty view layout

484afeb

- force measure and arrange call

5c9669b

- fix legacy tests

4d228fa

- set frame if emptyview is just text

013f34f

Update ItemsViewController2.cs

541ff3d

- fix test

0b75c19

- make sure to invalidate measure when the content is swapped out

b0cc1d8

- fix appearing from firing when the content page has been covered by…

eaa985c

… a modal

- update with latest titleview images for better test and fix refresh…

f0c14f6

…view to measure/layout correctly

- adjust refreshview screen shot for new measure code

5f4935b

- shipped text fixes

adc9511

- fix

c4439d0

PureWeen force-pushed the remove-compat-layout-net10 branch from 53fb5cf to c4439d0 Compare July 17, 2025 04:42

PureWeen closed this Jul 17, 2025

PureWeen deleted the remove-compat-layout-net10 branch July 17, 2025 04:51

PureWeen added a commit that referenced this pull request Jul 17, 2025

Copy all changes from PR #29281 - Remove CarouselPage dependencies an…

7b94bab

…d modernize layout system Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>

github-actions bot locked and limited conversation to collaborators Aug 16, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Further remove dependency of Compatibility.Layout on all modern .NET MAUI controls#29281

Further remove dependency of Compatibility.Layout on all modern .NET MAUI controls#29281
jfversluis wants to merge 14 commits intonet10.0from
remove-compat-layout-net10

jfversluis commented May 1, 2025 •

edited by PureWeen

Loading

Uh oh!

jfversluis commented May 1, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jsuarezruiz left a comment

Uh oh!

PureWeen commented Jun 10, 2025

Uh oh!

Uh oh!

MartyIX Jun 11, 2025 •

edited

Loading

Uh oh!

mattleibow left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

PureWeen commented Jul 13, 2025

Uh oh!

PureWeen commented Jul 17, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

jfversluis commented May 1, 2025 • edited by PureWeen Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of Change

Issues Fixed

Uh oh!

jfversluis commented May 1, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jsuarezruiz left a comment

Choose a reason for hiding this comment

Uh oh!

PureWeen commented Jun 10, 2025

Uh oh!

Uh oh!

MartyIX Jun 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mattleibow left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

PureWeen commented Jul 13, 2025

Uh oh!

PureWeen commented Jul 17, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

jfversluis commented May 1, 2025 •

edited by PureWeen

Loading

MartyIX Jun 11, 2025 •

edited

Loading