diff --git a/eng/devices/windows.cake b/eng/devices/windows.cake
index 76741497c1e8..a64592128e97 100644
--- a/eng/devices/windows.cake
+++ b/eng/devices/windows.cake
@@ -205,7 +205,7 @@ Task("Test")
.IsDependentOn("SetupTestPaths")
.Does(() =>
{
- var waitForResultTimeoutInSeconds = 120;
+ var waitForResultTimeoutInSeconds = 240;
CleanDirectories(TEST_RESULTS);
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/HybridWebViewPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/HybridWebViewPage.xaml
new file mode 100644
index 000000000000..78779691808a
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/HybridWebViewPage.xaml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/HybridWebViewPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/HybridWebViewPage.xaml.cs
new file mode 100644
index 000000000000..c25780f123b4
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/HybridWebViewPage.xaml.cs
@@ -0,0 +1,23 @@
+using System;
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample.Pages
+{
+ public partial class HybridWebViewPage
+ {
+ public HybridWebViewPage()
+ {
+ InitializeComponent();
+ }
+
+ private void SendMessageButton_Clicked(object sender, EventArgs e)
+ {
+ hwv.SendRawMessage("Hello from C#!");
+ }
+
+ private void hwv_RawMessageReceived(object sender, HybridWebViewRawMessageReceivedEventArgs e)
+ {
+ Dispatcher.Dispatch(() => statusLabel.Text += e.Message);
+ }
+ }
+}
diff --git a/src/Controls/samples/Controls.Sample/Resources/Raw/HybridSamplePage/docs/sample.pdf b/src/Controls/samples/Controls.Sample/Resources/Raw/HybridSamplePage/docs/sample.pdf
new file mode 100644
index 000000000000..f548cfbc6b3a
Binary files /dev/null and b/src/Controls/samples/Controls.Sample/Resources/Raw/HybridSamplePage/docs/sample.pdf differ
diff --git a/src/Controls/samples/Controls.Sample/Resources/Raw/HybridSamplePage/index.html b/src/Controls/samples/Controls.Sample/Resources/Raw/HybridSamplePage/index.html
new file mode 100644
index 000000000000..787d4dc3b9e0
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Resources/Raw/HybridSamplePage/index.html
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ Hybrid sample!
+
+
+
+
+
+ Message from C#:
+
+
+
+
diff --git a/src/Controls/samples/Controls.Sample/Resources/Raw/HybridSamplePage/scripts/HybridWebView.js b/src/Controls/samples/Controls.Sample/Resources/Raw/HybridSamplePage/scripts/HybridWebView.js
new file mode 100644
index 000000000000..bf41fe0a160b
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Resources/Raw/HybridSamplePage/scripts/HybridWebView.js
@@ -0,0 +1,48 @@
+function HybridWebViewInit() {
+
+ function DispatchHybridWebViewMessage(message) {
+ const event = new CustomEvent("HybridWebViewMessageReceived", { detail: { message: message } });
+ window.dispatchEvent(event);
+ }
+
+ if (window.chrome && window.chrome.webview) {
+ // Windows WebView2
+ window.chrome.webview.addEventListener('message', arg => {
+ DispatchHybridWebViewMessage(arg.data);
+ });
+ }
+ else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.webwindowinterop) {
+ // iOS and MacCatalyst WKWebView
+ window.external = {
+ "receiveMessage": message => {
+ DispatchHybridWebViewMessage(message);
+ }
+ };
+ }
+ else {
+ // Android WebView
+ window.addEventListener('message', arg => {
+ DispatchHybridWebViewMessage(arg.data);
+ });
+ }
+}
+
+window.HybridWebView = {
+ "SendRawMessage": function (message) {
+
+ if (window.chrome && window.chrome.webview) {
+ // Windows WebView2
+ window.chrome.webview.postMessage(message);
+ }
+ else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.webwindowinterop) {
+ // iOS and MacCatalyst WKWebView
+ window.webkit.messageHandlers.webwindowinterop.postMessage(message);
+ }
+ else {
+ // Android WebView
+ hybridWebViewHost.sendRawMessage(message);
+ }
+ }
+}
+
+HybridWebViewInit();
diff --git a/src/Controls/samples/Controls.Sample/Resources/Raw/HybridSamplePage/styles/app.css b/src/Controls/samples/Controls.Sample/Resources/Raw/HybridSamplePage/styles/app.css
new file mode 100644
index 000000000000..5e2f4852d638
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Resources/Raw/HybridSamplePage/styles/app.css
@@ -0,0 +1,10 @@
+button
+{
+ background-color: dodgerblue;
+ border-radius: 5px;
+ border-width: 1px;
+ color: white;
+ cursor: pointer;
+ margin: 6px;
+ text-align: center;
+}
diff --git a/src/Controls/samples/Controls.Sample/ViewModels/ControlsViewModel.cs b/src/Controls/samples/Controls.Sample/ViewModels/ControlsViewModel.cs
index 2f5b80819267..a30d6ffb6c84 100644
--- a/src/Controls/samples/Controls.Sample/ViewModels/ControlsViewModel.cs
+++ b/src/Controls/samples/Controls.Sample/ViewModels/ControlsViewModel.cs
@@ -39,6 +39,9 @@ protected override IEnumerable CreateItems() => new[]
new SectionModel(typeof(EntryPage), "Entry",
"The Entry control is used for single-line text input."),
+ new SectionModel(typeof(HybridWebViewPage), "HybridWebView",
+ "The HybridWebView control embeds web content locally and natively in an app."),
+
new SectionModel(typeof(ImagePage), "Image",
"Displays an image."),
diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
new file mode 100644
index 000000000000..382ab5e7cc66
--- /dev/null
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -0,0 +1,54 @@
+using System;
+
+namespace Microsoft.Maui.Controls
+{
+ ///
+ /// A that presents local HTML content in a web view and allows JavaScript and C# code to interop using messages.
+ ///
+ public class HybridWebView : View, IHybridWebView
+ {
+ /// Bindable property for .
+ public static readonly BindableProperty DefaultFileProperty =
+ BindableProperty.Create(nameof(DefaultFile), typeof(string), typeof(HybridWebView), defaultValue: "index.html");
+ /// Bindable property for .
+ public static readonly BindableProperty HybridRootProperty =
+ BindableProperty.Create(nameof(HybridRoot), typeof(string), typeof(HybridWebView), defaultValue: "wwwroot");
+
+
+ ///
+ /// Specifies the file within the that should be served as the default file. The
+ /// default value is index.html.
+ ///
+ public string? DefaultFile
+ {
+ get { return (string)GetValue(DefaultFileProperty); }
+ set { SetValue(DefaultFileProperty, value); }
+ }
+
+ ///
+ /// The path within the app's "Raw" asset resources that contain the web app's contents. For example, if the
+ /// files are located in [ProjectFolder]/Resources/Raw/hybrid_root, then set this property to "hybrid_root".
+ /// The default value is wwwroot, which maps to [ProjectFolder]/Resources/Raw/wwwroot.
+ ///
+ public string? HybridRoot
+ {
+ get { return (string)GetValue(HybridRootProperty); }
+ set { SetValue(HybridRootProperty, value); }
+ }
+
+ void IHybridWebView.RawMessageReceived(string rawMessage)
+ {
+ RawMessageReceived?.Invoke(this, new HybridWebViewRawMessageReceivedEventArgs(rawMessage));
+ }
+
+ ///
+ /// Raised when a raw message is received from the web view. Raw messages are strings that have no additional processing.
+ ///
+ public event EventHandler? RawMessageReceived;
+
+ public void SendRawMessage(string rawMessage)
+ {
+ Handler?.Invoke(nameof(IHybridWebView.SendRawMessage), rawMessage);
+ }
+ }
+}
diff --git a/src/Controls/src/Core/HybridWebView/HybridWebViewRawMessageReceivedEventArgs.cs b/src/Controls/src/Core/HybridWebView/HybridWebViewRawMessageReceivedEventArgs.cs
new file mode 100644
index 000000000000..d431303de8de
--- /dev/null
+++ b/src/Controls/src/Core/HybridWebView/HybridWebViewRawMessageReceivedEventArgs.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace Microsoft.Maui.Controls
+{
+ public class HybridWebViewRawMessageReceivedEventArgs : EventArgs
+ {
+ public HybridWebViewRawMessageReceivedEventArgs(string? message)
+ {
+ Message = message;
+ }
+
+ public string? Message { get; }
+ }
+}
diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 6ca2b95572bb..d463b309df62 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,4 +1,15 @@
#nullable enable
+Microsoft.Maui.Controls.HybridWebView
+Microsoft.Maui.Controls.HybridWebView.DefaultFile.get -> string?
+Microsoft.Maui.Controls.HybridWebView.DefaultFile.set -> void
+Microsoft.Maui.Controls.HybridWebView.HybridRoot.get -> string?
+Microsoft.Maui.Controls.HybridWebView.HybridRoot.set -> void
+Microsoft.Maui.Controls.HybridWebView.HybridWebView() -> void
+Microsoft.Maui.Controls.HybridWebView.RawMessageReceived -> System.EventHandler?
+Microsoft.Maui.Controls.HybridWebView.SendRawMessage(string! rawMessage) -> void
+Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs
+Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.HybridWebViewRawMessageReceivedEventArgs(string? message) -> void
+Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.Message.get -> string?
Microsoft.Maui.Controls.PlatformDragStartingEventArgs
Microsoft.Maui.Controls.PlatformDragStartingEventArgs.Sender.get -> Android.Views.View!
Microsoft.Maui.Controls.PlatformDragStartingEventArgs.MotionEvent.get -> Android.Views.MotionEvent!
@@ -73,6 +84,8 @@ Microsoft.Maui.Controls.TimeChangedEventArgs.NewTime.get -> System.TimeSpan
Microsoft.Maui.Controls.TimeChangedEventArgs.OldTime.get -> System.TimeSpan
Microsoft.Maui.Controls.TimeChangedEventArgs.TimeChangedEventArgs(System.TimeSpan oldTime, System.TimeSpan newTime) -> void
Microsoft.Maui.Controls.TimePicker.TimeSelected -> System.EventHandler
+static readonly Microsoft.Maui.Controls.HybridWebView.DefaultFileProperty -> Microsoft.Maui.Controls.BindableProperty!
+static readonly Microsoft.Maui.Controls.HybridWebView.HybridRootProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.KeyboardAccelerator.KeyProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.KeyboardAccelerator.ModifiersProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.DragGestureRecognizer.CanDragProperty -> Microsoft.Maui.Controls.BindableProperty!
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 044e4e82b5c5..ab4745457ee3 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,4 +1,15 @@
#nullable enable
+Microsoft.Maui.Controls.HybridWebView
+Microsoft.Maui.Controls.HybridWebView.DefaultFile.get -> string?
+Microsoft.Maui.Controls.HybridWebView.DefaultFile.set -> void
+Microsoft.Maui.Controls.HybridWebView.HybridRoot.get -> string?
+Microsoft.Maui.Controls.HybridWebView.HybridRoot.set -> void
+Microsoft.Maui.Controls.HybridWebView.HybridWebView() -> void
+Microsoft.Maui.Controls.HybridWebView.RawMessageReceived -> System.EventHandler?
+Microsoft.Maui.Controls.HybridWebView.SendRawMessage(string! rawMessage) -> void
+Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs
+Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.HybridWebViewRawMessageReceivedEventArgs(string? message) -> void
+Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.Message.get -> string?
override Microsoft.Maui.Controls.Handlers.Compatibility.CellRenderer.Invoke(string! command, object? args) -> void
override Microsoft.Maui.Controls.Handlers.Compatibility.CellRenderer.UpdateValue(string! property) -> void
override Microsoft.Maui.Controls.Handlers.Compatibility.ShellRenderer.PreferredStatusBarUpdateAnimation.get -> UIKit.UIStatusBarAnimation
@@ -89,6 +100,8 @@ override Microsoft.Maui.Controls.Platform.Compatibility.ShellFlyoutRenderer.Pref
override Microsoft.Maui.Controls.Platform.Compatibility.ShellFlyoutRenderer.PrefersHomeIndicatorAutoHidden.get -> bool
override Microsoft.Maui.Controls.Platform.Compatibility.ShellFlyoutRenderer.PrefersStatusBarHidden() -> bool
override Microsoft.Maui.Controls.Platform.Compatibility.ShellSectionRenderer.ViewDidAppear(bool animated) -> void
+static readonly Microsoft.Maui.Controls.HybridWebView.DefaultFileProperty -> Microsoft.Maui.Controls.BindableProperty!
+static readonly Microsoft.Maui.Controls.HybridWebView.HybridRootProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.KeyboardAccelerator.KeyProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.KeyboardAccelerator.ModifiersProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.DragGestureRecognizer.CanDragProperty -> Microsoft.Maui.Controls.BindableProperty!
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index d1771227750c..39bf7cf0d753 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,4 +1,15 @@
#nullable enable
+Microsoft.Maui.Controls.HybridWebView
+Microsoft.Maui.Controls.HybridWebView.DefaultFile.get -> string?
+Microsoft.Maui.Controls.HybridWebView.DefaultFile.set -> void
+Microsoft.Maui.Controls.HybridWebView.HybridRoot.get -> string?
+Microsoft.Maui.Controls.HybridWebView.HybridRoot.set -> void
+Microsoft.Maui.Controls.HybridWebView.HybridWebView() -> void
+Microsoft.Maui.Controls.HybridWebView.RawMessageReceived -> System.EventHandler?
+Microsoft.Maui.Controls.HybridWebView.SendRawMessage(string! rawMessage) -> void
+Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs
+Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.HybridWebViewRawMessageReceivedEventArgs(string? message) -> void
+Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.Message.get -> string?
override Microsoft.Maui.Controls.Handlers.Compatibility.CellRenderer.Invoke(string! command, object? args) -> void
override Microsoft.Maui.Controls.Handlers.Compatibility.CellRenderer.UpdateValue(string! property) -> void
override Microsoft.Maui.Controls.GradientBrush.IsEmpty.get -> bool
@@ -83,6 +94,8 @@ Microsoft.Maui.Controls.TimeChangedEventArgs.OldTime.get -> System.TimeSpan
Microsoft.Maui.Controls.TimeChangedEventArgs.TimeChangedEventArgs(System.TimeSpan oldTime, System.TimeSpan newTime) -> void
Microsoft.Maui.Controls.TimePicker.TimeSelected -> System.EventHandler
override Microsoft.Maui.Controls.Handlers.Items.ItemsViewController.LoadView() -> void
+static readonly Microsoft.Maui.Controls.HybridWebView.DefaultFileProperty -> Microsoft.Maui.Controls.BindableProperty!
+static readonly Microsoft.Maui.Controls.HybridWebView.HybridRootProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.KeyboardAccelerator.KeyProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.KeyboardAccelerator.ModifiersProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.DragGestureRecognizer.CanDragProperty -> Microsoft.Maui.Controls.BindableProperty!
diff --git a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index e32d6e8c2dc7..9e937760dacf 100644
--- a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1,4 +1,15 @@
#nullable enable
+Microsoft.Maui.Controls.HybridWebView
+Microsoft.Maui.Controls.HybridWebView.DefaultFile.get -> string?
+Microsoft.Maui.Controls.HybridWebView.DefaultFile.set -> void
+Microsoft.Maui.Controls.HybridWebView.HybridRoot.get -> string?
+Microsoft.Maui.Controls.HybridWebView.HybridRoot.set -> void
+Microsoft.Maui.Controls.HybridWebView.HybridWebView() -> void
+Microsoft.Maui.Controls.HybridWebView.RawMessageReceived -> System.EventHandler?
+Microsoft.Maui.Controls.HybridWebView.SendRawMessage(string! rawMessage) -> void
+Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs
+Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.HybridWebViewRawMessageReceivedEventArgs(string? message) -> void
+Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.Message.get -> string?
Microsoft.Maui.Controls.PlatformDragStartingEventArgs
Microsoft.Maui.Controls.PlatformDropCompletedEventArgs
Microsoft.Maui.Controls.PlatformDragEventArgs
@@ -55,6 +66,8 @@ Microsoft.Maui.Controls.TimeChangedEventArgs.OldTime.get -> System.TimeSpan
Microsoft.Maui.Controls.TimeChangedEventArgs.TimeChangedEventArgs(System.TimeSpan oldTime, System.TimeSpan newTime) -> void
Microsoft.Maui.Controls.TimePicker.TimeSelected -> System.EventHandler
override Microsoft.Maui.Controls.GradientBrush.IsEmpty.get -> bool
+static readonly Microsoft.Maui.Controls.HybridWebView.DefaultFileProperty -> Microsoft.Maui.Controls.BindableProperty!
+static readonly Microsoft.Maui.Controls.HybridWebView.HybridRootProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.KeyboardAccelerator.KeyProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.KeyboardAccelerator.ModifiersProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.DragGestureRecognizer.CanDragProperty -> Microsoft.Maui.Controls.BindableProperty!
diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 2270d964161a..557e20477a14 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,5 +1,16 @@
#nullable enable
Microsoft.Maui.Controls.Handlers.Items.CarouselViewHandler.~CarouselViewHandler() -> void
+Microsoft.Maui.Controls.HybridWebView
+Microsoft.Maui.Controls.HybridWebView.DefaultFile.get -> string?
+Microsoft.Maui.Controls.HybridWebView.DefaultFile.set -> void
+Microsoft.Maui.Controls.HybridWebView.HybridRoot.get -> string?
+Microsoft.Maui.Controls.HybridWebView.HybridRoot.set -> void
+Microsoft.Maui.Controls.HybridWebView.HybridWebView() -> void
+Microsoft.Maui.Controls.HybridWebView.RawMessageReceived -> System.EventHandler?
+Microsoft.Maui.Controls.HybridWebView.SendRawMessage(string! rawMessage) -> void
+Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs
+Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.HybridWebViewRawMessageReceivedEventArgs(string? message) -> void
+Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.Message.get -> string?
Microsoft.Maui.Controls.PlatformDragStartingEventArgs
Microsoft.Maui.Controls.PlatformDragStartingEventArgs.Sender.get -> Microsoft.UI.Xaml.UIElement!
Microsoft.Maui.Controls.PlatformDragStartingEventArgs.DragStartingEventArgs.get -> Microsoft.UI.Xaml.DragStartingEventArgs!
@@ -80,6 +91,8 @@ Microsoft.Maui.Controls.TimeChangedEventArgs.NewTime.get -> System.TimeSpan
Microsoft.Maui.Controls.TimeChangedEventArgs.OldTime.get -> System.TimeSpan
Microsoft.Maui.Controls.TimeChangedEventArgs.TimeChangedEventArgs(System.TimeSpan oldTime, System.TimeSpan newTime) -> void
Microsoft.Maui.Controls.TimePicker.TimeSelected -> System.EventHandler
+static readonly Microsoft.Maui.Controls.HybridWebView.DefaultFileProperty -> Microsoft.Maui.Controls.BindableProperty!
+static readonly Microsoft.Maui.Controls.HybridWebView.HybridRootProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.KeyboardAccelerator.KeyProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.KeyboardAccelerator.ModifiersProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.DragGestureRecognizer.CanDragProperty -> Microsoft.Maui.Controls.BindableProperty!
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
index 8420cbc99b5d..c19ed9b783d8 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1,4 +1,15 @@
#nullable enable
+Microsoft.Maui.Controls.HybridWebView
+Microsoft.Maui.Controls.HybridWebView.DefaultFile.get -> string?
+Microsoft.Maui.Controls.HybridWebView.DefaultFile.set -> void
+Microsoft.Maui.Controls.HybridWebView.HybridRoot.get -> string?
+Microsoft.Maui.Controls.HybridWebView.HybridRoot.set -> void
+Microsoft.Maui.Controls.HybridWebView.HybridWebView() -> void
+Microsoft.Maui.Controls.HybridWebView.RawMessageReceived -> System.EventHandler?
+Microsoft.Maui.Controls.HybridWebView.SendRawMessage(string! rawMessage) -> void
+Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs
+Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.HybridWebViewRawMessageReceivedEventArgs(string? message) -> void
+Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.Message.get -> string?
Microsoft.Maui.Controls.PlatformDragStartingEventArgs
Microsoft.Maui.Controls.PlatformDropCompletedEventArgs
Microsoft.Maui.Controls.PlatformDragEventArgs
@@ -57,6 +68,8 @@ Microsoft.Maui.Controls.TimeChangedEventArgs.OldTime.get -> System.TimeSpan
Microsoft.Maui.Controls.TimeChangedEventArgs.TimeChangedEventArgs(System.TimeSpan oldTime, System.TimeSpan newTime) -> void
Microsoft.Maui.Controls.TimePicker.TimeSelected -> System.EventHandler
override Microsoft.Maui.Controls.GradientBrush.IsEmpty.get -> bool
+static readonly Microsoft.Maui.Controls.HybridWebView.DefaultFileProperty -> Microsoft.Maui.Controls.BindableProperty!
+static readonly Microsoft.Maui.Controls.HybridWebView.HybridRootProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.KeyboardAccelerator.KeyProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.KeyboardAccelerator.ModifiersProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.DragGestureRecognizer.CanDragProperty -> Microsoft.Maui.Controls.BindableProperty!
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 585a0675a609..050dea94f92f 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,5 +1,16 @@
#nullable enable
Microsoft.Maui.Controls.DragEventArgs.PlatformArgs.get -> Microsoft.Maui.Controls.PlatformDragEventArgs?
+Microsoft.Maui.Controls.HybridWebView
+Microsoft.Maui.Controls.HybridWebView.DefaultFile.get -> string?
+Microsoft.Maui.Controls.HybridWebView.DefaultFile.set -> void
+Microsoft.Maui.Controls.HybridWebView.HybridRoot.get -> string?
+Microsoft.Maui.Controls.HybridWebView.HybridRoot.set -> void
+Microsoft.Maui.Controls.HybridWebView.HybridWebView() -> void
+Microsoft.Maui.Controls.HybridWebView.RawMessageReceived -> System.EventHandler?
+Microsoft.Maui.Controls.HybridWebView.SendRawMessage(string! rawMessage) -> void
+Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs
+Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.HybridWebViewRawMessageReceivedEventArgs(string? message) -> void
+Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.Message.get -> string?
Microsoft.Maui.Controls.PlatformDragStartingEventArgs
Microsoft.Maui.Controls.PlatformDropCompletedEventArgs
Microsoft.Maui.Controls.PlatformDragEventArgs
@@ -55,6 +66,8 @@ Microsoft.Maui.Controls.TimeChangedEventArgs.OldTime.get -> System.TimeSpan
Microsoft.Maui.Controls.TimeChangedEventArgs.TimeChangedEventArgs(System.TimeSpan oldTime, System.TimeSpan newTime) -> void
Microsoft.Maui.Controls.TimePicker.TimeSelected -> System.EventHandler
override Microsoft.Maui.Controls.GradientBrush.IsEmpty.get -> bool
+static readonly Microsoft.Maui.Controls.HybridWebView.DefaultFileProperty -> Microsoft.Maui.Controls.BindableProperty!
+static readonly Microsoft.Maui.Controls.HybridWebView.HybridRootProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.KeyboardAccelerator.KeyProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.KeyboardAccelerator.ModifiersProperty -> Microsoft.Maui.Controls.BindableProperty!
static readonly Microsoft.Maui.Controls.DragGestureRecognizer.CanDragProperty -> Microsoft.Maui.Controls.BindableProperty!
diff --git a/src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs b/src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs
index f5deafe55c61..ebbd595dffa2 100644
--- a/src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs
+++ b/src/Controls/src/Xaml/Hosting/AppHostBuilderExtensions.cs
@@ -86,6 +86,7 @@ public static IMauiHandlersCollection AddMauiControlsHandlers(this IMauiHandlers
handlersCollection.AddHandler();
handlersCollection.AddHandler();
handlersCollection.AddHandler();
+ handlersCollection.AddHandler();
handlersCollection.AddHandler();
handlersCollection.AddHandler();
handlersCollection.AddHandler();
diff --git a/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj b/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
index b21cd0cc8e97..e051cd0a393f 100644
--- a/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
+++ b/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
@@ -26,6 +26,10 @@
+
+
+
+
diff --git a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests.cs b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests.cs
new file mode 100644
index 000000000000..7facd9f54a50
--- /dev/null
+++ b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests.cs
@@ -0,0 +1,83 @@
+using System.Threading.Tasks;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Hosting;
+using Xunit;
+
+namespace Microsoft.Maui.DeviceTests
+{
+ [Category(TestCategory.HybridWebView)]
+ public class HybridWebViewTests : ControlsHandlerTestBase
+ {
+ void SetupBuilder()
+ {
+ EnsureHandlerCreated(builder =>
+ {
+ builder.ConfigureMauiHandlers(handlers =>
+ {
+ handlers.AddHandler();
+ });
+ });
+ }
+
+ [Fact]
+ public async Task LoadsHtmlAndSendReceiveRawMessage()
+ {
+#if ANDROID
+ // NOTE: skip this test on older Android devices because it is not currently supported on these versions
+ if (!System.OperatingSystem.IsAndroidVersionAtLeast(24))
+ {
+ return;
+ }
+#endif
+
+ SetupBuilder();
+
+ await InvokeOnMainThreadAsync(async () =>
+ {
+ var hybridWebView = new HybridWebView()
+ {
+ WidthRequest = 100,
+ HeightRequest = 100,
+
+ HybridRoot = "HybridTestRoot",
+ };
+
+ var lastRawMessage = "";
+
+ hybridWebView.RawMessageReceived += (s, e) =>
+ {
+ lastRawMessage = e.Message;
+ };
+
+ var handler = CreateHandler(hybridWebView);
+
+ var platformView = handler.PlatformView;
+
+ // Setup the view to be displayed/parented and run our tests on it
+ await AttachAndRun(hybridWebView, async (handler) =>
+ {
+ await Task.Delay(5000);
+
+ const string TestRawMessage = "Hybrid\"\"'' {Test} with chars!";
+ hybridWebView.SendRawMessage(TestRawMessage);
+
+ var passed = false;
+
+ for (var i = 0; i < 10; i++)
+ {
+ if (lastRawMessage == "You said: " + TestRawMessage)
+ {
+ passed = true;
+ break;
+ }
+
+ await Task.Delay(1000);
+ }
+
+ Assert.True(passed, $"Waited for raw message response but it never arrived or didn't match (last message: {lastRawMessage})");
+ });
+ });
+ }
+ }
+}
diff --git a/src/Controls/tests/DeviceTests/Memory/MemoryTests.cs b/src/Controls/tests/DeviceTests/Memory/MemoryTests.cs
index e9ecca92794e..562d81752722 100644
--- a/src/Controls/tests/DeviceTests/Memory/MemoryTests.cs
+++ b/src/Controls/tests/DeviceTests/Memory/MemoryTests.cs
@@ -40,6 +40,7 @@ void SetupBuilder()
handlers.AddHandler();
#pragma warning restore CS0618 // Type or member is obsolete
handlers.AddHandler();
+ handlers.AddHandler();
handlers.AddHandler();
handlers.AddHandler();
handlers.AddHandler();
@@ -143,6 +144,7 @@ await CreateHandlerAndAddToWindow(new Window(navPage), async () =>
#pragma warning restore CS0618 // Type or member is obsolete
[InlineData(typeof(GraphicsView))]
[InlineData(typeof(Grid))]
+ [InlineData(typeof(HybridWebView))]
[InlineData(typeof(Image))]
[InlineData(typeof(ImageButton))]
[InlineData(typeof(IndicatorView))]
@@ -175,6 +177,11 @@ public async Task HandlerDoesNotLeak(Type type)
// NOTE: skip certain controls on older Android devices
if ((type == typeof(DatePicker) || type == typeof(ListView)) && !OperatingSystem.IsAndroidVersionAtLeast(30))
return;
+
+ if (type == typeof(HybridWebView) && !OperatingSystem.IsAndroidVersionAtLeast(24))
+ {
+ return;
+ }
#endif
#if IOS
@@ -228,6 +235,11 @@ await InvokeOnMainThreadAsync(async () =>
webView.Source = new HtmlWebViewSource { Html = "hi
" };
await Task.Delay(1000);
}
+ else if (view is HybridWebView hybridWebView)
+ {
+ hybridWebView.HybridRoot = "HybridTestRoot";
+ await Task.Delay(1000);
+ }
else if (view is TemplatedView templated)
{
templated.ControlTemplate = new ControlTemplate(() =>
diff --git a/src/Controls/tests/DeviceTests/Resources/Raw/HybridTestRoot/index.html b/src/Controls/tests/DeviceTests/Resources/Raw/HybridTestRoot/index.html
new file mode 100644
index 000000000000..0d1c8dc295ac
--- /dev/null
+++ b/src/Controls/tests/DeviceTests/Resources/Raw/HybridTestRoot/index.html
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+ Hybrid test!
+
+
+
\ No newline at end of file
diff --git a/src/Controls/tests/DeviceTests/Resources/Raw/HybridTestRoot/scripts/HybridWebView.js b/src/Controls/tests/DeviceTests/Resources/Raw/HybridTestRoot/scripts/HybridWebView.js
new file mode 100644
index 000000000000..bf41fe0a160b
--- /dev/null
+++ b/src/Controls/tests/DeviceTests/Resources/Raw/HybridTestRoot/scripts/HybridWebView.js
@@ -0,0 +1,48 @@
+function HybridWebViewInit() {
+
+ function DispatchHybridWebViewMessage(message) {
+ const event = new CustomEvent("HybridWebViewMessageReceived", { detail: { message: message } });
+ window.dispatchEvent(event);
+ }
+
+ if (window.chrome && window.chrome.webview) {
+ // Windows WebView2
+ window.chrome.webview.addEventListener('message', arg => {
+ DispatchHybridWebViewMessage(arg.data);
+ });
+ }
+ else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.webwindowinterop) {
+ // iOS and MacCatalyst WKWebView
+ window.external = {
+ "receiveMessage": message => {
+ DispatchHybridWebViewMessage(message);
+ }
+ };
+ }
+ else {
+ // Android WebView
+ window.addEventListener('message', arg => {
+ DispatchHybridWebViewMessage(arg.data);
+ });
+ }
+}
+
+window.HybridWebView = {
+ "SendRawMessage": function (message) {
+
+ if (window.chrome && window.chrome.webview) {
+ // Windows WebView2
+ window.chrome.webview.postMessage(message);
+ }
+ else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.webwindowinterop) {
+ // iOS and MacCatalyst WKWebView
+ window.webkit.messageHandlers.webwindowinterop.postMessage(message);
+ }
+ else {
+ // Android WebView
+ hybridWebViewHost.sendRawMessage(message);
+ }
+ }
+}
+
+HybridWebViewInit();
diff --git a/src/Controls/tests/DeviceTests/TestCategory.cs b/src/Controls/tests/DeviceTests/TestCategory.cs
index 84e11618afae..1c6c53d339dd 100644
--- a/src/Controls/tests/DeviceTests/TestCategory.cs
+++ b/src/Controls/tests/DeviceTests/TestCategory.cs
@@ -21,6 +21,7 @@ public static class TestCategory
public const string FlyoutPage = "FlyoutPage";
public const string Frame = "Frame";
public const string Gesture = "Gesture";
+ public const string HybridWebView = "HybridWebView";
public const string Image = "Image";
public const string Label = "Label";
public const string Layout = "Layout";
diff --git a/src/Core/src/Core/IHybridWebView.cs b/src/Core/src/Core/IHybridWebView.cs
new file mode 100644
index 000000000000..057ffd7a3bcd
--- /dev/null
+++ b/src/Core/src/Core/IHybridWebView.cs
@@ -0,0 +1,18 @@
+namespace Microsoft.Maui
+{
+ public interface IHybridWebView : IView
+ {
+ string? DefaultFile { get; }
+
+ ///
+ /// The path within the app's "Raw" asset resources that contain the web app's contents. For example, if the
+ /// files are located in [ProjectFolder]/Resources/Raw/hybrid_root, then set this property to "hybrid_root".
+ /// The default value is HybridRoot, which maps to [ProjectFolder]/Resources/Raw/HybridRoot.
+ ///
+ string? HybridRoot { get; }
+
+ void RawMessageReceived(string rawMessage);
+
+ void SendRawMessage(string rawMessage);
+ }
+}
diff --git a/src/Core/src/Handlers/HybridWebView/FileExtensionContentTypeProvider.cs b/src/Core/src/Handlers/HybridWebView/FileExtensionContentTypeProvider.cs
new file mode 100644
index 000000000000..b34751d1ae83
--- /dev/null
+++ b/src/Core/src/Handlers/HybridWebView/FileExtensionContentTypeProvider.cs
@@ -0,0 +1,469 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+// NOTE: This file is copied from https://github.com/dotnet/aspnetcore/blob/main/src/Components/WebView/WebView/src/FileExtensionContentTypeProvider.cs
+// and made internal with a namespace change.
+// It can't be referenced directly from the StaticFiles package because that would cause this package to require
+// Microsoft.AspNetCore.App, thus preventing it from being used anywhere ASP.NET Core isn't supported (such as
+// various platforms that .NET MAUI runs on, such as Android and iOS).
+
+using System.Diagnostics.CodeAnalysis;
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.Maui.Handlers;
+
+///
+/// Provides a mapping between file extensions and MIME types.
+///
+internal sealed class FileExtensionContentTypeProvider
+{
+ // Notes:
+ // - This table was initially copied from IIS and has many legacy entries we will maintain for backwards compatibility.
+ // - We only plan to add new entries where we expect them to be applicable to a majority of developers such as being
+ // used in the project templates.
+ #region Extension mapping table
+ ///
+ /// Creates a new provider with a set of default mappings.
+ ///
+ public FileExtensionContentTypeProvider()
+ : this(new Dictionary(StringComparer.OrdinalIgnoreCase)
+ {
+ { ".323", "text/h323" },
+ { ".3g2", "video/3gpp2" },
+ { ".3gp2", "video/3gpp2" },
+ { ".3gp", "video/3gpp" },
+ { ".3gpp", "video/3gpp" },
+ { ".aac", "audio/aac" },
+ { ".aaf", "application/octet-stream" },
+ { ".aca", "application/octet-stream" },
+ { ".accdb", "application/msaccess" },
+ { ".accde", "application/msaccess" },
+ { ".accdt", "application/msaccess" },
+ { ".acx", "application/internet-property-stream" },
+ { ".adt", "audio/vnd.dlna.adts" },
+ { ".adts", "audio/vnd.dlna.adts" },
+ { ".afm", "application/octet-stream" },
+ { ".ai", "application/postscript" },
+ { ".aif", "audio/x-aiff" },
+ { ".aifc", "audio/aiff" },
+ { ".aiff", "audio/aiff" },
+ { ".appcache", "text/cache-manifest" },
+ { ".application", "application/x-ms-application" },
+ { ".art", "image/x-jg" },
+ { ".asd", "application/octet-stream" },
+ { ".asf", "video/x-ms-asf" },
+ { ".asi", "application/octet-stream" },
+ { ".asm", "text/plain" },
+ { ".asr", "video/x-ms-asf" },
+ { ".asx", "video/x-ms-asf" },
+ { ".atom", "application/atom+xml" },
+ { ".au", "audio/basic" },
+ { ".avi", "video/x-msvideo" },
+ { ".axs", "application/olescript" },
+ { ".bas", "text/plain" },
+ { ".bcpio", "application/x-bcpio" },
+ { ".bin", "application/octet-stream" },
+ { ".bmp", "image/bmp" },
+ { ".c", "text/plain" },
+ { ".cab", "application/vnd.ms-cab-compressed" },
+ { ".calx", "application/vnd.ms-office.calx" },
+ { ".cat", "application/vnd.ms-pki.seccat" },
+ { ".cdf", "application/x-cdf" },
+ { ".chm", "application/octet-stream" },
+ { ".class", "application/x-java-applet" },
+ { ".clp", "application/x-msclip" },
+ { ".cmx", "image/x-cmx" },
+ { ".cnf", "text/plain" },
+ { ".cod", "image/cis-cod" },
+ { ".cpio", "application/x-cpio" },
+ { ".cpp", "text/plain" },
+ { ".crd", "application/x-mscardfile" },
+ { ".crl", "application/pkix-crl" },
+ { ".crt", "application/x-x509-ca-cert" },
+ { ".csh", "application/x-csh" },
+ { ".css", "text/css" },
+ { ".csv", "text/csv" }, // https://tools.ietf.org/html/rfc7111#section-5.1
+ { ".cur", "application/octet-stream" },
+ { ".dcr", "application/x-director" },
+ { ".deploy", "application/octet-stream" },
+ { ".der", "application/x-x509-ca-cert" },
+ { ".dib", "image/bmp" },
+ { ".dir", "application/x-director" },
+ { ".disco", "text/xml" },
+ { ".dlm", "text/dlm" },
+ { ".doc", "application/msword" },
+ { ".docm", "application/vnd.ms-word.document.macroEnabled.12" },
+ { ".docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document" },
+ { ".dot", "application/msword" },
+ { ".dotm", "application/vnd.ms-word.template.macroEnabled.12" },
+ { ".dotx", "application/vnd.openxmlformats-officedocument.wordprocessingml.template" },
+ { ".dsp", "application/octet-stream" },
+ { ".dtd", "text/xml" },
+ { ".dvi", "application/x-dvi" },
+ { ".dvr-ms", "video/x-ms-dvr" },
+ { ".dwf", "drawing/x-dwf" },
+ { ".dwp", "application/octet-stream" },
+ { ".dxr", "application/x-director" },
+ { ".eml", "message/rfc822" },
+ { ".emz", "application/octet-stream" },
+ { ".eot", "application/vnd.ms-fontobject" },
+ { ".eps", "application/postscript" },
+ { ".etx", "text/x-setext" },
+ { ".evy", "application/envoy" },
+ { ".exe", "application/vnd.microsoft.portable-executable" }, // https://www.iana.org/assignments/media-types/application/vnd.microsoft.portable-executable
+ { ".fdf", "application/vnd.fdf" },
+ { ".fif", "application/fractals" },
+ { ".fla", "application/octet-stream" },
+ { ".flr", "x-world/x-vrml" },
+ { ".flv", "video/x-flv" },
+ { ".gif", "image/gif" },
+ { ".gtar", "application/x-gtar" },
+ { ".gz", "application/x-gzip" },
+ { ".h", "text/plain" },
+ { ".hdf", "application/x-hdf" },
+ { ".hdml", "text/x-hdml" },
+ { ".hhc", "application/x-oleobject" },
+ { ".hhk", "application/octet-stream" },
+ { ".hhp", "application/octet-stream" },
+ { ".hlp", "application/winhlp" },
+ { ".hqx", "application/mac-binhex40" },
+ { ".hta", "application/hta" },
+ { ".htc", "text/x-component" },
+ { ".htm", "text/html" },
+ { ".html", "text/html" },
+ { ".htt", "text/webviewhtml" },
+ { ".hxt", "text/html" },
+ { ".ical", "text/calendar" },
+ { ".icalendar", "text/calendar" },
+ { ".ico", "image/x-icon" },
+ { ".ics", "text/calendar" },
+ { ".ief", "image/ief" },
+ { ".ifb", "text/calendar" },
+ { ".iii", "application/x-iphone" },
+ { ".inf", "application/octet-stream" },
+ { ".ins", "application/x-internet-signup" },
+ { ".isp", "application/x-internet-signup" },
+ { ".IVF", "video/x-ivf" },
+ { ".jar", "application/java-archive" },
+ { ".java", "application/octet-stream" },
+ { ".jck", "application/liquidmotion" },
+ { ".jcz", "application/liquidmotion" },
+ { ".jfif", "image/pjpeg" },
+ { ".jpb", "application/octet-stream" },
+ { ".jpe", "image/jpeg" },
+ { ".jpeg", "image/jpeg" },
+ { ".jpg", "image/jpeg" },
+ { ".js", "text/javascript" },
+ { ".json", "application/json" },
+ { ".jsx", "text/jscript" },
+ { ".latex", "application/x-latex" },
+ { ".lit", "application/x-ms-reader" },
+ { ".lpk", "application/octet-stream" },
+ { ".lsf", "video/x-la-asf" },
+ { ".lsx", "video/x-la-asf" },
+ { ".lzh", "application/octet-stream" },
+ { ".m13", "application/x-msmediaview" },
+ { ".m14", "application/x-msmediaview" },
+ { ".m1v", "video/mpeg" },
+ { ".m2ts", "video/vnd.dlna.mpeg-tts" },
+ { ".m3u", "audio/x-mpegurl" },
+ { ".m4a", "audio/mp4" },
+ { ".m4v", "video/mp4" },
+ { ".man", "application/x-troff-man" },
+ { ".manifest", "application/x-ms-manifest" },
+ { ".map", "text/plain" },
+ { ".markdown", "text/markdown" },
+ { ".md", "text/markdown" },
+ { ".mdb", "application/x-msaccess" },
+ { ".mdp", "application/octet-stream" },
+ { ".me", "application/x-troff-me" },
+ { ".mht", "message/rfc822" },
+ { ".mhtml", "message/rfc822" },
+ { ".mid", "audio/mid" },
+ { ".midi", "audio/mid" },
+ { ".mix", "application/octet-stream" },
+ { ".mjs", "text/javascript" },
+ { ".mmf", "application/x-smaf" },
+ { ".mno", "text/xml" },
+ { ".mny", "application/x-msmoney" },
+ { ".mov", "video/quicktime" },
+ { ".movie", "video/x-sgi-movie" },
+ { ".mp2", "video/mpeg" },
+ { ".mp3", "audio/mpeg" },
+ { ".mp4", "video/mp4" },
+ { ".mp4v", "video/mp4" },
+ { ".mpa", "video/mpeg" },
+ { ".mpe", "video/mpeg" },
+ { ".mpeg", "video/mpeg" },
+ { ".mpg", "video/mpeg" },
+ { ".mpp", "application/vnd.ms-project" },
+ { ".mpv2", "video/mpeg" },
+ { ".ms", "application/x-troff-ms" },
+ { ".msi", "application/octet-stream" },
+ { ".mso", "application/octet-stream" },
+ { ".mvb", "application/x-msmediaview" },
+ { ".mvc", "application/x-miva-compiled" },
+ { ".nc", "application/x-netcdf" },
+ { ".nsc", "video/x-ms-asf" },
+ { ".nws", "message/rfc822" },
+ { ".ocx", "application/octet-stream" },
+ { ".oda", "application/oda" },
+ { ".odc", "text/x-ms-odc" },
+ { ".ods", "application/oleobject" },
+ { ".oga", "audio/ogg" },
+ { ".ogg", "video/ogg" },
+ { ".ogv", "video/ogg" },
+ { ".ogx", "application/ogg" },
+ { ".one", "application/onenote" },
+ { ".onea", "application/onenote" },
+ { ".onetoc", "application/onenote" },
+ { ".onetoc2", "application/onenote" },
+ { ".onetmp", "application/onenote" },
+ { ".onepkg", "application/onenote" },
+ { ".osdx", "application/opensearchdescription+xml" },
+ { ".otf", "font/otf" },
+ { ".p10", "application/pkcs10" },
+ { ".p12", "application/x-pkcs12" },
+ { ".p7b", "application/x-pkcs7-certificates" },
+ { ".p7c", "application/pkcs7-mime" },
+ { ".p7m", "application/pkcs7-mime" },
+ { ".p7r", "application/x-pkcs7-certreqresp" },
+ { ".p7s", "application/pkcs7-signature" },
+ { ".pbm", "image/x-portable-bitmap" },
+ { ".pcx", "application/octet-stream" },
+ { ".pcz", "application/octet-stream" },
+ { ".pdf", "application/pdf" },
+ { ".pfb", "application/octet-stream" },
+ { ".pfm", "application/octet-stream" },
+ { ".pfx", "application/x-pkcs12" },
+ { ".pgm", "image/x-portable-graymap" },
+ { ".pko", "application/vnd.ms-pki.pko" },
+ { ".pma", "application/x-perfmon" },
+ { ".pmc", "application/x-perfmon" },
+ { ".pml", "application/x-perfmon" },
+ { ".pmr", "application/x-perfmon" },
+ { ".pmw", "application/x-perfmon" },
+ { ".png", "image/png" },
+ { ".pnm", "image/x-portable-anymap" },
+ { ".pnz", "image/png" },
+ { ".pot", "application/vnd.ms-powerpoint" },
+ { ".potm", "application/vnd.ms-powerpoint.template.macroEnabled.12" },
+ { ".potx", "application/vnd.openxmlformats-officedocument.presentationml.template" },
+ { ".ppam", "application/vnd.ms-powerpoint.addin.macroEnabled.12" },
+ { ".ppm", "image/x-portable-pixmap" },
+ { ".pps", "application/vnd.ms-powerpoint" },
+ { ".ppsm", "application/vnd.ms-powerpoint.slideshow.macroEnabled.12" },
+ { ".ppsx", "application/vnd.openxmlformats-officedocument.presentationml.slideshow" },
+ { ".ppt", "application/vnd.ms-powerpoint" },
+ { ".pptm", "application/vnd.ms-powerpoint.presentation.macroEnabled.12" },
+ { ".pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation" },
+ { ".prf", "application/pics-rules" },
+ { ".prm", "application/octet-stream" },
+ { ".prx", "application/octet-stream" },
+ { ".ps", "application/postscript" },
+ { ".psd", "application/octet-stream" },
+ { ".psm", "application/octet-stream" },
+ { ".psp", "application/octet-stream" },
+ { ".pub", "application/x-mspublisher" },
+ { ".qt", "video/quicktime" },
+ { ".qtl", "application/x-quicktimeplayer" },
+ { ".qxd", "application/octet-stream" },
+ { ".ra", "audio/x-pn-realaudio" },
+ { ".ram", "audio/x-pn-realaudio" },
+ { ".rar", "application/octet-stream" },
+ { ".ras", "image/x-cmu-raster" },
+ { ".rf", "image/vnd.rn-realflash" },
+ { ".rgb", "image/x-rgb" },
+ { ".rm", "application/vnd.rn-realmedia" },
+ { ".rmi", "audio/mid" },
+ { ".roff", "application/x-troff" },
+ { ".rpm", "audio/x-pn-realaudio-plugin" },
+ { ".rtf", "application/rtf" },
+ { ".rtx", "text/richtext" },
+ { ".scd", "application/x-msschedule" },
+ { ".sct", "text/scriptlet" },
+ { ".sea", "application/octet-stream" },
+ { ".setpay", "application/set-payment-initiation" },
+ { ".setreg", "application/set-registration-initiation" },
+ { ".sgml", "text/sgml" },
+ { ".sh", "application/x-sh" },
+ { ".shar", "application/x-shar" },
+ { ".sit", "application/x-stuffit" },
+ { ".sldm", "application/vnd.ms-powerpoint.slide.macroEnabled.12" },
+ { ".sldx", "application/vnd.openxmlformats-officedocument.presentationml.slide" },
+ { ".smd", "audio/x-smd" },
+ { ".smi", "application/octet-stream" },
+ { ".smx", "audio/x-smd" },
+ { ".smz", "audio/x-smd" },
+ { ".snd", "audio/basic" },
+ { ".snp", "application/octet-stream" },
+ { ".spc", "application/x-pkcs7-certificates" },
+ { ".spl", "application/futuresplash" },
+ { ".spx", "audio/ogg" },
+ { ".src", "application/x-wais-source" },
+ { ".ssm", "application/streamingmedia" },
+ { ".sst", "application/vnd.ms-pki.certstore" },
+ { ".stl", "application/vnd.ms-pki.stl" },
+ { ".sv4cpio", "application/x-sv4cpio" },
+ { ".sv4crc", "application/x-sv4crc" },
+ { ".svg", "image/svg+xml" },
+ { ".svgz", "image/svg+xml" },
+ { ".swf", "application/x-shockwave-flash" },
+ { ".t", "application/x-troff" },
+ { ".tar", "application/x-tar" },
+ { ".tcl", "application/x-tcl" },
+ { ".tex", "application/x-tex" },
+ { ".texi", "application/x-texinfo" },
+ { ".texinfo", "application/x-texinfo" },
+ { ".tgz", "application/x-compressed" },
+ { ".thmx", "application/vnd.ms-officetheme" },
+ { ".thn", "application/octet-stream" },
+ { ".tif", "image/tiff" },
+ { ".tiff", "image/tiff" },
+ { ".toc", "application/octet-stream" },
+ { ".tr", "application/x-troff" },
+ { ".trm", "application/x-msterminal" },
+ { ".ts", "video/vnd.dlna.mpeg-tts" },
+ { ".tsv", "text/tab-separated-values" },
+ { ".ttc", "application/x-font-ttf" },
+ { ".ttf", "application/x-font-ttf" },
+ { ".tts", "video/vnd.dlna.mpeg-tts" },
+ { ".txt", "text/plain" },
+ { ".u32", "application/octet-stream" },
+ { ".uls", "text/iuls" },
+ { ".ustar", "application/x-ustar" },
+ { ".vbs", "text/vbscript" },
+ { ".vcf", "text/x-vcard" },
+ { ".vcs", "text/plain" },
+ { ".vdx", "application/vnd.ms-visio.viewer" },
+ { ".vml", "text/xml" },
+ { ".vsd", "application/vnd.visio" },
+ { ".vss", "application/vnd.visio" },
+ { ".vst", "application/vnd.visio" },
+ { ".vsto", "application/x-ms-vsto" },
+ { ".vsw", "application/vnd.visio" },
+ { ".vsx", "application/vnd.visio" },
+ { ".vtx", "application/vnd.visio" },
+ { ".wasm", "application/wasm" },
+ { ".wav", "audio/wav" },
+ { ".wax", "audio/x-ms-wax" },
+ { ".wbmp", "image/vnd.wap.wbmp" },
+ { ".wcm", "application/vnd.ms-works" },
+ { ".wdb", "application/vnd.ms-works" },
+ { ".webm", "video/webm" },
+ { ".webmanifest", "application/manifest+json" }, // https://w3c.github.io/manifest/#media-type-registration
+ { ".webp", "image/webp" },
+ { ".wks", "application/vnd.ms-works" },
+ { ".wm", "video/x-ms-wm" },
+ { ".wma", "audio/x-ms-wma" },
+ { ".wmd", "application/x-ms-wmd" },
+ { ".wmf", "application/x-msmetafile" },
+ { ".wml", "text/vnd.wap.wml" },
+ { ".wmlc", "application/vnd.wap.wmlc" },
+ { ".wmls", "text/vnd.wap.wmlscript" },
+ { ".wmlsc", "application/vnd.wap.wmlscriptc" },
+ { ".wmp", "video/x-ms-wmp" },
+ { ".wmv", "video/x-ms-wmv" },
+ { ".wmx", "video/x-ms-wmx" },
+ { ".wmz", "application/x-ms-wmz" },
+ { ".woff", "application/font-woff" }, // https://www.w3.org/TR/WOFF/#appendix-b
+ { ".woff2", "font/woff2" }, // https://www.w3.org/TR/WOFF2/#IMT
+ { ".wps", "application/vnd.ms-works" },
+ { ".wri", "application/x-mswrite" },
+ { ".wrl", "x-world/x-vrml" },
+ { ".wrz", "x-world/x-vrml" },
+ { ".wsdl", "text/xml" },
+ { ".wtv", "video/x-ms-wtv" },
+ { ".wvx", "video/x-ms-wvx" },
+ { ".x", "application/directx" },
+ { ".xaf", "x-world/x-vrml" },
+ { ".xaml", "application/xaml+xml" },
+ { ".xap", "application/x-silverlight-app" },
+ { ".xbap", "application/x-ms-xbap" },
+ { ".xbm", "image/x-xbitmap" },
+ { ".xdr", "text/plain" },
+ { ".xht", "application/xhtml+xml" },
+ { ".xhtml", "application/xhtml+xml" },
+ { ".xla", "application/vnd.ms-excel" },
+ { ".xlam", "application/vnd.ms-excel.addin.macroEnabled.12" },
+ { ".xlc", "application/vnd.ms-excel" },
+ { ".xlm", "application/vnd.ms-excel" },
+ { ".xls", "application/vnd.ms-excel" },
+ { ".xlsb", "application/vnd.ms-excel.sheet.binary.macroEnabled.12" },
+ { ".xlsm", "application/vnd.ms-excel.sheet.macroEnabled.12" },
+ { ".xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" },
+ { ".xlt", "application/vnd.ms-excel" },
+ { ".xltm", "application/vnd.ms-excel.template.macroEnabled.12" },
+ { ".xltx", "application/vnd.openxmlformats-officedocument.spreadsheetml.template" },
+ { ".xlw", "application/vnd.ms-excel" },
+ { ".xml", "text/xml" },
+ { ".xof", "x-world/x-vrml" },
+ { ".xpm", "image/x-xpixmap" },
+ { ".xps", "application/vnd.ms-xpsdocument" },
+ { ".xsd", "text/xml" },
+ { ".xsf", "text/xml" },
+ { ".xsl", "text/xml" },
+ { ".xslt", "text/xml" },
+ { ".xsn", "application/octet-stream" },
+ { ".xtp", "application/octet-stream" },
+ { ".xwd", "image/x-xwindowdump" },
+ { ".z", "application/x-compress" },
+ { ".zip", "application/x-zip-compressed" },
+ })
+ {
+ }
+ #endregion
+
+ ///
+ /// Creates a lookup engine using the provided mapping.
+ /// It is recommended that the IDictionary instance use StringComparer.OrdinalIgnoreCase.
+ ///
+ ///
+ public FileExtensionContentTypeProvider(IReadOnlyDictionary mapping)
+ {
+ Mappings = mapping ?? throw new ArgumentNullException(nameof(mapping));
+ }
+
+ ///
+ /// The cross reference table of file extensions and content-types.
+ ///
+ public IReadOnlyDictionary Mappings { get; private set; }
+
+ ///
+ /// Given a file path, determine the MIME type
+ ///
+ /// A file path
+ /// The resulting MIME type
+ /// True if MIME type could be determined
+ public bool TryGetContentType(string subpath, [MaybeNullWhen(false)] out string contentType)
+ {
+ var extension = GetExtension(subpath);
+ if (extension == null)
+ {
+ contentType = null;
+ return false;
+ }
+ return Mappings.TryGetValue(extension, out contentType);
+ }
+
+ private static string? GetExtension(string path)
+ {
+ // Don't use Path.GetExtension as that may throw an exception if there are
+ // invalid characters in the path. Invalid characters should be handled
+ // by the FileProviders
+
+ if (string.IsNullOrWhiteSpace(path))
+ {
+ return null;
+ }
+
+ int index = path.LastIndexOf('.');
+ if (index < 0)
+ {
+ return null;
+ }
+
+ return path.Substring(index);
+ }
+}
diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.Android.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.Android.cs
new file mode 100644
index 000000000000..01946630305f
--- /dev/null
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.Android.cs
@@ -0,0 +1,103 @@
+using System;
+using Android.Webkit;
+using Java.Interop;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using static Android.Views.ViewGroup;
+using AWebView = Android.Webkit.WebView;
+
+namespace Microsoft.Maui.Handlers
+{
+ public partial class HybridWebViewHandler : ViewHandler
+ {
+ // This name matches the name of the API used in HybridWebView.js and must remain in sync
+ private const string HybridWebViewHostJsName = "hybridWebViewHost";
+
+ private HybridWebViewJavaScriptInterface? _javaScriptInterface;
+
+ protected override AWebView CreatePlatformView()
+ {
+ var platformView = new MauiHybridWebView(this, Context!)
+ {
+ LayoutParameters = new LayoutParams(LayoutParams.MatchParent, LayoutParams.MatchParent)
+ };
+
+ platformView.Settings.DomStorageEnabled = true;
+ platformView.Settings.SetSupportMultipleWindows(true);
+
+ // Note that this is a per-app setting and not per-control, so if you enable
+ // this, it is enabled for all Android WebViews in the app.
+ AWebView.SetWebContentsDebuggingEnabled(enabled: true); // TODO: Get from setting
+
+ platformView.Settings.JavaScriptEnabled = true;
+
+ _javaScriptInterface = new HybridWebViewJavaScriptInterface(this);
+ platformView.AddJavascriptInterface(_javaScriptInterface, HybridWebViewHostJsName);
+
+ return platformView;
+ }
+
+ private sealed class HybridWebViewJavaScriptInterface : Java.Lang.Object
+ {
+ private readonly WeakReference _hybridWebViewHandler;
+
+ public HybridWebViewJavaScriptInterface(HybridWebViewHandler hybridWebViewHandler)
+ {
+ _hybridWebViewHandler = new(hybridWebViewHandler);
+ }
+
+ private HybridWebViewHandler? Handler => _hybridWebViewHandler is not null && _hybridWebViewHandler.TryGetTarget(out var h) ? h : null;
+
+ [JavascriptInterface]
+ [Export("sendRawMessage")]
+ public void SendRawMessage(string message)
+ {
+ Handler?.VirtualView?.RawMessageReceived(message);
+ }
+ }
+
+ protected override void ConnectHandler(AWebView platformView)
+ {
+ base.ConnectHandler(platformView);
+
+ var webViewClient = new MauiHybridWebViewClient(this);
+ PlatformView.SetWebViewClient(webViewClient);
+
+ platformView.LoadUrl(new Uri(AppOriginUri, "/").ToString());
+ }
+
+ protected override void DisconnectHandler(AWebView platformView)
+ {
+ if (OperatingSystem.IsAndroidVersionAtLeast(26))
+ {
+ if (platformView.WebViewClient is MauiHybridWebViewClient webViewClient)
+ {
+ webViewClient.Disconnect();
+ }
+ //if (platformView.WebChromeClient is MauiWebChromeClient webChromeClient)
+ //{
+ // webChromeClient.Disconnect();
+ //}
+ }
+
+ platformView.SetWebViewClient(null!);
+ //platformView.SetWebChromeClient(null);
+
+ platformView.StopLoading();
+
+
+ base.DisconnectHandler(platformView);
+ }
+
+ public static void MapSendRawMessage(IHybridWebViewHandler handler, IHybridWebView hybridWebView, object? arg)
+ {
+ if (arg is not string rawMessage || handler.PlatformView is not IHybridPlatformWebView hybridPlatformWebView)
+ {
+ return;
+ }
+
+ hybridPlatformWebView.SendRawMessage(rawMessage);
+ }
+ }
+}
diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.Standard.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.Standard.cs
new file mode 100644
index 000000000000..4702a0768af6
--- /dev/null
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.Standard.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace Microsoft.Maui.Handlers
+{
+ public partial class HybridWebViewHandler : ViewHandler
+ {
+ protected override object CreatePlatformView() => throw new NotImplementedException();
+
+ public static void MapSendRawMessage(IHybridWebViewHandler handler, IHybridWebView hybridWebView, object? arg) { }
+ }
+}
\ No newline at end of file
diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.Tizen.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.Tizen.cs
new file mode 100644
index 000000000000..b04f00f71f4c
--- /dev/null
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.Tizen.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace Microsoft.Maui.Handlers
+{
+ public partial class HybridWebViewHandler : ViewHandler
+ {
+ protected override Tizen.NUI.BaseComponents.View CreatePlatformView() => throw new NotImplementedException();
+
+ public static void MapSendRawMessage(IHybridWebViewHandler handler, IHybridWebView hybridWebView, object? arg) { }
+ }
+}
\ No newline at end of file
diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.Windows.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.Windows.cs
new file mode 100644
index 000000000000..49de98bbb859
--- /dev/null
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.Windows.cs
@@ -0,0 +1,221 @@
+using System;
+using System.IO;
+using System.Runtime.InteropServices.WindowsRuntime;
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.Web.WebView2.Core;
+using Windows.Storage.Streams;
+
+namespace Microsoft.Maui.Handlers
+{
+ public partial class HybridWebViewHandler : ViewHandler
+ {
+ private readonly HybridWebView2Proxy _proxy = new();
+
+ protected override WebView2 CreatePlatformView()
+ {
+ return new MauiHybridWebView(this);
+ }
+
+ protected override async void ConnectHandler(WebView2 platformView)
+ {
+ await _proxy.Connect(this, platformView);
+
+ base.ConnectHandler(platformView);
+
+ if (platformView.IsLoaded)
+ {
+ OnLoaded();
+ }
+ else
+ {
+ platformView.Loaded += OnWebViewLoaded;
+ }
+
+ platformView.CoreWebView2.Settings.AreDevToolsEnabled = true;//EnableWebDevTools;
+ platformView.CoreWebView2.Settings.IsWebMessageEnabled = true;
+ platformView.CoreWebView2.AddWebResourceRequestedFilter($"{AppOrigin}*", CoreWebView2WebResourceContext.All);
+
+ platformView.Source = new Uri(new Uri(AppOriginUri, "/").ToString());
+ }
+
+ void OnWebViewLoaded(object sender, RoutedEventArgs e)
+ {
+ OnLoaded();
+ }
+
+ void OnLoaded()
+ {
+ var window = MauiContext!.GetPlatformWindow();
+ _proxy.Connect(window);
+ }
+
+ void Disconnect(WebView2 platformView)
+ {
+ platformView.Loaded -= OnWebViewLoaded;
+ _proxy.Disconnect(platformView);
+ if (platformView.CoreWebView2 is not null)
+ {
+ platformView.Close();
+ }
+ }
+
+ protected override void DisconnectHandler(WebView2 platformView)
+ {
+ Disconnect(platformView);
+ base.DisconnectHandler(platformView);
+ }
+
+ public static void MapSendRawMessage(IHybridWebViewHandler handler, IHybridWebView hybridWebView, object? arg)
+ {
+ if (arg is not string rawMessage || handler.PlatformView is not IHybridPlatformWebView hybridPlatformWebView)
+ {
+ return;
+ }
+
+ hybridPlatformWebView.SendRawMessage(rawMessage);
+ }
+
+
+ private void OnWebMessageReceived(WebView2 sender, CoreWebView2WebMessageReceivedEventArgs args)
+ {
+ VirtualView?.RawMessageReceived(args.TryGetWebMessageAsString());
+ }
+
+ private async void OnWebResourceRequested(CoreWebView2 sender, CoreWebView2WebResourceRequestedEventArgs eventArgs)
+ {
+ // Get a deferral object so that WebView2 knows there's some async stuff going on. We call Complete() at the end of this method.
+ using var deferral = eventArgs.GetDeferral();
+
+ var requestUri = HybridWebViewQueryStringHelper.RemovePossibleQueryString(eventArgs.Request.Uri);
+
+ if (new Uri(requestUri) is Uri uri && AppOriginUri.IsBaseOf(uri))
+ {
+ var relativePath = AppOriginUri.MakeRelativeUri(uri).ToString().Replace('/', '\\');
+
+ string contentType;
+ if (string.IsNullOrEmpty(relativePath))
+ {
+ relativePath = VirtualView.DefaultFile;
+ contentType = "text/html";
+ }
+ else
+ {
+ if (!ContentTypeProvider.TryGetContentType(relativePath, out contentType!))
+ {
+ // TODO: Log this
+ contentType = "text/plain";
+ }
+ }
+
+ var assetPath = Path.Combine(VirtualView.HybridRoot!, relativePath!);
+ var contentStream = await GetAssetStreamAsync(assetPath);
+
+ if (contentStream is null)
+ {
+ var notFoundContent = "Resource not found (404)";
+ eventArgs.Response = sender.Environment!.CreateWebResourceResponse(
+ Content: null,
+ StatusCode: 404,
+ ReasonPhrase: "Not Found",
+ Headers: GetHeaderString("text/plain", notFoundContent.Length)
+ );
+ }
+ else
+ {
+ eventArgs.Response = sender.Environment!.CreateWebResourceResponse(
+ Content: await CopyContentToRandomAccessStreamAsync(contentStream),
+ StatusCode: 200,
+ ReasonPhrase: "OK",
+ Headers: GetHeaderString(contentType, (int)contentStream.Length)
+ );
+ }
+
+ contentStream?.Dispose();
+ }
+
+ // Notify WebView2 that the deferred (async) operation is complete and we set a response.
+ deferral.Complete();
+
+ async Task CopyContentToRandomAccessStreamAsync(Stream content)
+ {
+ using var memStream = new MemoryStream();
+ await content.CopyToAsync(memStream);
+ var randomAccessStream = new InMemoryRandomAccessStream();
+ await randomAccessStream.WriteAsync(memStream.GetWindowsRuntimeBuffer());
+ return randomAccessStream;
+ }
+ }
+
+ private protected static string GetHeaderString(string contentType, int contentLength) =>
+$@"Content-Type: {contentType}
+Content-Length: {contentLength}";
+
+ private sealed class HybridWebView2Proxy
+ {
+ private WeakReference? _window;
+ private WeakReference? _handler;
+
+ private Window? Window => _window is not null && _window.TryGetTarget(out var w) ? w : null;
+ private HybridWebViewHandler? Handler => _handler is not null && _handler.TryGetTarget(out var h) ? h : null;
+
+ public async Task Connect(HybridWebViewHandler handler, WebView2 platformView)
+ {
+ _handler = new(handler);
+
+ platformView.WebMessageReceived += OnWebMessageReceived;
+
+ await platformView.EnsureCoreWebView2Async();
+
+ platformView.CoreWebView2.WebResourceRequested += OnWebResourceRequested;
+ }
+
+ private void OnWebResourceRequested(CoreWebView2 sender, CoreWebView2WebResourceRequestedEventArgs args)
+ {
+ Handler?.OnWebResourceRequested(sender, args);
+ }
+
+ public void Connect(Window window)
+ {
+ _window = new(window);
+ window.Closed += OnWindowClosed;
+ }
+
+ public void Disconnect(WebView2 platformView)
+ {
+ platformView.WebMessageReceived -= OnWebMessageReceived;
+ platformView.CoreWebView2.WebResourceRequested -= OnWebResourceRequested;
+
+ if (platformView.CoreWebView2 is CoreWebView2 webView2)
+ {
+ webView2.Stop();
+ }
+
+ if (Window is Window window)
+ {
+ window.Closed -= OnWindowClosed;
+ }
+
+ _handler = null;
+ _window = null;
+ }
+
+ void OnWebMessageReceived(WebView2 sender, CoreWebView2WebMessageReceivedEventArgs args)
+ {
+ if (Handler is HybridWebViewHandler handler)
+ {
+ handler.OnWebMessageReceived(sender, args);
+ }
+ }
+
+ void OnWindowClosed(object sender, WindowEventArgs args)
+ {
+ if (Handler is HybridWebViewHandler handler)
+ {
+ handler.Disconnect(handler.PlatformView);
+ }
+ }
+ }
+ }
+}
diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
new file mode 100644
index 000000000000..931fe4347f25
--- /dev/null
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
@@ -0,0 +1,110 @@
+#if __IOS__ || MACCATALYST
+using PlatformView = WebKit.WKWebView;
+#elif MONOANDROID
+using PlatformView = Android.Webkit.WebView;
+#elif WINDOWS
+using PlatformView = Microsoft.UI.Xaml.Controls.WebView2;
+#elif TIZEN
+using PlatformView = Tizen.NUI.BaseComponents.View;
+#elif (NETSTANDARD || !PLATFORM) || (NET6_0_OR_GREATER && !IOS && !ANDROID && !TIZEN)
+using PlatformView = System.Object;
+#endif
+#if __ANDROID__
+using Android.Webkit;
+#elif __IOS__
+using WebKit;
+#endif
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.Maui.Storage;
+using System;
+
+namespace Microsoft.Maui.Handlers
+{
+ public partial class HybridWebViewHandler : IHybridWebViewHandler
+ {
+ // Using an IP address means that the web view doesn't wait for any DNS resolution,
+ // making it substantially faster. Note that this isn't real HTTP traffic, since
+ // we intercept all the requests within this origin.
+ private static readonly string AppHostAddress = "0.0.0.0";
+
+ private static readonly string AppHostScheme =
+#if IOS || MACCATALYST
+ "app";
+#else
+ "https";
+#endif
+
+ ///
+ /// Gets the application's base URI. Defaults to https://0.0.0.0/ on Windows and Android,
+ /// and app://0.0.0.0/ on iOS and MacCatalyst (because https is reserved).
+ ///
+ internal static readonly string AppOrigin = $"{AppHostScheme}://{AppHostAddress}/";
+
+ internal static readonly Uri AppOriginUri = new(AppOrigin);
+
+ public static IPropertyMapper Mapper = new PropertyMapper(ViewHandler.ViewMapper)
+ {
+ [nameof(IHybridWebView.DefaultFile)] = MapDefaultFile,
+ [nameof(IHybridWebView.HybridRoot)] = MapHybridRoot,
+ };
+
+ public static CommandMapper CommandMapper = new(ViewCommandMapper)
+ {
+ [nameof(IHybridWebView.SendRawMessage)] = MapSendRawMessage,
+ };
+
+ public HybridWebViewHandler() : base(Mapper, CommandMapper)
+ {
+ }
+
+ public HybridWebViewHandler(IPropertyMapper? mapper = null, CommandMapper? commandMapper = null)
+ : base(mapper ?? Mapper, commandMapper ?? CommandMapper)
+ {
+ }
+
+ IHybridWebView IHybridWebViewHandler.VirtualView => VirtualView;
+
+ PlatformView IHybridWebViewHandler.PlatformView => PlatformView;
+
+ public static void MapDefaultFile(IHybridWebViewHandler handler, IHybridWebView hybridWebView)
+ {
+ handler.DefaultFile = hybridWebView.DefaultFile;
+ }
+
+ public static void MapHybridRoot(IHybridWebViewHandler handler, IHybridWebView hybridWebView)
+ {
+ handler.HybridRoot = hybridWebView.HybridRoot;
+ }
+
+ public string? DefaultFile { get; set; }
+ public string? HybridRoot { get; set; }
+
+ internal static async Task GetAssetContentAsync(string assetPath)
+ {
+ using var stream = await GetAssetStreamAsync(assetPath);
+ if (stream == null)
+ {
+ return null;
+ }
+ using var reader = new StreamReader(stream);
+
+ var contents = reader.ReadToEnd();
+
+ return contents;
+ }
+
+ internal static async Task GetAssetStreamAsync(string assetPath)
+ {
+ if (!await FileSystem.AppPackageFileExistsAsync(assetPath))
+ {
+ return null;
+ }
+ return await FileSystem.OpenAppPackageFileAsync(assetPath);
+ }
+
+#if !NETSTANDARD
+ internal static readonly FileExtensionContentTypeProvider ContentTypeProvider = new();
+#endif
+ }
+}
diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.iOS.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.iOS.cs
new file mode 100644
index 000000000000..172e0f4368fb
--- /dev/null
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.iOS.cs
@@ -0,0 +1,212 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Net;
+using System.Runtime.Versioning;
+using System.Text;
+using System.Threading.Tasks;
+using Foundation;
+using Microsoft.Extensions.Logging;
+using Microsoft.Maui.Graphics;
+using UIKit;
+using WebKit;
+using RectangleF = CoreGraphics.CGRect;
+
+namespace Microsoft.Maui.Handlers
+{
+ public partial class HybridWebViewHandler : ViewHandler
+ {
+ private const string ScriptMessageHandlerName = "webwindowinterop";
+
+ //protected virtual float MinimumSize => 44f;
+
+ //WKUIDelegate? _delegate;
+
+ protected override WKWebView CreatePlatformView()
+ {
+ var config = new WKWebViewConfiguration();
+
+ // By default, setting inline media playback to allowed, including autoplay
+ // and picture in picture, since these things MUST be set during the webview
+ // creation, and have no effect if set afterwards.
+ // A custom handler factory delegate could be set to disable these defaults
+ // but if we do not set them here, they cannot be changed once the
+ // handler's platform view is created, so erring on the side of wanting this
+ // capability by default.
+ if (OperatingSystem.IsMacCatalystVersionAtLeast(10) || OperatingSystem.IsIOSVersionAtLeast(10))
+ {
+ config.AllowsPictureInPictureMediaPlayback = true;
+ config.AllowsInlineMediaPlayback = true;
+ config.MediaTypesRequiringUserActionForPlayback = WKAudiovisualMediaTypes.None;
+ }
+
+ config.DefaultWebpagePreferences!.AllowsContentJavaScript = true;
+
+ config.UserContentController.AddScriptMessageHandler(new WebViewScriptMessageHandler(this), ScriptMessageHandlerName);
+ // iOS WKWebView doesn't allow handling 'http'/'https' schemes, so we use the fake 'app' scheme
+ config.SetUrlSchemeHandler(new SchemeHandler(this), urlScheme: "app");
+
+ var webview = new WKWebView(RectangleF.Empty, config)
+ {
+ BackgroundColor = UIColor.Clear,
+ AutosizesSubviews = true
+ };
+
+ if (true)//DeveloperTools.Enabled)
+ {
+ // Legacy Developer Extras setting.
+ config.Preferences.SetValueForKey(NSObject.FromObject(true), new NSString("developerExtrasEnabled"));
+
+ if (OperatingSystem.IsIOSVersionAtLeast(16, 4) || OperatingSystem.IsMacCatalystVersionAtLeast(16, 6))
+ {
+ // Enable Developer Extras for iOS builds for 16.4+ and Mac Catalyst builds for 16.6 (macOS 13.5)+
+ webview.SetValueForKey(NSObject.FromObject(true), new NSString("inspectable"));
+ }
+ }
+
+ return new MauiHybridWebView(this, RectangleF.Empty, config);
+ }
+
+ public static void MapSendRawMessage(IHybridWebViewHandler handler, IHybridWebView hybridWebView, object? arg)
+ {
+ if (arg is not string rawMessage || handler.PlatformView is not IHybridPlatformWebView hybridPlatformWebView)
+ {
+ return;
+ }
+
+ hybridPlatformWebView.SendRawMessage(rawMessage);
+ }
+
+ private void MessageReceived(Uri uri, string message)
+ {
+ VirtualView?.RawMessageReceived(message);
+ }
+
+ protected override void ConnectHandler(WKWebView platformView)
+ {
+ base.ConnectHandler(platformView);
+
+ using var nsUrl = new NSUrl(new Uri(AppOriginUri, "/").ToString());
+ using var request = new NSUrlRequest(nsUrl);
+
+ platformView.LoadRequest(request);
+ }
+
+ protected override void DisconnectHandler(WKWebView platformView)
+ {
+ platformView.Configuration.UserContentController.RemoveScriptMessageHandler(ScriptMessageHandlerName);
+
+ base.DisconnectHandler(platformView);
+ }
+
+ private sealed class WebViewScriptMessageHandler : NSObject, IWKScriptMessageHandler
+ {
+ private readonly WeakReference _webViewHandler;
+
+ public WebViewScriptMessageHandler(HybridWebViewHandler webViewHandler)
+ {
+ _webViewHandler = new(webViewHandler);
+ }
+
+ private HybridWebViewHandler? Handler => _webViewHandler is not null && _webViewHandler.TryGetTarget(out var h) ? h : null;
+
+ public void DidReceiveScriptMessage(WKUserContentController userContentController, WKScriptMessage message)
+ {
+ ArgumentNullException.ThrowIfNull(message);
+ Handler?.MessageReceived(AppOriginUri, ((NSString)message.Body).ToString());
+ }
+ }
+
+ private class SchemeHandler : NSObject, IWKUrlSchemeHandler
+ {
+ private readonly WeakReference _webViewHandler;
+
+ public SchemeHandler(HybridWebViewHandler webViewHandler)
+ {
+ _webViewHandler = new(webViewHandler);
+ }
+
+ private HybridWebViewHandler? Handler => _webViewHandler is not null && _webViewHandler.TryGetTarget(out var h) ? h : null;
+
+ [Export("webView:startURLSchemeTask:")]
+ [SupportedOSPlatform("ios11.0")]
+ public async void StartUrlSchemeTask(WKWebView webView, IWKUrlSchemeTask urlSchemeTask)
+ {
+ var url = urlSchemeTask.Request.Url?.AbsoluteString ?? "";
+
+ var responseData = await GetResponseBytes(url);
+
+ if (responseData.StatusCode == 200)
+ {
+ using (var dic = new NSMutableDictionary())
+ {
+ dic.Add((NSString)"Content-Length", (NSString)(responseData.ResponseBytes.Length.ToString(CultureInfo.InvariantCulture)));
+ dic.Add((NSString)"Content-Type", (NSString)responseData.ContentType);
+ // Disable local caching. This will prevent user scripts from executing correctly.
+ dic.Add((NSString)"Cache-Control", (NSString)"no-cache, max-age=0, must-revalidate, no-store");
+ if (urlSchemeTask.Request.Url != null)
+ {
+ using var response = new NSHttpUrlResponse(urlSchemeTask.Request.Url, responseData.StatusCode, "HTTP/1.1", dic);
+ urlSchemeTask.DidReceiveResponse(response);
+ }
+ }
+
+ urlSchemeTask.DidReceiveData(NSData.FromArray(responseData.ResponseBytes));
+ urlSchemeTask.DidFinish();
+ }
+ }
+
+ private async Task<(byte[] ResponseBytes, string ContentType, int StatusCode)> GetResponseBytes(string? url)
+ {
+ if (Handler is null)
+ {
+ return (Array.Empty(), ContentType: string.Empty, StatusCode: 404);
+ }
+
+ string contentType;
+
+ await Task.Delay(0);
+
+ var fullUrl = url;
+ url = HybridWebViewQueryStringHelper.RemovePossibleQueryString(url);
+
+ if (new Uri(url) is Uri uri && AppOriginUri.IsBaseOf(uri))
+ {
+ var relativePath = AppOriginUri.MakeRelativeUri(uri).ToString().Replace('\\', '/');
+
+ var bundleRootDir = Path.Combine(NSBundle.MainBundle.ResourcePath, Handler.HybridRoot!);
+
+ if (string.IsNullOrEmpty(relativePath))
+ {
+ relativePath = Handler.DefaultFile!.Replace('\\', '/');
+ contentType = "text/html";
+ }
+ else
+ {
+ if (!ContentTypeProvider.TryGetContentType(relativePath, out contentType!))
+ {
+ // TODO: Log this
+ contentType = "text/plain";
+ }
+ }
+
+ var assetPath = Path.Combine(bundleRootDir, relativePath);
+
+ if (File.Exists(assetPath))
+ {
+ return (File.ReadAllBytes(assetPath), contentType, StatusCode: 200);
+ }
+ }
+
+ return (Array.Empty(), ContentType: string.Empty, StatusCode: 404);
+ }
+
+ [Export("webView:stopURLSchemeTask:")]
+ public void StopUrlSchemeTask(WKWebView webView, IWKUrlSchemeTask urlSchemeTask)
+ {
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewQueryStringHelper.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewQueryStringHelper.cs
new file mode 100644
index 000000000000..a61918675980
--- /dev/null
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewQueryStringHelper.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+#if !NETSTANDARD
+namespace Microsoft.Maui
+{
+ internal class HybridWebViewQueryStringHelper
+ {
+ public static string RemovePossibleQueryString(string? url)
+ {
+ if (string.IsNullOrEmpty(url))
+ {
+ return string.Empty;
+ }
+ var indexOfQueryString = url.IndexOf('?', StringComparison.Ordinal);
+ return (indexOfQueryString == -1)
+ ? url
+ : url.Substring(0, indexOfQueryString);
+ }
+
+ // TODO: Replace this
+
+ ///
+ /// A simple utility that takes a URL, extracts the query string and returns a dictionary of key-value pairs.
+ /// Note that values are unescaped. Manually created URLs in JavaScript should use encodeURIComponent to escape values.
+ ///
+ ///
+ ///
+ public static Dictionary GetKeyValuePairs(string? url)
+ {
+ var result = new Dictionary();
+ if (!string.IsNullOrEmpty(url))
+ {
+ var query = new Uri(url).Query;
+ if (query != null && query.Length > 1)
+ {
+ result = query
+ .Substring(1)
+ .Split('&')
+ .Select(p => p.Split('='))
+ .ToDictionary(p => p[0], p => Uri.UnescapeDataString(p[1]));
+ }
+ }
+
+ return result;
+ }
+ }
+}
+#endif
diff --git a/src/Core/src/Handlers/HybridWebView/IHybridPlatformWebView.cs b/src/Core/src/Handlers/HybridWebView/IHybridPlatformWebView.cs
new file mode 100644
index 000000000000..6fc06b9e1a34
--- /dev/null
+++ b/src/Core/src/Handlers/HybridWebView/IHybridPlatformWebView.cs
@@ -0,0 +1,7 @@
+namespace Microsoft.Maui.Handlers
+{
+ public interface IHybridPlatformWebView
+ {
+ void SendRawMessage(string rawMessage);
+ }
+}
diff --git a/src/Core/src/Handlers/HybridWebView/IHybridWebViewHandler.cs b/src/Core/src/Handlers/HybridWebView/IHybridWebViewHandler.cs
new file mode 100644
index 000000000000..88bcb97a4d27
--- /dev/null
+++ b/src/Core/src/Handlers/HybridWebView/IHybridWebViewHandler.cs
@@ -0,0 +1,23 @@
+#if __IOS__ || MACCATALYST
+using PlatformView = WebKit.WKWebView;
+#elif MONOANDROID
+using PlatformView = Android.Webkit.WebView;
+#elif WINDOWS
+using PlatformView = Microsoft.UI.Xaml.Controls.WebView2;
+#elif TIZEN
+using PlatformView = Tizen.NUI.BaseComponents.View;
+#elif (NETSTANDARD || !PLATFORM) || (NET6_0_OR_GREATER && !IOS && !ANDROID && !TIZEN)
+using PlatformView = System.Object;
+#endif
+
+namespace Microsoft.Maui.Handlers
+{
+ public partial interface IHybridWebViewHandler : IViewHandler
+ {
+ new IHybridWebView VirtualView { get; }
+ new PlatformView PlatformView { get; }
+
+ string? DefaultFile { get; set; }
+ string? HybridRoot { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/Android/MauiHybridWebView.cs b/src/Core/src/Platform/Android/MauiHybridWebView.cs
new file mode 100644
index 000000000000..c37de02919ba
--- /dev/null
+++ b/src/Core/src/Platform/Android/MauiHybridWebView.cs
@@ -0,0 +1,27 @@
+using System;
+using Android.Content;
+using Android.Webkit;
+using AWebView = Android.Webkit.WebView;
+using AUri = Android.Net.Uri;
+
+namespace Microsoft.Maui.Platform
+{
+ public class MauiHybridWebView : AWebView, IHybridPlatformWebView
+ {
+ private readonly WeakReference _handler;
+ private static readonly AUri AndroidAppOriginUri = AUri.Parse(HybridWebViewHandler.AppOrigin)!;
+
+ public MauiHybridWebView(HybridWebViewHandler handler, Context context) : base(context)
+ {
+ ArgumentNullException.ThrowIfNull(handler, nameof(handler));
+ _handler = new WeakReference(handler);
+ }
+
+ public void SendRawMessage(string rawMessage)
+ {
+#pragma warning disable CA1416 // Validate platform compatibility
+ PostWebMessage(new WebMessage(rawMessage), AndroidAppOriginUri);
+#pragma warning restore CA1416 // Validate platform compatibility
+ }
+ }
+}
diff --git a/src/Core/src/Platform/Android/MauiHybridWebViewClient.cs b/src/Core/src/Platform/Android/MauiHybridWebViewClient.cs
new file mode 100644
index 000000000000..01baebcdd9b4
--- /dev/null
+++ b/src/Core/src/Platform/Android/MauiHybridWebViewClient.cs
@@ -0,0 +1,124 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using Android.Webkit;
+using AWebView = Android.Webkit.WebView;
+
+namespace Microsoft.Maui.Platform
+{
+ public class MauiHybridWebViewClient : WebViewClient
+ {
+ private readonly WeakReference _handler;
+
+ public MauiHybridWebViewClient(HybridWebViewHandler handler)
+ {
+ _handler = new(handler);
+ }
+
+ private HybridWebViewHandler? Handler => _handler is not null && _handler.TryGetTarget(out var h) ? h : null;
+
+ public override WebResourceResponse? ShouldInterceptRequest(AWebView? view, IWebResourceRequest? request)
+ {
+ if (Handler is null)
+ {
+ return base.ShouldInterceptRequest(view, request);
+ }
+
+ var fullUrl = request?.Url?.ToString();
+ var requestUri = HybridWebViewQueryStringHelper.RemovePossibleQueryString(fullUrl);
+
+ if (new Uri(requestUri) is Uri uri && HybridWebViewHandler.AppOriginUri.IsBaseOf(uri))
+ {
+ var relativePath = HybridWebViewHandler.AppOriginUri.MakeRelativeUri(uri).ToString().Replace('/', '\\');
+
+ string contentType;
+ if (string.IsNullOrEmpty(relativePath))
+ {
+ relativePath = Handler.DefaultFile;
+ contentType = "text/html";
+ }
+ else
+ {
+ if (!HybridWebViewHandler.ContentTypeProvider.TryGetContentType(relativePath, out contentType!))
+ {
+ // TODO: Log this
+ contentType = "text/plain";
+ }
+ }
+
+ var assetPath = Path.Combine(Handler.HybridRoot!, relativePath!);
+ var contentStream = PlatformOpenAppPackageFile(assetPath);
+
+ if (contentStream is null)
+ {
+ var notFoundContent = "Resource not found (404)";
+
+ var notFoundByteArray = Encoding.UTF8.GetBytes(notFoundContent);
+ var notFoundContentStream = new MemoryStream(notFoundByteArray);
+
+ return new WebResourceResponse("text/plain", "UTF-8", 404, "Not Found", GetHeaders("text/plain"), notFoundContentStream);
+ }
+ else
+ {
+ // TODO: We don't know the content length because Android doesn't tell us. Seems to work without it!
+ return new WebResourceResponse(contentType, "UTF-8", 200, "OK", GetHeaders(contentType), contentStream);
+ }
+ }
+ else
+ {
+ return base.ShouldInterceptRequest(view, request);
+ }
+ }
+
+ private Stream? PlatformOpenAppPackageFile(string filename)
+ {
+ if (Handler is null)
+ {
+ return null;
+ }
+
+ filename = PathUtils.NormalizePath(filename);
+
+ try
+ {
+ return Handler.Context.Assets?.Open(filename);
+ }
+ catch (Java.IO.FileNotFoundException)
+ {
+ return null;
+ }
+ }
+
+ internal static class PathUtils
+ {
+ public static string NormalizePath(string filename) =>
+ filename
+ .Replace('\\', Path.DirectorySeparatorChar)
+ .Replace('/', Path.DirectorySeparatorChar);
+ }
+
+ private protected static IDictionary GetHeaders(string contentType) =>
+ new Dictionary {
+ { "Content-Type", contentType },
+ };
+
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing)
+ {
+ Disconnect();
+ }
+
+ base.Dispose(disposing);
+ }
+
+ internal void Disconnect()
+ {
+ _handler.SetTarget(null);
+ }
+ }
+}
diff --git a/src/Core/src/Platform/Windows/MauiHybridWebView.cs b/src/Core/src/Platform/Windows/MauiHybridWebView.cs
new file mode 100644
index 000000000000..dab8110bcd36
--- /dev/null
+++ b/src/Core/src/Platform/Windows/MauiHybridWebView.cs
@@ -0,0 +1,22 @@
+using System;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.Web.WebView2.Core;
+
+namespace Microsoft.Maui.Platform
+{
+ public class MauiHybridWebView : WebView2, IHybridPlatformWebView
+ {
+ private readonly WeakReference _handler;
+
+ public MauiHybridWebView(HybridWebViewHandler handler)
+ {
+ ArgumentNullException.ThrowIfNull(handler, nameof(handler));
+ _handler = new WeakReference(handler);
+ }
+
+ public void SendRawMessage(string rawMessage)
+ {
+ CoreWebView2.PostWebMessageAsString(rawMessage);
+ }
+ }
+}
diff --git a/src/Core/src/Platform/iOS/MauiHybridWebView.cs b/src/Core/src/Platform/iOS/MauiHybridWebView.cs
new file mode 100644
index 000000000000..0e20121e49ce
--- /dev/null
+++ b/src/Core/src/Platform/iOS/MauiHybridWebView.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Foundation;
+using WebKit;
+using RectangleF = CoreGraphics.CGRect;
+
+namespace Microsoft.Maui.Platform
+{
+ // Note: This type is partial to allow for source generation to create a partial class for the nested RawMessageContext type
+ public partial class MauiHybridWebView : WKWebView, IHybridPlatformWebView
+ {
+ private readonly WeakReference _handler;
+
+ public MauiHybridWebView(HybridWebViewHandler handler, RectangleF frame, WKWebViewConfiguration configuration)
+ : base(frame, configuration)
+ {
+ ArgumentNullException.ThrowIfNull(handler, nameof(handler));
+ _handler = new WeakReference(handler);
+ }
+
+ public void SendRawMessage(string rawMessage)
+ {
+ EvaluateJavaScript(
+ new NSString($"window.external.receiveMessage({JsonSerializer.Serialize(rawMessage, RawMessageContext.Default.String)})"),
+ (result, error) =>
+ {
+ // Handle the result or error here
+ });
+ }
+
+ [JsonSourceGenerationOptions()]
+ [JsonSerializable(typeof(string))]
+ internal partial class RawMessageContext : JsonSerializerContext
+ {
+ }
+ }
+}
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 30afe0ce3405..7d3e8bad4603 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -4,7 +4,28 @@ abstract Microsoft.Maui.PlatformWrapperView.DrawShadow(Android.Graphics.Canvas!
Microsoft.Maui.CommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler, Microsoft.Maui.IElement? virtualView, string! property, object? args) -> void
Microsoft.Maui.FocusRequest.FocusRequest() -> void
Microsoft.Maui.FontSize.Equals(Microsoft.Maui.FontSize other) -> bool
+Microsoft.Maui.Handlers.HybridWebViewHandler
+Microsoft.Maui.Handlers.HybridWebViewHandler.DefaultFile.get -> string?
+Microsoft.Maui.Handlers.HybridWebViewHandler.DefaultFile.set -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridRoot.get -> string?
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridRoot.set -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridWebViewHandler() -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridWebViewHandler(Microsoft.Maui.IPropertyMapper? mapper = null, Microsoft.Maui.CommandMapper? commandMapper = null) -> void
+Microsoft.Maui.Handlers.IHybridPlatformWebView
+Microsoft.Maui.Handlers.IHybridPlatformWebView.SendRawMessage(string! rawMessage) -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler
+Microsoft.Maui.Handlers.IHybridWebViewHandler.DefaultFile.get -> string?
+Microsoft.Maui.Handlers.IHybridWebViewHandler.DefaultFile.set -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler.HybridRoot.get -> string?
+Microsoft.Maui.Handlers.IHybridWebViewHandler.HybridRoot.set -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler.PlatformView.get -> Android.Webkit.WebView!
+Microsoft.Maui.Handlers.IHybridWebViewHandler.VirtualView.get -> Microsoft.Maui.IHybridWebView!
Microsoft.Maui.Handlers.ISwipeItemMenuItemHandler.SourceLoader.get -> Microsoft.Maui.Platform.ImageSourcePartLoader?
+Microsoft.Maui.IHybridWebView
+Microsoft.Maui.IHybridWebView.DefaultFile.get -> string?
+Microsoft.Maui.IHybridWebView.HybridRoot.get -> string?
+Microsoft.Maui.IHybridWebView.RawMessageReceived(string! rawMessage) -> void
+Microsoft.Maui.IHybridWebView.SendRawMessage(string! rawMessage) -> void
Microsoft.Maui.IKeyboardAccelerator
Microsoft.Maui.ElementHandlerExtensions
Microsoft.Maui.IKeyboardAccelerator.Key.get -> string?
@@ -27,6 +48,11 @@ Microsoft.Maui.KeyboardAcceleratorModifiers.None = 0 -> Microsoft.Maui.KeyboardA
Microsoft.Maui.KeyboardAcceleratorModifiers.Shift = 1 -> Microsoft.Maui.KeyboardAcceleratorModifiers
Microsoft.Maui.KeyboardAcceleratorModifiers.Windows = 16 -> Microsoft.Maui.KeyboardAcceleratorModifiers
Microsoft.Maui.Layouts.FlexBasis.Equals(Microsoft.Maui.Layouts.FlexBasis other) -> bool
+Microsoft.Maui.Platform.MauiHybridWebView
+Microsoft.Maui.Platform.MauiHybridWebView.MauiHybridWebView(Microsoft.Maui.Handlers.HybridWebViewHandler! handler, Android.Content.Context! context) -> void
+Microsoft.Maui.Platform.MauiHybridWebView.SendRawMessage(string! rawMessage) -> void
+Microsoft.Maui.Platform.MauiHybridWebViewClient
+Microsoft.Maui.Platform.MauiHybridWebViewClient.MauiHybridWebViewClient(Microsoft.Maui.Handlers.HybridWebViewHandler! handler) -> void
Microsoft.Maui.Platform.MauiMaterialButton.MauiMaterialButton(Android.Content.Context! context, Android.Util.IAttributeSet? attrs) -> void
Microsoft.Maui.Platform.MauiMaterialButton.MauiMaterialButton(Android.Content.Context! context, Android.Util.IAttributeSet? attrs, int defStyleAttr) -> void
Microsoft.Maui.Platform.MauiMaterialButton.MauiMaterialButton(nint javaReference, Android.Runtime.JniHandleOwnership transfer) -> void
@@ -65,11 +91,16 @@ Microsoft.Maui.SoftInputExtensions
override Microsoft.Maui.FontSize.Equals(object? obj) -> bool
override Microsoft.Maui.FontSize.GetHashCode() -> int
override Microsoft.Maui.Handlers.EditorHandler.PlatformArrange(Microsoft.Maui.Graphics.Rect frame) -> void
+override Microsoft.Maui.Handlers.HybridWebViewHandler.ConnectHandler(Android.Webkit.WebView! platformView) -> void
+override Microsoft.Maui.Handlers.HybridWebViewHandler.CreatePlatformView() -> Android.Webkit.WebView!
+override Microsoft.Maui.Handlers.HybridWebViewHandler.DisconnectHandler(Android.Webkit.WebView! platformView) -> void
override Microsoft.Maui.Handlers.RadioButtonHandler.PlatformArrange(Microsoft.Maui.Graphics.Rect frame) -> void
override Microsoft.Maui.Handlers.ShapeViewHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
override Microsoft.Maui.Layouts.FlexBasis.Equals(object? obj) -> bool
override Microsoft.Maui.Layouts.FlexBasis.GetHashCode() -> int
override Microsoft.Maui.MauiAppCompatActivity.DispatchTouchEvent(Android.Views.MotionEvent? e) -> bool
+override Microsoft.Maui.Platform.MauiHybridWebViewClient.Dispose(bool disposing) -> void
+override Microsoft.Maui.Platform.MauiHybridWebViewClient.ShouldInterceptRequest(Android.Webkit.WebView? view, Android.Webkit.IWebResourceRequest? request) -> Android.Webkit.WebResourceResponse?
override Microsoft.Maui.PlatformAppCompatTextView.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
override Microsoft.Maui.PlatformAppCompatTextView.ThresholdClass.get -> nint
override Microsoft.Maui.PlatformAppCompatTextView.ThresholdType.get -> System.Type!
@@ -102,6 +133,11 @@ static Microsoft.Maui.GridLength.operator !=(Microsoft.Maui.GridLength left, Mic
static Microsoft.Maui.GridLength.operator ==(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
static Microsoft.Maui.Handlers.EditorHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEditorHandler! handler, Microsoft.Maui.IEditor! editor) -> void
static Microsoft.Maui.Handlers.EntryHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.CommandMapper -> Microsoft.Maui.CommandMapper!
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapDefaultFile(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapHybridRoot(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapSendRawMessage(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView, object? arg) -> void
static Microsoft.Maui.Handlers.ImageButtonHandler.MapBackground(Microsoft.Maui.Handlers.IImageButtonHandler! handler, Microsoft.Maui.IImageButton! imageButton) -> void
static Microsoft.Maui.Handlers.LayoutHandler.MapInputTransparent(Microsoft.Maui.ILayoutHandler! handler, Microsoft.Maui.ILayout! layout) -> void
static Microsoft.Maui.Handlers.SearchBarHandler.MapFocus(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar, object? args) -> void
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 4e3395a8eecb..5c8893e5685e 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -2,12 +2,33 @@
Microsoft.Maui.CommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler, Microsoft.Maui.IElement? virtualView, string! property, object? args) -> void
Microsoft.Maui.ElementHandlerExtensions
Microsoft.Maui.FocusRequest.FocusRequest() -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler
+Microsoft.Maui.Handlers.HybridWebViewHandler.DefaultFile.get -> string?
+Microsoft.Maui.Handlers.HybridWebViewHandler.DefaultFile.set -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridRoot.get -> string?
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridRoot.set -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridWebViewHandler() -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridWebViewHandler(Microsoft.Maui.IPropertyMapper? mapper = null, Microsoft.Maui.CommandMapper? commandMapper = null) -> void
+Microsoft.Maui.Handlers.IHybridPlatformWebView
+Microsoft.Maui.Handlers.IHybridPlatformWebView.SendRawMessage(string! rawMessage) -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler
+Microsoft.Maui.Handlers.IHybridWebViewHandler.DefaultFile.get -> string?
+Microsoft.Maui.Handlers.IHybridWebViewHandler.DefaultFile.set -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler.HybridRoot.get -> string?
+Microsoft.Maui.Handlers.IHybridWebViewHandler.HybridRoot.set -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler.PlatformView.get -> WebKit.WKWebView!
+Microsoft.Maui.Handlers.IHybridWebViewHandler.VirtualView.get -> Microsoft.Maui.IHybridWebView!
Microsoft.Maui.Handlers.IImageHandler.OnWindowChanged() -> void
Microsoft.Maui.Handlers.ImageHandler.OnWindowChanged() -> void
Microsoft.Maui.Handlers.ISwipeItemMenuItemHandler.SourceLoader.get -> Microsoft.Maui.Platform.ImageSourcePartLoader?
Microsoft.Maui.Handlers.SwipeItemButton
Microsoft.Maui.Handlers.SwipeItemButton.FrameChanged -> System.EventHandler?
Microsoft.Maui.Handlers.SwipeItemButton.SwipeItemButton() -> void
+Microsoft.Maui.IHybridWebView
+Microsoft.Maui.IHybridWebView.DefaultFile.get -> string?
+Microsoft.Maui.IHybridWebView.HybridRoot.get -> string?
+Microsoft.Maui.IHybridWebView.RawMessageReceived(string! rawMessage) -> void
+Microsoft.Maui.IHybridWebView.SendRawMessage(string! rawMessage) -> void
Microsoft.Maui.IKeyboardAccelerator
Microsoft.Maui.IKeyboardAccelerator.Key.get -> string?
Microsoft.Maui.IKeyboardAccelerator.Modifiers.get -> Microsoft.Maui.KeyboardAcceleratorModifiers
@@ -44,6 +65,9 @@ Microsoft.Maui.Platform.IImageSourcePartSetter.ImageSourcePart.get -> Microsoft.
Microsoft.Maui.Platform.IImageSourcePartSetter.SetImageSource(UIKit.UIImage? platformImage) -> void
Microsoft.Maui.Platform.ImageSourcePartLoader.ImageSourcePartLoader(Microsoft.Maui.Platform.IImageSourcePartSetter! setter) -> void
Microsoft.Maui.Platform.KeyboardAutoManagerScroll
+Microsoft.Maui.Platform.MauiHybridWebView
+Microsoft.Maui.Platform.MauiHybridWebView.MauiHybridWebView(Microsoft.Maui.Handlers.HybridWebViewHandler! handler, CoreGraphics.CGRect frame, WebKit.WKWebViewConfiguration! configuration) -> void
+Microsoft.Maui.Platform.MauiHybridWebView.SendRawMessage(string! rawMessage) -> void
Microsoft.Maui.Platform.MauiImageView.MauiImageView(Microsoft.Maui.Handlers.IImageHandler! handler) -> void
Microsoft.Maui.Platform.MauiView.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
Microsoft.Maui.Platform.MauiView.CrossPlatformLayout.set -> void
@@ -54,6 +78,9 @@ Microsoft.Maui.SoftInputExtensions
override Microsoft.Maui.Handlers.ButtonHandler.NeedsContainer.get -> bool
override Microsoft.Maui.Handlers.ContentViewHandler.DisconnectHandler(Microsoft.Maui.Platform.ContentView! platformView) -> void
override Microsoft.Maui.Handlers.RefreshViewHandler.SetVirtualView(Microsoft.Maui.IView! view) -> void
+override Microsoft.Maui.Handlers.HybridWebViewHandler.ConnectHandler(WebKit.WKWebView! platformView) -> void
+override Microsoft.Maui.Handlers.HybridWebViewHandler.CreatePlatformView() -> WebKit.WKWebView!
+override Microsoft.Maui.Handlers.HybridWebViewHandler.DisconnectHandler(WebKit.WKWebView! platformView) -> void
override Microsoft.Maui.Handlers.ScrollViewHandler.NeedsContainer.get -> bool
override Microsoft.Maui.Handlers.SwipeItemButton.Frame.get -> CoreGraphics.CGRect
override Microsoft.Maui.Handlers.SwipeItemButton.Frame.set -> void
@@ -97,6 +124,11 @@ static Microsoft.Maui.CommandMapperExtensions.PrependToMapping(this Microsoft.Maui.ICommandMapper! commandMapper, string! key, System.Action! method) -> void
static Microsoft.Maui.GridLength.operator !=(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
static Microsoft.Maui.GridLength.operator ==(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
+static Microsoft.Maui.Handlers.HybridWebViewHandler.CommandMapper -> Microsoft.Maui.CommandMapper!
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapDefaultFile(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapHybridRoot(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapSendRawMessage(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView, object? arg) -> void
static Microsoft.Maui.Handlers.MenuBarItemHandler.MapIsEnabled(Microsoft.Maui.Handlers.IMenuBarItemHandler! handler, Microsoft.Maui.IMenuBarItem! view) -> void
static Microsoft.Maui.Handlers.MenuFlyoutItemHandler.MapIsEnabled(Microsoft.Maui.Handlers.IMenuFlyoutItemHandler! handler, Microsoft.Maui.IMenuFlyoutItem! view) -> void
static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandler.MapIsEnabled(Microsoft.Maui.Handlers.IMenuFlyoutSubItemHandler! handler, Microsoft.Maui.IMenuFlyoutSubItem! view) -> void
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 476c14dbcc44..273f46361fd8 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,12 +1,33 @@
#nullable enable
Microsoft.Maui.CommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler, Microsoft.Maui.IElement? virtualView, string! property, object? args) -> void
Microsoft.Maui.FocusRequest.FocusRequest() -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler
+Microsoft.Maui.Handlers.HybridWebViewHandler.DefaultFile.get -> string?
+Microsoft.Maui.Handlers.HybridWebViewHandler.DefaultFile.set -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridRoot.get -> string?
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridRoot.set -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridWebViewHandler() -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridWebViewHandler(Microsoft.Maui.IPropertyMapper? mapper = null, Microsoft.Maui.CommandMapper? commandMapper = null) -> void
+Microsoft.Maui.Handlers.IHybridPlatformWebView
+Microsoft.Maui.Handlers.IHybridPlatformWebView.SendRawMessage(string! rawMessage) -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler
+Microsoft.Maui.Handlers.IHybridWebViewHandler.DefaultFile.get -> string?
+Microsoft.Maui.Handlers.IHybridWebViewHandler.DefaultFile.set -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler.HybridRoot.get -> string?
+Microsoft.Maui.Handlers.IHybridWebViewHandler.HybridRoot.set -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler.PlatformView.get -> WebKit.WKWebView!
+Microsoft.Maui.Handlers.IHybridWebViewHandler.VirtualView.get -> Microsoft.Maui.IHybridWebView!
Microsoft.Maui.Handlers.IImageHandler.OnWindowChanged() -> void
Microsoft.Maui.Handlers.ImageHandler.OnWindowChanged() -> void
Microsoft.Maui.Handlers.ISwipeItemMenuItemHandler.SourceLoader.get -> Microsoft.Maui.Platform.ImageSourcePartLoader?
Microsoft.Maui.Handlers.SwipeItemButton
Microsoft.Maui.Handlers.SwipeItemButton.FrameChanged -> System.EventHandler?
Microsoft.Maui.Handlers.SwipeItemButton.SwipeItemButton() -> void
+Microsoft.Maui.IHybridWebView
+Microsoft.Maui.IHybridWebView.DefaultFile.get -> string?
+Microsoft.Maui.IHybridWebView.HybridRoot.get -> string?
+Microsoft.Maui.IHybridWebView.RawMessageReceived(string! rawMessage) -> void
+Microsoft.Maui.IHybridWebView.SendRawMessage(string! rawMessage) -> void
Microsoft.Maui.IKeyboardAccelerator
Microsoft.Maui.ElementHandlerExtensions
Microsoft.Maui.IKeyboardAccelerator.Key.get -> string?
@@ -42,6 +63,9 @@ Microsoft.Maui.Platform.IImageSourcePartSetter.Handler.get -> Microsoft.Maui.IEl
Microsoft.Maui.Platform.IImageSourcePartSetter.ImageSourcePart.get -> Microsoft.Maui.IImageSourcePart?
Microsoft.Maui.Platform.IImageSourcePartSetter.SetImageSource(UIKit.UIImage? platformImage) -> void
Microsoft.Maui.Platform.ImageSourcePartLoader.ImageSourcePartLoader(Microsoft.Maui.Platform.IImageSourcePartSetter! setter) -> void
+Microsoft.Maui.Platform.MauiHybridWebView
+Microsoft.Maui.Platform.MauiHybridWebView.MauiHybridWebView(Microsoft.Maui.Handlers.HybridWebViewHandler! handler, CoreGraphics.CGRect frame, WebKit.WKWebViewConfiguration! configuration) -> void
+Microsoft.Maui.Platform.MauiHybridWebView.SendRawMessage(string! rawMessage) -> void
Microsoft.Maui.Platform.MauiImageView.MauiImageView(Microsoft.Maui.Handlers.IImageHandler! handler) -> void
Microsoft.Maui.Platform.MauiView.CacheMeasureConstraints(double widthConstraint, double heightConstraint) -> void
Microsoft.Maui.Platform.MauiView.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
@@ -57,6 +81,9 @@ Microsoft.Maui.SoftInputExtensions
override Microsoft.Maui.Handlers.ButtonHandler.NeedsContainer.get -> bool
override Microsoft.Maui.Handlers.ContentViewHandler.DisconnectHandler(Microsoft.Maui.Platform.ContentView! platformView) -> void
override Microsoft.Maui.Handlers.RefreshViewHandler.SetVirtualView(Microsoft.Maui.IView! view) -> void
+override Microsoft.Maui.Handlers.HybridWebViewHandler.ConnectHandler(WebKit.WKWebView! platformView) -> void
+override Microsoft.Maui.Handlers.HybridWebViewHandler.CreatePlatformView() -> WebKit.WKWebView!
+override Microsoft.Maui.Handlers.HybridWebViewHandler.DisconnectHandler(WebKit.WKWebView! platformView) -> void
override Microsoft.Maui.Handlers.ScrollViewHandler.NeedsContainer.get -> bool
override Microsoft.Maui.Handlers.SwipeItemButton.Frame.get -> CoreGraphics.CGRect
override Microsoft.Maui.Handlers.SwipeItemButton.Frame.set -> void
@@ -100,6 +127,11 @@ static Microsoft.Maui.CommandMapperExtensions.PrependToMapping(this Microsoft.Maui.ICommandMapper! commandMapper, string! key, System.Action! method) -> void
static Microsoft.Maui.GridLength.operator !=(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
static Microsoft.Maui.GridLength.operator ==(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
+static Microsoft.Maui.Handlers.HybridWebViewHandler.CommandMapper -> Microsoft.Maui.CommandMapper!
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapDefaultFile(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapHybridRoot(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapSendRawMessage(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView, object? arg) -> void
static Microsoft.Maui.Handlers.MenuBarItemHandler.MapIsEnabled(Microsoft.Maui.Handlers.IMenuBarItemHandler! handler, Microsoft.Maui.IMenuBarItem! view) -> void
static Microsoft.Maui.Handlers.MenuFlyoutItemHandler.MapIsEnabled(Microsoft.Maui.Handlers.IMenuFlyoutItemHandler! handler, Microsoft.Maui.IMenuFlyoutItem! view) -> void
static Microsoft.Maui.Handlers.MenuFlyoutSubItemHandler.MapIsEnabled(Microsoft.Maui.Handlers.IMenuFlyoutSubItemHandler! handler, Microsoft.Maui.IMenuFlyoutSubItem! view) -> void
@@ -176,3 +208,4 @@ virtual Microsoft.Maui.MauiUIApplicationDelegate.PerformFetch(UIKit.UIApplicatio
Microsoft.Maui.Platform.UIEdgeInsetsExtensions
static Microsoft.Maui.Platform.UIEdgeInsetsExtensions.ToThickness(this UIKit.UIEdgeInsets insets) -> Microsoft.Maui.Thickness
*REMOVED*override Microsoft.Maui.Platform.MauiLabel.InvalidateIntrinsicContentSize() -> void
+*REMOVED*override Microsoft.Maui.Platform.MauiLabel.InvalidateIntrinsicContentSize() -> void
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 8e05e6a7bd5f..a83d820ec813 100644
--- a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1,6 +1,22 @@
#nullable enable
Microsoft.Maui.CommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler, Microsoft.Maui.IElement? virtualView, string! property, object? args) -> void
Microsoft.Maui.FocusRequest.FocusRequest() -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler
+Microsoft.Maui.Handlers.HybridWebViewHandler.DefaultFile.get -> string?
+Microsoft.Maui.Handlers.HybridWebViewHandler.DefaultFile.set -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridRoot.get -> string?
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridRoot.set -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridWebViewHandler() -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridWebViewHandler(Microsoft.Maui.IPropertyMapper? mapper = null, Microsoft.Maui.CommandMapper? commandMapper = null) -> void
+Microsoft.Maui.Handlers.IHybridPlatformWebView
+Microsoft.Maui.Handlers.IHybridPlatformWebView.SendRawMessage(string! rawMessage) -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler
+Microsoft.Maui.Handlers.IHybridWebViewHandler.DefaultFile.get -> string?
+Microsoft.Maui.Handlers.IHybridWebViewHandler.DefaultFile.set -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler.HybridRoot.get -> string?
+Microsoft.Maui.Handlers.IHybridWebViewHandler.HybridRoot.set -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler.PlatformView.get -> Tizen.NUI.BaseComponents.View!
+Microsoft.Maui.Handlers.IHybridWebViewHandler.VirtualView.get -> Microsoft.Maui.IHybridWebView!
Microsoft.Maui.Handlers.ISwipeItemMenuItemHandler.SourceLoader.get -> Microsoft.Maui.Platform.ImageSourcePartLoader?
Microsoft.Maui.IApplication.UserAppTheme.get -> Microsoft.Maui.ApplicationModel.AppTheme
Microsoft.Maui.Hosting.MauiApp.DisposeAsync() -> System.Threading.Tasks.ValueTask
@@ -18,6 +34,11 @@ Microsoft.Maui.ICrossPlatformLayout.CrossPlatformMeasure(double widthConstraint,
Microsoft.Maui.ICrossPlatformLayoutBacking
Microsoft.Maui.ICrossPlatformLayoutBacking.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
Microsoft.Maui.ICrossPlatformLayoutBacking.CrossPlatformLayout.set -> void
+Microsoft.Maui.IHybridWebView
+Microsoft.Maui.IHybridWebView.DefaultFile.get -> string?
+Microsoft.Maui.IHybridWebView.HybridRoot.get -> string?
+Microsoft.Maui.IHybridWebView.RawMessageReceived(string! rawMessage) -> void
+Microsoft.Maui.IHybridWebView.SendRawMessage(string! rawMessage) -> void
Microsoft.Maui.Layouts.FlexBasis.Equals(Microsoft.Maui.Layouts.FlexBasis other) -> bool
Microsoft.Maui.KeyboardAcceleratorModifiers
Microsoft.Maui.KeyboardAcceleratorModifiers.Alt = 4 -> Microsoft.Maui.KeyboardAcceleratorModifiers
@@ -33,6 +54,7 @@ Microsoft.Maui.Platform.IImageSourcePartSetter.SetImageSource(Microsoft.Maui.Pla
Microsoft.Maui.Platform.ImageSourcePartLoader.ImageSourcePartLoader(Microsoft.Maui.Platform.IImageSourcePartSetter! setter) -> void
Microsoft.Maui.SizeRequest.Equals(Microsoft.Maui.SizeRequest other) -> bool
Microsoft.Maui.SoftInputExtensions
+override Microsoft.Maui.Handlers.HybridWebViewHandler.CreatePlatformView() -> Tizen.NUI.BaseComponents.View!
override Microsoft.Maui.Layouts.FlexBasis.Equals(object? obj) -> bool
override Microsoft.Maui.Layouts.FlexBasis.GetHashCode() -> int
override Microsoft.Maui.SizeRequest.Equals(object? obj) -> bool
@@ -48,6 +70,11 @@ static Microsoft.Maui.GridLength.operator !=(Microsoft.Maui.GridLength left, Mic
static Microsoft.Maui.GridLength.operator ==(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
static Microsoft.Maui.Handlers.EditorHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEditorHandler! handler, Microsoft.Maui.IEditor! editor) -> void
static Microsoft.Maui.Handlers.EntryHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.CommandMapper -> Microsoft.Maui.CommandMapper!
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapDefaultFile(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapHybridRoot(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapSendRawMessage(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView, object? arg) -> void
static Microsoft.Maui.Handlers.SearchBarHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.AddHandler(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.TryAddHandler(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index a957ec043376..c33da0734ca1 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,8 +1,29 @@
#nullable enable
Microsoft.Maui.CommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler, Microsoft.Maui.IElement? virtualView, string! property, object? args) -> void
Microsoft.Maui.FocusRequest.FocusRequest() -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler
+Microsoft.Maui.Handlers.HybridWebViewHandler.DefaultFile.get -> string?
+Microsoft.Maui.Handlers.HybridWebViewHandler.DefaultFile.set -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridRoot.get -> string?
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridRoot.set -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridWebViewHandler() -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridWebViewHandler(Microsoft.Maui.IPropertyMapper? mapper = null, Microsoft.Maui.CommandMapper? commandMapper = null) -> void
+Microsoft.Maui.Handlers.IHybridPlatformWebView
+Microsoft.Maui.Handlers.IHybridPlatformWebView.SendRawMessage(string! rawMessage) -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler
+Microsoft.Maui.Handlers.IHybridWebViewHandler.DefaultFile.get -> string?
+Microsoft.Maui.Handlers.IHybridWebViewHandler.DefaultFile.set -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler.HybridRoot.get -> string?
+Microsoft.Maui.Handlers.IHybridWebViewHandler.HybridRoot.set -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler.PlatformView.get -> Microsoft.UI.Xaml.Controls.WebView2!
+Microsoft.Maui.Handlers.IHybridWebViewHandler.VirtualView.get -> Microsoft.Maui.IHybridWebView!
Microsoft.Maui.Handlers.ISwipeItemMenuItemHandler.SourceLoader.get -> Microsoft.Maui.Platform.ImageSourcePartLoader?
Microsoft.Maui.ElementHandlerExtensions
+Microsoft.Maui.IHybridWebView
+Microsoft.Maui.IHybridWebView.DefaultFile.get -> string?
+Microsoft.Maui.IHybridWebView.HybridRoot.get -> string?
+Microsoft.Maui.IHybridWebView.RawMessageReceived(string! rawMessage) -> void
+Microsoft.Maui.IHybridWebView.SendRawMessage(string! rawMessage) -> void
Microsoft.Maui.IKeyboardAccelerator
Microsoft.Maui.IKeyboardAccelerator.Key.get -> string?
Microsoft.Maui.IKeyboardAccelerator.Modifiers.get -> Microsoft.Maui.KeyboardAcceleratorModifiers
@@ -37,6 +58,9 @@ Microsoft.Maui.Platform.IImageSourcePartSetter.ImageSourcePart.get -> Microsoft.
Microsoft.Maui.Platform.IImageSourcePartSetter.SetImageSource(Microsoft.UI.Xaml.Media.ImageSource? platformImage) -> void
Microsoft.Maui.Platform.ImageSourcePartLoader.ImageSourcePartLoader(Microsoft.Maui.Platform.IImageSourcePartSetter! setter) -> void
Microsoft.Maui.Platform.KeyboardAcceleratorExtensions
+Microsoft.Maui.Platform.MauiHybridWebView
+Microsoft.Maui.Platform.MauiHybridWebView.MauiHybridWebView(Microsoft.Maui.Handlers.HybridWebViewHandler! handler) -> void
+Microsoft.Maui.Platform.MauiHybridWebView.SendRawMessage(string! rawMessage) -> void
Microsoft.Maui.Platform.MauiPanel
Microsoft.Maui.Platform.MauiPanel.CrossPlatformLayout.get -> Microsoft.Maui.ICrossPlatformLayout?
Microsoft.Maui.Platform.MauiPanel.CrossPlatformLayout.set -> void
@@ -45,6 +69,9 @@ Microsoft.Maui.Platform.MauiWebView.MauiWebView(Microsoft.Maui.Handlers.WebViewH
Microsoft.Maui.SizeRequest.Equals(Microsoft.Maui.SizeRequest other) -> bool
Microsoft.Maui.SoftInputExtensions
override Microsoft.Maui.Handlers.ContentViewHandler.DisconnectHandler(Microsoft.Maui.Platform.ContentPanel! platformView) -> void
+override Microsoft.Maui.Handlers.HybridWebViewHandler.ConnectHandler(Microsoft.UI.Xaml.Controls.WebView2! platformView) -> void
+override Microsoft.Maui.Handlers.HybridWebViewHandler.CreatePlatformView() -> Microsoft.UI.Xaml.Controls.WebView2!
+override Microsoft.Maui.Handlers.HybridWebViewHandler.DisconnectHandler(Microsoft.UI.Xaml.Controls.WebView2! platformView) -> void
override Microsoft.Maui.Handlers.ImageHandler.ConnectHandler(Microsoft.UI.Xaml.Controls.Image! platformView) -> void
override Microsoft.Maui.Handlers.MenuFlyoutHandler.DisconnectHandler(Microsoft.UI.Xaml.Controls.MenuFlyout! platformView) -> void
override Microsoft.Maui.Layouts.FlexBasis.Equals(object? obj) -> bool
@@ -64,6 +91,11 @@ static Microsoft.Maui.GridLength.operator !=(Microsoft.Maui.GridLength left, Mic
static Microsoft.Maui.GridLength.operator ==(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
static Microsoft.Maui.Handlers.EditorHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEditorHandler! handler, Microsoft.Maui.IEditor! editor) -> void
static Microsoft.Maui.Handlers.EntryHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.CommandMapper -> Microsoft.Maui.CommandMapper!
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapDefaultFile(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapHybridRoot(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapSendRawMessage(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView, object? arg) -> void
static Microsoft.Maui.Handlers.LayoutHandler.MapInputTransparent(Microsoft.Maui.ILayoutHandler! handler, Microsoft.Maui.ILayout! layout) -> void
static Microsoft.Maui.Handlers.SearchBarHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
static Microsoft.Maui.Handlers.SwipeItemMenuItemHandler.MapSourceAsync(Microsoft.Maui.Handlers.ISwipeItemMenuItemHandler! handler, Microsoft.Maui.ISwipeItemMenuItem! image) -> System.Threading.Tasks.Task!
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index 6399505c2d87..c775e4e8e4b7 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -2,7 +2,28 @@
Microsoft.Maui.CommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler, Microsoft.Maui.IElement? virtualView, string! property, object? args) -> void
Microsoft.Maui.ElementHandlerExtensions
Microsoft.Maui.FocusRequest.FocusRequest() -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler
+Microsoft.Maui.Handlers.HybridWebViewHandler.DefaultFile.get -> string?
+Microsoft.Maui.Handlers.HybridWebViewHandler.DefaultFile.set -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridRoot.get -> string?
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridRoot.set -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridWebViewHandler() -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridWebViewHandler(Microsoft.Maui.IPropertyMapper? mapper = null, Microsoft.Maui.CommandMapper? commandMapper = null) -> void
+Microsoft.Maui.Handlers.IHybridPlatformWebView
+Microsoft.Maui.Handlers.IHybridPlatformWebView.SendRawMessage(string! rawMessage) -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler
+Microsoft.Maui.Handlers.IHybridWebViewHandler.DefaultFile.get -> string?
+Microsoft.Maui.Handlers.IHybridWebViewHandler.DefaultFile.set -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler.HybridRoot.get -> string?
+Microsoft.Maui.Handlers.IHybridWebViewHandler.HybridRoot.set -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler.PlatformView.get -> object!
+Microsoft.Maui.Handlers.IHybridWebViewHandler.VirtualView.get -> Microsoft.Maui.IHybridWebView!
Microsoft.Maui.Handlers.ISwipeItemMenuItemHandler.SourceLoader.get -> Microsoft.Maui.Platform.ImageSourcePartLoader?
+Microsoft.Maui.IHybridWebView
+Microsoft.Maui.IHybridWebView.DefaultFile.get -> string?
+Microsoft.Maui.IHybridWebView.HybridRoot.get -> string?
+Microsoft.Maui.IHybridWebView.RawMessageReceived(string! rawMessage) -> void
+Microsoft.Maui.IHybridWebView.SendRawMessage(string! rawMessage) -> void
Microsoft.Maui.IKeyboardAccelerator
Microsoft.Maui.IKeyboardAccelerator.Key.get -> string?
Microsoft.Maui.IApplication.UserAppTheme.get -> Microsoft.Maui.ApplicationModel.AppTheme
@@ -37,6 +58,7 @@ Microsoft.Maui.Platform.IImageSourcePartSetter.SetImageSource(object? platformIm
Microsoft.Maui.Platform.ImageSourcePartLoader.ImageSourcePartLoader(Microsoft.Maui.Platform.IImageSourcePartSetter! setter) -> void
Microsoft.Maui.SizeRequest.Equals(Microsoft.Maui.SizeRequest other) -> bool
Microsoft.Maui.SoftInputExtensions
+override Microsoft.Maui.Handlers.HybridWebViewHandler.CreatePlatformView() -> object!
override Microsoft.Maui.Layouts.FlexBasis.Equals(object? obj) -> bool
override Microsoft.Maui.Layouts.FlexBasis.GetHashCode() -> int
override Microsoft.Maui.SizeRequest.Equals(object? obj) -> bool
@@ -52,6 +74,11 @@ static Microsoft.Maui.GridLength.operator !=(Microsoft.Maui.GridLength left, Mic
static Microsoft.Maui.GridLength.operator ==(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
static Microsoft.Maui.Handlers.EditorHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEditorHandler! handler, Microsoft.Maui.IEditor! editor) -> void
static Microsoft.Maui.Handlers.EntryHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.CommandMapper -> Microsoft.Maui.CommandMapper!
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapDefaultFile(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapHybridRoot(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapSendRawMessage(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView, object? arg) -> void
static Microsoft.Maui.Handlers.SearchBarHandler.MapIsSpellCheckEnabled(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.AddHandler(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.TryAddHandler(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 9e5542bb4949..c40630b031da 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,6 +1,22 @@
#nullable enable
Microsoft.Maui.CommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler, Microsoft.Maui.IElement? virtualView, string! property, object? args) -> void
Microsoft.Maui.FocusRequest.FocusRequest() -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler
+Microsoft.Maui.Handlers.HybridWebViewHandler.DefaultFile.get -> string?
+Microsoft.Maui.Handlers.HybridWebViewHandler.DefaultFile.set -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridRoot.get -> string?
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridRoot.set -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridWebViewHandler() -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridWebViewHandler(Microsoft.Maui.IPropertyMapper? mapper = null, Microsoft.Maui.CommandMapper? commandMapper = null) -> void
+Microsoft.Maui.Handlers.IHybridPlatformWebView
+Microsoft.Maui.Handlers.IHybridPlatformWebView.SendRawMessage(string! rawMessage) -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler
+Microsoft.Maui.Handlers.IHybridWebViewHandler.DefaultFile.get -> string?
+Microsoft.Maui.Handlers.IHybridWebViewHandler.DefaultFile.set -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler.HybridRoot.get -> string?
+Microsoft.Maui.Handlers.IHybridWebViewHandler.HybridRoot.set -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler.PlatformView.get -> object!
+Microsoft.Maui.Handlers.IHybridWebViewHandler.VirtualView.get -> Microsoft.Maui.IHybridWebView!
Microsoft.Maui.Handlers.ISwipeItemMenuItemHandler.SourceLoader.get -> Microsoft.Maui.Platform.ImageSourcePartLoader?
Microsoft.Maui.IApplication.UserAppTheme.get -> Microsoft.Maui.ApplicationModel.AppTheme
Microsoft.Maui.Hosting.MauiApp.DisposeAsync() -> System.Threading.Tasks.ValueTask
@@ -11,6 +27,11 @@ Microsoft.Maui.ICommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler
Microsoft.Maui.ICommandMapper
Microsoft.Maui.ICommandMapper.Add(string! key, System.Action! action) -> void
Microsoft.Maui.ICommandMapper.Add(string! key, System.Action! action) -> void
+Microsoft.Maui.IHybridWebView
+Microsoft.Maui.IHybridWebView.DefaultFile.get -> string?
+Microsoft.Maui.IHybridWebView.HybridRoot.get -> string?
+Microsoft.Maui.IHybridWebView.RawMessageReceived(string! rawMessage) -> void
+Microsoft.Maui.IHybridWebView.SendRawMessage(string! rawMessage) -> void
Microsoft.Maui.ITextInput.IsSpellCheckEnabled.get -> bool
Microsoft.Maui.ICrossPlatformLayout
Microsoft.Maui.ICrossPlatformLayout.CrossPlatformArrange(Microsoft.Maui.Graphics.Rect bounds) -> Microsoft.Maui.Graphics.Size
@@ -33,6 +54,7 @@ Microsoft.Maui.Platform.IImageSourcePartSetter.SetImageSource(object? platformIm
Microsoft.Maui.Platform.ImageSourcePartLoader.ImageSourcePartLoader(Microsoft.Maui.Platform.IImageSourcePartSetter! setter) -> void
Microsoft.Maui.SizeRequest.Equals(Microsoft.Maui.SizeRequest other) -> bool
Microsoft.Maui.SoftInputExtensions
+override Microsoft.Maui.Handlers.HybridWebViewHandler.CreatePlatformView() -> object!
override Microsoft.Maui.Layouts.FlexBasis.Equals(object? obj) -> bool
override Microsoft.Maui.Layouts.FlexBasis.GetHashCode() -> int
override Microsoft.Maui.SizeRequest.Equals(object? obj) -> bool
@@ -50,6 +72,11 @@ static Microsoft.Maui.GridLength.operator !=(Microsoft.Maui.GridLength left, Mic
static Microsoft.Maui.GridLength.operator ==(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
static Microsoft.Maui.Handlers.EditorHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEditorHandler! handler, Microsoft.Maui.IEditor! editor) -> void
static Microsoft.Maui.Handlers.EntryHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.CommandMapper -> Microsoft.Maui.CommandMapper!
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapDefaultFile(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapHybridRoot(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapSendRawMessage(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView, object? arg) -> void
static Microsoft.Maui.Handlers.SearchBarHandler.MapIsSpellCheckEnabled(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.AddHandler(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.TryAddHandler(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index b4742bd39532..2ce26bfd48cb 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1,7 +1,28 @@
#nullable enable
Microsoft.Maui.CommandMapper.Invoke(Microsoft.Maui.IElementHandler! viewHandler, Microsoft.Maui.IElement? virtualView, string! property, object? args) -> void
Microsoft.Maui.FocusRequest.FocusRequest() -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler
+Microsoft.Maui.Handlers.HybridWebViewHandler.DefaultFile.get -> string?
+Microsoft.Maui.Handlers.HybridWebViewHandler.DefaultFile.set -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridRoot.get -> string?
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridRoot.set -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridWebViewHandler() -> void
+Microsoft.Maui.Handlers.HybridWebViewHandler.HybridWebViewHandler(Microsoft.Maui.IPropertyMapper? mapper = null, Microsoft.Maui.CommandMapper? commandMapper = null) -> void
+Microsoft.Maui.Handlers.IHybridPlatformWebView
+Microsoft.Maui.Handlers.IHybridPlatformWebView.SendRawMessage(string! rawMessage) -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler
+Microsoft.Maui.Handlers.IHybridWebViewHandler.DefaultFile.get -> string?
+Microsoft.Maui.Handlers.IHybridWebViewHandler.DefaultFile.set -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler.HybridRoot.get -> string?
+Microsoft.Maui.Handlers.IHybridWebViewHandler.HybridRoot.set -> void
+Microsoft.Maui.Handlers.IHybridWebViewHandler.PlatformView.get -> object!
+Microsoft.Maui.Handlers.IHybridWebViewHandler.VirtualView.get -> Microsoft.Maui.IHybridWebView!
Microsoft.Maui.Handlers.ISwipeItemMenuItemHandler.SourceLoader.get -> Microsoft.Maui.Platform.ImageSourcePartLoader?
+Microsoft.Maui.IHybridWebView
+Microsoft.Maui.IHybridWebView.DefaultFile.get -> string?
+Microsoft.Maui.IHybridWebView.HybridRoot.get -> string?
+Microsoft.Maui.IHybridWebView.RawMessageReceived(string! rawMessage) -> void
+Microsoft.Maui.IHybridWebView.SendRawMessage(string! rawMessage) -> void
Microsoft.Maui.IKeyboardAccelerator
Microsoft.Maui.IKeyboardAccelerator.Key.get -> string?
Microsoft.Maui.IKeyboardAccelerator.Modifiers.get -> Microsoft.Maui.KeyboardAcceleratorModifiers
@@ -37,6 +58,7 @@ Microsoft.Maui.Platform.IImageSourcePartSetter.SetImageSource(object? platformIm
Microsoft.Maui.Platform.ImageSourcePartLoader.ImageSourcePartLoader(Microsoft.Maui.Platform.IImageSourcePartSetter! setter) -> void
Microsoft.Maui.SizeRequest.Equals(Microsoft.Maui.SizeRequest other) -> bool
Microsoft.Maui.SoftInputExtensions
+override Microsoft.Maui.Handlers.HybridWebViewHandler.CreatePlatformView() -> object!
override Microsoft.Maui.Layouts.FlexBasis.Equals(object? obj) -> bool
override Microsoft.Maui.Layouts.FlexBasis.GetHashCode() -> int
override Microsoft.Maui.SizeRequest.Equals(object? obj) -> bool
@@ -52,6 +74,11 @@ static Microsoft.Maui.GridLength.operator !=(Microsoft.Maui.GridLength left, Mic
static Microsoft.Maui.GridLength.operator ==(Microsoft.Maui.GridLength left, Microsoft.Maui.GridLength right) -> bool
static Microsoft.Maui.Handlers.EditorHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEditorHandler! handler, Microsoft.Maui.IEditor! editor) -> void
static Microsoft.Maui.Handlers.EntryHandler.MapIsSpellCheckEnabled(Microsoft.Maui.Handlers.IEntryHandler! handler, Microsoft.Maui.IEntry! entry) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.CommandMapper -> Microsoft.Maui.CommandMapper!
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapDefaultFile(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapHybridRoot(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+static Microsoft.Maui.Handlers.HybridWebViewHandler.Mapper -> Microsoft.Maui.IPropertyMapper!
+static Microsoft.Maui.Handlers.HybridWebViewHandler.MapSendRawMessage(Microsoft.Maui.Handlers.IHybridWebViewHandler! handler, Microsoft.Maui.IHybridWebView! hybridWebView, object? arg) -> void
static Microsoft.Maui.Handlers.SearchBarHandler.MapIsSpellCheckEnabled(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.AddHandler(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!
static Microsoft.Maui.Hosting.MauiHandlersCollectionExtensions.TryAddHandler(this Microsoft.Maui.Hosting.IMauiHandlersCollection! handlersCollection, System.Func! handlerImplementationFactory) -> Microsoft.Maui.Hosting.IMauiHandlersCollection!