[main][Tizen] Replace Tizen Backend engine

.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets

@@ -113,5 +113,4 @@
   <PropertyGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) ">
     <DefineConstants>WINDOWS_UWP;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
-
 </Project>

.nuspec/Microsoft.Maui.Controls.SingleProject.targets

@@ -111,7 +111,7 @@
           BeforeTargets="_MauiInjectXamlCssAdditionalFiles;GenerateMSBuildEditorConfigFileShouldRun"
           Condition=" '$(EnableDefaultItems)' == 'true' and '$(SingleProject)' == 'true' ">
 
-    <!-- Removals -->
+  <!-- Removals -->
     <ItemGroup>
       <!-- Remove everything that isn't part of this platform -->
       <Compile

eng/Microsoft.Extensions.targets

@@ -126,7 +126,7 @@
         Version="$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)"
     />
     <PackageReference
-        Update="Tizen.UIExtensions.ElmSharp"
+        Update="Tizen.UIExtensions.NUI"
         Version="$(TizenUIExtensionsVersion)"
     />
     <PackageReference

src/BlazorWebView/src/Maui/PublicAPI/net-tizen/PublicAPI.Shipped.txt

@@ -36,12 +36,9 @@ Microsoft.AspNetCore.Components.WebView.Maui.RootComponentsCollection
 Microsoft.AspNetCore.Components.WebView.Maui.RootComponentsCollection.JSComponents.get -> Microsoft.AspNetCore.Components.Web.JSComponentConfigurationStore!
 Microsoft.AspNetCore.Components.WebView.Maui.RootComponentsCollection.RootComponentsCollection(Microsoft.AspNetCore.Components.Web.JSComponentConfigurationStore! jsComponents) -> void
 Microsoft.AspNetCore.Components.WebView.Maui.TizenWebViewManager
-Microsoft.AspNetCore.Components.WebView.Maui.TizenWebViewManager.TizenWebViewManager(Microsoft.AspNetCore.Components.WebView.Maui.BlazorWebViewHandler! blazorMauiWebViewHandler, Tizen.WebView.WebView! webview, System.IServiceProvider! provider, Microsoft.AspNetCore.Components.Dispatcher! dispatcher, Microsoft.Extensions.FileProviders.IFileProvider! fileProvider, Microsoft.AspNetCore.Components.Web.JSComponentConfigurationStore! jsComponents, string! contentRootRelativeToAppRoot, string! hostPageRelativePath) -> void
+Microsoft.AspNetCore.Components.WebView.Maui.TizenWebViewManager.TizenWebViewManager(Microsoft.AspNetCore.Components.WebView.Maui.BlazorWebViewHandler! blazorMauiWebViewHandler, Tizen.NUI.BaseComponents.WebView! webview, System.IServiceProvider! provider, Microsoft.AspNetCore.Components.Dispatcher! dispatcher, Microsoft.Extensions.FileProviders.IFileProvider! fileProvider, Microsoft.AspNetCore.Components.Web.JSComponentConfigurationStore! jsComponents, string! contentRootRelativeToAppRoot, string! hostPageRelativePath) -> void
 override Microsoft.AspNetCore.Components.WebView.Maui.TizenWebViewManager.NavigateCore(System.Uri! absoluteUri) -> void
 override Microsoft.AspNetCore.Components.WebView.Maui.TizenWebViewManager.SendMessage(string! message) -> void
-Microsoft.AspNetCore.Components.WebView.Maui.WebViewContainer
-Microsoft.AspNetCore.Components.WebView.Maui.WebViewContainer.WebViewContainer(ElmSharp.EvasObject! parent) -> void
-Microsoft.AspNetCore.Components.WebView.Maui.WebViewContainer.WebView.get -> Tizen.WebView.WebView!
 Microsoft.AspNetCore.Components.WebView.UrlLoadingEventArgs
 Microsoft.AspNetCore.Components.WebView.UrlLoadingEventArgs.Url.get -> System.Uri!
 Microsoft.AspNetCore.Components.WebView.UrlLoadingEventArgs.UrlLoadingStrategy.get -> Microsoft.AspNetCore.Components.WebView.UrlLoadingStrategy
