Cleanup.

Author: ilonatommy

src/Components/Components/src/NavigationManager.cs

@@ -38,7 +38,7 @@ public event EventHandler<LocationChangedEventArgs> LocationChanged
     /// <summary>
     /// An event that fires when the page is not found.
     /// </summary>
-    public event EventHandler<NotFoundEventArgs> NotFoundEvent
+    public event EventHandler<EventArgs> NotFoundEvent
     {
         add
         {
@@ -52,7 +52,7 @@ public event EventHandler<NotFoundEventArgs> NotFoundEvent
         }
     }
 
-    private EventHandler<NotFoundEventArgs>? _notFound;
+    private EventHandler<EventArgs>? _notFound;
 
     private readonly List<Func<NotFoundContext, ValueTask>> _notFoundHandlers = new();
 
@@ -201,12 +201,12 @@ public virtual void Refresh(bool forceReload = false)
         => NavigateTo(Uri, forceLoad: true, replace: true);
 
     /// <summary>
-    /// TODO
+    /// Handles setting the NotFound state.
     /// </summary>
     public virtual void NotFound() => NotFoundCore();
 
     /// <summary>
-    /// TODO
+    /// Handles setting the NotFound state.
     /// </summary>
     protected virtual void NotFoundCore() => throw new NotImplementedException();
 
@@ -344,16 +344,11 @@ protected void NotifyLocationChanged(bool isInterceptedLink)
     /// <summary>
     /// Triggers the <see cref="NotFound"/> event with the current URI value.
     /// </summary>
