Skip to content

[iOS/Catalyst] Correctly call DidFinishNavigation in NavigationDelegate #20725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 22, 2024
Merged

[iOS/Catalyst] Correctly call DidFinishNavigation in NavigationDelegate #20725

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
69332cf
Invoke ProcessNavigatedAsync for MauiWKWebView
drasticactions Feb 20, 2024
1d4e755
Add underlying API back
drasticactions Feb 20, 2024
be2c9b0
Revert sandbox changes
drasticactions Feb 20, 2024
dd968fa
Use FireAndForget
drasticactions Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Core/src/Platform/iOS/MauiWKWebView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 6 additions & 2 deletions src/Core/src/Platform/iOS/MauiWebViewNavigationDelegate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public MauiWebViewNavigationDelegate(IWebViewHandler handler)
}

[Export("webView:didFinishNavigation:")]
public void DidFinishNavigation(WKWebView webView, WKNavigation navigation)
public async void DidFinishNavigation(WKWebView webView, WKNavigation navigation)
{
var handler = Handler;
var virtualView = handler?.VirtualView;
Expand All @@ -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)
await webViewHandler.ProcessNavigatedAsync(url);
else
handler.PlatformView?.UpdateCanGoBackForward(virtualView);
}

[Export("webView:didFailNavigation:withError:")]
Expand Down