@@ -51,13 +48,13 @@ Microsoft.AspNetCore.Components.WebView.UrlLoadingStrategy.CancelLoad = 2 -> Mic
 Microsoft.AspNetCore.Components.WebView.UrlLoadingStrategy.OpenExternally = 0 -> Microsoft.AspNetCore.Components.WebView.UrlLoadingStrategy
 Microsoft.AspNetCore.Components.WebView.UrlLoadingStrategy.OpenInWebView = 1 -> Microsoft.AspNetCore.Components.WebView.UrlLoadingStrategy
 Microsoft.Extensions.DependencyInjection.BlazorWebViewServiceCollectionExtensions
-override Microsoft.AspNetCore.Components.WebView.Maui.BlazorWebViewHandler.CreatePlatformView() -> Microsoft.AspNetCore.Components.WebView.Maui.WebViewContainer!
-override Microsoft.AspNetCore.Components.WebView.Maui.BlazorWebViewHandler.ConnectHandler(Microsoft.AspNetCore.Components.WebView.Maui.WebViewContainer! platformView) -> void
-override Microsoft.AspNetCore.Components.WebView.Maui.BlazorWebViewHandler.DisconnectHandler(Microsoft.AspNetCore.Components.WebView.Maui.WebViewContainer! platformView) -> void
+override Microsoft.AspNetCore.Components.WebView.Maui.BlazorWebViewHandler.CreatePlatformView() -> Tizen.NUI.BaseComponents.WebView!
+override Microsoft.AspNetCore.Components.WebView.Maui.BlazorWebViewHandler.ConnectHandler(Tizen.NUI.BaseComponents.WebView! platformView) -> void
+override Microsoft.AspNetCore.Components.WebView.Maui.BlazorWebViewHandler.DisconnectHandler(Tizen.NUI.BaseComponents.WebView! platformView) -> void
 static Microsoft.AspNetCore.Components.WebView.Maui.BlazorWebViewHandler.MapHostPage(Microsoft.AspNetCore.Components.WebView.Maui.BlazorWebViewHandler! handler, Microsoft.AspNetCore.Components.WebView.Maui.IBlazorWebView! webView) -> void
 static Microsoft.AspNetCore.Components.WebView.Maui.BlazorWebViewHandler.MapRootComponents(Microsoft.AspNetCore.Components.WebView.Maui.BlazorWebViewHandler! handler, Microsoft.AspNetCore.Components.WebView.Maui.IBlazorWebView! webView) -> void
 static Microsoft.Extensions.DependencyInjection.BlazorWebViewServiceCollectionExtensions.AddBlazorWebViewDeveloperTools(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
 static Microsoft.Extensions.DependencyInjection.BlazorWebViewServiceCollectionExtensions.AddMauiBlazorWebView(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.AspNetCore.Components.WebView.Maui.IMauiBlazorWebViewBuilder!
 static Microsoft.AspNetCore.Components.WebView.Maui.BlazorWebViewHandler.BlazorWebViewMapper -> Microsoft.Maui.PropertyMapper<Microsoft.AspNetCore.Components.WebView.Maui.IBlazorWebView!, Microsoft.AspNetCore.Components.WebView.Maui.BlazorWebViewHandler!>!
 virtual Microsoft.AspNetCore.Components.WebView.Maui.BlazorWebView.CreateFileProvider(string! contentRootDir) -> Microsoft.Extensions.FileProviders.IFileProvider!
-~Microsoft.AspNetCore.Components.WebView.BlazorWebViewInitializedEventArgs.WebView.get -> Tizen.WebView.WebView
+~Microsoft.AspNetCore.Components.WebView.BlazorWebViewInitializedEventArgs.WebView.get -> Tizen.NUI.BaseComponents.WebView

src/BlazorWebView/src/Maui/Tizen/BlazorWebViewHandler.Tizen.cs

@@ -1,21 +1,23 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Maui;
 using Microsoft.Maui.Dispatching;
 using Microsoft.Maui.Handlers;
-using Tizen.WebView;
-using TChromium = Tizen.WebView.Chromium;
-using TWebView = Tizen.WebView.WebView;
+using Tizen.NUI;
+using NWebView = Tizen.NUI.BaseComponents.WebView;
 
 namespace Microsoft.AspNetCore.Components.WebView.Maui
 {
 	/// <summary>
 	/// The Tizen <see cref="ViewHandler"/> for <see cref="BlazorWebView"/>.
 	/// </summary>
-	public partial class BlazorWebViewHandler : ViewHandler<IBlazorWebView, WebViewContainer>
+	public partial class BlazorWebViewHandler : ViewHandler<IBlazorWebView, NWebView>
 	{
+		private const string BlazorWebViewIdentifier = "BlazorWebView:";
+		private const string UserAgentHeaderKey = "User-Agent";
 		private const string AppOrigin = "http://0.0.0.0/";
 		private const string BlazorInitScript = @"
 			window.__receiveMessageCallbacks = [];
@@ -42,53 +44,99 @@ public partial class BlazorWebViewHandler : ViewHandler<IBlazorWebView, WebViewC
 			})();
 		";
 
-		private TizenWebViewManager? _webviewManager;
-		private WebViewExtensions.InterceptRequestCallback? _interceptRequestCallback;
+		static private Dictionary<string, WeakReference<BlazorWebViewHandler>> s_webviewHandlerTable = new Dictionary<string, WeakReference<BlazorWebViewHandler>>();
 
-		private TWebView PlatformWebView => PlatformView.WebView;
+		private TizenWebViewManager? _webviewManager;
 
 		private bool RequiredStartupPropertiesSet =>
 			//_webview != null &&
 			HostPage != null &&
 			Services != null;
 
 		/// <inheritdoc />
-		protected override WebViewContainer CreatePlatformView()
+		protected override NWebView CreatePlatformView()
 		{
-			TChromium.Initialize();
-			MauiApplication.Current.Terminated += (s, e) => TChromium.Shutdown();
-
-			return new WebViewContainer(PlatformParent);
+			return new NWebView()
+			{
+				MouseEventsEnabled = true,
+				KeyEventsEnabled = true,
+			};
 		}
 
 		/// <inheritdoc />
-		protected override void ConnectHandler(WebViewContainer platformView)
+		protected override void ConnectHandler(NWebView platformView)
 		{
-			_interceptRequestCallback = OnRequestInterceptCallback;
-			PlatformWebView.LoadFinished += OnLoadFinished;
-			PlatformWebView.AddJavaScriptMessageHandler("BlazorHandler", PostMessageFromJS);
-			PlatformWebView.SetInterceptRequestCallback(_interceptRequestCallback);
-			PlatformWebView.GetSettings().JavaScriptEnabled = true;
+			platformView.PageLoadFinished += OnLoadFinished;
+			platformView.Context.RegisterHttpRequestInterceptedCallback(OnRequestInterceptStaticCallback);
+			platformView.AddJavaScriptMessageHandler("BlazorHandler", PostMessageFromJS);
+			platformView.UserAgent += $" {BlazorWebViewIdentifier}{GetHashCode()}";
+			s_webviewHandlerTable[GetHashCode().ToString()] = new WeakReference<BlazorWebViewHandler>(this);
 		}
 
 		/// <inheritdoc />
-		protected override void DisconnectHandler(WebViewContainer platformView)
+		protected override void DisconnectHandler(NWebView platformView)
 		{
-			PlatformWebView.LoadFinished -= OnLoadFinished;
+			platformView.PageLoadFinished -= OnLoadFinished;
 			base.DisconnectHandler(platformView);
+			s_webviewHandlerTable.Remove(GetHashCode().ToString());
+		}
+
+
+		private void PostMessageFromJS(string message)
+		{
+			_webviewManager!.MessageReceivedInternal(new Uri(PlatformView.Url), message);
 		}
 
-		private void PostMessageFromJS(JavaScriptMessage message)
+		private void OnLoadFinished(object? sender, WebViewPageLoadEventArgs e)
 		{
-			if (message is null)
+			//FocusManager.Instance.SetCurrentFocusView(NativeView);
+			var url = PlatformView.Url;
+
+			if (url == AppOrigin)
+				PlatformView.EvaluateJavaScript(BlazorInitScript);
+		}
+
+		private static void OnRequestInterceptStaticCallback(WebHttpRequestInterceptor interceptor)
+		{
+			if (interceptor.Headers.TryGetValue(UserAgentHeaderKey, out var agent))
 			{
-				throw new ArgumentNullException(nameof(message));
+				var idx = agent.IndexOf(BlazorWebViewIdentifier);
+				if (idx >= 0)
+				{
+					var webviewKey = agent.Substring(idx + BlazorWebViewIdentifier.Length);
+					if (s_webviewHandlerTable.TryGetValue(webviewKey, out var weakHandler)
+						&& weakHandler.TryGetTarget(out var handler))
+					{
+						handler.OnRequestInterceptCallback(interceptor);
+						return;
+					}
+				}
 			}
+			interceptor.Ignore();
+		}
 
-			if (message.Name.Equals("BlazorHandler", StringComparison.Ordinal))
+		private void OnRequestInterceptCallback(WebHttpRequestInterceptor interceptor)
+		{
+			var url = interceptor.Url;
+			if (url.StartsWith(AppOrigin))
 			{
-				_webviewManager!.MessageReceivedInternal(new Uri(PlatformWebView.Url), message.GetBodyAsString());
+				var allowFallbackOnHostPage = url.EndsWith("/");
+				url = QueryStringHelper.RemovePossibleQueryString(url);
+				if (_webviewManager!.TryGetResponseContentInternal(url, allowFallbackOnHostPage, out var statusCode, out var statusMessage, out var content, out var headers))
+				{
+					var header = $"HTTP/1.0 200 OK\r\n";
+					foreach (var item in headers)
+					{
+						header += $"{item.Key}:{item.Value}\r\n";
+					}
+					header += "\r\n";
+					MemoryStream memstream = new MemoryStream();
+					content.CopyTo(memstream);
+					interceptor.SetResponse(header, memstream.ToArray());
+					return;
+				}
 			}
+			interceptor.Ignore();
 		}
 
 		private void StartWebViewCoreIfPossible()
@@ -105,14 +153,14 @@ private void StartWebViewCoreIfPossible()
 
 			// We assume the host page is always in the root of the content directory, because it's
 			// unclear there's any other use case. We can add more options later if so.
-			var contentRootDir = Path.GetDirectoryName(HostPage!) ?? string.Empty;
-			var hostPageRelativePath = Path.GetRelativePath(contentRootDir, HostPage!);
+			var contentRootDir = System.IO.Path.GetDirectoryName(HostPage!) ?? string.Empty;
+			var hostPageRelativePath = System.IO.Path.GetRelativePath(contentRootDir, HostPage!);
 
 			var fileProvider = VirtualView.CreateFileProvider(contentRootDir);
 
 			_webviewManager = new TizenWebViewManager(
 				this,
-				PlatformWebView,
+				PlatformView,
 				Services!,
 				new MauiDispatcher(Services!.GetRequiredService<IDispatcher>()),
 				fileProvider,
@@ -125,7 +173,7 @@ private void StartWebViewCoreIfPossible()
 			VirtualView.BlazorWebViewInitializing(new BlazorWebViewInitializingEventArgs());
 			VirtualView.BlazorWebViewInitialized(new BlazorWebViewInitializedEventArgs
 			{
-				WebView = PlatformWebView,
+				WebView = PlatformView,
 			});
 
 			if (RootComponents != null)
@@ -139,50 +187,6 @@ private void StartWebViewCoreIfPossible()
 			_webviewManager.Navigate("/");
 		}
 
-		private void OnRequestInterceptCallback(IntPtr context, IntPtr request, IntPtr userdata)
-		{
-			if (request == IntPtr.Zero)
-			{
-				return;
-			}
-
-			var url = PlatformWebView.GetInterceptRequestUrl(request);
-
-			if (url.StartsWith(AppOrigin))
-			{
-				var allowFallbackOnHostPage = url.EndsWith("/");
-				url = QueryStringHelper.RemovePossibleQueryString(url);
-				if (_webviewManager!.TryGetResponseContentInternal(url, allowFallbackOnHostPage, out var statusCode, out var statusMessage, out var content, out var headers))
-				{
-					var header = $"HTTP/1.0 200 OK\r\n";
-					foreach (var item in headers)
-					{
-						header += $"{item.Key}:{item.Value}\r\n";
-					}
-					header += "\r\n";
-
-					using (MemoryStream memstream = new MemoryStream())
-					{
-						content.CopyTo(memstream);
-						var body = memstream.ToArray();
-						PlatformWebView.SetInterceptRequestResponse(request, header, body, (uint)body.Length);
-					}
-					return;
-				}
-			}
-
-			PlatformWebView.IgnoreInterceptRequest(request);
-		}
-
-		private void OnLoadFinished(object? sender, EventArgs e)
-		{
-			PlatformWebView.SetFocus(true);
-			var url = PlatformWebView.Url;
-
-			if (url == AppOrigin)
-				PlatformWebView.Eval(BlazorInitScript);
-		}
-
 		internal IFileProvider CreateFileProvider(string contentRootDir)
 		{
 			return new TizenMauiAssetFileProvider(contentRootDir);

src/BlazorWebView/src/Maui/Tizen/TizenWebViewManager.cs

@@ -4,7 +4,7 @@
 using System.Text.Encodings.Web;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.Extensions.FileProviders;
-using TWebView = Tizen.WebView.WebView;
+using NWebView = Tizen.NUI.BaseComponents.WebView;
 
 namespace Microsoft.AspNetCore.Components.WebView.Maui
 {
@@ -17,7 +17,7 @@ public class TizenWebViewManager : WebViewManager
 		private const string AppOrigin = "http://0.0.0.0/";
 
 		private readonly BlazorWebViewHandler _blazorMauiWebViewHandler;
-		private readonly TWebView _webview;
+		private readonly NWebView _webview;
 		private readonly string _contentRootRelativeToAppRoot;
 
 		/// <summary>
@@ -31,7 +31,7 @@ public class TizenWebViewManager : WebViewManager
 		/// <param name="jsComponents">Describes configuration for adding, removing, and updating root components from JavaScript code.</param>
 		/// <param name="contentRootRelativeToAppRoot">Path to the directory containing application content files.</param>
 		/// <param name="hostPageRelativePath">Path to the host page within the fileProvider.</param>
-		public TizenWebViewManager(BlazorWebViewHandler blazorMauiWebViewHandler, TWebView webview, IServiceProvider provider, Dispatcher dispatcher, IFileProvider fileProvider, JSComponentConfigurationStore jsComponents, string contentRootRelativeToAppRoot, string hostPageRelativePath)
+		public TizenWebViewManager(BlazorWebViewHandler blazorMauiWebViewHandler, NWebView webview, IServiceProvider provider, Dispatcher dispatcher, IFileProvider fileProvider, JSComponentConfigurationStore jsComponents, string contentRootRelativeToAppRoot, string hostPageRelativePath)
 			: base(provider, dispatcher, new Uri(AppOrigin), fileProvider, jsComponents, hostPageRelativePath)
 		{
 			_blazorMauiWebViewHandler = blazorMauiWebViewHandler ?? throw new ArgumentNullException(nameof(blazorMauiWebViewHandler));
@@ -58,7 +58,7 @@ protected override void NavigateCore(Uri absoluteUri)
 		protected override void SendMessage(string message)
 		{
 			var messageJSStringLiteral = JavaScriptEncoder.Default.Encode(message);
-			_webview.Eval($"__dispatchMessageCallback(\"{messageJSStringLiteral}\")");
+			_webview.EvaluateJavaScript($"__dispatchMessageCallback(\"{messageJSStringLiteral}\")");
 		}
 
 		internal void MessageReceivedInternal(Uri uri, string message)