[iOS/Catalyst] Correctly call DidFinishNavigation in NavigationDelega…

…te (#20725) * Invoke ProcessNavigatedAsync for MauiWKWebView * Add underlying API back * Revert sandbox changes * Use FireAndForget
dotnet · Feb 22, 2024 · 8b45ad7 · 8b45ad7
1 parent a1eab3e
commit 8b45ad7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Core/src/Platform/iOS/MauiWKWebView.cs b/src/Core/src/Platform/iOS/MauiWKWebView.cs
@@ -76,7 +76,7 @@ public override void MovedToWindow()
 			_movedToWindow?.Invoke(this, EventArgs.Empty);
 		}
 
-		[Export("webView:didFinishNavigation:")]
+		[Obsolete("Use MauiWebViewNavigationDelegate.DidFinishNavigation instead.")]
 		public async void DidFinishNavigation(WKWebView webView, WKNavigation navigation)
 		{
 			var url = CurrentUrl;

diff --git a/src/Core/src/Platform/iOS/MauiWebViewNavigationDelegate.cs b/src/Core/src/Platform/iOS/MauiWebViewNavigationDelegate.cs
@@ -43,7 +43,11 @@ public void DidFinishNavigation(WKWebView webView, WKNavigation navigation)
 
 			virtualView.Navigated(_lastEvent, url, WebNavigationResult.Success);
 
-			handler.PlatformView?.UpdateCanGoBackForward(virtualView);
+			// ProcessNavigatedAsync calls UpdateCanGoBackForward
+			if (handler is WebViewHandler webViewHandler)
+				webViewHandler.ProcessNavigatedAsync(url).FireAndForget();
+			else
+				handler.PlatformView?.UpdateCanGoBackForward(virtualView);
 		}
 
 		[Export("webView:didFailNavigation:withError:")]