-    protected void NotifyNotFound(bool isInterceptedLink)
+    protected void NotifyNotFound()
     {
         try
         {
-            _notFound?.Invoke(
-                this,
-                new NotFoundEventArgs(isInterceptedLink)
-                {
-                    HistoryEntryState = HistoryEntryState
-                });
+            _notFound?.Invoke(this, new EventArgs());
         }
         catch (Exception ex)
         {
@@ -486,7 +481,7 @@ protected async ValueTask<bool> NotifyLocationChangingAsync(string uri, string?
             cts.Dispose();
 
             if (_locationChangingCts == cts)
-        {
+            {
                 _locationChangingCts = null;
             }
         }
@@ -495,9 +490,8 @@ protected async ValueTask<bool> NotifyLocationChangingAsync(string uri, string?
     /// <summary>
     /// Notifies the registered handlers of the current ot found event.
     /// </summary>
-    /// <param name="isNavigationIntercepted">Whether this not found was intercepted from a link.</param>
     /// <returns>A <see cref="ValueTask{TResult}"/> representing the completion of the operation. If the result is <see langword="true"/>, the navigation should continue.</returns>
-    protected async ValueTask<bool> NotifyNotFoundAsync(bool isNavigationIntercepted)
+    protected async ValueTask<bool> NotifyNotFoundAsync()
     {
         _notFoundCts?.Cancel();
         _notFoundCts = null;
@@ -516,8 +510,6 @@ protected async ValueTask<bool> NotifyNotFoundAsync(bool isNavigationIntercepted
         var cancellationToken = cts.Token;
         var context = new NotFoundContext
         {
-            // HistoryEntryState = state,
-            IsNavigationIntercepted = isNavigationIntercepted,
             CancellationToken = cancellationToken,
         };
 

src/Components/Components/src/PublicAPI.Unshipped.txt

@@ -2,20 +2,14 @@
 
 virtual Microsoft.AspNetCore.Components.NavigationManager.NotFound() -> void
 virtual Microsoft.AspNetCore.Components.NavigationManager.NotFoundCore() -> void
-Microsoft.AspNetCore.Components.NavigationManager.NotFoundEvent -> System.EventHandler<Microsoft.AspNetCore.Components.Routing.NotFoundEventArgs!>!
-Microsoft.AspNetCore.Components.Routing.NotFoundEventArgs
-Microsoft.AspNetCore.Components.Routing.NotFoundEventArgs.NotFoundEventArgs(bool isNavigationIntercepted) -> void
-Microsoft.AspNetCore.Components.Routing.NotFoundEventArgs.IsNavigationIntercepted.get -> bool
-Microsoft.AspNetCore.Components.Routing.NotFoundEventArgs.HistoryEntryState.get -> string?
+Microsoft.AspNetCore.Components.NavigationManager.NotFoundEvent -> System.EventHandler<System.EventArgs!>!
 Microsoft.AspNetCore.Components.Routing.NotFoundContext
 Microsoft.AspNetCore.Components.Routing.NotFoundContext.NotFoundContext() -> void
 Microsoft.AspNetCore.Components.Routing.NotFoundContext.CancellationToken.get -> System.Threading.CancellationToken
 Microsoft.AspNetCore.Components.Routing.NotFoundContext.CancellationToken.init -> void
-Microsoft.AspNetCore.Components.Routing.NotFoundContext.IsNavigationIntercepted.get -> bool
-Microsoft.AspNetCore.Components.Routing.NotFoundContext.IsNavigationIntercepted.init -> void
 Microsoft.AspNetCore.Components.Routing.NotFoundContext.PreventRendering() -> void
-Microsoft.AspNetCore.Components.NavigationManager.NotifyNotFound(bool isInterceptedLink) -> void
-Microsoft.AspNetCore.Components.NavigationManager.NotifyNotFoundAsync(bool isNavigationIntercepted) -> System.Threading.Tasks.ValueTask<bool>
+Microsoft.AspNetCore.Components.NavigationManager.NotifyNotFound() -> void
+Microsoft.AspNetCore.Components.NavigationManager.NotifyNotFoundAsync() -> System.Threading.Tasks.ValueTask<bool>
 virtual Microsoft.AspNetCore.Components.NavigationManager.HandleNotFoundHandlerException(System.Exception! ex, Microsoft.AspNetCore.Components.Routing.NotFoundContext! context) -> void
 Microsoft.AspNetCore.Components.NotFoundRenderingException
 Microsoft.AspNetCore.Components.NotFoundRenderingException.NotFoundRenderingException(string! message, System.Exception! innerException) -> void

src/Components/Components/src/Routing/NotFoundContext.cs

@@ -16,11 +16,6 @@ public sealed class NotFoundContext
     /// </summary>
     public CancellationToken CancellationToken { get; init; }
 
-    /// <summary>
-    /// Gets whether this navigation was intercepted from a link.
-    /// </summary>
-    public bool IsNavigationIntercepted { get; init; }
-
     /// <summary>
     /// Prevents this navigation from continuing.
     /// </summary>

src/Components/Components/src/Routing/NotFoundEventArgs.cs

@@ -322,7 +322,7 @@ private void OnLocationChanged(object sender, LocationChangedEventArgs args)
         }
     }
 
-    private void OnNotFound(object sender, NotFoundEventArgs args)
+    private void OnNotFound(object sender, EventArgs args)
     {
         if (_renderHandle.IsInitialized)
         {

src/Components/Components/src/Routing/Router.cs

@@ -1 +1 @@
-#nullable enable
+#nullable enable

src/Components/Endpoints/src/PublicAPI.Unshipped.txt

@@ -160,14 +160,14 @@ async Task NotFoundAsync()
         {
             try
             {
-                bool shouldContinueRendering = await NotifyNotFoundAsync(false);
+                bool shouldContinueRendering = await NotifyNotFoundAsync();
                 if (!shouldContinueRendering)
                 {
                     Log.NotFoundRenderCanceled(_logger);
                     return;
                 }
 
-                NotifyNotFound(false);
+                NotifyNotFound();
             }
             catch (Exception ex)
             {

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

@@ -94,15 +94,15 @@ async Task PerformNotFoundAsync()
         {
             try
             {
-                var shouldContinueNotFound = await NotifyNotFoundAsync(false); // should we pass NavigationOptions.HistoryEntryState? are we navigating awaay and changing the history?
+                var shouldContinueNotFound = await NotifyNotFoundAsync();
 
                 if (!shouldContinueNotFound)
                 {
                     Log.NotFoundRenderCanceled(_logger);
                     return;
                 }
 
-                NotifyNotFound(false);
+                NotifyNotFound();
             }
             catch (Exception ex)
             {