From 19d1e07dc56ffbadf0e32ae5ea2963ab0e238305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez=20Ruiz?= <javiersuarezruiz@hotmail.com>
Date: Mon, 9 May 2022 13:25:09 +0200
Subject: [PATCH] Use IPropertyMapper in some pending handlers

---
 src/Core/src/Handlers/IndicatorView/IndicatorViewHandler.cs   | 4 ++--
 src/Core/src/Handlers/NavigationPage/NavigationViewHandler.cs | 4 ++--
 src/Core/src/Handlers/RefreshView/RefreshViewHandler.cs       | 4 ++--
 src/Core/src/Handlers/WebView/WebViewHandler.cs               | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Core/src/Handlers/IndicatorView/IndicatorViewHandler.cs b/src/Core/src/Handlers/IndicatorView/IndicatorViewHandler.cs
index b525a717ac6f..aecb2c2a9b59 100644
--- a/src/Core/src/Handlers/IndicatorView/IndicatorViewHandler.cs
+++ b/src/Core/src/Handlers/IndicatorView/IndicatorViewHandler.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Maui.Handlers
 {
 	public partial class IndicatorViewHandler : IIndicatorViewHandler
 	{
-		public static PropertyMapper<IIndicatorView, IIndicatorViewHandler> Mapper = new(ViewMapper)
+		public static IPropertyMapper<IIndicatorView, IIndicatorViewHandler> Mapper = new PropertyMapper<IIndicatorView, IIndicatorViewHandler>(ViewMapper)
 		{
 			[nameof(IIndicatorView.Count)] = MapCount,
 			[nameof(IIndicatorView.Position)] = MapPosition,
@@ -36,7 +36,7 @@ public IndicatorViewHandler() : base(Mapper)
 		{
 		}
 
-		public IndicatorViewHandler(PropertyMapper mapper) : base(mapper ?? Mapper)
+		public IndicatorViewHandler(IPropertyMapper mapper) : base(mapper ?? Mapper)
 		{
 		}
 
diff --git a/src/Core/src/Handlers/NavigationPage/NavigationViewHandler.cs b/src/Core/src/Handlers/NavigationPage/NavigationViewHandler.cs
index 338aab266904..fe31c5a285d2 100644
--- a/src/Core/src/Handlers/NavigationPage/NavigationViewHandler.cs
+++ b/src/Core/src/Handlers/NavigationPage/NavigationViewHandler.cs
@@ -15,7 +15,7 @@ namespace Microsoft.Maui.Handlers
 {
 	public partial class NavigationViewHandler : INavigationViewHandler
 	{
-		public static PropertyMapper<IStackNavigationView, INavigationViewHandler> Mapper = new(ViewMapper)
+		public static IPropertyMapper<IStackNavigationView, INavigationViewHandler> Mapper = new PropertyMapper<IStackNavigationView, INavigationViewHandler>(ViewMapper)
 		{
 		};
 
@@ -28,7 +28,7 @@ public NavigationViewHandler() : base(Mapper, CommandMapper)
 		{
 		}
 
-		public NavigationViewHandler(PropertyMapper? mapper = null) : base(mapper ?? Mapper, CommandMapper)
+		public NavigationViewHandler(IPropertyMapper? mapper = null) : base(mapper ?? Mapper, CommandMapper)
 		{
 		}
 
diff --git a/src/Core/src/Handlers/RefreshView/RefreshViewHandler.cs b/src/Core/src/Handlers/RefreshView/RefreshViewHandler.cs
index 665363ce21ee..5402ded7253f 100644
--- a/src/Core/src/Handlers/RefreshView/RefreshViewHandler.cs
+++ b/src/Core/src/Handlers/RefreshView/RefreshViewHandler.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Maui.Handlers
 {
 	public partial class RefreshViewHandler : IRefreshViewHandler
 	{
-		public static PropertyMapper<IRefreshView, IRefreshViewHandler> Mapper = new PropertyMapper<IRefreshView, IRefreshViewHandler>(ViewHandler.ViewMapper)
+		public static IPropertyMapper<IRefreshView, IRefreshViewHandler> Mapper = new PropertyMapper<IRefreshView, IRefreshViewHandler>(ViewHandler.ViewMapper)
 		{
 			[nameof(IRefreshView.IsRefreshing)] = MapIsRefreshing,
 			[nameof(IRefreshView.Content)] = MapContent,
@@ -31,7 +31,7 @@ public RefreshViewHandler() : base(Mapper, CommandMapper)
 		{
 		}
 
-		public RefreshViewHandler(PropertyMapper? mapper = null) : base(mapper ?? Mapper)
+		public RefreshViewHandler(IPropertyMapper? mapper = null) : base(mapper ?? Mapper)
 		{
 		}
 
diff --git a/src/Core/src/Handlers/WebView/WebViewHandler.cs b/src/Core/src/Handlers/WebView/WebViewHandler.cs
index b21dd79a26e7..1aca40419da9 100644
--- a/src/Core/src/Handlers/WebView/WebViewHandler.cs
+++ b/src/Core/src/Handlers/WebView/WebViewHandler.cs
@@ -20,7 +20,7 @@ namespace Microsoft.Maui.Handlers
 {
 	public partial class WebViewHandler : IWebViewHandler
 	{
-		public static PropertyMapper<IWebView, IWebViewHandler> Mapper = new PropertyMapper<IWebView, IWebViewHandler>(ViewHandler.ViewMapper)
+		public static IPropertyMapper<IWebView, IWebViewHandler> Mapper = new PropertyMapper<IWebView, IWebViewHandler>(ViewHandler.ViewMapper)
 		{
 			[nameof(IWebView.Source)] = MapSource,
 #if __ANDROID__