Skip to content

Commit bfdd078

Browse files
authored
Merge pull request #22136 from unoplatform/dev/doti/webview-absolute-url
2 parents 8f1c7b2 + 7b08c44 commit bfdd078

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/Uno.UI/UI/Xaml/Controls/WebView/Core/CoreWebView2.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void Navigate(string uri)
6363
_processedSource = actualUri;
6464
if (_owner.SwitchSourceBeforeNavigating)
6565
{
66-
Source = actualUri.ToString();
66+
Source = actualUri.AbsoluteUri;
6767
}
6868

6969
UpdateFromInternalSource();
@@ -124,7 +124,8 @@ internal void NavigateWithHttpRequestMessage(global::Windows.Web.Http.HttpReques
124124
_processedSource = requestMessage;
125125
if (_owner.SwitchSourceBeforeNavigating)
126126
{
127-
Source = requestMessage.RequestUri.ToString();
127+
var reqUri = requestMessage.RequestUri;
128+
Source = reqUri.IsAbsoluteUri ? reqUri.AbsoluteUri : reqUri.OriginalString;
128129
}
129130

130131
UpdateFromInternalSource();

src/Uno.UI/UI/Xaml/Controls/WebView/WebView2/WebView2.Properties.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,12 @@ public Uri Source
5656
var webView = (WebView2)s;
5757
if (!webView._sourceChangeFromCore)
5858
{
59-
webView.CoreWebView2.Navigate(((Uri)e.NewValue)?.ToString());
59+
var newUri = (Uri)e.NewValue;
60+
if (newUri != null)
61+
{
62+
var targetUrl = newUri.IsAbsoluteUri ? newUri.AbsoluteUri : newUri.OriginalString;
63+
webView.CoreWebView2.Navigate(targetUrl);
64+
}
6065
}
6166
}));
6267

0 commit comments

Comments
 (0)