Moved GetPlatformSize logic into a new service
#4885
Merged
Conversation
This file contains 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
mattleibow
commented
Feb 24, 2022
Comment on lines
269
to
275
| else if ((visualElementRenderer == null || visualElementRenderer is HandlerToRendererShim) && view is IView iView) | ||
| { | ||
| Application.Current?.FindMauiContext()?.CreateLogger<Platform>()?.LogWarning( | ||
| "Someone called Platform.GetNativeSize instead of going through the Handler."); | ||
|
|
||
| returnValue = iView.Handler.GetDesiredSize(widthConstraint, heightConstraint); | ||
| } |
There was a problem hiding this comment.
Keeping this chunk of code here for "just in case", but this code path should never be hit because this service is obsolete and could co away at any time. All callers need to check the handler before using ths service so a removal of renderers/compat is a seamless operation.
Comment on lines
136
to
+143
| if (IndicatorTemplate == null) | ||
| return Device.PlatformServices.GetPlatformSize(this, widthConstraint, heightConstraint); | ||
| { | ||
| if (Handler != null) | ||
| return new SizeRequest(Handler.GetDesiredSize(widthConstraint, heightConstraint)); | ||
|
|
||
| _platformSizeService ??= DependencyService.Get<IPlatformSizeService>(); | ||
| return _platformSizeService.GetPlatformSize(this, widthConstraint, heightConstraint); | ||
| } |
There was a problem hiding this comment.
This is the example of first checking the handler before using the compat service. Using this, the renderer checks should never even be fetched.
Comment on lines
-288
to
+294
| return Device.PlatformServices.GetPlatformSize(this, widthConstraint, heightConstraint); | ||
| if (Handler != null) | ||
| return new SizeRequest(Handler.GetDesiredSize(widthConstraint, heightConstraint)); | ||
|
|
||
| _platformSizeService ??= DependencyService.Get<IPlatformSizeService>(); | ||
| return _platformSizeService.GetPlatformSize(this, widthConstraint, heightConstraint); |
There was a problem hiding this comment.
Another case of checking the handler before renderers.
Comment on lines
-913
to
+919
| return Device.PlatformServices.GetPlatformSize(this, widthConstraint, heightConstraint); | ||
| if (Handler != null) | ||
| return new SizeRequest(Handler.GetDesiredSize(widthConstraint, heightConstraint)); | ||
|
|
||
| _platformSizeService ??= DependencyService.Get<IPlatformSizeService>(); | ||
| return _platformSizeService.GetPlatformSize(this, widthConstraint, heightConstraint); |
There was a problem hiding this comment.
Last and base occurence of the Handler first before Renderer touches.
Comment on lines
-77
to
-87
| [SetUp] | ||
| public void Setup() | ||
| { | ||
| Device.PlatformServices = new MockPlatformServices(); | ||
| } | ||
|
|
||
| [TearDown] | ||
| public void TearDown() | ||
| { | ||
| Device.PlatformServices = null; | ||
| } |
There was a problem hiding this comment.
Removed the rendant logic as BaseTestFixture does all this.
27 tasks
hartez
approved these changes
Feb 24, 2022
samhouts
added
the
migration-compatibility
samhouts
added
the
fixed-in-6.0.200-preview.14.2
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Description of Change
This PR is basically removing the
IPlatformServices.GetPlatformSizemember and moving it into a new, separate service.However, this one also makes a change to further split the renderers out of the common path. Previously,
IPlatformServices.GetPlatformSizewas basically a "proxy" for calling the CompatPlatform.GetNativeSize. When we introduced handlers, we just kept things as they were and added aif handler, then measure with handlerchunk of code.This is "fine", but basically makes a hard dependency of all code on compatibility and first assumes renderer logic and then works with handlers. This PR includes a small change to first check the handlers from Controls, and then tries to use the service and Compat.
Part of #1965
Fixes #3949
Additions made
IPlatformServices.GetPlatformSizePR Checklist
Does this PR touch anything that might affect accessibility?
If any of the above checkboxes apply to your PR, then the PR will need to provide testing to demonstrate that accessibility still works.