[X] simpilfy and avoid duplication in conversion #7143
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
Simplify, and unify in a single place, the way we look for TypeConverters on BP, properties, and type. Remove a unused IValueProvider, fix code here and there
| @@ -6,9 +6,7 @@ | |||
| namespace Microsoft.Maui.Controls | |||
| { | |||
| /// <include file="../../../docs/Microsoft.Maui.Controls/PropertyCondition.xml" path="Type[@FullName='Microsoft.Maui.Controls.PropertyCondition']/Docs" /> | |||
| [ProvideCompiled("Microsoft.Maui.Controls.XamlC.PassthroughValueProvider")] | |||
| [AcceptEmptyServiceProvider] | |||
| public sealed class PropertyCondition : Condition, IValueProvider | |||
There was a problem hiding this comment.
no longer need to be IValueProvider (value conversion is done when setting the properties)
| if (converterException != null && _hasdark) | ||
| binding.Dark = Dark.ConvertTo(propertyType, minforetriever, serviceProvider, out converterException); | ||
| if (converterException != null && _hasdefault) | ||
| binding.Default = Default.ConvertTo(propertyType, minforetriever, serviceProvider, out converterException); |
There was a problem hiding this comment.
this block was never executed
mattleibow
approved these changes
Jun 2, 2022
Eilon
added a commit
that referenced
this pull request
Aug 8, 2022
In this PR: #7143 Some code was removed that sets 'propertyType' based on some logic. That code is now gone and 'propertyType' is always null, which later causes a NullRef here: Microsoft.Maui.Controls.Xaml.TypeConversionExtensions.ConvertTo(object value = ...value.., System.Type toType = null, System.Func<System.ComponentModel.TypeConverter> getConverter = {Method = {System.Reflection.RuntimeMethodInfo}}, System.IServiceProvider serviceProvider = {Microsoft.Maui.Controls.Xaml.Internals.XamlServiceProvider}, out System.Exception exception = null) Line 275
mattleibow
added a commit
that referenced
this pull request
Aug 9, 2022
This reverts commit b8ec9fb.
mattleibow
added a commit
that referenced
this pull request
Aug 9, 2022
Simplify, and unify in a single place, the way we look for TypeConverters on BP, properties, and type. Remove a unused IValueProvider, fix code here and there Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
|
Cherry picked to a new branch awaiting the XAML healer: https://github.com/dotnet/maui/tree/dev/reland-7143 |
Eilon
added
the
t/perf
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
Simplify, and unify in a single place, the way we look for
TypeConverters on BP, properties, and type.
Remove a unused IValueProvider, fix code here and there