[Catalyst] Allow to use a custom WKUIDelegate on WebView

src/Controls/samples/Controls.Sample/MauiProgram.cs

@@ -17,6 +17,7 @@
 using Microsoft.Maui.Foldable;
 using Microsoft.Maui.Hosting;
 using Microsoft.Maui.LifecycleEvents;
+
 #if COMPATIBILITY_ENABLED
 using Microsoft.Maui.Controls.Compatibility.Hosting;
 #endif
@@ -288,6 +289,19 @@ static bool LogEvent(string eventName, string? type = null)
 				}
 			});
 
+#if MACCATALYST
+			Microsoft.Maui.Handlers.WebViewHandler.Mapper.Add(nameof(WebKit.WKUIDelegate), (handler, view) =>
+			{
+				if (UIKit.UIDevice.CurrentDevice.CheckSystemVersion(15, 0))
+				{
+					MainThread.BeginInvokeOnMainThread(() =>
+					{
+						handler.PlatformView.UIDelegate = new Platforms.MacCatalyst.CustomWebViewUIDelegate();
+					});
+				}
+			});
+#endif
+
 			return appBuilder.Build();
 		}
 	}

src/Controls/samples/Controls.Sample/Pages/Controls/WebViewGalleries/WebViewGallery.cs

@@ -0,0 +1,25 @@
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample.Pages.WebViewGalleries
+{
+	public class WebViewGallery : ContentPage
+	{
+		public WebViewGallery()
+		{
+			Content = new ScrollView
+			{
+				Content = new StackLayout
+				{
+					Spacing = 5,
+					Children =
+					{
+						GalleryBuilder.NavButton("WebView Playground", () => new WebViewPlayground(), Navigation),
+#if MACCATALYST
+						GalleryBuilder.NavButton("WebView using a custom UIDelegate", () => new WebViewUIDelegatePage(), Navigation),
+#endif
+					}
+				}
+			};
+		}
+	}
+}

src/Controls/samples/Controls.Sample/Pages/Controls/WebViewPage.xaml → src/Controls/samples/Controls.Sample/Pages/Controls/WebViewGalleries/WebViewPlayground.xaml

@@ -1,7 +1,7 @@
 <views:BasePage
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Maui.Controls.Sample.Pages.WebViewPage"
+    x:Class="Maui.Controls.Sample.Pages.WebViewGalleries.WebViewPlayground"
     xmlns:views="clr-namespace:Maui.Controls.Sample.Pages.Base"
     Title="WebView">
     <views:BasePage.Content>

src/Controls/samples/Controls.Sample/Pages/Controls/WebViewPage.xaml.cs → src/Controls/samples/Controls.Sample/Pages/Controls/WebViewGalleries/WebViewPlayground.xaml.cs

@@ -7,11 +7,11 @@
 using Microsoft.Maui.Devices;
 using Microsoft.Maui.Storage;
 
-namespace Maui.Controls.Sample.Pages
+namespace Maui.Controls.Sample.Pages.WebViewGalleries
 {
-	public partial class WebViewPage
+	public partial class WebViewPlayground
 	{
-		public WebViewPage()
+		public WebViewPlayground()
 		{
 			InitializeComponent();
 		}

src/Controls/samples/Controls.Sample/Pages/Controls/WebViewGalleries/WebViewUIDelegatePage.xaml

@@ -0,0 +1,15 @@
+<views:BasePage
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Maui.Controls.Sample.Pages.WebViewGalleries.WebViewUIDelegatePage"
+    xmlns:views="clr-namespace:Maui.Controls.Sample.Pages.Base"
+    Title="WebView">
+    <views:BasePage.Content>
+        <AbsoluteLayout>
+            <WebView 
+                x:Name="DelegateWebView" 
+                AbsoluteLayout.LayoutBounds="0,0,1,1"
+                AbsoluteLayout.LayoutFlags="SizeProportional" />
+        </AbsoluteLayout>
+    </views:BasePage.Content>
+</views:BasePage>

src/Controls/samples/Controls.Sample/Pages/Controls/WebViewGalleries/WebViewUIDelegatePage.xaml.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace Maui.Controls.Sample.Pages.WebViewGalleries
+{
+	public partial class WebViewUIDelegatePage
+	{
+		public WebViewUIDelegatePage()
+		{
+			InitializeComponent();
+
+			DelegateWebView.Source = new Uri("https://webrtc.github.io/samples/src/content/getusermedia/gum/");
+		}
+	}
+}

src/Controls/samples/Controls.Sample/Platforms/MacCatalyst/CustomWebViewUIDelegate.cs

@@ -0,0 +1,25 @@
+using System;
+using Foundation;
+using WebKit;
+
+
+namespace Maui.Controls.Sample.Platforms.MacCatalyst
+{
+	public class CustomWebViewUIDelegate : WKUIDelegate
+	{
+		public CustomWebViewUIDelegate()
+		{
+
+		}
+
+		[Export("webView:requestMediaCapturePermissionForOrigin:initiatedByFrame:type:decisionHandler:")]
+		public override void RequestMediaCapturePermission(WKWebView webView, WKSecurityOrigin origin, WKFrameInfo frame, WKMediaCaptureType type, Action<WKPermissionDecision> decisionHandler)
+		{
+			decisionHandler(WKPermissionDecision.Grant);
+		}
+		public override void RequestDeviceOrientationAndMotionPermission(WKWebView webView, WKSecurityOrigin origin, WKFrameInfo frame, Action<WKPermissionDecision> decisionHandler)
+		{
+			base.RequestDeviceOrientationAndMotionPermission(webView, origin, frame, decisionHandler);
+		}
+	}
+}

src/Controls/samples/Controls.Sample/ViewModels/ControlsViewModel.cs

@@ -2,6 +2,7 @@
 using Maui.Controls.Sample.Models;
 using Maui.Controls.Sample.Pages;
 using Maui.Controls.Sample.ViewModels.Base;
+using Maui.Controls.Sample.Pages.WebViewGalleries;
 
 namespace Maui.Controls.Sample.ViewModels
 {
@@ -87,7 +88,7 @@ public class ControlsViewModel : BaseGalleryViewModel
 			new SectionModel(typeof(TimePickerPage), "TimePicker",
 				"A view that allows the user to select a time."),
 
-			new SectionModel(typeof(WebViewPage), "WebView",
+			new SectionModel(typeof(WebViewGallery), "WebView",
 				"WebView is a view for displaying web and HTML content in your app.")
 		};
 	}

src/Core/src/Handlers/WebView/WebViewHandler.cs

@@ -12,7 +12,7 @@
 
 #if __ANDROID__
 using Android.Webkit;
-#elif __IOS__
+#elif __IOS__ || MACCATALYST
 using WebKit;
 #endif
 
@@ -28,7 +28,7 @@ public partial class WebViewHandler : IWebViewHandler
 			[nameof(WebViewClient)] = MapWebViewClient,
 			[nameof(WebChromeClient)] = MapWebChromeClient,
 			[nameof(WebView.Settings)] =  MapWebViewSettings
-#elif __IOS__
+#elif __IOS__ || MACCATALYST
 			[nameof(WKUIDelegate)] = MapWKUIDelegate,
 #endif
 		};