fix script timing for webview2

camnewnham · Aug 17, 2024 · 9ebdc75 · 9ebdc75
1 parent 0c442ff
commit 9ebdc75
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Eto.Wpf/Forms/Controls/WebView2Handler.cs b/src/Eto.Wpf/Forms/Controls/WebView2Handler.cs
@@ -479,7 +479,6 @@ void Control_CoreWebView2Ready(object sender, CoreWebView2InitializationComplete
 		{
 			throw new WebView2InitializationException("Failed to initialize WebView2", e.InitializationException);
 		}
-		InjectScripts();
 
 		// can't actually do anything here, so execute them in the main loop
 		Application.Instance.AsyncInvoke(RunDelayedActions);
@@ -492,6 +491,7 @@ private void RunDelayedActions()
 
 		Control.CoreWebView2.DocumentTitleChanged += CoreWebView2_DocumentTitleChanged;
 		Control.CoreWebView2.NewWindowRequested += CoreWebView2_NewWindowRequested;
+		Control.CoreWebView2.DOMContentLoaded += CoreWebView2_DOMContentLoadedInjectScripts;
 		webView2Ready = true;
 
 		if (delayedActions != null)
@@ -664,9 +664,9 @@ private void Control_WebMessageReceived(object sender, CoreWebView2WebMessageRec
 	/// <summary>
 	/// Wraps window.chrome.webview.postMessage to window.eto.postMessage for platform consistency
 	/// </summary>
-	private void InjectScripts()
+	private void CoreWebView2_DOMContentLoadedInjectScripts(object sender, CoreWebView2DOMContentLoadedEventArgs e)
 	{
-		CoreWebView2.AddScriptToExecuteOnDocumentCreatedAsync("window.eto = { postMessage: function(message) { window.chrome.webview.postMessage(message); } };");
+		CoreWebView2.ExecuteScriptAsync("window.eto = { postMessage: function(message) { window.chrome.webview.postMessage(message); } };");
 	}
 
 	public Uri Url