Skip to content

Platform View to ViewModel location provider #2824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dansiegel merged 2 commits into from
Feb 21, 2023
Merged

Platform View to ViewModel location provider #2824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
033773e
feat: Platform View to ViewModel location provider
dansiegel Feb 20, 2023
2948351
chore: add missing xml docs
dansiegel Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
148 changes: 0 additions & 148 deletions src/Maui/Prism.Maui/Mvvm/ViewModelLocationProvider2.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/Maui/Prism.Maui/Mvvm/ViewModelLocator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ internal static void Autowire(object view)
Autowire(navigationPage.RootPage);
}

ViewModelLocationProvider2.AutoWireViewModelChanged(view, Bind);
ViewModelLocationProvider.AutoWireViewModelChanged(view, Bind);

if (view is BindableObject bindable && bindable.BindingContext is null)
bindable.BindingContext = new object();
Expand Down
6 changes: 3 additions & 3 deletions src/Maui/Prism.Maui/PrismAppBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ internal PrismAppBuilder(IContainerExtension containerExtension, MauiAppBuilder

private void ConfigureViewModelLocator()
{
ViewModelLocationProvider2.SetDefaultViewToViewModelTypeResolver(view =>
ViewModelLocationProvider.SetDefaultViewToViewModelTypeResolver(view =>
{
if (view is not BindableObject bindable)
return null;

return bindable.GetValue(ViewModelLocator.ViewModelProperty) as Type;
});

ViewModelLocationProvider2.SetDefaultViewModelFactory(DefaultViewModelLocator);
ViewModelLocationProvider.SetDefaultViewModelFactory(DefaultViewModelLocator);
}

internal static object DefaultViewModelLocator(object view, Type viewModelType)
Expand Down Expand Up @@ -183,7 +183,7 @@ public PrismAppBuilder OnAppStart(Func<IContainerProvider, INavigationService, T
/// </summary>
public PrismAppBuilder ConfigureDefaultViewModelFactory(Func<IContainerProvider, object, Type, object> viewModelFactory)
{
ViewModelLocationProvider2.SetDefaultViewModelFactory((view, type) =>
ViewModelLocationProvider.SetDefaultViewModelFactory((view, type) =>
{
if (view is not BindableObject bindable)
return null;
Expand Down
16 changes: 14 additions & 2 deletions src/Prism.Core/Mvvm/ViewModelLocationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ private static Type DefaultViewTypeToViewModel(Type viewType)
return Type.GetType(viewModelName);
}

static Func<object, Type> _defaultViewToViewModelTypeResolver = view => null;

/// <summary>
/// Sets the default view model factory.
/// </summary>
Expand Down Expand Up @@ -95,6 +97,13 @@ public static void SetDefaultViewTypeToViewModelTypeResolver(Func<Type, Type> vi
_defaultViewTypeToViewModelTypeResolver = viewTypeToViewModelTypeResolver;
}

/// <summary>
/// Sets the default ViewModel Type Resolver given the View instance. This can be used to evaluate the View for
/// custom attributes or Attached Properties to determine the ViewModel Type.
/// </summary>
public static void SetDefaultViewToViewModelTypeResolver(Func<object, Type> viewToViewModelTypeResolver) =>
Comment thread
dansiegel marked this conversation as resolved.
_defaultViewToViewModelTypeResolver = viewToViewModelTypeResolver;

/// <summary>
/// Automatically looks up the viewmodel that corresponds to the current view, using two strategies:
/// It first looks to see if there is a mapping registered for that view, if not it will fallback to the convention based approach.
Expand All @@ -109,9 +118,13 @@ public static void AutoWireViewModelChanged(object view, Action<object, object>
// try to use ViewModel type
if (viewModel == null)
{
//check type mappings
// check type mappings
var viewModelType = GetViewModelTypeForView(view.GetType());

// check platform View to ViewModel resolver
if (viewModelType == null)
viewModelType = _defaultViewToViewModelTypeResolver(view);

// fallback to convention based
if (viewModelType == null)
viewModelType = _defaultViewTypeToViewModelTypeResolver(view.GetType());
Expand All @@ -122,7 +135,6 @@ public static void AutoWireViewModelChanged(object view, Action<object, object>
viewModel = _defaultViewModelFactoryWithViewParameter != null ? _defaultViewModelFactoryWithViewParameter(view, viewModelType) : _defaultViewModelFactory(viewModelType);
}


setDataContextCallback(view, viewModel);
}

Expand Down