tmp

Author: javiercn

src/Components/Server/src/Circuits/RemoteNavigationManager.cs

@@ -106,6 +106,12 @@ async Task PerformNavigationAsync()
                 }
 
                 await _jsRuntime.InvokeVoidAsync(Interop.NavigateTo, uri, options);
+                Log.NavigationCompleted(_logger, uri);
+            }
+            catch (TaskCanceledException) when (_jsRuntime is RemoteJSRuntime remoteRuntime && !remoteRuntime.IsInitialized)
+            {
+                Log.NavigationCanceled(_logger, uri);
+                return;
             }
             catch (Exception ex)
             {
@@ -190,5 +196,8 @@ public static void RequestingNavigation(ILogger logger, string uri, NavigationOp
 
         [LoggerMessage(5, LogLevel.Error, "Failed to refresh", EventName = "RefreshFailed")]
         public static partial void RefreshFailed(ILogger logger, Exception exception);
+
+        [LoggerMessage(6, LogLevel.Debug, "Navigation completed when changing the location to {Uri}", EventName = "NavigationCompleted")]
+        public static partial void NavigationCompleted(ILogger logger, string uri);
     }
 }

src/Components/Web.JS/src/Services/NavigationManager.ts

@@ -101,7 +101,7 @@ function isSamePageWithHash(absoluteHref: string): boolean {
   return hashIndex > -1 && location.href.replace(location.hash, '') === absoluteHref.substring(0, hashIndex);
 }
 
-function performScrollToElementOnTheSamePage(absoluteHref : string, replace: boolean, state: string | undefined = undefined): void {
+function performScrollToElementOnTheSamePage(absoluteHref: string, replace: boolean, state: string | undefined = undefined): void {
   saveToBrowserHistory(absoluteHref, replace, state);
 
   const hashIndex = absoluteHref.indexOf('#');
@@ -158,19 +158,23 @@ function navigateToCore(uri: string, options: NavigationOptions, skipLocationCha
 }
 
 function performExternalNavigation(uri: string, replace: boolean) {
-  if (location.href === uri) {
-    // If you're already on this URL, you can't append another copy of it to the history stack,
-    // so we can ignore the 'replace' flag. However, reloading the same URL you're already on
-    // requires special handling to avoid triggering browser-specific behavior issues.
-    // For details about what this fixes and why, see https://github.com/dotnet/aspnetcore/pull/10839
-    const temporaryUri = uri + '?';
-    history.replaceState(null, '', temporaryUri);
-    location.replace(uri);
-  } else if (replace) {
-    location.replace(uri);
-  } else {
-    location.href = uri;
-  }
+  // If we are navigating to an external URI, defer setting the URL so that we can
+  // complete the current navigation operation if the request comes from .NET.
+  setTimeout(() => {
+    if (location.href === uri) {
+      // If you're already on this URL, you can't append another copy of it to the history stack,
+      // so we can ignore the 'replace' flag. However, reloading the same URL you're already on
+      // requires special handling to avoid triggering browser-specific behavior issues.
+      // For details about what this fixes and why, see https://github.com/dotnet/aspnetcore/pull/10839
+      const temporaryUri = uri + '?';
+      history.replaceState(null, '', temporaryUri);
+      location.replace(uri);
+    } else if (replace) {
+      location.replace(uri);
+    } else {
+      location.href = uri;
+    }
+  }, 0);
 }
 
 async function performInternalNavigation(absoluteInternalHref: string, interceptedLink: boolean, replace: boolean, state: string | undefined = undefined, skipLocationChangingCallback = false) {