Revert previous approach, allow custom ShouldMatch implementations.

Author: ilonatommy

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

@@ -1 +1,2 @@
 #nullable enable
+virtual Microsoft.AspNetCore.Components.Routing.NavLink.ShouldMatch(string! currentUriAbsolute) -> bool

src/Components/Web/src/Routing/NavLink.cs

@@ -106,7 +106,7 @@ private void OnLocationChanged(object? sender, LocationChangedEventArgs args)
         }
     }
 
-    private bool ShouldMatch(string currentUriAbsolute)
+    protected virtual bool ShouldMatch(string currentUriAbsolute)
     {
         if (_hrefAbsolute == null)
         {
@@ -124,33 +124,6 @@ private bool ShouldMatch(string currentUriAbsolute)
             return true;
         }
 
-        if (Match == NavLinkMatch.All
-            && IsStrictlyPrefixIgnoringQueryAndFragment(currentUriAbsolute))
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    private bool IsStrictlyPrefixIgnoringQueryAndFragment(string currentUriAbsolute)
-    {
-        Debug.Assert(_hrefAbsolute != null);
-
-        return IsStrictlyPrefixedIgnoringSuffixAfterSymbol(currentUriAbsolute, '?')
-            || IsStrictlyPrefixedIgnoringSuffixAfterSymbol(currentUriAbsolute, '#');
-    }
-
-    private bool IsStrictlyPrefixedIgnoringSuffixAfterSymbol(string currentUriAbsolute, char symbol)
-    {
-        Debug.Assert(_hrefAbsolute != null);
-
-        var fragmentIndex = currentUriAbsolute.IndexOf(symbol);
-        if (fragmentIndex >= 0)
-        {
-            var prefix = currentUriAbsolute.Substring(0, fragmentIndex);
-            return IsStrictlyPrefixWithSeparator(currentUriAbsolute, prefix);
-        }
         return false;
     }
 

src/Components/test/E2ETest/Tests/RoutingTest.cs

@@ -383,6 +383,34 @@ public void CanFollowLinkDefinedInOpenShadowRoot()
         AssertHighlightedLinks("Other", "Other with base-relative URL (matches all)");
     }
 
+    [Fact]
+    public void CanOverrideNavLinkToIgnoreFragment()
+    {
+        SetUrlViaPushState("/layout-overridden");
+
+        var app = Browser.MountTestComponent<TestRouter>();
+        app.FindElement(By.LinkText("Override layout with hash, no trailing slash")).Click();
+        Browser.Equal("This is the page with overridden layout.", () => app.FindElement(By.Id("test-info")).Text);
+        AssertHighlightedLinks(
+            "Override layout (matches all)",
+            "Override layout, no trailing slash (matches all)",
+            "Override layout with hash, no trailing slash");
+    }
+
+    [Fact]
+    public void CanOverrideNavLinkToIgnoreQuery()
+    {
+        SetUrlViaPushState("/layout-overridden");
+
+        var app = Browser.MountTestComponent<TestRouter>();
+        app.FindElement(By.LinkText("Override layout with query, no trailing slash")).Click();
+        Browser.Equal("This is the page with overridden layout.", () => app.FindElement(By.Id("test-info")).Text);
+        AssertHighlightedLinks(
+            "Override layout (matches all)",
+            "Override layout, no trailing slash (matches all)",
+            "Override layout with query, no trailing slash");
+    }
+
     [Fact]
     public void CanGoBackFromNotAComponent()
     {

src/Components/test/testassets/BasicTestApp/RouterTest/LayoutOverridden.razor

@@ -0,0 +1,4 @@
+@page "/layout-overridden"
+@page "/layout-overridden/Default.html"
+@layout RouterTestLayoutNavLinksOverridden
+<div id="test-info">This is the page with overridden layout.</div>

src/Components/test/testassets/BasicTestApp/RouterTest/LinksOverridden.razor

@@ -0,0 +1,18 @@
+@using Microsoft.AspNetCore.Components.Routing
+<style type="text/css">
+    a.active {
+        background-color: yellow;
+        font-weight: bold;
+    }
+</style>
+<ul>
+    <li><NavLinkIgnoreQueryAndFragmentString href="/subdir/layout-overridden/" Match=NavLinkMatch.All>Override layout (matches all)</NavLinkIgnoreQueryAndFragmentString></li>
+    <li><NavLinkIgnoreQueryAndFragmentString href="/subdir/layout-overridden" Match=NavLinkMatch.All>Override layout, no trailing slash (matches all)</NavLinkIgnoreQueryAndFragmentString></li>
+    <li><NavLinkIgnoreQueryAndFragmentString href="/subdir/layout-overridden/?abc=123">Override layout with query</NavLinkIgnoreQueryAndFragmentString></li>
+    <li><NavLinkIgnoreQueryAndFragmentString href="/subdir/layout-overridden?abc=123">Override layout with query, no trailing slash</NavLinkIgnoreQueryAndFragmentString></li>
+    <li><NavLinkIgnoreQueryAndFragmentString href="/subdir/layout-overridden/#blah">Override layout with hash</NavLinkIgnoreQueryAndFragmentString></li>
+    <li><NavLinkIgnoreQueryAndFragmentString href="/subdir/layout-overridden#blah">Override layout with hash, no trailing slash</NavLinkIgnoreQueryAndFragmentString></li>
+    <li><NavLinkIgnoreQueryAndFragmentString href="/subdir/layout-overridden/Default.html">Override layout with extension</NavLinkIgnoreQueryAndFragmentString></li>
+    <li><NavLinkIgnoreQueryAndFragmentString href="/subdir/layout-overridden/Other">Override Other</NavLinkIgnoreQueryAndFragmentString></li>
+    <li><NavLinkIgnoreQueryAndFragmentString href="/subdir/Other" Match=NavLinkMatch.All>Override Other with base-relative URL (matches all)</NavLinkIgnoreQueryAndFragmentString></li>
+</ul>

src/Components/test/testassets/BasicTestApp/RouterTest/NavLinkIgnoreQueryAndFragmentString.razor

@@ -0,0 +1,27 @@
+@using Microsoft.AspNetCore.Components.Routing;
+@inherits NavLink
+
+@{
+    base.BuildRenderTree(__builder);
+}
+
+@code{
+
+    protected override bool ShouldMatch(string currentUriAbsolute)
+    {
+        if (base.ShouldMatch(currentUriAbsolute))
+        {
+            return true;
+        }
+
+        var originalMatch = base.Match;
+        base.Match = NavLinkMatch.All;
+        string uriWithoutQueryAndFragment = GetUriIgnoreQueryAndFragment(currentUriAbsolute);
+        var shouldMatch = base.ShouldMatch(uriWithoutQueryAndFragment);
+        base.Match = originalMatch;
+        return shouldMatch;
+    }
+
+    private string GetUriIgnoreQueryAndFragment(string uri) =>
+        new Uri(uri).GetLeftPart(UriPartial.Path);
+}

src/Components/test/testassets/BasicTestApp/RouterTestLayoutNavLinksOverridden.razor

@@ -0,0 +1,6 @@
+@using Microsoft.AspNetCore.Components
+@inherits LayoutComponentBase
+
+@Body
+
+<BasicTestApp.RouterTest.LinksOverridden />