Restore & obsolete Windows MauiWebView ctor (#15541)

* Restore & obsolete Windows MauiWebView ctor * Reinstate functionality for obsoleted ctor
dotnet · Jun 12, 2023 · c34957a · c34957a
1 parent 81d2406
commit c34957a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 19 deletions.
diff --git a/src/Core/src/Platform/Windows/MauiWebView.cs b/src/Core/src/Platform/Windows/MauiWebView.cs
@@ -11,27 +11,20 @@ public class MauiWebView : WebView2, IWebViewDelegate
 	{
 		readonly WeakReference<WebViewHandler> _handler;
 
+		[Obsolete("Constructor is no longer used, please use an overloaded version.")]
+#pragma warning disable CS8618
+		public MauiWebView()
+		{
+			SetupPlatformEvents();
+		}
+#pragma warning restore CS8618
+
 		public MauiWebView(WebViewHandler handler)
 		{
 			ArgumentNullException.ThrowIfNull(handler, nameof(handler));
 			_handler = new WeakReference<WebViewHandler>(handler);
 
-			NavigationStarting += (sender, args) =>
-			{
-				// Auto map local virtual app dir host, e.g. if navigating back to local site from a link to an external site
-				if (args?.Uri?.ToLowerInvariant().StartsWith(LocalScheme.TrimEnd('/').ToLowerInvariant()) == true)
-				{
-					CoreWebView2.SetVirtualHostNameToFolderMapping(
-						LocalHostName,
-						ApplicationPath,
-						Web.WebView2.Core.CoreWebView2HostResourceAccessKind.Allow);
-				}
-				// Auto unmap local virtual app dir host if navigating to any other potentially unsafe domain
-				else
-				{
-					CoreWebView2.ClearVirtualHostNameToFolderMapping(LocalHostName);
-				}
-			};
+			SetupPlatformEvents();
 		}
 
 		WebView2? _internalWebView;
@@ -132,7 +125,7 @@ public async void LoadUrl(string? url)
 				uri = new Uri(LocalScheme + url, UriKind.RelativeOrAbsolute);
 			}
 
-			if (_handler.TryGetTarget(out var handler))
+			if (_handler?.TryGetTarget(out var handler) ?? false)
 				await handler.SyncPlatformCookies(uri.AbsoluteUri);
 
 			try
@@ -144,5 +137,25 @@ public async void LoadUrl(string? url)
 				Debug.WriteLine(nameof(MauiWebView), $"Failed to load: {uri} {exc}");
 			}
 		}
+
+		void SetupPlatformEvents()
+		{
+			NavigationStarting += (sender, args) =>
+			{
+				// Auto map local virtual app dir host, e.g. if navigating back to local site from a link to an external site
+				if (args?.Uri?.ToLowerInvariant().StartsWith(LocalScheme.TrimEnd('/').ToLowerInvariant()) == true)
+				{
+					CoreWebView2.SetVirtualHostNameToFolderMapping(
+						LocalHostName,
+						ApplicationPath,
+						Web.WebView2.Core.CoreWebView2HostResourceAccessKind.Allow);
+				}
+				// Auto unmap local virtual app dir host if navigating to any other potentially unsafe domain
+				else
+				{
+					CoreWebView2.ClearVirtualHostNameToFolderMapping(LocalHostName);
+				}
+			};
+		}
 	}
 }
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -43,5 +43,4 @@ static Microsoft.Maui.PropertyMapperExtensions.ModifyMapping<TVirtualView, TView
 static Microsoft.Maui.PropertyMapperExtensions.PrependToMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.IPropertyMapper<Microsoft.Maui.IElement!, Microsoft.Maui.IElementHandler!>! propertyMapper, string! key, System.Action<TViewHandler, TVirtualView>! method) -> void
 static Microsoft.Maui.PropertyMapperExtensions.ReplaceMapping<TVirtualView, TViewHandler>(this Microsoft.Maui.IPropertyMapper<Microsoft.Maui.IElement!, Microsoft.Maui.IElementHandler!>! propertyMapper, string! key, System.Action<TViewHandler, TVirtualView>! method) -> void
 static Microsoft.Maui.SizeRequest.operator !=(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
-static Microsoft.Maui.SizeRequest.operator ==(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool
-*REMOVED*Microsoft.Maui.Platform.MauiWebView.MauiWebView() -> void
+static Microsoft.Maui.SizeRequest.operator ==(Microsoft.Maui.SizeRequest left, Microsoft.Maui.SizeRequest right) -> bool